From 8a87a24ceb1f2451abbaf1113f9316a46ba1cc22 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Sat, 15 Aug 2015 22:20:11 -0400 Subject: [PATCH 001/169] dev-php/PEAR-Archive_Tar: Version bump Package-Manager: portage-2.2.20.1 --- dev-php/PEAR-Archive_Tar/Manifest | 1 + .../PEAR-Archive_Tar-1.4.0.ebuild | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.0.ebuild diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest index 211813c4aa922..f93a955f0b631 100644 --- a/dev-php/PEAR-Archive_Tar/Manifest +++ b/dev-php/PEAR-Archive_Tar/Manifest @@ -1 +1,2 @@ DIST Archive_Tar-1.3.15.tgz 19985 SHA256 25e4f296874d208f46a772425e924e9361720b92f6bddb1e1fa0d83669fcb0af SHA512 a4fdbbcc654428242a2123438adfc72b2d24e7d201b2d927a20f4df7952cf23ab9bb395757f4e88f1617a86a2430df4a6508f26b2e3ffdc4eefcbbcf0cf6bd71 WHIRLPOOL c20a77658652316d1a12b1212e54296102fae160bdc64c6a237239dada7f3d0b8aba0d10b823893fabd5937884fbbd525903fca7ee45f935314ffba74a61891b +DIST Archive_Tar-1.4.0.tgz 20018 SHA256 f1eb4260d09d20de29a3c589019ed53a8be6b8c5832233de9de83984baef96d6 SHA512 d15825f54fb286473e3d96be82818046cbe0cda40f0968ef9e03c7d620cd3ae5db23c93a764cbcb3fb3ca39f41cc6d4a4f782ee2718ffa47c83e1fd9a5aedba9 WHIRLPOOL 4450bb5537285f2b02cad263ab5973c8f18b7489124ea86012a04a21c68b4897f09de92a757c5369baa953ddf9ff009581a74dcc0b4e93db46e0a14a47daed9d diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.0.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.0.ebuild new file mode 100644 index 0000000000000..4d197a1b53909 --- /dev/null +++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +MY_PN="${PN/PEAR-/}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Tar file management class" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" +SRC_URI="http://pear.php.net/get/${MY_P}.tgz" +DEPEND=">=dev-lang/php-5.4:*[pcre(+)] + >=dev-php/PEAR-PEAR-1.9.0 +" +RDEPEND=">=dev-lang/php-5.4:*[bzip2,posix,zlib] + ${DEPEND}" +PDEPEND="dev-php/pear" +HOMEPAGE="http://pear.php.net/package/Archive_Tar" + +S="${WORKDIR}/${MY_P}" + +src_install() { + insinto /usr/share/php/Archive + doins Archive/* + + dodoc docs/* +} From f993e634ed8ebeeb19391ede877e35e614067283 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Sat, 15 Aug 2015 22:30:03 -0400 Subject: [PATCH 002/169] dev-php/PEAR-Structures_Graph: Version bump Package-Manager: portage-2.2.20.1 --- dev-php/PEAR-Structures_Graph/Manifest | 1 + .../PEAR-Structures_Graph-1.1.1.ebuild | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1.ebuild diff --git a/dev-php/PEAR-Structures_Graph/Manifest b/dev-php/PEAR-Structures_Graph/Manifest index e7a4685efb04d..27ec9e5a159ff 100644 --- a/dev-php/PEAR-Structures_Graph/Manifest +++ b/dev-php/PEAR-Structures_Graph/Manifest @@ -1 +1,2 @@ DIST Structures_Graph-1.0.4.tgz 30318 SHA256 3619ac17892855117283e3555b1a156df0eb4d175e70e63d9c6d27d2c31a2e4f SHA512 40d45c932c571e38807fbfdcf1df6d4fcab29ab43f518ed313bac2bd35a55396aa2b87790dc827bd2e9e5c5f721df55eadfe83ff1a106bf325c467e44556c9fe WHIRLPOOL af2df6bc3d23eae990fa9c258c6277ee35fec8c9efb3e737f84278e5a3ba1d41202c66f8ae69cfc8054fb5f6b544b6407300cf25fe5ba32f4c3975c44f160c91 +DIST Structures_Graph-1.1.1.tgz 12402 SHA256 00f18a59e517db8c4eb167ada9f2a8a007c5a14b2adafc0308e5c3fad3ddd8de SHA512 cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284 WHIRLPOOL f832c8be32e18c05ccc6958633c423570ece02cae83b4ce2b9f03ecc3d8ef98795f5e951652b3ffc95756f145435449970c568f550ceb265736a55df60fca568 diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1.ebuild new file mode 100644 index 0000000000000..facc50b3d798f --- /dev/null +++ b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# BIG FAT WARNING! +# Do not use any pear eclass here since pear itself depends on this package. +# Using the pear eclass will thus create a circular dependency + +EAPI="5" + +MY_PN="${PN/PEAR-/}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Graph datastructure manipulation library" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" +SRC_URI="http://pear.php.net/get/${MY_P}.tgz" +DEPEND=">=dev-lang/php-5.3:*[pcre(+)] + >=dev-php/PEAR-PEAR-1.8.1" +RDEPEND="${DEPEND}" +PDEPEND="dev-php/pear" +HOMEPAGE="http://pear.php.net/package/Structures_Graph" + +S="${WORKDIR}/${MY_P}" + +src_install() { + insinto /usr/share/php + doins -r Structures +# Currently empty except for a sudo-html file +# dohtml -r docs/html/* +} From 88ab9897e6dd4acb0af0dc9c646282adc07862f5 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Sat, 15 Aug 2015 22:35:03 -0400 Subject: [PATCH 003/169] dev-php/PEAR-Console_Getopt: Version bump Package-Manager: portage-2.2.20.1 --- dev-php/PEAR-Console_Getopt/Manifest | 1 + .../PEAR-Console_Getopt-1.4.1.ebuild | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1.ebuild diff --git a/dev-php/PEAR-Console_Getopt/Manifest b/dev-php/PEAR-Console_Getopt/Manifest index f4829627db486..3c110d12f4efa 100644 --- a/dev-php/PEAR-Console_Getopt/Manifest +++ b/dev-php/PEAR-Console_Getopt/Manifest @@ -1,2 +1,3 @@ DIST Console_Getopt-1.3.1.tgz 4471 SHA256 9381ad3f8e48574c38917b55caae2cd20cf152af8e65a31d09931fad829161c4 SHA512 701c2861bcf07c121e573441dec783b4e832b10d439bf807076427cbfa832ebcd80a20c324296e962d7f493e51231f5c54b46fd19e83a431db17f21b7d984876 WHIRLPOOL a2028ae0ea556ce9821249527c1abccc8757425b67cbc7a842487fc86b09cbd075405a1f7477fae802aa0014a7aa2ddbfbb9ad534f907a81a562e71d5e099903 DIST Console_Getopt-1.4.0.tgz 4534 SHA256 634a8647ce2b343253c57d77f42361464eebe28a3b4c0a321c6675495da88fab SHA512 1da827cb3740de139ba0721c82dbe374b05fbf7e08e0eecfaa4b53f8d0024be1bbaa737a3c9b7a21ac2779dc4036480d3d6d85f7bd83cb07db0cc234ea193a1c WHIRLPOOL f7a36d4898f8c7cc7aff655ebb9a6037eb9cdde03f981ced353fa6e59ddfa6b568f8e56eab14b55ab988408321a4b359353d226f364a42d93ae99c611d8996fe +DIST Console_Getopt-1.4.1.tgz 5580 SHA256 2ac7b7ad616529b9bb891688459e866aacb3190cb81e208cddfe49e5d0fb5616 SHA512 cbf12a72b33424935f019b17ae8fa55289eae77d3845dcfcbbc1c47b71111992d2c0eb837b0f262ce644809c3cc06ad0c2bb04aa1b6ec89a1e3122f327114dbd WHIRLPOOL 5a5da6e0e977ffd15d69b83ebad079e7fd25d2d38f0cc691dbbe059b92a48fbfdc1169f499aaff045786fb099a993815e5e7c6bc1a41858a7bcf7855696e2fb9 diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1.ebuild new file mode 100644 index 0000000000000..d2487e44f01f1 --- /dev/null +++ b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MY_PN="${PN/PEAR-/}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Command-line option parser" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" +SRC_URI="http://pear.php.net/get/${MY_P}.tgz" +DEPEND=">=dev-lang/php-5.4:* + >=dev-php/PEAR-PEAR-1.8.1" +RDEPEND="${DEPEND}" +PDEPEND="dev-php/pear" +HOMEPAGE="http://pear.php.net/package/Console_Getopt" + +S="${WORKDIR}/${MY_P}" + +src_install() { + insinto /usr/share/php/ + doins -r Console +} From e6fa55141fbf898ea56e134ba034f6f3f1335203 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Sat, 15 Aug 2015 22:40:23 -0400 Subject: [PATCH 004/169] dev-php/PEAR-XML_Util: Version bump Package-Manager: portage-2.2.20.1 --- dev-php/PEAR-XML_Util/Manifest | 1 + .../PEAR-XML_Util/PEAR-XML_Util-1.3.0.ebuild | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 dev-php/PEAR-XML_Util/PEAR-XML_Util-1.3.0.ebuild diff --git a/dev-php/PEAR-XML_Util/Manifest b/dev-php/PEAR-XML_Util/Manifest index 9d91d0ee54c8d..eb9fef2a997bc 100644 --- a/dev-php/PEAR-XML_Util/Manifest +++ b/dev-php/PEAR-XML_Util/Manifest @@ -1 +1,2 @@ DIST XML_Util-1.2.3.tgz 17134 SHA256 ddbb99bf9907e1f7b1a4ae1bc340d1bba42960d61fbb93015133099472844705 SHA512 720319bb6c57e7f67ae213768b41727a24bccd5e7cfba88006796edbbed7a351042fcaef85dc1cfd6248daac8b86af5b9d5021290e7e13a5ef679c2a8a2875c3 WHIRLPOOL 29ee4effa8f3349a0d877c8e231bb6a4c4946055c36c96b0649b9cdf0ecbf121b34da6f0e4007b176a5035f26a4d541714c3d82b7e01cd6431c1c72971f98f31 +DIST XML_Util-1.3.0.tgz 17186 SHA256 1396dbf975ae7235ec4131c40d772a3958d6086c34ea985a03e988e241c0892e SHA512 751af0c2329bee53b6b374fc613ed8c388ace6b9d5246f7ecade0e74e5f41101bd14727e1bcd566d850aea5b336981daac92d6adb8d66dbe7425990460ef0633 WHIRLPOOL d5dbbe9bcca96fdf11d009ea93c94b0eb3b2b332ad13ac23a8365a8e384d24b3da9e314fa56bd68c4b987d23a6a323772963f62390494b80f4be48a40d897195 diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.3.0.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.3.0.ebuild new file mode 100644 index 0000000000000..49c4b854bbee2 --- /dev/null +++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.3.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +MY_PN="${PN/PEAR-/}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="XML utility class" + +LICENSE="PHP-2.02" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" +SRC_URI="http://pear.php.net/get/${MY_P}.tgz" + +DEPEND=">=dev-lang/php-5.3:*[pcre(+)] + >=dev-php/PEAR-PEAR-1.8.1" +RDEPEND="${DEPEND}" +PDEPEND="dev-php/pear" + +HOMEPAGE="http://pear.php.net/package/XML_Util" + +S="${WORKDIR}/${MY_P}" + +src_install() { + insinto /usr/share/php/XML + doins XML/Util.php + + insinto /usr/share/php/docs/${MY_PN} + doins examples/* +} From 47ce1158adf79906111a1994abcbb220f098eab2 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Sat, 15 Aug 2015 23:05:50 -0400 Subject: [PATCH 005/169] dev-php/{pear,PEAR-PEAR}: Version bump for PHP7 compatible version This is being committed as masked because I expect many older PEAR packages to break with the new format. Further testing is required on all PEAR packages before unmasking. Package-Manager: portage-2.2.20.1 --- dev-php/pear/pear-1.10.0_alpha2.ebuild | 43 ++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 dev-php/pear/pear-1.10.0_alpha2.ebuild diff --git a/dev-php/pear/pear-1.10.0_alpha2.ebuild b/dev-php/pear/pear-1.10.0_alpha2.ebuild new file mode 100644 index 0000000000000..3405c1fc49707 --- /dev/null +++ b/dev-php/pear/pear-1.10.0_alpha2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +DESCRIPTION="PEAR - PHP Extension and Application Repository" +HOMEPAGE="http://pear.php.net/" +SRC_URI="" +LICENSE="MIT" +SLOT="0" +IUSE="" +S="${WORKDIR}" + +DEPEND=">=dev-lang/php-5.4:* + !=dev-php/PEAR-Archive_Tar-1.4.0 + >=dev-php/PEAR-Console_Getopt-1.4.1 + >=dev-php/PEAR-Structures_Graph-1.1.0 + >=dev-php/PEAR-XML_Util-1.3.0" +RDEPEND="${DEPEND}" + +src_install() { + :; +} + +pkg_postinst() { + pear clear-cache + + # Update PEAR/PECL channels as needed, add new ones to the list if needed + elog "Updating PEAR/PECL channels" + local pearchans="pear.php.net pecl.php.net components.ez.no + pear.propelorm.org pear.phing.info pear.symfony-project.com + pear.phpontrax.com pear.agavi.org" + + for chan in ${pearchans} ; do + pear channel-discover ${chan} + pear channel-update ${chan} + done +} From 201d36ec0c973aebafbb207d2093e33de58bf7db Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Sat, 15 Aug 2015 23:06:58 -0400 Subject: [PATCH 006/169] dev-php/PEAR-PEAR: Version bump for PHP7 compatible version This is being committed as masked because I expect many older PEAR packages to break with the new format. Further testing is required on all PEAR packages before unmasking. Package-Manager: portage-2.2.20.1 Signed-off-by: Brian Evans --- dev-php/PEAR-PEAR/Manifest | 1 + .../PEAR-PEAR/PEAR-PEAR-1.10.0_alpha2.ebuild | 108 ++++++++++++++++++ profiles/package.mask | 6 + 3 files changed, 115 insertions(+) create mode 100644 dev-php/PEAR-PEAR/PEAR-PEAR-1.10.0_alpha2.ebuild diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest index fc2dbfc550464..94e0d82702ec4 100644 --- a/dev-php/PEAR-PEAR/Manifest +++ b/dev-php/PEAR-PEAR/Manifest @@ -1,2 +1,3 @@ +DIST PEAR-1.10.0dev2.tgz 290636 SHA256 6a1c697a0691b1566c251b295846d804e79776f2a7f5b149cfe41b3db75b4493 SHA512 b430f8cfd9858710198fd849ebd91d4c6cf6b5e68d88348a49ddaeb1e7a234ec8a60862a3344810c2ce7d402746fb677e2824b2960d56b290df306905c154523 WHIRLPOOL 83746c0079239350049202f0bc8e60ce58e7f2718fa6af80482b9f4377c246a1e638c9aac47f88c24f8f0b342716216b976fe6e8668925b178ca8def9732c98d DIST PEAR-1.9.4.tgz 296332 SHA256 80c329264a0363c6222b2f750e1646015161c9787bb4041f5ab41d95160bb93c SHA512 f4c8c6f24039940254cf774e51087a12e6b17f7cbd7308c814f8b43f1342ae68db6b2d94626a4d7ed05e8b537816da08459e2939689f15aef725504683657f47 WHIRLPOOL a640fa5dff5eda2801698094b3d99c7c63d9028727f323634dc6c17942d4cbf4fe76ddd35b89a11a8187de068201b875642bf90ea705544801d4ffaac3325828 DIST PEAR-1.9.5.tgz 290006 SHA256 d4c27d7321f76527222eae3972c6ffb62412cc729105c858ae0bb0861d699bdb SHA512 73c5ef84c4ededa7bca81b1d94944e80ddf9dc40101c0727c5975d4ddb72f66a28aecafcefb7af8d1cc3b6fa7e488e704559a7efbebe860adfb8e9796cdf4933 WHIRLPOOL ea42f63e73d680985857f3e8e318e1f7d001edc843d12b94c9b7d3969c0793c0a9709d2dc8940b339be2f9e854cb2a3acb8c0e5cdef7ddc3cd06c9df97a3ee37 diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.0_alpha2.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.0_alpha2.ebuild new file mode 100644 index 0000000000000..4221a0e3651fd --- /dev/null +++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.0_alpha2.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils + +PEAR="${PV//_alpha/dev}" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos" + +DESCRIPTION="PEAR Base System" +HOMEPAGE="http://pear.php.net/package/PEAR" +SRC_URI="http://pear.php.net/get/PEAR-${PEAR}.tgz" +LICENSE="MIT" +SLOT="0" +IUSE="" + +DEPEND="dev-lang/php:*[cli,pcre(+),xml,zlib]" + +RDEPEND="${DEPEND}" + +PDEPEND="dev-php/pear" + +S="${WORKDIR}" + +pkg_setup() { + [[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear" + [[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear" + [[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp" + + elog + elog "cache_dir is set to: ${PEAR_CACHEDIR}" + elog "download_dir is set to: ${PEAR_DOWNLOADDIR}" + elog "temp_dir is set to: ${PEAR_TEMPDIR}" + elog + elog "If you want to change the above values, you need to set" + elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)" + elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}." + elog +} + +src_prepare() { + cd PEAR-${PEAR} + epatch "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" + epatch_user +} + +src_install() { + # Prevent SNMP related sandbox violoation. + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/ + + # install PEAR package + cd "${S}"/PEAR-${PEAR} + + insinto /usr/share/php + doins -r PEAR/ + doins -r OS/ + doins PEAR.php System.php + doins scripts/pearcmd.php + doins scripts/peclcmd.php + + newbin scripts/pear.sh pear + newbin scripts/peardev.sh peardev + newbin scripts/pecl.sh pecl + + # adjust some scripts for current version + for i in pearcmd.php peclcmd.php ; do + sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" + done + + for i in pear peardev pecl ; do + sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" + sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" + done + sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" -i "${D}/usr/bin/pear" + + sed "s:@package_version@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/Command/Package.php" + sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/Dependency2.php" + sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" + sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" + + # finalize install + insinto /etc + newins "${FILESDIR}"/pear.conf-r2 pear.conf + sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" -i "${D}/etc/pear.conf" + sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" -i "${D}/etc/pear.conf" + sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" -i "${D}/etc/pear.conf" + sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" -i "${D}/etc/pear.conf" + + # Change the paths for eprefix! + sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" -i "${D}/etc/pear.conf" + sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" -i "${D}/etc/pear.conf" + sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" -i "${D}/etc/pear.conf" + sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" -i "${D}/etc/pear.conf" + sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" -i "${D}/etc/pear.conf" + + [[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}" + keepdir "${PEAR_CACHEDIR#${EPREFIX}}" + diropts -m1777 + keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}" +} + +pkg_preinst() { + rm -f "${EROOT}/etc/pear.conf" +} diff --git a/profiles/package.mask b/profiles/package.mask index 9f40aab9aa78f..6b7268bd63c82 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,12 @@ #--- END OF EXAMPLES --- +# Brian Evans (16 Aug 2015) +# Mask new PEAR installer as it is likely to break +# many old scripts +>=dev-php/pear-1.10.0_alpha1 +>=dev-php/PEAR-PEAR-1.10.0_alpha1 + # Patrice Clement (14 Aug 2015) # Unreachable HOMEPAGE (dead). Very very very old package: # last release came out in 2001. From 5af0dc4424114509ec3e5277d7a7690f23f8cdfd Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Sun, 16 Aug 2015 13:32:33 +0800 Subject: [PATCH 007/169] dev-python/beaker: patch to fix failed test, fixes bug #557026 Package-Manager: portage-2.2.20 --- dev-python/beaker/beaker-1.7.0-r1.ebuild | 5 +++ .../files/beaker-1.7.0-cookie-testfix.patch | 40 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 dev-python/beaker/files/beaker-1.7.0-cookie-testfix.patch diff --git a/dev-python/beaker/beaker-1.7.0-r1.ebuild b/dev-python/beaker/beaker-1.7.0-r1.ebuild index 13b2fe6c5a210..032a14b064870 100644 --- a/dev-python/beaker/beaker-1.7.0-r1.ebuild +++ b/dev-python/beaker/beaker-1.7.0-r1.ebuild @@ -27,8 +27,13 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] )" RDEPEND="" +# Py2.7 fais some tests without this +DISTUTILS_IN_SOURCE_BUILD=1 + S="${WORKDIR}/${P}dev" +PATCHES=( "${FILESDIR}"/${P}-cookie-testfix.patch ) + python_prepare_all() { # Workaround for http://bugs.python.org/issue11276. sed -e "s/import anydbm/& as anydbm/;/import anydbm/a dbm = anydbm" \ diff --git a/dev-python/beaker/files/beaker-1.7.0-cookie-testfix.patch b/dev-python/beaker/files/beaker-1.7.0-cookie-testfix.patch new file mode 100644 index 0000000000000..364d112b45a4e --- /dev/null +++ b/dev-python/beaker/files/beaker-1.7.0-cookie-testfix.patch @@ -0,0 +1,40 @@ +https://github.com/bbangert/beaker/commit/714f464cac9d14e338cf4420163292acaab3bb49 +diff --git a/beaker/session.py b/beaker/session.py +index 10a87f2..f1a585f 100644 +--- a/beaker/session.py ++++ b/beaker/session.py +@@ -226,7 +226,7 @@ def _create_id(self, set_new=True): + self.last_accessed = None + if self.use_cookies: + self._set_cookie_values() +- sc = set_new == False ++ sc = set_new is False + self._update_cookie_out(set_cookie=sc) + + @property +diff --git a/tests/test_session.py b/tests/test_session.py +index 82ed74d..926dabb 100644 +--- a/tests/test_session.py ++++ b/tests/test_session.py +@@ -218,7 +218,8 @@ def test_cookies_enabled(): + + # test for secure + session = get_session(use_cookies=True, secure=True) +- assert 'secure' in session.request['cookie_out'] ++ cookie = session.request['cookie_out'].lower() # Python3.4.3 outputs "Secure", while previous output "secure" ++ assert 'secure' in cookie, cookie + + # test for httponly + class ShowWarning(object): +@@ -233,7 +234,9 @@ def __call__(self, message, category, filename, lineno, file=None, line=None): + if sys.version_info < (2, 6): + assert sw.msg == 'Python 2.6+ is required to use httponly' + else: +- assert 'httponly' in session.request['cookie_out'] ++ # Python3.4.3 outputs "HttpOnly", while previous output "httponly" ++ cookie = session.request['cookie_out'].lower() ++ assert 'httponly' in cookie, cookie + warnings.showwarning = orig_sw + + def test_cookies_disabled(): + From 5ac96456f81305034ff8a4522ce3ea04eb26dede Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sun, 16 Aug 2015 07:59:43 +0200 Subject: [PATCH 008/169] profiles/arch/hppa: Mask USE=luajittex for app-text/texlive-core (bug #554376). --- profiles/arch/hppa/package.use.mask | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask index eba7b8ed42731..cd55171963fdd 100644 --- a/profiles/arch/hppa/package.use.mask +++ b/profiles/arch/hppa/package.use.mask @@ -4,6 +4,10 @@ # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to . +# Jeroen Roovers (16 Aug 2015) +# Bundles luajit which has not been ported to HPPA (bug #554376) +app-text/texlive-core luajittex + # Jeroen Roovers (3 Jul 2015) # net-libs/nghttp2 fails to compile (bug #552898) net-libs/nghttp2 cxx From 71e4c23d03982446d25c5fb6e8fe69878ca773a8 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sun, 16 Aug 2015 08:04:02 +0200 Subject: [PATCH 009/169] net-misc/youtube-dl: Version bump. Package-Manager: portage-2.2.20.1 --- net-misc/youtube-dl/Manifest | 3 +- .../youtube-dl/youtube-dl-2015.08.06.1.ebuild | 87 ------------------- ...28.ebuild => youtube-dl-2015.08.16.ebuild} | 0 3 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 net-misc/youtube-dl/youtube-dl-2015.08.06.1.ebuild rename net-misc/youtube-dl/{youtube-dl-2015.07.28.ebuild => youtube-dl-2015.08.16.ebuild} (100%) diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index 136b4b4d7e446..af6b4ee926bc5 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,4 +1,3 @@ DIST youtube-dl-2015.04.03.tar.gz 1472296 SHA256 0521a15a24a9b620728a2f45ea9163ca74660ed443781b6e69b4e06d36d7bf59 SHA512 6b2c85cfa222a31f3462aab583fa98bb92544cd5fb0d395ca0b69a26c24ab174870d02264e058281f09305752d50aa5a06d0d747205499a530b275e3194fc6f9 WHIRLPOOL 391e06ea261f92e03a0b38618307f1c9d53a2dfb9f2062fe0cd3ded1ea0c411033a17ded581616032c74a9e4fb398a57e565bf847196a23a9f89433f861362ae -DIST youtube-dl-2015.07.28.tar.gz 1671847 SHA256 61c3acea56cb6127c092fed37ce77c64f14b501faceab54496412d3479685c56 SHA512 d1df40ece3a384859ee25419c7caafb37d55fc504920ba638d40ea4971a97e5dc70a2d03be30fadef5ff24df9f55d471095d707795d7951ba3ebe76735d1a9be WHIRLPOOL 49daef34e160a731d5f37c92dca038c86e3ada1d9f3f8468c97e7e164b575bf022bb04636e8967bb7fe723fbbb51b68aa3db25563873ac626f85053f5b4a1444 -DIST youtube-dl-2015.08.06.1.tar.gz 1684397 SHA256 efd25b9827851a5b8f7108437ea4d84f778702e59fcf85e37e9e0933b8a5c908 SHA512 4e7c35f0f903092c218439e2e9437b7af8c18a26a5d918d0ec086749d15d485ec781ac35cfd25498c4e99bccafdaf7283ea51fa6538109b4798ac3a32a5fd106 WHIRLPOOL 169e42c89d46da2dda59af4f92fa60eb7c1132eceedbdeeb6d139676997d61d8fb858a1d689dc23657f085457a678ddbabe8b816567f7ac11bdf8f8bc8426e60 DIST youtube-dl-2015.08.09.tar.gz 1694525 SHA256 01bd26ceb7bfde7bef2528666807241354087cf01b198b3d48623ee5e3c4b746 SHA512 16e805081e4ca090c577120dea81b180cc96ff86bdf2e0cd0e76cb2857babba307f375a3605f184af76b7a359c1d15d867c79585d2918c537aa6a8450aaa5dd8 WHIRLPOOL 5e41826a3b2edc3b0949a35fe7671e93490760480deb0454d04578be2fe07f12be391b7057ccf84fc621c93e339bf6bb03e43e1c09b67de553eed5262418483e +DIST youtube-dl-2015.08.16.tar.gz 1704579 SHA256 85ef29e55989bdde8ea1bf9084484288e2acf91bf9c9d2f6ee08380d427712e6 SHA512 8aada283b7612e2314a1b05798e3cff60251899e1fa71c58b601167871d43c703c1d2a20614f2caec688cc34414d1ba6ae54b9a0ba13d51811c63325b66c29eb WHIRLPOOL 894800215424f5e219dc6457c9143d0fff99b40a7a5d83ee03206b7f2a34fc7efb4e88401c02158b3f0e74d2df662e48a86f33ff6fca05157768dd565caeb187 diff --git a/net-misc/youtube-dl/youtube-dl-2015.08.06.1.ebuild b/net-misc/youtube-dl/youtube-dl-2015.08.06.1.ebuild deleted file mode 100644 index f78acdd93f6ff..0000000000000 --- a/net-misc/youtube-dl/youtube-dl-2015.08.06.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=(python{2_7,3_3,3_4}) -DISTUTILS_SINGLE_IMPL=true -inherit bash-completion-r1 distutils-r1 eutils - -DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="http://rg3.github.com/youtube-dl/" -SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="offensive test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[coverage(+)] ) -" - -S="${WORKDIR}/${PN}" - -src_prepare() { - if ! use offensive; then - sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \ - youtube_dl/version.py || die - # these have single line import statements - local xxx=( - alphaporno anysex behindkink drtuber eporner eroprofile extremetube - fourtube foxgay goshgay hellporno hentaistigma hornbunny keezmovies - mofosex motherless porn91 pornhd pornotube pornovoisines pornoxo - redtube sexykarma sexu sunporno slutload spankbang spankwire thisav - trutube tube8 vporn xbef xnxx xtube xvideos xxxymovies youjizz - youporn - ) - # these have multi-line import statements - local mxxx=( - pornhub xhamster tnaflix - ) - # do single line imports - sed -i \ - -e $( printf '/%s/d;' ${xxx[@]} ) \ - youtube_dl/extractor/__init__.py \ - || die - - # do multiple line imports - sed -i \ - -e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \ - youtube_dl/extractor/__init__.py \ - || die - - sed -i \ - -e $( printf '/%s/d;' ${mxxx[@]} ) \ - youtube_dl/extractor/generic.py \ - youtube_dl/extractor/tumblr.py \ - || die - - rm \ - $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \ - $( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \ - test/test_age_restriction.py \ - || die - fi - - epatch_user -} - -src_compile() { - distutils-r1_src_compile -} - -src_test() { - emake test -} - -src_install() { - python_domodule youtube_dl - dobin bin/${PN} - dodoc README.txt - doman ${PN}.1 - newbashcomp ${PN}.bash-completion ${PN} - python_fix_shebang "${ED}" -} diff --git a/net-misc/youtube-dl/youtube-dl-2015.07.28.ebuild b/net-misc/youtube-dl/youtube-dl-2015.08.16.ebuild similarity index 100% rename from net-misc/youtube-dl/youtube-dl-2015.07.28.ebuild rename to net-misc/youtube-dl/youtube-dl-2015.08.16.ebuild From cdc7dd2f9dc63663e895d43dfa85016073e0a32f Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sun, 16 Aug 2015 08:09:19 +0200 Subject: [PATCH 010/169] dev-lang/php: Stable for HPPA (bug #556952). Package-Manager: portage-2.2.20.1 --- dev-lang/php/php-5.4.44.ebuild | 2 +- dev-lang/php/php-5.6.12.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-lang/php/php-5.4.44.ebuild b/dev-lang/php/php-5.4.44.ebuild index 5a89e01be45d4..e83310df33a2f 100644 --- a/dev-lang/php/php-5.4.44.ebuild +++ b/dev-lang/php/php-5.4.44.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/php/php-5.6.12.ebuild b/dev-lang/php/php-5.6.12.ebuild index daddbb47220b3..4b0e0f50a7d4c 100644 --- a/dev-lang/php/php-5.6.12.ebuild +++ b/dev-lang/php/php-5.6.12.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { From 1606f253239936c34333e3724072ad364bd8037f Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sun, 16 Aug 2015 08:35:50 +0200 Subject: [PATCH 011/169] dev-ruby/http: version bump Package-Manager: portage-2.2.20.1 --- dev-ruby/http/Manifest | 1 + dev-ruby/http/http-0.9.1.ebuild | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 dev-ruby/http/http-0.9.1.ebuild diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest index b192ee117a395..1bdac9be30992 100644 --- a/dev-ruby/http/Manifest +++ b/dev-ruby/http/Manifest @@ -1,3 +1,4 @@ DIST http-0.6.3.gem 67072 SHA256 bbefb6ab1255f2967437b0ea9b29058066c89b1e30448e3494ca3840432cb272 SHA512 e5fe784e833da30e5ef6bcdc43b45a04fcf03d827b8336853591c5ba67b5ccf45cc18849ec4a78f3a0526b05cc50da2a7aadd5ea211284fe73f8dddbe89c642b WHIRLPOOL e231732948a938310280ecdac254c98607a473d29e2ffbc9a36a9c0dc4144f5c54e8a52603581391eb6a5046e932d41817d57b516c8dcd4099c7fc8a2bcfe86f DIST http-0.8.12.gem 71168 SHA256 12a8a0f88f7edc70efe9c773dd6025ca70d9e1be24d18d37b2990be893d02713 SHA512 6e25b185092dec0f59f3bb6ee47817a3f53df4090fcb07cf163a39389732f3a13fde63c6eca93a3b0f3423640ea791585903a24a7339fe594a268c66aec3c51e WHIRLPOOL 83ca8abeb1f276832da544f3d15869576c2b14687e1db6b9026c3180a671f0598d1836e7f94f56e332f786dc36657344b63902663bcb85e98d534bbfdf7fd9a8 DIST http-0.9.0.gem 64000 SHA256 1c24039281a60d6f072748e733a0540be6764e5a31d1d29fb6f8db3e9b67fe1d SHA512 344cf1d1940f5b24d83f6d0e832584d3a3e1cbe89ba0bc8dabfc1262a5b1924e1ff225c72dd699abfd351f8ca16209048d77702d4e5f603bbd6ca5682c810a47 WHIRLPOOL 5980b7ef5e196784aa6bd87e26e66c0eb453e4100ba2b742f4792a6d5a73e0b15200f0b559c15eb344db76c11135eb1a0c6e84eedf28d8080e8ac20f7caba6b0 +DIST http-0.9.1.gem 64512 SHA256 549e27dcf9fece445ba785dfa108898b46f5d89b3db21afacc08e0ab193b04c2 SHA512 1f2ae51ad561b73e154379a5f941e64d166ad231a9da58d45218eb22c20396bf606ff70abdd11d3ebe5e95bfc5505ec304439f8cde286059eef6c9fe23a274b0 WHIRLPOOL ea197c6542871f45ea370f8ae5524947893fd90178c98ad8731603180c673c33ba8d072956a61d7802165960a9342a831b4f18e07abc9dc215bd2446538c7605 diff --git a/dev-ruby/http/http-0.9.1.ebuild b/dev-ruby/http/http-0.9.1.ebuild new file mode 100644 index 0000000000000..196ca48849930 --- /dev/null +++ b/dev-ruby/http/http-0.9.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby19 ruby20 ruby21" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md" + +inherit ruby-fakegem + +DESCRIPTION="An easy-to-use client library for making requests from Ruby" +HOMEPAGE="https://github.com/tarcieri/http" + +LICENSE="MIT" +SLOT="0.8" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="" + +ruby_add_rdepend " + >=dev-ruby/addressable-2.3 + >=dev-ruby/http-cookie-1.0 + >=dev-ruby/http-form_data-1.0.1:1.0 + >=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*" + +ruby_add_bdepend " + test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )" + +all_ruby_prepare() { + sed -i -e '/simplecov/,/end/ s:^:#:' \ + -e '1irequire "cgi"' spec/spec_helper.rb || die +} From 160aeae60ddc8960ab971d1f6dc6f0233e7d3f78 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sun, 16 Aug 2015 09:30:02 +0200 Subject: [PATCH 012/169] app-text/teseq: Initial commit. Package-Manager: portage-2.2.20.1 --- app-text/teseq/Manifest | 1 + app-text/teseq/metadata.xml | 7 +++++++ app-text/teseq/teseq-1.1.1.ebuild | 13 +++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 app-text/teseq/Manifest create mode 100644 app-text/teseq/metadata.xml create mode 100644 app-text/teseq/teseq-1.1.1.ebuild diff --git a/app-text/teseq/Manifest b/app-text/teseq/Manifest new file mode 100644 index 0000000000000..0d6c16fe9960d --- /dev/null +++ b/app-text/teseq/Manifest @@ -0,0 +1 @@ +DIST teseq-1.1.1.tar.xz 240256 SHA256 230d2b4a587542284c415b33557a27774f5ad1580ed9db272bcd1e2034ea0589 SHA512 c7747c734e640f7cc607389e001ab2cb9e368b504bd41406eea4dd7ba8bfead79659c68b148e33e797b843e9a46de38d104172303329b88e3fde0266aa1ffd7c WHIRLPOOL ad8eade357f9bbd6a53acc16d12b8088de4c9297604553edcfb10b9d920d479d92cb422c6c7160f13359b1e7934ec9a630215239d76bbc94118c8e2c3611ae4d diff --git a/app-text/teseq/metadata.xml b/app-text/teseq/metadata.xml new file mode 100644 index 0000000000000..3fcf9a077c2a2 --- /dev/null +++ b/app-text/teseq/metadata.xml @@ -0,0 +1,7 @@ + + + + +jer@gentoo.org + + diff --git a/app-text/teseq/teseq-1.1.1.ebuild b/app-text/teseq/teseq-1.1.1.ebuild new file mode 100644 index 0000000000000..03d5c94b1a051 --- /dev/null +++ b/app-text/teseq/teseq-1.1.1.ebuild @@ -0,0 +1,13 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +DESCRIPTION="a tool for analyzing files that contain control characters and terminal control sequences" +HOMEPAGE="http://www.gnu.org/software/teseq/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" From d1e2b8347c277c05486e0a530f70fb1cbedc137e Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sun, 16 Aug 2015 09:39:25 +0200 Subject: [PATCH 013/169] sys-boot/unetbootin: Set and use path to Qt4 executables (maybe bug #557142). Package-Manager: portage-2.2.20.1 --- sys-boot/unetbootin/unetbootin-619.ebuild | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys-boot/unetbootin/unetbootin-619.ebuild b/sys-boot/unetbootin/unetbootin-619.ebuild index 9fb9454c24ca1..8a9b604739072 100644 --- a/sys-boot/unetbootin/unetbootin-619.ebuild +++ b/sys-boot/unetbootin/unetbootin-619.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils qt4-r2 +inherit eutils qmake-utils qt4-r2 DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive" HOMEPAGE="https://github.com/unetbootin/unetbootin" @@ -62,8 +62,11 @@ src_prepare() { src_configure() { sed -i -e '/^RESOURCES/d' unetbootin.pro || die - lupdate ${PN}.pro || die - lrelease ${PN}.pro || die + + UNBN_QTPATH="$(qt4_get_bindir)/" + ${UNBN_QTPATH}lupdate ${PN}.pro || die + ${UNBN_QTPATH}lrelease ${PN}.pro || die + eqmake4 ${PN}.pro || die } From 2338803bdd18e0fb48909a832ba88ed3e19b6643 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sun, 16 Aug 2015 09:49:15 +0200 Subject: [PATCH 014/169] sys-apps/gentoo-functions: Stable for PPC64 (bug #556154). Package-Manager: portage-2.2.20.1 --- sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild index f8478e89df7aa..607ff11d49172 100644 --- a/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild +++ b/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="git://github.com/gentoo/${PN}.git" else SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" fi inherit toolchain-funcs flag-o-matic From fbf3297913183d19c8d1105d6408590d3bf54ded Mon Sep 17 00:00:00 2001 From: Heather Cynede Date: Sun, 16 Aug 2015 11:59:19 +0400 Subject: [PATCH 015/169] dev-lang/mono repair multilib-strict : Bug 554704 Package-Manager: portage-2.2.20.1 --- dev-lang/mono/mono-3.12.1.ebuild | 10 ++++++++++ dev-lang/mono/mono-4.0.3.20.ebuild | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/dev-lang/mono/mono-3.12.1.ebuild b/dev-lang/mono/mono-3.12.1.ebuild index 1952ade7f2f44..51416a4136ec2 100644 --- a/dev-lang/mono/mono-3.12.1.ebuild +++ b/dev-lang/mono/mono-3.12.1.ebuild @@ -115,3 +115,13 @@ src_test() { cd mcs/tests || die emake check } + +src_install() { + autotools-utils_src_install + + # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora + # mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html + # for reference. + rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die + rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die +} diff --git a/dev-lang/mono/mono-4.0.3.20.ebuild b/dev-lang/mono/mono-4.0.3.20.ebuild index 526b34b1b9c14..0884626d5a86b 100644 --- a/dev-lang/mono/mono-4.0.3.20.ebuild +++ b/dev-lang/mono/mono-4.0.3.20.ebuild @@ -104,3 +104,13 @@ src_test() { cd mcs/tests || die emake check } + +src_install() { + autotools-utils_src_install + + # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora + # mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html + # for reference. + rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die + rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die +} From 0c609a12e55e68a0edd1b4d1c201f5d07130376a Mon Sep 17 00:00:00 2001 From: Agostino Sarubbo Date: Sun, 16 Aug 2015 10:25:06 +0200 Subject: [PATCH 016/169] dev-java/commons-collections-3.2.1-r1: amd64 stable wrt bug #557902 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" --- .../commons-collections/commons-collections-3.2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild index b20947a640b51..d5ceab75b248c 100644 --- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild +++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="test-framework" CDEPEND=" From bb863e0c2778188a32466cdb03f2b52f78494cea Mon Sep 17 00:00:00 2001 From: Agostino Sarubbo Date: Sun, 16 Aug 2015 10:25:27 +0200 Subject: [PATCH 017/169] dev-java/commons-collections-3.2.1-r1: x86 stable wrt bug #557902 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="x86" --- .../commons-collections/commons-collections-3.2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild index d5ceab75b248c..bf46f001846c3 100644 --- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild +++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="test-framework" CDEPEND=" From 959a3425254ef9735cf7c2b0e073b62cbf1d22f6 Mon Sep 17 00:00:00 2001 From: Agostino Sarubbo Date: Sun, 16 Aug 2015 10:33:02 +0200 Subject: [PATCH 018/169] dev-java/slf4j-simple-1.7.7-r0: amd64 stable wrt bug #557470 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" --- dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild index f1a1b2410e34b..b7b5c6874490b 100644 --- a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild +++ b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-ext/}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" COMMON_DEP="dev-java/slf4j-api:0 From 6770c94743d16fd6297fec905770e0700a493d17 Mon Sep 17 00:00:00 2001 From: Agostino Sarubbo Date: Sun, 16 Aug 2015 10:33:06 +0200 Subject: [PATCH 019/169] dev-java/slf4j-simple-1.7.7-r0: amd64 stable wrt bug #557470 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" --- dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild index b7f975aef35ac..42287c0849c59 100644 --- a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild +++ b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-simple/}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="test" COMMON_DEP="dev-java/slf4j-api:0" From 724f4da03f72f43530ee186fba5960783bd0ec6f Mon Sep 17 00:00:00 2001 From: Agostino Sarubbo Date: Sun, 16 Aug 2015 10:33:30 +0200 Subject: [PATCH 020/169] dev-java/slf4j-simple-1.7.7-r0: x86 stable wrt bug #557470 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="x86" --- dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild index b7b5c6874490b..cc798166fb635 100644 --- a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild +++ b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-ext/}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" COMMON_DEP="dev-java/slf4j-api:0 From 403774dbff5e373323d3fc24ba582ecd58624243 Mon Sep 17 00:00:00 2001 From: Agostino Sarubbo Date: Sun, 16 Aug 2015 10:33:34 +0200 Subject: [PATCH 021/169] dev-java/slf4j-simple-1.7.7-r0: x86 stable wrt bug #557470 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="x86" --- dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild index 42287c0849c59..ffe05a9cd2caf 100644 --- a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild +++ b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-simple/}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" COMMON_DEP="dev-java/slf4j-api:0" From 87734d3141398e916521b33e6bb6f23c50cc1da5 Mon Sep 17 00:00:00 2001 From: Agostino Sarubbo Date: Sun, 16 Aug 2015 10:49:02 +0200 Subject: [PATCH 022/169] www-servers/resin-4.0.44-r0: amd64 stable wrt bug #431416 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" --- www-servers/resin/resin-4.0.44.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/resin/resin-4.0.44.ebuild b/www-servers/resin/resin-4.0.44.ebuild index 306e2ac29907f..4f1e0c64dfd73 100644 --- a/www-servers/resin/resin-4.0.44.ebuild +++ b/www-servers/resin/resin-4.0.44.ebuild @@ -16,7 +16,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="admin doc" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" CDEPEND="dev-java/resin-servlet-api:3.0 dev-java/jsr101:0 From cd8399cad313d3feb4451670f8a6d9975e0c9532 Mon Sep 17 00:00:00 2001 From: Agostino Sarubbo Date: Sun, 16 Aug 2015 10:49:27 +0200 Subject: [PATCH 023/169] www-servers/resin-4.0.44-r0: x86 stable wrt bug #431416 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="x86" --- www-servers/resin/resin-4.0.44.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/resin/resin-4.0.44.ebuild b/www-servers/resin/resin-4.0.44.ebuild index 4f1e0c64dfd73..4e356a237fe2c 100644 --- a/www-servers/resin/resin-4.0.44.ebuild +++ b/www-servers/resin/resin-4.0.44.ebuild @@ -16,7 +16,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="admin doc" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" CDEPEND="dev-java/resin-servlet-api:3.0 dev-java/jsr101:0 From 22f8c70f262bd5d8c3f6b0fc4fb69693728c6af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Sun, 16 Aug 2015 10:47:49 +0100 Subject: [PATCH 024/169] sys-kernel/dracut: Don't complain about missing sources Use /proc/config.gz if sources are not installed. Gentoo-Bug: 508652 Package-Manager: portage-2.2.20.1 --- sys-kernel/dracut/dracut-034-r4.ebuild | 2 +- sys-kernel/dracut/dracut-040-r3.ebuild | 2 +- sys-kernel/dracut/dracut-041-r3.ebuild | 2 +- sys-kernel/dracut/dracut-043-r1.ebuild | 2 +- sys-kernel/dracut/dracut-043.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-kernel/dracut/dracut-034-r4.ebuild b/sys-kernel/dracut/dracut-034-r4.ebuild index ea80f7f2d8275..041e7e6996237 100644 --- a/sys-kernel/dracut/dracut-034-r4.ebuild +++ b/sys-kernel/dracut/dracut-034-r4.ebuild @@ -284,7 +284,7 @@ src_install() { } pkg_postinst() { - if linux-info_get_any_version && linux_config_src_exists; then + if linux-info_get_any_version && linux_config_exists; then ewarn "" ewarn "If the following test report contains a missing kernel" ewarn "configuration option, you should reconfigure and rebuild your" diff --git a/sys-kernel/dracut/dracut-040-r3.ebuild b/sys-kernel/dracut/dracut-040-r3.ebuild index 0ab6bd89b9a92..8bf31be63b584 100644 --- a/sys-kernel/dracut/dracut-040-r3.ebuild +++ b/sys-kernel/dracut/dracut-040-r3.ebuild @@ -198,7 +198,7 @@ src_install() { } pkg_postinst() { - if linux-info_get_any_version && linux_config_src_exists; then + if linux-info_get_any_version && linux_config_exists; then ewarn "" ewarn "If the following test report contains a missing kernel" ewarn "configuration option, you should reconfigure and rebuild your" diff --git a/sys-kernel/dracut/dracut-041-r3.ebuild b/sys-kernel/dracut/dracut-041-r3.ebuild index a7318cbf1f8cf..d96e6477c089f 100644 --- a/sys-kernel/dracut/dracut-041-r3.ebuild +++ b/sys-kernel/dracut/dracut-041-r3.ebuild @@ -206,7 +206,7 @@ src_install() { } pkg_postinst() { - if linux-info_get_any_version && linux_config_src_exists; then + if linux-info_get_any_version && linux_config_exists; then ewarn "" ewarn "If the following test report contains a missing kernel" ewarn "configuration option, you should reconfigure and rebuild your" diff --git a/sys-kernel/dracut/dracut-043-r1.ebuild b/sys-kernel/dracut/dracut-043-r1.ebuild index e38d97c843dd4..6c16464232896 100644 --- a/sys-kernel/dracut/dracut-043-r1.ebuild +++ b/sys-kernel/dracut/dracut-043-r1.ebuild @@ -202,7 +202,7 @@ src_install() { } pkg_postinst() { - if linux-info_get_any_version && linux_config_src_exists; then + if linux-info_get_any_version && linux_config_exists; then ewarn "" ewarn "If the following test report contains a missing kernel" ewarn "configuration option, you should reconfigure and rebuild your" diff --git a/sys-kernel/dracut/dracut-043.ebuild b/sys-kernel/dracut/dracut-043.ebuild index 04eb96479f1e1..290055ae959a0 100644 --- a/sys-kernel/dracut/dracut-043.ebuild +++ b/sys-kernel/dracut/dracut-043.ebuild @@ -197,7 +197,7 @@ src_install() { } pkg_postinst() { - if linux-info_get_any_version && linux_config_src_exists; then + if linux-info_get_any_version && linux_config_exists; then ewarn "" ewarn "If the following test report contains a missing kernel" ewarn "configuration option, you should reconfigure and rebuild your" From 8c578d67d48c971ba1cc438e610b5158eb247d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Sun, 16 Aug 2015 10:58:26 +0100 Subject: [PATCH 025/169] sys-kernel/dracut: Add patches removing non-portable use of `echo -n` Gentoo-Bug: 554750 Package-Manager: portage-2.2.20.1 --- sys-kernel/dracut/dracut-043-r1.ebuild | 2 + ...place-echo-n-with-printf-in-code-wit.patch | 275 ++++++++++++++++++ ...ncheck-Look-for-echo-n-usage-in-modu.patch | 26 ++ 3 files changed, 303 insertions(+) create mode 100644 sys-kernel/dracut/files/043-0002-Replace-echo-n-with-printf-in-code-wit.patch create mode 100644 sys-kernel/dracut/files/043-0003-syncheck-Look-for-echo-n-usage-in-modu.patch diff --git a/sys-kernel/dracut/dracut-043-r1.ebuild b/sys-kernel/dracut/dracut-043-r1.ebuild index 6c16464232896..b713bea5b0181 100644 --- a/sys-kernel/dracut/dracut-043-r1.ebuild +++ b/sys-kernel/dracut/dracut-043-r1.ebuild @@ -50,6 +50,8 @@ DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules MY_LIBDIR=/usr/lib PATCHES=( "${FILESDIR}/${PV}-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch" + "${FILESDIR}/${PV}-0002-Replace-echo-n-with-printf-in-code-wit.patch" + "${FILESDIR}/${PV}-0003-syncheck-Look-for-echo-n-usage-in-modu.patch" ) QA_MULTILIB_PATHS=" usr/lib/dracut/dracut-install diff --git a/sys-kernel/dracut/files/043-0002-Replace-echo-n-with-printf-in-code-wit.patch b/sys-kernel/dracut/files/043-0002-Replace-echo-n-with-printf-in-code-wit.patch new file mode 100644 index 0000000000000..7f0e62732ae49 --- /dev/null +++ b/sys-kernel/dracut/files/043-0002-Replace-echo-n-with-printf-in-code-wit.patch @@ -0,0 +1,275 @@ +From 15f330fe1afe9ac8870461faad55b7d63e791aca Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Tue, 14 Jul 2015 22:22:14 -0400 +Subject: [PATCH 2/3] Replace echo -n with printf in code with a /bin/sh + shebang + +POSIX does not mandate that echo support the -n parameter. +printf has more well-defined behavior. +--- + modules.d/04watchdog/watchdog-stop.sh | 2 +- + modules.d/40network/net-lib.sh | 2 +- + modules.d/45ifcfg/write-ifcfg.sh | 2 +- + modules.d/90lvm/lvm_scan.sh | 4 ++-- + modules.d/95fcoe/fcoe-up.sh | 2 +- + modules.d/98usrmount/mount-usr.sh | 2 +- + modules.d/99base/dracut-lib.sh | 6 +++--- + modules.d/99base/init.sh | 2 +- + test/TEST-10-RAID/create-root.sh | 2 +- + test/TEST-10-RAID/cryptroot-ask.sh | 2 +- + test/TEST-12-RAID-DEG/create-root.sh | 2 +- + test/TEST-12-RAID-DEG/cryptroot-ask.sh | 2 +- + test/TEST-13-ENC-RAID-LVM/create-root.sh | 2 +- + test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh | 2 +- + test/TEST-14-IMSM/cryptroot-ask.sh | 2 +- + test/TEST-20-NFS/client-init.sh | 2 +- + test/TEST-40-NBD/create-root.sh | 2 +- + test/TEST-40-NBD/cryptroot-ask.sh | 2 +- + 18 files changed, 21 insertions(+), 21 deletions(-) + +diff --git a/modules.d/04watchdog/watchdog-stop.sh b/modules.d/04watchdog/watchdog-stop.sh +index 91d45d6..921f969 100755 +--- a/modules.d/04watchdog/watchdog-stop.sh ++++ b/modules.d/04watchdog/watchdog-stop.sh +@@ -1,2 +1,2 @@ + #!/bin/sh +-[ -c /dev/watchdog ] && echo -n 'V' > /dev/watchdog ++[ -c /dev/watchdog ] && printf 'V' > /dev/watchdog +diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh +index a09cdaf..6c739e8 100755 +--- a/modules.d/40network/net-lib.sh ++++ b/modules.d/40network/net-lib.sh +@@ -189,7 +189,7 @@ set_ifname() { + fix_bootif() { + local macaddr=${1} + local IFS='-' +- macaddr=$(for i in ${macaddr} ; do echo -n $i:; done) ++ macaddr=$(printf '%s:' ${macaddr}) + macaddr=${macaddr%:} + # strip hardware type field from pxelinux + [ -n "${macaddr%??:??:??:??:??:??}" ] && macaddr=${macaddr#??:} +diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh +index fa7db27..251d684 100755 +--- a/modules.d/45ifcfg/write-ifcfg.sh ++++ b/modules.d/45ifcfg/write-ifcfg.sh +@@ -48,7 +48,7 @@ print_s390() { + for i in /sys/class/net/$_netif/device/cdev[0-9]*; do + [ -e $i ] || continue + channel=$(readlink -f $i) +- echo -n "${channel##*/}," ++ printf '%s' "${channel##*/}," + done + }) + [ -n "$SUBCHANNELS" ] || return 1 +diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh +index 7495644..ead28aa 100755 +--- a/modules.d/90lvm/lvm_scan.sh ++++ b/modules.d/90lvm/lvm_scan.sh +@@ -15,14 +15,14 @@ SNAPSIZE=$(getargs rd.lvm.snapsize -d rd_LVM_SNAPSIZE=) + lvmdevs=$( + for f in /tmp/.lvm_scan-*; do + [ -e "$f" ] || continue +- echo -n "${f##/tmp/.lvm_scan-} " ++ printf '%s' "${f##/tmp/.lvm_scan-} " + done + ) + + if [ ! -e /etc/lvm/lvm.conf ]; then + { + echo 'devices {'; +- echo -n ' filter = [ ' ++ printf ' filter = [ ' + for dev in $lvmdevs; do + printf '"a|^/dev/%s$|", ' $dev; + done; +diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh +index 43a0ad5..950e4b6 100755 +--- a/modules.d/95fcoe/fcoe-up.sh ++++ b/modules.d/95fcoe/fcoe-up.sh +@@ -64,7 +64,7 @@ elif [ "$netdriver" = "bnx2x" ]; then + sleep 3 + fipvlan "$netif" -c -s + else +- echo -n "$netif" > /sys/module/fcoe/parameters/create ++ printf '%s' "$netif" > /sys/module/fcoe/parameters/create + fi + + need_shutdown +diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh +index c29610f..d1a629c 100755 +--- a/modules.d/98usrmount/mount-usr.sh ++++ b/modules.d/98usrmount/mount-usr.sh +@@ -12,7 +12,7 @@ filtersubvol() { + while [ $# -gt 0 ]; do + case $1 in + subvol\=*) :;; +- *) echo -n "${1}," ;; ++ *) printf '%s' "${1}," ;; + esac + shift + done +diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh +index 08110cc..7a3c58c 100755 +--- a/modules.d/99base/dracut-lib.sh ++++ b/modules.d/99base/dracut-lib.sh +@@ -298,7 +298,7 @@ _dogetargs() { + fi + done + if [ -n "$_found" ]; then +- [ $# -gt 0 ] && echo -n "$@" ++ [ $# -gt 0 ] && printf '%s' "$*" + return 0 + fi + return 1; +@@ -329,9 +329,9 @@ getargs() { + done + if [ -n "$_gfound" ]; then + if [ $# -gt 0 ]; then +- echo -n "$@" ++ printf '%s' "$*" + else +- echo -n 1 ++ printf 1 + fi + debug_on + return 0 +diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh +index f96dbb5..a59e8ea 100755 +--- a/modules.d/99base/init.sh ++++ b/modules.d/99base/init.sh +@@ -253,7 +253,7 @@ while :; do + done + + { +- echo -n "Mounted root filesystem " ++ printf "Mounted root filesystem " + while read dev mp rest || [ -n "$dev" ]; do [ "$mp" = "$NEWROOT" ] && echo $dev; done < /proc/mounts + } | vinfo + +diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh +index a7e56a5..7b5f2a7 100755 +--- a/test/TEST-10-RAID/create-root.sh ++++ b/test/TEST-10-RAID/create-root.sh +@@ -18,7 +18,7 @@ mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sda2 /d + # randomly. + mdadm -W /dev/md0 + set -e +-echo -n test >keyfile ++printf test >keyfile + cryptsetup -q luksFormat /dev/md0 /keyfile + echo "The passphrase is test" + cryptsetup luksOpen /dev/md0 dracut_crypt_test /keyfile ++printf test >/keyfile + /sbin/cryptsetup luksOpen "$1" "$2" keyfile ++printf test >keyfile + cryptsetup -q luksFormat /dev/md0 /keyfile + echo "The passphrase is test" + set -e +diff --git a/test/TEST-12-RAID-DEG/cryptroot-ask.sh b/test/TEST-12-RAID-DEG/cryptroot-ask.sh +index db27c5b..78ed7f5 100755 +--- a/test/TEST-12-RAID-DEG/cryptroot-ask.sh ++++ b/test/TEST-12-RAID-DEG/cryptroot-ask.sh +@@ -1,6 +1,6 @@ + #!/bin/sh + + [ -b /dev/mapper/$2 ] && exit 0 +-echo -n test >/keyfile ++printf test >/keyfile + /sbin/cryptsetup luksOpen $1 $2 keyfile ++printf test >keyfile + cryptsetup -q luksFormat /dev/sda2 /keyfile + cryptsetup -q luksFormat /dev/sda3 /keyfile + cryptsetup -q luksFormat /dev/sda4 /keyfile +diff --git a/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh b/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh +index db27c5b..78ed7f5 100755 +--- a/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh ++++ b/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh +@@ -1,6 +1,6 @@ + #!/bin/sh + + [ -b /dev/mapper/$2 ] && exit 0 +-echo -n test >/keyfile ++printf test >/keyfile + /sbin/cryptsetup luksOpen $1 $2 /keyfile ++printf test >/keyfile + /sbin/cryptsetup luksOpen $1 $2 /dev/watchdog ++ [ -c /dev/watchdog ] && printf 'V' > /dev/watchdog + strstr "$(setsid --help)" "control" && CTTY="-c" + setsid $CTTY sh -i + fi +diff --git a/test/TEST-40-NBD/create-root.sh b/test/TEST-40-NBD/create-root.sh +index 391279e..20d0eff 100755 +--- a/test/TEST-40-NBD/create-root.sh ++++ b/test/TEST-40-NBD/create-root.sh +@@ -5,7 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do + done + rm -f -- /etc/lvm/lvm.conf + udevadm control --reload +-echo -n test >keyfile ++printf test >keyfile + cryptsetup -q luksFormat /dev/sdb /keyfile + echo "The passphrase is test" + cryptsetup luksOpen /dev/sdb dracut_crypt_test /keyfile ++printf test >/keyfile + /sbin/cryptsetup luksOpen $1 $2 +Date: Tue, 14 Jul 2015 11:12:16 -0400 +Subject: [PATCH 3/3] syncheck: Look for 'echo -n' usage in modules + +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 0af5d0f..16c6d2a 100644 +--- a/Makefile ++++ b/Makefile +@@ -211,7 +211,8 @@ syncheck: + [ "$${i##*/}" = "module-setup.sh" ] && continue; \ + read line < "$$i"; [ "$${line#*bash*}" != "$$line" ] && continue; \ + [ $$V ] && echo "posix syntax check: $$i"; bash --posix -n "$$i" ; ret=$$(($$ret+$$?)); \ +- [ $$V ] && echo "checking for [[: $$i"; if grep -Fq '[[ ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains [["; fi \ ++ [ $$V ] && echo "checking for [[: $$i"; if grep -Fq '[[ ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains [["; fi; \ ++ [ $$V ] && echo "checking for echo -n: $$i"; if grep -Fq 'echo -n ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains echo -n"; fi \ + done;exit $$ret + @ret=0;for i in *.sh mkinitrd-dracut.sh modules.d/*/*.sh \ + modules.d/*/module-setup.sh; do \ +-- +2.5.0 + From a3872f3b4a4fd7f5d91cb12fc86b9d8c351c3e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Sun, 16 Aug 2015 11:02:44 +0100 Subject: [PATCH 026/169] sys-kernel/dracut: Bump revision to trigger user update Bump due to following change: Add patches removing non-portable use of `echo -n` Gentoo-Bug: 554750 Package-Manager: portage-2.2.20.1 --- sys-kernel/dracut/{dracut-043-r1.ebuild => dracut-043-r2.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sys-kernel/dracut/{dracut-043-r1.ebuild => dracut-043-r2.ebuild} (100%) diff --git a/sys-kernel/dracut/dracut-043-r1.ebuild b/sys-kernel/dracut/dracut-043-r2.ebuild similarity index 100% rename from sys-kernel/dracut/dracut-043-r1.ebuild rename to sys-kernel/dracut/dracut-043-r2.ebuild From 44c0fdcb5b821dc3f4a79bec8bae798ba3ccece1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Sun, 16 Aug 2015 11:04:11 +0100 Subject: [PATCH 027/169] sys-kernel/dracut: Remove old revision of 043 version Package-Manager: portage-2.2.20.1 --- sys-kernel/dracut/dracut-043.ebuild | 271 ---------------------------- 1 file changed, 271 deletions(-) delete mode 100644 sys-kernel/dracut/dracut-043.ebuild diff --git a/sys-kernel/dracut/dracut-043.ebuild b/sys-kernel/dracut/dracut-043.ebuild deleted file mode 100644 index 290055ae959a0..0000000000000 --- a/sys-kernel/dracut/dracut-043.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit bash-completion-r1 eutils linux-info multilib systemd - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="http://dracut.wiki.kernel.org" -SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug selinux systemd" - -RESTRICT="test" - -CDEPEND="virtual/udev - systemd? ( >=sys-apps/systemd-199 ) - " -RDEPEND="${CDEPEND} - app-arch/cpio - >=app-shells/bash-4.0 - >sys-apps/kmod-5[tools] - || ( - >=sys-apps/sysvinit-2.87-r3 - sys-apps/systemd[sysv-utils] - sys-apps/systemd-sysv-utils - ) - >=sys-apps/util-linux-2.21 - - debug? ( dev-util/strace ) - selinux? ( - sys-libs/libselinux - sys-libs/libsepol - sec-policy/selinux-dracut - ) - " -DEPEND="${CDEPEND} - app-text/asciidoc - >=dev-libs/libxslt-1.1.26 - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75.2 - virtual/pkgconfig - " - -DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO ) -MY_LIBDIR=/usr/lib -QA_MULTILIB_PATHS=" - usr/lib/dracut/dracut-install - usr/lib/dracut/skipcpio - " - -# -# Helper functions -# - -# Removes module from modules.d. -# $1 = module name -# Module name can be specified without number prefix. -rm_module() { - local force m - [[ $1 = -f ]] && force=-f - - for m in $@; do - if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then - rm ${force} --interactive=never -r "${modules_dir}"/$m - else - rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m - fi - done -} - -# Grabbed from net-misc/netctl ebuild. -optfeature() { - local desc=$1 - shift - while (( $# )); do - if has_version "$1"; then - elog " [I] $1 to ${desc}" - else - elog " [ ] $1 to ${desc}" - fi - shift - done -} - -# -# ebuild functions -# - -src_prepare() { - local libdirs="/$(get_libdir) /usr/$(get_libdir)" - if [[ ${SYMLINK_LIB} = yes ]]; then - # Preserve lib -> lib64 symlinks in initramfs - [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" - fi - einfo "Setting libdirs to \"${libdirs}\" ..." - sed -e "3alibdirs=\"${libdirs}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - - local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)" - einfo "Setting udevdir to ${udevdir}..." - sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - - if use systemd; then - local systemdutildir="$(systemd_get_utildir)" - local systemdsystemunitdir="$(systemd_get_unitdir)" - local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \ - --variable=systemdsystemconfdir)" - [[ ${systemdsystemconfdir} ]] \ - || systemdsystemconfdir=/etc/systemd/system - einfo "Setting systemdutildir to ${systemdutildir} and ..." - sed -e "5asystemdutildir=\"${systemdutildir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..." - sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..." - sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - else - local systemdutildir="/lib/systemd" - einfo "Setting systemdutildir for standalone udev to" \ - "${systemdutildir}..." - sed -e "5asystemdutildir=\"${systemdutildir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - fi - - epatch_user -} - -src_configure() { - local myconf="--libdir=${MY_LIBDIR}" - myconf+=" --bashcompletiondir=$(get_bashcompdir)" - - if use systemd; then - myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" - fi - - econf ${myconf} -} - -src_compile() { - tc-export CC - emake doc install/dracut-install skipcpio/skipcpio -} - -src_install() { - default - - local my_libdir="${MY_LIBDIR}" - local dracutlibdir="${my_libdir#/}/dracut" - - echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh" - - insinto "${dracutlibdir}/dracut.conf.d/" - newins dracut.conf.d/gentoo.conf.example gentoo.conf - - insinto /etc/logrotate.d - newins dracut.logrotate dracut - - dodir /var/lib/dracut/overlay - - dohtml dracut.html - - if ! use systemd; then - # Scripts in kernel/install.d are systemd-specific - rm -r "${D%/}/${my_libdir}/kernel" || die - fi - - # - # Modules - # - local module - modules_dir="${D%/}/${dracutlibdir}/modules.d" - - use debug || rm_module 95debug - use selinux || rm_module 98selinux - - if use systemd; then - # With systemd following modules do not make sense - rm_module 96securityfs 97masterkey 98integrity - else - rm_module 00systemd 98dracut-systemd - # Without systemd following modules do not make sense - rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd - fi - - # Remove modules which won't work for sure - rm_module 95fcoe # no tools - # fips module depends on masked app-crypt/hmaccalc - rm_module 01fips 02fips-aesni -} - -pkg_postinst() { - if linux-info_get_any_version && linux_config_exists; then - ewarn "" - ewarn "If the following test report contains a missing kernel" - ewarn "configuration option, you should reconfigure and rebuild your" - ewarn "kernel before booting image generated with this Dracut version." - ewarn "" - - local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" - - # Kernel configuration options descriptions: - local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" - local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ -"(initramfs/initrd) support" - - local opt desc - - # Generate ERROR_* variables for check_extra_config. - for opt in ${CONFIG_CHECK}; do - opt=${opt#\~} - desc=desc_${opt} - eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ - "is missing and REQUIRED'" - done - - check_extra_config - echo - else - ewarn "" - ewarn "Your kernel configuration couldn't be checked. Do you have" - ewarn "/usr/src/linux/.config file there? Please check manually if" - ewarn "following options are enabled:" - ewarn "" - ewarn " CONFIG_BLK_DEV_INITRD" - ewarn " CONFIG_DEVTMPFS" - ewarn "" - fi - - elog "To get additional features, a number of optional runtime" - elog "dependencies may be installed:" - elog "" - optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ - sys-apps/iproute2 - optfeature \ - "Measure performance of the boot process for later visualisation" \ - app-benchmarks/bootchart2 app-admin/killproc sys-process/acct - optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs - optfeature "Load kernel modules and drop this privilege for real init" \ - sys-libs/libcap - optfeature "Support CIFS" net-fs/cifs-utils - optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ - "sys-fs/cryptsetup[-static-libs]" - optfeature "Support for GPG-encrypted keys for crypt module" \ - app-crypt/gnupg - optfeature \ - "Allows use of dash instead of default bash (on your own risk)" \ - app-shells/dash - optfeature "Framebuffer splash (media-gfx/splashutils)" \ - media-gfx/splashutils - optfeature "Support iSCSI" sys-block/open-iscsi - optfeature "Support Logical Volume Manager" sys-fs/lvm2 - optfeature "Support MD devices, also known as software RAID devices" \ - sys-fs/mdadm - optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools - optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' - optfeature "Support network block devices" sys-block/nbd - optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind - optfeature \ - "Install ssh and scp along with config files and specified keys" \ - net-misc/openssh - optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ - app-admin/rsyslog -} From 47884f333e4fb48a9573247dcd87c63023e0e23f Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 12:28:17 +0200 Subject: [PATCH 028/169] dev-util/cmake: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-util/cmake/cmake-2.8.12.2-r1.ebuild | 4 ++-- dev-util/cmake/cmake-2.8.12.2-r2.ebuild | 4 ++-- dev-util/cmake/cmake-2.8.12.2.ebuild | 4 ++-- dev-util/cmake/cmake-3.0.2.ebuild | 4 ++-- dev-util/cmake/cmake-3.1.0.ebuild | 2 +- dev-util/cmake/cmake-3.2.2.ebuild | 2 +- dev-util/cmake/cmake-3.2.3.ebuild | 2 +- dev-util/cmake/cmake-3.3.0.ebuild | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild index 2f39846637c8f..ebf1807e66de7 100644 --- a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild +++ b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -27,7 +27,7 @@ DEPEND=" >=net-misc/curl-7.20.0-r1[ssl] sys-libs/zlib virtual/pkgconfig - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 diff --git a/dev-util/cmake/cmake-2.8.12.2-r2.ebuild b/dev-util/cmake/cmake-2.8.12.2-r2.ebuild index d007dfcdece7c..8e030d800e852 100644 --- a/dev-util/cmake/cmake-2.8.12.2-r2.ebuild +++ b/dev-util/cmake/cmake-2.8.12.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -27,7 +27,7 @@ DEPEND=" >=net-misc/curl-7.20.0-r1[ssl] sys-libs/zlib virtual/pkgconfig - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 diff --git a/dev-util/cmake/cmake-2.8.12.2.ebuild b/dev-util/cmake/cmake-2.8.12.2.ebuild index 3d2fbc8cb9158..216354edc5262 100644 --- a/dev-util/cmake/cmake-2.8.12.2.ebuild +++ b/dev-util/cmake/cmake-2.8.12.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -27,7 +27,7 @@ DEPEND=" >=net-misc/curl-7.20.0-r1[ssl] sys-libs/zlib virtual/pkgconfig - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 diff --git a/dev-util/cmake/cmake-3.0.2.ebuild b/dev-util/cmake/cmake-3.0.2.ebuild index 1be9eef7c6d56..452c9b35690cf 100644 --- a/dev-util/cmake/cmake-3.0.2.ebuild +++ b/dev-util/cmake/cmake-3.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -25,7 +25,7 @@ RDEPEND=" sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 diff --git a/dev-util/cmake/cmake-3.1.0.ebuild b/dev-util/cmake/cmake-3.1.0.ebuild index cc8f10cc58d2c..33404269332d9 100644 --- a/dev-util/cmake/cmake-3.1.0.ebuild +++ b/dev-util/cmake/cmake-3.1.0.ebuild @@ -25,7 +25,7 @@ RDEPEND=" sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 diff --git a/dev-util/cmake/cmake-3.2.2.ebuild b/dev-util/cmake/cmake-3.2.2.ebuild index 86cfeacdd5090..a111fa9171feb 100644 --- a/dev-util/cmake/cmake-3.2.2.ebuild +++ b/dev-util/cmake/cmake-3.2.2.ebuild @@ -23,7 +23,7 @@ RDEPEND=" sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 diff --git a/dev-util/cmake/cmake-3.2.3.ebuild b/dev-util/cmake/cmake-3.2.3.ebuild index 417c192bad224..2c4cfa446ebca 100644 --- a/dev-util/cmake/cmake-3.2.3.ebuild +++ b/dev-util/cmake/cmake-3.2.3.ebuild @@ -23,7 +23,7 @@ RDEPEND=" sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 diff --git a/dev-util/cmake/cmake-3.3.0.ebuild b/dev-util/cmake/cmake-3.3.0.ebuild index 86d3335e0731c..35fc5cb2aaefe 100644 --- a/dev-util/cmake/cmake-3.3.0.ebuild +++ b/dev-util/cmake/cmake-3.3.0.ebuild @@ -25,7 +25,7 @@ RDEPEND=" sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 From a7da091a582a9f6a18b24be11a5d931b610a5e02 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 12:31:17 +0200 Subject: [PATCH 029/169] sys-process/htop: Use slot operators for ncurses; drop old Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sys-process/htop/Manifest | 1 - sys-process/htop/htop-1.0.2-r2.ebuild | 81 --------------------------- sys-process/htop/htop-1.0.2.ebuild | 58 ------------------- sys-process/htop/htop-1.0.3.ebuild | 2 +- 4 files changed, 1 insertion(+), 141 deletions(-) delete mode 100644 sys-process/htop/htop-1.0.2-r2.ebuild delete mode 100644 sys-process/htop/htop-1.0.2.ebuild diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest index ce3f8d98bd556..c8d23ca124b38 100644 --- a/sys-process/htop/Manifest +++ b/sys-process/htop/Manifest @@ -1,2 +1 @@ -DIST htop-1.0.2.tar.gz 388499 SHA256 ee60657b044ece0df096c053060df7abf3cce3a568ab34d260049e6a37ccd8a1 SHA512 50ae0e8ace862520c01a707b3cf9a19591dc1081f6fc38c7fdccc81e36dd94b3cbe9db00cbb90f782c22d9b73f22526e24d04fad8368c6f2a7de0c58f9d92191 WHIRLPOOL 2766cfe1ea9c98d23c375e5a1c293c6d573d33cf7132e9aaa6ad0335a5f62976a8b8a8da6ede2f03bbadb31ac62e9d7ba5b35138a262dda73eb033afdf27b570 DIST htop-1.0.3.tar.gz 399306 SHA256 055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829 SHA512 4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232 WHIRLPOOL 14b8879210025aff9a1e098314a1b35d2bb6fcfaab42b95670e3726c61d471b1618486e6fc3dbbc97043e85f9a22196d97e676f3b2dd98250326be8527bdebbe diff --git a/sys-process/htop/htop-1.0.2-r2.ebuild b/sys-process/htop/htop-1.0.2-r2.ebuild deleted file mode 100644 index 3ad83786ea320..0000000000000 --- a/sys-process/htop/htop-1.0.2-r2.ebuild +++ /dev/null @@ -1,81 +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 ) - -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils linux-info python-any-r1 - -DESCRIPTION="interactive process viewer" -HOMEPAGE="http://htop.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver" - -RDEPEND="sys-libs/ncurses[unicode?]" -DEPEND="${RDEPEND}" - -DOCS=( ChangeLog README ) - -CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" - -# config.h problems -AUTOTOOLS_IN_SOURCE_BUILD=1 - -pkg_setup() { - if use kernel_FreeBSD && ! [[ -f ${ROOT}/compat/linux/proc/stat && -f ${ROOT}/compat/linux/proc/meminfo ]]; then - echo - eerror "htop requires linprocfs mounted at /compat/linux/proc to build and function." - eerror "To mount it, type:" - [ -d /compat/linux/proc ] || eerror "mkdir -p /compat/linux/proc" - eerror "mount -t linprocfs none /compat/linux/proc" - eerror "Alternatively, place this information into /etc/fstab" - echo - die "htop needs /compat/linux/proc mounted" - fi - - if ! has_version sys-process/lsof; then - ewarn "To use lsof features in htop(what processes are accessing" - ewarn "what files), you must have sys-process/lsof installed." - fi - python-any-r1_pkg_setup - linux-info_pkg_setup -} - -PATCHES=( - "${FILESDIR}"/${P}-tinfo.patch - "${FILESDIR}"/${P}-process.patch - "${FILESDIR}"/${P}-out-of-src.patch -) - -src_prepare() { - rm missing || die - sed \ - -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \ - -i scripts/MakeHeader.py || die - autotools-utils_src_prepare -} - -src_configure() { - [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 - - local myeconfargs=() - - use kernel_FreeBSD && myeconfargs+=( --with-proc=/compat/linux/proc ) - - myeconfargs+=( - $(use_enable openvz) - $(use_enable kernel_linux cgroup) - $(use_enable vserver) - $(use_enable unicode) - --enable-taskstats - ) - autotools-utils_src_configure -} diff --git a/sys-process/htop/htop-1.0.2.ebuild b/sys-process/htop/htop-1.0.2.ebuild deleted file mode 100644 index 28e1a571d4a80..0000000000000 --- a/sys-process/htop/htop-1.0.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -DESCRIPTION="interactive process viewer" -HOMEPAGE="http://htop.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver" - -RDEPEND="sys-libs/ncurses[unicode?]" -DEPEND="${RDEPEND}" - -DOCS=( ChangeLog README ) - -pkg_setup() { - if use kernel_FreeBSD && ! [[ -f ${ROOT}/compat/linux/proc/stat && -f ${ROOT}/compat/linux/proc/meminfo ]]; then - echo - eerror "htop requires linprocfs mounted at /compat/linux/proc to build and function." - eerror "To mount it, type:" - [ -d /compat/linux/proc ] || eerror "mkdir -p /compat/linux/proc" - eerror "mount -t linprocfs none /compat/linux/proc" - eerror "Alternatively, place this information into /etc/fstab" - echo - die "htop needs /compat/linux/proc mounted" - fi - - if ! has_version sys-process/lsof; then - ewarn "To use lsof features in htop(what processes are accessing" - ewarn "what files), you must have sys-process/lsof installed." - fi -} - -src_prepare() { - sed -i -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \ - scripts/MakeHeader.py || die -} - -src_configure() { - [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 - - local myconf='' - - use kernel_FreeBSD && myconf="${myconf} --with-proc=/compat/linux/proc" - - econf \ - $(use_enable openvz) \ - $(use_enable kernel_linux cgroup) \ - $(use_enable vserver) \ - $(use_enable unicode) \ - --enable-taskstats \ - ${myconf} -} diff --git a/sys-process/htop/htop-1.0.3.ebuild b/sys-process/htop/htop-1.0.3.ebuild index a0b4ab8a38913..6a433f5340d4a 100644 --- a/sys-process/htop/htop-1.0.3.ebuild +++ b/sys-process/htop/htop-1.0.3.ebuild @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="kernel_FreeBSD kernel_linux oom openvz unicode vserver" -RDEPEND="sys-libs/ncurses[unicode?]" +RDEPEND="sys-libs/ncurses:5=[unicode?]" DEPEND="${RDEPEND} ${PYTHON_DEPS} virtual/pkgconfig" From 01f96bde83ab52f47cea0c0f9641e0528b87522e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Sun, 16 Aug 2015 11:33:59 +0100 Subject: [PATCH 030/169] sys-kernel/dracut: Add patch fixing dracut-initramfs-restore Patch makes mount error nonfatal in dracut-initramfs-restore. Commit on behalf of Alexander Tsoy . Gentoo-Bug: 533084 Package-Manager: portage-2.2.20.1 --- sys-kernel/dracut/dracut-043-r2.ebuild | 1 + ...acut-initramfs-restore-make-mount-er.patch | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 sys-kernel/dracut/files/043-0004-dracut-initramfs-restore-make-mount-er.patch diff --git a/sys-kernel/dracut/dracut-043-r2.ebuild b/sys-kernel/dracut/dracut-043-r2.ebuild index b713bea5b0181..017bc207137eb 100644 --- a/sys-kernel/dracut/dracut-043-r2.ebuild +++ b/sys-kernel/dracut/dracut-043-r2.ebuild @@ -52,6 +52,7 @@ PATCHES=( "${FILESDIR}/${PV}-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch" "${FILESDIR}/${PV}-0002-Replace-echo-n-with-printf-in-code-wit.patch" "${FILESDIR}/${PV}-0003-syncheck-Look-for-echo-n-usage-in-modu.patch" + "${FILESDIR}/${PV}-0004-dracut-initramfs-restore-make-mount-er.patch" ) QA_MULTILIB_PATHS=" usr/lib/dracut/dracut-install diff --git a/sys-kernel/dracut/files/043-0004-dracut-initramfs-restore-make-mount-er.patch b/sys-kernel/dracut/files/043-0004-dracut-initramfs-restore-make-mount-er.patch new file mode 100644 index 0000000000000..23e30e1f70508 --- /dev/null +++ b/sys-kernel/dracut/files/043-0004-dracut-initramfs-restore-make-mount-er.patch @@ -0,0 +1,28 @@ +From a18c8fdc9cb3eb917e9a7a30466839c33131cc8a Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Tue, 28 Jul 2015 14:55:59 +0300 +Subject: [PATCH 4/4] dracut-initramfs-restore: make mount error nonfatal + +Script enables errexit option (set -e). So if /boot is not a mount point +or is already mounted, then script dies after unsuccessful mount +command. Fix this by always returning successful result. +--- + dracut-initramfs-restore.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh +index 0e6a1a8..0c41a59 100644 +--- a/dracut-initramfs-restore.sh ++++ b/dracut-initramfs-restore.sh +@@ -14,7 +14,7 @@ SKIP="$dracutbasedir/skipcpio" + + [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id + +-mount -o ro /boot &>/dev/null ++mount -o ro /boot &>/dev/null || true + + if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then + IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" +-- +2.5.0 + From 65afe5fc850ac9568cbc89fa4efe66d78130ab1f Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sun, 16 Aug 2015 12:49:05 +0200 Subject: [PATCH 031/169] sys-kernel/vanilla-sources: Fix ebuild file name suffix Thanks-to: Joakim Tjernlund Package-Manager: portage-2.2.20.1 --- sys-kernel/vanilla-sources/Manifest | 4 ++++ ...vanilla-sources-3.14.50 => vanilla-sources-3.14.50.ebuild} | 0 2 files changed, 4 insertions(+) rename sys-kernel/vanilla-sources/{vanilla-sources-3.14.50 => vanilla-sources-3.14.50.ebuild} (100%) diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest index 6ad1736e958bb..fa24c73f0db6d 100644 --- a/sys-kernel/vanilla-sources/Manifest +++ b/sys-kernel/vanilla-sources/Manifest @@ -1,5 +1,6 @@ DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9 DIST deblob-3.12 120320 SHA256 1d767acd3f461bcaa7ebef744dce1ca3eefde1cd41fde4c69a449e2470ab8c0e SHA512 61073cb763e3e0c21a84c0ee888087fbbf37b667ce0efbbc6c2ebc46ccae8460553511e347cf23d3c3603eec64df738ad4552a1b527453c7d795b8f90c4cf678 WHIRLPOOL c64cc566944ac241149a2a517da069185830be5b8ee25168b2b6b942bcf24fe3f2c0fe487b51a5b7e73e2910af2cabd7167cd1497ab7272c865d1eb3e68e4efe +DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831 DIST deblob-3.2 107195 SHA256 2e8a59bf7f18425652050a1b9f2fe2e8d1f09b50b33ee633771ac03943345e81 SHA512 8de24b5dade9256caf20215692f2e53e403f99d3d1e81b301263ae5f8ce667780a1df7917094155fb47210f22e7839e3d08e4f3a84c86ae6bf582227b938229d WHIRLPOOL f7abda0702c9b038ee82b462d1de30bd21b28d591058f417aa399581e93ba35638f476544e6acfb12760d672dab067916e4c68275c91f4c01d3bef7f685ed67b DIST deblob-3.4 108298 SHA256 b005dd372b8e55b19fc583fd99a3e95e44844b56305fdff7fdbd5f924a6c0308 SHA512 ce3df3c4850f0da821286acfa1b6c94e16350578f76a4df93284d2fe201dd78ce15dfb5c56727d8f90012062db180d5e9ee81ac3372f5b46e0deabdcfc03ca19 WHIRLPOOL 79386c1e04ca84709fce6ec4ea5eb308876d86f04a1b28f1eda4653d4917b3b9aa9b8a6b82605da3456d29e800dd5bbfcb27c124f1a01057d25b18871bc8770d @@ -7,6 +8,7 @@ DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e DIST deblob-check-3.10 612122 SHA256 5a9552abac85cab9715a958785a3f901937fa135d85452647a16398181909c12 SHA512 c52917e9de8211f66a1e6805282dd727f1ec86701f76cbf16d0909ec212a9429c0994e0993db95b57934b17d9d91b08b4fa29f80c501397a5acce84bf4e1aed9 WHIRLPOOL d1c591fe7e229f9638945dd14f7dd16617ecff224b4cf2a6a3dd58913c23f7eb67496c26235d1d4637607bc9c9d260d990a0935b6b5bf2332f15e8ed58269856 DIST deblob-check-3.12 612300 SHA256 f29e34b141113ef9f71bf963b0e09bfe64e46db485ae1174bd212fed45a82ed3 SHA512 5835725eecbb9c23740e80bf5a6bb826bf49244e8a90b82ba3e2eaabeb8199aaceb1b63b8615f9e4770d846a5218eddcd091e7ec4568f74f963eb177051e8da5 WHIRLPOOL 615b95b11a9c9514c94a064e6b5019d36faae384c55ba30da1014ce3676731042939331074ccb3e7136458d54f3a5ad1f88aeb8ea45fb6310734c9f455ddb750 +DIST deblob-check-3.14 613905 SHA256 4c69ea1c225b1a84c41e75392dcaa94f77dd8e647aff3afe52f1ab16ac99c5e5 SHA512 4dd7e785727ce29d78f5f68431fcb6ea9dfda5221dc8e699f40d13e3c85411707b13c288d23f8baa6b3c47f5a67ac58da0a7f1a51c4d9fdda82a7428ead88cf4 WHIRLPOOL de1b67955662f072193f58b7e7dbd98c6680958c2d65632bfb831dc0681945a4d1c27abe978e6ee687ae8f48773eb71c2f9026f461377b28235e7f7e39832a67 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c DIST deblob-check-3.2 557345 SHA256 60d05db20e7b50919ca44487d05e8faa9cca830318bd8d96625f0f75b252eeed SHA512 6b857380d495261c4d356639157f99f3ca3412388fd3b1c72b566c3bb6453c5a22ab7716e3b24e64a9b63dab912b07baccccfd0fca806ac0e0620efeef777b6a WHIRLPOOL 877c2c9b813466f9aa5cfecdc9ab93247bd2cdead457c9e0bd97da49d042d0a52262f9b4f8e9c83e397b57c5bb5a8fe2b61bb5f44d5a178a579cc9fff990941a DIST deblob-check-3.4 612122 SHA256 5a9552abac85cab9715a958785a3f901937fa135d85452647a16398181909c12 SHA512 c52917e9de8211f66a1e6805282dd727f1ec86701f76cbf16d0909ec212a9429c0994e0993db95b57934b17d9d91b08b4fa29f80c501397a5acce84bf4e1aed9 WHIRLPOOL d1c591fe7e229f9638945dd14f7dd16617ecff224b4cf2a6a3dd58913c23f7eb67496c26235d1d4637607bc9c9d260d990a0935b6b5bf2332f15e8ed58269856 @@ -14,6 +16,7 @@ DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebe DIST deblob-check-4.1 674781 SHA256 54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33 WHIRLPOOL d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417 +DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6 DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17 DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 SHA512 1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c WHIRLPOOL a36e62fe197ba7c08d498a79034da58091a94348f69542241067c9ebef683f86371b2c0a3b3fb6c4611e2fb885d9b74eee5c1f46a493c72dfb76c5665f0b8a6a @@ -21,6 +24,7 @@ DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8 DIST patch-3.10.86.xz 1158056 SHA256 330c1176511d0fbd16ec68732c14183216d1aa422dc896d63bc9545b5abcd3cb SHA512 5343a066d55d0aa1408d45393fadd97f4372fe02e15dd25c22238de62ebac47a870fd04b11801393cbd65f8da987f3b832ea8ce6af907fe72305df232ad4eb6d WHIRLPOOL a79c9ca743c6501fd8b87b8bd16ae2d4d6e712530f9034e99f30356c947fbf54e68b948bdc37aa06e314dae46cd9e9d5c87c547efdc2d81b5130599304c9b3ac DIST patch-3.12.46.xz 1313524 SHA256 cc052c3c1bf2442f22396f0658b7b8a078402859416cbf5a16eb8d40bc9416aa SHA512 7173b508d173fa389b06362fe823b6f22bf3a43245dec735c36b9a9cbb9ee4dbb9fda5b3cceba06f3464e31fb4af2fcd3f543969f4ce3a9170b55270283781b6 WHIRLPOOL a56cc8a8f05ff210cd7dbe903d40cdfcd26960c00efea323d2ef08690940914ecdbc0d50835a4409670615fc01947687fffdd2d2f68309ad3f9095d714882894 +DIST patch-3.14.50.xz 963716 SHA256 12b938ea1f10aa8f8d34833fd2464abde33a7f9eae5a71dad60a50358e9fcca0 SHA512 aa0adfb5e96847944565a9afeebd17305d41a04ada246bc5451fc92575a00a170147b55c610a084472e9f58a1daf272127162f8f341c45158fd7afc7295a3f73 WHIRLPOOL 22bf2570b9e72eb7f2f5f56196171f4d8ba0daa6cea03b3bbd67844bab9f1c4240f7a18292b86857ca56770f31425c8b32ca0ff2fe77eda7f1a53de1fceafb38 DIST patch-3.18.19.xz 566864 SHA256 27764fcbefea9e1a83a2f31c55c1baf8bb580634fdce243c4a386850d2724c37 SHA512 32cc7e9db5e4b607160670b83bf03ef1d850a49c77a45f183543e1c3674bb3e1337480d139959636624c739f97cca9f9f3e16d282dab2151926e50378a1c96c7 WHIRLPOOL 48d79ba1828ce2875af271b1d6891047ee9cc451f95e4e4f304d31578130d9f6b71eb49d94a375ba07e35ceafe36b4d0d528adde0b54c8684021e3bb2b15dbd3 DIST patch-3.2.70.xz 1438832 SHA256 f19128239756e2ff3cee9e3176f3c4f779ae888d71507a9fded4972228ccb669 SHA512 974f9ea5fa2a4419ee7452846270b04a4be870cb24e3391ac6e2d84366f33e3b9dde5b8cf4cea038075264446e4e3f5778da690ecd43f46efd30187d6fc48bfa WHIRLPOOL 95d891007753cb1f0b9176183cf75a7ea21f56773a52354c8662c6b418d2ec42b43cef6af6043abd2f31f413c9f3761cf8daa7f80af506cd9c2788611636098c DIST patch-3.4.108.xz 1249808 SHA256 7909601dd0cab76e933c86fc76bdd64520ff34abb126059f9c02fb4cf2050372 SHA512 50091f2db3cf60d3fe3a0619f9ca72c29ce20f1accbee745849da9d2c0f0de1dd0fb6ba3511356d6d70ab0cbf7e740e16ae45c7dc9311b06a5539684dbac5f94 WHIRLPOOL 3e7341a42f71cceeaec7b19b0558017d66bf7f0c115d8bd47c6cfdc646b319d59c4fb176704c43fe945c72ecb1c052eb8a6dab9c9e99f6c615ee17f6caeda7ac diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.14.50 b/sys-kernel/vanilla-sources/vanilla-sources-3.14.50.ebuild similarity index 100% rename from sys-kernel/vanilla-sources/vanilla-sources-3.14.50 rename to sys-kernel/vanilla-sources/vanilla-sources-3.14.50.ebuild From 120f8eac682043a549a11cc498e8c0be35ada654 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 16 Aug 2015 12:43:56 +0200 Subject: [PATCH 032/169] x11-misc/devilspie2: fix Manifest issue Gentoo-Bug: 557892 --- x11-misc/devilspie2/Manifest | 2 +- x11-misc/devilspie2/devilspie2-0.39.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest index 199f2ef436b05..f79a5d966421e 100644 --- a/x11-misc/devilspie2/Manifest +++ b/x11-misc/devilspie2/Manifest @@ -1,3 +1,3 @@ -DIST devilspie2-0.39.tar.gz 45042 SHA256 95d7ca93c66ef511bdd2ea5d301a2e84b5a8175a5a89f4d29859c8a84ed7801c SHA512 4f84ddc6efe6a73290bc9f069790abc80b8377e66919a424d18e8814b9dd6293e87358cc6856a470aaa60454e89ae8bd57ee7356efaaffd09b027873ea25df3c WHIRLPOOL 024d79263527c2b25df26b49e75bd615ebda4bb7f730d107c3209f374b450c2c21072e3a0c63d2de54c1c3363fe26d2c9250a8cb0ffda61d0136ebcffa6d5482 DIST devilspie2_0.36-src.tar.gz 44818 SHA256 7d0c2982d65f4dfc9d64f29f72252cce3354231938bc79da8034edfb3394ae11 SHA512 5ab755e7b2f12c0d6304a7ce4a25c95f1cb5d11eec42da0902239e37e2f637663706a21b2d69643f423b8fd597761283fc7a0efc8c201e1f07e503a2057fefd6 WHIRLPOOL 2a6aac66c8fe9e5a0eb8099eca835bc1a7382627e662fdbd70f598a4ead478ca9d8a8510a6ce353f2a186ac94f71a5df67375dd91a3dbd4c9cc001854d1cc6fa DIST devilspie2_0.37-src.tar.gz 44722 SHA256 463db05b85723f571e16034b3c9281bdcc3a2cffcaa2cf056580575ee8a421b6 SHA512 1eaf7d6a5074179d1a3b356ed25e0243bb177e8d408797a8efe230ae1b737d18f52442a69f92a3f47cece2d91c70b4c7d9cb378183eb353f0e163ac772f9478e WHIRLPOOL a58c6137415108c10e603e4c095309038801b2a82dfa0ea1befd8a03b62d341fdf3015314df0ebb0f81f43b481c3661b6904ef28a1899bd52aeb98922dcd509a +DIST devilspie2_0.39-src.tar.gz 45341 SHA256 07b74ffc078e5f01525d9da7a1978b4c1a9725b814b344f83a1a203cf4caae09 SHA512 3389351296df8398a18e7cadf46d8fb7c3817939b0e0348410c8623fde89132dfda7ebe516092de6bc1ae10e9204e66dc44eca8953a3533fd4fbc518184f07cb WHIRLPOOL a5b9c3b1272dbf183c22adb373689321cba3d59495e4c7590859a2750d9465241a7044bd38dbc0a3ff11c4fee9fa56392f469f03b6124c677ce31e1145504f7a diff --git a/x11-misc/devilspie2/devilspie2-0.39.ebuild b/x11-misc/devilspie2/devilspie2-0.39.ebuild index eddb4cc689b66..5e53f9e95e421 100644 --- a/x11-misc/devilspie2/devilspie2-0.39.ebuild +++ b/x11-misc/devilspie2/devilspie2-0.39.ebuild @@ -10,7 +10,7 @@ inherit flag-o-matic toolchain-funcs l10n DESCRIPTION="Devilspie like window matching utility, using LUA for scripting" HOMEPAGE="http://devilspie2.gusnan.se" -SRC_URI="http://git.savannah.gnu.org/cgit/devilspie2.git/snapshot/devilspie2-${PV}.tar.gz" +SRC_URI="http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${PV}-src.tar.gz" LICENSE="GPL-3" SLOT="0" From 9a5101604338b01f66be49c453a6becfb626466d Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 12:40:54 +0200 Subject: [PATCH 033/169] app-text/multitail: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- app-text/multitail/multitail-6.2.1.ebuild | 2 +- app-text/multitail/multitail-6.3.ebuild | 2 +- app-text/multitail/multitail-6.4.1.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-text/multitail/multitail-6.2.1.ebuild b/app-text/multitail/multitail-6.2.1.ebuild index ccaa4841a5c9e..a118a21811407 100644 --- a/app-text/multitail/multitail-6.2.1.ebuild +++ b/app-text/multitail/multitail-6.2.1.ebuild @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="amd64 hppa ia64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux" IUSE="debug examples unicode" -RDEPEND="sys-libs/ncurses[unicode?]" +RDEPEND="sys-libs/ncurses:5=[unicode?]" DEPEND="${RDEPEND} virtual/pkgconfig" RESTRICT="test" # bug #492270 diff --git a/app-text/multitail/multitail-6.3.ebuild b/app-text/multitail/multitail-6.3.ebuild index 067f08d8eb2ab..344aba9630fb1 100644 --- a/app-text/multitail/multitail-6.3.ebuild +++ b/app-text/multitail/multitail-6.3.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-lin IUSE="debug examples unicode" RDEPEND=" - sys-libs/ncurses[unicode?] + sys-libs/ncurses:5=[unicode?] " DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/app-text/multitail/multitail-6.4.1.ebuild b/app-text/multitail/multitail-6.4.1.ebuild index 89a0195d90abf..055eb6eab437a 100644 --- a/app-text/multitail/multitail-6.4.1.ebuild +++ b/app-text/multitail/multitail-6.4.1.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-lin IUSE="debug examples unicode" RDEPEND=" - sys-libs/ncurses[unicode?] + sys-libs/ncurses:5=[unicode?] " DEPEND=" ${RDEPEND} From 7a64c6f9d000a57039bf0c01683d6e19d8f5a1fb Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 12:43:27 +0200 Subject: [PATCH 034/169] dev-libs/libcdio: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-libs/libcdio/libcdio-0.92.ebuild | 4 ++-- dev-libs/libcdio/libcdio-0.93.ebuild | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-libs/libcdio/libcdio-0.92.ebuild b/dev-libs/libcdio/libcdio-0.92.ebuild index 50759e092a141..f7222b126a9b8 100644 --- a/dev-libs/libcdio/libcdio-0.92.ebuild +++ b/dev-libs/libcdio/libcdio-0.92.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,7 +16,7 @@ IUSE="cddb +cxx minimal static-libs test" RDEPEND=" !minimal? ( - >=sys-libs/ncurses-5.7-r7 + >=sys-libs/ncurses-5.7-r7:5= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] diff --git a/dev-libs/libcdio/libcdio-0.93.ebuild b/dev-libs/libcdio/libcdio-0.93.ebuild index 35b586fe85d80..a06f0f1315148 100644 --- a/dev-libs/libcdio/libcdio-0.93.ebuild +++ b/dev-libs/libcdio/libcdio-0.93.ebuild @@ -16,7 +16,7 @@ IUSE="cddb +cxx minimal static-libs test" RDEPEND=" !minimal? ( - >=sys-libs/ncurses-5.7-r7 + >=sys-libs/ncurses-5.7-r7:5= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] From 967c20425123a7a999685b87d264a9dee008482f Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 12:44:50 +0200 Subject: [PATCH 035/169] sys-process/ftop: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sys-process/ftop/ftop-1.0.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-process/ftop/ftop-1.0.ebuild b/sys-process/ftop/ftop-1.0.ebuild index 85f73fa31e01d..ddd7b1ec0a240 100644 --- a/sys-process/ftop/ftop-1.0.ebuild +++ b/sys-process/ftop/ftop-1.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=5 AUTOTOOLS_AUTORECONF=frob inherit autotools-utils @@ -15,7 +15,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 ~hppa ~x86" -DEPEND="sys-libs/ncurses" +DEPEND="sys-libs/ncurses:5=" RDEPEND="${DEPEND}" PATCHES=( From f6f229cfd37b69bdb641ff668bdb5e5120f2a4c6 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 12:50:26 +0200 Subject: [PATCH 036/169] www-client/lynx: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- www-client/lynx/lynx-2.8.8_p2.ebuild | 4 ++-- www-client/lynx/lynx-2.8.9_pre4.ebuild | 2 +- www-client/lynx/metadata.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/www-client/lynx/lynx-2.8.8_p2.ebuild b/www-client/lynx/lynx-2.8.8_p2.ebuild index e5624d6a66359..711c303462c24 100644 --- a/www-client/lynx/lynx-2.8.8_p2.ebuild +++ b/www-client/lynx/lynx-2.8.8_p2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -27,7 +27,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode" -RDEPEND="sys-libs/ncurses[unicode?] +RDEPEND="sys-libs/ncurses:5=[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( diff --git a/www-client/lynx/lynx-2.8.9_pre4.ebuild b/www-client/lynx/lynx-2.8.9_pre4.ebuild index ae32b1e4bef0c..0d10481646015 100644 --- a/www-client/lynx/lynx-2.8.9_pre4.ebuild +++ b/www-client/lynx/lynx-2.8.9_pre4.ebuild @@ -27,7 +27,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode" -RDEPEND="sys-libs/ncurses[unicode?] +RDEPEND="sys-libs/ncurses:5=[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( diff --git a/www-client/lynx/metadata.xml b/www-client/lynx/metadata.xml index 5fe596d66290c..5c0215e5dcf36 100644 --- a/www-client/lynx/metadata.xml +++ b/www-client/lynx/metadata.xml @@ -6,7 +6,7 @@ Tim Harder - Enable HTTPS support. - Use gnutls library for HTTPS support (openssl is the default library for HTTPS support). + Enable HTTPS support. + Use gnutls library for HTTPS support (openssl is the default library for HTTPS support). From 34957f8c627d2a38537b7e930e1388134c8f3148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Sun, 16 Aug 2015 11:56:03 +0100 Subject: [PATCH 037/169] sys-apps/biosdevname: Bump version to 0.6.2 Package-Manager: portage-2.2.20.1 --- sys-apps/biosdevname/Manifest | 1 + sys-apps/biosdevname/biosdevname-0.6.2.ebuild | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 sys-apps/biosdevname/biosdevname-0.6.2.ebuild diff --git a/sys-apps/biosdevname/Manifest b/sys-apps/biosdevname/Manifest index 9518dd56d5568..7a106c4d6bd6c 100644 --- a/sys-apps/biosdevname/Manifest +++ b/sys-apps/biosdevname/Manifest @@ -2,3 +2,4 @@ DIST biosdevname-0.3.11.tar.gz 186408 SHA256 02c127f7fff76127cd6006e7cdd9da93350 DIST biosdevname-0.4.0.tar.gz 187775 SHA256 7d567ea8081bc83c6fe17fa32bf8e2b852636a733f5e4d9d583fedeb2f48e21b SHA512 0607f6c04725b4df58becfc6d3b16139397e0ab0f172ac137c670115c8d1a3b2849266e0d801b635d8e4aa4b3ac662a0f356835df0c4d05bfee6ff3e6459c1d8 WHIRLPOOL f2fe757b0f00c90252594cb38d499250c987a012135f1aa73eb3679e81f12fee44606476a21ef175c7c2b254ce5a0f5936b90dd9605e7274f5fd42f7d5398906 DIST biosdevname-0.4.1.tar.gz 187782 SHA256 230e5bffd17f46b6d820faa46ea79ace3eecaf919852ee7ff231e73f6b9f8fe7 SHA512 1c7534dd31acbba7121fc4f904d828b6bfc035248cde3366a58f4596f601c81618b44a96d67b99d4a17cf8d985c971be41196134f6d43ae63b4f8cd4308bed22 WHIRLPOOL 33917ad8ed6493b3fd6b5880e592031fc028e975e428cc9b2b5b16b299f5be647baac6a601c70b9422931a1cf6f98133944e18e9355afe2a0453d456e4697407 DIST biosdevname-0.6.1.tar.gz 195604 SHA256 b43580589a3f40afc836afbff9bcd837224c710b75a4d0b576f2e4d44ec158cc SHA512 46962c50618eb87c3ade5f4866bbb3fddb75f3a450bc32610d54062375b53bcd4c2f17cc3d729335c7d582043d0b491c8d8e1dc50d7de9c7683846b8dc8b0d77 WHIRLPOOL 9fa40a118ca57dd4e1a226ab0bea117f0291b0ee8807a5c2a9a56ef850d52d9500bb59a0d9e1fcba4cb87e85f269c76216bbee4eb331906cfa545b69ef3c6774 +DIST biosdevname-0.6.2.tar.gz 195655 SHA256 7c6620e9a65e2929411036db04cc009e11a83b80a72282858e26cd19b598e466 SHA512 b4c56d9ba7ed539cb2fe05ec34f4345542237d77e0e2ce56835d95a2148baa59db5af1724e7569567999620bb963ad7867634bb9c8ba1b5b30cbf809a527eb81 WHIRLPOOL 85c0de6a59a2c9635721fa649cbd089920caee0842c4f4777a6a290df82a788c9573204aed501d336fe18a13e5e5c486226550bf3ff1b24ec826ab1b2604d9d9 diff --git a/sys-apps/biosdevname/biosdevname-0.6.2.ebuild b/sys-apps/biosdevname/biosdevname-0.6.2.ebuild new file mode 100644 index 0000000000000..13541322006c5 --- /dev/null +++ b/sys-apps/biosdevname/biosdevname-0.6.2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 +inherit udev + +DESCRIPTION="Sets BIOS-given device names instead of kernel eth* names" +HOMEPAGE="http://linux.dell.com/biosdevname/" +SRC_URI="http://linux.dell.com/biosdevname/${P}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +CDEPEND="virtual/udev" +DEPEND="${CDEPEND} + sys-apps/pciutils" +RDEPEND="${CDEPEND}" + +src_prepare() { + sed -i -e 's|/sbin/biosdevname|/usr\0|g' biosdevname.rules.in || die + sed -i -e "/RULEDEST/s:/lib/udev:$(get_udevdir):" configure{,.ac} || die +} From 93b24b866c0b046e6dc21631b7d1aff7af763aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Sun, 16 Aug 2015 11:58:03 +0100 Subject: [PATCH 038/169] sys-apps/biosdevname: Remove to oldest versions: 0.3.11 and 0.4.0 Package-Manager: portage-2.2.20.1 --- sys-apps/biosdevname/Manifest | 2 - .../biosdevname/biosdevname-0.3.11-r1.ebuild | 40 ------------------- sys-apps/biosdevname/biosdevname-0.4.0.ebuild | 40 ------------------- 3 files changed, 82 deletions(-) delete mode 100644 sys-apps/biosdevname/biosdevname-0.3.11-r1.ebuild delete mode 100644 sys-apps/biosdevname/biosdevname-0.4.0.ebuild diff --git a/sys-apps/biosdevname/Manifest b/sys-apps/biosdevname/Manifest index 7a106c4d6bd6c..6a8f719540b00 100644 --- a/sys-apps/biosdevname/Manifest +++ b/sys-apps/biosdevname/Manifest @@ -1,5 +1,3 @@ -DIST biosdevname-0.3.11.tar.gz 186408 SHA256 02c127f7fff76127cd6006e7cdd9da9335035bcb3e0a0fcf039fbb5c0f5d2dc0 SHA512 2c96c8c8163c5fd74735c52881d448af731bac875c4825ba54608a2b100de70bc2003edda86f1d1ed3597260177d572348e2358f1663a788f193e20e5d50f719 WHIRLPOOL 860815bd928459779f4def4953a04fa2ce8b7caeb8370bf2c1e3e4db87e29d2deac4318b7d12ff4415ad0c0ef166cae7470ce83601330ad9afc6a36603da6db1 -DIST biosdevname-0.4.0.tar.gz 187775 SHA256 7d567ea8081bc83c6fe17fa32bf8e2b852636a733f5e4d9d583fedeb2f48e21b SHA512 0607f6c04725b4df58becfc6d3b16139397e0ab0f172ac137c670115c8d1a3b2849266e0d801b635d8e4aa4b3ac662a0f356835df0c4d05bfee6ff3e6459c1d8 WHIRLPOOL f2fe757b0f00c90252594cb38d499250c987a012135f1aa73eb3679e81f12fee44606476a21ef175c7c2b254ce5a0f5936b90dd9605e7274f5fd42f7d5398906 DIST biosdevname-0.4.1.tar.gz 187782 SHA256 230e5bffd17f46b6d820faa46ea79ace3eecaf919852ee7ff231e73f6b9f8fe7 SHA512 1c7534dd31acbba7121fc4f904d828b6bfc035248cde3366a58f4596f601c81618b44a96d67b99d4a17cf8d985c971be41196134f6d43ae63b4f8cd4308bed22 WHIRLPOOL 33917ad8ed6493b3fd6b5880e592031fc028e975e428cc9b2b5b16b299f5be647baac6a601c70b9422931a1cf6f98133944e18e9355afe2a0453d456e4697407 DIST biosdevname-0.6.1.tar.gz 195604 SHA256 b43580589a3f40afc836afbff9bcd837224c710b75a4d0b576f2e4d44ec158cc SHA512 46962c50618eb87c3ade5f4866bbb3fddb75f3a450bc32610d54062375b53bcd4c2f17cc3d729335c7d582043d0b491c8d8e1dc50d7de9c7683846b8dc8b0d77 WHIRLPOOL 9fa40a118ca57dd4e1a226ab0bea117f0291b0ee8807a5c2a9a56ef850d52d9500bb59a0d9e1fcba4cb87e85f269c76216bbee4eb331906cfa545b69ef3c6774 DIST biosdevname-0.6.2.tar.gz 195655 SHA256 7c6620e9a65e2929411036db04cc009e11a83b80a72282858e26cd19b598e466 SHA512 b4c56d9ba7ed539cb2fe05ec34f4345542237d77e0e2ce56835d95a2148baa59db5af1724e7569567999620bb963ad7867634bb9c8ba1b5b30cbf809a527eb81 WHIRLPOOL 85c0de6a59a2c9635721fa649cbd089920caee0842c4f4777a6a290df82a788c9573204aed501d336fe18a13e5e5c486226550bf3ff1b24ec826ab1b2604d9d9 diff --git a/sys-apps/biosdevname/biosdevname-0.3.11-r1.ebuild b/sys-apps/biosdevname/biosdevname-0.3.11-r1.ebuild deleted file mode 100644 index cc48a0776f542..0000000000000 --- a/sys-apps/biosdevname/biosdevname-0.3.11-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -DESCRIPTION="Sets BIOS-given device names instead of kernel eth* names" -HOMEPAGE="http://linux.dell.com/biosdevname/" -SRC_URI="http://linux.dell.com/biosdevname/${P}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -CDEPEND="virtual/udev" -DEPEND="${CDEPEND} - sys-apps/pciutils" -RDEPEND="${CDEPEND}" - -src_prepare() { - sed -e 's|/sbin/biosdevname|/usr\0|g' -i "${S}"/biosdevname.rules.in -} - -pkg_postinst() { - elog "To make it working you need to remove" - elog "" - elog " /etc/udev/rules.d/70-persistent-net.rules" - elog "" - elog "and then reboot the machine. After reboot ethernet devices names will" - elog "change to the ones reported by BIOS. For more information you might" - elog "want to read following document:" - elog "" - elog " http://fedoraproject.org/wiki/Features/ConsistentNetworkDeviceNaming" - elog "" - elog "To disable this feature, pass biosdevname=0 to kernel command line." - elog "" - elog "If you use Dracut, you might want to enable 'biosdevname' module" - elog "(in DRACUT_MODULES variable)." -} diff --git a/sys-apps/biosdevname/biosdevname-0.4.0.ebuild b/sys-apps/biosdevname/biosdevname-0.4.0.ebuild deleted file mode 100644 index cc48a0776f542..0000000000000 --- a/sys-apps/biosdevname/biosdevname-0.4.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -DESCRIPTION="Sets BIOS-given device names instead of kernel eth* names" -HOMEPAGE="http://linux.dell.com/biosdevname/" -SRC_URI="http://linux.dell.com/biosdevname/${P}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -CDEPEND="virtual/udev" -DEPEND="${CDEPEND} - sys-apps/pciutils" -RDEPEND="${CDEPEND}" - -src_prepare() { - sed -e 's|/sbin/biosdevname|/usr\0|g' -i "${S}"/biosdevname.rules.in -} - -pkg_postinst() { - elog "To make it working you need to remove" - elog "" - elog " /etc/udev/rules.d/70-persistent-net.rules" - elog "" - elog "and then reboot the machine. After reboot ethernet devices names will" - elog "change to the ones reported by BIOS. For more information you might" - elog "want to read following document:" - elog "" - elog " http://fedoraproject.org/wiki/Features/ConsistentNetworkDeviceNaming" - elog "" - elog "To disable this feature, pass biosdevname=0 to kernel command line." - elog "" - elog "If you use Dracut, you might want to enable 'biosdevname' module" - elog "(in DRACUT_MODULES variable)." -} From 6ac4640f58f723510d2078d9c37228c6d0f34fa0 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 12:56:08 +0200 Subject: [PATCH 039/169] app-emulation/qemu: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- app-emulation/qemu/metadata.xml | 80 ++++++++++++------------- app-emulation/qemu/qemu-2.3.0-r4.ebuild | 2 +- app-emulation/qemu/qemu-2.3.0-r5.ebuild | 2 +- app-emulation/qemu/qemu-2.3.0-r6.ebuild | 2 +- app-emulation/qemu/qemu-2.3.1.ebuild | 2 +- app-emulation/qemu/qemu-2.4.0.ebuild | 2 +- app-emulation/qemu/qemu-9999.ebuild | 2 +- 7 files changed, 46 insertions(+), 46 deletions(-) diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml index c287e3d0b514f..4a344007d8cba 100644 --- a/app-emulation/qemu/metadata.xml +++ b/app-emulation/qemu/metadata.xml @@ -1,54 +1,54 @@ -qemu - - Adds support for braille displays using brltty - Enables support for Linux's Async IO - Enable alsa output for sound emulation - Support ISOs / -cdrom directives vis HTTP or HTTPS. - Enables firmware device tree support - Enables GlusterFS cluster fileystem via + qemu + + Adds support for braille displays using brltty + Enables support for Linux's Async IO + Enable alsa output for sound emulation + Support ISOs / -cdrom directives vis HTTP or HTTPS. + Enables firmware device tree support + Enables GlusterFS cluster fileystem via sys-cluster/glusterfs - Use gtk-2 instead of gtk-3 - Enable direct iSCSI support via + Use gtk-2 instead of gtk-3 + Enable direct iSCSI support via net-libs/libiscsi instead of indirectly via the Linux block layer that sys-block/open-iscsi does. - Enable the ncurses-based console - Enable NFS support - Enable NUMA support - Pin the versions of BIOS firmware to the version included in the upstream release. + Enable the ncurses-based console + Enable NFS support + Enable NUMA support + Pin the versions of BIOS firmware to the version included in the upstream release. This is needed to sanely support migration/suspend/resume/snapshotting/etc... of instances. When the blobs are different, random corruption/bugs/crashes/etc... may be observed. - Enable pulseaudio output for sound emulation - Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD - Enable the SDL-based console - Use libsdl2 instead of libsdl - Enable Spice protocol support via app-emulation/spice - Enable SSH based block device support via net-libs/libssh2 - Builds the Software MMU (system) targets as static binaries - Build the User targets as static binaries - Enables both 'static-softmmu' and 'static-user' - Enable support for snappy compression - Enable SystemTAP/DTrace tracing - Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time. - Enable TLS support for the VNC console server. + Enable pulseaudio output for sound emulation + Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD + Enable the SDL-based console + Use libsdl2 instead of libsdl + Enable Spice protocol support via app-emulation/spice + Enable SSH based block device support via net-libs/libssh2 + Builds the Software MMU (system) targets as static binaries + Build the User targets as static binaries + Enables both 'static-softmmu' and 'static-user' + Enable support for snappy compression + Enable SystemTAP/DTrace tracing + Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time. + Enable TLS support for the VNC console server. For 1.4 and newer this also enables WebSocket support. For 2.0 through 2.3 also enables disk quorum support. - Enable jpeg image support for the VNC console server - Enable png image support for the VNC console server - Enable USB passthrough via dev-libs/libusb - Use sys-apps/usbredir to redirect USB devices to another machine over TCP - Enable UUID support in the vdi block driver - Enable VDE-based networking - Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet - Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup - Enable terminal support (x11-libs/vte) in the GTK+ interface - Add support for getting and setting POSIX extended attributes, through + Enable jpeg image support for the VNC console server + Enable png image support for the VNC console server + Enable USB passthrough via dev-libs/libusb + Use sys-apps/usbredir to redirect USB devices to another machine over TCP + Enable UUID support in the vdi block driver + Enable VDE-based networking + Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet + Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup + Enable terminal support (x11-libs/vte) in the GTK+ interface + Add support for getting and setting POSIX extended attributes, through sys-apps/attr. Requisite for the virtfs backend. - Enables support for Xen backends - Support xfsctl() notification and syncing for XFS backed + Enables support for Xen backends + Support xfsctl() notification and syncing for XFS backed virtual disks. - + diff --git a/app-emulation/qemu/qemu-2.3.0-r4.ebuild b/app-emulation/qemu/qemu-2.3.0-r4.ebuild index 2302d5e837715..b153961dede43 100644 --- a/app-emulation/qemu/qemu-2.3.0-r4.ebuild +++ b/app-emulation/qemu/qemu-2.3.0-r4.ebuild @@ -77,7 +77,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] ) jpeg? ( virtual/jpeg:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) - ncurses? ( sys-libs/ncurses[static-libs(+)] ) + ncurses? ( sys-libs/ncurses:5=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) png? ( media-libs/libpng:0=[static-libs(+)] ) diff --git a/app-emulation/qemu/qemu-2.3.0-r5.ebuild b/app-emulation/qemu/qemu-2.3.0-r5.ebuild index 01625e3f2cecf..376c7153102fa 100644 --- a/app-emulation/qemu/qemu-2.3.0-r5.ebuild +++ b/app-emulation/qemu/qemu-2.3.0-r5.ebuild @@ -77,7 +77,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] ) jpeg? ( virtual/jpeg:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) - ncurses? ( sys-libs/ncurses[static-libs(+)] ) + ncurses? ( sys-libs/ncurses:5=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) png? ( media-libs/libpng:0=[static-libs(+)] ) diff --git a/app-emulation/qemu/qemu-2.3.0-r6.ebuild b/app-emulation/qemu/qemu-2.3.0-r6.ebuild index e5b04c20c52ca..bd98ca0a1a291 100644 --- a/app-emulation/qemu/qemu-2.3.0-r6.ebuild +++ b/app-emulation/qemu/qemu-2.3.0-r6.ebuild @@ -77,7 +77,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] ) jpeg? ( virtual/jpeg:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) - ncurses? ( sys-libs/ncurses[static-libs(+)] ) + ncurses? ( sys-libs/ncurses:5=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) png? ( media-libs/libpng:0=[static-libs(+)] ) diff --git a/app-emulation/qemu/qemu-2.3.1.ebuild b/app-emulation/qemu/qemu-2.3.1.ebuild index 2802a570e7275..f4e887bd73d0b 100644 --- a/app-emulation/qemu/qemu-2.3.1.ebuild +++ b/app-emulation/qemu/qemu-2.3.1.ebuild @@ -77,7 +77,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] ) jpeg? ( virtual/jpeg:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) - ncurses? ( sys-libs/ncurses[static-libs(+)] ) + ncurses? ( sys-libs/ncurses:5=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) png? ( media-libs/libpng:0=[static-libs(+)] ) diff --git a/app-emulation/qemu/qemu-2.4.0.ebuild b/app-emulation/qemu/qemu-2.4.0.ebuild index 7be0e4d5fa9b5..71b5671135a41 100644 --- a/app-emulation/qemu/qemu-2.4.0.ebuild +++ b/app-emulation/qemu/qemu-2.4.0.ebuild @@ -92,7 +92,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) - ncurses? ( sys-libs/ncurses[static-libs(+)] ) + ncurses? ( sys-libs/ncurses:5=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 7be0e4d5fa9b5..71b5671135a41 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -92,7 +92,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) - ncurses? ( sys-libs/ncurses[static-libs(+)] ) + ncurses? ( sys-libs/ncurses:5=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( From 2d82c41140ff458f09e00ef04745d19573fae797 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 12:58:33 +0200 Subject: [PATCH 040/169] sys-apps/util-linux: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sys-apps/util-linux/metadata.xml | 18 +++++++++--------- .../util-linux/util-linux-2.26.1-r1.ebuild | 4 ++-- sys-apps/util-linux/util-linux-2.26.2.ebuild | 4 ++-- sys-apps/util-linux/util-linux-9999.ebuild | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml index 8caf3fdd5a1db..77690bce835ff 100644 --- a/sys-apps/util-linux/metadata.xml +++ b/sys-apps/util-linux/metadata.xml @@ -2,18 +2,18 @@ base-system - - build setpriv helper (run programs with diff capabilities) - build mkfs/fsck helpers for cramfs filesystems - build cytune for Cyclades-Z multiport serial cards - build fdformat (floppy disk format) - build runuser helper - + + build setpriv helper (run programs with diff capabilities) + build mkfs/fsck helpers for cramfs filesystems + build cytune for Cyclades-Z multiport serial cards + build fdformat (floppy disk format) + build runuser helper + install mount/umount as setuid so non-root users may mount/umount devices, and wall/write as setgid so non-root users can notify other users - install the mesg/wall/write tools for talking to local users - + install the mesg/wall/write tools for talking to local users + cpe:/a:andries_brouwer:util-linux diff --git a/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild index f16b9789a710f..2c1a869c2da76 100644 --- a/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild @@ -36,7 +36,7 @@ RDEPEND="!sys-process/schedutils !=sys-libs/ncurses-5.2-r2 ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:5= ) pam? ( sys-libs/pam ) python? ( ${PYTHON_DEPS} ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) @@ -44,7 +44,7 @@ RDEPEND="!sys-process/schedutils systemd? ( sys-apps/systemd ) udev? ( virtual/libudev ) abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 + !<=app-emulation/emul-linux-x86-baselibs-20150406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )" DEPEND="${RDEPEND} diff --git a/sys-apps/util-linux/util-linux-2.26.2.ebuild b/sys-apps/util-linux/util-linux-2.26.2.ebuild index cd8859751d811..fa08f0641470c 100644 --- a/sys-apps/util-linux/util-linux-2.26.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.26.2.ebuild @@ -36,7 +36,7 @@ RDEPEND="!sys-process/schedutils !=sys-libs/ncurses-5.2-r2:=[unicode?] ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:5=[unicode?] ) pam? ( sys-libs/pam ) python? ( ${PYTHON_DEPS} ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) @@ -44,7 +44,7 @@ RDEPEND="!sys-process/schedutils systemd? ( sys-apps/systemd ) udev? ( virtual/libudev:= ) abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 + !<=app-emulation/emul-linux-x86-baselibs-20150406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )" DEPEND="${RDEPEND} diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index cd8859751d811..fa08f0641470c 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -36,7 +36,7 @@ RDEPEND="!sys-process/schedutils !=sys-libs/ncurses-5.2-r2:=[unicode?] ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:5=[unicode?] ) pam? ( sys-libs/pam ) python? ( ${PYTHON_DEPS} ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) @@ -44,7 +44,7 @@ RDEPEND="!sys-process/schedutils systemd? ( sys-apps/systemd ) udev? ( virtual/libudev:= ) abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 + !<=app-emulation/emul-linux-x86-baselibs-20150406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )" DEPEND="${RDEPEND} From 60ff9777063e465acd35febdb3656b7e7711c370 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 12:59:00 +0200 Subject: [PATCH 041/169] sys-fs/ncdu: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sys-fs/ncdu/ncdu-1.11.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/ncdu/ncdu-1.11.ebuild b/sys-fs/ncdu/ncdu-1.11.ebuild index 06611e6817160..c0a99b886e450 100644 --- a/sys-fs/ncdu/ncdu-1.11.ebuild +++ b/sys-fs/ncdu/ncdu-1.11.ebuild @@ -14,7 +14,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" -RDEPEND="sys-libs/ncurses[unicode]" +RDEPEND="sys-libs/ncurses:5=[unicode]" DEPEND="${RDEPEND} virtual/pkgconfig" From b7dd0f85a5c7ec4b040e67847022f154708ca8e8 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sun, 16 Aug 2015 13:06:08 +0200 Subject: [PATCH 042/169] dev-db/mariadb: Stable for PPC64 (bug #555480). Package-Manager: portage-2.2.20.1 --- dev-db/mariadb/mariadb-10.0.21.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-db/mariadb/mariadb-10.0.21.ebuild b/dev-db/mariadb/mariadb-10.0.21.ebuild index 6c2a28fdc3bb6..24da847e9a36b 100644 --- a/dev-db/mariadb/mariadb-10.0.21.ebuild +++ b/dev-db/mariadb/mariadb-10.0.21.ebuild @@ -11,7 +11,7 @@ inherit toolchain-funcs mysql-multilib IUSE="$IUSE" # REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" # When MY_EXTRAS is bumped, the index should be revised to exclude these. EPATCH_EXCLUDE='' From 44e770b18c1b3c0f5e6f03d7a6af5bb084550701 Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Sun, 16 Aug 2015 12:29:02 +0000 Subject: [PATCH 043/169] profiles: Mask dev-java/base64 for removal. See bug 557866. Signed-off-by: Patrice Clement --- profiles/package.mask | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 6b7268bd63c82..b5306e7cf5e46 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,12 @@ #--- END OF EXAMPLES --- +# Patrice Clement (16 Aug 2015) +# Project discontinued: part of the java.util namespace as of Java 8. +# See https://docs.oracle.com/javase/8/docs/api/java/util/Base64.html. +# Masked for removal. See bug #557866. +dev-java/base64 + # Brian Evans (16 Aug 2015) # Mask new PEAR installer as it is likely to break # many old scripts From 10b43c11887708e2c0cef46022b874b2df521125 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 13:05:32 +0200 Subject: [PATCH 044/169] app-crypt/pinentry: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- app-crypt/pinentry/metadata.xml | 8 ++++---- app-crypt/pinentry/pinentry-0.9.0-r3.ebuild | 4 ++-- app-crypt/pinentry/pinentry-0.9.0.ebuild | 4 ++-- app-crypt/pinentry/pinentry-0.9.5.ebuild | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml index 3c50ec9eb99ad..d18704030551f 100644 --- a/app-crypt/pinentry/metadata.xml +++ b/app-crypt/pinentry/metadata.xml @@ -1,8 +1,8 @@ -crypto - - Enable clipboard integration - + crypto + + Enable clipboard integration + diff --git a/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild b/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild index 336343c0dffc7..959f69686ecce 100644 --- a/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild +++ b/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild @@ -19,9 +19,9 @@ RDEPEND=" app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) - static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) + static? ( >=sys-libs/ncurses-5.7-r5:5=[static-libs,-gpm] ) " DEPEND="${RDEPEND} sys-devel/gettext diff --git a/app-crypt/pinentry/pinentry-0.9.0.ebuild b/app-crypt/pinentry/pinentry-0.9.0.ebuild index c772221154689..115de38367561 100644 --- a/app-crypt/pinentry/pinentry-0.9.0.ebuild +++ b/app-crypt/pinentry/pinentry-0.9.0.ebuild @@ -19,9 +19,9 @@ RDEPEND=" app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) - static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) + static? ( >=sys-libs/ncurses-5.7-r5:5=[static-libs,-gpm] ) " DEPEND="${RDEPEND} sys-devel/gettext diff --git a/app-crypt/pinentry/pinentry-0.9.5.ebuild b/app-crypt/pinentry/pinentry-0.9.5.ebuild index ef825c21e56ba..567f98d1b3d0b 100644 --- a/app-crypt/pinentry/pinentry-0.9.5.ebuild +++ b/app-crypt/pinentry/pinentry-0.9.5.ebuild @@ -21,9 +21,9 @@ RDEPEND=" app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) - static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) + static? ( >=sys-libs/ncurses-5.7-r5:5=[static-libs,-gpm] ) " DEPEND="${RDEPEND} sys-devel/gettext From 3b3cd0ac0ff5574a75a33826cbac226b950dd8ba Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 13:05:45 +0200 Subject: [PATCH 045/169] sys-libs/readline: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sys-libs/readline/metadata.xml | 8 ++++---- sys-libs/readline/readline-7.0_alpha.ebuild | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml index 0ff924c56c0eb..6172776f3e7cd 100644 --- a/sys-libs/readline/metadata.xml +++ b/sys-libs/readline/metadata.xml @@ -1,8 +1,8 @@ -base-system - - Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline - + base-system + + Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline + diff --git a/sys-libs/readline/readline-7.0_alpha.ebuild b/sys-libs/readline/readline-7.0_alpha.ebuild index fb437475ea35c..0e72930838159 100644 --- a/sys-libs/readline/readline-7.0_alpha.ebuild +++ b/sys-libs/readline/readline-7.0_alpha.ebuild @@ -40,7 +40,7 @@ SLOT="0/7" # subslot matches SONAME major #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" IUSE="static-libs utils" -RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] +RDEPEND=">=sys-libs/ncurses-5.9-r3:5=[${MULTILIB_USEDEP}] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 From a453db0e2080fd6bc2be266dcd901dc2a1179022 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 13:11:51 +0200 Subject: [PATCH 046/169] sys-devel/gdb: Use slot operators for ncurses and readline Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sys-devel/gdb/gdb-7.7-r1.ebuild | 4 ++-- sys-devel/gdb/gdb-7.7.1.ebuild | 4 ++-- sys-devel/gdb/gdb-7.8.1.ebuild | 4 ++-- sys-devel/gdb/gdb-7.8.2.ebuild | 4 ++-- sys-devel/gdb/gdb-7.8.ebuild | 4 ++-- sys-devel/gdb/gdb-7.9.1.ebuild | 2 +- sys-devel/gdb/gdb-7.9.ebuild | 2 +- sys-devel/gdb/gdb-9999.ebuild | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys-devel/gdb/gdb-7.7-r1.ebuild b/sys-devel/gdb/gdb-7.7-r1.ebuild index 08e6bfd9e836a..ebfaa68fc7422 100644 --- a/sys-devel/gdb/gdb-7.7-r1.ebuild +++ b/sys-devel/gdb/gdb-7.7-r1.ebuild @@ -49,8 +49,8 @@ IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="!dev-util/gdbserver - >=sys-libs/ncurses-5.2-r2 - sys-libs/readline + >=sys-libs/ncurses-5.2-r2:5= + sys-libs/readline:0= expat? ( dev-libs/expat ) lzma? ( app-arch/xz-utils ) python? ( ${PYTHON_DEPS} ) diff --git a/sys-devel/gdb/gdb-7.7.1.ebuild b/sys-devel/gdb/gdb-7.7.1.ebuild index a962c2978b43b..795cc558306eb 100644 --- a/sys-devel/gdb/gdb-7.7.1.ebuild +++ b/sys-devel/gdb/gdb-7.7.1.ebuild @@ -49,8 +49,8 @@ IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="!dev-util/gdbserver - >=sys-libs/ncurses-5.2-r2 - sys-libs/readline + >=sys-libs/ncurses-5.2-r2:5= + sys-libs/readline:0= expat? ( dev-libs/expat ) lzma? ( app-arch/xz-utils ) python? ( ${PYTHON_DEPS} ) diff --git a/sys-devel/gdb/gdb-7.8.1.ebuild b/sys-devel/gdb/gdb-7.8.1.ebuild index 3ff1f0d520727..b1130656021c1 100644 --- a/sys-devel/gdb/gdb-7.8.1.ebuild +++ b/sys-devel/gdb/gdb-7.8.1.ebuild @@ -53,8 +53,8 @@ REQUIRED_USE=" RDEPEND="server? ( !dev-util/gdbserver ) client? ( - >=sys-libs/ncurses-5.2-r2 - sys-libs/readline + >=sys-libs/ncurses-5.2-r2:5= + sys-libs/readline:0= expat? ( dev-libs/expat ) lzma? ( app-arch/xz-utils ) python? ( ${PYTHON_DEPS} ) diff --git a/sys-devel/gdb/gdb-7.8.2.ebuild b/sys-devel/gdb/gdb-7.8.2.ebuild index 1c1f9aba26b56..c8b17634f567f 100644 --- a/sys-devel/gdb/gdb-7.8.2.ebuild +++ b/sys-devel/gdb/gdb-7.8.2.ebuild @@ -53,8 +53,8 @@ REQUIRED_USE=" RDEPEND="server? ( !dev-util/gdbserver ) client? ( - >=sys-libs/ncurses-5.2-r2 - sys-libs/readline + >=sys-libs/ncurses-5.2-r2:5= + sys-libs/readline:0= expat? ( dev-libs/expat ) lzma? ( app-arch/xz-utils ) python? ( ${PYTHON_DEPS} ) diff --git a/sys-devel/gdb/gdb-7.8.ebuild b/sys-devel/gdb/gdb-7.8.ebuild index d07074fc42882..7d0ade428b3fe 100644 --- a/sys-devel/gdb/gdb-7.8.ebuild +++ b/sys-devel/gdb/gdb-7.8.ebuild @@ -49,8 +49,8 @@ IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="!dev-util/gdbserver - >=sys-libs/ncurses-5.2-r2 - sys-libs/readline + >=sys-libs/ncurses-5.2-r2:5= + sys-libs/readline:0= expat? ( dev-libs/expat ) lzma? ( app-arch/xz-utils ) python? ( ${PYTHON_DEPS} ) diff --git a/sys-devel/gdb/gdb-7.9.1.ebuild b/sys-devel/gdb/gdb-7.9.1.ebuild index 841576ac18244..bb531a97d7485 100644 --- a/sys-devel/gdb/gdb-7.9.1.ebuild +++ b/sys-devel/gdb/gdb-7.9.1.ebuild @@ -67,7 +67,7 @@ REQUIRED_USE=" RDEPEND="server? ( !dev-util/gdbserver ) client? ( - >=sys-libs/ncurses-5.2-r2:= + >=sys-libs/ncurses-5.2-r2:5= sys-libs/readline:0= expat? ( dev-libs/expat ) lzma? ( app-arch/xz-utils ) diff --git a/sys-devel/gdb/gdb-7.9.ebuild b/sys-devel/gdb/gdb-7.9.ebuild index 5c02bea1a5c42..bb531a97d7485 100644 --- a/sys-devel/gdb/gdb-7.9.ebuild +++ b/sys-devel/gdb/gdb-7.9.ebuild @@ -67,7 +67,7 @@ REQUIRED_USE=" RDEPEND="server? ( !dev-util/gdbserver ) client? ( - >=sys-libs/ncurses-5.2-r2 + >=sys-libs/ncurses-5.2-r2:5= sys-libs/readline:0= expat? ( dev-libs/expat ) lzma? ( app-arch/xz-utils ) diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild index 6c9aa1a6a732d..fc830c723b947 100644 --- a/sys-devel/gdb/gdb-9999.ebuild +++ b/sys-devel/gdb/gdb-9999.ebuild @@ -67,7 +67,7 @@ REQUIRED_USE=" RDEPEND="server? ( !dev-util/gdbserver ) client? ( - >=sys-libs/ncurses-5.2-r2:= + >=sys-libs/ncurses-5.2-r2:5= sys-libs/readline:0= expat? ( dev-libs/expat ) lzma? ( app-arch/xz-utils ) From 62990fe736a6facdf4058c6fac0e44a80ad15bdd Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 13:13:17 +0200 Subject: [PATCH 047/169] sys-apps/openrc: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sys-apps/openrc/openrc-0.13.11.ebuild | 2 +- sys-apps/openrc/openrc-0.14.ebuild | 2 +- sys-apps/openrc/openrc-0.15.1.ebuild | 2 +- sys-apps/openrc/openrc-0.15.ebuild | 2 +- sys-apps/openrc/openrc-0.16.1.ebuild | 2 +- sys-apps/openrc/openrc-0.16.2.ebuild | 2 +- sys-apps/openrc/openrc-0.16.3.ebuild | 2 +- sys-apps/openrc/openrc-0.16.4.ebuild | 2 +- sys-apps/openrc/openrc-0.16.ebuild | 2 +- sys-apps/openrc/openrc-0.17.ebuild | 2 +- sys-apps/openrc/openrc-9999.ebuild | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys-apps/openrc/openrc-0.13.11.ebuild b/sys-apps/openrc/openrc-0.13.11.ebuild index 699e9b2349639..d08f658e5ec5a 100644 --- a/sys-apps/openrc/openrc-0.13.11.ebuild +++ b/sys-apps/openrc/openrc-0.13.11.ebuild @@ -24,7 +24,7 @@ IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) pam? ( sys-auth/pambase virtual/pam diff --git a/sys-apps/openrc/openrc-0.14.ebuild b/sys-apps/openrc/openrc-0.14.ebuild index 2458eece2a065..0de09f5e2cb23 100644 --- a/sys-apps/openrc/openrc-0.14.ebuild +++ b/sys-apps/openrc/openrc-0.14.ebuild @@ -24,7 +24,7 @@ IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static- COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) pam? ( sys-auth/pambase virtual/pam diff --git a/sys-apps/openrc/openrc-0.15.1.ebuild b/sys-apps/openrc/openrc-0.15.1.ebuild index 2458eece2a065..0de09f5e2cb23 100644 --- a/sys-apps/openrc/openrc-0.15.1.ebuild +++ b/sys-apps/openrc/openrc-0.15.1.ebuild @@ -24,7 +24,7 @@ IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static- COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) pam? ( sys-auth/pambase virtual/pam diff --git a/sys-apps/openrc/openrc-0.15.ebuild b/sys-apps/openrc/openrc-0.15.ebuild index 2458eece2a065..0de09f5e2cb23 100644 --- a/sys-apps/openrc/openrc-0.15.ebuild +++ b/sys-apps/openrc/openrc-0.15.ebuild @@ -24,7 +24,7 @@ IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static- COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) pam? ( sys-auth/pambase virtual/pam diff --git a/sys-apps/openrc/openrc-0.16.1.ebuild b/sys-apps/openrc/openrc-0.16.1.ebuild index 2458eece2a065..0de09f5e2cb23 100644 --- a/sys-apps/openrc/openrc-0.16.1.ebuild +++ b/sys-apps/openrc/openrc-0.16.1.ebuild @@ -24,7 +24,7 @@ IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static- COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) pam? ( sys-auth/pambase virtual/pam diff --git a/sys-apps/openrc/openrc-0.16.2.ebuild b/sys-apps/openrc/openrc-0.16.2.ebuild index 2458eece2a065..0de09f5e2cb23 100644 --- a/sys-apps/openrc/openrc-0.16.2.ebuild +++ b/sys-apps/openrc/openrc-0.16.2.ebuild @@ -24,7 +24,7 @@ IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static- COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) pam? ( sys-auth/pambase virtual/pam diff --git a/sys-apps/openrc/openrc-0.16.3.ebuild b/sys-apps/openrc/openrc-0.16.3.ebuild index 2458eece2a065..0de09f5e2cb23 100644 --- a/sys-apps/openrc/openrc-0.16.3.ebuild +++ b/sys-apps/openrc/openrc-0.16.3.ebuild @@ -24,7 +24,7 @@ IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static- COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) pam? ( sys-auth/pambase virtual/pam diff --git a/sys-apps/openrc/openrc-0.16.4.ebuild b/sys-apps/openrc/openrc-0.16.4.ebuild index 233f89416d30c..7aed223c0a093 100644 --- a/sys-apps/openrc/openrc-0.16.4.ebuild +++ b/sys-apps/openrc/openrc-0.16.4.ebuild @@ -24,7 +24,7 @@ IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static- COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) pam? ( sys-auth/pambase virtual/pam diff --git a/sys-apps/openrc/openrc-0.16.ebuild b/sys-apps/openrc/openrc-0.16.ebuild index 2458eece2a065..0de09f5e2cb23 100644 --- a/sys-apps/openrc/openrc-0.16.ebuild +++ b/sys-apps/openrc/openrc-0.16.ebuild @@ -24,7 +24,7 @@ IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static- COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) pam? ( sys-auth/pambase virtual/pam diff --git a/sys-apps/openrc/openrc-0.17.ebuild b/sys-apps/openrc/openrc-0.17.ebuild index 233f89416d30c..7aed223c0a093 100644 --- a/sys-apps/openrc/openrc-0.17.ebuild +++ b/sys-apps/openrc/openrc-0.17.ebuild @@ -24,7 +24,7 @@ IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static- COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) pam? ( sys-auth/pambase virtual/pam diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index 2458eece2a065..0de09f5e2cb23 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -24,7 +24,7 @@ IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static- COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) pam? ( sys-auth/pambase virtual/pam From 85661f91679debe00ece6059bafc7b82c8cdda98 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 13:15:19 +0200 Subject: [PATCH 048/169] app-shells/bash: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- app-shells/bash/bash-4.4_alpha-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/bash/bash-4.4_alpha-r1.ebuild b/app-shells/bash/bash-4.4_alpha-r1.ebuild index a77538fb59793..28f11104daf72 100644 --- a/app-shells/bash/bash-4.4_alpha-r1.ebuild +++ b/app-shells/bash/bash-4.4_alpha-r1.ebuild @@ -43,7 +43,7 @@ SLOT="0" #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla" -DEPEND=">=sys-libs/ncurses-5.2-r2:= +DEPEND=">=sys-libs/ncurses-5.2-r2:5= readline? ( >=sys-libs/readline-${READLINE_VER}_alpha:0= ) nls? ( virtual/libintl )" RDEPEND="${DEPEND} From 8c05129e3e2fce50f23c7c5c6015575f686f6e8f Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 13:18:23 +0200 Subject: [PATCH 049/169] sci-biology/bamtools: Restrict Version of dev-libs/jsoncpp in deps, bug #550144 https://github.com/pezmaster31/bamtools/issues/108 Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sci-biology/bamtools/bamtools-2.3.0.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sci-biology/bamtools/bamtools-2.3.0.ebuild b/sci-biology/bamtools/bamtools-2.3.0.ebuild index cb86750cc0cf5..5b6468c6f6a2e 100644 --- a/sci-biology/bamtools/bamtools-2.3.0.ebuild +++ b/sci-biology/bamtools/bamtools-2.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,6 +17,7 @@ IUSE="static-libs" DEPEND=" >=dev-libs/jsoncpp-0.5.0-r1 + Date: Sun, 16 Aug 2015 13:20:12 +0200 Subject: [PATCH 050/169] app-text/pinfo: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- app-text/pinfo/metadata.xml | 6 +++--- app-text/pinfo/pinfo-0.6.10-r5.ebuild | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app-text/pinfo/metadata.xml b/app-text/pinfo/metadata.xml index 3fcf9a077c2a2..25aee7af786ba 100644 --- a/app-text/pinfo/metadata.xml +++ b/app-text/pinfo/metadata.xml @@ -1,7 +1,7 @@ - -jer@gentoo.org - + + jer@gentoo.org + diff --git a/app-text/pinfo/pinfo-0.6.10-r5.ebuild b/app-text/pinfo/pinfo-0.6.10-r5.ebuild index 1674728856d3b..dc55a82dc30ad 100644 --- a/app-text/pinfo/pinfo-0.6.10-r5.ebuild +++ b/app-text/pinfo/pinfo-0.6.10-r5.ebuild @@ -3,6 +3,7 @@ # $Id$ EAPI=5 + inherit autotools eutils flag-o-matic DESCRIPTION="Hypertext info and man viewer based on (n)curses" @@ -14,7 +15,7 @@ SLOT="0" KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" IUSE="nls readline" -RDEPEND="sys-libs/ncurses:= +RDEPEND="sys-libs/ncurses:5= sys-libs/readline:0= nls? ( virtual/libintl ) " From 73a564f2cc923daeda69f555399c9ef9f9a96cfc Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 13:20:16 +0200 Subject: [PATCH 051/169] dev-util/wiggle: Use slot operators for ncurses; bump EAPI; drop old Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-util/wiggle/Manifest | 1 - ...gle-0.8-r1.ebuild => wiggle-0.9-r1.ebuild} | 34 +++++++++++-------- 2 files changed, 20 insertions(+), 15 deletions(-) rename dev-util/wiggle/{wiggle-0.8-r1.ebuild => wiggle-0.9-r1.ebuild} (68%) diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest index 247d26d727945..46f673955885e 100644 --- a/dev-util/wiggle/Manifest +++ b/dev-util/wiggle/Manifest @@ -1,2 +1 @@ -DIST wiggle-0.8.tar.gz 2097175 SHA256 f8bf7981f5e5811dcf6c519c5e335031a1c9b7833c919a2c5707ac8d5524b94a SHA512 536bfd8ed09decdefcba7ecf49eaa8085b9a88c163079b4a256c6796dc373f25c9947353c28f225b6c25c21b6684acbf973504838fc200e8acf746bb8e16632f WHIRLPOOL c5bc6e06079a8e856ab29e9aad4e2a36a48b618e3fb3277949eedf462668ce7afb3916d849f192cfe8bdd5d324aa7f34241c4269cb3ae5a4538f2aa0bb9fc5a6 DIST wiggle-0.9.tar.gz 809756 SHA256 fe3dcf05a2cda07f42db2099ae8407acdb4d58bb9cfdc58c72395b7ae4a4e6b5 SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9 WHIRLPOOL 95a12f73458abdb999681de7af08c407d9f7c4762c71287eb6e80e38a322459c6e1767f2bec72199cf7d8cb33912981b9fd48fbe95957f854b43e4c148c04c14 diff --git a/dev-util/wiggle/wiggle-0.8-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild similarity index 68% rename from dev-util/wiggle/wiggle-0.8-r1.ebuild rename to dev-util/wiggle/wiggle-0.9-r1.ebuild index ed270e30e9707..acb936da89ea5 100644 --- a/dev-util/wiggle/wiggle-0.8-r1.ebuild +++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=3 +EAPI=5 -inherit eutils fixheadtails toolchain-funcs +inherit eutils fixheadtails flag-o-matic toolchain-funcs DESCRIPTION="program for applying patches that patch cannot apply because of conflicting changes" HOMEPAGE="http://neil.brown.name/wiggle http://neil.brown.name/git?p=wiggle" @@ -12,13 +12,14 @@ SRC_URI="http://neil.brown.name/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="test" # The 'p' tool does support bitkeeper, but I'm against just dumping it in here # due to it's size. I've explictly listed every other dependancy here due to # the nature of the shell program 'p' -RDEPEND="dev-util/diffstat +RDEPEND=" + dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils @@ -27,14 +28,14 @@ RDEPEND="dev-util/diffstat sys-apps/less sys-apps/sed sys-apps/coreutils - sys-devel/patch" + sys-devel/patch + sys-libs/ncurses:5= + " DEPEND="${RDEPEND} sys-apps/groff test? ( sys-process/time )" src_prepare() { - epatch "${FILESDIR}/${P}-buffer-overflow.patch" - # Fix the reference to the help file so `p help' works sed -i "s:\$0.help:${EPREFIX}/usr/share/wiggle/p.help:" p || die "sed failed on p" @@ -44,18 +45,23 @@ src_prepare() { # Use prefixed time binary sed -i "s:/usr/bin/time:${EPREFIX}/usr/bin/time:" dotest || die "sed failed on dotest" + sed \ + -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \ + -i Makefile || die + ht_fix_file p + + append-cppflags -I. } src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" \ - wiggle || die "emake wiggle failed." + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" ${PN} } src_install() { - dobin wiggle p || die "failed to install binaries" - doman wiggle.1 || die "failed to install man page" - dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes || die "failed to install docs" + dobin wiggle p + doman wiggle.1 + dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes insinto /usr/share/wiggle - doins p.help || die "failed to install help file" + doins p.help } From 715d60cfd63ed6350b3ce13a020ef85e9e974747 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 13:21:25 +0200 Subject: [PATCH 052/169] media-libs/aalib: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- media-libs/aalib/aalib-1.4_rc5-r6.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild index 43e8502f0a0fe..c7712350fc2f7 100644 --- a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild +++ b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild @@ -18,10 +18,11 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="X slang gpm static-libs" -RDEPEND="X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) +RDEPEND=" + X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) gpm? ( >=sys-libs/gpm-1.20.7-r2[${MULTILIB_USEDEP}] ) slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] ) - >=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] + >=sys-libs/ncurses-5.9-r3:5=[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND} virtual/pkgconfig From e86282ec00f98531e7d3c66f3bbf70df7bb5cfff Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 13:25:32 +0200 Subject: [PATCH 053/169] net-analyzer/iptraf-ng: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild | 4 ++-- net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild | 4 ++-- net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild index e69b978e074bc..10d7e25d4be63 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,7 +17,7 @@ IUSE="doc" RESTRICT="test" RDEPEND=" - >=sys-libs/ncurses-5.7-r7 + >=sys-libs/ncurses-5.7-r7:5= " DEPEND=" ${RDEPEND} diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild index 95b2dd1165994..fd6b55ff9d65d 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,7 +17,7 @@ IUSE="doc" RESTRICT="test" RDEPEND=" - >=sys-libs/ncurses-5.7-r7 + >=sys-libs/ncurses-5.7-r7:5= " DEPEND=" ${RDEPEND} diff --git a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild index 660a84c6022e1..6fffe222a16e7 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,7 +17,7 @@ IUSE="doc" RESTRICT="test" RDEPEND=" - >=sys-libs/ncurses-5.7-r7 + >=sys-libs/ncurses-5.7-r7:5= " DEPEND=" ${RDEPEND} From 7823c4905c6a2fbee81993b4b592371249679c9f Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 13:26:54 +0200 Subject: [PATCH 054/169] app-misc/devtodo: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- app-misc/devtodo/devtodo-0.1.20-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild index 91f007e02f7f7..25de4bce06646 100644 --- a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild +++ b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild @@ -19,8 +19,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~a IUSE="" RDEPEND=" - >=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1" + >=sys-libs/ncurses-5.2:5= + >=sys-libs/readline-4.1:0=" DEPEND="${RDEPEND}" DOCS=( AUTHORS ChangeLog QuickStart README doc/scripts.sh doc/scripts.tcsh doc/todorc.example ) From 612ad389df0ee65b5a9e299aa628f8d63265ea78 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 13:27:36 +0200 Subject: [PATCH 055/169] dev-scheme/guile: Add missing dep on ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-scheme/guile/guile-1.8.8-r1.ebuild | 5 +++-- dev-scheme/guile/guile-2.0.0.ebuild | 1 + dev-scheme/guile/metadata.xml | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-scheme/guile/guile-1.8.8-r1.ebuild b/dev-scheme/guile/guile-1.8.8-r1.ebuild index ffee62922f71d..0df6806d1594d 100644 --- a/dev-scheme/guile/guile-1.8.8-r1.ebuild +++ b/dev-scheme/guile/guile-1.8.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,9 +15,10 @@ IUSE="networking +regex discouraged +deprecated emacs nls debug-freelist debug-m RESTRICT="!regex? ( test )" RDEPEND=" - >=dev-libs/gmp-4.1 + >=dev-libs/gmp-4.1:0= >=sys-devel/libtool-1.5.6 sys-devel/gettext + sys-libs/ncurses:5= emacs? ( virtual/emacs )" DEPEND="${RDEPEND} sys-apps/texinfo" diff --git a/dev-scheme/guile/guile-2.0.0.ebuild b/dev-scheme/guile/guile-2.0.0.ebuild index e83a05bf7e9b7..f0ca913115011 100644 --- a/dev-scheme/guile/guile-2.0.0.ebuild +++ b/dev-scheme/guile/guile-2.0.0.ebuild @@ -21,6 +21,7 @@ RDEPEND=" dev-libs/libunistring >=dev-libs/boehm-gc-7.0[threads?] virtual/libffi + sys-libs/ncurses emacs? ( virtual/emacs )" DEPEND="${RDEPEND} sys-apps/texinfo" diff --git a/dev-scheme/guile/metadata.xml b/dev-scheme/guile/metadata.xml index a3d993de70de9..05ad57a9512e0 100644 --- a/dev-scheme/guile/metadata.xml +++ b/dev-scheme/guile/metadata.xml @@ -6,13 +6,13 @@ Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs. - Include garbage collector freelist debugging + Include garbage collector freelist debugging code - Include malloc debugging code - Enable deprecated features - (implied by deprecated) enable merely discouraged + Include malloc debugging code + Enable deprecated features + (implied by deprecated) enable merely discouraged features - Include networking interfaces - Include regular expression interfaces + Include networking interfaces + Include regular expression interfaces From 1736183b6d7f2f753c9b275bd1d7085e0549705f Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 13:33:39 +0200 Subject: [PATCH 056/169] sci-chemistry/autodock_vina: Require thread support in boost, bug #557822 Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sci-chemistry/autodock_vina/autodock_vina-1.1.2.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sci-chemistry/autodock_vina/autodock_vina-1.1.2.ebuild b/sci-chemistry/autodock_vina/autodock_vina-1.1.2.ebuild index aea218f8faf93..a5662a18882db 100644 --- a/sci-chemistry/autodock_vina/autodock_vina-1.1.2.ebuild +++ b/sci-chemistry/autodock_vina/autodock_vina-1.1.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=5 inherit eutils flag-o-matic versionator @@ -17,7 +17,7 @@ KEYWORDS="amd64 x86" LICENSE="Apache-2.0" IUSE="debug" -RDEPEND="dev-libs/boost" +RDEPEND="dev-libs/boost[threads]" DEPEND="${RDEPEND}" S="${WORKDIR}"/${MY_P}/build/linux/release From 65a4b9698753ca208572bb3de757a02db36f054a Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sun, 16 Aug 2015 13:37:20 +0200 Subject: [PATCH 057/169] kde-plasma: Allow to build with kde-frameworks/{baloo,kfilemetadata} Package-Manager: portage-2.2.20.1 --- kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild | 2 +- kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild | 4 ++-- kde-plasma/plasma-meta/plasma-meta-5.3.2.ebuild | 2 -- kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild index 2531fafbf2626..2c522c5766f41 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild @@ -13,7 +13,7 @@ KEYWORDS="~amd64" IUSE="+fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad usb" COMMON_DEPEND=" - $(add_plasma_dep baloo) + || ( $(add_plasma_dep baloo) $(add_frameworks_dep baloo) ) $(add_plasma_dep kwin) $(add_plasma_dep plasma-workspace) $(add_frameworks_dep attica) diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild index 5d8e33548ab1a..282658af96ce0 100644 --- a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild +++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild @@ -25,8 +25,8 @@ DEPEND=" dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( - $(add_plasma_dep baloo) - $(add_plasma_dep kfilemetadata) + || ( $(add_plasma_dep baloo) $(add_frameworks_dep baloo) ) + || ( $(add_plasma_dep kfilemetadata) $(add_frameworks_dep kfilemetadata) ) ) " RDEPEND="${DEPEND} diff --git a/kde-plasma/plasma-meta/plasma-meta-5.3.2.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.3.2.ebuild index 5a79d6cb306de..e099e1050bd0e 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.3.2.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.3.2.ebuild @@ -15,12 +15,10 @@ KEYWORDS="~amd64" IUSE="bluetooth +display-manager gtk +sddm networkmanager +wallpapers" RDEPEND=" - $(add_plasma_dep baloo) $(add_plasma_dep breeze) $(add_plasma_dep kde-cli-tools) $(add_plasma_dep kdecoration) $(add_plasma_dep kdeplasma-addons) - $(add_plasma_dep kfilemetadata) $(add_plasma_dep khelpcenter) $(add_plasma_dep khotkeys) $(add_plasma_dep kinfocenter) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild index f3af7ec4acd84..d107c3025440d 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.3.2.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~amd64" IUSE="dbus +drkonqi gps prison qalculate +systemmonitor" COMMON_DEPEND=" - $(add_plasma_dep baloo) + || ( $(add_plasma_dep baloo) $(add_frameworks_dep baloo) ) $(add_plasma_dep kwayland) $(add_plasma_dep kwin) $(add_plasma_dep libkscreen) From e1d276a50f9798a9c29488dbc34d9ba271bee903 Mon Sep 17 00:00:00 2001 From: Andrew Savchenko Date: Sun, 16 Aug 2015 14:32:44 +0300 Subject: [PATCH 058/169] net-fs/openafs{,-kernel}: update maintainers information These packages are now directly maintained by NP-Hardass, proxy-maintaining is no longer required. --- net-fs/openafs-kernel/metadata.xml | 10 ++-------- net-fs/openafs/metadata.xml | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/net-fs/openafs-kernel/metadata.xml b/net-fs/openafs-kernel/metadata.xml index 14612822dde96..fad2f16ae5b4b 100644 --- a/net-fs/openafs-kernel/metadata.xml +++ b/net-fs/openafs-kernel/metadata.xml @@ -2,19 +2,13 @@ net-fs -proxy-maintainers np.hardass@gmail.com - proxied maintainer, please assign bugs to - - - steve@pressers.name - Steven Presser - proxied maintainer, please CC on bugs + please assign bugs to bircoph@gentoo.org Andrew Savchenko - maintainer, please CC on bugs + please CC on bugs diff --git a/net-fs/openafs/metadata.xml b/net-fs/openafs/metadata.xml index 8a2e43a1f5652..ff3a2d22bba92 100644 --- a/net-fs/openafs/metadata.xml +++ b/net-fs/openafs/metadata.xml @@ -2,20 +2,14 @@ net-fs -proxy-maintainers np.hardass@gmail.com - proxied maintainer, please assign bugs to - - - steve@pressers.name - Steven Presser - proxied maintainer, please CC on bugs + please assign bugs to bircoph@gentoo.org Andrew Savchenko - maintainer, please CC on bugs + please CC on bugs Build libafs kernel module. Disable only if you know From daf4abd9bde6828ebfff643f026475cccee2558d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Sun, 16 Aug 2015 13:04:12 +0100 Subject: [PATCH 059/169] net-mail/notmuch: Remove oldest versions Package-Manager: portage-2.2.20.1 --- net-mail/notmuch/Manifest | 2 - net-mail/notmuch/metadata.xml | 2 - net-mail/notmuch/notmuch-0.16-r1.ebuild | 172 ------------------------ net-mail/notmuch/notmuch-0.17.ebuild | 163 ---------------------- 4 files changed, 339 deletions(-) delete mode 100644 net-mail/notmuch/notmuch-0.16-r1.ebuild delete mode 100644 net-mail/notmuch/notmuch-0.17.ebuild diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest index a3d441374e6b8..e9ddfc4ce6edf 100644 --- a/net-mail/notmuch/Manifest +++ b/net-mail/notmuch/Manifest @@ -1,5 +1,3 @@ -DIST notmuch-0.16.tar.gz 588739 SHA256 e7792dec15be845c55ad265d06339325f03b9c886ab3836b7e80a6eb6841f344 SHA512 0b00abb32a340d25a6566b453ae086e13bd4f7f3c64a9dd827f0665733a1dc343c7df562282c4d9feb9ce7dff59f9c379daf599d6641156ace33c37f73974143 WHIRLPOOL 065452ead0bdc1f63b46419d7045fd798734e9d34a12e5673362f8302ae8b2d3eada3ca157eb55bcf9c0ec5f5fb3cf37b2ecdf5c9ab15e3a4590808fa0866213 -DIST notmuch-0.17.tar.gz 606710 SHA256 d215e0e7e536c50bc0d8a455a58bb4ddabe0678cc637c4dcebdb57d5c4bcbe95 SHA512 cb649aceba1a3e25d4cff51f212aa85d0efe9907af4bcb9390cd1cf5e29c48d4145d9ecd1b040eaef588c63bfb5296bdfef683c22872841b5631481f5d832c03 WHIRLPOOL 98d4a5c5b72ac6d237b2c77d80481dcaa43be87c4bcd0a53aa55e4d008c70a88738706b92a169fa8b12681cb6e169162d0bfc01a5fbce95d73dccf5c12b267c4 DIST notmuch-0.18.2.tar.gz 635438 SHA256 e99f7bfee1250aa9f23e05d926ec278316fb8dd135262b0e24f4ba1a78febc9c SHA512 f6c7c9f17b1a7560bae8d3c7023be2fa6661a1dee5d69a6449a7b7c4468730b6917a857f015b67f09e18801e084a4c65a24a01603683e0ed12fc24b9feb9250e WHIRLPOOL 40191e7078088b45deda2ab2d61a3e2448c61e63b69dd725a88ff68cfaedf68a6270f2d9171ef6a8cb475c4faefd9d84b899f7239953b53aebceede79a76199c DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb SHA512 41eba85d2e6f89693f53d607abdef837973204e709f2c7385e64507a19b316913851f17b3b6dc93d8a622c72756b3e696aad8189570a563df38994cf346791a5 WHIRLPOOL 380d2508f106fc08b31f7928d63587cfc7ed63835a0cde287d7ba09d3f6814070c789aad1d0bf6a3bab387273b2d37a8c783d939c2f4afa475b9785f2618a25a DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml index 1de81c8610c79..7972cdfb4545b 100644 --- a/net-mail/notmuch/metadata.xml +++ b/net-mail/notmuch/metadata.xml @@ -14,8 +14,6 @@ Install experimental tag sharing / pseudo-bug-tracking script for Notmuch (see http://notmuchmail.org/nmbug/) - Experimental threaded message view for the emacs - interface Notmuch is a system for indexing, searching, reading, and tagging large diff --git a/net-mail/notmuch/notmuch-0.16-r1.ebuild b/net-mail/notmuch/notmuch-0.16-r1.ebuild deleted file mode 100644 index 9e9351d52299d..0000000000000 --- a/net-mail/notmuch/notmuch-0.16-r1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python{2_7,3_3} ) - -inherit bash-completion-r1 elisp-common eutils pax-utils distutils-r1 - -DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging" -HOMEPAGE="http://notmuchmail.org/" -SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -REQUIRED_USE=" - pick? ( emacs ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( crypt emacs python ) - " -IUSE="crypt debug doc emacs mutt nmbug pick python test" - -CDEPEND=" - >=dev-libs/glib-2.22 - >=dev-libs/gmime-2.6.7 - =virtual/emacs-23 ) - python? ( ${PYTHON_DEPS} ) - x86? ( >=dev-libs/xapian-1.2.7-r2 ) - " -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) ) - test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2] - >=app-editors/emacs-vcs-23[libxml2] ) Date: Sun, 16 Aug 2015 14:08:48 +0200 Subject: [PATCH 060/169] dev-lang/php: Stable for HPPA (bug #556952). Package-Manager: portage-2.2.20.1 --- dev-lang/php/php-5.5.28.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/php/php-5.5.28.ebuild b/dev-lang/php/php-5.5.28.ebuild index daddbb47220b3..4b0e0f50a7d4c 100644 --- a/dev-lang/php/php-5.5.28.ebuild +++ b/dev-lang/php/php-5.5.28.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { From c405f0e1e60442ce46f7d2d5c65ef58dc20a1df3 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sun, 16 Aug 2015 14:12:34 +0200 Subject: [PATCH 061/169] net-analyzer/wireshark: Stable for HPPA (bug #557522). Package-Manager: portage-2.2.20.1 --- net-analyzer/wireshark/wireshark-1.12.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild index f95b0a3aab95e..a0578c30f58dd 100644 --- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild +++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd" IUSE=" adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl zlib From e913049da47a6a22a414f9337e6918e549ad6c9c Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 16 Aug 2015 14:39:10 +0200 Subject: [PATCH 062/169] kde-frameworks/kwallet: Update gpgmepp package name Package-Manager: portage-2.2.20.1 Signed-off-by: Johannes Huber --- kde-frameworks/kwallet/kwallet-5.13.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/kwallet/kwallet-5.13.0.ebuild b/kde-frameworks/kwallet/kwallet-5.13.0.ebuild index 2798f1d955f70..9af54c76a59d7 100644 --- a/kde-frameworks/kwallet/kwallet-5.13.0.ebuild +++ b/kde-frameworks/kwallet/kwallet-5.13.0.ebuild @@ -35,7 +35,7 @@ DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package gpg Gpgme) - $(cmake-utils_use_find_package gpg Gpgmepp) + $(cmake-utils_use_find_package gpg KF5Gpgmepp) ) kde5_src_configure } From 985101784d11bb2b309b3d8a53dc02cbf72449c4 Mon Sep 17 00:00:00 2001 From: Agostino Sarubbo Date: Sun, 16 Aug 2015 15:10:15 +0200 Subject: [PATCH 063/169] sys-kernel/vanilla-sources: Automated version bump to 3.2.71 - remove old. Package-Manager: portage-2.2.20.1 --- sys-kernel/vanilla-sources/Manifest | 2 +- ...illa-sources-3.2.70.ebuild => vanilla-sources-3.2.71.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sys-kernel/vanilla-sources/{vanilla-sources-3.2.70.ebuild => vanilla-sources-3.2.71.ebuild} (100%) diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest index fa24c73f0db6d..8e8a381a200f3 100644 --- a/sys-kernel/vanilla-sources/Manifest +++ b/sys-kernel/vanilla-sources/Manifest @@ -26,7 +26,7 @@ DIST patch-3.10.86.xz 1158056 SHA256 330c1176511d0fbd16ec68732c14183216d1aa422dc DIST patch-3.12.46.xz 1313524 SHA256 cc052c3c1bf2442f22396f0658b7b8a078402859416cbf5a16eb8d40bc9416aa SHA512 7173b508d173fa389b06362fe823b6f22bf3a43245dec735c36b9a9cbb9ee4dbb9fda5b3cceba06f3464e31fb4af2fcd3f543969f4ce3a9170b55270283781b6 WHIRLPOOL a56cc8a8f05ff210cd7dbe903d40cdfcd26960c00efea323d2ef08690940914ecdbc0d50835a4409670615fc01947687fffdd2d2f68309ad3f9095d714882894 DIST patch-3.14.50.xz 963716 SHA256 12b938ea1f10aa8f8d34833fd2464abde33a7f9eae5a71dad60a50358e9fcca0 SHA512 aa0adfb5e96847944565a9afeebd17305d41a04ada246bc5451fc92575a00a170147b55c610a084472e9f58a1daf272127162f8f341c45158fd7afc7295a3f73 WHIRLPOOL 22bf2570b9e72eb7f2f5f56196171f4d8ba0daa6cea03b3bbd67844bab9f1c4240f7a18292b86857ca56770f31425c8b32ca0ff2fe77eda7f1a53de1fceafb38 DIST patch-3.18.19.xz 566864 SHA256 27764fcbefea9e1a83a2f31c55c1baf8bb580634fdce243c4a386850d2724c37 SHA512 32cc7e9db5e4b607160670b83bf03ef1d850a49c77a45f183543e1c3674bb3e1337480d139959636624c739f97cca9f9f3e16d282dab2151926e50378a1c96c7 WHIRLPOOL 48d79ba1828ce2875af271b1d6891047ee9cc451f95e4e4f304d31578130d9f6b71eb49d94a375ba07e35ceafe36b4d0d528adde0b54c8684021e3bb2b15dbd3 -DIST patch-3.2.70.xz 1438832 SHA256 f19128239756e2ff3cee9e3176f3c4f779ae888d71507a9fded4972228ccb669 SHA512 974f9ea5fa2a4419ee7452846270b04a4be870cb24e3391ac6e2d84366f33e3b9dde5b8cf4cea038075264446e4e3f5778da690ecd43f46efd30187d6fc48bfa WHIRLPOOL 95d891007753cb1f0b9176183cf75a7ea21f56773a52354c8662c6b418d2ec42b43cef6af6043abd2f31f413c9f3761cf8daa7f80af506cd9c2788611636098c +DIST patch-3.2.71.xz 1456808 SHA256 24160af70c29320d74429717d5dfa3cd3547586f558890533a28dc19bc7caa0c SHA512 e953df5d59270abeb4c72fc3a2a660cade1a8b5768d5dd00c11f5b3580c65e8c8ccfb814b5bf591900c35e72c1b3aee91819d1c9ddf9aab0dce44b45750f9578 WHIRLPOOL 8377da2ff6427888db1eb670f677f6bc71f4db46244ced8a2f849b0250cd9deb8d183556987c892f88011b7c5645838048c11e214c7e2026e7f12efad31ad8b4 DIST patch-3.4.108.xz 1249808 SHA256 7909601dd0cab76e933c86fc76bdd64520ff34abb126059f9c02fb4cf2050372 SHA512 50091f2db3cf60d3fe3a0619f9ca72c29ce20f1accbee745849da9d2c0f0de1dd0fb6ba3511356d6d70ab0cbf7e740e16ae45c7dc9311b06a5539684dbac5f94 WHIRLPOOL 3e7341a42f71cceeaec7b19b0558017d66bf7f0c115d8bd47c6cfdc646b319d59c4fb176704c43fe945c72ecb1c052eb8a6dab9c9e99f6c615ee17f6caeda7ac DIST patch-4.0.9.xz 226564 SHA256 842cb3abf053e809b23e615020f3d0730220660f0e71f259dce69510364965f1 SHA512 59cfaba028cf9d669ceac25f967945963330736059f38c01f584d3379e2ac243df3f89836e4815014f6799816746bba49a35915ccc4a66250bb95536d9b9e9f5 WHIRLPOOL 9e59979125dbbfef3ba972be4987606a8ba0ce24ed7cadf216c3b339036dbfc3a071f66fc12b6d0acd41d5ad53e71607d3e01d658f4fa59ebe70767d0e5cbc62 DIST patch-4.1.5.xz 170056 SHA256 b495cf8a7b978986dd2b757b687751c62f635d15cc2228edb80934bc0d449dcc SHA512 1325cdb35ea1f277d513932af37804f788b96ae63b94cedeb3c9b916ee8963bbd6aca5d0e13279e36a81f1de06005c5f3666ecfc845609932686f261fa4250c5 WHIRLPOOL 291ddfcde395c3d201a8172f7281ac560167a8bce78d3196b47e4c7be759545282cc1104fc7b2edc95d90250a834cc23103199275bc8c6974bd4229dd530d1a3 diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.2.70.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.2.71.ebuild similarity index 100% rename from sys-kernel/vanilla-sources/vanilla-sources-3.2.70.ebuild rename to sys-kernel/vanilla-sources/vanilla-sources-3.2.71.ebuild From de2b0c83e04fc72349b595b779bcda8a8917ba68 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sun, 16 Aug 2015 15:20:58 +0200 Subject: [PATCH 064/169] net-misc/knemo: Fix build, bug 555784 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revision bump adds patch to fix build. Patch provided by baddy . Gentoo-bug: 555784 Reported-by: Toralf Förster Package-Manager: portage-2.2.20.1 --- .../files/knemo-0.7.6-netlinkbackend.patch | 11 +++++ net-misc/knemo/knemo-0.7.6-r2.ebuild | 40 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 net-misc/knemo/files/knemo-0.7.6-netlinkbackend.patch create mode 100644 net-misc/knemo/knemo-0.7.6-r2.ebuild diff --git a/net-misc/knemo/files/knemo-0.7.6-netlinkbackend.patch b/net-misc/knemo/files/knemo-0.7.6-netlinkbackend.patch new file mode 100644 index 0000000000000..fb4dd3a245218 --- /dev/null +++ b/net-misc/knemo/files/knemo-0.7.6-netlinkbackend.patch @@ -0,0 +1,11 @@ +--- ./src/knemod/backends/netlinkbackend.cpp 2015-08-15 14:34:54.823572917 +0600 ++++ ./src/knemod/backends/netlinkbackend.cpp.new 2015-08-15 14:34:15.680238396 +0600 +@@ -30,6 +30,8 @@ + #include "utils.h" + #include "netlinkbackend.h" + ++#include ++ + #ifndef IFF_LOWER_UP + #define IFF_LOWER_UP 0x10000 + #endif diff --git a/net-misc/knemo/knemo-0.7.6-r2.ebuild b/net-misc/knemo/knemo-0.7.6-r2.ebuild new file mode 100644 index 0000000000000..8c0ab2cacb2cc --- /dev/null +++ b/net-misc/knemo/knemo-0.7.6-r2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_LINGUAS="ar bg br bs cs cy da de el en_GB eo es et fi fr ga gl hr hu is it +ja ka km lt ms nb nds nl pl pt pt_BR ro ru rw sk sl sr sv tr ug uk zh_CN zh_TW" +inherit kde4-base + +DESCRIPTION="The KDE Network Monitor" +HOMEPAGE="http://kde-apps.org/content/show.php?content=12956" +SRC_URI="http://www.kde-apps.org/CONTENT/content-files/12956-${P}.tar.bz2" + +SLOT="4" +KEYWORDS="~amd64 ~x86" +LICENSE="GPL-2" +IUSE="debug wifi" + +DEPEND=" + $(add_kdebase_dep ksysguard) + $(add_kdebase_dep systemsettings) + dev-libs/libnl:3 + sys-apps/net-tools + dev-qt/qtsql:4[sqlite] + wifi? ( net-wireless/wireless-tools ) +" +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS ChangeLog README ) + +PATCHES=( "${FILESDIR}/${P}-netlinkbackend.patch" ) + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_no wifi WIRELESS_SUPPORT) + ) + + kde4-base_src_configure +} From 2a84d30e55502c01c27fa176e3e09c09c59361d7 Mon Sep 17 00:00:00 2001 From: Naohiro Aota Date: Sun, 16 Aug 2015 22:22:46 +0900 Subject: [PATCH 065/169] dev-util/perf: fix install dir perf binary and libs are accidentaly installed under / not /usr. Add a patch to fix "prefix=" behavior and reuse prefix argument. --- dev-util/perf/files/perf-4.1.5-prefix.patch | 43 +++++++++++++++++++ ...perf-4.1.5.ebuild => perf-4.1.5-r1.ebuild} | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 dev-util/perf/files/perf-4.1.5-prefix.patch rename dev-util/perf/{perf-4.1.5.ebuild => perf-4.1.5-r1.ebuild} (98%) diff --git a/dev-util/perf/files/perf-4.1.5-prefix.patch b/dev-util/perf/files/perf-4.1.5-prefix.patch new file mode 100644 index 0000000000000..0c4dff011306a --- /dev/null +++ b/dev-util/perf/files/perf-4.1.5-prefix.patch @@ -0,0 +1,43 @@ +commit 75e84ab906ef8935cff3df3d8929f1bafea81599 +Author: Lukas Wunner +Date: Thu Jun 18 13:00:32 2015 +0200 + + perf tools: Fix build breakage if prefix= is specified + + Invoking Makefile.perf with prefix= breaks the build since Makefile.perf + hands that variable down to Makefile.build where it overrides + + prefix := $(subst ./,,$(OUTPUT)$(dir)/) + + leading to errors like this: + + No rule to make target '/usrabspath.o', needed by '/usrlibperf-in.o' + + Signed-off-by: Lukas Wunner + Acked-by: Jiri Olsa + Cc: David Ahern + Fixes: c819e2cf2eb6f65d3208d195d7a0edef6108d5 + Link: http://lkml.kernel.org/r/5582c48a.84a22b0a.a918.5285SMTPIN_ADDED_MISSING@mx.google.com + Signed-off-by: Arnaldo Carvalho de Melo + +diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build +index 10df572..98cfc38 100644 +--- a/tools/build/Makefile.build ++++ b/tools/build/Makefile.build +@@ -94,12 +94,12 @@ obj-y := $(patsubst %/, %/$(obj)-in.o, $(obj-y)) + subdir-obj-y := $(filter %/$(obj)-in.o, $(obj-y)) + + # '$(OUTPUT)/dir' prefix to all objects +-prefix := $(subst ./,,$(OUTPUT)$(dir)/) +-obj-y := $(addprefix $(prefix),$(obj-y)) +-subdir-obj-y := $(addprefix $(prefix),$(subdir-obj-y)) ++objprefix := $(subst ./,,$(OUTPUT)$(dir)/) ++obj-y := $(addprefix $(objprefix),$(obj-y)) ++subdir-obj-y := $(addprefix $(objprefix),$(subdir-obj-y)) + + # Final '$(obj)-in.o' object +-in-target := $(prefix)$(obj)-in.o ++in-target := $(objprefix)$(obj)-in.o + + PHONY += $(subdir-y) + diff --git a/dev-util/perf/perf-4.1.5.ebuild b/dev-util/perf/perf-4.1.5-r1.ebuild similarity index 98% rename from dev-util/perf/perf-4.1.5.ebuild rename to dev-util/perf/perf-4.1.5-r1.ebuild index b49b73f636539..1323e675b275a 100644 --- a/dev-util/perf/perf-4.1.5.ebuild +++ b/dev-util/perf/perf-4.1.5-r1.ebuild @@ -107,6 +107,8 @@ src_prepare() { epatch "${WORKDIR}"/${P}.patch fi + epatch "${FILESDIR}"/${P}-prefix.patch + # Drop some upstream too-developer-oriented flags and fix the # Makefile in general sed -i \ @@ -140,10 +142,10 @@ perf_make() { # but it also wants to know about the split value -- i386/x86_64 vs just # x86. We can get that by telling the func to use an older linux version. # It's kind of a hack, but not that bad ... - # prefix="/usr" bindir_relative="bin" \ local arch=$(tc-arch-kernel) emake V=1 \ CC="$(tc-getCC)" AR="$(tc-getAR)" \ + prefix="/usr" bindir_relative="bin" \ CFLAGS_OPTIMIZE="${CFLAGS}" \ LDFLAGS_OPTIMIZE="${LDFLAGS}" \ ARCH="${arch}" \ From 6745a49a8922fa8847fb9aea39d7da7b987e768c Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 16 Aug 2015 15:45:47 +0200 Subject: [PATCH 066/169] net-im/jabberd2: version bump to 2.3.3 Gentoo-Bug: 539534 --- net-im/jabberd2/Manifest | 1 + net-im/jabberd2/jabberd2-2.3.3.ebuild | 157 ++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100644 net-im/jabberd2/jabberd2-2.3.3.ebuild diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest index 9e461eda2d330..176fa40c09fbe 100644 --- a/net-im/jabberd2/Manifest +++ b/net-im/jabberd2/Manifest @@ -1,2 +1,3 @@ DIST jabberd-2.3.1.tar.xz 1460088 SHA256 feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0 SHA512 93a594ac4a39643c66e330ef4912ecee8071fdc3e3f460514d0bff60b2031caa2ef5eaad00dede59e4a4d6f7b8e5b52d56daa3959f3b341082933d175cb49b2c WHIRLPOOL 667c576cf7915dc80b2b044e0e0483ef9ef5268daec069542013accf7089acf1428310521f4b1dd144b2a3ebde7a5ec2d70b50a065c76588c8e7de7d9da50136 DIST jabberd-2.3.2.tar.xz 1473436 SHA256 ceb1f427fde5bf3d1acf2275a2ea3c8c680470ee1aa2be2dda66092d60cd3d50 SHA512 10b00dc4409b59dd30ab85a3c42e4b7b10d1d733d0e73eac5984c6b0bb1edbbca29e3a5e56f86d9a0b94acd3f582ab0575db9387abd345edb154fe5ac7765e03 WHIRLPOOL 42a88b8a53dd8fb22b3157103f307c2d2635953b530536777e35a2e1a46a03351e54c93e192b793f276a98fc6b1699628ca2f8a1284a2f2f4d9db3210f579183 +DIST jabberd-2.3.3.tar.xz 1457340 SHA256 c6c2f34d0811e90c5c791143018bb5b07ecbe2ea5d8cc10140235d25815cb030 SHA512 c3c8d6829c3bc61555280d90edc1bef0228e4cec2684ba283373075883ef64bfa5e9118dad96d7a1193bb2afb6b2e7c78e24267e6feb6e7b191138bf8c79a7da WHIRLPOOL 0c590d79905ff95d2e18362065e0ba4e2341fdc95a61d3e157993d7d16976480b81f2f4b0479516538b1c5c0c9b496b446383da89c2e17539f8f9cb59db62463 diff --git a/net-im/jabberd2/jabberd2-2.3.3.ebuild b/net-im/jabberd2/jabberd2-2.3.3.ebuild new file mode 100644 index 0000000000000..af82c89460b09 --- /dev/null +++ b/net-im/jabberd2/jabberd2-2.3.3.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit db-use eutils flag-o-matic pam + +DESCRIPTION="Open Source Jabber Server" +HOMEPAGE="http://jabberd2.org" +SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" +IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test zlib" +REQUIRED_USE="memdebug? ( debug )" + +# broken +RESTRICT="test" + +DEPEND="dev-libs/expat + net-libs/udns + net-dns/libidn + virtual/gsasl + berkdb? ( >=sys-libs/db-4.1.25:* ) + ldap? ( net-nds/openldap ) + mysql? ( virtual/mysql ) + pam? ( virtual/pam ) + postgres? ( dev-db/postgresql:* ) + ssl? ( >=dev-libs/openssl-1.0.1:0 ) + sqlite? ( dev-db/sqlite:3 ) + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND} + >=net-im/jabber-base-0.01" +DEPEND="${DEPEND} + app-arch/xz-utils + virtual/pkgconfig + test? ( dev-libs/check )" + +DOCS=( AUTHORS README ) + +S=${WORKDIR}/jabberd-${PV} + +src_prepare() { + # Fix some default directory locations + sed -i \ + -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ + -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ + -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ + -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ + -e 's,@localstatedir@,/var/spool,g' \ + -e 's,@package@,jabber,g' \ + etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!" + + # If the package wasn't merged with sqlite then default to use berkdb + use sqlite || + sed -i \ + -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db,g' \ + etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!" + + # avoid file collision with x11-misc/screen-message wrt #453994 + sed -i \ + -e 's/@jabberd_router_bin@/jabberd2-router/' \ + -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \ + -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \ + -e 's/@jabberd_sm_bin@/jabberd2-sm/' \ + etc/jabberd*.in || die "fixing file collisions failed!" + + # rename pid files wrt #241472 + sed -i \ + -e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \ + -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \ + -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \ + -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \ + etc/*.xml.dist.in || die "renaming pid files failed!" +} + +src_configure() { + # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3 + # https://github.com/jabberd2/jabberd2/issues/34 + replace-flags -O[3s] -O2 + + # --enable-pool-debug is currently broken + econf \ + --sysconfdir=/etc/jabber \ + $(usex debug "--enable-debug" "") \ + $(usex memdebug "--enable-nad-debug" "") \ + $(use_enable ssl) \ + $(use_enable mysql) \ + $(use_enable postgres pgsql) \ + $(use_enable sqlite) \ + $(use_enable berkdb db) \ + $(use_enable ldap) \ + $(use_enable pam) \ + --enable-pipe \ + --enable-anon \ + --enable-fs \ + $(use_enable experimental) \ + $(use_enable test tests) \ + $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \ + $(use_with zlib) +} + +src_install() { + local i + + default + prune_libtool_files --modules + + keepdir /var/spool/jabber/{fs,db} + fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ + /var/spool/jabber/{fs,db} + fperms 770 /var/spool/jabber/{fs,db} + fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} + + # avoid file collision with x11-misc/screen-message wrt #453994 + for i in router sm c2s s2s ; do + einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" + mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die + done + + newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd + newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd + + docompress -x /usr/share/doc/${PF}/tools + docinto tools + dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \ + tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} + + # remove useless upstart files wrt #498900 + rm -rf "${ED%/}"/usr/etc +} + +pkg_postinst() { + if use pam; then + echo + ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' + ewarn 'be in the form of "contactname@jabberdomain". This behavior' + ewarn 'is likely to change in future versions of jabberd-2. It may' + ewarn 'be advisable to avoid PAM authentication for the time being.' + echo + fi + + if use sqlite || use mysql || use postgres; then + echo + einfo "You will need to setup or update your database using the" + einfo "scripts in /usr/share/doc/${PF}/tools/" + echo + fi + + ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have' + ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because' + ewarn 'the binaries have been renamed to avoid file collisions!' +} From 12a4bee5575e673c108f532617df5f16088e0910 Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Sun, 16 Aug 2015 14:52:59 +0000 Subject: [PATCH 067/169] app-emulation/virtualbox: remove hard dependency on {jre,jdk}-1.7 and set {jre,jdk}-1.6 as a minimum requirement. Fixes bug 556424. Package-Manager: portage-2.2.18 Signed-off-by: Patrice Clement --- .../virtualbox/virtualbox-5.0.0-r1.ebuild | 425 ++++++++++++++++++ 1 file changed, 425 insertions(+) create mode 100644 app-emulation/virtualbox/virtualbox-5.0.0-r1.ebuild diff --git a/app-emulation/virtualbox/virtualbox-5.0.0-r1.ebuild b/app-emulation/virtualbox/virtualbox-5.0.0-r1.ebuild new file mode 100644 index 0000000000000..c7f848eee38db --- /dev/null +++ b/app-emulation/virtualbox/virtualbox-5.0.0-r1.ebuild @@ -0,0 +1,425 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev + +MY_PV="${PV/beta/BETA}" +MY_PV="${MY_PV/rc/RC}" +MY_P=VirtualBox-${MY_PV} +SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 + http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.0_beta3-patches-01.tar.xz" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use" +HOMEPAGE="http://www.virtualbox.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa doc headless java pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc" + +RDEPEND="!app-emulation/virtualbox-bin + ~app-emulation/virtualbox-modules-${PV} + dev-libs/libIDL + >=dev-libs/libxslt-1.1.19 + net-misc/curl + dev-libs/openssl:0= + dev-libs/libxml2 + media-libs/libpng:0= + media-libs/libvpx + sys-libs/zlib + !headless? ( + qt4? ( + dev-qt/qtgui:4 + dev-qt/qtcore:4 + opengl? ( dev-qt/qtopengl:4 ) + x11-libs/libXinerama + ) + opengl? ( virtual/opengl media-libs/freeglut ) + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXt + media-libs/libsdl:0[X,video] + ) + + java? ( >=virtual/jre-1.6 ) + udev? ( >=virtual/udev-171 ) + vnc? ( >=net-libs/libvncserver-0.9.9 )" +DEPEND="${RDEPEND} + >=dev-util/kbuild-0.1.9998_pre20131130 + >=dev-lang/yasm-0.6.2 + sys-devel/bin86 + sys-power/iasl + pam? ( sys-libs/pam ) + sys-libs/libcap + doc? ( + dev-texlive/texlive-basic + dev-texlive/texlive-latex + dev-texlive/texlive-latexrecommended + dev-texlive/texlive-latexextra + dev-texlive/texlive-fontsrecommended + dev-texlive/texlive-fontsextra + ) + java? ( >=virtual/jre-1.6 ) + virtual/pkgconfig + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + !headless? ( x11-libs/libXinerama ) + pulseaudio? ( media-sound/pulseaudio ) + vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) + ${PYTHON_DEPS}" + +QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so + usr/lib/virtualbox/VBoxSDL.so + usr/lib/virtualbox/VBoxSharedFolders.so + usr/lib/virtualbox/VBoxDD2.so + usr/lib/virtualbox/VBoxOGLrenderspu.so + usr/lib/virtualbox/VBoxPython.so + usr/lib/virtualbox/VBoxDD.so + usr/lib/virtualbox/VBoxDDU.so + usr/lib/virtualbox/VBoxREM64.so + usr/lib/virtualbox/VBoxSharedClipboard.so + usr/lib/virtualbox/VBoxHeadless.so + usr/lib/virtualbox/VBoxRT.so + usr/lib/virtualbox/VBoxREM.so + usr/lib/virtualbox/VBoxSettings.so + usr/lib/virtualbox/VBoxKeyboard.so + usr/lib/virtualbox/VBoxSharedCrOpenGL.so + usr/lib/virtualbox/VBoxVMM.so + usr/lib/virtualbox/VirtualBox.so + usr/lib/virtualbox/VBoxOGLhosterrorspu.so + usr/lib/virtualbox/components/VBoxC.so + usr/lib/virtualbox/components/VBoxSVCM.so + usr/lib/virtualbox/components/VBoxDDU.so + usr/lib/virtualbox/components/VBoxRT.so + usr/lib/virtualbox/components/VBoxREM.so + usr/lib/virtualbox/components/VBoxVMM.so + usr/lib/virtualbox/VBoxREM32.so + usr/lib/virtualbox/VBoxPython2_4.so + usr/lib/virtualbox/VBoxPython2_5.so + usr/lib/virtualbox/VBoxPython2_6.so + usr/lib/virtualbox/VBoxPython2_7.so + usr/lib/virtualbox/VBoxXPCOMC.so + usr/lib/virtualbox/VBoxOGLhostcrutil.so + usr/lib/virtualbox/VBoxNetDHCP.so + usr/lib/virtualbox/VBoxNetNAT.so" + +REQUIRED_USE=" + java? ( sdk ) + python? ( + ( sdk ) + ) + vboxwebsrv? ( java ) + ${PYTHON_REQUIRED_USE} +" + +pkg_setup() { + if ! use headless && ! use qt4 ; then + einfo "No USE=\"qt4\" selected, this build will not include" + einfo "any Qt frontend." + elif use headless && use qt4 ; then + einfo "You selected USE=\"headless qt4\", defaulting to" + einfo "USE=\"headless\", this build will not include any X11/Qt frontend." + fi + + if ! use opengl ; then + einfo "No USE=\"opengl\" selected, this build will lack" + einfo "the OpenGL feature." + fi + if ! use python ; then + einfo "You have disabled the \"python\" USE flag. This will only" + einfo "disable the python bindings being installed." + fi + java-pkg-opt-2_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + # Remove shipped binaries (kBuild,yasm), see bug #232775 + rm -rf kBuild/bin tools + + # Disable things unused or split into separate ebuilds + sed -e "s@MY_LIBDIR@$(get_libdir)@" \ + "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die + + # Respect LDFLAGS + sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ + -i Config.kmk src/libs/xpcom18a4/Config.kmk || die + + # Use PAM only when pam USE flag is enbaled (bug #376531) + if ! use pam ; then + elog "Disabling PAM removes the possibility to use the VRDP features." + sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die + sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \ + src/VBox/HostServices/Makefile.kmk || die + fi + + # add correct java path + if use java ; then + sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \ + -i "${S}"/Config.kmk || die + java-pkg-opt-2_src_prepare + fi + + if ! gcc-specs-pie ; then + EPATCH_EXCLUDE="050_${PN}-4.3.14-nopie.patch" + fi + + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}/patches" + + #epatch "${FILESDIR}/${PN}-5.0.0_beta1-dont_build_validationkit.patch" + + epatch_user +} + +src_configure() { + local myconf + use alsa || myconf+=" --disable-alsa" + use doc || myconf+=" --disable-docs" + use java || myconf+=" --disable-java" + use opengl || myconf+=" --disable-opengl" + use pulseaudio || myconf+=" --disable-pulse" + use python || myconf+=" --disable-python" + use vboxwebsrv && myconf+=" --enable-webservice" + use vnc && myconf+=" --enable-vnc" + if ! use headless ; then + use qt4 || myconf+=" --disable-qt4" + else + myconf+=" --build-headless --disable-opengl" + fi + if use amd64 && ! has_multilib_profile ; then + myconf+=" --disable-vmmraw" + fi + # not an autoconf script + ./configure \ + --with-gcc="$(tc-getCC)" \ + --with-g++="$(tc-getCXX)" \ + --disable-kmods \ + --disable-dbus \ + --disable-devmapper \ + ${myconf} \ + || die "configure failed" +} + +src_compile() { + source ./env.sh + + # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529) + # and strip all flags + # strip-flags + + MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+') + MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') + MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" + MAKE="kmk" emake \ + VBOX_BUILD_PUBLISHER=_Gentoo \ + TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ + TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ + TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ + TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \ + VBOX_GCC_OPT="${CXXFLAGS}" \ + TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \ + all +} + +src_install() { + cd "${S}"/out/linux.${ARCH}/release/bin || die + + # Create configuration files + insinto /etc/vbox + newins "${FILESDIR}/${PN}-4-config" vbox.cfg + + # Set the right libdir + sed -i \ + -e "s@MY_LIBDIR@$(get_libdir)@" \ + "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed" + + # Symlink binaries to the shipped wrapper + exeinto /usr/$(get_libdir)/${PN} + newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox" + fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox + fperms 0750 /usr/$(get_libdir)/${PN}/VBox + + dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage + dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP + dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless + dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl + + # Install binaries and libraries + insinto /usr/$(get_libdir)/${PN} + doins -r components + + if use sdk ; then + doins -r sdk + fi + + if use vboxwebsrv ; then + doins vboxwebsrv + fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv + fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv + dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv + newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv + newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv + fi + + #local gcfiles="*gc" + #if use amd64 && ! has_multilib_profile ; then + # gcfiles="" + #fi + + for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 *.rc ; do + doins ${each} + fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each} + fperms 0750 /usr/$(get_libdir)/${PN}/${each} + done + + # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case.. + for each in VBoxNet{AdpCtl,DHCP,NAT} ; do + doins ${each} + fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each} + fperms 4750 /usr/$(get_libdir)/${PN}/${each} + done + + # VBoxSVC and VBoxManage need to be pax-marked (bug #403453) + # VBoxXPCOMIPCD (bug #524202) + for each in VBox{Manage,SVC,XPCOMIPCD} ; do + pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} || die + done + + if ! use headless ; then + for each in VBox{SDL,Headless} ; do + doins ${each} + fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each} + fperms 4750 /usr/$(get_libdir)/${PN}/${each} + pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} + done + + if use opengl && use qt4 ; then + doins VBoxTestOGL + fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL + fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL + pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL + fi + + dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL + + if use qt4 ; then + doins VirtualBox + fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox + fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox + pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox \ + || die + + dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox + + newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop + fi + + pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die + for size in 16 32 48 64 128 ; do + newicon -s ${size} ${PN}-${size}px.png ${PN}.png + done + newicon ${PN}-48px.png ${PN}.png + popd &>/dev/null || die + else + doins VBoxHeadless + fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless + fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless + pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless || die + fi + + insinto /usr/$(get_libdir)/${PN} + # Install EFI Firmware files (bug #320757) + pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die + for fwfile in VBoxEFI{32,64}.fd ; do + doins ${fwfile} + fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} + done + popd &>/dev/null || die + + if use udev ; then + # New way of handling USB device nodes for VBox (bug #356215) + local udevdir="$(get_udevdir)" + insinto ${udevdir} + doins VBoxCreateUSBNode.sh + fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh + fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh + insinto ${udevdir}/rules.d + doins "${FILESDIR}"/10-virtualbox.rules + sed "s@%UDEVDIR%@${udevdir}@" \ + -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die + fi + + insinto /usr/share/${PN} + if ! use headless && use qt4 ; then + doins -r nls + fi + + # VRDPAuth only works with this (bug #351949) + dosym VBoxAuth.so /usr/$(get_libdir)/${PN}/VRDPAuth.so + + # set an env-variable for 3rd party tools + echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox" + doenvd "${T}/90virtualbox" + + if use java ; then + java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar" + java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so" + fi +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + if use udev ; then + udevadm control --reload-rules \ + && udevadm trigger --subsystem-match=usb + fi + + if ! use headless && use qt4 ; then + elog "To launch VirtualBox just type: \"VirtualBox\"." + fi + elog "You must be in the vboxusers group to use VirtualBox." + elog "" + elog "The latest user manual is available for download at:" + elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf" + elog "" + elog "For advanced networking setups you should emerge:" + elog "net-misc/bridge-utils and sys-apps/usermode-utilities" + elog "" + elog "IMPORTANT!" + elog "If you upgrade from app-emulation/virtualbox-ose make sure to run" + elog "\"env-update\" as root and logout and relogin as the user you wish" + elog "to run ${PN} as." + elog "" + elog "Starting with version 4.0.0, ${PN} has USB-1 support." + elog "For USB-2 support, PXE-boot ability and VRDP support please emerge" + elog " app-emulation/virtualbox-extpack-oracle" + elog "package." + elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and" + elog "the \"extension\" USE flag. For installation of the guest additions ISO" + elog "image, please emerge" + elog " app-emulation/virtualbox-additions" + elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge" + elog " app-emulation/virtualbox-extpack-oracle" + if ! use udev ; then + elog "" + elog "WARNING!" + elog "Without USE=udev, USB devices will likely not work in ${PN}." + elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then + elog "" + elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\"" + elog "or else USB in ${PN} won't work." + fi +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} From 92b44a68171d3a0d820c714ea0d65385d6206f49 Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Sun, 16 Aug 2015 15:02:27 +0000 Subject: [PATCH 068/169] profiles: Mask dev-java/httpunit for removal. See bug 557920. Signed-off-by: Patrice Clement --- profiles/package.mask | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index b5306e7cf5e46..c56977bdb76ab 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,12 @@ #--- END OF EXAMPLES --- + +# Patrice Clement (16 Aug 2015) +# Last release was in 2008. Does not compile with recent JDKs (>= 1.8). +# Masked for removal. See bug #557920. +dev-java/httpunit + # Patrice Clement (16 Aug 2015) # Project discontinued: part of the java.util namespace as of Java 8. # See https://docs.oracle.com/javase/8/docs/api/java/util/Base64.html. From 88256ace04fa92f3b71d41fa4c2a3305fde730d1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 16 Aug 2015 10:05:52 -0400 Subject: [PATCH 069/169] dev-libs/efl: require newer wayland #557172 --- dev-libs/efl/efl-1.15.0.ebuild | 2 +- dev-libs/efl/efl-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/efl/efl-1.15.0.ebuild b/dev-libs/efl/efl-1.15.0.ebuild index cb15054225bec..6b10b0c3a1d09 100644 --- a/dev-libs/efl/efl-1.15.0.ebuild +++ b/dev-libs/efl/efl-1.15.0.ebuild @@ -73,7 +73,7 @@ RDEPEND=" tslib? ( x11-libs/tslib ) valgrind? ( dev-util/valgrind ) wayland? ( - >=dev-libs/wayland-1.3.0 + >=dev-libs/wayland-1.8.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) diff --git a/dev-libs/efl/efl-9999.ebuild b/dev-libs/efl/efl-9999.ebuild index f69b54dc4e62e..21220e28eb475 100644 --- a/dev-libs/efl/efl-9999.ebuild +++ b/dev-libs/efl/efl-9999.ebuild @@ -73,7 +73,7 @@ RDEPEND=" tslib? ( x11-libs/tslib ) valgrind? ( dev-util/valgrind ) wayland? ( - >=dev-libs/wayland-1.3.0 + >=dev-libs/wayland-1.8.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) From ef84bdb03c699eb2c13e31cf4b74c065392dcbf5 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 17:13:11 +0300 Subject: [PATCH 070/169] dev-db/mariadb: amd64 stable wrt bug #555480 Package-Manager: portage-2.2.20.1 --- dev-db/mariadb/mariadb-10.0.21.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-db/mariadb/mariadb-10.0.21.ebuild b/dev-db/mariadb/mariadb-10.0.21.ebuild index 24da847e9a36b..5c7c423ff8226 100644 --- a/dev-db/mariadb/mariadb-10.0.21.ebuild +++ b/dev-db/mariadb/mariadb-10.0.21.ebuild @@ -11,7 +11,7 @@ inherit toolchain-funcs mysql-multilib IUSE="$IUSE" # REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" # When MY_EXTRAS is bumped, the index should be revised to exclude these. EPATCH_EXCLUDE='' From 8aff38ed87661bd2506e240e575b25bb8a90ebab Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 16 Aug 2015 10:18:37 -0400 Subject: [PATCH 071/169] dev-libs/wayland: version bump to 1.8.1 #556880 --- dev-libs/wayland/Manifest | 1 + dev-libs/wayland/wayland-1.8.1.ebuild | 62 +++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 dev-libs/wayland/wayland-1.8.1.ebuild diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest index fa0c6876cf206..db28f8111a946 100644 --- a/dev-libs/wayland/Manifest +++ b/dev-libs/wayland/Manifest @@ -9,3 +9,4 @@ DIST wayland-1.5.0.tar.xz 404644 SHA256 0069e1e9af888b3e05384380ad8cc6c976ea3e81 DIST wayland-1.6.0.tar.xz 415192 SHA256 a7d5102dcf53d08c059d24bc62de491d7cd482070abeb6737a20d0d86ba6fc7f SHA512 11fc8cb90f00a07b9952c073f1d18bf53284a46b4cc3aa5c71ed33cf509fca0cdf45afbdb852461a7fae236424b1be0e5314a2bbde8a59de2ab81246960da055 WHIRLPOOL 376a4023e47cf5ce624b4d724386b5b8e6cce0696bed8103301cf72fa816bd144e5f3f346a71a3776a1ee922f52fd26060d5b021bf0c7d2ee68fefbe0fe4ea1e DIST wayland-1.6.1.tar.xz 418628 SHA256 d1aeb95b433cab33a928b56cb80efa551802e0a064adb4a8ea1517249d3c10b0 SHA512 28a0980ece2fb4ba0ca688f3913ffba34c2741167d7686be80cfbc9cb56f995282a68173d69d2849eb5c2986684ebe6d5cfaca04518ab74a4512c8dfb4d8d0c2 WHIRLPOOL be307a292c8f939921700fc85c9ad1675c491fdc3e1a16ffc52512e39d971f6afdbd378c60c57a64781cdccb364ed77271e07b64f5c3b7b96abd45a1595dfc4e DIST wayland-1.7.0.tar.xz 372004 SHA256 bdea47a2db96f7e53f1ce0351559c0af5b7f7aae7e95f0a884a78af9f1057c9c SHA512 2475a5e8c2ef5c4bc97d90f946a89e4155d840a342886a7634df5423e5764973dbf5d721e1a8a941b7bd2305017cdcb74af7a29bee7bb8b58373306e5c03add7 WHIRLPOOL 152be0d1c3ac314cd3dcd765e6a04eaa71b618b1577c423147ccb5b1d82cdeaf09d09c8933746e6bd100b2d59374749084eede36b9075a153328fda179955ea2 +DIST wayland-1.8.1.tar.xz 374116 SHA256 f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8 SHA512 392edd22203fc44a37a66d7a099d0534f047f49e91b28614092346f0167c07a39431c5919f2ea1deaf460dc53a77fba8504a7a7f5d03af638267c767bb07ae19 WHIRLPOOL f15ea109324c0c84b848f458acb6786248fb1c7ee8dafd6ef945d4f80f5b87b911dd2d2c0485b1ceeeed95454990e186e7d8b04d366f903954dd8998a1f3999f diff --git a/dev-libs/wayland/wayland-1.8.1.ebuild b/dev-libs/wayland/wayland-1.8.1.ebuild new file mode 100644 index 0000000000000..ebfe2830bd689 --- /dev/null +++ b/dev-libs/wayland/wayland-1.8.1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}" + GIT_ECLASS="git-r3" + EXPERIMENTAL="true" + AUTOTOOLS_AUTORECONF=1 +fi + +inherit autotools-multilib toolchain-funcs $GIT_ECLASS + +DESCRIPTION="Wayland protocol libraries" +HOMEPAGE="http://wayland.freedesktop.org/" + +if [[ ${PV} == 9999* ]]; then + SRC_URI="${SRC_PATCHES}" +else + SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz" +fi + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="doc static-libs" + +RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + doc? ( + >=app-doc/doxygen-1.6[dot] + app-text/xmlto + >=media-gfx/graphviz-2.26.0 + sys-apps/grep[pcre] + ) + virtual/pkgconfig" + +src_configure() { + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable doc documentation) + ) + if tc-is-cross-compiler ; then + myeconfargs+=( --disable-scanner ) + fi + if ! multilib_is_native_abi; then + myeconfargs+=( --disable-documentation ) + fi + + autotools-multilib_src_configure +} + +src_test() { + export XDG_RUNTIME_DIR="${T}/runtime-dir" + mkdir "${XDG_RUNTIME_DIR}" || die + chmod 0700 "${XDG_RUNTIME_DIR}" || die + + autotools-multilib_src_test +} From 48ad977b8a166c1ae5079fee8b60aae90e0d0ad6 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 15:39:59 +0200 Subject: [PATCH 072/169] media-sound/lame: Add missing dep on ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- media-sound/lame/lame-3.99.5-r1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-sound/lame/lame-3.99.5-r1.ebuild b/media-sound/lame/lame-3.99.5-r1.ebuild index b1fb71d78b905..48f81fd4e0d73 100644 --- a/media-sound/lame/lame-3.99.5-r1.ebuild +++ b/media-sound/lame/lame-3.99.5-r1.ebuild @@ -18,7 +18,8 @@ IUSE="debug cpu_flags_x86_mmx mp3rtp sndfile static-libs" # These deps are without MULTILIB_USEDEP and are correct since we only build # libmp3lame for multilib and these deps apply to the lame frontend executable. -RDEPEND=">=sys-libs/ncurses-5.7-r7 +RDEPEND=" + >=sys-libs/ncurses-5.7-r7:5= sndfile? ( >=media-libs/libsndfile-1.0.2 ) abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} From c24d3eba5c6f4ddc1fb03399204b26ec6955646d Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 15:43:05 +0200 Subject: [PATCH 073/169] net-p2p/rtorrent: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild index c47b58d297eaf..5659667a7105c 100644 --- a/net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild +++ b/net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild @@ -18,7 +18,7 @@ IUSE="daemon debug ipv6 selinux test xmlrpc" COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.} >=dev-libs/libsigc++-2.2.2:2 >=net-misc/curl-7.19.1 - sys-libs/ncurses + sys-libs/ncurses:5= xmlrpc? ( dev-libs/xmlrpc-c )" RDEPEND="${COMMON_DEPEND} daemon? ( app-misc/screen ) From f92484568b6ef062d96202f1bf69f17aefd031f9 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 15:50:15 +0200 Subject: [PATCH 074/169] app-portage/ufed: Use slot operators for ncurses Additionally: * drop base.eclass usage in favour of "epatch ${PATCHES[@]}" * clean old * merge changes into live ebuild Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- app-portage/ufed/Manifest | 3 -- app-portage/ufed/ufed-0.40.2-r1.ebuild | 44 ------------------------ app-portage/ufed/ufed-0.90_rc1.ebuild | 37 -------------------- app-portage/ufed/ufed-0.90_rc2-r1.ebuild | 41 ---------------------- app-portage/ufed/ufed-0.90_rc2.ebuild | 39 --------------------- app-portage/ufed/ufed-0.91.ebuild | 2 +- app-portage/ufed/ufed-0.92.ebuild | 6 ++-- app-portage/ufed/ufed-9999.ebuild | 9 +++-- 8 files changed, 8 insertions(+), 173 deletions(-) delete mode 100644 app-portage/ufed/ufed-0.40.2-r1.ebuild delete mode 100644 app-portage/ufed/ufed-0.90_rc1.ebuild delete mode 100644 app-portage/ufed/ufed-0.90_rc2-r1.ebuild delete mode 100644 app-portage/ufed/ufed-0.90_rc2.ebuild diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest index 383cd1b5c5ad1..f1fbb63a5a1bc 100644 --- a/app-portage/ufed/Manifest +++ b/app-portage/ufed/Manifest @@ -1,5 +1,2 @@ -DIST ufed-0.40.2.tar.bz2 33982 SHA256 d88048e1940ba774d8517e80109cf3f0d93e2113841be9aaad14995da284a3cf SHA512 81b37d92cac9a247c97b8b741410962a5cb55a507d0092863f15d084b00b1482092ab6153277c0d0f4728cdfdbbda41d54431f4d3cf939270ee451f2938a1b3e WHIRLPOOL 36c88488f06b06eea99b1004ee67e69ea579965ae74a37a49e7a9a01fc43dd599a7cc056b270f6f937ab975ce6fd7691acf7ab2a2cde0d4fe0db11dbc01c0fbf -DIST ufed-0.90_rc1.tar.bz2 51336 SHA256 291c48ed7baa183fac394affaff97d43c448244bfdb0365ac14f650f13e67ee4 SHA512 f1fc03f425d2b7e51d8dba386ae8dfb8b947fb5506270c27f6148d36a8075468b268ef7b0d65f54a44dc9961dc1527050eae310f27472725151468301890d47e WHIRLPOOL ab5a16546171dbea26da098a789baa72c99dcc9bca0e890ae5952478fdcce2e28103e6e20fbad8659ae2addacd3d697d34dbe14df09401ffb46b1f5979163d01 -DIST ufed-0.90_rc2.tar.bz2 51762 SHA256 f85226fffd20e971a9e5c1599e67aa3ae46f10d267eb57f65bba2bfc7321ece8 SHA512 c5ed326596d4c6706ba2a2ad6ecfe0e2700121878fbdb71f4fe7793895649498c3a3bd4e226e5478af6e13d9519ee3e84b3a85dfd47fb986432c6ebb898eae1d WHIRLPOOL 8d639fe966f675b171e420e8ad9b8b30d4beeb62dde6fe4eb0cce7c9a4186035bdedce32d55e9a7a432aafb641e2fb437d72abaa9c64a32337ece961254ae323 DIST ufed-0.91.tar.bz2 61466 SHA256 1f53be6c2a3dacf3e88f43245fd9775c793236044c85441a6f80bed7ff2f11fd SHA512 34fc57b4d3fd1e8c4226401aec409ce4303294ec9044673ec62053b8dc6ade9d54419a5d208ba6767b75507bc9f8983a401dc258b0bae5b733e7a0c791554c35 WHIRLPOOL 9ee78247430ac3ece6f7e52cadc2305ef409f02c556576a8dea47ba25082b81fc917350854d479363a77558b8b0a312a58d76b233b29510b69e75983bf7515b6 DIST ufed-0.92.tar.bz2 61606 SHA256 0816d2ba522e1e61ab585c13bb67c33ca037ab3021f958a9e66803d678692405 SHA512 b1a608d026945144653f43ad322e54f0f1192d39fea3da2a4919e07de65445c75aa5e2d1e8cf9b24849c45f891a0de5952c92b3227f6c1200965f3c280611408 WHIRLPOOL 388ed787bf5743fa8d431b3cdbb97fb01106057b74b0dd6bac97fd89b213b400ecd2626f690ae06e7d77edf1cdc72b6a4dfaf07db6eef59a02be0b3e84a4487d diff --git a/app-portage/ufed/ufed-0.40.2-r1.ebuild b/app-portage/ufed/ufed-0.40.2-r1.ebuild deleted file mode 100644 index e9a695221d684..0000000000000 --- a/app-portage/ufed/ufed-0.40.2-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit base multilib autotools prefix - -DESCRIPTION="Gentoo Linux USE flags editor" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND="sys-libs/ncurses" -RDEPEND="${DEPEND} - dev-lang/perl" - -# Populate the patches array for patches applied for -rX releases -# It is an array of patch file names of the form: -# "${FILESDIR}"/${P}-make.globals-path.patch -PATCHES=( - "${FILESDIR}"/${P}-prefix.patch - "${FILESDIR}"/${P}-manpage-URL.patch -) - -src_prepare() { - base_src_prepare - # Change the version number to reflect the ebuild version - sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac - eprefixify ufed.8 - eautoreconf -} -src_configure() { - econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed -} - -src_install() { - emake DESTDIR="${D}" install || die -} diff --git a/app-portage/ufed/ufed-0.90_rc1.ebuild b/app-portage/ufed/ufed-0.90_rc1.ebuild deleted file mode 100644 index d17f1c957b08d..0000000000000 --- a/app-portage/ufed/ufed-0.90_rc1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit base eutils multilib autotools - -DESCRIPTION="Gentoo Linux USE flags editor" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND="sys-libs/ncurses" -RDEPEND="${DEPEND} - dev-lang/perl" - -# Populate the patches array for patches applied for -rX releases -# It is an array of patch file names of the form: -# "${FILESDIR}"/${P}-make.globals-path.patch -PATCHES=() - -src_prepare() { - base_src_prepare - # Change the version number to reflect the ebuild version - sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac - eautoreconf -} - -src_configure() { - econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed -} diff --git a/app-portage/ufed/ufed-0.90_rc2-r1.ebuild b/app-portage/ufed/ufed-0.90_rc2-r1.ebuild deleted file mode 100644 index d9073eb8b82e3..0000000000000 --- a/app-portage/ufed/ufed-0.90_rc2-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit base eutils multilib autotools - -DESCRIPTION="Gentoo Linux USE flags editor" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="" - -COMMON_DEPEND="sys-libs/ncurses" -RDEPEND="${COMMON_DEPEND} - dev-lang/perl" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" - -# Populate the patches array for patches applied for -rX releases -# It is an array of patch file names of the form: -# "${FILESDIR}"/${P}-make.globals-path.patch -PATCHES=( - "${FILESDIR}"/${P}-get_portdir_from_portageq.patch -) - -src_prepare() { - base_src_prepare - # Change the version number to reflect the ebuild version - sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac - eautoreconf -} - -src_configure() { - econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed -} diff --git a/app-portage/ufed/ufed-0.90_rc2.ebuild b/app-portage/ufed/ufed-0.90_rc2.ebuild deleted file mode 100644 index de55bfd8e6d8b..0000000000000 --- a/app-portage/ufed/ufed-0.90_rc2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit base eutils multilib autotools - -DESCRIPTION="Gentoo Linux USE flags editor" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="" - -COMMON_DEPEND="sys-libs/ncurses" -RDEPEND="${COMMON_DEPEND} - dev-lang/perl" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" - -# Populate the patches array for patches applied for -rX releases -# It is an array of patch file names of the form: -# "${FILESDIR}"/${P}-make.globals-path.patch -PATCHES=() - -src_prepare() { - base_src_prepare - # Change the version number to reflect the ebuild version - sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac - eautoreconf -} - -src_configure() { - econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed -} diff --git a/app-portage/ufed/ufed-0.91.ebuild b/app-portage/ufed/ufed-0.91.ebuild index e30a13a6f81d0..612668467c98d 100644 --- a/app-portage/ufed/ufed-0.91.ebuild +++ b/app-portage/ufed/ufed-0.91.ebuild @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="" -COMMON_DEPEND="sys-libs/ncurses" +COMMON_DEPEND="sys-libs/ncurses:5=" RDEPEND="${COMMON_DEPEND} dev-lang/perl" DEPEND="${COMMON_DEPEND} diff --git a/app-portage/ufed/ufed-0.92.ebuild b/app-portage/ufed/ufed-0.92.ebuild index 9690899e46599..a737b5dcf6886 100644 --- a/app-portage/ufed/ufed-0.92.ebuild +++ b/app-portage/ufed/ufed-0.92.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit base eutils multilib autotools +inherit eutils multilib autotools DESCRIPTION="Gentoo Linux USE flags editor" HOMEPAGE="http://www.gentoo.org/" @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="" -COMMON_DEPEND="sys-libs/ncurses" +COMMON_DEPEND="sys-libs/ncurses:5=" RDEPEND="${COMMON_DEPEND} dev-lang/perl" DEPEND="${COMMON_DEPEND} @@ -28,7 +28,7 @@ DEPEND="${COMMON_DEPEND} PATCHES=() src_prepare() { - base_src_prepare + # epatch "${PATCHES[@]}" # Change the version number to reflect the ebuild version sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac eautoreconf diff --git a/app-portage/ufed/ufed-9999.ebuild b/app-portage/ufed/ufed-9999.ebuild index 80651693e199f..28503973005f9 100644 --- a/app-portage/ufed/ufed-9999.ebuild +++ b/app-portage/ufed/ufed-9999.ebuild @@ -2,22 +2,21 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=5 -inherit eutils multilib git-2 autotools - -EGIT_REPO_URI="git://anongit.gentoo.org/proj/ufed.git" +inherit eutils multilib git-r3 autotools DESCRIPTION="Gentoo Linux USE flags editor" HOMEPAGE="http://www.gentoo.org/" SRC_URI="" +EGIT_REPO_URI="git://anongit.gentoo.org/proj/ufed.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" IUSE="" -COMMON_DEPEND="sys-libs/ncurses" +COMMON_DEPEND="sys-libs/ncurses:5=" RDEPEND="${COMMON_DEPEND} dev-lang/perl" DEPEND="${COMMON_DEPEND} From c4c09d78088f4097e0cca3824ce3fafda74aa285 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 15:53:37 +0200 Subject: [PATCH 075/169] media-video/vlc: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- media-video/vlc/vlc-2.1.5-r1.ebuild | 2 +- media-video/vlc/vlc-2.1.9999.ebuild | 2 +- media-video/vlc/vlc-2.2.0.ebuild | 2 +- media-video/vlc/vlc-2.2.1.ebuild | 2 +- media-video/vlc/vlc-2.2.9999.ebuild | 2 +- media-video/vlc/vlc-9999.ebuild | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media-video/vlc/vlc-2.1.5-r1.ebuild b/media-video/vlc/vlc-2.1.5-r1.ebuild index e2edee1c65eab..c7556a0a28adc 100644 --- a/media-video/vlc/vlc-2.1.5-r1.ebuild +++ b/media-video/vlc/vlc-2.1.5-r1.ebuild @@ -115,7 +115,7 @@ RDEPEND=" mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1.0.0:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) - ncurses? ( sys-libs/ncurses:5[unicode] ) + ncurses? ( sys-libs/ncurses:5=[unicode] ) ogg? ( media-libs/libogg:0 ) opencv? ( >media-libs/opencv-2.0:0 ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild index e80ec35c56919..09e1fc0ca11c0 100644 --- a/media-video/vlc/vlc-2.1.9999.ebuild +++ b/media-video/vlc/vlc-2.1.9999.ebuild @@ -115,7 +115,7 @@ RDEPEND=" mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1.0.0:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) - ncurses? ( sys-libs/ncurses:5[unicode] ) + ncurses? ( sys-libs/ncurses:5=[unicode] ) ogg? ( media-libs/libogg:0 ) opencv? ( >media-libs/opencv-2.0:0 ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) diff --git a/media-video/vlc/vlc-2.2.0.ebuild b/media-video/vlc/vlc-2.2.0.ebuild index a1473a478b3c6..1b8eee3c00da2 100644 --- a/media-video/vlc/vlc-2.2.0.ebuild +++ b/media-video/vlc/vlc-2.2.0.ebuild @@ -112,7 +112,7 @@ RDEPEND=" mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) - ncurses? ( sys-libs/ncurses:5[unicode] ) + ncurses? ( sys-libs/ncurses:5=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0 ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) diff --git a/media-video/vlc/vlc-2.2.1.ebuild b/media-video/vlc/vlc-2.2.1.ebuild index 9f74073b91790..57d3bd04dbc5f 100644 --- a/media-video/vlc/vlc-2.2.1.ebuild +++ b/media-video/vlc/vlc-2.2.1.ebuild @@ -111,7 +111,7 @@ RDEPEND=" mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) - ncurses? ( sys-libs/ncurses:5[unicode] ) + ncurses? ( sys-libs/ncurses:5=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0 ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild index 929e3d8c02214..07186e7c22e38 100644 --- a/media-video/vlc/vlc-2.2.9999.ebuild +++ b/media-video/vlc/vlc-2.2.9999.ebuild @@ -112,7 +112,7 @@ RDEPEND=" mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) - ncurses? ( sys-libs/ncurses:5[unicode] ) + ncurses? ( sys-libs/ncurses:5=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0 ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 289589ef067c8..1f9bb76688220 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -111,7 +111,7 @@ RDEPEND=" mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) - ncurses? ( sys-libs/ncurses:5[unicode] ) + ncurses? ( sys-libs/ncurses:5=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0 ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) From 9f3859db086b260419059b3af1df33cf9c92571e Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 15:57:20 +0200 Subject: [PATCH 076/169] app-misc/screen: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- app-misc/screen/screen-4.2.1-r2.ebuild | 5 +++-- app-misc/screen/screen-4.3.1.ebuild | 3 ++- app-misc/screen/screen-9999.ebuild | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app-misc/screen/screen-4.2.1-r2.ebuild b/app-misc/screen/screen-4.2.1-r2.ebuild index c5d04d19bb354..22177edec7f11 100644 --- a/app-misc/screen/screen-4.2.1-r2.ebuild +++ b/app-misc/screen/screen-4.2.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,7 +15,8 @@ SLOT="0" KEYWORDS=" ~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug nethack pam selinux multiuser" -CDEPEND=">=sys-libs/ncurses-5.2 +CDEPEND=" + >=sys-libs/ncurses-5.2:5= pam? ( virtual/pam )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-screen )" diff --git a/app-misc/screen/screen-4.3.1.ebuild b/app-misc/screen/screen-4.3.1.ebuild index b46e4b57e241a..4c0c60aadf091 100644 --- a/app-misc/screen/screen-4.3.1.ebuild +++ b/app-misc/screen/screen-4.3.1.ebuild @@ -15,7 +15,8 @@ SLOT="0" KEYWORDS=" ~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug nethack pam selinux multiuser" -CDEPEND=">=sys-libs/ncurses-5.2 +CDEPEND=" + >=sys-libs/ncurses-5.2:5= pam? ( virtual/pam )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-screen )" diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild index 2b211a10782d6..1b18b57585521 100644 --- a/app-misc/screen/screen-9999.ebuild +++ b/app-misc/screen/screen-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,7 +20,8 @@ SLOT="0" KEYWORDS="" IUSE="debug nethack pam selinux multiuser" -CDEPEND=">=sys-libs/ncurses-5.2 +CDEPEND=" + >=sys-libs/ncurses-5.2:5= pam? ( virtual/pam )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-screen )" From 4eae307569530fa4d0786afe14fee897e7a7df5a Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:00:36 +0200 Subject: [PATCH 077/169] dev-lang/ruby: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-lang/ruby/metadata.xml | 2 +- dev-lang/ruby/ruby-2.0.0_p645.ebuild | 2 +- dev-lang/ruby/ruby-2.1.6-r1.ebuild | 2 +- dev-lang/ruby/ruby-2.2.2-r1.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml index 47732fa63ea4c..bf0744a3d1d3e 100644 --- a/dev-lang/ruby/metadata.xml +++ b/dev-lang/ruby/metadata.xml @@ -23,7 +23,7 @@ Install dev-ruby/rdoc after installing Ruby. - + Use dev-libs/jemalloc for memory allocation. diff --git a/dev-lang/ruby/ruby-2.0.0_p645.ebuild b/dev-lang/ruby/ruby-2.0.0_p645.ebuild index 392d7918a3bf7..ee69640bcc7cd 100644 --- a/dev-lang/ruby/ruby-2.0.0_p645.ebuild +++ b/dev-lang/ruby/ruby-2.0.0_p645.ebuild @@ -41,7 +41,7 @@ RDEPEND=" gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl:0 ) socks5? ( >=net-proxy/dante-1.1.13 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) readline? ( sys-libs/readline:0 ) dev-libs/libyaml virtual/libffi diff --git a/dev-lang/ruby/ruby-2.1.6-r1.ebuild b/dev-lang/ruby/ruby-2.1.6-r1.ebuild index 685e4c5edbc6c..34ffb69696461 100644 --- a/dev-lang/ruby/ruby-2.1.6-r1.ebuild +++ b/dev-lang/ruby/ruby-2.1.6-r1.ebuild @@ -42,7 +42,7 @@ RDEPEND=" gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl:0 ) socks5? ( >=net-proxy/dante-1.1.13 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) readline? ( sys-libs/readline:0 ) dev-libs/libyaml virtual/libffi diff --git a/dev-lang/ruby/ruby-2.2.2-r1.ebuild b/dev-lang/ruby/ruby-2.2.2-r1.ebuild index 5e2e56fe9e2ff..7f0330c4dfb6f 100644 --- a/dev-lang/ruby/ruby-2.2.2-r1.ebuild +++ b/dev-lang/ruby/ruby-2.2.2-r1.ebuild @@ -40,7 +40,7 @@ RDEPEND=" jemalloc? ( dev-libs/jemalloc ) ssl? ( dev-libs/openssl:0 ) socks5? ( >=net-proxy/dante-1.1.13 ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:5= ) readline? ( sys-libs/readline:0 ) dev-libs/libyaml virtual/libffi From 6be89dcda553ac3dddd25484a8212f70d9a1ad78 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:01:27 +0200 Subject: [PATCH 078/169] sys-apps/texinfo: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sys-apps/texinfo/metadata.xml | 2 +- sys-apps/texinfo/texinfo-6.0.ebuild | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys-apps/texinfo/metadata.xml b/sys-apps/texinfo/metadata.xml index 96a2d586367db..659da0ca93c21 100644 --- a/sys-apps/texinfo/metadata.xml +++ b/sys-apps/texinfo/metadata.xml @@ -1,5 +1,5 @@ -base-system + base-system diff --git a/sys-apps/texinfo/texinfo-6.0.ebuild b/sys-apps/texinfo/texinfo-6.0.ebuild index c9ee432caa7ba..5ad16a83d610c 100644 --- a/sys-apps/texinfo/texinfo-6.0.ebuild +++ b/sys-apps/texinfo/texinfo-6.0.ebuild @@ -15,8 +15,9 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="nls static" -RDEPEND="!=app-text/tetex-2* - >=sys-libs/ncurses-5.2-r2:= +RDEPEND=" + !=app-text/tetex-2* + >=sys-libs/ncurses-5.2-r2:5= dev-lang/perl dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth From 536e4b61aeeeda833b14e80c7578aea5c481ebaf Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:01:51 +0200 Subject: [PATCH 079/169] net-analyzer/iftop: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild | 4 ++-- net-analyzer/iftop/iftop-1.0_pre4.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild index 1bf3dddfb841b..5be1c54303a89 100644 --- a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild +++ b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,7 +17,7 @@ IUSE="" RDEPEND=" net-libs/libpcap - sys-libs/ncurses + sys-libs/ncurses:5= " DEPEND=" ${RDEPEND} diff --git a/net-analyzer/iftop/iftop-1.0_pre4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4.ebuild index 147036bace72b..4742cffb81735 100644 --- a/net-analyzer/iftop/iftop-1.0_pre4.ebuild +++ b/net-analyzer/iftop/iftop-1.0_pre4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,7 +17,7 @@ IUSE="" RDEPEND=" net-libs/libpcap - sys-libs/ncurses" + sys-libs/ncurses:5=" DEPEND=" ${RDEPEND} virtual/pkgconfig From 97fe9d5daa9eef81559bf67833a41b2e1257ac18 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:13:47 +0200 Subject: [PATCH 080/169] dev-vcs/tig: Use slot operators for ncurses; Version Bump Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-vcs/tig/Manifest | 1 + dev-vcs/tig/tig-2.0.3.ebuild | 7 +++--- dev-vcs/tig/tig-2.1.1.ebuild | 49 ++++++++++++++++++++++++++++++++++++ dev-vcs/tig/tig-2.1.ebuild | 6 ++--- 4 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 dev-vcs/tig/tig-2.1.1.ebuild diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest index ca4a5d525dfd7..157c19c33a0f1 100644 --- a/dev-vcs/tig/Manifest +++ b/dev-vcs/tig/Manifest @@ -1,2 +1,3 @@ DIST tig-2.0.3.tar.gz 605513 SHA256 faac0fd80cb771cf34ae0aa9b2fedba1cc0f8aa70731d400661660c8d48f96c4 SHA512 0d16c4ec68d7b846b8cb990756ff683584eaf7eea89f9853d3803c86ef7544e2b80e1376a0e441082d7d23a2496fb7bcf8b5d987fe026b3d85e777064351fa15 WHIRLPOOL 6e63b1622aa593e7ee30db5356f438ef536f428a30f917b1bce43204a4c27b7b21b3268b5c97fde5c6518b4a1fd81a85f2168138e94aab7b8673176c01b0265f +DIST tig-2.1.1.tar.gz 641710 SHA256 50c5179fd564b829b6b2cec087e66f10cf8799601de19350df0772ae77e4852f SHA512 be55ece813e1af938e3c4d805d4f034e78f75c1fcda7f4b5bc02de8b228d6d76b9f4921f6dc079485b8c13a3acc5ea2d146a0c437d28add45d50137ae6545f10 WHIRLPOOL 869012b9e5d47eaa24d7939202819bcf85c44ed4d2de742d7770d8610f3e86dfae43588f626de2785f10e78293c21151272b81b0f196163844ea8b76cce5d01c DIST tig-2.1.tar.gz 635114 SHA256 306287f684f57563a53abf1cf46149e0d30c6b500fbc0c39e9bc059506373cb0 SHA512 d21d263b62675721467aca35cf2f7fbe41e0042ac295516bd67e348039030df53de30f5dea3059c4b13188e450921972920c014f0381729826c727dcdd7f6804 WHIRLPOOL 9a5ea63fd985764c0d06660bc58d3ffe11bb9242ab92ec8dc7d638e1e5f5693e342577fc1bceb7e899386f96baaa467506bfb9a3fc5ff52231c24f317c9cb68d diff --git a/dev-vcs/tig/tig-2.0.3.ebuild b/dev-vcs/tig/tig-2.0.3.ebuild index 3547f5b306775..ee4a698da7426 100644 --- a/dev-vcs/tig/tig-2.0.3.ebuild +++ b/dev-vcs/tig/tig-2.0.3.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit bash-completion-r1 toolchain-funcs -DESCRIPTION="Tig: text mode interface for git" +DESCRIPTION="text mode interface for git" HOMEPAGE="http://jonas.nitro.dk/tig/" SRC_URI="http://jonas.nitro.dk/tig/releases/${P}.tar.gz" @@ -15,8 +15,9 @@ SLOT="0" KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="unicode" -DEPEND="sys-libs/ncurses[unicode?] - sys-libs/readline:0" +DEPEND=" + sys-libs/ncurses:5=[unicode?] + sys-libs/readline:0=" RDEPEND="${DEPEND} dev-vcs/git" diff --git a/dev-vcs/tig/tig-2.1.1.ebuild b/dev-vcs/tig/tig-2.1.1.ebuild new file mode 100644 index 0000000000000..3a943bbc1f82a --- /dev/null +++ b/dev-vcs/tig/tig-2.1.1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit bash-completion-r1 toolchain-funcs + +DESCRIPTION="text mode interface for git" +HOMEPAGE="http://jonas.nitro.dk/tig/" +SRC_URI="http://jonas.nitro.dk/tig/releases/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="unicode" + +DEPEND=" + sys-libs/ncurses:5=[unicode?] + sys-libs/readline:0" +RDEPEND="${DEPEND} + dev-vcs/git" + +src_prepare() { + # pre-generated manpages are in the root directory + sed -i '/^MANDOC/s#doc/##g' Makefile || die +} + +src_configure() { + econf $(use_with unicode ncursesw) +} + +src_compile() { + emake V=1 +} + +src_test() { + # workaround parallel test failures + emake -j1 test +} + +src_install() { + emake DESTDIR="${D}" install install-doc-man + dohtml manual.html README.html NEWS.html + newbashcomp contrib/tig-completion.bash ${PN} + + docinto examples + dodoc contrib/*.tigrc +} diff --git a/dev-vcs/tig/tig-2.1.ebuild b/dev-vcs/tig/tig-2.1.ebuild index 7c5983a2f38b4..236f7668c5f2c 100644 --- a/dev-vcs/tig/tig-2.1.ebuild +++ b/dev-vcs/tig/tig-2.1.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit bash-completion-r1 toolchain-funcs -DESCRIPTION="Tig: text mode interface for git" +DESCRIPTION="text mode interface for git" HOMEPAGE="http://jonas.nitro.dk/tig/" SRC_URI="http://jonas.nitro.dk/tig/releases/${P}.tar.gz" @@ -15,8 +15,8 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="unicode" -DEPEND="sys-libs/ncurses[unicode?] - sys-libs/readline:0" +DEPEND="sys-libs/ncurses:5=[unicode?] + sys-libs/readline:0=" RDEPEND="${DEPEND} dev-vcs/git" From c0f0e4442a54d113f2ac8a0991de573b704b296f Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:16:00 +0200 Subject: [PATCH 081/169] sys-apps/gptfdisk: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sys-apps/gptfdisk/gptfdisk-0.8.10.ebuild | 5 +++-- sys-apps/gptfdisk/gptfdisk-1.0.0.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys-apps/gptfdisk/gptfdisk-0.8.10.ebuild b/sys-apps/gptfdisk/gptfdisk-0.8.10.ebuild index ef98452440a90..9bea75ef7103a 100644 --- a/sys-apps/gptfdisk/gptfdisk-0.8.10.ebuild +++ b/sys-apps/gptfdisk/gptfdisk-0.8.10.ebuild @@ -15,8 +15,9 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="kernel_linux ncurses static" -LIB_DEPEND="dev-libs/popt[static-libs(+)] - ncurses? ( >=sys-libs/ncurses-5.7-r7[static-libs(+)] ) +LIB_DEPEND=" + dev-libs/popt[static-libs(+)] + ncurses? ( >=sys-libs/ncurses-5.7-r7:5=[static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] )" # libuuid RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.0.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.0.ebuild index f96d989e8ea59..9a0e6abb20b9b 100644 --- a/sys-apps/gptfdisk/gptfdisk-1.0.0.ebuild +++ b/sys-apps/gptfdisk/gptfdisk-1.0.0.ebuild @@ -15,8 +15,9 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="kernel_linux ncurses static" -LIB_DEPEND="dev-libs/popt[static-libs(+)] - ncurses? ( >=sys-libs/ncurses-5.7-r7[static-libs(+)] ) +LIB_DEPEND=" + dev-libs/popt[static-libs(+)] + ncurses? ( >=sys-libs/ncurses-5.7-r7:5=[static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] )" # libuuid RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} From 0cb200c0170ae891cb8e67e2f9efe0f027c83375 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:17:08 +0200 Subject: [PATCH 082/169] x11-terms/xterm: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- x11-terms/xterm/xterm-314.ebuild | 2 +- x11-terms/xterm/xterm-315.ebuild | 2 +- x11-terms/xterm/xterm-317.ebuild | 2 +- x11-terms/xterm/xterm-318.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x11-terms/xterm/xterm-314.ebuild b/x11-terms/xterm/xterm-314.ebuild index 061f0bc8ece82..f58ee9a3ac7aa 100644 --- a/x11-terms/xterm/xterm-314.ebuild +++ b/x11-terms/xterm/xterm-314.ebuild @@ -17,7 +17,7 @@ IUSE="+openpty toolbar truetype unicode Xaw3d" COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) - >=sys-libs/ncurses-5.7-r7 + >=sys-libs/ncurses-5.7-r7:5= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw diff --git a/x11-terms/xterm/xterm-315.ebuild b/x11-terms/xterm/xterm-315.ebuild index 8058aea813cb9..30d949d85879a 100644 --- a/x11-terms/xterm/xterm-315.ebuild +++ b/x11-terms/xterm/xterm-315.ebuild @@ -17,7 +17,7 @@ IUSE="+openpty toolbar truetype unicode Xaw3d" COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) - >=sys-libs/ncurses-5.7-r7 + >=sys-libs/ncurses-5.7-r7:5= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw diff --git a/x11-terms/xterm/xterm-317.ebuild b/x11-terms/xterm/xterm-317.ebuild index 8058aea813cb9..30d949d85879a 100644 --- a/x11-terms/xterm/xterm-317.ebuild +++ b/x11-terms/xterm/xterm-317.ebuild @@ -17,7 +17,7 @@ IUSE="+openpty toolbar truetype unicode Xaw3d" COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) - >=sys-libs/ncurses-5.7-r7 + >=sys-libs/ncurses-5.7-r7:5= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw diff --git a/x11-terms/xterm/xterm-318.ebuild b/x11-terms/xterm/xterm-318.ebuild index 8058aea813cb9..30d949d85879a 100644 --- a/x11-terms/xterm/xterm-318.ebuild +++ b/x11-terms/xterm/xterm-318.ebuild @@ -17,7 +17,7 @@ IUSE="+openpty toolbar truetype unicode Xaw3d" COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) - >=sys-libs/ncurses-5.7-r7 + >=sys-libs/ncurses-5.7-r7:5= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw From e34730b5bd1208288b9c86a3942a008c30e8bc01 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:18:25 +0200 Subject: [PATCH 083/169] app-crypt/heimdal: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- app-crypt/heimdal/heimdal-1.5.3-r2.ebuild | 2 +- app-crypt/heimdal/metadata.xml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild b/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild index 21853f9d49590..4c2d10787303e 100644 --- a/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild +++ b/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild @@ -24,7 +24,7 @@ CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}] - sys-libs/ncurses + sys-libs/ncurses:5= >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) diff --git a/app-crypt/heimdal/metadata.xml b/app-crypt/heimdal/metadata.xml index 4fcd8e4919c80..a8ae6730c5014 100644 --- a/app-crypt/heimdal/metadata.xml +++ b/app-crypt/heimdal/metadata.xml @@ -1,17 +1,17 @@ -kerberos -Kerberos 5 implementation from KTH - - + kerberos + Kerberos 5 implementation from KTH + + Adds support for one-time passwords - + Adds support for PKINIT for the initial ticket - + Adds support for LDAP as a database backend - + From 7ff576ff5380d213feb5778b29b62ec247c7c5e3 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 16 Aug 2015 10:21:12 -0400 Subject: [PATCH 084/169] dev-util/ccache: version bump --- dev-util/ccache/Manifest | 1 + dev-util/ccache/ccache-3.2.3.ebuild | 68 +++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 dev-util/ccache/ccache-3.2.3.ebuild diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index a3ada3a556547..fd73d4b1b8551 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -3,3 +3,4 @@ DIST ccache-3.1.10.tar.xz 240932 SHA256 88439f43d3b426ab435afdf69a808511bada4de3 DIST ccache-3.1.9.tar.xz 238988 SHA256 4981fdf3ad851de400d94083a0d03f115ce9ce8062c3fd7a291630294b0006c4 SHA512 b73f5816bb87c2d94200473510ea42a304c5a2c5e5f14720c513574ce3eb983423c5849a786a89df70cbb09852d9ec2761ad37a820a767d7350e1a3243148ac0 WHIRLPOOL 61ef671aae68516ecfaee88a50b8f442968a7ab24595fd7dfc652ab27de80834d90510c62cfcc75dd88e1f3832989633f518ebe5984149c16d5ab9848cff05fc DIST ccache-3.2.1.tar.xz 297868 SHA256 872af34e1d2cef18694001d29db7f167d644e7602ca32cd6c74b28d81458bd9d SHA512 ef0e56f2d1775fb0f401f48cca2a65eb415f4e2ccf0bcfd769045a9c08c3c2977db4edea12e06629f4cb5406cde23cd3ee0910e2e4d5eff9376227fa23c78a7a WHIRLPOOL f3d07cf142258d588a1c6cb9ba77d31d7b568cd18ae131ed3526595c809352b0fa30ae61b0bfcbfde3ea8d959c545119662c25af0cd03c97517be361315e1ffe DIST ccache-3.2.2.tar.xz 300808 SHA256 4f0d99699f24d198494addca0f41a93b0150cdfd01491f15a5d7eb02c7c2a0ca SHA512 fc438f3b00baa41076eee3e5783ea53a208eb348343e587c6f729f7e98462cd20c720fe323fe08f271bc14dae48f7828cef769882f028f3772992989b87b075d WHIRLPOOL 095a125e869910644622b98b7720a01ccc235fbeb8c84ec52017fe52f82fe7b8122584c3e5fa4d39c1344e9c062517a1edb46c3e64fe649e845ed5c1fb455c5a +DIST ccache-3.2.3.tar.xz 301728 SHA256 ec0414fc435982ece8b8fca062f5836ff32c5d5148abd7f80768614ed776600e SHA512 27da2032fd8936253e29f0410fc2f8085967de78ebe300bd1efecf78c67ed5e060e543df96bb29bc1bea75ec4d5e108f89d58dc6d9573bf6fcc8384d00b951dd WHIRLPOOL 721e9e8dab552c40bfd77df3225e33d49553b2bee5ec990dc6f33ce8bdd9009f4f35b75d08d04ce51ee36e0772a5b403c4d8629627dd6d488b717e23b3d3657c diff --git a/dev-util/ccache/ccache-3.2.3.ebuild b/dev-util/ccache/ccache-3.2.3.ebuild new file mode 100644 index 0000000000000..a8d9ebdbe399b --- /dev/null +++ b/dev-util/ccache/ccache-3.2.3.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils readme.gentoo + +DESCRIPTION="fast compiler cache" +HOMEPAGE="http://ccache.samba.org/" +SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND="app-arch/xz-utils + sys-libs/zlib" +RDEPEND="${DEPEND} + sys-apps/gentoo-functions" + +src_prepare() { + # make sure we always use system zlib + rm -rf zlib || die + epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178 + sed \ + -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ + "${FILESDIR}"/ccache-config-3 > ccache-config || die +} + +src_install() { + DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.txt ) + default + + dobin ccache-config + + DOC_CONTENTS=" +To use ccache with **non-Portage** C compiling, add +${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}usr/bin. +Portage 2.0.46-r11+ will automatically take advantage of ccache with +no additional steps. If this is your first install of ccache, type +something like this to set a maximum cache size of 2GB:\\n +# ccache -M 2G\\n +If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n +# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n +ccache now supports sys-devel/clang and dev-lang/icc, too!" + + readme.gentoo_create_doc +} + +pkg_prerm() { + if [[ -z ${REPLACED_BY_VERSION} ]] ; then + "${EROOT}"/usr/bin/ccache-config --remove-links + "${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST} + fi +} + +pkg_postinst() { + "${EROOT}"/usr/bin/ccache-config --install-links + "${EROOT}"/usr/bin/ccache-config --install-links ${CHOST} + + # nuke broken symlinks from previous versions that shouldn't exist + rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die + rm -rf "${EROOT}"/usr/lib/ccache.backup || die + + readme.gentoo_print_elog +} From af10395ca6aeccece86c3b118de90599eb9a4713 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 17:18:18 +0300 Subject: [PATCH 085/169] net-fs/openafs-kernel: amd64 stable wrt bug #556354 Package-Manager: portage-2.2.20.1 --- net-fs/openafs-kernel/openafs-kernel-1.6.12-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.12-r1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.12-r1.ebuild index 7e474e15bf891..957b867091088 100644 --- a/net-fs/openafs-kernel/openafs-kernel-1.6.12-r1.ebuild +++ b/net-fs/openafs-kernel/openafs-kernel-1.6.12-r1.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="IBM BSD openafs-krb5-a APSL-2" SLOT="0" -KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux" +KEYWORDS="amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="" S=${WORKDIR}/${MY_P} From b808fb09fe27ab12caedfac67e5ca703ba7d7ba1 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 17:19:07 +0300 Subject: [PATCH 086/169] net-fs/openafs: amd64 stable wrt bug #556354 Package-Manager: portage-2.2.20.1 --- net-fs/openafs/openafs-1.6.12-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-fs/openafs/openafs-1.6.12-r1.ebuild b/net-fs/openafs/openafs-1.6.12-r1.ebuild index bf62b37cade22..5f8b462d534ab 100644 --- a/net-fs/openafs/openafs-1.6.12-r1.ebuild +++ b/net-fs/openafs/openafs-1.6.12-r1.ebuild @@ -22,7 +22,7 @@ SRC_URI=" LICENSE="IBM BSD openafs-krb5-a APSL-2" SLOT="0" -KEYWORDS="~amd64 ~amd64-linux ~sparc ~x86 ~x86-linux" +KEYWORDS="amd64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc kerberos +modules pam" From 4d10f751d5f03e1e9ec52633229bc6e163241aa9 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 15 Aug 2015 23:54:26 +0100 Subject: [PATCH 087/169] www-servers/tomcat: Remove orphaned patch Package-Manager: portage-2.2.20.1 --- .../files/tomcat-8.0.22-build.xml.patch | 230 ------------------ 1 file changed, 230 deletions(-) delete mode 100644 www-servers/tomcat/files/tomcat-8.0.22-build.xml.patch diff --git a/www-servers/tomcat/files/tomcat-8.0.22-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.22-build.xml.patch deleted file mode 100644 index d7479598837ba..0000000000000 --- a/www-servers/tomcat/files/tomcat-8.0.22-build.xml.patch +++ /dev/null @@ -1,230 +0,0 @@ -diff -Naur apache-tomcat-8.0.18-src-orig/build.xml apache-tomcat-8.0.18-src/build.xml ---- apache-tomcat-8.0.18-src-orig/build.xml 2015-01-28 15:10:36.112146352 -0500 -+++ apache-tomcat-8.0.18-src/build.xml 2015-02-19 18:08:37.971396016 -0500 -@@ -703,24 +703,29 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - -+ - -+ - - -+ - - - -- -+ - - - -@@ -1059,7 +1064,7 @@ - - - -- -+ - - - -@@ -1093,7 +1098,7 @@ - - - -- -+ - - - - - -- -+ - - - - -+ - -@@ -1519,7 +1525,7 @@ - - -+ description="Prepare to build web services extras package" unless="noget"> - - - -@@ -1658,7 +1664,7 @@ - - -+ description="Prepare to build web services extras package" unless="noget"> - - - -@@ -2703,7 +2709,7 @@ - - - -+ description="Download (and build) components necessary to compile" unless="noget"> - - - -@@ -2746,7 +2752,7 @@ - - - -+ description="Download additional components for the tests" unless="noget"> - - - -@@ -2792,7 +2798,7 @@ - - - -+ description="Download additional components for a distribution" unless="noget"> - - - -@@ -2818,18 +2824,18 @@ - - - -- -+ - - - - -- -+ - - - - -- -+ - - - -@@ -2841,7 +2847,7 @@ - - - -- -+ - - - -@@ -2860,7 +2866,7 @@ - - - -- -+ - - - -@@ -2871,7 +2877,7 @@ - - - -- -+ - - - -@@ -2889,7 +2895,7 @@ - - - -- -+ - - - -@@ -2899,7 +2905,7 @@ - - - -- -+ - - - -@@ -2922,7 +2928,7 @@ - - - -- -+ - - - -@@ -2933,7 +2939,7 @@ - - - -- -+ - - - -@@ -2944,7 +2950,7 @@ - - -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - - From 376d26baf99c396be6c12a9c4d95addf932427a6 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sun, 16 Aug 2015 00:18:34 +0100 Subject: [PATCH 088/169] java-ant-2.eclass: Add explicit ant-core SLOT for QA --- eclass/java-ant-2.eclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 982e3eef7659e..ea0f3e05fa90f 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -1,7 +1,7 @@ # eclass for ant based Java packages # # Copyright (c) 2004-2005, Thomas Matthijs -# Copyright (c) 2004-2011, Gentoo Foundation +# Copyright (c) 2004-2015, Gentoo Foundation # Changes: # May 2007: # Made bsfix make one pass for all things and add some glocal targets for @@ -58,7 +58,8 @@ inherit java-utils-2 multilib # Setting this variable non-empty before inheriting java-ant-2 disables adding # dev-java/ant-core into DEPEND. if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then - JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND} >=dev-java/ant-core-1.8.2" + JAVA_ANT_E_DEPEND+=" >=dev-java/ant-core-1.8.2" + [[ "${EAPI:-0}" != 0 ]] && JAVA_ANT_E_DEPEND+=":0" fi # add ant tasks specified in WANT_ANT_TASKS to DEPEND @@ -371,7 +372,7 @@ java-ant_bsfix_files() { # @USAGE: # @DESCRIPTION: # Attempts to fix named build file. -# +# # @CODE # Affected by variables: # JAVA_PKG_BSFIX_SOURCE_TAGS From 480ab71a5cb19f40a74ffaa947b954b0ea4b2783 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sun, 16 Aug 2015 14:39:50 +0100 Subject: [PATCH 089/169] www-servers/tomcat: Version bumps, fix bug #453212, general cleanup * Version bumps for 7.0.63 and 8.0.24. * Start with a minimal classpath by prepending remaining jars to common.loader instead. Fixes bug #453212. * Unbundle javamail at runtime and servlet-api at build time. * Clean up test handling and add missing easymock dependency. * Fix handling of websockets flag under 7. Package-Manager: portage-2.2.20.1 --- www-servers/tomcat/Manifest | 2 + .../files/tomcat-6.0.44-build.xml.patch | 45 +++- .../files/tomcat-7.0.63-build.xml.patch | 121 +++++++++ .../files/tomcat-8.0.24-build.xml.patch | 230 +++++++++++++++++ .../tomcat/files/tomcat-instance-manager.bash | 240 ------------------ www-servers/tomcat/files/tomcat-r1.init | 111 ++++++++ www-servers/tomcat/files/tomcat.conf | 8 + www-servers/tomcat/tomcat-6.0.44-r1.ebuild | 141 ++++++++++ www-servers/tomcat/tomcat-7.0.63.ebuild | 146 +++++++++++ www-servers/tomcat/tomcat-8.0.24.ebuild | 147 +++++++++++ 10 files changed, 945 insertions(+), 246 deletions(-) create mode 100644 www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch create mode 100644 www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch delete mode 100644 www-servers/tomcat/files/tomcat-instance-manager.bash create mode 100644 www-servers/tomcat/files/tomcat-r1.init create mode 100644 www-servers/tomcat/tomcat-6.0.44-r1.ebuild create mode 100644 www-servers/tomcat/tomcat-7.0.63.ebuild create mode 100644 www-servers/tomcat/tomcat-8.0.24.ebuild diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index dafdb4ce8c6cb..1b82f42785899 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,3 +1,5 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff +DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256 443aa92f2668906fb24cc43ba952068240f445df637a6e5da8d4661527536657 SHA512 677b28aa0131d309aed83afc73a778c16fd27a187e971ea6929b9b6b65268caa2a67cc468b15565a7d5944a60e8528cc26c82437b476ebc41ff9556367349d8a WHIRLPOOL a208ac63ed6f7ce7ac23674d8bb20d523b3fb5d10dfb46d292004f9b296986c4cab690f0252ad53bb4c625c3f58e04b9ddcda5a580fdafea20118b93f544760c DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88 +DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a WHIRLPOOL 4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8 diff --git a/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch index 6517dee4d1967..eaa1963e76bf1 100644 --- a/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch @@ -1,6 +1,41 @@ ---- build.xml.orig 2012-07-06 20:26:21.361299240 +0200 -+++ build.xml 2012-07-06 20:26:56.085899911 +0200 -@@ -487,12 +487,14 @@ +diff -Naur apache-tomcat-6.0.44-src.orig/build.xml apache-tomcat-6.0.44-src/build.xml +--- apache-tomcat-6.0.44-src.orig/build.xml 2015-05-08 13:22:05.000000000 +0100 ++++ apache-tomcat-6.0.44-src/build.xml 2015-08-16 14:10:03.609366396 +0100 +@@ -159,12 +159,14 @@ + + + ++ + + + +@@ -307,14 +309,18 @@ + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + + ++ + + ++ + + + +@@ -492,12 +498,14 @@ @@ -15,9 +50,7 @@ ---- build.xml.orig 2012-07-06 20:31:31.387806167 +0200 -+++ build.xml 2012-07-06 20:32:33.185315885 +0200 -@@ -646,9 +646,11 @@ +@@ -649,9 +657,11 @@ diff --git a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch new file mode 100644 index 0000000000000..23181e71ca69f --- /dev/null +++ b/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch @@ -0,0 +1,121 @@ +diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml +--- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100 ++++ apache-tomcat-7.0.63-src/build.xml 2015-08-16 14:17:34.594426081 +0100 +@@ -660,12 +660,14 @@ + + + ++ + + + +@@ -721,26 +723,32 @@ + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + + ++ + + ++ + + ++ + + + + ++ + + + +@@ -1051,14 +1061,15 @@ + + + ++ + + +- ++ + + + ++ description="Prepare to build web services extras package" unless="noget"> + + + +@@ -2642,7 +2653,7 @@ + + + ++ description="Download (and build) components necessary to compile" unless="noget"> + + + +@@ -2699,7 +2710,7 @@ + + + ++ description="Download additional components for the tests" unless="noget"> + + + +@@ -2727,7 +2738,7 @@ + + + ++ description="Download additional components for a distribution" unless="noget"> + + + diff --git a/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch new file mode 100644 index 0000000000000..9854c9da0e79d --- /dev/null +++ b/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch @@ -0,0 +1,230 @@ +diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml +--- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100 ++++ apache-tomcat-8.0.24-src/build.xml 2015-08-14 13:45:50.315788075 +0100 +@@ -697,24 +697,29 @@ + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + + ++ + ++ + + ++ + + + +- ++ + + + +@@ -1049,7 +1054,7 @@ + + + +- ++ + + + +@@ -1083,7 +1088,7 @@ + + + +- ++ + + + + + +- ++ + + + + ++ + +@@ -1542,7 +1548,7 @@ + + ++ description="Prepare to build web services extras package" unless="noget"> + + + +@@ -1681,7 +1687,7 @@ + + ++ description="Prepare to build web services extras package" unless="noget"> + + + +@@ -2739,7 +2745,7 @@ + + + ++ description="Download (and build) components necessary to compile" unless="noget"> + + + +@@ -2773,7 +2779,7 @@ + + + ++ description="Download additional components for the tests" unless="noget"> + + + +@@ -2819,7 +2825,7 @@ + + + ++ description="Download additional components for a distribution" unless="noget"> + + + +@@ -2845,18 +2851,18 @@ + + + +- ++ + + + + +- ++ + + + + +- ++ + + + +@@ -2868,7 +2874,7 @@ + + + +- ++ + + + +@@ -2887,7 +2893,7 @@ + + + +- ++ + + + +@@ -2898,7 +2904,7 @@ + + + +- ++ + + + +@@ -2916,7 +2922,7 @@ + + + +- ++ + + + +@@ -2926,7 +2932,7 @@ + + + +- ++ + + + +@@ -2949,7 +2955,7 @@ + + + +- ++ + + + +@@ -2960,7 +2966,7 @@ + + + +- ++ + + + +@@ -2971,7 +2977,7 @@ + + ++ description="Prepares the source tree to be built in Eclipse" unless="noget"> + + + diff --git a/www-servers/tomcat/files/tomcat-instance-manager.bash b/www-servers/tomcat/files/tomcat-instance-manager.bash deleted file mode 100644 index fcdfebf21495a..0000000000000 --- a/www-servers/tomcat/files/tomcat-instance-manager.bash +++ /dev/null @@ -1,240 +0,0 @@ -#!/bin/bash -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# Author: Ralph Sennhauser - -die() { - echo "${@}" - exit 1 -} - -usage() { - cat < [--suffix s][--user u][--group g] - - Options: - --help: - show this text. - --create: - create a new instance - --remove: - remove an existing instance. - --suffix SUFFIX: - a suffix for this instance. the suffix may not collide with an already - existing instance, defaults to empty. - --user USER: - the user for which to configure this instance for. The user needs to - exist already. defaults to tomcat. - --group GROUP: - the group for which to configure this instance for. The group needs to - exist already. defaults to tomcat. - - Examples: - ${BASH_SOURCE} --create --suffix testing --user tacmot --group tacmot - ${BASH_SOURCE} --remove --suffix testing -EOL -} - -parse_argv() { - action="not specified" - instance_name="tomcat-@SLOT@" - instance_user="tomcat" - instance_group="tomcat" - - while [[ -n $1 ]]; do - case $1 in - --help) - usage - exit 0;; - --suffix) - instance_name+="-$2" - shift; shift;; - --user) - instance_user="$2" - shift; shift;; - --group) - instance_group="$2" - shift; shift;; - --create) - action=create - shift;; - --remove) - action=remove - shift;; - --backup) - action=backup - shift;; - --restore) - action=restore - shift;; - --update) - action=update - shift;; - *) - echo "Invalid option '$1'" - usage - exit 2;; - esac - done - - tomcat_home="/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-@SLOT@" - instance_base="/@GENTOO_PORTAGE_EPREFIX@var/lib/${instance_name}" - instance_conf="/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}" - instance_logs="/@GENTOO_PORTAGE_EPREFIX@var/log/${instance_name}" - instance_temp="/@GENTOO_PORTAGE_EPREFIX@var/tmp/${instance_name}" - - all_targets=( - "${instance_base}" - "${instance_logs}" - "${instance_temp}" - "/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}" - "/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}" - "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}" - ) -} - -test_can_deploy() { - local no_deploy target - for target in "${all_targets[@]}"; do - if [[ -e "${target}" ]]; then - echo "Error: '${target}' already exists." - no_deploy=yes - fi - done - if [[ -n "${no_deploy}" ]]; then - cat <<-EOL - - To protect an existing installation no new instance was deployed. You can use - '${BASH_SOURCE} --remove' - to remove an existing instance first or run - '${BASH_SOURCE} --create --sufix ' - to deploy an instance under a different name - - EOL - usage - exit 1 - fi - - if ! id --user "${instance_user}" >/dev/null 2>&1; then - echo "Error: user '${instance_user}' doesn't exist." - exit 1 - fi - - if ! id --group "${instance_group}" >/dev/null 2>&1; then - echo "Error: group '${instance_group}' doesn't exist." - exit 1 - fi -} - -deploy_instance() { - test_can_deploy - - mkdir -p "${instance_base}"/{work,webapps} || die - mkdir -p "${instance_logs}" || die - mkdir -p "${instance_temp}" || die - - cp -r "${tomcat_home}"/webapps/ROOT "${instance_base}"/webapps || die - - chown -R "${instance_user}":"${instance_group}" \ - "${instance_base}" "${instance_logs}" "${instance_temp}" || die - - find "${instance_base}"/webapps -type d -exec chmod 750 {} + || die - find "${instance_base}"/webapps -type f -exec chmod 640 {} + || die - - # initial config # - - cp -r "${tomcat_home}"/conf "${instance_conf}" || die - - sed -i -e "s|\${catalina.base}/logs|${instance_logs}|" \ - "${instance_conf}"/logging.properties || die - sed -i -e "s|directory=\"logs\"|directory=\"${instance_logs}\"|" \ - "${instance_conf}"/server.xml || die - - mkdir -p "${instance_conf}"/Catalina/localhost || die - cat > "${instance_conf}"/Catalina/localhost/host-manager.xml <<-'EOF' - - - EOF - - cat > "${instance_conf}"/Catalina/localhost/manager.xml <<-'EOF' - - - EOF - - if [[ -d "${tomcat_home}"/webapps/docs ]]; then - cat > "${instance_conf}"/Catalina/localhost/docs.xml <<-'EOF' - - - EOF - fi - - if [[ -d "${tomcat_home}"/webapps/examples ]]; then - cat > "${instance_conf}"/Catalina/localhost/examples.xml <<-'EOF' - - - EOF - fi - - chown -R "${instance_user}":"${instance_group}" "${instance_conf}" || die - find "${instance_conf}" -type d -exec chmod 750 {} + || die - find "${instance_conf}" -type f -exec chmod 640 {} + || die - - # rc script # - - cp "${tomcat_home}"/gentoo/tomcat.init \ - "/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}" || die - - sed -e "s|@INSTANCE_NAME@|${instance_name}|g" \ - -e "s|@INSTANCE_USER@|${instance_user}|g" \ - -e "s|@INSTANCE_GROUP@|${instance_group}|g" \ - "${tomcat_home}"/gentoo/tomcat.conf \ - > "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}" || die - - # some symlinks for tomcat and netbeans # - - ln -s "${instance_conf}" "${instance_base}"/conf || die - ln -s "${instance_temp}" "${instance_base}"/temp || die - - # a note to update the default configuration # - - cat <<-EOL - Successfully created instance '${instance_name}' - It's strongly recommended for production systems to go carefully through the - configuration files at '${instance_conf}'. - The generated initial configuration is close to upstreams default which - favours the demo aspect over hardening. - EOL -} - -remove_instance() { - echo "The following files will be removed permanently:" - local target; for target in "${all_targets[@]}"; do - find ${target} - done - - echo "Type 'yes' to continue" - read - if [[ ${REPLY} == yes ]]; then - rm -rv "${all_targets[@]}" - else - echo "Aborting as requested ..." - fi -} - -parse_argv "$@" - -if [[ ${action} == create ]]; then - deploy_instance -elif [[ ${action} == remove ]]; then - remove_instance -elif [[ ${action} == "not specified" ]]; then - echo "No action specified!" - usage - exit 1 -else - echo "${action} not yet implemented!" - usage - exit 1 -fi diff --git a/www-servers/tomcat/files/tomcat-r1.init b/www-servers/tomcat/files/tomcat-r1.init new file mode 100644 index 0000000000000..3a69a9dad0f8f --- /dev/null +++ b/www-servers/tomcat/files/tomcat-r1.init @@ -0,0 +1,111 @@ +#!/@GENTOO_PORTAGE_EPREFIX@sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="forcestop" + +PIDFILE=/@GENTOO_PORTAGE_EPREFIX@var/run/${RC_SVCNAME}.pid + +: ${CATALINA_HOME:=/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-@SLOT@} +: ${CATALINA_BASE:=/@GENTOO_PORTAGE_EPREFIX@var/lib/${RC_SVCNAME}} +: ${CATALINA_TMPDIR:=/@GENTOO_PORTAGE_EPREFIX@var/tmp/${RC_SVCNAME}} +: ${CATALINA_USER:=tomcat} +: ${CATALINA_GROUP:=tomcat} + +: ${TOMCAT_START:=start} + +: ${JPDA_TRANSPORT:="dt_socket"} +: ${JPDA_ADDRESS:="8000"} +: ${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"} + +export JAVA_HOME=`java-config ${TOMCAT_JVM:+--select-vm ${TOMCAT_JVM}} --jre-home` +export CLASSPATH="${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar" +[[ @SLOT@ = 6 ]] && CLASSPATH+=":/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-servlet-api-2.5/lib/jsp-api.jar:/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-servlet-api-2.5/lib/servlet-api.jar" + +depend() { + use dns logger net +} + +start() { + ebegin "Starting ${RC_SVCNAME}" + + if [ ! -e "${CATALINA_TMPDIR}" ]; then + eerror "CATALINA_TMPDIR does not exist. Unable to start tomcat." + eerror "Please see /@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${RC_SVCNAME} for more information." + eend 1 + fi + + local DEPEND=$(java-config --query DEPEND --package tomcat-@SLOT@):${TOMCAT_EXTRA_JARS} + DEPEND=${DEPEND%:} + + local GCLASSPATH=$(java-config --with-dependencies --classpath "${DEPEND//:/,}"):${TOMCAT_EXTRA_CLASSPATH} + GCLASSPATH=${GCLASSPATH%:} + + local cmd=java args= + if [ "${TOMCAT_START}" = "debug" ] || [ "${TOMCAT_START}" = "-security debug" ] ; then + cmd=jdb + args="${args} -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share" + fi + if [ "${TOMCAT_START}" = "-security debug" ] || [ "${TOMCAT_START}" = "-security start" ]; then + args="${args} -Djava.security.manager" + args="${args} -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy" + fi + if [ "${TOMCAT_START}" = "jpda start" ] ; then + args="${args} ${JPDA_OPTS}" + fi + if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then + args="${args} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \ + -Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties" + fi + + start-stop-daemon --start \ + --quiet --background \ + --chdir "${CATALINA_TMPDIR}" \ + --user ${CATALINA_USER}:${CATALINA_GROUP} \ + --make-pidfile --pidfile ${PIDFILE} \ + --exec ${JAVA_HOME}/bin/${cmd} \ + -- \ + ${JAVA_OPTS} \ + ${args} \ + -Dcatalina.base="${CATALINA_BASE}" \ + -Dcatalina.home="${CATALINA_HOME}" \ + -Djava.io.tmpdir="${CATALINA_TMPDIR}" \ + -Dgentoo.classpath="${GCLASSPATH//:/,}" \ + -classpath "${CLASSPATH}" \ + org.apache.catalina.startup.Bootstrap \ + ${CATALINA_OPTS} \ + ${TOMCAT_START} + + eend $? +} + +stop() { + ebegin "Stopping '${RC_SVCNAME}'" + + start-stop-daemon --stop \ + --quiet --retry=60 \ + --pidfile ${PIDFILE} \ + --exec ${JAVA_HOME}/bin/java \ + -- \ + ${JAVA_OPTS} \ + -classpath "${CLASSPATH}" \ + ${CATALINA_OPTS} \ + stop ${STD_OUT} + + eend $? +} + +forcestop() { + ebegin "Forcing '${RC_SVCNAME}' to stop" + + start-stop-daemon --stop \ + --quiet --retry=60 \ + --pidfile ${PIDFILE} \ + --signal=9 + + if service_started "${RC_SVCNAME}"; then + mark_service_stopped "${RC_SVCNAME}" + fi + + eend $? +} diff --git a/www-servers/tomcat/files/tomcat.conf b/www-servers/tomcat/files/tomcat.conf index a27f93342678d..376af44adef66 100644 --- a/www-servers/tomcat/files/tomcat.conf +++ b/www-servers/tomcat/files/tomcat.conf @@ -17,6 +17,14 @@ # #TOMCAT_EXTRA_JARS="" +# Additional paths to put on the default classpath. +# These should be separated by the : character. +# Note: The extra jars listed here will be visible to webapps. +# Example: +# TOMCAT_EXTRA_CLASSPATH="/path/to/foo.jar:/path/to/bar.jar" +# +#TOMCAT_EXTRA_CLASSPATH="" + # User/Group of this instance. CATALINA_USER=@INSTANCE_USER@ CATALINA_GROUP=@INSTANCE_GROUP@ diff --git a/www-servers/tomcat/tomcat-6.0.44-r1.ebuild b/www-servers/tomcat/tomcat-6.0.44-r1.ebuild new file mode 100644 index 0000000000000..a3155455ffd7c --- /dev/null +++ b/www-servers/tomcat/tomcat-6.0.44-r1.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +JAVA_PKG_IUSE="source test" + +inherit eutils java-pkg-2 java-ant-2 prefix user + +MY_P="apache-${P}-src" + +DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container" +HOMEPAGE="http://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="6" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE="extra-webapps" + +ECJ_SLOT="3.7" +SAPI_SLOT="2.5" + +COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/oracle-javamail:0 + dev-java/tomcat-servlet-api:${SAPI_SLOT}" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.6 + ! Date: Sun, 16 Aug 2015 15:16:02 +0100 Subject: [PATCH 090/169] dev-java/tomcat-servlet-api: Version bumps for 7 and 8 Package-Manager: portage-2.2.20.1 --- dev-java/tomcat-servlet-api/Manifest | 2 ++ .../tomcat-servlet-api-7.0.63.ebuild | 35 ++++++++++++++++++ .../tomcat-servlet-api-8.0.24.ebuild | 36 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.63.ebuild create mode 100644 dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.24.ebuild diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 0daa64dc159ae..51c5cf4dc9516 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -3,5 +3,7 @@ DIST apache-tomcat-5.5.27-src.tar.gz 7382057 SHA256 90bc8abcddda604e855c37035653 DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b39f99b80683b0ee43c72751390e88dcd6114d SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519 WHIRLPOOL 25e987b58af5535914b666a5bb8691146d68b2287796ba25b8a5f792df08f55901a7ea3f419602207f7a8168302b080592bde5f4aeb67b58f40e5da00b8049ad DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff +DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256 443aa92f2668906fb24cc43ba952068240f445df637a6e5da8d4661527536657 SHA512 677b28aa0131d309aed83afc73a778c16fd27a187e971ea6929b9b6b65268caa2a67cc468b15565a7d5944a60e8528cc26c82437b476ebc41ff9556367349d8a WHIRLPOOL a208ac63ed6f7ce7ac23674d8bb20d523b3fb5d10dfb46d292004f9b296986c4cab690f0252ad53bb4c625c3f58e04b9ddcda5a580fdafea20118b93f544760c DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88 +DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a WHIRLPOOL 4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.63.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.63.ebuild new file mode 100644 index 0000000000000..eee41e50b94da --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.63.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +JAVA_PKG_IUSE="source" + +inherit eutils java-pkg-2 java-ant-2 + +MY_A="apache-${P}-src" +MY_P="${MY_A/-servlet-api/}" +DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation" +HOMEPAGE="http://tomcat.apache.org/" +SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="3.0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.6" +RDEPEND=">=virtual/jre-1.6" + +S="${WORKDIR}/${MY_P}/" + +java_prepare() { + cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" + rm -fR */*/build.xml ||die + find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + || die +} + +src_install() { + java-pkg_dojar "${S}"/output/build/lib/*.jar + use source && java-pkg_dosrc java/javax/servlet/ +} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.24.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.24.ebuild new file mode 100644 index 0000000000000..1c1c74f6bb49a --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.24.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +JAVA_PKG_IUSE="source" + +inherit eutils java-pkg-2 java-ant-2 + +MY_A="apache-${P}-src" +MY_P="${MY_A/-servlet-api/}" +DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3 implementation" +HOMEPAGE="http://tomcat.apache.org/" +SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="3.1" +KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.7" +RDEPEND=">=virtual/jre-1.7" + +S="${WORKDIR}/${MY_P}/" + +java_prepare() { + cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" + rm -fR */*/build.xml + einfo "Removing bundled jars and classes" + find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + +} + +src_install() { + java-pkg_dojar "${S}"/output/build/lib/*.jar + use source && java-pkg_dosrc java/javax/servlet/ +} From 8dc307067f68ebaf07e4edf76ee710d810489348 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:23:33 +0200 Subject: [PATCH 091/169] x11-libs/vte: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- x11-libs/vte/metadata.xml | 8 ++++---- x11-libs/vte/vte-0.28.2-r206.ebuild | 2 +- x11-libs/vte/vte-0.28.2-r207.ebuild | 2 +- x11-libs/vte/vte-0.36.3.ebuild | 2 +- x11-libs/vte/vte-0.36.4.ebuild | 2 +- x11-libs/vte/vte-0.38.3.ebuild | 2 +- x11-libs/vte/vte-0.40.2.ebuild | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml index 84c40c2c6ea00..cd6612f9502dc 100644 --- a/x11-libs/vte/metadata.xml +++ b/x11-libs/vte/metadata.xml @@ -1,8 +1,8 @@ -gnome - - Provide integration with dev-util/glade. - + gnome + + Provide integration with dev-util/glade. + diff --git a/x11-libs/vte/vte-0.28.2-r206.ebuild b/x11-libs/vte/vte-0.28.2-r206.ebuild index edf1eaba8f889..b0e1406434194 100644 --- a/x11-libs/vte/vte-0.28.2-r206.ebuild +++ b/x11-libs/vte/vte-0.28.2-r206.ebuild @@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.26:2 >=x11-libs/gtk+-2.20:2[introspection?] >=x11-libs/pango-1.22.0 - sys-libs/ncurses + sys-libs/ncurses:5= x11-libs/libX11 x11-libs/libXft diff --git a/x11-libs/vte/vte-0.28.2-r207.ebuild b/x11-libs/vte/vte-0.28.2-r207.ebuild index 0b2c3cce2d523..6ff5f00f04ea1 100644 --- a/x11-libs/vte/vte-0.28.2-r207.ebuild +++ b/x11-libs/vte/vte-0.28.2-r207.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=x11-libs/gtk+-2.20:2[introspection?] >=x11-libs/pango-1.22.0 - sys-libs/ncurses + sys-libs/ncurses:5= x11-libs/libX11 x11-libs/libXft diff --git a/x11-libs/vte/vte-0.36.3.ebuild b/x11-libs/vte/vte-0.36.3.ebuild index 405172b3bcf23..427a79ab89fd5 100644 --- a/x11-libs/vte/vte-0.36.3.ebuild +++ b/x11-libs/vte/vte-0.36.3.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=x11-libs/gtk+-3.1.9:3[introspection?] >=x11-libs/pango-1.22.0 - sys-libs/ncurses + sys-libs/ncurses:5= x11-libs/libX11 x11-libs/libXft diff --git a/x11-libs/vte/vte-0.36.4.ebuild b/x11-libs/vte/vte-0.36.4.ebuild index c942207a0bdc0..8f1f22973e552 100644 --- a/x11-libs/vte/vte-0.36.4.ebuild +++ b/x11-libs/vte/vte-0.36.4.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=x11-libs/gtk+-3.1.9:3[introspection?] >=x11-libs/pango-1.22.0 - sys-libs/ncurses + sys-libs/ncurses:5= x11-libs/libX11 x11-libs/libXft diff --git a/x11-libs/vte/vte-0.38.3.ebuild b/x11-libs/vte/vte-0.38.3.ebuild index d8db59a6aa452..525954975ca70 100644 --- a/x11-libs/vte/vte-0.38.3.ebuild +++ b/x11-libs/vte/vte-0.38.3.ebuild @@ -22,7 +22,7 @@ RDEPEND=" >=x11-libs/gtk+-3.8:3[introspection?] >=x11-libs/pango-1.22.0 - sys-libs/ncurses + sys-libs/ncurses:5= x11-libs/libX11 x11-libs/libXft diff --git a/x11-libs/vte/vte-0.40.2.ebuild b/x11-libs/vte/vte-0.40.2.ebuild index f657aa5aeb518..1c46855f8ff38 100644 --- a/x11-libs/vte/vte-0.40.2.ebuild +++ b/x11-libs/vte/vte-0.40.2.ebuild @@ -22,7 +22,7 @@ RDEPEND=" >=x11-libs/gtk+-3.8:3[introspection?] >=x11-libs/pango-1.22.0 - sys-libs/ncurses + sys-libs/ncurses:5= sys-libs/zlib x11-libs/libX11 x11-libs/libXft From d4514e9c0d454556aec725a205773121880d2218 Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Sun, 16 Aug 2015 22:31:41 +0800 Subject: [PATCH 092/169] dev-python/pympler: bump, rm old wrt bug #556626 Package-Manager: portage-2.2.20 --- dev-python/pympler/Manifest | 2 +- dev-python/pympler/{pympler-0.4.ebuild => pympler-0.4.2.ebuild} | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename dev-python/pympler/{pympler-0.4.ebuild => pympler-0.4.2.ebuild} (95%) diff --git a/dev-python/pympler/Manifest b/dev-python/pympler/Manifest index 9a616b12b1c79..081200321cfe9 100644 --- a/dev-python/pympler/Manifest +++ b/dev-python/pympler/Manifest @@ -1,3 +1,3 @@ DIST Pympler-0.3.1.tar.gz 382158 SHA256 8cb170fddfe592342856590e2239e8c20ac61eacf18bc4f65a95ccaf74475e3e SHA512 0863f754edcd80375128f54d443974ef9933c203658d3215b8e98b53c8a1a36db199e309412c5b9f2d886e515ddd4d93c65035feb2c2fcaee4d6dc549e0e0b3c WHIRLPOOL 9e2c6a6c5c28040a4e3b712cf6ec58a8b0040a5092498e4d1958684966ce7d42b3de5a25588a6a0b62a27f24ef8e834bd13189bbb75b5a8b1958802e31f4adbc DIST Pympler-0.4.1.tar.gz 395535 SHA256 6a8bfd2972c4ec34ac8750358515950be4a4ca13dfa6a05a9a22419786745f90 SHA512 3f7e2d88ca431ae73cf49d5140c10de4eab10c1627cdacc12e216c89410add16cb5e1faedc484ea765e4b866b905a5379bb21e7d41b9b8d622c4ac7b1b16a8a3 WHIRLPOOL 4b35b554cabda8b9ab633409f1c91728956cad31c1a41d3b66a8d2cbf2e1283edd32017181d5f9c8bd66a1bac7ba398c292dd60fd9cdc268fec86222b4a790c8 -DIST Pympler-0.4.tar.gz 476969 SHA256 b280480502df658b18cb6310d2c744fabf05d4c518f873377884b4d4b5d2992d SHA512 14d5f7b6ecfeb81fb89f0e4e231aedd8effaad079742d75904b4ae6a5840f273bb76b565cb075b1d691b84eb878f0e39f627a51e9982deab9d147b0841baf66c WHIRLPOOL 3a75aaf8ce974aa03d2638ae9c15fd7e3f23bd25d31a6a244bed6fd8f80eb9aebcedf2f3d2a9015bb15fbe4ccd40e8eb8f04d43977b8d901e4e28fdeec06c6ad +DIST Pympler-0.4.2.tar.gz 395765 SHA256 3c3f9d8eb3dddf4f29c433433ea77c9c3f2f0dcc06575c0c2a9d81b2602893b2 SHA512 ae6e7718ecf8e7bc46ce968dd3b57543c4a3e882a07d7cb68ee38e60debc157ce2410c66b23c14179c47fef1b89647886289d9e4fdfc5f9e9ecd87a052f204aa WHIRLPOOL cc1e0ddb1509d92f3cc44f8e09c84a4fdc59fb273d0d5c2e10c421c97d0b83468dd7ffbf8d9817a480683afefb0f7dcf79993aa4ec7a7fb6b1789fc655ecb9c6 diff --git a/dev-python/pympler/pympler-0.4.ebuild b/dev-python/pympler/pympler-0.4.2.ebuild similarity index 95% rename from dev-python/pympler/pympler-0.4.ebuild rename to dev-python/pympler/pympler-0.4.2.ebuild index d2f582662ca8c..4261ca3736e0a 100644 --- a/dev-python/pympler/pympler-0.4.ebuild +++ b/dev-python/pympler/pympler-0.4.2.ebuild @@ -34,6 +34,7 @@ python_prepare_all() { } python_test() { + # https://github.com/pympler/pympler/issues/22 esetup.py try } From 5e535ab740d949d0b3c7cfc5789a9ce73a40ef4c Mon Sep 17 00:00:00 2001 From: Tobias Klausmann Date: Sun, 16 Aug 2015 16:37:36 +0200 Subject: [PATCH 093/169] net-analyzer/wireshark: add alpha keyword Gentoo-Bug: 557522 Package-Manager: portage-2.2.20.1 --- net-analyzer/wireshark/wireshark-1.12.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild index a0578c30f58dd..3fac5b55e442f 100644 --- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild +++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd" IUSE=" adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl zlib From 99eb92e7cf538c50db7e7e3365491a272e836bda Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:38:47 +0200 Subject: [PATCH 094/169] dev-python/setuptools_scm: Version Bump Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-python/setuptools_scm/Manifest | 1 + .../setuptools_scm-1.7.0.ebuild | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 dev-python/setuptools_scm/setuptools_scm-1.7.0.ebuild diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest index c40609edd40aa..1ddc05afdbc92 100644 --- a/dev-python/setuptools_scm/Manifest +++ b/dev-python/setuptools_scm/Manifest @@ -1,2 +1,3 @@ DIST setuptools_scm-1.5.4.tar.gz 15647 SHA256 756fb77b82c5e22818683b838c978537f4894f468ea074f0e8a99d8aaf689022 SHA512 c1e7c6b510761a3dcf3ebfed4988db924f9203c9f919891c94623f07935b101690ff2671ff3e153906a89f05d4002154e671196ba711597d4e3e7c8d0602289e WHIRLPOOL a02209c4c3c8ef6de63463ec163c018906de88abc5e1786b9506c4fc71dfdbe4b576cce94d19d653f1eb6f21f86292a645823b009107a07801056fb1f90a79b0 DIST setuptools_scm-1.5.5.tar.gz 17442 SHA256 63f56843b9cc18743c843e43d54fd78ab091cb82d01f5acb64655743e8002134 SHA512 39516db6164dc0d6179922fd79b012950c0684c8f6d4dbf71c2fcae661d1a54ef745c48c8d521ed3906c4f74d91b79fe4a94b5e27ab6a84701964494057c2494 WHIRLPOOL 929e5c38aaef9c247a451382842bf16faf44528858981af7c29133d5b3f4693414b85d076ade33c033dfbadb5803bf1b95fa5d8fa942725af2c3b01534d72a72 +DIST setuptools_scm-1.7.0.tar.gz 18754 SHA256 f2f69c782b4f549003edf5b75b356b37f40a4e880b615996c5d9c117913d6f9c SHA512 58fb39dff1fe7731d8f8fb9a383d4df41ad9271590c13e64d75bf9e5d390f553414a47b3223747e2c6d9407af44eff84365bce162251f0c0324bfb216f44c1a8 WHIRLPOOL 3555650b8d40df3b43e61240c0c7c09b46d7fb735c9cc64cf50da7fc3b9c6c66f237b69f1eb7bc66bfc4592daed824f1b25e2db507245a946ea6dafd028ec0fe diff --git a/dev-python/setuptools_scm/setuptools_scm-1.7.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.7.0.ebuild new file mode 100644 index 0000000000000..0d9a43c28f990 --- /dev/null +++ b/dev-python/setuptools_scm/setuptools_scm-1.7.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="package to manage versions by scm tags via setuptools" +HOMEPAGE="https://github.com/pypa/setuptools_scm" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="test" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" + +python_test() { + py.test || die "tests failed under ${EPYTHON}" +} From d4b874fc86c75e8590e2b7dcabfadfcbb05645df Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 17:37:18 +0300 Subject: [PATCH 095/169] dev-libs/grantlee: Add ~x86 keyword wrt bug #553426 Package-Manager: portage-2.2.20.1 --- dev-libs/grantlee/grantlee-5.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/grantlee/grantlee-5.0.0.ebuild b/dev-libs/grantlee/grantlee-5.0.0.ebuild index 2134e804594e4..635c7b450f886 100644 --- a/dev-libs/grantlee/grantlee-5.0.0.ebuild +++ b/dev-libs/grantlee/grantlee-5.0.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="5" -KEYWORDS="~amd64 ~arm" +KEYWORDS="~amd64 ~arm ~x86" IUSE="debug doc test" RDEPEND=" From 3d9971c0cba1f4a167a86fb195d31ec659b1b251 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 16 Aug 2015 16:55:30 +0200 Subject: [PATCH 096/169] media-gfx/xpaint: version bump to 2.9.10.3 --- media-gfx/xpaint/Manifest | 1 + ...xpaint-2.9.10.3-Fix-build-with-clang.patch | 25 ++++++ media-gfx/xpaint/xpaint-2.9.10.3.ebuild | 86 +++++++++++++++++++ 3 files changed, 112 insertions(+) create mode 100644 media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch create mode 100644 media-gfx/xpaint/xpaint-2.9.10.3.ebuild diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest index 452330505bd84..a3ac931c1e419 100644 --- a/media-gfx/xpaint/Manifest +++ b/media-gfx/xpaint/Manifest @@ -1 +1,2 @@ DIST xpaint-2.9.10.2.tar.bz2 1245813 SHA256 7f1554c8390bc68da2bcc0449407b8cc69616ce5d2170f97d1b30aee9fcbdcf6 SHA512 8aa388d4b82b5867817eca2188f50734140c395efe663c290a78b4f24314754fb29257165a64c9b8a03634dede03d919d9a3a54c1d32049cc34216a1f3d4e499 WHIRLPOOL 5ffe99ba979590c1ad675f7cbd57e4dba92aa7c24a9600784224c913069cad1fa88a676180d60fc2cc60c6f7185056385ccb59f2725c9799781335ed38d8934a +DIST xpaint-2.9.10.3.tar.bz2 1283725 SHA256 9de0cb99557ea8329391b5d45ad59be080972924258aeb1b3c0c748bab9586c7 SHA512 d5d365e0308e50166e5ac70859e388436d8f0cb870b2dea0155fbc9a65a8377a861bea2217df2b5c016f8751c9ff1f74509eaff310acfaacd7b29c51cf726ac5 WHIRLPOOL 4d0ec766168fe329cba88506ff98f560f8fc4067245d1062ae9649db5bc3f380181e98eae0b443deb13f4f3de38c8239cc1d608499f61941cc18c18c70849d61 diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch b/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch new file mode 100644 index 0000000000000..a5a26214409e0 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch @@ -0,0 +1,25 @@ +From 69a76e5f4a72d83635cd413b7460df4776b2605f Mon Sep 17 00:00:00 2001 +From: hasufell +Date: Sun, 16 Aug 2015 16:51:26 +0200 +Subject: [PATCH] Fix build with clang + +--- + rw/readWriteTGA.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rw/readWriteTGA.c b/rw/readWriteTGA.c +index 306a751..9046ee3 100644 +--- a/rw/readWriteTGA.c ++++ b/rw/readWriteTGA.c +@@ -607,7 +607,7 @@ int WriteTGA(char *file_name, Image * image) + int tga_defdir = 1; + int transparency = -1; + +- if (!image) return; ++ if (!image) return -1; + w = image->width; + h = image->height; + bpp = image->scale; +-- +2.5.0 + diff --git a/media-gfx/xpaint/xpaint-2.9.10.3.ebuild b/media-gfx/xpaint/xpaint-2.9.10.3.ebuild new file mode 100644 index 0000000000000..06434b75af9d6 --- /dev/null +++ b/media-gfx/xpaint/xpaint-2.9.10.3.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools eutils + +DESCRIPTION="Image editor with tiff, jpeg and png support" +HOMEPAGE="http://sf-xpaint.sourceforge.net/" +SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="jpeg2k pgf tiff" + +RDEPEND=" + media-libs/fontconfig + media-libs/freetype + media-libs/libpng:0 + x11-libs/libICE + x11-libs/libX11 + >=x11-libs/libXaw3dXft-1.6.2c + x11-libs/libXext + x11-libs/libXft + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt + sys-libs/zlib + virtual/jpeg:62 + jpeg2k? ( media-libs/openjpeg:0 ) + pgf? ( media-libs/libpgf ) + tiff? ( + media-libs/jbigkit:0 + media-libs/tiff:0 + )" +DEPEND="${RDEPEND} + sys-devel/flex + sys-devel/bison + virtual/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \ + "${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch \ + "${FILESDIR}"/${PN}-2.9.10.3-Fix-build-with-clang.patch + eautoreconf +} + +src_configure() { + econf \ + $(use_enable tiff) \ + $(use_enable jpeg2k libopenjpeg) +} + +src_compile() { + # clean up + emake clean + emake -C util clean + + # parallel make still fails sometimes + emake substads + emake xpaint.1 + + default + emake \ + WITH_PGF="$(usex pgf "yes" "no")" \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + -C util +} + +src_install() { + default + emake \ + WITH_PGF="$(usex pgf "yes" "no")" \ + DESTDIR="${ED}" \ + -C util install +} + +pkg_postinst() { + elog "optional dependencies:" + elog " app-text/gv (external viewer for PostScript output)" + elog " media-gfx/imagemagick (external viewer for pixel graphics)" + elog " net-print/cups (printing)" +} From 1a17d75ad74c923d1dff18201f39ed65656fc2db Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 16 Aug 2015 16:57:46 +0200 Subject: [PATCH 097/169] media-gfx/xpaint: fix keywords "repoman full" did not complain again. --- media-gfx/xpaint/xpaint-2.9.10.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/xpaint/xpaint-2.9.10.3.ebuild b/media-gfx/xpaint/xpaint-2.9.10.3.ebuild index 06434b75af9d6..838367ca28de8 100644 --- a/media-gfx/xpaint/xpaint-2.9.10.3.ebuild +++ b/media-gfx/xpaint/xpaint-2.9.10.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="jpeg2k pgf tiff" RDEPEND=" From aa1837036951eeeb998b6c250b258bc75fd246a6 Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Sun, 16 Aug 2015 23:07:31 +0800 Subject: [PATCH 098/169] dev-python/PyPDF2: bump Package-Manager: portage-2.2.20 --- dev-python/PyPDF2/Manifest | 1 + dev-python/PyPDF2/PyPDF2-1.25.1.ebuild | 29 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 dev-python/PyPDF2/PyPDF2-1.25.1.ebuild diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest index 1a162ee5fb0aa..3dc667a9eacab 100644 --- a/dev-python/PyPDF2/Manifest +++ b/dev-python/PyPDF2/Manifest @@ -1 +1,2 @@ DIST PyPDF2-1.24.tar.gz 59891 SHA256 aca40d5155524120fceaf2eb4ae054480b8a2b6ffcfa0a2e77e3e45666428c64 SHA512 91a9338b0338eee1cfddc25dd0f21494f73696e630b08a71ff9195fe7b0fc77cf6c07b38a0c6aa4856536be6fe0a474c3b292c13fdd0187b62cb8848e69b29f9 WHIRLPOOL b5d33c209d5e0ce7d2d567d9266faacbbc6c1e49ac714e0063eeeb3879f400482a3fa887bd165b364a7216b4240b5236dec1954683ade632ea802a36a5272303 +DIST PyPDF2-1.25.1.tar.gz 194181 SHA256 43d324f70f8994c25a08e6edc02ec2d5c1e84c9231d3537f785b3f97641182eb SHA512 0cb43d4557d17ec82298ceabce5c4731438a0e16ad6c6b2abc54204a3d93373a46b86c995e9b39cec475de1dce325d552da17ce36de3733c7b0471779e3b0899 WHIRLPOOL 71467c2b43d462fde0486a1ca9c300bc3c6b048c21450affa6f09e3b2a5b893b5125fec10cb6ac9d1c1157fdfacdcf5c5b6ed37a1e3742f95595b3f76bd9868a diff --git a/dev-python/PyPDF2/PyPDF2-1.25.1.ebuild b/dev-python/PyPDF2/PyPDF2-1.25.1.ebuild new file mode 100644 index 0000000000000..4409d3770783c --- /dev/null +++ b/dev-python/PyPDF2/PyPDF2-1.25.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyPDF2/PyPDF2-1.24.ebuild,v 1.3 2015/03/08 23:38:15 pacho Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit distutils-r1 + +DESCRIPTION="Python library to work with pdf files" +HOMEPAGE="http://pypi.python.org/pypi/${PN}/ https://github.com/mstamy2/PyPDF2" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +# https://github.com/mstamy2/PyPDF2/issues/216 +RESTRICT="test" + +python_test() { + "${PYTHON}" -m unittest Tests.tests +} + +python_install_all() { + use examples && local EXAMPLES=( Sample_Code/. ) + distutils-r1_python_install_all +} From 2687e90cf320c93ffe2ec175eedd979ffec05f3f Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:47:56 +0200 Subject: [PATCH 099/169] app-crypt/zuluCrypt: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- app-crypt/zuluCrypt/metadata.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app-crypt/zuluCrypt/metadata.xml b/app-crypt/zuluCrypt/metadata.xml index 6138cd8f86a17..7d506ef91e7a4 100644 --- a/app-crypt/zuluCrypt/metadata.xml +++ b/app-crypt/zuluCrypt/metadata.xml @@ -6,18 +6,21 @@ Julian Ospald - Enable support for the freedesktop.org + Enable support for the freedesktop.org Secret Service API via app-crypt/libsecret. This does not control the gui! - Whether to build the QT gui. Highly recommended. + Whether to build the QT gui. Highly recommended. - Enable support for KDE, e.g. via + Enable support for KDE, e.g. via kde-base/kwalletd. This does not control the gui, but NEEDS GUI ENABLED! - Whether udev will be consulted when deciding + Whether udev will be consulted when deciding if a volume is system or not. + + mhogomchungu/zuluCrypt + From 3a82cee5cd6e62722d040f7126547f9e766415d7 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:49:25 +0200 Subject: [PATCH 100/169] dev-db/lmdb: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-db/lmdb/metadata.xml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dev-db/lmdb/metadata.xml b/dev-db/lmdb/metadata.xml index 02b69a4700a6e..1a92abe90e01e 100644 --- a/dev-db/lmdb/metadata.xml +++ b/dev-db/lmdb/metadata.xml @@ -1,12 +1,15 @@ - + An ultra-fast, ultra-compact key-value embedded data store -ldap - - eras@gentoo.org - Eray Aslan - + ldap + + eras@gentoo.org + Eray Aslan + + + LMDB/lmdb + From 20850068a88587c39fdd7c3162b79d1cc5063a66 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:49:36 +0200 Subject: [PATCH 101/169] dev-db/maxscale: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-db/maxscale/metadata.xml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dev-db/maxscale/metadata.xml b/dev-db/maxscale/metadata.xml index 154341b9f5368..8def2a61ae603 100644 --- a/dev-db/maxscale/metadata.xml +++ b/dev-db/maxscale/metadata.xml @@ -1,13 +1,16 @@ -mysql - - grknight@gentoo.org - Brian Evans - - - Use dev-libs/jemalloc for allocations - Add support for RabbitMQ message queue - + mysql + + grknight@gentoo.org + Brian Evans + + + Use dev-libs/jemalloc for allocations + Add support for RabbitMQ message queue + + + mariadb-corporation/MaxScale + From f5a0da6aab32993ebc4dea5af21ba74df7d839d8 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:50:09 +0200 Subject: [PATCH 102/169] dev-dotnet/mono-addins: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-dotnet/mono-addins/metadata.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-dotnet/mono-addins/metadata.xml b/dev-dotnet/mono-addins/metadata.xml index e85974a7fa17f..ab1e40984daa4 100644 --- a/dev-dotnet/mono-addins/metadata.xml +++ b/dev-dotnet/mono-addins/metadata.xml @@ -1,5 +1,8 @@ -dotnet + dotnet + + mono/mono-addins + From dc55744d67033eb1dbdc68bdc4331342c7360119 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:50:22 +0200 Subject: [PATCH 103/169] dev-dotnet/nuget: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-dotnet/nuget/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-dotnet/nuget/metadata.xml b/dev-dotnet/nuget/metadata.xml index 64172775ecd6c..5225f5cd7ed43 100644 --- a/dev-dotnet/nuget/metadata.xml +++ b/dev-dotnet/nuget/metadata.xml @@ -4,4 +4,7 @@ dotnet + + mrward/nuget + From 3b216e2be99fb54dc3fd6a2e013cc4794e8e4fb6 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:50:49 +0200 Subject: [PATCH 104/169] dev-dotnet/xdt-for-monodevelop: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-dotnet/xdt-for-monodevelop/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-dotnet/xdt-for-monodevelop/metadata.xml b/dev-dotnet/xdt-for-monodevelop/metadata.xml index 64172775ecd6c..a50adc63439a2 100644 --- a/dev-dotnet/xdt-for-monodevelop/metadata.xml +++ b/dev-dotnet/xdt-for-monodevelop/metadata.xml @@ -4,4 +4,7 @@ dotnet + + mrward/xdt + From 93867d175ee832695c3e3bc6c525b38a64bdb987 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:51:16 +0200 Subject: [PATCH 105/169] dev-haskell/ekg-json: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-haskell/ekg-json/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-haskell/ekg-json/metadata.xml b/dev-haskell/ekg-json/metadata.xml index 59cef6cab7add..5e8ea039ee790 100644 --- a/dev-haskell/ekg-json/metadata.xml +++ b/dev-haskell/ekg-json/metadata.xml @@ -7,4 +7,7 @@ ekg package, thus allowing ekg metrics to be served by other HTTP servers than the one used by the ekg package. + + tibbe/ekg-json + From f4de7b169a146803187b37727b8f90720e01e159 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:51:45 +0200 Subject: [PATCH 106/169] dev-haskell/fdo-notify: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-haskell/fdo-notify/metadata.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-haskell/fdo-notify/metadata.xml b/dev-haskell/fdo-notify/metadata.xml index e373ad840236f..3aff3f32bafbb 100644 --- a/dev-haskell/fdo-notify/metadata.xml +++ b/dev-haskell/fdo-notify/metadata.xml @@ -3,8 +3,11 @@ haskell - A library for issuing notifications using FreeDesktop.org's Desktop + A library for issuing notifications using FreeDesktop.org's Desktop Notifications protcol. This protocol is supported by services such - as Ubuntu's NotifyOSD. + as Ubuntu's NotifyOSD. + + taejo/fdo-notify + From f3dde4b690c13868120107026f47d2b586889403 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:52:57 +0200 Subject: [PATCH 107/169] dev-haskell/fsnotify: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-haskell/fsnotify/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-haskell/fsnotify/metadata.xml b/dev-haskell/fsnotify/metadata.xml index c40e26392d766..eabb10714e653 100644 --- a/dev-haskell/fsnotify/metadata.xml +++ b/dev-haskell/fsnotify/metadata.xml @@ -8,4 +8,7 @@ existing libraries for platform-specific Window, Mac, and Linux filesystem event notification. + + haskell-fswatch/hfsnotify + From d5481fbfa19f02d5ed0f8544dd2630b6af865541 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:55:31 +0200 Subject: [PATCH 108/169] dev-java/cofoja: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-java/cofoja/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-java/cofoja/metadata.xml b/dev-java/cofoja/metadata.xml index 46bdd8b327f83..679fd98f7efc2 100644 --- a/dev-java/cofoja/metadata.xml +++ b/dev-java/cofoja/metadata.xml @@ -4,6 +4,7 @@ java cofoja + nhatminhle/cofoja monsieurp@gentoo.org From 5403c0bbd52ebc3bac7518aea18aa241aa69ffe1 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:55:40 +0200 Subject: [PATCH 109/169] dev-java/guice: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-java/guice/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/guice/metadata.xml b/dev-java/guice/metadata.xml index 32433bd1dedb7..b8ec531e902a6 100644 --- a/dev-java/guice/metadata.xml +++ b/dev-java/guice/metadata.xml @@ -4,6 +4,6 @@ java google-guice + google/guice - From 0cf8c225666de2c451c674b35b9d3dbf1d12a822 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:57:11 +0200 Subject: [PATCH 110/169] dev-java/javacsv: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-java/javacsv/metadata.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-java/javacsv/metadata.xml b/dev-java/javacsv/metadata.xml index 3d4abf33c0dd2..765da51c0271d 100644 --- a/dev-java/javacsv/metadata.xml +++ b/dev-java/javacsv/metadata.xml @@ -6,5 +6,7 @@ monsieurp@gentoo.org Patrice Clement + + javacsv + - From 479f43652ce558d6d043f875c2489f64794123c8 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:57:29 +0200 Subject: [PATCH 111/169] dev-libs/iniparser: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-libs/iniparser/metadata.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-libs/iniparser/metadata.xml b/dev-libs/iniparser/metadata.xml index 714b385c64db1..8b009d0c00c79 100644 --- a/dev-libs/iniparser/metadata.xml +++ b/dev-libs/iniparser/metadata.xml @@ -1,9 +1,12 @@ -samba - - samba@gentoo.org - Samba Team - + samba + + samba@gentoo.org + Samba Team + + + ndevilla/iniparser + From a3aff8fa20a39a8128b72553c951837fa7cf23e0 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:58:35 +0200 Subject: [PATCH 112/169] dev-python/os-client-config: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-python/os-client-config/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-python/os-client-config/metadata.xml b/dev-python/os-client-config/metadata.xml index 02be8c5eb78fb..d0b15e80226d8 100644 --- a/dev-python/os-client-config/metadata.xml +++ b/dev-python/os-client-config/metadata.xml @@ -7,4 +7,7 @@ + + os-client-config + From ea6111c9ffdf733c6fc91bb235befb3c3a7a7763 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 16:59:08 +0200 Subject: [PATCH 113/169] dev-python/passlib: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-python/passlib/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-python/passlib/metadata.xml b/dev-python/passlib/metadata.xml index 03438f6f4e73b..67a9a00294cf7 100644 --- a/dev-python/passlib/metadata.xml +++ b/dev-python/passlib/metadata.xml @@ -12,5 +12,6 @@ passlib + ecollins/passlib From 9fb6d7c5848e50580819fd9ae2a4abfe9225dfa5 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:00:28 +0200 Subject: [PATCH 114/169] dev-python/pygame_sdl2: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-python/pygame_sdl2/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-python/pygame_sdl2/metadata.xml b/dev-python/pygame_sdl2/metadata.xml index a309a9b4706a9..17cc7c21ae673 100644 --- a/dev-python/pygame_sdl2/metadata.xml +++ b/dev-python/pygame_sdl2/metadata.xml @@ -5,4 +5,7 @@ hasufell@gentoo.org Julian Ospald + + renpy/pygame_sdl2 + From aaf9e8a096a9a07eef6ecdd199027e3646a75922 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:00:44 +0200 Subject: [PATCH 115/169] dev-python/pyrfc3339: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-python/pyrfc3339/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-python/pyrfc3339/metadata.xml b/dev-python/pyrfc3339/metadata.xml index 6adff6d79d536..daec484149004 100644 --- a/dev-python/pyrfc3339/metadata.xml +++ b/dev-python/pyrfc3339/metadata.xml @@ -8,5 +8,6 @@ pyRFC3339 + kurtraschke/pyRFC3339 From f51bd38b7c286cfb0ad940c44d3f15668f8c7c8e Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:01:00 +0200 Subject: [PATCH 116/169] dev-python/sphinxcontrib-newsfeed: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-python/sphinxcontrib-newsfeed/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-python/sphinxcontrib-newsfeed/metadata.xml b/dev-python/sphinxcontrib-newsfeed/metadata.xml index 02be8c5eb78fb..bc830d6793235 100644 --- a/dev-python/sphinxcontrib-newsfeed/metadata.xml +++ b/dev-python/sphinxcontrib-newsfeed/metadata.xml @@ -7,4 +7,7 @@ + + sphinxcontrib-newsfeed + From c58eba9f1d223a0a4feccc4ca8bb3853dd854b37 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:01:12 +0200 Subject: [PATCH 117/169] dev-python/sphinxcontrib-spelling: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-python/sphinxcontrib-spelling/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-python/sphinxcontrib-spelling/metadata.xml b/dev-python/sphinxcontrib-spelling/metadata.xml index 02be8c5eb78fb..022082634a534 100644 --- a/dev-python/sphinxcontrib-spelling/metadata.xml +++ b/dev-python/sphinxcontrib-spelling/metadata.xml @@ -7,4 +7,7 @@ + + sphinxcontrib-spelling + From 2552b454f6ebe98f0d6242c656b01ecfa75cd2ff Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:01:26 +0200 Subject: [PATCH 118/169] dev-python/stormpath: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-python/stormpath/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-python/stormpath/metadata.xml b/dev-python/stormpath/metadata.xml index 02be8c5eb78fb..b9aa63f055558 100644 --- a/dev-python/stormpath/metadata.xml +++ b/dev-python/stormpath/metadata.xml @@ -7,4 +7,7 @@ + + stormpath/stormpath-sdk-python + From ef2c5f31abbfd12aa1f84df9ba3ee0fdb4ffdf7a Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:02:07 +0200 Subject: [PATCH 119/169] dev-util/bumpversion: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-util/bumpversion/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-util/bumpversion/metadata.xml b/dev-util/bumpversion/metadata.xml index 55c42d9e202fb..4eab27f24c6b4 100644 --- a/dev-util/bumpversion/metadata.xml +++ b/dev-util/bumpversion/metadata.xml @@ -7,5 +7,6 @@ bumpversion + peritus/bumpversion From 26ed8b4d4adc2950e472d8fa1cae3a786ef6d211 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:02:31 +0200 Subject: [PATCH 120/169] dev-vcs/git-imerge: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- dev-vcs/git-imerge/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-vcs/git-imerge/metadata.xml b/dev-vcs/git-imerge/metadata.xml index a309a9b4706a9..4370ba6a15a90 100644 --- a/dev-vcs/git-imerge/metadata.xml +++ b/dev-vcs/git-imerge/metadata.xml @@ -5,4 +5,7 @@ hasufell@gentoo.org Julian Ospald + + mhagger/git-imerge + From 61af1f3250d2e418b35bddec450a17984c4e7125 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:02:59 +0200 Subject: [PATCH 121/169] media-fonts/monoid: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- media-fonts/monoid/metadata.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/media-fonts/monoid/metadata.xml b/media-fonts/monoid/metadata.xml index 696065edd3389..b7443646b6141 100644 --- a/media-fonts/monoid/metadata.xml +++ b/media-fonts/monoid/metadata.xml @@ -1,5 +1,8 @@ -fonts + fonts + + larsenwork/monoid + From 952843cc97554b3df8c8afa2fc01f6cd5c3abf07 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:03:33 +0200 Subject: [PATCH 122/169] media-video/ffcast: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- media-video/ffcast/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media-video/ffcast/metadata.xml b/media-video/ffcast/metadata.xml index d9dbdaa77c743..f5798318d75ad 100644 --- a/media-video/ffcast/metadata.xml +++ b/media-video/ffcast/metadata.xml @@ -5,4 +5,7 @@ zx2c4@gentoo.org + + lolilolicon/ffcast + From 577a39b51566e7bb13f0b0f6676912ca0ab0daf6 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:04:13 +0200 Subject: [PATCH 123/169] net-im/purple-events: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- net-im/purple-events/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/purple-events/metadata.xml b/net-im/purple-events/metadata.xml index 08f16ca7b67eb..65e3c847018f6 100644 --- a/net-im/purple-events/metadata.xml +++ b/net-im/purple-events/metadata.xml @@ -11,6 +11,6 @@ Quentin “Sardem FF7” Glidic CC him on bugs + sardemff7/purple-events - From e024196958e77c2f9d6372c199e736b628accc9c Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:06:07 +0200 Subject: [PATCH 124/169] net-libs/mbedtls: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- net-libs/mbedtls/metadata.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net-libs/mbedtls/metadata.xml b/net-libs/mbedtls/metadata.xml index b2d078a68ae47..0fab649adea27 100644 --- a/net-libs/mbedtls/metadata.xml +++ b/net-libs/mbedtls/metadata.xml @@ -14,6 +14,9 @@ Warning: the HAVEGE random generator is not suitable for virtualized environments - Build PolarSSL programs + Build PolarSSL programs + + ARMmbed/mbedtls + From 8bb08a02a5efaee78a1d40cc91970e761238585e Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:06:38 +0200 Subject: [PATCH 125/169] sys-apps/conspy: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sys-apps/conspy/metadata.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys-apps/conspy/metadata.xml b/sys-apps/conspy/metadata.xml index effbbf33eac85..920fb2366c649 100644 --- a/sys-apps/conspy/metadata.xml +++ b/sys-apps/conspy/metadata.xml @@ -1,5 +1,10 @@ - maintainer-needed@gentoo.org + + maintainer-needed@gentoo.org + + + conspy + From aa1a26ea2757ff4fd0ddb641a49d0e211515d847 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:07:21 +0200 Subject: [PATCH 126/169] x11-apps/xrectsel: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- x11-apps/xrectsel/metadata.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x11-apps/xrectsel/metadata.xml b/x11-apps/xrectsel/metadata.xml index 01c4c004e735c..c868de9720ee0 100644 --- a/x11-apps/xrectsel/metadata.xml +++ b/x11-apps/xrectsel/metadata.xml @@ -1,5 +1,8 @@ -x11 + x11 + + lolilolicon/xrectsel + From 9a602182eefcfd84e7f71cfcbd7af8018d569b63 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:07:37 +0200 Subject: [PATCH 127/169] x11-misc/gpaste: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- x11-misc/gpaste/metadata.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/x11-misc/gpaste/metadata.xml b/x11-misc/gpaste/metadata.xml index 4601862a84f8a..665d025492170 100644 --- a/x11-misc/gpaste/metadata.xml +++ b/x11-misc/gpaste/metadata.xml @@ -6,9 +6,12 @@ Julian Ospald - Enable gpaste-applet - Enable proper gnome support and + Enable gpaste-applet + Enable proper gnome support and enable gnome shell extension. - Build vala bindings + Build vala bindings + + Keruspe/GPaste + From ef6bbce3df18e5c425f765c400aa802be5e26923 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 17:07:55 +0200 Subject: [PATCH 128/169] x11-plugins/purple-libnotify-plus: Updating remote-id in metadata.xml Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- x11-plugins/purple-libnotify-plus/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-plugins/purple-libnotify-plus/metadata.xml b/x11-plugins/purple-libnotify-plus/metadata.xml index 08f16ca7b67eb..eb4db31375c5e 100644 --- a/x11-plugins/purple-libnotify-plus/metadata.xml +++ b/x11-plugins/purple-libnotify-plus/metadata.xml @@ -11,6 +11,6 @@ Quentin “Sardem FF7” Glidic CC him on bugs + sardemff7/purple-libnotify-plus - From 9afcf1b6c23ef128e52f64acbe65b02b9e88bfac Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 19:25:07 +0300 Subject: [PATCH 129/169] dev-db/mysql-connector-c: Add ~ia64 keyword wrt bug #556246 Package-Manager: portage-2.2.20.1 --- dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild index 969af88812056..4ab5ff43397c3 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild @@ -20,7 +20,7 @@ LICENSE="GPL-2" SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz" S="${WORKDIR}/${P}-src" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ia64 ~x86" SLOT="0/18" IUSE="+ssl static-libs" From c7bd2035e2cdacc0a091b2b7814f46f560cc48f3 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 19:29:27 +0300 Subject: [PATCH 130/169] app-admin/logrotate: ia64 stable wrt bug #556144 Package-Manager: portage-2.2.20.1 --- app-admin/logrotate/logrotate-3.9.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/logrotate/logrotate-3.9.1.ebuild b/app-admin/logrotate/logrotate-3.9.1.ebuild index 5450528e1c8f6..8108bc21d2c91 100644 --- a/app-admin/logrotate/logrotate-3.9.1.ebuild +++ b/app-admin/logrotate/logrotate-3.9.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="acl +cron selinux" CDEPEND=" From f1bfb3888a4c8c4b89cc0b6126733621c2ede556 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 19:35:20 +0300 Subject: [PATCH 131/169] media-libs/babl: ia64 stable wrt bug #552006 Package-Manager: portage-2.2.20.1 --- media-libs/babl/babl-0.1.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/babl/babl-0.1.12.ebuild b/media-libs/babl/babl-0.1.12.ebuild index 407941b467c37..53917a0babba6 100644 --- a/media-libs/babl/babl-0.1.12.ebuild +++ b/media-libs/babl/babl-0.1.12.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" - KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A dynamic, any to any, pixel format conversion library" From 2d11132939abb9335891df94ef98c27ba14fc55a Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 19:35:41 +0300 Subject: [PATCH 132/169] media-libs/gegl: ia64 stable wrt bug #552006 Package-Manager: portage-2.2.20.1 --- media-libs/gegl/gegl-0.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/gegl/gegl-0.3.0.ebuild b/media-libs/gegl/gegl-0.3.0.ebuild index bbb271ef0aa3d..2b00923e3bbb3 100644 --- a/media-libs/gegl/gegl-0.3.0.ebuild +++ b/media-libs/gegl/gegl-0.3.0.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" - KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A graph based image processing framework" From 5bbe89079b2ddf4475fbf7bc0e5332b28ffe5563 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sun, 16 Aug 2015 17:58:49 +0100 Subject: [PATCH 133/169] dev-java/ant-apache-xalan2: Mark 1.9.2-r1 stable on ALLARCHES Closes bug #556584. Package-Manager: portage-2.2.20.1 --- dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild index db70288cb1553..464e2744d4b81 100644 --- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild +++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild @@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="xalan" inherit ant-tasks -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" DEPEND="dev-java/xalan:0 dev-java/xalan-serializer:0" From 24591583338154d041fd70eb3b304a1c3a029581 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sun, 16 Aug 2015 18:01:42 +0100 Subject: [PATCH 134/169] dev-java/ant-apache-xalan2: Remove old Package-Manager: portage-2.2.20.1 --- .../ant-apache-xalan2-1.9.2.ebuild | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2.ebuild diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2.ebuild deleted file mode 100644 index e19cd5621198c..0000000000000 --- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -ANT_TASK_DEPNAME="xalan" - -inherit ant-tasks - -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -DEPEND="dev-java/xalan" -RDEPEND="${DEPEND}" - -src_unpack() { - ant-tasks_src_unpack all -} From 4b14d479c991e8997ac7cc69455de18825bae6f7 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sun, 16 Aug 2015 12:09:24 -0500 Subject: [PATCH 135/169] app-emulation/spice-protocol: version bump to 0.12.9 (bug #557576) Bump to version 0.12.9 to fix a header incompatibility Gentoo-Bug: 557576 Gentoo-Bug: 557872 Gentoo-Bug: 557942 Package-Manager: portage-2.2.20.1 --- app-emulation/spice-protocol/Manifest | 2 +- ...pice-protocol-0.12.8.ebuild => spice-protocol-0.12.9.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename app-emulation/spice-protocol/{spice-protocol-0.12.8.ebuild => spice-protocol-0.12.9.ebuild} (100%) diff --git a/app-emulation/spice-protocol/Manifest b/app-emulation/spice-protocol/Manifest index ad5ad1c65b1e9..cda97847109f1 100644 --- a/app-emulation/spice-protocol/Manifest +++ b/app-emulation/spice-protocol/Manifest @@ -1,2 +1,2 @@ DIST spice-protocol-0.12.3.tar.bz2 69854 SHA256 dc8609efe23e6f9b78d56663aa9ca5e8cb10c2b8403b8fc02aa72ae7686cc037 SHA512 55423743cf195459125305c726803db491ebf16a5ef0cb821eed7e0d71ace9d581b9a6a60c11a03d6a17c0ecc31e2b4c649ed117857a050f409844686b7df3e0 WHIRLPOOL 308ced9222f8b43e2455733fc5d311912bc9d10fbf830d8d4eecd0e86bfd6dc6a0ae15c3d94dc5c3d73aa9635247023259642c570e31557e0ba9caf4bd2c7eb6 -DIST spice-protocol-0.12.8.tar.bz2 71681 SHA256 116d57a1893c08f8f7801579dffb4c1568a4fb4566aa75c84a2685f150aae67c SHA512 68f11148f3df420dc86483171330e25966d51495313f9a871e473977e8dcd37ae0002f943e6f8d679ce82e1fd9f69625fe983426575ac9338b12a7dddd89597a WHIRLPOOL 6b15a634c1e6308b6521e6e1835dc292f92d0573aefea445d71cccce14f21424aaa01c60b907a4f7e341eee76b6c8ec399b49f0ff0bcb6bc6c54c5a1e8633eb1 +DIST spice-protocol-0.12.9.tar.bz2 71766 SHA256 290cf834dd156014d229b474e98006265ab9c5f63b4c471ea3b2cf8b2ff37876 SHA512 91dd639459a5f20ac37af5a348dcc085690f66274a005017f68a773d23a063ac2c64430c5c78dcead2a144ad0c367b8b12beed0bf80bd146608c8edb9d8080c0 WHIRLPOOL 1f578924b1539ee0c1405478bdd9f37a2d96b2d2e6868f2141b4730f6d1a70e486965a1266af5b1500eefc4a1ee30974f983f585c9d23a7acb762ed2993a13c7 diff --git a/app-emulation/spice-protocol/spice-protocol-0.12.8.ebuild b/app-emulation/spice-protocol/spice-protocol-0.12.9.ebuild similarity index 100% rename from app-emulation/spice-protocol/spice-protocol-0.12.8.ebuild rename to app-emulation/spice-protocol/spice-protocol-0.12.9.ebuild From 1fdaa4c9411995a5a4183e70bcdcbeb85952b98c Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:19:14 +0300 Subject: [PATCH 136/169] dev-python/decorator: ia64 stable wrt bug #556704 Package-Manager: portage-2.2.20.1 --- dev-python/decorator/decorator-3.4.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/decorator/decorator-3.4.2.ebuild b/dev-python/decorator/decorator-3.4.2.ebuild index 81a946181b75f..7c9d0050070bc 100644 --- a/dev-python/decorator/decorator-3.4.2.ebuild +++ b/dev-python/decorator/decorator-3.4.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" From 15f9174b82f3efd6bcfb718fbbe999219d9039bb Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:21:37 +0300 Subject: [PATCH 137/169] media-libs/gexiv2: ia64 stable wrt bug #553474 Package-Manager: portage-2.2.20.1 --- media-libs/gexiv2/gexiv2-0.10.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/gexiv2/gexiv2-0.10.2.ebuild b/media-libs/gexiv2/gexiv2-0.10.2.ebuild index 31254672ea42e..87ef43b3dca33 100644 --- a/media-libs/gexiv2/gexiv2-0.10.2.ebuild +++ b/media-libs/gexiv2/gexiv2-0.10.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm ~ia64 ppc ~ppc64 sparc x86" +KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 sparc x86" IUSE="introspection python static-libs" REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )" From cba0b07e64b04a6f59092e6df898d45dd30cdaa1 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:32:19 +0300 Subject: [PATCH 138/169] sys-apps/pciutils: ia64 stable wrt bug #543834 Package-Manager: portage-2.2.20.1 --- sys-apps/pciutils/pciutils-3.3.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/pciutils/pciutils-3.3.1.ebuild b/sys-apps/pciutils/pciutils-3.3.1.ebuild index dc34f2a6fb970..3316b785cd8f8 100644 --- a/sys-apps/pciutils/pciutils-3.3.1.ebuild +++ b/sys-apps/pciutils/pciutils-3.3.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux" IUSE="dns +kmod static-libs +udev zlib" # Have the sub-libs in RDEPEND with [static-libs] since, logically, From da4e5eb1c42273b4949f9ba46e8e782306f814f2 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:36:24 +0300 Subject: [PATCH 139/169] dev-lang/php: ia64 stable wrt bug #543834 Package-Manager: portage-2.2.20.1 --- dev-lang/php/php-5.4.44.ebuild | 2 +- dev-lang/php/php-5.5.28.ebuild | 2 +- dev-lang/php/php-5.6.12.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-lang/php/php-5.4.44.ebuild b/dev-lang/php/php-5.4.44.ebuild index e83310df33a2f..0934107a79346 100644 --- a/dev-lang/php/php-5.4.44.ebuild +++ b/dev-lang/php/php-5.4.44.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/php/php-5.5.28.ebuild b/dev-lang/php/php-5.5.28.ebuild index 4b0e0f50a7d4c..5ecc1842370d3 100644 --- a/dev-lang/php/php-5.5.28.ebuild +++ b/dev-lang/php/php-5.5.28.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/php/php-5.6.12.ebuild b/dev-lang/php/php-5.6.12.ebuild index 4b0e0f50a7d4c..5ecc1842370d3 100644 --- a/dev-lang/php/php-5.6.12.ebuild +++ b/dev-lang/php/php-5.6.12.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { From 3cbb4c95bdc4046cfae0e0747b958957e184685f Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:39:18 +0300 Subject: [PATCH 140/169] media-libs/libmikmod: ia64 stable wrt bug #535462 Package-Manager: portage-2.2.20.1 --- media-libs/libmikmod/libmikmod-3.3.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libmikmod/libmikmod-3.3.7.ebuild b/media-libs/libmikmod/libmikmod-3.3.7.ebuild index 0158991114e7c..989ff503c84dd 100644 --- a/media-libs/libmikmod/libmikmod-3.3.7.ebuild +++ b/media-libs/libmikmod/libmikmod-3.3.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz" LICENSE="LGPL-2+ LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads" REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )" From c5618db274804a18e33897b925ddfc344f0523bc Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:42:51 +0300 Subject: [PATCH 141/169] app-shells/bash: ia64 stable wrt bug #557510 Package-Manager: portage-2.2.20.1 --- app-shells/bash/bash-4.3_p39.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/bash/bash-4.3_p39.ebuild b/app-shells/bash/bash-4.3_p39.ebuild index ffa0c3e4dc5f7..302f3fcd5aca1 100644 --- a/app-shells/bash/bash-4.3_p39.ebuild +++ b/app-shells/bash/bash-4.3_p39.ebuild @@ -38,7 +38,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla" DEPEND=">=sys-libs/ncurses-5.2-r2 From b8d9c80347de5fa81297c29f36e2ea6d0e318670 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:46:10 +0300 Subject: [PATCH 142/169] net-analyzer/wireshark: ia64 stable wrt bug #557510 Package-Manager: portage-2.2.20.1 --- net-analyzer/wireshark/wireshark-1.12.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild index 3fac5b55e442f..454219efe61ee 100644 --- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild +++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd" IUSE=" adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl zlib From ac4cb5efc72b36018ad8a1dd27d174a7613bea3b Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:48:00 +0300 Subject: [PATCH 143/169] dev-tcltk/blt: ia64 stable wrt bug #557510 Package-Manager: portage-2.2.20.1 --- dev-tcltk/blt/blt-2.4z-r13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tcltk/blt/blt-2.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild index 09fd4ce1e1167..a139b230fbf40 100644 --- a/dev-tcltk/blt/blt-2.4z-r13.ebuild +++ b/dev-tcltk/blt/blt-2.4z-r13.ebuild @@ -19,7 +19,7 @@ SRC_URI=" IUSE="jpeg static-libs X" SLOT="0" LICENSE="BSD" -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" DEPEND=" dev-lang/tk:0= From 74efa54f7f69be8394f52f9fbe3f7d9254b928fe Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:50:43 +0300 Subject: [PATCH 144/169] app-admin/apache-tools: ia64 stable wrt bug #557198 Package-Manager: portage-2.2.20.1 --- app-admin/apache-tools/apache-tools-2.2.31.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/apache-tools/apache-tools-2.2.31.ebuild b/app-admin/apache-tools/apache-tools-2.2.31.ebuild index 511497c316927..091a6f42d8c2a 100644 --- a/app-admin/apache-tools/apache-tools-2.2.31.ebuild +++ b/app-admin/apache-tools/apache-tools-2.2.31.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="ssl" RESTRICT="test" From 050e62650f158e0fe566b46c9ad16d112ef26e6a Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:50:59 +0300 Subject: [PATCH 145/169] www-servers/apache: ia64 stable wrt bug #557198 Package-Manager: portage-2.2.20.1 --- www-servers/apache/apache-2.2.31.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/apache/apache-2.2.31.ebuild b/www-servers/apache/apache-2.2.31.ebuild index f9eabe4d2f57d..bf0abdfb41b2a 100644 --- a/www-servers/apache/apache-2.2.31.ebuild +++ b/www-servers/apache/apache-2.2.31.ebuild @@ -89,7 +89,7 @@ HOMEPAGE="http://httpd.apache.org/" # some helper scripts are Apache-1.1, thus both are here LICENSE="Apache-2.0 Apache-1.1" SLOT="2" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="" src_configure() { From f68382d4907bb1dc589827d7eed327f32b72b221 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:52:58 +0300 Subject: [PATCH 146/169] sys-libs/libcap-ng: ia64 stable wrt bug #556872 Package-Manager: portage-2.2.20.1 --- sys-libs/libcap-ng/libcap-ng-0.7.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.7.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.7.ebuild index 4bb3610f1befa..caec299b608cd 100644 --- a/sys-libs/libcap-ng/libcap-ng-0.7.7.ebuild +++ b/sys-libs/libcap-ng/libcap-ng-0.7.7.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://people.redhat.com/sgrubb/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux" IUSE="python static-libs" RDEPEND="python? ( ${PYTHON_DEPS} )" From c98fbdb5d2a05d377a3c06d5ee5f94204278d81d Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sun, 16 Aug 2015 12:47:23 -0500 Subject: [PATCH 147/169] profiles: mask smartcard use flag for spice-gtk on uclibc/arm --- profiles/default/linux/uclibc/arm/package.use.mask | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/profiles/default/linux/uclibc/arm/package.use.mask b/profiles/default/linux/uclibc/arm/package.use.mask index 2dd995b1c4cdd..2595edaf6123d 100644 --- a/profiles/default/linux/uclibc/arm/package.use.mask +++ b/profiles/default/linux/uclibc/arm/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Matthias Maier (16 Aug 2015) +# missing keywords +net-misc/spice-gtk smartcard + # Matthias Maier (17 Oct 2014) # virtual/jre is not keyworded on arm. net-print/cups java From 2d7361ecaa83ed7979d9a416b3c021095d154175 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sun, 16 Aug 2015 12:52:44 -0500 Subject: [PATCH 148/169] net-misc/spice-gtk: version bump to 0.29 Package-Manager: portage-2.2.20.1 --- net-misc/spice-gtk/Manifest | 1 + net-misc/spice-gtk/spice-gtk-0.29.ebuild | 159 +++++++++++++++++++++++ 2 files changed, 160 insertions(+) create mode 100644 net-misc/spice-gtk/spice-gtk-0.29.ebuild diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest index a20f392993fe1..3ecc48671da9f 100644 --- a/net-misc/spice-gtk/Manifest +++ b/net-misc/spice-gtk/Manifest @@ -2,3 +2,4 @@ DIST spice-gtk-0.20.tar.bz2 1210694 SHA256 b1355823b0ceb2e118c1f9a9a602ccab78e1e DIST spice-gtk-0.21.tar.bz2 1191082 SHA256 73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564 SHA512 970c5de33c5f2117c4c4c0864da4d3796226771be54fdcc5393d17eefecb297cdc0767003699afa03db7e72a9810de4d157217e40de62013e410b90c8c759151 WHIRLPOOL caabfcc4654077dce70d9f82d7ccd77bd390d365c23f6c82c906b5490c1dd135c82c48e2aab486b699470829b24b3253dcb39c22921c13132dc16a03369d62f9 DIST spice-gtk-0.25.tar.bz2 1242457 SHA256 0730c6a80ad9f5012f65927d443377019f300573f7ccc93db84eadec462ad087 SHA512 5d44ffa784af3c94492e80129b7350065f4d108c8e3bc42be673fc1f42b47023757d0b8131d047432b7c59c03662db0652759cb4bdf677062a6d1e0508d02bd9 WHIRLPOOL 63002ec6d309c949d296e70ff5e22a7cf9e8300e7001e37a4a5b2de6ccb833915d884798347e04a06c60ea4508f85f265b3d4b4dc1c00a3a8e036ddf21e003f8 DIST spice-gtk-0.28.tar.bz2 1274095 SHA256 15aeeb63422cb3bfaa2edbf4602ed2025baa4455abfd1677f631245a0d0f81c4 SHA512 a183ab3d9a463de13acc3333d6927fbaba00f184b40f4346d1fd4de94a3394a6cdfeb51b02666be9154d9f65184d1499560f2aa5a387a526915671e951e1493f WHIRLPOOL 96e25ec39b060136b9e6b1cbb5c38c06f319aeb582742acc2741abb29ea45853fe2fe5f2c2da5a0c61176bdd68e37a7be1f64d0b02b1e8db6754514a2a20bfe5 +DIST spice-gtk-0.29.tar.bz2 1277160 SHA256 44c7e22713246a2054c3c3b6e0280fd4c1fdbd2c8d33e5eb95bcda4748d5e973 SHA512 87cdcc5daa0f14eda5225cbe5cf0f29c1fb059c9fbbd6dfd52da02655db13f67f508c448dd5754877e12c577b5efde230914928fd91fcccf33eff52fac2319b0 WHIRLPOOL 96e2a2acaef4b824316aefdf5af59b45b33393264c70761cd7754b860166dafc3340526ca3f51dcf425dd904b35f27c1da83d0124a7c66b0b9fc6de6c0f85d1b diff --git a/net-misc/spice-gtk/spice-gtk-0.29.ebuild b/net-misc/spice-gtk/spice-gtk-0.29.ebuild new file mode 100644 index 0000000000000..33656b080ca00 --- /dev/null +++ b/net-misc/spice-gtk/spice-gtk-0.29.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +GCONF_DEBUG="no" +WANT_AUTOMAKE="1.12" +VALA_MIN_API_VERSION="0.14" +VALA_USE_DEPEND="vapigen" + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eutils multibuild python-single-r1 vala + +DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" +HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk" + +LICENSE="LGPL-2.1" +SLOT="0" +SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + ?? ( pulseaudio gstreamer ) +" + +# TODO: +# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h +# * use external pnp.ids as soon as that means not pulling in gnome-desktop +RDEPEND=" + ${PYTHON_DEPS} + pulseaudio? ( media-sound/pulseaudio[glib] ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 ) + >=x11-libs/pixman-0.17.7 + >=media-libs/celt-0.5.1.1:0.5.1 + media-libs/opus + dev-libs/openssl:= + gtk3? ( x11-libs/gtk+:3[introspection?] ) + x11-libs/gtk+:2[introspection?] + >=dev-libs/glib-2.28:2 + >=x11-libs/cairo-1.2 + virtual/jpeg:= + sys-libs/zlib + introspection? ( dev-libs/gobject-introspection ) + lz4? ( app-arch/lz4 ) + python? ( dev-python/pygtk:2 ) + sasl? ( dev-libs/cyrus-sasl ) + smartcard? ( app-emulation/qemu[smartcard] ) + usbredir? ( + sys-apps/hwids + >=sys-apps/usbredir-0.4.2 + virtual/libusb:1 + virtual/libgudev:= + policykit? ( + sys-apps/acl + >=sys-auth/polkit-0.110-r1 + !~sys-auth/polkit-0.111 ) + ) + webdav? ( + net-libs/phodav:2.0 + >=dev-libs/glib-2.43.90:2 + >=net-libs/libsoup-2.49.91 ) +" +DEPEND="${RDEPEND} + dev-lang/python + dev-python/pyparsing + dev-perl/Text-CSV + >=dev-util/gtk-doc-am-1.14 + >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +# Hard-deps while building from git: +# dev-lang/vala:0.14 +# dev-lang/perl + +src_prepare() { + epatch_user + + AT_NO_RECURSIVE="yes" eautoreconf + + use vala && vala_src_prepare +} + +src_configure() { + local myconf + local audio="no" + + use gstreamer && audio="gstreamer" + use pulseaudio && audio="pulse" + + if use vala ; then + # force vala regen for MinGW, etc + rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c + fi + + myconf=" + --disable-maintainer-mode \ + $(use_enable static-libs static) \ + $(use_enable introspection) \ + --with-audio=${audio} \ + $(use_with sasl) \ + $(use_enable smartcard) \ + $(use_enable usbredir) \ + $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \ + $(use_with usbredir usb-acl-helper-dir /usr/libexec) \ + $(use_enable policykit polkit) \ + $(use_enable vala) \ + $(use_enable webdav) \ + $(use_enable dbus) \ + --disable-gtk-doc \ + --disable-werror \ + --enable-pie" + + # Parameter of --with-gtk + MULTIBUILD_VARIANTS=( 2.0 ) + use gtk3 && MULTIBUILD_VARIANTS+=( 3.0 ) + + configure() { + local myconf=() + myconf+=( --with-gtk=${MULTIBUILD_VARIANT} ) + + if [[ ${MULTIBUILD_ID} =~ "2.0" ]] ; then + myconf+=( $(use_with python) ) + else + myconf+=( --without-python ) + fi + + ECONF_SOURCE="${S}" econf $@ ${myconf[@]} + } + multibuild_foreach_variant run_in_build_dir configure ${myconf} +} + +src_compile() { + multibuild_foreach_variant run_in_build_dir default +} + +src_test() { + multibuild_foreach_variant run_in_build_dir default +} + +src_install() { + dodoc AUTHORS ChangeLog NEWS README THANKS TODO + + multibuild_foreach_variant run_in_build_dir default + + # Remove .la files if they're not needed + use static-libs || prune_libtool_files + + use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la + + make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" +} From 3a5f73eb507cf12d862feddd70a5b7f265bbde88 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:56:13 +0300 Subject: [PATCH 149/169] dev-python/cffi: ia64 stable wrt bug #556428 Package-Manager: portage-2.2.20.1 --- dev-python/cffi/cffi-1.1.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/cffi/cffi-1.1.2.ebuild b/dev-python/cffi/cffi-1.1.2.ebuild index ee778887d15e0..2c1c192975086 100644 --- a/dev-python/cffi/cffi-1.1.2.ebuild +++ b/dev-python/cffi/cffi-1.1.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" IUSE="doc" RDEPEND=" From ae61bfce5ac74ee1e348df1f47530ecba58e1dc3 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:57:14 +0300 Subject: [PATCH 150/169] dev-python/ply: ia64 stable wrt bug #556428 Package-Manager: portage-2.2.20.1 --- dev-python/ply/ply-3.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/ply/ply-3.6-r1.ebuild b/dev-python/ply/ply-3.6-r1.ebuild index e302718f0d725..0e7c4708c534b 100644 --- a/dev-python/ply/ply-3.6-r1.ebuild +++ b/dev-python/ply/ply-3.6-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.dabeaz.com/ply/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" IUSE="examples" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" From 568e6aad3ba85447331554fc47cd5a1703d780ff Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:58:00 +0300 Subject: [PATCH 151/169] dev-python/pycparser: ia64 stable wrt bug #556428 Package-Manager: portage-2.2.20.1 --- dev-python/pycparser/pycparser-2.14.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/pycparser/pycparser-2.14.ebuild b/dev-python/pycparser/pycparser-2.14.ebuild index ea182625dec7e..7c2fe122f517a 100644 --- a/dev-python/pycparser/pycparser-2.14.ebuild +++ b/dev-python/pycparser/pycparser-2.14.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" IUSE="test" RDEPEND="dev-python/ply[${PYTHON_USEDEP}]" From 531c23ab9c73a8e7cc55243b81da41296bcae477 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 20:58:35 +0300 Subject: [PATCH 152/169] dev-python/bcrypt: ia64 stable wrt bug #556428 Package-Manager: portage-2.2.20.1 --- dev-python/bcrypt/bcrypt-1.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/bcrypt/bcrypt-1.1.1.ebuild b/dev-python/bcrypt/bcrypt-1.1.1.ebuild index 4f98d0f41ee68..35dc1a1c7d0fd 100644 --- a/dev-python/bcrypt/bcrypt-1.1.1.ebuild +++ b/dev-python/bcrypt/bcrypt-1.1.1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" SLOT="0" LICENSE="Apache-2.0" -KEYWORDS="amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ia64 ~ppc64 ~x86" IUSE="test" DEPEND=" From f2b07ff730c8988bfb8fcdc237a668797d24fc6b Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Sun, 16 Aug 2015 19:06:48 +0000 Subject: [PATCH 153/169] dev-java/kxml: Update HOMEPAGE. License should be BSD and not MIT according to HOMEPAGE. Package-Manager: portage-2.2.18 Signed-off-by: Patrice Clement --- dev-java/kxml/kxml-2.3.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-java/kxml/kxml-2.3.0.ebuild b/dev-java/kxml/kxml-2.3.0.ebuild index a7235f392c16e..c8bb6434107a6 100644 --- a/dev-java/kxml/kxml-2.3.0.ebuild +++ b/dev-java/kxml/kxml-2.3.0.ebuild @@ -9,10 +9,10 @@ JAVA_PKG_IUSE="doc examples source" inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="Small XML pull parser for constrained environments such as Applets, Personal Java or MIDP devices" -HOMEPAGE="http://${PN}.sourceforge.net/" +HOMEPAGE="http://kxml.org/" SRC_URI="mirror://sourceforge/${PN}/${PN}2-src-${PV}.zip" -LICENSE="MIT" +LICENSE="BSD" SLOT="2" KEYWORDS="~amd64" From add7eb2e0a138b25c98cbef9ce286ac830754faa Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sun, 16 Aug 2015 20:14:36 +0200 Subject: [PATCH 154/169] media-gfx/enblend: Fix texinfo compilation (bug #479978) --- media-gfx/enblend/enblend-4.1.1-r3.ebuild | 79 +++ .../enblend-4.1.1-texinfo-5-upstream.patch | 617 ++++++++++++++++++ 2 files changed, 696 insertions(+) create mode 100644 media-gfx/enblend/enblend-4.1.1-r3.ebuild create mode 100644 media-gfx/enblend/files/enblend-4.1.1-texinfo-5-upstream.patch diff --git a/media-gfx/enblend/enblend-4.1.1-r3.ebuild b/media-gfx/enblend/enblend-4.1.1-r3.ebuild new file mode 100644 index 0000000000000..2e468253e0c24 --- /dev/null +++ b/media-gfx/enblend/enblend-4.1.1-r3.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils cmake-utils + +MY_P="${PN}-enfuse-${PV/_rc/rc}" + +DESCRIPTION="Image Blending with Multiresolution Splines" +HOMEPAGE="http://enblend.sourceforge.net/" +SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz" + +LICENSE="GPL-2 VIGRA" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc gpu image-cache openmp" + +REQUIRED_USE="openmp? ( !image-cache )" + +RDEPEND=" + media-libs/glew + =media-libs/lcms-2* + >=media-libs/libpng-1.2.43:0= + >=media-libs/openexr-1.0:= + media-libs/plotutils[X] + media-libs/tiff + >=media-libs/vigra-1.8.0 + sci-libs/gsl + virtual/jpeg:0= + debug? ( dev-libs/dmalloc ) + gpu? ( media-libs/freeglut )" +DEPEND="${RDEPEND} + >=dev-libs/boost-1.31.0:= + virtual/pkgconfig + doc? ( + media-gfx/imagemagick + media-gfx/transfig + sci-visualization/gnuplot[gd] + virtual/latex-base + )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-4.1.3-vigra_check.patch + + sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die + sed -i -e "s:doc/enblend:doc/${P}:" doc/CMakeLists.txt || die + cmake-utils_src_prepare + + epatch "${FILESDIR}"/${P}-texinfo-5-upstream.patch + epatch "${FILESDIR}"/${PN}-4.1.3-texinfo-5-more.patch + +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_CXX_FLAGS_RELEASE="" + $(cmake-utils_use_enable debug DMALLOC) + $(cmake-utils_use doc DOC) + $(cmake-utils_use_enable image-cache IMAGECACHE) + $(cmake-utils_use_enable openmp) + $(cmake-utils_use_enable gpu) + ) + CMAKE_BUILD_TYPE="Release" + cmake-utils_src_configure +} + +src_compile() { + # forcing -j1 as every parallel compilation process needs about 1 GB RAM. + cmake-utils_src_compile -j1 +} + +src_install() { + local DOCS=( AUTHORS ChangeLog NEWS README ) + cmake-utils_src_install +} diff --git a/media-gfx/enblend/files/enblend-4.1.1-texinfo-5-upstream.patch b/media-gfx/enblend/files/enblend-4.1.1-texinfo-5-upstream.patch new file mode 100644 index 0000000000000..8399f231ff967 --- /dev/null +++ b/media-gfx/enblend/files/enblend-4.1.1-texinfo-5-upstream.patch @@ -0,0 +1,617 @@ +From 0a60c121addb1b850f52281d898bdf1e04d920ad Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Sun, 16 Aug 2015 20:01:15 +0200 +Subject: [PATCH] Port enblend-4.1.3-texinfo-5-upstream.patch to 4.1.1 + +--- + doc/Makefile.am | 2 +- + doc/auxmac.tex | 7 --- + doc/auxmac.texi | 156 --------------------------------------------------- + doc/bug-reports.texi | 2 +- + doc/enblend.texi | 34 +++++------ + doc/enfuse.texi | 81 +++++++++++--------------- + 6 files changed, 51 insertions(+), 231 deletions(-) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 22c7fbc..40bb394 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -46,7 +46,7 @@ AM_MAKEINFOHTMLFLAGS = @AM_MAKEINFOHTMLFLAGS@ \ + -I $(top_builddir) -I $(srcdir) \ + --css-include=@srcdir@/default.css \ + $(MAKEINFOHTMLFLAGS) +-export TEXINPUTS=$(top_builddir):$(srcdir) ++export TEXINPUTS = .:$(top_builddir):$(srcdir): + + TEXI2DVI = texi2dvi $(TEXI2DVIFLAGS) $(EXTRATEXI2DVIFLAGS) + +diff --git a/doc/auxmac.tex b/doc/auxmac.tex +index 812d58d..524830f 100644 +--- a/doc/auxmac.tex ++++ b/doc/auxmac.tex +@@ -1,13 +1,6 @@ +-\input thumbpdf.sty +- +- + % Auxilliary Macros. + % + % Include this file before texinfo.tex! + + \def\mathit#1{\hbox{\it #1}} + \def\mathrm#1{\ifmmode{\rm #1}\else #1\fi} +- +-% These definitions are required for older versions of texinfo.tex. +-\def\geq{\ifmmode \ge\else $\ge$\fi} +-\def\leq{\ifmmode \le\else $\le$\fi} +diff --git a/doc/auxmac.texi b/doc/auxmac.texi +index 98c679f..59520c3 100644 +--- a/doc/auxmac.texi ++++ b/doc/auxmac.texi +@@ -2,16 +2,6 @@ + @c Macro Definitions + @c + +-@c redefined commands +- +-@c Get the spacing of dimensions right. +-@ifnottex +-@macro dmn{unit} +-@tie{}\unit\ +-@end macro +-@end ifnottex +- +- + @c extended commands + + @c Add a title to a DocBook element. +@@ -80,73 +70,6 @@ not displayed, because of lacking SVG and + + @c Operators + +-@c Generate a nice representation of base^exponent. +-@macro power{base, exponent} +-@ifinfo +-\base\^\exponent\ +-@end ifinfo +-@html +-\base\\exponent\ +-@end html +-@tex +-$\base\^{\exponent\}$% +-@end tex +-@docbook +-\base\\exponent\ +-@end docbook +-@end macro +- +- +-@macro classictimes +-@ifinfo +-x@c gobble following newline -- The Tricks of a Texinfo Wizard. +-@end ifinfo +-@html +-× +-@end html +-@tex +-\\ifmmode\\times\\else$\\times$\\fi% gobble following newline -- The Tricks of a TeX Wizard. +-@end tex +-@docbook +-× +-@end docbook +-@end macro +- +- +-@c Required for older versions of makeinfo. The definition of @geq +-@c for TeX lives in auxmac.tex. +-@ifnottex +-@macro geq +-@ifinfo +->=@c +-@end ifinfo +-@html +-≥ +-@end html +-@docbook +-≥ +-@end docbook +-@end macro +-@end ifnottex +- +- +-@c Required for older versions of makeinfo. The definition of @leq +-@c for TeX lives in auxmac.tex. +-@ifnottex +-@macro leq +-@ifinfo +-<=@c +-@end ifinfo +-@html +-≤ +-@end html +-@docbook +-≤ +-@end docbook +-@end macro +-@end ifnottex +- +- + @macro plusminus + @ifinfo + +/-@c +@@ -163,62 +86,6 @@ x@c gobble following newline -- The Tricks of a Texinfo Wizard. + @end macro + + +-@c Special Characters +- +-@macro inlineomega +-@ifinfo +-@math{omega}@c +-@end ifinfo +-@html +- +- ω +- +-@end html +-@tex +-$\\omega$% +-@end tex +-@docbook +-ω +-@end docbook +-@end macro +- +- +-@macro inlinesigma +-@ifinfo +-@math{sigma}@c +-@end ifinfo +-@html +- +- σ +- +-@end html +-@tex +-$\\sigma$% +-@end tex +-@docbook +-σ +-@end docbook +-@end macro +- +- +-@macro inlinexi +-@ifinfo +-@math{xi}@c +-@end ifinfo +-@html +- +- ξ +- +-@end html +-@tex +-$\\xi$% +-@end tex +-@docbook +-ξ +-@end docbook +-@end macro +- +- + @c Text Fragments + + @macro mainpurpose +@@ -236,26 +103,3 @@ $\\xi$% + @noindent + @strong{Summary of influential options} + @end macro +- +- +-@macro semilog{significant, exponent} +-@ifinfo +-\significant\*10^\exponent\@c +-@end ifinfo +-@html +- +- \significant\ +- × +- +- 10 +- \exponent\ +- +- +-@end html +-@tex +-\\ifmmode\significant\ \\times 10^{\exponent\}\\else$\significant\ \\times 10^{\exponent\}$\\fi% +-@end tex +-@docbook +-\significant\×10\exponent\ +-@end docbook +-@end macro +diff --git a/doc/bug-reports.texi b/doc/bug-reports.texi +index 56f8196..82c7476 100644 +--- a/doc/bug-reports.texi ++++ b/doc/bug-reports.texi +@@ -78,7 +78,7 @@ this by running it with the options @option{--version} and + @item + A complete set of input images that will reproduce the bug. Strive + for a minimal set of @emph{small}@footnote{Images of a size less than +-1500@classictimes{}1000 pixels qualify as small.} images. ++1500x1000 pixels qualify as small.} images. + + @item + The type of machine you are using, and the operating system name and +diff --git a/doc/enblend.texi b/doc/enblend.texi +index 17b7c3d..a9a00e8 100644 +--- a/doc/enblend.texi ++++ b/doc/enblend.texi +@@ -508,9 +508,9 @@ As a guideline, remember that each new level works on a linear scale + twice as large as the previous one. So, the zeroth layer, the + original image, obviously defines the image at single-pixel scale, the + first level works at two-pixel scale, and generally, the @math{n}-th +-level contains image data at @power{2, n}-pixel scale. This is the ++level contains image data at 2^n-pixel scale. This is the + reason why an image of +-@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be ++@math{width}x@/@math{height}@dmn{pixels} cannot be + deconstructed into a pyramid of more than + @ifinfo + @display +@@ -1194,11 +1194,11 @@ For floating-point format, use + + @itemize + @item +-Minimum normalized value: @semilog{1.2, -38} ++Minimum normalized value: 1.2e-38 + @item +-Epsilon: @semilog{1.2, -7} ++Epsilon: 1.2e-7 + @item +-Maximum finite value: @semilog{3.4, 38} ++Maximum finite value: 3.4e38 + @end itemize + + @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10 +@@ -1210,11 +1210,11 @@ Maximum finite value: @semilog{3.4, 38} + + @itemize + @item +-Minimum normalized value: @semilog{2.2, -308} ++Minimum normalized value: 2.2e-308 + @item +-Epsilon: @semilog{2.2, -16} ++Epsilon: 2.2e-16 + @item +-Maximum finite value: @semilog{1.8, 308} ++Maximum finite value: 1.8e308 + @end itemize + @end table + +@@ -1236,11 +1236,11 @@ floating-point numbers. + + @itemize + @item +-Minimum normalized value: @semilog{9.3, -10} ++Minimum normalized value: 9.3e-10 + @item +-Epsilon: @semilog{2.0, -3} ++Epsilon: 2.0e-3 + @item +-Maximum finite value: @semilog{4.3, 9} ++Maximum finite value: 4.3e9 + @end itemize + + @item -f @var{WIDTH}x@var{HEIGHT} +@@ -1250,7 +1250,7 @@ Maximum finite value: @semilog{4.3, 9} + @cindex canvas size + @cindex size, canvas + Ensure that the minimum ``canvas'' size of the output image is at +-least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify ++least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify + the @var{XOFFSET} and @var{YOFFSET}, too. + + @pindex nona @r{(Hugin)} +@@ -1572,7 +1572,7 @@ If omitted @var{FACTOR} defaults to + @value{src::default-coarseness-factor}, this means, + option@tie{}@option{--coarse-mask} shrinks the overlapping + @emph{areas} by a factor of +-@math{@value{src::default-coarseness-factor}@classictimes{}@/@value{src::default-coarseness-factor}}. ++@math{@value{src::default-coarseness-factor}x@/@value{src::default-coarseness-factor}}. + With @var{FACTOR}@tie{}=@tie{}8 the total memory allocated during a + run of Enblend shrinks approximately by 80% and the maximum amount of + memory in use at a time is decreased to 60% (Enblend compiled with +@@ -2494,7 +2494,7 @@ option@tie{}@option{--visualize} to directly judge the effect. + When using this option in conjunction with + option@tie{}@code{--coarse-mask}=@/@var{FACTOR}, keep in mind that the + smoothing occurs @emph{after} the overlap regions have been shrunken. +-Thus, blurring affects a @var{FACTOR}@classictimes{}@/@var{FACTOR} ++Thus, blurring affects a @var{FACTOR}x@/@var{FACTOR} + times larger area in the original images. + + Valid range: @var{RADIUS} @geq{} @value{src::minimum-smooth-difference}. +@@ -2606,7 +2606,7 @@ of the image and the final seam-line + @rimage{seam-line-visualization} + + @caption{Seam-line visualization of a simple overlap. The +-853@classictimes{}238@dmn{pixel} image is shown at a magification of ++853x238@dmn{pixel} image is shown at a magification of + 100%.} + + @shortcaption{Seam-line visualization} +@@ -2618,7 +2618,7 @@ of the image and the final seam-line + @rimage{seam-line-visualization, 15cm} + + @caption{Seam-line visualization of a simple overlap. The +-853@classictimes{}238@dmn{pixel} image has been rescaled to a width of ++853x238@dmn{pixel} image has been rescaled to a width of + approximately 15@dmn{cm}.} + + @shortcaption{Seam-line visualization} +@@ -2629,7 +2629,7 @@ approximately 15@dmn{cm}.} + @float Figure,Figure:seam-line-visualization + @rimage{seam-line-visualization, 15cm} + +-@caption{Seam-line visualization of a simple overlap. The 853@classictimes{}238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.} ++@caption{Seam-line visualization of a simple overlap. The 853x238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.} + + @shortcaption{Seam-line visualization} + @end float +diff --git a/doc/enfuse.texi b/doc/enfuse.texi +index 0dd8c23..59c1dfe 100644 +--- a/doc/enfuse.texi ++++ b/doc/enfuse.texi +@@ -621,9 +621,9 @@ As a guideline, remember that each new level works on a linear scale + twice as large as the previous one. So, the zeroth layer, the + original image, obviously defines the image at single-pixel scale, the + first level works at two-pixel scale, and generally, the @math{n}-th +-level contains image data at @power{2, n}-pixel scale. This is the ++level contains image data at 2^n-pixel scale. This is the + reason why an image of +-@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be ++@math{width}x@/@math{height}@dmn{pixels} cannot be + deconstructed into a pyramid of more than + @ifinfo + @display +@@ -1255,11 +1255,11 @@ For floating-point format, use + + @itemize + @item +-Minimum normalized value: @semilog{1.2, -38} ++Minimum normalized value: 1.2e-38 + @item +-Epsilon: @semilog{1.2, -7} ++Epsilon: 1.2e-7 + @item +-Maximum finite value: @semilog{3.4, 38} ++Maximum finite value: 3.4e38 + @end itemize + + @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10 +@@ -1271,11 +1271,11 @@ Maximum finite value: @semilog{3.4, 38} + + @itemize + @item +-Minimum normalized value: @semilog{2.2, -308} ++Minimum normalized value: 2.2e-308 + @item +-Epsilon: @semilog{2.2, -16} ++Epsilon: 2.2e-16 + @item +-Maximum finite value: @semilog{1.8, 308} ++Maximum finite value: 1.8e308 + @end itemize + @end table + +@@ -1297,11 +1297,11 @@ floating-point numbers. + + @itemize + @item +-Minimum normalized value: @semilog{9.3, -10} ++Minimum normalized value: 9.3e-10 + @item +-Epsilon: @semilog{2.0, -3} ++Epsilon: 2.0e-3 + @item +-Maximum finite value: @semilog{4.3, 9} ++Maximum finite value: 4.3e9 + @end itemize + + @item -f @var{WIDTH}x@var{HEIGHT} +@@ -1311,7 +1311,7 @@ Maximum finite value: @semilog{4.3, 9} + @cindex canvas size + @cindex size, canvas + Ensure that the minimum ``canvas'' size of the output image is at +-least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify ++least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify + the @var{XOFFSET} and @var{YOFFSET}, too. + + @pindex nona @r{(Hugin)} +@@ -1501,8 +1501,8 @@ A positive @var{LCE-SCALE} turns on local contrast enhancement + @var{LCE-SCALE} is the radius of the Gaussian used in the enhancement + step, @var{LCE-FACTOR} is the weight factor (``strength''). + +-@var{enhanced} = (1 + @var{LCE-FACTOR}) @classictimes{} @var{original} +-@minus{} @var{LCE-FACTOR} @classictimes{} Gaussian@/Smooth(@var{original}, ++@var{enhanced} = (1 + @var{LCE-FACTOR}) x @var{original} ++@minus{} @var{LCE-FACTOR} x Gaussian@/Smooth(@var{original}, + @var{LCE-SCALE}). + + @var{LCE-SCALE} defaults to @value{src::default-lce-scale} pixels and +@@ -1531,7 +1531,7 @@ left unchanged. This effectively suppresses weak edges. + @opindex --contrast-window-size + + Set the window @var{SIZE} for local contrast analysis. The window +-will be a square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels. If ++will be a square of @var{SIZE}x@/@var{SIZE} pixels. If + given an even @var{SIZE}, Enfuse will automatically use the next odd + number. + +@@ -1585,7 +1585,7 @@ output image. + @opindex --entropy-window-size + + Window @var{SIZE} for local entropy analysis. The window will be a +-square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels. ++square of @var{SIZE}x@/@var{SIZE} pixels. + + In the entropy calculation @var{SIZE} values of 3 to 7 yield an + acceptable compromise of the locality of the information and the +@@ -2433,20 +2433,6 @@ where @math{x} runs from 1 to the common width of the images, @math{y} + from 1 to the common height, and @math{i} from 1 to the number of + input images@tie{}@math{n}. + +-@macro equationW{} +-@ifnotdocbook +-@ifnottex +-(W) +-@end ifnottex +-@end ifnotdocbook +-@tex +-(W)% +-@end tex +-@docbook +- +-@end docbook +-@end macro +- + Enfuse allows for weighting the contribution of each @math{P(i, x, y)} + to the final @math{Q(x, y)}: + @ifinfo +@@ -2454,7 +2440,7 @@ to the final @math{Q(x, y)}: + @math{w(P(1, x, y)) * P(1, x, y) + + ... + + w(P(n, x, y)) * P(n, x, y) +---> Q(x, y),}@w{ }@equationW{} ++--> Q(x, y),} + @end display + @end ifinfo + @html +@@ -2520,9 +2506,6 @@ w(P(n, x, y)) * P(n, x, y) + y + + +- , +- +- @equationW{} + + + @end html +@@ -2530,7 +2513,7 @@ w(P(n, x, y)) * P(n, x, y) + $$ + w(P(1, x, y)) P(1, x, y) + \ldots + w(P(n, x, y)) P(n, x, y) + \rightarrow +- Q(x, y),\hskip4em\hbox{@equationW{}} ++ Q(x, y) + $$ + @end tex + @docbook +@@ -2948,7 +2931,7 @@ contributes as much as its weight demands. Of course the weights can + be extreme, favoring only a few pixels or even only one pixel in the + input stack. Extremes are not typical, however. + +-Equal weights are another extreme that turns @equationW{} into an ++Equal weights are another extreme that turns the equation into an + arithmetic average. This is why we sometimes speak of the ``averaging + property'' of this weighting algorithm, like smoothing out noise. + +@@ -2969,7 +2952,7 @@ Trouper'') weighting mode, where the pixel with the highest weight + wins, this is, gets weight@tie{}one, and all other pixels get the + weight of zero + (@uref{http://@/en.wikipedia.org/@/wiki/@/The_@/Winner_@/Takes_@/It_@/All,,``The +-Winner Takes It All.''}). With @option{--hard-mask} Equation@tie{}@equationW{} ++Winner Takes It All.''}). With @option{--hard-mask} the equation + becomes + @ifinfo + @display +@@ -3114,8 +3097,8 @@ where + + @noindent + Note that this ``averaging'' scheme lacks the nice noise-reduction +-property of the weighted average@tie{}@equationW{}, because only a +-single input pixel contributes to the output. ++property of the weighted average, because only a single input pixel ++contributes to the output. + + + @node Single Criterion Fusing +@@ -3562,7 +3545,7 @@ $$ + + @noindent + It associates a probability@tie{}@math{p} with each of the @math{n} +-different possible outcomes@tie{}@inlineomega{} of the random ++different possible outcomes@tie{}@math{omega} of the random + variable@tie{}@math{X}. + @cindex expectation value + Based on @math{w}, we define the @dfn{expectation value} or ``First +@@ -4189,7 +4172,7 @@ $$ + @end docbook + + @noindent +-The parameter@tie{}@inlinesigma{}, the argument of ++The parameter@tie{}@math{sigma}, the argument of + option@tie{}@option{--contrast-edge-scale}, is the length scale on which edges + are detected by @math{g(x, y)}. We apply the Laplacian operator in + Cartesian coordinates +@@ -4401,7 +4384,7 @@ $$ + + @end docbook + +-where we have used the dimensionless distance@tie{}@inlinexi{} from ++where we have used the dimensionless distance@tie{}@math{xi} from + the origin + @ifinfo + @display +@@ -4556,7 +4539,7 @@ $R = \sqrt{x^2 + y^2}$. + @float Figure,Figure:laplacian-of-gaussian + @vimage{laplacian-of-gaussian} + +-@caption{Laplacian-of-Gaussian function for @inlinesigma{} = 0.5.} ++@caption{Laplacian-of-Gaussian function for @math{sigma} = 0.5.} + + @shortcaption{Laplacian-of-Gaussian} + @end float +@@ -4656,10 +4639,10 @@ Experience has shown that neither the parameters @var{EDGESCALE} and + @var{CURVATURE} nor the mode of operation (@acronym{SDev}-only, + @acronym{LoG}-only, or a blend of both) scales to different image + sizes. In practice, this means that if you start with a set of +-reduced size images, say 2808@classictimes{}1872 pixels, carefully ++reduced size images, say 2808x1872 pixels, carefully + optimize @var{EDGESCALE}, @var{CURVATURE} and so on, and find + @acronym{LoG}-only the best mode, and then switch to the original +-resolution of 5616@classictimes{}3744 pixels, multiplying (or ++resolution of 5616x3744 pixels, multiplying (or + dividing) the parameters by four and sticking to @acronym{LoG}-only + might @emph{not} result in the best fused image. For best quality, + perform the parameter optimization and the search for the most +@@ -5080,9 +5063,9 @@ centers around the image effects. + Images should align well to be suitable for fusion. However, there is + no hard mathematical rule what ``well'' means. The alignment + requirements for 16@dmn{MPixel} images to yield a sharp +-4"@classictimes{}6" print at 300@dmn{dpi} (``dpi'' means dots per ++4"x6" print at 300@dmn{dpi} (``dpi'' means dots per + inch) or even for web presentation are relatively low, whereas the +-alignment of 8@dmn{MPixel} images for a 12"@classictimes{}18" print ++alignment of 8@dmn{MPixel} images for a 12"x18" print + ought to be tight. + + @pindex hugin +@@ -5548,7 +5531,7 @@ next section. + + Let us use an example to illustrate the problem of relating the + sharpness with the local contrast variations. Say we use a +-5@classictimes{}5 contrast window. Moreover, let @code{sharp_edge} ++5x5 contrast window. Moreover, let @code{sharp_edge} + and @code{smooth_edge} be two specific configurations: + + @example +@@ -5727,7 +5710,7 @@ Use @acronym{LoG} to detect edges on a scale of 0.3@dmn{pixels}. + Apply the default grayscale projector: @code{average} and throw away + all edges with a curvature of less than 0.5% and replace the + @acronym{LoG} data between 0% and 0.5% with @acronym{SDev} data. Use +-a window of 7@classictimes{}7@dmn{pixel} window to compute the ++a window of 7x7@dmn{pixel} window to compute the + @acronym{SDev}. + @end table + +-- +2.5.0 + From 4a2f76fd85afb8c3b4fbdf67153378894bc2b821 Mon Sep 17 00:00:00 2001 From: Sven Vermeulen Date: Sun, 16 Aug 2015 20:08:07 +0200 Subject: [PATCH 155/169] app-crypt/eid-mw: Update -9999 to drop gtk requirement in newest builds Provided by Vincent Hardy, this patches the live ebuild to drop the gtk requirement from the code. It also includes the pkgconfig file. Gentoo-Bug: 557604 Package-Manager: portage-2.2.20.1 --- app-crypt/eid-mw/eid-mw-9999.ebuild | 43 +++++++++---- .../eid-mw/files/gtk_not_required_9999.patch | 64 +++++++++++++++++++ app-crypt/eid-mw/metadata.xml | 7 +- 3 files changed, 99 insertions(+), 15 deletions(-) create mode 100644 app-crypt/eid-mw/files/gtk_not_required_9999.patch diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild index 9ef575a906b3f..06e154cbea829 100644 --- a/app-crypt/eid-mw/eid-mw-9999.ebuild +++ b/app-crypt/eid-mw/eid-mw-9999.ebuild @@ -4,18 +4,18 @@ EAPI=5 -inherit eutils versionator mozextension multilib +inherit eutils autotools mozextension multilib if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://github.com/Fedict/${PN}.git https://github.com/Fedict/${PN}.git" - inherit git-2 autotools + inherit git-2 SRC_URI="" else - MY_P="${PN}-${PV/_p/-}" - SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-258906.gz -> ${MY_P}.tar.gz" - KEYWORDS="~x86 ~amd64" - S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)" + MY_P="${P}-v${PV}" + SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz -> ${MY_P}.tar.gz" + KEYWORDS="~x86 ~amd64 ~arm" + S="${WORKDIR}/${MY_P}" fi SLOT="0" @@ -24,9 +24,12 @@ DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian HOMEPAGE="http://eid.belgium.be" -IUSE="+gtk +xpi" +IUSE="+gtk +xpi +dialogs" -RDEPEND="gtk? ( x11-libs/gtk+:2 ) +REQUIRED_USE=" + dialogs? ( gtk )" + +RDEPEND="gtk? ( x11-libs/gtk+:* ) >=sys-apps/pcsc-lite-1.2.9 xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) @@ -35,18 +38,32 @@ RDEPEND="gtk? ( x11-libs/gtk+:2 ) DEPEND="${RDEPEND} virtual/pkgconfig" -if [[ ${PV} == "9999" ]]; then - src_prepare() { +src_prepare() { + use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch + + if [[ ${PV} == "9999" ]] ; then + # Only in current git. Hopefully, in next release. + sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac + sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in + fi + + if [[ ${PV} == "9999" ]] || ! use gtk ; then eautoreconf - } -fi + fi +} src_configure() { - econf $(use_enable gtk dialogs) --disable-static + econf $(use_enable dialogs) --disable-static } src_install() { emake DESTDIR="${D}" install + + if [[ ${PV} != "9999" ]] ; then + # Automatically done in current git. Hopefully, in next release. + rm doc/sdk/include/rsaref220/win32.h + doheader -r doc/sdk/include/* + fi if use xpi; then declare MOZILLA_FIVE_HOME if has_version '>=www-client/firefox-3.6.20'; then diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch new file mode 100644 index 0000000000000..ba4d4b1524ad4 --- /dev/null +++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch @@ -0,0 +1,64 @@ +diff --git a/Makefile.am b/Makefile.am +index 1a605f7..6475886 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + ACLOCAL_AMFLAGS = -I scripts/m4 + EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc + +-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk ++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi + + xpipackage: + $(MAKE) -C plugins_tools/xpi xpipackage +diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am +index b70e7f2..ac38944 100644 +--- a/cardcomm/pkcs11/src/Makefile.am ++++ b/cardcomm/pkcs11/src/Makefile.am +@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \ + dialogs/dialogsgtk/single_dialog.c + endif + +-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin +- +-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c +-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@ +-beid_askpin_LDADD = @GTK_LIBS@ +- +-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c +-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ +-beid_changepin_LDADD = @GTK_LIBS@ +- +-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c +-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ +-beid_badpin_LDADD = @GTK_LIBS@ +- +-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c +-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ +-beid_askaccess_LDADD = @GTK_LIBS@ +- +-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c +-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ +-beid_spr_askpin_LDADD = @GTK_LIBS@ +- +-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c +-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ +-beid_spr_changepin_LDADD = @GTK_LIBS@ +- + pkgconfig_DATA=libbeidpkcs11.pc +diff --git a/configure.ac b/configure.ac +index 102c1c7..efdf0e2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,11 +56,6 @@ then + fi + fi + +-if test x"$have_gtk" = "xno" +-then +- AC_MSG_ERROR([At least one version of GTK is required.]) +-fi +- + ########################################################################### + ####### read user-specific requests from --enable directives ###### + ########################################################################### diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml index 964772a1c4bba..a695712ba3d3a 100644 --- a/app-crypt/eid-mw/metadata.xml +++ b/app-crypt/eid-mw/metadata.xml @@ -20,9 +20,12 @@ These three functions form the basis of the countless applications for your eID. - Enable the dialog pages, by using x11-libs/gtk+:2 + All dialogs are available, by using x11-libs/gtk+:* - + + Enable "askaccess" dialog box, by using x11-libs/gtk+:* + + Build and install an extension for Mozilla browsers. From 1bfbafda280c28e50b577c835d9fdb42376d1021 Mon Sep 17 00:00:00 2001 From: Sven Vermeulen Date: Sun, 16 Aug 2015 20:10:57 +0200 Subject: [PATCH 156/169] app-crypt/eid-mw: Version bump to 4.1.4 As provided by Vincent Hardy, this brings eid-mw to version 4.1.4 Gentoo-Bug: 557604 Package-Manager: portage-2.2.20.1 --- app-crypt/eid-mw/Manifest | 1 + app-crypt/eid-mw/eid-mw-4.1.4.ebuild | 79 +++++++++++++++++++ .../eid-mw/files/gtk_not_required_4.1.4.patch | 60 ++++++++++++++ 3 files changed, 140 insertions(+) create mode 100644 app-crypt/eid-mw/eid-mw-4.1.4.ebuild create mode 100644 app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest index b5b1c58bfc288..9f67898ee6e79 100644 --- a/app-crypt/eid-mw/Manifest +++ b/app-crypt/eid-mw/Manifest @@ -1,2 +1,3 @@ DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b WHIRLPOOL cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22 DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104 WHIRLPOOL b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867 +DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398 diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild new file mode 100644 index 0000000000000..06e154cbea829 --- /dev/null +++ b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils autotools mozextension multilib + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://github.com/Fedict/${PN}.git + https://github.com/Fedict/${PN}.git" + inherit git-2 + SRC_URI="" +else + MY_P="${P}-v${PV}" + SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz -> ${MY_P}.tar.gz" + KEYWORDS="~x86 ~amd64 ~arm" + S="${WORKDIR}/${MY_P}" +fi + +SLOT="0" +LICENSE="LGPL-3" +DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government" + +HOMEPAGE="http://eid.belgium.be" + +IUSE="+gtk +xpi +dialogs" + +REQUIRED_USE=" + dialogs? ( gtk )" + +RDEPEND="gtk? ( x11-libs/gtk+:* ) + >=sys-apps/pcsc-lite-1.2.9 + xpi? ( || ( >=www-client/firefox-bin-3.6.24 + >=www-client/firefox-3.6.20 ) ) + !app-misc/beid-runtime" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch + + if [[ ${PV} == "9999" ]] ; then + # Only in current git. Hopefully, in next release. + sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac + sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in + fi + + if [[ ${PV} == "9999" ]] || ! use gtk ; then + eautoreconf + fi +} + +src_configure() { + econf $(use_enable dialogs) --disable-static +} + +src_install() { + emake DESTDIR="${D}" install + + if [[ ${PV} != "9999" ]] ; then + # Automatically done in current git. Hopefully, in next release. + rm doc/sdk/include/rsaref220/win32.h + doheader -r doc/sdk/include/* + fi + if use xpi; then + declare MOZILLA_FIVE_HOME + if has_version '>=www-client/firefox-3.6.20'; then + MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox" + xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be" + fi + if has_version '>=www-client/firefox-bin-3.6.24'; then + MOZILLA_FIVE_HOME="/opt/firefox" + xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be" + fi + fi + rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la +} diff --git a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch new file mode 100644 index 0000000000000..137ef8e4ad1bc --- /dev/null +++ b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch @@ -0,0 +1,60 @@ +diff -ur eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am +--- eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am 2015-07-27 10:30:34.638418958 +0200 ++++ eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am 2015-08-13 14:12:43.827586821 +0200 +@@ -164,29 +164,3 @@ + dialogs/dialogsgtk/dlgs_gtk.cpp \ + dialogs/dialogsgtk/single_dialog.c + endif +- +-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin +- +-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c +-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@ +-beid_askpin_LDADD = @GTK_LIBS@ +- +-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c +-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ +-beid_changepin_LDADD = @GTK_LIBS@ +- +-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c +-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ +-beid_badpin_LDADD = @GTK_LIBS@ +- +-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c +-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ +-beid_askaccess_LDADD = @GTK_LIBS@ +- +-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c +-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ +-beid_spr_askpin_LDADD = @GTK_LIBS@ +- +-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c +-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ +-beid_spr_changepin_LDADD = @GTK_LIBS@ +diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac +--- eid-mw-4.1.4-v4.1.4-a/configure.ac 2015-07-27 10:30:34.641752294 +0200 ++++ eid-mw-4.1.4-v4.1.4-b/configure.ac 2015-08-13 14:13:51.456736608 +0200 +@@ -55,11 +55,6 @@ + fi + fi + +-if test x"$have_gtk" = "xno" +-then +- AC_MSG_ERROR([At least one version of GTK is required.]) +-fi +- + ########################################################################### + ####### read user-specific requests from --enable directives ###### + ########################################################################### +diff -ur eid-mw-4.1.4-v4.1.4-a/Makefile.am eid-mw-4.1.4-v4.1.4-b/Makefile.am +--- eid-mw-4.1.4-v4.1.4-a/Makefile.am 2015-07-27 10:30:34.638418958 +0200 ++++ eid-mw-4.1.4-v4.1.4-b/Makefile.am 2015-08-13 14:11:43.878340486 +0200 +@@ -1,7 +1,7 @@ + ACLOCAL_AMFLAGS = -I scripts/m4 + EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc + +-SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk ++SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi + + xpipackage: + $(MAKE) -C plugins_tools/xpi xpipackage From 646f22b7c98f38e53377cbf18b64f540f7bdc162 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 16 Aug 2015 20:00:26 +0100 Subject: [PATCH 157/169] =?UTF-8?q?dev-lang/helium:=20port=20to=20ghc-7.10?= =?UTF-8?q?,=20bug=20#557938=20by=20Toralf=20F=C3=B6rster?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.20 --- .../helium/files/helium-1.8.1-ghc-7.10.patch | 55 +++++++++++++++++++ dev-lang/helium/helium-1.8.1.ebuild | 4 ++ 2 files changed, 59 insertions(+) create mode 100644 dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch diff --git a/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch b/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch new file mode 100644 index 0000000000000..43af33ecac89d --- /dev/null +++ b/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch @@ -0,0 +1,55 @@ +diff --git a/src/Helium/Parser/LexerMonad.hs b/src/Helium/Parser/LexerMonad.hs +index 75ac077..af35093 100644 +--- a/src/Helium/Parser/LexerMonad.hs ++++ b/src/Helium/Parser/LexerMonad.hs +@@ -20,2 +20,4 @@ import Helium.Parser.LexerMessage + import Text.ParserCombinators.Parsec.Pos ++import Control.Applicative ++import Control.Monad + +@@ -47,2 +49,9 @@ returnLM x = LM (\_ pos brackets -> Right (x, [], pos, brackets)) + ++instance Functor LexerMonad where ++ fmap = liftM ++ ++instance Applicative LexerMonad where ++ pure = return ++ (<*>) = ap -- defined in Control.Monad ++ + instance Monad LexerMonad where +diff --git a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs +index 880ac0b..90574f0 100644 +--- a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs ++++ b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs +@@ -1 +1,2 @@ ++{-# LANGUAGE FlexibleContexts #-} + {-| Module : OnlyResultHeuristics +diff --git a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs +index 89e43f2..251406f 100644 +--- a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs ++++ b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs +@@ -1 +1,2 @@ ++{-# LANGUAGE FlexibleContexts #-} + {-| Module : RepairHeuristics +diff --git a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs +index d0b01a3..ba7ca19 100644 +--- a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs ++++ b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs +@@ -1 +1,2 @@ ++{-# LANGUAGE FlexibleContexts #-} + {-| Module : TieBreakerHeuristics +diff --git a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs +index c2e91f5..493c882 100644 +--- a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs ++++ b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs +@@ -1 +1,2 @@ ++{-# LANGUAGE FlexibleContexts #-} + {-| Module : UnifierHeuristics +diff --git a/src/Helium/Syntax/UHA_Pretty.hs b/src/Helium/Syntax/UHA_Pretty.hs +index af970dc..ee42a48 100644 +--- a/src/Helium/Syntax/UHA_Pretty.hs ++++ b/src/Helium/Syntax/UHA_Pretty.hs +@@ -17,2 +17,3 @@ import Control.Monad.Identity (Identity) + import qualified Control.Monad.Identity ++import Prelude hiding ((<$>)) + diff --git a/dev-lang/helium/helium-1.8.1.ebuild b/dev-lang/helium/helium-1.8.1.ebuild index f351f59ee72fc..e8966854d3d16 100644 --- a/dev-lang/helium/helium-1.8.1.ebuild +++ b/dev-lang/helium/helium-1.8.1.ebuild @@ -30,3 +30,7 @@ RDEPEND=">=dev-haskell/lvmlib-1.1:=[profile?] DEPEND="${RDEPEND} >=dev-haskell/cabal-1.10.1.0 " + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.8.1-ghc-7.10.patch +} From 07bf31d7449f92695b191d16e31031c98cc97c61 Mon Sep 17 00:00:00 2001 From: Alex Brandt Date: Sun, 16 Aug 2015 14:09:00 -0500 Subject: [PATCH 158/169] app-admin/supernova: add version 2.0.8 Package-Manager: portage-2.2.20.1 --- app-admin/supernova/Manifest | 1 + app-admin/supernova/supernova-2.0.8.ebuild | 53 ++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 app-admin/supernova/supernova-2.0.8.ebuild diff --git a/app-admin/supernova/Manifest b/app-admin/supernova/Manifest index d581a5e43b4d4..2912a06de63ad 100644 --- a/app-admin/supernova/Manifest +++ b/app-admin/supernova/Manifest @@ -1,3 +1,4 @@ DIST supernova-2.0.0.tar.gz 18298 SHA256 43b27ee9ed2ca7b0b5860bf52422750e215b60cb71eca106a57b4f900faef24e SHA512 a5c439cfe489991d5ae7f0f63e858b1200ac8df8f1556871f79f8cfc97862d46aae555aee9c97565308388305bd721ecce1f91221824f425caf19acb92f5ac8a WHIRLPOOL e4514e9c0312c68f1c017a92f1959180db042da0cd38ef83079bcee93344758383b41c06b5c51d1139b970dfdae51fda03f8f041d1788a533f9ca71645a7bcf9 DIST supernova-2.0.5.tar.gz 18219 SHA256 8219f6e42e364aceba5d1b70211522ba76fafad16374f71319a0e43c7f615489 SHA512 737649bb0d5e7ee21d9721cba8556617afffdd8cfa287f9d08fa3d81bfa98eb35a6aeeded9c13e600d355616cd3983bfc80148c0934d2b7791da2724e420c9c0 WHIRLPOOL b9204b5fb265bd7384b8724c62a5a10a4220f34c9ebe20f8f95945f12399c6fb291abb3086b5a09cb988fca8229ec99377f84394c98f15b6874ae140396ab8a9 DIST supernova-2.0.7.tar.gz 18516 SHA256 5fc2cc9eaf6a7cd0bd355b867240bae2b15c66b1e3ff4f5206b591c3ae155837 SHA512 f1271cac15c04f8f4dc1e1c4d92bd6214019215a9c2b1f567268a49e122852f1e3e67fb0325720b450176c073358f99fe2cbefb602055ac2d650d41e839202a3 WHIRLPOOL 7392ccf2e1ee8adac46141478c05d1c1f5876d2a1ac0ce9adefa182ece0cb26d3c9e800f9d1d4c7c5c0978512a736da527903c3e7f34bdd45405599b5641927c +DIST supernova-2.0.8.tar.gz 22569 SHA256 fd1a3dbcf52bba6deceb316baf9f8c6b5733c8e1ab4a6b1977aa6c871190f853 SHA512 43d1c53c71c6901da3d9c8e6160ff04110c76cb52281e10fcd8d339c23b2e5da03074e0fda6df66026d8edd268c6a755aa7e087dc131fdfc2365b5bdeed22be2 WHIRLPOOL 6837cc4d841b362a84b97b2a57d6b0b7e0b9cf13eaeef8e6643d9c96db8bbbed0d8c431cf4ddf54a662992a9b4980c88c86c299bd0efd53a015177c975262cf1 diff --git a/app-admin/supernova/supernova-2.0.8.ebuild b/app-admin/supernova/supernova-2.0.8.ebuild new file mode 100644 index 0000000000000..56a25edac9268 --- /dev/null +++ b/app-admin/supernova/supernova-2.0.8.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="novaclient wrapper for multiple nova environments" +HOMEPAGE="https://github.com/rackerhacker/supernova" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc examples test" + +CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND=" + ${CDEPEND} + doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] ) + test? ( dev-python/pytest[${PYTHON_USEDEP}] ) +" +RDEPEND=" + ${CDEPEND} + dev-python/click[${PYTHON_USEDEP}] + dev-python/configobj[${PYTHON_USEDEP}] + >=dev-python/keyring-0.9.2[${PYTHON_USEDEP}] + dev-python/python-novaclient[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] +" + +python_compile_all() { + if use doc; then + mkdocs build || die "docs failed to build" + fi +} + +python_test() { + distutils_install_for_testing + cd "${TEST_DIR}"/lib || die + py.test || die "tests failed under ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( site/. ) + use examples && local EXAMPLES=( example_configs/. ) + + distutils-r1_python_install_all + + newbashcomp contrib/${PN}-completion.bash ${PN} +} From c81e02c419ec3d071384acbfc82fce12af1cd881 Mon Sep 17 00:00:00 2001 From: Alex Brandt Date: Sun, 16 Aug 2015 14:14:11 -0500 Subject: [PATCH 159/169] app-admin/supernova: remove version 2.0.0 Package-Manager: portage-2.2.20.1 --- app-admin/supernova/Manifest | 1 - app-admin/supernova/supernova-2.0.0.ebuild | 45 ---------------------- 2 files changed, 46 deletions(-) delete mode 100644 app-admin/supernova/supernova-2.0.0.ebuild diff --git a/app-admin/supernova/Manifest b/app-admin/supernova/Manifest index 2912a06de63ad..d12bb20234310 100644 --- a/app-admin/supernova/Manifest +++ b/app-admin/supernova/Manifest @@ -1,4 +1,3 @@ -DIST supernova-2.0.0.tar.gz 18298 SHA256 43b27ee9ed2ca7b0b5860bf52422750e215b60cb71eca106a57b4f900faef24e SHA512 a5c439cfe489991d5ae7f0f63e858b1200ac8df8f1556871f79f8cfc97862d46aae555aee9c97565308388305bd721ecce1f91221824f425caf19acb92f5ac8a WHIRLPOOL e4514e9c0312c68f1c017a92f1959180db042da0cd38ef83079bcee93344758383b41c06b5c51d1139b970dfdae51fda03f8f041d1788a533f9ca71645a7bcf9 DIST supernova-2.0.5.tar.gz 18219 SHA256 8219f6e42e364aceba5d1b70211522ba76fafad16374f71319a0e43c7f615489 SHA512 737649bb0d5e7ee21d9721cba8556617afffdd8cfa287f9d08fa3d81bfa98eb35a6aeeded9c13e600d355616cd3983bfc80148c0934d2b7791da2724e420c9c0 WHIRLPOOL b9204b5fb265bd7384b8724c62a5a10a4220f34c9ebe20f8f95945f12399c6fb291abb3086b5a09cb988fca8229ec99377f84394c98f15b6874ae140396ab8a9 DIST supernova-2.0.7.tar.gz 18516 SHA256 5fc2cc9eaf6a7cd0bd355b867240bae2b15c66b1e3ff4f5206b591c3ae155837 SHA512 f1271cac15c04f8f4dc1e1c4d92bd6214019215a9c2b1f567268a49e122852f1e3e67fb0325720b450176c073358f99fe2cbefb602055ac2d650d41e839202a3 WHIRLPOOL 7392ccf2e1ee8adac46141478c05d1c1f5876d2a1ac0ce9adefa182ece0cb26d3c9e800f9d1d4c7c5c0978512a736da527903c3e7f34bdd45405599b5641927c DIST supernova-2.0.8.tar.gz 22569 SHA256 fd1a3dbcf52bba6deceb316baf9f8c6b5733c8e1ab4a6b1977aa6c871190f853 SHA512 43d1c53c71c6901da3d9c8e6160ff04110c76cb52281e10fcd8d339c23b2e5da03074e0fda6df66026d8edd268c6a755aa7e087dc131fdfc2365b5bdeed22be2 WHIRLPOOL 6837cc4d841b362a84b97b2a57d6b0b7e0b9cf13eaeef8e6643d9c96db8bbbed0d8c431cf4ddf54a662992a9b4980c88c86c299bd0efd53a015177c975262cf1 diff --git a/app-admin/supernova/supernova-2.0.0.ebuild b/app-admin/supernova/supernova-2.0.0.ebuild deleted file mode 100644 index 03dc2ddffea44..0000000000000 --- a/app-admin/supernova/supernova-2.0.0.ebuild +++ /dev/null @@ -1,45 +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 bash-completion-r1 distutils-r1 vcs-snapshot - -DESCRIPTION="novaclient wrapper for multiple nova environments" -HOMEPAGE="https://github.com/rackerhacker/supernova" -SRC_URI="https://github.com/major/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="examples test" - -CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND=" - ${CDEPEND} - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" -RDEPEND=" - ${CDEPEND} - dev-python/click[${PYTHON_USEDEP}] - dev-python/configobj[${PYTHON_USEDEP}] - >=dev-python/keyring-0.9.2[${PYTHON_USEDEP}] - dev-python/python-novaclient[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" - -python_test() { - distutils_install_for_testing - cd "${TEST_DIR}"/lib || die - py.test || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - use examples && local EXAMPLES=( example_configs/. ) - - distutils-r1_python_install_all - - newbashcomp contrib/${PN}-completion.bash ${PN} -} From e27d00105ada076525f74cba2059140f5619fa33 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 22:37:57 +0300 Subject: [PATCH 160/169] kde-apps/kwalletd: x86 stable wrt bug #540790 Package-Manager: portage-2.2.20.1 --- kde-apps/kwalletd/kwalletd-4.14.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/kwalletd/kwalletd-4.14.3-r2.ebuild b/kde-apps/kwalletd/kwalletd-4.14.3-r2.ebuild index 72afa54fa6c0d..5c6537d98414b 100644 --- a/kde-apps/kwalletd/kwalletd-4.14.3-r2.ebuild +++ b/kde-apps/kwalletd/kwalletd-4.14.3-r2.ebuild @@ -8,7 +8,7 @@ KMNAME="kde-runtime" inherit kde4-meta DESCRIPTION="KDE Password Server" -KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="debug gpg" DEPEND=" From 82d1524f33bc9a068cc233e2c3990be7ab230d98 Mon Sep 17 00:00:00 2001 From: Markus Meier Date: Sun, 16 Aug 2015 21:53:39 +0200 Subject: [PATCH 161/169] dev-vcs/subversion: arm stable, bug #556076 Package-Manager: portage-2.2.20 --- dev-vcs/subversion/subversion-1.7.21.ebuild | 2 +- dev-vcs/subversion/subversion-1.8.14.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-vcs/subversion/subversion-1.7.21.ebuild b/dev-vcs/subversion/subversion-1.7.21.ebuild index 521c914867b01..77057497e70bd 100644 --- a/dev-vcs/subversion/subversion-1.7.21.ebuild +++ b/dev-vcs/subversion/subversion-1.7.21.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Subversion GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf" COMMON_DEPEND=">=dev-db/sqlite-3.6.18[threadsafe(+)] diff --git a/dev-vcs/subversion/subversion-1.8.14.ebuild b/dev-vcs/subversion/subversion-1.8.14.ebuild index 5db1dd238cb4a..c266c8728ccd7 100644 --- a/dev-vcs/subversion/subversion-1.8.14.ebuild +++ b/dev-vcs/subversion/subversion-1.8.14.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Subversion GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax" COMMON_DEPEND=">=dev-db/sqlite-3.7.12 From 0d86427c6cbecf9e5cb6b70c68807734f4e03a4c Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 23:16:24 +0300 Subject: [PATCH 162/169] dev-python/python-sqlparse: Add ~ia64 keyword wrt bug #525562 Package-Manager: portage-2.2.20.1 --- dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild | 2 +- dev-python/python-sqlparse/python-sqlparse-0.1.14.ebuild | 2 +- dev-python/python-sqlparse/python-sqlparse-0.1.15.ebuild | 2 +- dev-python/python-sqlparse/python-sqlparse-0.1.16.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild index 3c056af728dbe..c803994e16218 100644 --- a/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild +++ b/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://code.google.com/p/python-sqlparse/ https://github.com/andialbre SRC_URI="https://github.com/andialbrecht/sqlparse/archive/${PV}.tar.gz -> ${P}.tar.gz" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" LICENSE="BSD-2" IUSE="doc examples test" diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.14.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.14.ebuild index 847ad91955e98..6e7fa0919a7d3 100644 --- a/dev-python/python-sqlparse/python-sqlparse-0.1.14.ebuild +++ b/dev-python/python-sqlparse/python-sqlparse-0.1.14.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="http://code.google.com/p/python-sqlparse/ https://github.com/andialbre SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" LICENSE="BSD-2" IUSE="doc test" diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.15.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.15.ebuild index 847ad91955e98..6e7fa0919a7d3 100644 --- a/dev-python/python-sqlparse/python-sqlparse-0.1.15.ebuild +++ b/dev-python/python-sqlparse/python-sqlparse-0.1.15.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="http://code.google.com/p/python-sqlparse/ https://github.com/andialbre SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" LICENSE="BSD-2" IUSE="doc test" diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.16.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.16.ebuild index 847ad91955e98..6e7fa0919a7d3 100644 --- a/dev-python/python-sqlparse/python-sqlparse-0.1.16.ebuild +++ b/dev-python/python-sqlparse/python-sqlparse-0.1.16.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="http://code.google.com/p/python-sqlparse/ https://github.com/andialbre SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" LICENSE="BSD-2" IUSE="doc test" From e4e37ecaf21ff4c8667a13c43f7e134310aaa1dd Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 23:32:51 +0300 Subject: [PATCH 163/169] media-gfx/fontforge: ia64 stable wrt bug #555958 Package-Manager: portage-2.2.20.1 --- media-gfx/fontforge/fontforge-20150430.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/fontforge/fontforge-20150430.ebuild b/media-gfx/fontforge/fontforge-20150430.ebuild index 766b56944c83e..d7a9bcf636839 100644 --- a/media-gfx/fontforge/fontforge-20150430.ebuild +++ b/media-gfx/fontforge/fontforge-20150430.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/fontforge/fontforge/archive/${PV}.tar.gz -> ${P}.tar LICENSE="BSD GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="cairo truetype-debugger gif gtk jpeg png +python readline tiff svg unicode X" REQUIRED_USE=" From 2dbd31a1fe739a0f9bc641ab9a5d5f90f53f1295 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 23:35:53 +0300 Subject: [PATCH 164/169] sys-kernel/genkernel-next: ia64 stable wrt bug #546170 Package-Manager: portage-2.2.20.1 --- sys-kernel/genkernel-next/genkernel-next-63.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-kernel/genkernel-next/genkernel-next-63.ebuild b/sys-kernel/genkernel-next/genkernel-next-63.ebuild index f643dd7c9d694..cba4e109d3332 100644 --- a/sys-kernel/genkernel-next/genkernel-next-63.ebuild +++ b/sys-kernel/genkernel-next/genkernel-next-63.ebuild @@ -13,9 +13,9 @@ fi inherit bash-completion-r1 eutils if [[ "${PV}" == "9999" ]]; then - KEYWORDS="ppc" + KEYWORDS="ia64 ppc" else - KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~x86" + KEYWORDS="~alpha amd64 ~arm ia64 ppc ~x86" fi DESCRIPTION="Gentoo automatic kernel building scripts, reloaded" From 8c1f83921f0d7ffac1fa7c76a7a5d2dfff22c027 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 23:40:29 +0300 Subject: [PATCH 165/169] sys-apps/smartmontools: ia64 stable wrt bug #555528 Package-Manager: portage-2.2.20.1 --- sys-apps/smartmontools/smartmontools-6.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/smartmontools/smartmontools-6.4.ebuild b/sys-apps/smartmontools/smartmontools-6.4.ebuild index 157de5e155892..2f60f4b4fbacd 100644 --- a/sys-apps/smartmontools/smartmontools-6.4.ebuild +++ b/sys-apps/smartmontools/smartmontools-6.4.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then inherit subversion autotools else SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos" + KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos" fi DESCRIPTION="Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools" From f21a19b37284f7bf9e2c14842f2ea8aa1faa7b99 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 23:50:21 +0300 Subject: [PATCH 166/169] dev-java/commons-logging: amd64 stable wrt bug #556866 Package-Manager: portage-2.2.20.1 --- dev-java/commons-logging/commons-logging-1.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/commons-logging/commons-logging-1.2.ebuild b/dev-java/commons-logging/commons-logging-1.2.ebuild index e1edb14bb5de8..aa4f49f900a50 100644 --- a/dev-java/commons-logging/commons-logging-1.2.ebuild +++ b/dev-java/commons-logging/commons-logging-1.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="avalon-logkit log4j servletapi avalon-framework" COMMON_DEP=" From d242dc9a7fcd92bda26004137646b35ac7fad21f Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 Aug 2015 23:53:37 +0300 Subject: [PATCH 167/169] app-emulation/libvirt-glib: amd64 stable wrt bug #557520 Package-Manager: portage-2.2.20.1 --- app-emulation/libvirt-glib/libvirt-glib-0.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/libvirt-glib/libvirt-glib-0.2.1.ebuild b/app-emulation/libvirt-glib/libvirt-glib-0.2.1.ebuild index 41e5fa80a899e..27caa06e587d8 100644 --- a/app-emulation/libvirt-glib/libvirt-glib-0.2.1.ebuild +++ b/app-emulation/libvirt-glib/libvirt-glib-0.2.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="+introspection python +vala" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) From 7f51f0da6f03e2385426800d0b66743a98202fb0 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 16 Aug 2015 22:59:59 +0200 Subject: [PATCH 168/169] sci-geosciences/osgearth: version bump to 2.7 Fixes: 555938 --- sci-geosciences/osgearth/Manifest | 1 + .../osgearth/files/osgearth-2.7-linker.patch | 52 +++++++++++++ sci-geosciences/osgearth/osgearth-2.7.ebuild | 74 +++++++++++++++++++ 3 files changed, 127 insertions(+) create mode 100644 sci-geosciences/osgearth/files/osgearth-2.7-linker.patch create mode 100644 sci-geosciences/osgearth/osgearth-2.7.ebuild diff --git a/sci-geosciences/osgearth/Manifest b/sci-geosciences/osgearth/Manifest index 05f9801cc37f8..d262160788c6b 100644 --- a/sci-geosciences/osgearth/Manifest +++ b/sci-geosciences/osgearth/Manifest @@ -1 +1,2 @@ DIST osgearth-2.6.tar.gz 58605003 SHA256 965c93837520ab9538038843ff83ee1903548f8be191ee211e40abb0e6c1bb4a SHA512 3120547ef639d4c1ff0404358777317c8794a493a772dc7af11b8056fd3f799a5e16358c19970862d16f6ab98f78abb3ea25c3aa113df8a3df68d54818fb03bc WHIRLPOOL 6533e5a92ee973ff1d5bfb80ab3b051279bc65e85d00f0fb9027b6fe2be06efc5bd3907516c27e7e06b4c1cb03569650bf368b5d7728b848bc86ec9666607939 +DIST osgearth-2.7.tar.gz 61837911 SHA256 cf973b664aeb79f70e48f5cd02ba670069ec273d71fe541604ed5b328d956d83 SHA512 acc7235b2df4a226e6834f961006c35310183695925091dcdfb1339e89be8ef08773c8c62ca98eb708485e03a870dace65a27d0beb2aefc807f6e558243e4693 WHIRLPOOL 8d3afe46fbef7064235a85c78a7da160f982c7ce19d8310484feb31f0a2317de631796f471c1b547bb9a01de0958a8b28ba1d919a20be230ea4651c5fbd785a8 diff --git a/sci-geosciences/osgearth/files/osgearth-2.7-linker.patch b/sci-geosciences/osgearth/files/osgearth-2.7-linker.patch new file mode 100644 index 0000000000000..74b56228d3c69 --- /dev/null +++ b/sci-geosciences/osgearth/files/osgearth-2.7-linker.patch @@ -0,0 +1,52 @@ +From: Julian Ospald +Date: Sun Aug 16 19:59:50 UTC 2015 +Subject: add missing library to linker + +--- a/src/applications/osgearth_package_qt/CMakeLists.txt ++++ b/src/applications/osgearth_package_qt/CMakeLists.txt +@@ -59,6 +59,7 @@ + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${QT_QTOPENGL_LIBRARY} ++ ${X11_LIBRARIES} + ) + + #### end var setup ### +--- a/src/applications/osgearth_qt/CMakeLists.txt ++++ b/src/applications/osgearth_qt/CMakeLists.txt +@@ -38,6 +38,7 @@ + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${QT_QTOPENGL_LIBRARY} ++ ${X11_LIBRARIES} + ) + + #### end var setup ### +--- a/src/applications/osgearth_demo/CMakeLists.txt ++++ b/src/applications/osgearth_demo/CMakeLists.txt +@@ -7,6 +7,7 @@ + QT5_WRAP_CPP( MOC_SRCS ${MOC_HDRS} OPTIONS "-f" ) + SET(TARGET_ADDED_LIBRARIES + osgEarthQt ++ ${X11_LIBRARIES} + ) + ELSE() + INCLUDE( ${QT_USE_FILE} ) +@@ -16,6 +17,7 @@ + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${QT_QTOPENGL_LIBRARY} ++ ${X11_LIBRARIES} + ) + ENDIF() + +--- a/src/applications/osgearth_qt_simple/CMakeLists.txt ++++ b/src/applications/osgearth_qt_simple/CMakeLists.txt +@@ -34,6 +34,7 @@ + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${QT_QTOPENGL_LIBRARY} ++ ${X11_LIBRARIES} + ) + + #### end var setup ### diff --git a/sci-geosciences/osgearth/osgearth-2.7.ebuild b/sci-geosciences/osgearth/osgearth-2.7.ebuild new file mode 100644 index 0000000000000..13bb0806ba4b4 --- /dev/null +++ b/sci-geosciences/osgearth/osgearth-2.7.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="Dynamic map generation toolkit for OpenSceneGraph" +HOMEPAGE="http://osgearth.org/" +SRC_URI="https://github.com/gwaldron/osgearth/archive/${P}.tar.gz" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc qt5" + +RDEPEND=" + dev-db/sqlite:3 + >=dev-games/openscenegraph-3.2.1-r1[curl,qt5?] + dev-libs/protobuf + dev-libs/tinyxml + net-misc/curl + sci-libs/gdal + sci-libs/geos + sys-libs/zlib[minizip] + virtual/opengl + x11-libs/libX11 + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + )" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( dev-python/sphinx )" + +S=${WORKDIR}/${PN}-${P} + +PATCHES=( + "${FILESDIR}"/${PN}-2.6-cmake-options.patch + "${FILESDIR}"/${PN}-2.7-linker.patch +) + +src_configure() { + # V8 disabled due to + # https://github.com/gwaldron/osgearth/issues/333 + local mycmakeargs=( + -DWITH_EXTERNAL_TINYXML=ON + $(cmake-utils_use qt5 OSGEARTH_USE_QT) + -DUSE_V8=OFF + -DOSGEARTH_USE_JAVASCRIPTCORE=OFF + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use doc ; then + emake -C "${S}"/docs man html info + fi +} + +src_install() { + cmake-utils_src_install + + if use doc ; then + dohtml -r "${S}"/docs/build/html/* + doman "${S}"/docs/build/man/* + doinfo "${S}"/docs/build/texinfo/*.info* + fi +} From 8d7d872ca8f29c7d5034940ae54dac915fa06357 Mon Sep 17 00:00:00 2001 From: Kristian Fiskerstrand Date: Sun, 16 Aug 2015 22:58:31 +0200 Subject: [PATCH 169/169] app-crypt/pinentry: Remove unused patch file pinentry-0.9.4-actually_respect_users_pm.patch is no longer used since the bump to 0.9.5. Cleaning up. Package-Manager: portage-2.2.20.1 --- ...ntry-0.9.4-actually_respect_users_pm.patch | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch diff --git a/app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch b/app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch deleted file mode 100644 index cfc96a3be8146..0000000000000 --- a/app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 444598586d0abf70d5a27d2aafcd6c14989621db Mon Sep 17 00:00:00 2001 -From: "Neal H. Walfield" -Date: Sun, 7 Jun 2015 14:36:39 +0200 -Subject: [PATCH] gnome3: Actually respect the user's choice of using a - password manager. - -* gnome3/pinentry-gnome3.c (create_prompt) [HAVE_LIBSECRET]: Only show -the libsecret prompt in this case. -(gnome3_cmd_handler) [HAVE_LIBSECRET]: Set PE->MAY_CACHE_PASSWORD -according to the user's choice. ---- - gnome3/pinentry-gnome3.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c -index 74ec89c..0fea8f0 100644 ---- a/gnome3/pinentry-gnome3.c -+++ b/gnome3/pinentry-gnome3.c -@@ -145,6 +145,7 @@ create_prompt (pinentry_t pe, int confirm) - /* XXX: gcr expects a string; we have a int. */ - // gcr_prompt_set_caller_window (prompt, pe->parent_wid); - -+#ifdef HAVE_LIBSECRET - if (! confirm && pe->allow_external_password_cache && pe->keyinfo) - { - if (pe->default_pwmngr) -@@ -157,6 +158,7 @@ create_prompt (pinentry_t pe, int confirm) - gcr_prompt_set_choice_label - (prompt, "Automatically unlock this key, whenever I'm logged in"); - } -+#endif - - return prompt; - } -@@ -203,6 +205,11 @@ gnome3_cmd_handler (pinentry_t pe) - if (pe->repeat_passphrase) - pe->repeat_okay = 1; - -+#ifdef HAVE_LIBSECRET -+ if (pe->allow_external_password_cache && pe->keyinfo) -+ pe->may_cache_password = gcr_prompt_get_choice_chosen (prompt); -+#endif -+ - ret = 1; - } - } --- -2.1.4 -