diff options
48 files changed, 1907 insertions, 116 deletions
diff --git a/app-misc/tmux/tmux-1.9a.ebuild b/app-misc/tmux/tmux-1.9a-r2.ebuild index 6f015ef3e5ed..7fd1b5454752 100644 --- a/app-misc/tmux/tmux-1.9a.ebuild +++ b/app-misc/tmux/tmux-1.9a-r2.ebuild @@ -17,8 +17,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 IUSE="debug selinux vim-syntax" COMMON_DEPEND=" - >=dev-libs/libevent-2.0.10 - <dev-libs/libevent-2.5.1 + =dev-libs/libevent-2.0* sys-libs/ncurses" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" diff --git a/app-misc/tmux/tmux-2.0-r1.ebuild b/app-misc/tmux/tmux-2.0-r3.ebuild index 55b653a6cf55..0c74bd5cd4ca 100644 --- a/app-misc/tmux/tmux-2.0-r1.ebuild +++ b/app-misc/tmux/tmux-2.0-r3.ebuild @@ -17,8 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa IUSE="debug selinux vim-syntax" CDEPEND=" - >=dev-libs/libevent-2.0.10 - <dev-libs/libevent-2.5.1 + =dev-libs/libevent-2.0* !sys-apps/utempter sys-libs/ncurses" DEPEND="${CDEPEND} diff --git a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch index 30b456e77416..ab97d22a2957 100644 --- a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch +++ b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch @@ -1,13 +1,14 @@ --- paps-0.6.8/src/libpaps.c +++ paps-0.6.8/src/libpaps.c -@@ -25,8 +25,8 @@ +@@ -25,8 +25,9 @@ #include <pango/pango.h> #include <pango/pangoft2.h> -#include <freetype/ftglyph.h> -#include <freetype/ftoutln.h> -+#include <ftglyph.h> -+#include <ftoutln.h> ++#include <ft2build.h> ++#include FT_GLYPH_H ++#include FT_OUTLINE_H #include <errno.h> #include <stdlib.h> #include <stdio.h> diff --git a/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch b/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch new file mode 100644 index 000000000000..16d0a05a7709 --- /dev/null +++ b/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch @@ -0,0 +1,22 @@ +--- src/org/hibernate/cache/EhCache.java.orig 2015-10-07 14:06:39.968486000 +0000 ++++ src/org/hibernate/cache/EhCache.java 2015-10-07 14:06:49.900486000 +0000 +@@ -192,9 +192,9 @@ + catch (IllegalStateException e) {
+ throw new CacheException(e);
+ }
+- catch (IOException e) {
+- throw new CacheException(e);
+- }
++ // catch (IOException e) {
++ // throw new CacheException(e);
++ // }
+ }
+
+ /**
+@@ -289,4 +289,4 @@ + return "EHCache(" + getRegionName() + ')';
+ }
+
+-} +\ No newline at end of file ++}
diff --git a/dev-java/hibernate/hibernate-3.1.3-r4.ebuild b/dev-java/hibernate/hibernate-3.1.3-r5.ebuild index a1cb1e159998..151b3535e9a6 100644 --- a/dev-java/hibernate/hibernate-3.1.3-r4.ebuild +++ b/dev-java/hibernate/hibernate-3.1.3-r5.ebuild @@ -19,14 +19,14 @@ IUSE="" SLOT="3.1" KEYWORDS="amd64 x86" -COMMON_DEPEND=" +CDEPENDEND=" >=dev-java/antlr-2.7.7:0[java] dev-java/c3p0:0 dev-java/cglib:3 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/dom4j:1 - dev-java/ehcache:0 + dev-java/ehcache:1.2 dev-java/oscache:0 dev-java/proxool:0 dev-java/swarmcache:1.0 @@ -35,18 +35,21 @@ COMMON_DEPEND=" dev-java/ant-core:0 dev-java/asm:2.2" RDEPEND=">=virtual/jre-1.6 - ${COMMON_DEPEND}" + ${CDEPENDEND}" DEPEND=">=virtual/jdk-1.6 - ${COMMON_DEPEND}" + ${CDEPENDEND}" S="${WORKDIR}/${PN}-${MY_PV}" -# Avoid this to happen. -# [javac] /var/tmp/portage/dev-java/hibernate-3.1.3-r4/work/hibernate-3.1/src/org/hibernate/dialect/MimerSQLDialect.java:13: error: unmappable character for encoding UTF8 -# [javac] * @author Fredrik �lund <fredrik.alund@mimer.se> JAVA_ANT_ENCODING="ISO-8859-1" +PATCHES=( + "${FILESDIR}"/"${P}-EhCache.java.patch" +) + java_prepare() { + epatch "${PATCHES[@]}" + java-ant_rewrite-bootclasspath 1.5 # this depends on jboss @@ -60,7 +63,7 @@ java_prepare() { JAVA_ANT_REWRITE_CLASSPATH="true" EANT_GENTOO_CLASSPATH=" c3p0,commons-collections,commons-logging,cglib-3,transaction-api -dom4j-1,ehcache,oscache,proxool,swarmcache-1.0 +dom4j-1,ehcache-1.2,oscache,proxool,swarmcache-1.0 sun-jacc-api,antlr,ant-core,asm-2.2 " EANT_EXTRA_ARGS="-Dnosplash -Ddist.dir=dist" diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest index c2e4eb5e2616..dc652abdfb6f 100644 --- a/dev-lang/ispc/Manifest +++ b/dev-lang/ispc/Manifest @@ -1,2 +1 @@ -DIST ispc-1.8.1.tar.gz 19222737 SHA256 adef83008bf9e2eb1947f0fbc38670d8bf801ddb36b1f22c4429a1c394e31f60 SHA512 515fd08d416f2f94444ae8771d1f5922b06c87fbebb552ab4003bf961307c1637eab35c46dcd9c356ce6ec159b441ff001edb4488c3dd6629496960a92bafe75 WHIRLPOOL ace2600866156e11a8cf90bb9e6c73a6cdcd1992d72761d9f3c64b16c6a34055410ac3172d6fb746a2a057704d6531e03f91bdbc7f7f480fa4884cbf91d75c3a DIST ispc-1.8.2.tar.gz 19259133 SHA256 d17ea68b7192d261a2830d6e00df656a73fbccd08a249433fcaf24a886902a9d SHA512 bb1f64afe41af138c386fb12a2a7f477f7bc8df2543191bbe7e5d7624e6b00dfec11ba422f6f396cd91af1c7b4cb5d2b3febf7902740d85c6d068de8ab94765a WHIRLPOOL 45ba7c52b3ada111f518b2a94d71d8c259040114ae84881c693f6e3491bd4b6897563eba4bccb6ae83a7cb90901bf1723bcbfeb9a124267ed235b1b8fdf61d69 diff --git a/dev-lang/ispc/ispc-1.8.1.ebuild b/dev-lang/ispc/ispc-1.8.1.ebuild deleted file mode 100644 index 0d283bb3d1f2..000000000000 --- a/dev-lang/ispc/ispc-1.8.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit toolchain-funcs python-any-r1 - -DESCRIPTION="Intel SPMD Program Compiler" -HOMEPAGE="https://ispc.github.com/" - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://github.com/ispc/ispc.git" - KEYWORDS="" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD BSD-2 UoI-NCSA" -SLOT="0" -IUSE="examples" - -RDEPEND=" - >=sys-devel/clang-3.0 - >=sys-devel/llvm-3.0 - " -DEPEND=" - ${RDEPEND} - ${PYTHON_DEPS} - sys-devel/bison - sys-devel/flex - " - -src_compile() { - sed -i '/^\t@/s/@//' Makefile || die #make all slient commands ("@") verbose - emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)" -} - -src_install() { - dobin ispc - dodoc README.rst - - if use examples; then - insinto "/usr/share/doc/${PF}/examples" - docompress -x "/usr/share/doc/${PF}/examples" - doins -r examples/* - fi -} diff --git a/dev-lang/ispc/ispc-1.8.2.ebuild b/dev-lang/ispc/ispc-1.8.2-r1.ebuild index 0d283bb3d1f2..7c0ad7e0a672 100644 --- a/dev-lang/ispc/ispc-1.8.2.ebuild +++ b/dev-lang/ispc/ispc-1.8.2-r1.ebuild @@ -25,8 +25,8 @@ SLOT="0" IUSE="examples" RDEPEND=" - >=sys-devel/clang-3.0 - >=sys-devel/llvm-3.0 + >=sys-devel/clang-3.4 + >=sys-devel/llvm-3.4 " DEPEND=" ${RDEPEND} diff --git a/dev-libs/libdbh/Manifest b/dev-libs/libdbh/Manifest new file mode 100644 index 000000000000..9f816f528bb2 --- /dev/null +++ b/dev-libs/libdbh/Manifest @@ -0,0 +1 @@ +DIST libdbh2-5.0.19.tar.gz 1608949 SHA256 2e534f24c4df99f6e2ba726e3982d7361b56361ed5eb16e7dfdc07fac26ceba2 SHA512 35c368e82f8f7c4c7d4960731214ff3863530795b16716c0be7351e0ca10740ac26a99930369f4df78c8e108d929124c222b5942ce5f521ecb58afd38d55bbe9 WHIRLPOOL 33c68c83e55f90bfa19ee10e9ba37b1dba95d1506b40bb9b992df151e96f35dc87d0969bfc3c2c8a0d5d95862a5d36e9a37199a7e94af26128870a9f3ff5939b diff --git a/dev-libs/libdbh/libdbh-5.0.19.ebuild b/dev-libs/libdbh/libdbh-5.0.19.ebuild new file mode 100644 index 000000000000..633df46aff97 --- /dev/null +++ b/dev-libs/libdbh/libdbh-5.0.19.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils + +MY_P=${PN}2-${PV} + +DESCRIPTION="a small library to create and manage 64-bit disk based hash tables" +HOMEPAGE="https://www.gnu.org/software/libdbh/" +SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + virtual/pkgconfig" + +S="${WORKDIR}"/${MY_P} + +pkg_setup() { + DOCS=( AUTHORS ChangeLog NEWS README TODO ) +} + +src_prepare() { + sed -i -e "s:-O2:${CFLAGS}:" m4/rfm-conditionals.m4 || die + eautoreconf +} + +src_install() { + default + prune_libtool_files +} diff --git a/dev-libs/libdbh/metadata.xml b/dev-libs/libdbh/metadata.xml new file mode 100644 index 000000000000..fcc6fe99c209 --- /dev/null +++ b/dev-libs/libdbh/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>angelos@gentoo.org</email> + <name>Christoph Mende</name> + </maintainer> +</pkgmetadata> diff --git a/dev-libs/libtubo/Manifest b/dev-libs/libtubo/Manifest new file mode 100644 index 000000000000..99f5e1df01ee --- /dev/null +++ b/dev-libs/libtubo/Manifest @@ -0,0 +1 @@ +DIST libtubo0-5.0.15.tar.bz2 389945 SHA256 98f6d14f6a2688bd2435c73b254f23f4b4f3e5f3a4be56d843f7a3cdf0ec31db SHA512 148147ef30b4f803ed3e45d07b85ce9fe68750938fd6a1f5e87f08e1da41d633b99934f0766ba0f62c793bd664ab43335e273068bbae1d2fe06f0cc9825d1d98 WHIRLPOOL d792fa428afe2593ad84e5293834e95b828203ca80b0aa685feddce467a5f07939e6483799905e5a365619c27857f4e60b410d4d58e74c9013b6f673878212ba diff --git a/dev-libs/libtubo/libtubo-5.0.15.ebuild b/dev-libs/libtubo/libtubo-5.0.15.ebuild new file mode 100644 index 000000000000..081a357d89d5 --- /dev/null +++ b/dev-libs/libtubo/libtubo-5.0.15.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils + +MY_P=${PN}0-${PV} + +DESCRIPTION="small and simple interprocess communication library" +HOMEPAGE="http://xffm.org/libtubo" +SRC_URI="mirror://sourceforge/xffm/${PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}"/${MY_P} + +pkg_setup() { + DOCS=( AUTHORS ChangeLog NEWS README TODO ) +} + +src_install() { + default + prune_libtool_files +} diff --git a/dev-libs/libtubo/metadata.xml b/dev-libs/libtubo/metadata.xml new file mode 100644 index 000000000000..fcc6fe99c209 --- /dev/null +++ b/dev-libs/libtubo/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>angelos@gentoo.org</email> + <name>Christoph Mende</name> + </maintainer> +</pkgmetadata> diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest index 9dc53ab8a78b..46577c7ac085 100644 --- a/dev-python/aiohttp/Manifest +++ b/dev-python/aiohttp/Manifest @@ -1 +1,2 @@ DIST aiohttp-0.14.4.tar.gz 1253273 SHA256 2338c8506ce7853ac2df7efba731a3fd015a7ee2561afab0d69ddefb43403f5a SHA512 453626e2acb2da85b39fd9dab01c51bbbbdf3422e2d7ff833e8be141f43d27d046646bafe6d58d96d37457208ecc2347a3724f056152c639c18de99da619538d WHIRLPOOL 42e8e23c3b1c28463617f9137288886ccf2d61fe404e8b06e105e0a48b36b06382a7a58a6e6c91bc38886e09874ba6112300fd6bf3adfce704129a7edbc4936d +DIST aiohttp-0.17.4.tar.gz 475034 SHA256 a2f122b41f29eb10772f1600ada5fec849c5dc717c1dcaa05c95bf0712af8843 SHA512 bca0aa93f51fae32eff383ffbd7790886a822647e77884fb5a26b6d2673429b61cf5483527297740a4b237b3e038934990df1061e32e6617d6a3da10276b9116 WHIRLPOOL a7abec0b3daa84078beee9057b5dfdf021b7522fa6b7f847f65008a061802f2cd61dee34886b833c8465f0a5379af9cb45b1f2117cd0b386b6ea488f3f9f2b3c diff --git a/dev-python/aiohttp/aiohttp-0.17.4.ebuild b/dev-python/aiohttp/aiohttp-0.17.4.ebuild new file mode 100644 index 000000000000..5efb49618e0d --- /dev/null +++ b/dev-python/aiohttp/aiohttp-0.17.4.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/aiohttp/aiohttp-0.14.4-r1.ebuild,v 1.1 2015/03/16 11:08:45 bman Exp $ + +EAPI="5" + +PYTHON_COMPAT=( python3_3 python3_4 ) + +inherit distutils-r1 + +DESCRIPTION="http client/server for asyncio" +HOMEPAGE="https://github.com/KeepSafe/aiohttp https://pypi.python.org/pypi/aiohttp" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc examples test" + +CDEPEND=" + dev-python/chardet[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3') + $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python3_3') +" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] + doc? ( + >=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}] + dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}] + dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + ) + test? ( + ${CDEPEND} + dev-python/nose[${PYTHON_USEDEP}] + www-servers/gunicorn[${PYTHON_USEDEP}] + ) +" +RDEPEND="${CDEPEND}" + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + PYTHONPATH="$(PWD):${PYTHONPATH}" nosetests tests/ || die "Tests failed under ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + use examples && local EXAMPLES=( examples/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/aiohttp/metadata.xml b/dev-python/aiohttp/metadata.xml index 79da0ee6f17a..4f715e81f53d 100644 --- a/dev-python/aiohttp/metadata.xml +++ b/dev-python/aiohttp/metadata.xml @@ -5,6 +5,10 @@ <email>bman@gentoo.org</email> <name>Aaron Bauman</name> </maintainer> + <maintainer> + <email>alunduil@gentoo.org</email> + <name>Alex Brandt</name> + </maintainer> <upstream> <remote-id type="pypi">aiohttp</remote-id> <remote-id type="github">KeepSafe/aiohttp</remote-id> diff --git a/dev-python/pymongo/pymongo-2.9.ebuild b/dev-python/pymongo/pymongo-2.9.ebuild index 059bdf55ecaf..9dd9181ccd19 100644 --- a/dev-python/pymongo/pymongo-2.9.ebuild +++ b/dev-python/pymongo/pymongo-2.9.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +PYTHON_COMPAT=( python{2_7,3_4} pypy ) inherit check-reqs distutils-r1 diff --git a/dev-python/uhashring/Manifest b/dev-python/uhashring/Manifest new file mode 100644 index 000000000000..a742c46fc8ef --- /dev/null +++ b/dev-python/uhashring/Manifest @@ -0,0 +1 @@ +DIST uhashring-0.1.tar.gz 11063 SHA256 72d5999006e44a38a1cc0a99e9f5ac81d893948abb32752090936ffd89af7cdb SHA512 bdce3319b1b871ed68aeec7fe6e8dfe829409d57f0c91ce54ab5df52044845f5861ee93864bba5c083000f4c7b9e4502e7f3e1c08a0a9c64c65385c699342e6b WHIRLPOOL ef737c5df409ec50247605b680f9670010f4917df71f5e0b79795d181566228641e87e00ffd6201fc242285876b8a3125d02ac540ecdd26a32edac0f3bcf942a diff --git a/dev-python/uhashring/metadata.xml b/dev-python/uhashring/metadata.xml new file mode 100644 index 000000000000..faafe4da961f --- /dev/null +++ b/dev-python/uhashring/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>python</herd> + <upstream> + <remote-id type="pypi">uhashring</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/uhashring/uhashring-0.1.ebuild b/dev-python/uhashring/uhashring-0.1.ebuild new file mode 100644 index 000000000000..3d0b1d40a4d4 --- /dev/null +++ b/dev-python/uhashring/uhashring-0.1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_{4,5} ) + +inherit distutils-r1 + +DESCRIPTION="Full featured consistent hashing python library compatible with ketama" +HOMEPAGE="https://github.com/ultrabug/uhashring" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" + +RESTRICT="test" diff --git a/dev-ros/filters/files/rostest.patch b/dev-ros/filters/files/rostest.patch new file mode 100644 index 000000000000..6a266fdef614 --- /dev/null +++ b/dev-ros/filters/files/rostest.patch @@ -0,0 +1,27 @@ +commit 5aef0d6619394df17bffe743071295ad041b5794 +Author: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> +Date: Tue Feb 4 16:02:09 2014 +0100 + + make rostest in CMakeLists optional (ros/rosdistro#3010) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ccb54f9..97eea51 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,7 +5,7 @@ project(filters) + # Find dependencies + ############################################################################## + +-find_package(catkin REQUIRED COMPONENTS pluginlib roslib roscpp rosconsole rostest) ++find_package(catkin REQUIRED COMPONENTS pluginlib roslib roscpp rosconsole) + find_package(Boost COMPONENTS system filesystem thread REQUIRED) + + include_directories( +@@ -41,6 +41,7 @@ add_library(transfer_function src/transfer_function.cpp) + target_link_libraries(transfer_function ${catkin_LIBRARIES} ${Boost_LIBRARIES}) + + if(CATKIN_ENABLE_TESTING) ++ find_package(rostest) + # Test median filter + add_executable(median_test EXCLUDE_FROM_ALL test/test_median.cpp ) + target_link_libraries(median_test median ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES}) diff --git a/dev-ros/filters/filters-1.7.4.ebuild b/dev-ros/filters/filters-1.7.4.ebuild index 4b50ee0a0497..d718f2d4a9f9 100644 --- a/dev-ros/filters/filters-1.7.4.ebuild +++ b/dev-ros/filters/filters-1.7.4.ebuild @@ -18,4 +18,4 @@ RDEPEND="dev-ros/roscpp dev-ros/pluginlib" DEPEND="${RDEPEND} test? ( dev-ros/rostest dev-cpp/gtest )" -PATCHES=( "${FILESDIR}/tests.patch" ) +PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/rostest.patch" ) diff --git a/games-board/gnubg/gnubg-1.05.000.ebuild b/games-board/gnubg/gnubg-1.05.000.ebuild index 90c280ab76a5..1399aa905ca0 100644 --- a/games-board/gnubg/gnubg-1.05.000.ebuild +++ b/games-board/gnubg/gnubg-1.05.000.ebuild @@ -55,6 +55,9 @@ src_prepare() { -e '/^gnubgiconsdir / s#=.*#= /usr/share#' \ -e '/^gnubgpixmapsdir / s#=.*#= /usr/share/pixmaps#' \ pixmaps/Makefile.in || die + sed -i \ + -e '1i#include <config.h>' \ + copying.c || die #551896 } src_configure() { diff --git a/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch b/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch new file mode 100644 index 000000000000..c361baf2a06f --- /dev/null +++ b/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch @@ -0,0 +1,50 @@ +taken from upstream + +http://savannah.nongnu.org/bugs/?func=detailitem&item_id=46118 + +From 30fe5e762e062612fdf4b56b50d813525a5aa311 Mon Sep 17 00:00:00 2001 +From: Werner Lemberg <wl@gnu.org> +Date: Sun, 4 Oct 2015 13:08:08 +0200 +Subject: [PATCH] [base] Replace left shifts with multiplication (#46118). + +* src/base/ftglyph.c (ft_bitmap_glyph_bbox, FT_Get_Glyph): Do it. +--- + ChangeLog | 6 ++++++ + src/base/ftglyph.c | 14 +++++++------- + 2 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c +index cb7fc37..2778743 100644 +--- a/src/base/ftglyph.c ++++ b/src/base/ftglyph.c +@@ -125,10 +125,10 @@ + FT_BitmapGlyph glyph = (FT_BitmapGlyph)bitmap_glyph; + + +- cbox->xMin = glyph->left << 6; +- cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width << 6 ); +- cbox->yMax = glyph->top << 6; +- cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows << 6 ); ++ cbox->xMin = glyph->left * 64; ++ cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width * 64 ); ++ cbox->yMax = glyph->top * 64; ++ cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows * 64 ); + } + + +@@ -403,9 +403,9 @@ + if ( error ) + goto Exit; + +- /* copy advance while converting it to 16.16 format */ +- glyph->advance.x = slot->advance.x << 10; +- glyph->advance.y = slot->advance.y << 10; ++ /* copy advance while converting 26.6 to 16.16 format */ ++ glyph->advance.x = slot->advance.x * 1024; ++ glyph->advance.y = slot->advance.y * 1024; + + /* now import the image from the glyph slot */ + error = clazz->glyph_init( glyph, slot ); +-- +2.5.2 + diff --git a/media-libs/freetype/freetype-2.6.1-r1.ebuild b/media-libs/freetype/freetype-2.6.1-r1.ebuild new file mode 100644 index 000000000000..de89f3921c71 --- /dev/null +++ b/media-libs/freetype/freetype-2.6.1-r1.ebuild |