diff options
127 files changed, 1635 insertions, 3638 deletions
diff --git a/app-admin/checkrestart/metadata.xml b/app-admin/checkrestart/metadata.xml index 1470e032181b..8870e4ffc77a 100644 --- a/app-admin/checkrestart/metadata.xml +++ b/app-admin/checkrestart/metadata.xml @@ -2,6 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>maintainer-needed@gentoo.org</email> + <email>aidecoe@gentoo.org</email> + <name>Amadeusz Żołnowski</name> </maintainer> </pkgmetadata> diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest new file mode 100644 index 000000000000..fd6dfbefc1a6 --- /dev/null +++ b/app-admin/checksec/Manifest @@ -0,0 +1 @@ +DIST checksec-1.7.2.tar.gz 16717 SHA256 eb17f2162e7f563ba0f97d9cf15f92cf1ba2d360c8293a33d66573d5a48822a8 SHA512 1f1c1867b889266c0d035c3f7b028e61ed2cf3413caa789dfb8589b56834194e3367b3868a80984242dadb7629a9a5a7563376a2f37e3971899e2ecc319ee2f1 WHIRLPOOL 3abf206d666751b2449387848afb320185102ddc0f1685db2aa6f4e974a3349e1c4d9551565459d9070cac5218354af1919c5c70af6f0131b9443fcf24a72d35 diff --git a/app-admin/checksec/checksec-1.7.2.ebuild b/app-admin/checksec/checksec-1.7.2.ebuild new file mode 100644 index 000000000000..97a2ca76256c --- /dev/null +++ b/app-admin/checksec/checksec-1.7.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils + +MY_PN=${PN}.sh +DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)" +HOMEPAGE="https://github.com/slimm609/checksec.sh" +SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +S="${WORKDIR}"/${MY_PN}-${PV} + +DOCS=( ChangeLog README.md ) + +src_prepare() { + epatch "${FILESDIR}"/${P}-path.patch +} + +src_install() { + default + dobin ${PN} +} diff --git a/app-admin/checksec/files/checksec-1.7.2-path.patch b/app-admin/checksec/files/checksec-1.7.2-path.patch new file mode 100644 index 000000000000..aa048b079d53 --- /dev/null +++ b/app-admin/checksec/files/checksec-1.7.2-path.patch @@ -0,0 +1,24 @@ +From 2065e51b255b5f9c014a0db35ffe5ce9ea946693 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Wed, 6 Jan 2016 17:28:36 +0100 +Subject: [PATCH] Extend ${PATH} so that sysctl is found + +--- + checksec | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/checksec b/checksec +index 3660e82..0ac685f 100755 +--- a/checksec ++++ b/checksec +@@ -59,6 +59,7 @@ + + #set global lang to C + export LC_ALL="C" ++export PATH="${PATH}:/usr/sbin/" # for sysctl + + # global vars + debug=false +-- +2.7.0 + diff --git a/app-admin/checksec/metadata.xml b/app-admin/checksec/metadata.xml new file mode 100644 index 000000000000..16bcc9f800a2 --- /dev/null +++ b/app-admin/checksec/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>sping@gentoo.org</email> + <name>Sebastian Pipping</name> + </maintainer> +</pkgmetadata> diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest index b9b401ccf404..7cd11d08674c 100644 --- a/app-admin/puppet-agent/Manifest +++ b/app-admin/puppet-agent/Manifest @@ -1,16 +1,2 @@ -DIST puppet-agent_1.2.2-1wheezy_amd64.deb 14860604 SHA256 5910ff850e8814092b50dc70a68d8c5497d5fe3d960bfef9cd13f8dc689dc665 SHA512 ad11b0ba820186f4b315ac156e8bf78348acd69d11e4c03cb12314fc73e4e3fbfef0814664e7fd04f692e8db42f9e137194e267354b2fc4ec8dda424af9f5d98 WHIRLPOOL 25c42e9f7871ccf61eb55b83327813e6090ee359c42e1e473ef09155db69adebfe412fd61a5752b4b634e5ad8aa7bd45d4a86f7e5ba29c1bdb74033b91f45c3f -DIST puppet-agent_1.2.2-1wheezy_i386.deb 14816930 SHA256 092b8bfe1e1156322d0ab68d411487c80146bd778916409b1c907791f41a49c8 SHA512 50879ce4eebcd451dafb33cb7a12c36ee9bcaedfc29ffa0d60552efa5aa4cd66d0007061d28a80d31615c67442f8526863185e6753418772d8275e58454d6886 WHIRLPOOL 7abb0b6f52f5dd07a5ccb56b1c795c05f8c4efd18665d2ca209400e51419e4ae335e630a845c031a47df09d96ce20fbc92d7cafa082deb3872306daf74838612 -DIST puppet-agent_1.2.4-1wheezy_amd64.deb 15187770 SHA256 a711255c7b5aab5f1a653fcbe461db0934645b1da876f24595d531c7ad8c81d4 SHA512 dc7656a7f79f1f2e5144bf625b87548ed1b78290ae03c969abb850f0b1c346536c37c2b204ac0e6add830c1fd692ca4f946ea01bba50bb9794c094069f237d73 WHIRLPOOL 3809a0f9c5db1c73c6edcc344e6fdc7fb5acf340e36225611c72088175fe64ea26c3770ba126a61ed91fa275cf898828d9d192872a216a52b8345f25de1df7e6 -DIST puppet-agent_1.2.4-1wheezy_i386.deb 15122670 SHA256 33e9b16ea215089e7a89288faebd4767163e05d7c4a9d5c51ca71b041496c204 SHA512 944f6388d317fab9a2714a6cdc57e713a973d3c1df259b3358be3a0d737878df9f1d66186af8aea0cc768e55650f1dd1d3ef8682b942728fba45e7c0bca20867 WHIRLPOOL bd5710845a9c8f27fb566ead63e45649fb3854200df0259c76b9478d93792b453a9d5cf4fdc20112991d4d091c82143b7504b51be65815b2dcb67796f275303d -DIST puppet-agent_1.2.5-1wheezy_amd64.deb 15187830 SHA256 4d557e45571df033a9e1babf406f9b8a4c387fe6dec7d3645f5e7ad5d7625f0d SHA512 25557aa4d5fa3d2ba0aa226c835d6779d075f0ef7c054cfda9826b1fedd08c90f5143630206b1bd51550f193aecdf4eef6395437f24e5fdfe10d3ed10fb4b75f WHIRLPOOL d6ef920932a708d1a143245f84380384b3a22320c0bb21e60be9807e29af1d3da6dbfef2f498fcb90fe4584618ae338546103c71eb305b743d326e9c20704f1f -DIST puppet-agent_1.2.5-1wheezy_i386.deb 15122650 SHA256 f34a6e9c70b5276806dacf64fb2b41fd927e6875071d044f9901c5a8d9dacd1d SHA512 0989501ca3f011601bb301126ad58084571ee67eb961fbf1f5cf002eb9155bf4f8e838452ac62b45472f00c0a7538cb5c72c3e43c651675a7940d8ab9a1a309c WHIRLPOOL f9698e3154254d9931fdbccd9a75edccae8ab799f8add0e32995453d62a0d070001ad858449c5b816c1b1a448beb8b99b180558feea3b36fc84c0e730e2d5b7e -DIST puppet-agent_1.2.6-1wheezy_amd64.deb 15187698 SHA256 3448a92d6761bc1c284b17508bf541b0a8c40394b03e7608826e4f2a900e40cc SHA512 b5e6e43f22728cd7d9f4d103aa4de8fa1eccb3159abc31a921fa8f387dd0436a8d0f915b38be8ce233e39448b94f30be90e18da4e2861d6aeda9ef8a312474d2 WHIRLPOOL eca0f32e11b29050e53d93d02a68e874cc5f0f90d823aa7ea5241599872ef39d65f45103542fac84083b40ec47cf09435f27c4fb91b5a5c9a4dee84aa50a2c41 -DIST puppet-agent_1.2.6-1wheezy_i386.deb 15122826 SHA256 271d62f7f6634b49632308d95c75519620335d176d3ee694a3cee42bb445d658 SHA512 3eae7b5a112baf1123c6d942e0b60ee07d76b02a8313a7122884b66f08077fbe430447857e5862182de7cf64ef90f931a49936d6967134937ccff84dd419ae4c WHIRLPOOL bce7ce95c3f6c21ca658d7ba25b3cb7b04c20e5af5499e3f4efb1df997dedd01e0982c67da332fcd8da901f06ce8683219baa6c7e02a7a4eed5ce20547bcfa35 -DIST puppet-agent_1.2.7-1wheezy_amd64.deb 15280016 SHA256 c250bcdeb22296ef3b0097da507b32f1503abbff332c68df10291dcb975243ed SHA512 f2e8d37415d9b6c260c8b4fdee44cc1b85ab784b57c944b856082cc9a65b3de32985527a65aac49ae3c3eea54736bf3c26e11af91c09fd6bfb3b065e98ca99d0 WHIRLPOOL e6b62d968dd0a10031b42afd052c2a280e5d50caae5d51f493a3f432cb4f74ff783db8c4cb77fd2bb6defb4fd1743ce220bf9143fa7c1c02a1b8dffe01a474b2 -DIST puppet-agent_1.2.7-1wheezy_i386.deb 15214412 SHA256 c2b9f51cfe3d3e43b3cdfb7a1c6c92abaeaf2c4ab26e9ceac5aba2b58cf1480e SHA512 6950e09c49da35c0cf463364b4ec468ba011f15d3caf9c59c58ef01a0cfd859cb5c97a3271d9a11c958a71c4c77ba45a8dab205124b92a80354da519dc1a2f3c WHIRLPOOL 12ce6f5ba23f00d1320d7cd40734485ac69bdddda8a9711e18f3549c12919592ca27394963578c5850400864e2b524e7034833e8b2985b15f06bb66f06df1b75 -DIST puppet-agent_1.3.0-1wheezy_amd64.deb 18018964 SHA256 dd107d96f674100e399f1e1a773b22ed2dd77081f3580d7df729f0d02885326f SHA512 20b5a2e516e98db30450b54f0ae042b4c6d5ccf4f44bc3403381bc663c73a7349b393fefaafabfbe334a49afbfcabc8eeae727e4eca54ef7eaa81463a7f05ed2 WHIRLPOOL df75fda9fa2ddc46fea419a65dc0de7eccd9ded41534c96f9be6688b07287fb3f6343ae908fcede47f857d37af1513e74ae5b25302150b1b186f0dc698d85860 -DIST puppet-agent_1.3.0-1wheezy_i386.deb 17960480 SHA256 eda86599bd647e1367874636aedb9e2812540043b6bf3f0f614efb00b7f727b8 SHA512 d2a3555c9298c9a14ea9342e787f4971a0e6fbe0ea37a2ca8a6f8ee4863fb8eb21dd5cb45c493ad0bffdc85e239baa6aaec95c778fb697e6ec5fe65ba592ea84 WHIRLPOOL f77446c30aaf56e529ecec2dfbd00d438407ed58bfa460f147cc59c403eeafa4fbb62697d84696173501c349156d0b0c0a0166760dc2bdf1f133371bc9ee1d98 -DIST puppet-agent_1.3.1-1wheezy_amd64.deb 18079810 SHA256 c7df7a99ac0ee08564e60596ec4547f4208010d196c7e229f54fe8c8939cf7fd SHA512 c205c24a2c8aee1f57ddb9c1e0b09172455e953de8b51452c274e43edd95e3d5999c8ff74d00935b3a3b3221532d264bd4e9917a994095e9deee8430e91cc572 WHIRLPOOL fb492b8f6e98565e664bfb14dcb8b06fcae20b5bcefb9a04abd064099271fbae8d21c47b6605e32e0efce7fb6bcceeb9e3e330c1e7338491b700e66945870c5b -DIST puppet-agent_1.3.1-1wheezy_i386.deb 18015662 SHA256 7a6df5b1ff33ab6791c76d7080fc2b8174e6efdf701c774d7945238f3be28e5a SHA512 3960327559ef9b7f58b6b0997789ec89b74afab2628c8067383556e66cdbfe5a5951ddf5c11840bf0fc76052a8548500f2608dc823ae757c669272ee10a22af5 WHIRLPOOL 9c8c50401e3388af6114a24b70753b6ee96beee5f73e9fbb50ff1e6c63ae6e94ae4110ad197558288f4d310ef36714ca9132d08ff0f122aab8a4885b4ab682cc DIST puppet-agent_1.3.2-1wheezy_amd64.deb 18316012 SHA256 9d36e5d2902e8ffa9cb19a51c0df26bfe9e15fa28daaff8fc7724185df460ae6 SHA512 d63a52a9e5cf6a0cb1438715ed3f1c8edddaf4c21335aac80771b283c577151519bfbf73028c3d6af702d03372220964b052c4b45190f838a0a7e5ade247923a WHIRLPOOL 789b9316dc0edf701da9ef73c6034501b261e71db86c29db2d4f737719a3d37a53ef71f5eb43d8b7c5d2ff465d44ab59f4f744a39ed20b6a7600624e5ef4b993 DIST puppet-agent_1.3.2-1wheezy_i386.deb 18248404 SHA256 7e6570f592a712c342c192643cacfb74ca103efea26191cb8b8baa0f359b0fca SHA512 66a092cd7579af5aff89e3c45897c2f3d036fc2fb6e35be3492bdfb273d33c356e4d5ff53362d303eead6b3c53aeef9e82da1371b3555c94f67f11a65f0f5b6d WHIRLPOOL 8cf9f5ddad6815511f2c09d76e66d456aa15c68af0485dfda86a081fa3f6ecbdeeaf4815838c2f6113a65890532164bbba1fb12fb9607c5d1fa8c95d4df14217 diff --git a/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild deleted file mode 100644 index f9888cf28fd0..000000000000 --- a/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils systemd unpacker - -DESCRIPTION="general puppet client utils along with mcollective hiera and facter" -HOMEPAGE="https://puppetlabs.com/" -SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy" -SRC_URI=" - amd64? ( ${SRC_BASE}_amd64.deb ) - x86? ( ${SRC_BASE}_i386.deb ) -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="puppetdb" -RESTRICT="strip" - -CDEPEND="!app-admin/puppet - !app-admin/mcollective - !dev-ruby/hiera - !dev-ruby/facter" - -DEPEND=" - ${DEPEND} - ${CDEPEND}" -RDEPEND="${CDEPEND} - puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )" - -S=${WORKDIR} - -src_install() { - # conf.d - doconfd etc/default/puppet - doconfd etc/default/mcollective - # logrotate.d - insinto /etc/logrotate.d - doins etc/logrotate.d/mcollective - # puppet itself - insinto /etc/puppetlabs - doins -r etc/puppetlabs/* - # logdir for systemd - dodir var/log/puppetlabs/puppet/ - fperms 0750 var/log/puppetlabs/puppet/ - # the rest - insinto /opt - doins -r opt/* - fperms 0750 /opt/puppetlabs/puppet/cache - # init - newinitd "${FILESDIR}/puppet.initd" puppet - newinitd "${FILESDIR}/mcollective.initd" mcollective - systemd_dounit "${FILESDIR}/puppet.service" - systemd_dounit "${FILESDIR}/mcollective.service" - systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf - # symlinks - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" - dosym /opt/puppetlabs/bin/facter /usr/bin/facter - dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera - dosym /opt/puppetlabs/bin/mco /usr/bin/mco - dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived -} diff --git a/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild deleted file mode 100644 index 2af998ef77bd..000000000000 --- a/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils systemd unpacker - -DESCRIPTION="general puppet client utils along with mcollective hiera and facter" -HOMEPAGE="https://puppetlabs.com/" -SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy" -SRC_URI=" - amd64? ( ${SRC_BASE}_amd64.deb ) - x86? ( ${SRC_BASE}_i386.deb ) -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="puppetdb selinux" -RESTRICT="strip" - -CDEPEND="!app-admin/augeas - !app-admin/mcollective - !app-admin/puppet - !dev-ruby/hiera - !dev-ruby/facter - !app-emulation/virt-what" - -DEPEND=" - ${CDEPEND}" -RDEPEND="${CDEPEND} - sys-apps/dmidecode - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )" - -S=${WORKDIR} - -src_install() { - # conf.d - doconfd etc/default/puppet - doconfd etc/default/mcollective - # logrotate.d - insinto /etc/logrotate.d - doins etc/logrotate.d/mcollective - # puppet itself - insinto /etc/puppetlabs - doins -r etc/puppetlabs/* - # logdir for systemd - dodir var/log/puppetlabs/puppet/ - fperms 0750 var/log/puppetlabs/puppet/ - # the rest - insinto /opt - doins -r opt/* - fperms 0750 /opt/puppetlabs/puppet/cache - # init - newinitd "${FILESDIR}/puppet.initd" puppet - newinitd "${FILESDIR}/mcollective.initd" mcollective - systemd_dounit "${FILESDIR}/puppet.service" - systemd_dounit "${FILESDIR}/mcollective.service" - systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf - # symlinks - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" - chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" - dosym /opt/puppetlabs/bin/facter /usr/bin/facter - dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera - dosym /opt/puppetlabs/bin/mco /usr/bin/mco - dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived - dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what - dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse - dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool - dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera -} diff --git a/app-admin/puppet-agent/puppet-agent-1.2.4.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.4.ebuild deleted file mode 100644 index d0c66a57f01c..000000000000 --- a/app-admin/puppet-agent/puppet-agent-1.2.4.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils systemd unpacker - -DESCRIPTION="general puppet client utils along with mcollective hiera and facter" -HOMEPAGE="https://puppetlabs.com/" -SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy" -SRC_URI=" - amd64? ( ${SRC_BASE}_amd64.deb ) - x86? ( ${SRC_BASE}_i386.deb ) -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="puppetdb selinux" -RESTRICT="strip" - -CDEPEND="!app-admin/augeas - !app-admin/mcollective - !app-admin/puppet - !dev-ruby/hiera - !dev-ruby/facter - !app-emulation/virt-what" - -DEPEND=" - ${CDEPEND}" -RDEPEND="${CDEPEND} - sys-apps/dmidecode - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )" - -S=${WORKDIR} - -src_install() { - # conf.d - doconfd etc/default/puppet - doconfd etc/default/mcollective - # logrotate.d - insinto /etc/logrotate.d - doins etc/logrotate.d/mcollective - # puppet itself - insinto /etc/puppetlabs - doins -r etc/puppetlabs/* - # logdir for systemd - dodir var/log/puppetlabs/puppet/ - fperms 0750 var/log/puppetlabs/puppet/ - # the rest - insinto /opt - dodir opt/puppetlabs/puppet/cache - doins -r opt/* - fperms 0750 /opt/puppetlabs/puppet/cache - # init - newinitd "${FILESDIR}/puppet.initd" puppet - newinitd "${FILESDIR}/mcollective.initd" mcollective - systemd_dounit "${FILESDIR}/puppet.service" - systemd_dounit "${FILESDIR}/mcollective.service" - systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf - # symlinks - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" - chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" - dosym /opt/puppetlabs/bin/facter /usr/bin/facter - dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera - dosym /opt/puppetlabs/bin/mco /usr/bin/mco - dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived - dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what - dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse - dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool - dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera -} diff --git a/app-admin/puppet-agent/puppet-agent-1.2.5.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.5.ebuild deleted file mode 100644 index d0c66a57f01c..000000000000 --- a/app-admin/puppet-agent/puppet-agent-1.2.5.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils systemd unpacker - -DESCRIPTION="general puppet client utils along with mcollective hiera and facter" -HOMEPAGE="https://puppetlabs.com/" -SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy" -SRC_URI=" - amd64? ( ${SRC_BASE}_amd64.deb ) - x86? ( ${SRC_BASE}_i386.deb ) -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="puppetdb selinux" -RESTRICT="strip" - -CDEPEND="!app-admin/augeas - !app-admin/mcollective - !app-admin/puppet - !dev-ruby/hiera - !dev-ruby/facter - !app-emulation/virt-what" - -DEPEND=" - ${CDEPEND}" -RDEPEND="${CDEPEND} - sys-apps/dmidecode - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )" - -S=${WORKDIR} - -src_install() { - # conf.d - doconfd etc/default/puppet - doconfd etc/default/mcollective - # logrotate.d - insinto /etc/logrotate.d - doins etc/logrotate.d/mcollective - # puppet itself - insinto /etc/puppetlabs - doins -r etc/puppetlabs/* - # logdir for systemd - dodir var/log/puppetlabs/puppet/ - fperms 0750 var/log/puppetlabs/puppet/ - # the rest - insinto /opt - dodir opt/puppetlabs/puppet/cache - doins -r opt/* - fperms 0750 /opt/puppetlabs/puppet/cache - # init - newinitd "${FILESDIR}/puppet.initd" puppet - newinitd "${FILESDIR}/mcollective.initd" mcollective - systemd_dounit "${FILESDIR}/puppet.service" - systemd_dounit "${FILESDIR}/mcollective.service" - systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf - # symlinks - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" - chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" - dosym /opt/puppetlabs/bin/facter /usr/bin/facter - dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera - dosym /opt/puppetlabs/bin/mco /usr/bin/mco - dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived - dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what - dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse - dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool - dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera -} diff --git a/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild deleted file mode 100644 index 7de77c52fb14..000000000000 --- a/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils systemd unpacker - -DESCRIPTION="general puppet client utils along with mcollective hiera and facter" -HOMEPAGE="https://puppetlabs.com/" -SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy" -SRC_URI=" - amd64? ( ${SRC_BASE}_amd64.deb ) - x86? ( ${SRC_BASE}_i386.deb ) -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="puppetdb selinux" -RESTRICT="strip" - -CDEPEND="!app-admin/augeas - !app-admin/mcollective - !app-admin/puppet - !dev-ruby/hiera - !dev-ruby/facter - !app-emulation/virt-what" - -DEPEND=" - ${CDEPEND}" -RDEPEND="${CDEPEND} - sys-apps/dmidecode - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )" - -S=${WORKDIR} - -src_install() { - # conf.d - doconfd etc/default/puppet - doconfd etc/default/mcollective - # logrotate.d - insinto /etc/logrotate.d - doins etc/logrotate.d/mcollective - # puppet itself - insinto /etc/puppetlabs - doins -r etc/puppetlabs/* - # logdir for systemd - dodir var/log/puppetlabs/puppet/ - fperms 0750 var/log/puppetlabs/puppet/ - # the rest - insinto /opt - dodir opt/puppetlabs/puppet/cache - doins -r opt/* - fperms 0750 /opt/puppetlabs/puppet/cache - # init - newinitd "${FILESDIR}/puppet.initd" puppet - newinitd "${FILESDIR}/mcollective.initd" mcollective - systemd_dounit "${FILESDIR}/puppet.service" - systemd_dounit "${FILESDIR}/mcollective.service" - systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf - # symlinks - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" - chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" - dosym /opt/puppetlabs/bin/facter /usr/bin/facter - dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera - dosym /opt/puppetlabs/bin/mco /usr/bin/mco - dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived - dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what - dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse - dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool - dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera -} diff --git a/app-admin/puppet-agent/puppet-agent-1.2.7-r1.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.7-r1.ebuild deleted file mode 100644 index c46e0fc86c30..000000000000 --- a/app-admin/puppet-agent/puppet-agent-1.2.7-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils systemd unpacker user - -DESCRIPTION="general puppet client utils along with mcollective hiera and facter" -HOMEPAGE="https://puppetlabs.com/" -SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy" -SRC_URI=" - amd64? ( ${SRC_BASE}_amd64.deb ) - x86? ( ${SRC_BASE}_i386.deb ) -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="puppetdb selinux" -RESTRICT="strip" - -CDEPEND="!app-admin/augeas - !app-admin/mcollective - !app-admin/puppet - !dev-ruby/hiera - !dev-ruby/facter - !app-emulation/virt-what" - -DEPEND=" - ${CDEPEND}" -RDEPEND="${CDEPEND} - sys-apps/dmidecode - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )" - -S=${WORKDIR} - -QA_PREBUILT=" - /opt/puppetlabs/puppet - /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/* - /opt/puppetlabs/puppet/lib/engines/* - /opt/puppetlabs/puppet/lib/virt-what/* - /opt/puppetlabs/puppet/bin/*" - -pkg_setup() { - enewgroup puppet - enewuser puppet -1 -1 /var/run/puppet puppet -} - -src_install() { - # conf.d - doconfd etc/default/puppet - doconfd etc/default/mcollective - # logrotate.d - insinto /etc/logrotate.d - doins etc/logrotate.d/mcollective - # puppet itself - insinto /etc/puppetlabs - doins -r etc/puppetlabs/* - # logdir for systemd - dodir var/log/puppetlabs/puppet/ - fperms 0750 var/log/puppetlabs/puppet/ - # the rest - insinto /opt - dodir opt/puppetlabs/puppet/cache - doins -r opt/* - fperms 0750 /opt/puppetlabs/puppet/cache - # init - newinitd "${FILESDIR}/puppet.initd" puppet - newinitd "${FILESDIR}/mcollective.initd" mcollective - systemd_dounit "${FILESDIR}/puppet.service" - systemd_dounit "${FILESDIR}/mcollective.service" - systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf - # symlinks - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" - chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" - dosym /opt/puppetlabs/bin/facter /usr/bin/facter - dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera - dosym /opt/puppetlabs/bin/mco /usr/bin/mco - dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived - dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what - dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse - dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool - dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera -} diff --git a/app-admin/puppet-agent/puppet-agent-1.3.0.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.0.ebuild deleted file mode 100644 index 696bcc79467a..000000000000 --- a/app-admin/puppet-agent/puppet-agent-1.3.0.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils systemd unpacker user - -DESCRIPTION="general puppet client utils along with mcollective hiera and facter" -HOMEPAGE="https://puppetlabs.com/" -SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy" -SRC_URI=" - amd64? ( ${SRC_BASE}_amd64.deb ) - x86? ( ${SRC_BASE}_i386.deb ) -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="puppetdb selinux" -RESTRICT="strip" - -CDEPEND="!app-admin/augeas - !app-admin/mcollective - !app-admin/puppet - !dev-ruby/hiera - !dev-ruby/facter - !app-emulation/virt-what" - -DEPEND=" - ${CDEPEND}" -RDEPEND="${CDEPEND} - sys-apps/dmidecode - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )" - -S=${WORKDIR} - -QA_PREBUILT=" - /opt/puppetlabs/puppet - /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/* - /opt/puppetlabs/puppet/lib/engines/* - /opt/puppetlabs/puppet/lib/virt-what/* - /opt/puppetlabs/puppet/bin/*" - -pkg_setup() { - enewgroup puppet - enewuser puppet -1 -1 /var/run/puppet puppet -} - -src_install() { - # conf.d - doconfd etc/default/puppet - doconfd etc/default/mcollective - # logrotate.d - insinto /etc/logrotate.d - doins etc/logrotate.d/mcollective - # puppet itself - insinto /etc/puppetlabs - doins -r etc/puppetlabs/* - # logdir for systemd - dodir var/log/puppetlabs/puppet/ - fperms 0750 var/log/puppetlabs/puppet/ - # the rest - insinto /opt - dodir opt/puppetlabs/puppet/cache - doins -r opt/* - fperms 0750 /opt/puppetlabs/puppet/cache - # init - newinitd "${FILESDIR}/puppet.initd" puppet - newinitd "${FILESDIR}/mcollective.initd" mcollective - systemd_dounit "${FILESDIR}/puppet.service" - systemd_dounit "${FILESDIR}/mcollective.service" - systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf - # symlinks - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" - chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" - dosym /opt/puppetlabs/bin/facter /usr/bin/facter - dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera - dosym /opt/puppetlabs/bin/mco /usr/bin/mco - dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived - dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what - dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse - dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool - dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera -} diff --git a/app-admin/puppet-agent/puppet-agent-1.3.1.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.1.ebuild deleted file mode 100644 index 696bcc79467a..000000000000 --- a/app-admin/puppet-agent/puppet-agent-1.3.1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils systemd unpacker user - -DESCRIPTION="general puppet client utils along with mcollective hiera and facter" -HOMEPAGE="https://puppetlabs.com/" -SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy" -SRC_URI=" - amd64? ( ${SRC_BASE}_amd64.deb ) - x86? ( ${SRC_BASE}_i386.deb ) -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="puppetdb selinux" -RESTRICT="strip" - -CDEPEND="!app-admin/augeas - !app-admin/mcollective - !app-admin/puppet - !dev-ruby/hiera - !dev-ruby/facter - !app-emulation/virt-what" - -DEPEND=" - ${CDEPEND}" -RDEPEND="${CDEPEND} - sys-apps/dmidecode - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )" - -S=${WORKDIR} - -QA_PREBUILT=" - /opt/puppetlabs/puppet - /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/* - /opt/puppetlabs/puppet/lib/engines/* - /opt/puppetlabs/puppet/lib/virt-what/* - /opt/puppetlabs/puppet/bin/*" - -pkg_setup() { - enewgroup puppet - enewuser puppet -1 -1 /var/run/puppet puppet -} - -src_install() { - # conf.d - doconfd etc/default/puppet - doconfd etc/default/mcollective - # logrotate.d - insinto /etc/logrotate.d - doins etc/logrotate.d/mcollective - # puppet itself - insinto /etc/puppetlabs - doins -r etc/puppetlabs/* - # logdir for systemd - dodir var/log/puppetlabs/puppet/ - fperms 0750 var/log/puppetlabs/puppet/ - # the rest - insinto /opt - dodir opt/puppetlabs/puppet/cache - doins -r opt/* - fperms 0750 /opt/puppetlabs/puppet/cache - # init - newinitd "${FILESDIR}/puppet.initd" puppet - newinitd "${FILESDIR}/mcollective.initd" mcollective - systemd_dounit "${FILESDIR}/puppet.service" - systemd_dounit "${FILESDIR}/mcollective.service" - systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf - # symlinks - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" - chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" - dosym /opt/puppetlabs/bin/facter /usr/bin/facter - dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera - dosym /opt/puppetlabs/bin/mco /usr/bin/mco - dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived - dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what - dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse - dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool - dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera -} diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest index 3c4be16c6527..6ddfff753857 100644 --- a/app-admin/puppetdb/Manifest +++ b/app-admin/puppetdb/Manifest @@ -1,5 +1 @@ -DIST puppetdb-3.0.1.tar.gz 24693952 SHA256 b5e86d36845c62d75c078816cffd5d38d97f014da8886506819b21a6c2719366 SHA512 00960de13270a8063de1845f7f0c42a3fa4bdec10ab2b8f66ce0dba27acda1b78974c57c0f3c6e2c09187f63e85d799b94f95de563bcbc179e9d692470a1e902 WHIRLPOOL ec136a91b2712b9249defaff6ea24b6f1ed917e519850515d8c0b995c5dcbc049550b2ac9efbe585c197a5747edcdb10e490a016de2067b593c833e02d8a7426 -DIST puppetdb-3.0.2.tar.gz 24698063 SHA256 976ef25948b206ad9a0abfee1ac8a4e737e87b7d8b26c3af24bc3237d1dd757b SHA512 9bf8ed30f2156bd7e544899d0e135aeaa0a30b3df76245878ce27f3a195bb4a6356a143b65a7ba1bb8c8382e64d1d616131ffe7dbeea15d2d1b5bdd34a93fc8e WHIRLPOOL e55c7405b814ab39e7e58941c3c71ea31f7ebd42bb23de2d98f722a99382f50999fa83105b3d730d49188d137aee1bdf7ed63fc30f8a879809b6e4762ba00873 -DIST puppetdb-3.1.0.tar.gz 25250202 SHA256 e341de9cf9c2a698bb68fef75ef366fbd4760595131bdced3cd925f439d67535 SHA512 95dd5119e198f481f79f83fd7071932bf266b14e21730b5e4b5b19cf43bb1643d82f0c478da725da677f6dc58cfdd10ab4658481638fd48348c4113777e2a564 WHIRLPOOL cd338cf9ebd0a3ce4ec917ce7450a85e1c5dc8bb3c0fb7482bf62aceacbf2dab7d7fa3ddd83e1689f20dc022460ceb4bda231b436fa09c511dc307207cacfc28 -DIST puppetdb-3.2.0.tar.gz 25274763 SHA256 09527c4c4d70d14079f57dacf4744ecbfc1459ce10db0e2277909c37255adcc1 SHA512 71b68866ddb9c25d2903a30653c6e411464cbe2202f32d2d46edf6d72988ff00331a791d863f2c5f9dc3195038e35f753855c37ce68ac0a2b65a559d245c1ad6 WHIRLPOOL c7b7670b5571f6dcfcda74d091c1172e81f80705b9add1598a6687d2024f72f00ec21312e53209fbfda693f406d63a40616f3cb567c7cda873375fcac6f4b10d DIST puppetdb-3.2.2.tar.gz 25273184 SHA256 c6ed59055ef54a3af0fc571fae54f23a99e4f4781783c0a9be4ef0df1012b2dd SHA512 5fdd22c3a14e447a997bf223e7147be22c51e8dd44d636ab51bf35c44c813ac2898fbfe72efba3896189244d56abd9cbac3782c7c8ab2f1648b6b1f01b53de45 WHIRLPOOL e138e39a277fad9a0dc56a2c573515ca257b272356381ed5e4d031743e014c3605c9754bf07307389192bee8ed057d02697096102300c15c5ed83990171c61e0 diff --git a/app-admin/puppetdb/puppetdb-3.0.1.ebuild b/app-admin/puppetdb/puppetdb-3.0.1.ebuild deleted file mode 100644 index 512445aa334b..000000000000 --- a/app-admin/puppetdb/puppetdb-3.0.1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit multilib systemd user - -DESCRIPTION="PuppetDB collects data generated by Puppet." -HOMEPAGE="http://docs.puppetlabs.com/puppetdb/" -SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" -# will need the same keywords as puppet -KEYWORDS="~amd64 ~x86" - -RDEPEND+=">=virtual/jdk-1.7.0" -DEPEND+="" - -pkg_setup() { - enewgroup puppetdb - enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb" -} - -src_prepare() { - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die - sed -i 's/sysconfig/conf\.d/g' install.sh || die - sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die - sed -i 's/var\/run/run/g' install.sh || die -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - dodir /opt/puppetlabs/server/data/puppetdb - insinto /opt/puppetlabs/server/apps/puppetdb - insopts -m0744 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppetdb.jar - insinto /etc/puppetlabs/puppetdb - doins ext/config/logback.xml - doins ext/config/bootstrap.cfg - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetdb/conf.d - doins ext/config/conf.d/jetty.ini - doins ext/config/conf.d/repl.ini - doins ext/config/conf.d/database.ini - doins ext/config/conf.d/config.ini - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetdb/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps - doins ext/cli/foreground - doins ext/cli/ssl-setup - doins ext/cli/export - doins ext/cli/config-migration - doins ext/cli/foreground - doins ext/cli/anonymize - doins ext/cli/import - insinto /opt/puppetlabs/server/apps/puppetdb/bin - doins ext/bin/puppetdb - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb - dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb - # init type tasks - newconfd ext/default puppetdb - systemd_dounit ext/redhat/puppetdb.service - systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf - newinitd "${FILESDIR}/puppetdb.initd" puppetdb - # misc - insinto /etc/logrotate.d - newins ext/puppetdb.logrotate.conf puppetdb - fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb - fperms -R 770 /opt/puppetlabs/server/data/puppetdb -} - -pkg_postinst() { - elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" - elog - elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" -} diff --git a/app-admin/puppetdb/puppetdb-3.0.2.ebuild b/app-admin/puppetdb/puppetdb-3.0.2.ebuild deleted file mode 100644 index 512445aa334b..000000000000 --- a/app-admin/puppetdb/puppetdb-3.0.2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit multilib systemd user - -DESCRIPTION="PuppetDB collects data generated by Puppet." -HOMEPAGE="http://docs.puppetlabs.com/puppetdb/" -SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" -# will need the same keywords as puppet -KEYWORDS="~amd64 ~x86" - -RDEPEND+=">=virtual/jdk-1.7.0" -DEPEND+="" - -pkg_setup() { - enewgroup puppetdb - enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb" -} - -src_prepare() { - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die - sed -i 's/sysconfig/conf\.d/g' install.sh || die - sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die - sed -i 's/var\/run/run/g' install.sh || die -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - dodir /opt/puppetlabs/server/data/puppetdb - insinto /opt/puppetlabs/server/apps/puppetdb - insopts -m0744 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppetdb.jar - insinto /etc/puppetlabs/puppetdb - doins ext/config/logback.xml - doins ext/config/bootstrap.cfg - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetdb/conf.d - doins ext/config/conf.d/jetty.ini - doins ext/config/conf.d/repl.ini - doins ext/config/conf.d/database.ini - doins ext/config/conf.d/config.ini - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetdb/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps - doins ext/cli/foreground - doins ext/cli/ssl-setup - doins ext/cli/export - doins ext/cli/config-migration - doins ext/cli/foreground - doins ext/cli/anonymize - doins ext/cli/import - insinto /opt/puppetlabs/server/apps/puppetdb/bin - doins ext/bin/puppetdb - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb - dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb - # init type tasks - newconfd ext/default puppetdb - systemd_dounit ext/redhat/puppetdb.service - systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf - newinitd "${FILESDIR}/puppetdb.initd" puppetdb - # misc - insinto /etc/logrotate.d - newins ext/puppetdb.logrotate.conf puppetdb - fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb - fperms -R 770 /opt/puppetlabs/server/data/puppetdb -} - -pkg_postinst() { - elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" - elog - elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" -} diff --git a/app-admin/puppetdb/puppetdb-3.1.0.ebuild b/app-admin/puppetdb/puppetdb-3.1.0.ebuild deleted file mode 100644 index 9d2bed7b5e7d..000000000000 --- a/app-admin/puppetdb/puppetdb-3.1.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit multilib systemd user - -DESCRIPTION="PuppetDB collects data generated by Puppet." -HOMEPAGE="http://docs.puppetlabs.com/puppetdb/" -SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" -# will need the same keywords as puppet -KEYWORDS="amd64 x86" - -RDEPEND+=">=virtual/jdk-1.7.0" -DEPEND+="" - -pkg_setup() { - enewgroup puppetdb - enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb" -} - -src_prepare() { - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die - sed -i 's/sysconfig/conf\.d/g' install.sh || die - sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die - sed -i 's/var\/run/run/g' install.sh || die -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - dodir /opt/puppetlabs/server/data/puppetdb - insinto /opt/puppetlabs/server/apps/puppetdb - insopts -m0744 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppetdb.jar - insinto /etc/puppetlabs/puppetdb - doins ext/config/logback.xml - doins ext/config/bootstrap.cfg - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetdb/conf.d - doins ext/config/conf.d/jetty.ini - doins ext/config/conf.d/repl.ini - doins ext/config/conf.d/database.ini - doins ext/config/conf.d/config.ini - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetdb/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps - doins ext/cli/foreground - doins ext/cli/ssl-setup - doins ext/cli/export - doins ext/cli/config-migration - doins ext/cli/foreground - doins ext/cli/anonymize - doins ext/cli/import - insinto /opt/puppetlabs/server/apps/puppetdb/bin - doins ext/bin/puppetdb - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb - dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb - # init type tasks - newconfd ext/default puppetdb - systemd_dounit ext/redhat/puppetdb.service - systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf - newinitd "${FILESDIR}/puppetdb.initd" puppetdb - # misc - insinto /etc/logrotate.d - newins ext/puppetdb.logrotate.conf puppetdb - fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb - fperms -R 770 /opt/puppetlabs/server/data/puppetdb -} - -pkg_postinst() { - elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" - elog - elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" -} diff --git a/app-admin/puppetdb/puppetdb-3.2.0.ebuild b/app-admin/puppetdb/puppetdb-3.2.0.ebuild deleted file mode 100644 index 9d2bed7b5e7d..000000000000 --- a/app-admin/puppetdb/puppetdb-3.2.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit multilib systemd user - -DESCRIPTION="PuppetDB collects data generated by Puppet." -HOMEPAGE="http://docs.puppetlabs.com/puppetdb/" -SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" -# will need the same keywords as puppet -KEYWORDS="amd64 x86" - -RDEPEND+=">=virtual/jdk-1.7.0" -DEPEND+="" - -pkg_setup() { - enewgroup puppetdb - enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb" -} - -src_prepare() { - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die - sed -i 's/sysconfig/conf\.d/g' install.sh || die - sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die - sed -i 's/var\/run/run/g' install.sh || die -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - dodir /opt/puppetlabs/server/data/puppetdb - insinto /opt/puppetlabs/server/apps/puppetdb - insopts -m0744 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppetdb.jar - insinto /etc/puppetlabs/puppetdb - doins ext/config/logback.xml - doins ext/config/bootstrap.cfg - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetdb/conf.d - doins ext/config/conf.d/jetty.ini - doins ext/config/conf.d/repl.ini - doins ext/config/conf.d/database.ini - doins ext/config/conf.d/config.ini - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetdb/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps - doins ext/cli/foreground - doins ext/cli/ssl-setup - doins ext/cli/export - doins ext/cli/config-migration - doins ext/cli/foreground - doins ext/cli/anonymize - doins ext/cli/import - insinto /opt/puppetlabs/server/apps/puppetdb/bin - doins ext/bin/puppetdb - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb - dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb - # init type tasks - newconfd ext/default puppetdb - systemd_dounit ext/redhat/puppetdb.service - systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf - newinitd "${FILESDIR}/puppetdb.initd" puppetdb - # misc - insinto /etc/logrotate.d - newins ext/puppetdb.logrotate.conf puppetdb - fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb - fperms -R 770 /opt/puppetlabs/server/data/puppetdb -} - -pkg_postinst() { - elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" - elog - elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" -} diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index 93cc86285747..8d9a1d37b2c6 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -1,3 +1 @@ -DIST puppetserver-2.1.2.tar.gz 42613471 SHA256 5b5ba875bad9d7ac6b060dab8ab02afb624878fa420d49c81954442c2d8b4048 SHA512 5b814f0268e232cef3e1b613cd0f608e14afacde2788700269687727c4a1f7dec2e353628e1714c71e086b9726972ef6d0aea2f997277e9c55eb481510430b5d WHIRLPOOL 357cf5e5c347d7942748cae3240a2aedaaab48293c4c7c7eb71b4723582a427760fe97cb954dc196a5fd87e1323ca3b2cd9e256429e5aee61f9a148a23de3537 -DIST puppetserver-2.2.0.tar.gz 42664943 SHA256 960603e0af9b7bf622db562d00516dfbbf1549ce82ad4eacf97c9a45c2c02e0d SHA512 a7413921ed2aaadfa0d9250482379e54ef7538f237a287bf3bc7226b3df45bdfd86b51768d4c36bfee7c26520c5c4189b56a2622009a8253140e5423a253198a WHIRLPOOL 6b77f4b47105600ec8f23871835852657b86a6692d4a89d104522cfcde2ad16136ef3f693857f56af4381af1320cd50d3b90ea255f59eadabc3f0edfaf92185f DIST puppetserver-2.2.1.tar.gz 42665674 SHA256 583662380b161fc35e0f0c5e7e2964892ec4b7e0cb848cadcd76b29684a85843 SHA512 9b7036d886467a41d0d62d4651a91676d885dfa684aa757d9e27ce5ef5f8183f188f490e1594b6b936219a3dd9bee8f609df6229d5d26fd331677fcf1f61d034 WHIRLPOOL f0f15512be55fd49da80b2e839cef9bd9684ef23eab5e872d331b0802f790451c0fb16320b97d25d0bbb8e9bad08cd66c788c0a47643c8da4d973d6649f0da2c diff --git a/app-admin/puppetserver/puppetserver-2.1.2.ebuild b/app-admin/puppetserver/puppetserver-2.1.2.ebuild deleted file mode 100644 index fd0caba716db..000000000000 --- a/app-admin/puppetserver/puppetserver-2.1.2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit multilib systemd user - -DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." -HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" -SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="puppetdb" -# will need the same keywords as puppet -KEYWORDS="amd64 x86" - -RDEPEND+=" - >=virtual/jdk-1.7.0 - app-admin/puppet-agent[puppetdb?]" -DEPEND+="" - -pkg_setup() { - enewgroup puppet - enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" -} - -src_prepare() { - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetserver.service || die - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetserver || die - sed -i 's/sysconfig/conf\.d/g' install.sh || die - sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die - sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die - sed -i 's/var\/run/run/g' install.sh || die -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - insinto /opt/puppetlabs/server/apps/puppetserver - insopts -m0774 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppet-server-release.jar - insinto /etc/puppetlabs/puppetserver - doins ext/config/logback.xml - doins ext/config/bootstrap.cfg - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetserver/conf.d - doins ext/config/conf.d/puppetserver.conf - doins ext/config/conf.d/ca.conf - doins ext/config/conf.d/global.conf - doins ext/config/conf.d/web-routes.conf - doins ext/config/conf.d/webserver.conf - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetserver/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps - doins ext/cli/irb - doins ext/cli/foreground - doins ext/cli/gem - doins ext/cli/ruby - insinto /opt/puppetlabs/server/apps/puppetserver/bin - doins ext/bin/puppetserver - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver - dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver - # other sys stuff - dodir /etc/puppetlabs/code - # needed for systemd - dodir /var/log/puppetlabs/puppetserver - dodir /etc/puppetlabs/puppet/ssl - fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl - fperms -R 771 /etc/puppetlabs/puppet/ssl - # init type tasks - newconfd ext/default puppetserver - systemd_dounit ext/redhat/puppetserver.service - newinitd "${FILESDIR}/puppetserver.initd" puppetserver - # misc - insinto /etc/logrotate.d - newins ext/puppetserver.logrotate.conf puppetserver - # cleanup - dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems - fowners -R puppet:puppet /opt/puppetlabs/server/data - fperms -R 775 /opt/puppetlabs/server/data/puppetserver - fperms -R 700 /var/log/puppetlabs/puppetserver -} - -pkg_postinst() { - elog "to install you may want to run the following:" - elog - elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" - elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" - elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" - elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" - elog "puppet config set --section master codedir /etc/puppetlabs/code" -} diff --git a/app-admin/puppetserver/puppetserver-2.2.0.ebuild b/app-admin/puppetserver/puppetserver-2.2.0.ebuild deleted file mode 100644 index 0151a4d796ac..000000000000 --- a/app-admin/puppetserver/puppetserver-2.2.0.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit multilib systemd user - -DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." -HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" -SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="puppetdb" -# will need the same keywords as puppet -KEYWORDS="~amd64 ~x86" - -RDEPEND+=" - >=virtual/jdk-1.7.0 - app-admin/puppet-agent[puppetdb?]" -DEPEND+="" - -pkg_setup() { - enewgroup puppet - enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" -} - -src_prepare() { - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetserver.service || die - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetserver || die - sed -i 's/sysconfig/conf\.d/g' install.sh || die - sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die - sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die - sed -i 's/var\/run/run/g' install.sh || die -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - insinto /opt/puppetlabs/server/apps/puppetserver - insopts -m0774 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppet-server-release.jar - insinto /etc/puppetlabs/puppetserver - doins ext/config/logback.xml - doins ext/config/bootstrap.cfg - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetserver/conf.d - doins ext/config/conf.d/puppetserver.conf - doins ext/config/conf.d/auth.conf - doins ext/config/conf.d/global.conf - doins ext/config/conf.d/web-routes.conf - doins ext/config/conf.d/webserver.conf - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetserver/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps - doins ext/cli/irb - doins ext/cli/foreground - doins ext/cli/gem - doins ext/cli/ruby - insinto /opt/puppetlabs/server/apps/puppetserver/bin - doins ext/bin/puppetserver - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver - dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver - # other sys stuff - dodir /etc/puppetlabs/code - # needed for systemd - dodir /var/log/puppetlabs/puppetserver - dodir /etc/puppetlabs/puppet/ssl - fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl - fperms -R 771 /etc/puppetlabs/puppet/ssl - # init type tasks - newconfd ext/default puppetserver - systemd_dounit ext/redhat/puppetserver.service - newinitd "${FILESDIR}/puppetserver.initd" puppetserver - # misc - insinto /etc/logrotate.d - newins ext/puppetserver.logrotate.conf puppetserver - # cleanup - dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems - fowners -R puppet:puppet /opt/puppetlabs/server/data - fperms -R 775 /opt/puppetlabs/server/data/puppetserver - fperms -R 700 /var/log/puppetlabs/puppetserver -} - -pkg_postinst() { - elog "to install you may want to run the following:" - elog - elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" - elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" - elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" - elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" - elog "puppet config set --section master codedir /etc/puppetlabs/code" -} diff --git a/app-emulation/libvirt/files/libvirtd.init-r16 b/app-emulation/libvirt/files/libvirtd.init-r16 new file mode 100644 index 000000000000..2aa9a880dba3 --- /dev/null +++ b/app-emulation/libvirt/files/libvirtd.init-r16 @@ -0,0 +1,35 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +description="Virtual Machine Management daemon (libvirt)" + +LIBVIRTD_OPTS=${LIBVIRTD_OPTS:-"${LIBVIRTD_OPTS}"} +LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"} + +command="/usr/sbin/libvirtd" +command_args="-d ${LIBVIRTD_OPTS}" +start_stop_daemon_args="--env KRB5_KTNAME=/etc/libvirt/krb5.tab" +pidfile="/var/run/libvirtd.pid" +retry="${LIBVIRTD_TERMTIMEOUT}" + +depend() { + need virtlogd + use dbus virtlockd + after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled + USE_FLAG_FIREWALLD + USE_FLAG_AVAHI + USE_FLAG_ISCSI + USE_FLAG_RBD +} + +start_pre() { + # Test configuration directories in /etc/libvirt/ to be either not + # present or a directory, i.e. not a regular file, bug #532892 + + checkpath --directory /etc/libvirt/lxc || return 1 + checkpath --directory /etc/libvirt/nwfilter || return 1 + checkpath --directory /etc/libvirt/qemu || return 1 + checkpath --directory /etc/libvirt/storage || return 1 +} diff --git a/app-emulation/libvirt/libvirt-1.3.0-r1.ebuild b/app-emulation/libvirt/libvirt-1.3.0-r1.ebuild new file mode 100644 index 000000000000..f4d64e711971 --- /dev/null +++ b/app-emulation/libvirt/libvirt-1.3.0-r1.ebuild @@ -0,0 +1,384 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils user autotools-utils linux-info systemd readme.gentoo + +BACKPORTS="20151222" # CVE-2015-5313 + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://libvirt.org/libvirt.git" + SRC_URI="" + KEYWORDS="" + SLOT="0" +else + # Versions with 4 numbers are stable updates: + if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then + SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz" + else + SRC_URI="http://libvirt.org/sources/${P}.tar.gz" + fi + SRC_URI+=" ${BACKPORTS:+ + https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz + https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}" + KEYWORDS="~amd64 ~x86" + SLOT="0/${PV}" +fi + +DESCRIPTION="C toolkit to manipulate virtual machines" +HOMEPAGE="http://www.libvirt.org/" +LICENSE="LGPL-2.1" +IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \ + lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \ + selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \ + xen" + +REQUIRED_USE=" + firewalld? ( virt-network ) + libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) + lxc? ( caps libvirtd ) + openvz? ( libvirtd ) + qemu? ( libvirtd ) + uml? ( libvirtd ) + vepa? ( macvtap ) + virt-network? ( libvirtd ) + virtualbox? ( libvirtd ) + xen? ( libvirtd )" + +# gettext.sh command is used by the libvirt command wrappers, and it's +# non-optional, so put it into RDEPEND. +# We can use both libnl:1.1 and libnl:3, but if you have both installed, the +# package will use 3 by default. Since we don't have slot pinning in an API, +# we must go with the most recent +RDEPEND=" + app-misc/scrub + dev-libs/libgcrypt:0 + dev-libs/libnl:3 + >=dev-libs/libxml2-2.7.6 + >=net-analyzer/netcat6-1.0-r2 + >=net-libs/gnutls-1.0.25 + net-libs/libssh2 + >=net-misc/curl-7.18.0 + sys-apps/dmidecode + >=sys-apps/util-linux-2.17 + sys-devel/gettext + sys-libs/ncurses:0= + sys-libs/readline:= + apparmor? ( sys-libs/libapparmor ) + audit? ( sys-process/audit ) + avahi? ( >=net-dns/avahi-0.6[dbus] ) + caps? ( sys-libs/libcap-ng ) + firewalld? ( net-firewall/firewalld ) + fuse? ( >=sys-fs/fuse-2.8.6 ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) + iscsi? ( sys-block/open-iscsi ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) + lxc? ( !systemd? ( sys-power/pm-utils ) ) + nfs? ( net-fs/nfs-utils ) + numa? ( + >sys-process/numactl-2.0.2 + sys-process/numad + ) + openvz? ( sys-kernel/openvz-sources:* ) + parted? ( + >=sys-block/parted-1.8[device-mapper] + sys-fs/lvm2 + ) + pcap? ( >=net-libs/libpcap-1.0.0 ) + policykit? ( >=sys-auth/polkit-0.9 ) + qemu? ( + >=app-emulation/qemu-0.13.0 + dev-libs/yajl + !systemd? ( sys-power/pm-utils ) + ) + rbd? ( sys-cluster/ceph ) + sasl? ( dev-libs/cyrus-sasl ) + selinux? ( >=sys-libs/libselinux-2.0.85 ) + systemd? ( sys-apps/systemd ) + virt-network? ( + net-dns/dnsmasq[script] + net-firewall/ebtables + >=net-firewall/iptables-1.4.10[ipv6] + net-misc/radvd + sys-apps/iproute2[-minimal] + ) + virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) + wireshark-plugins? ( net-analyzer/wireshark:= ) + xen? ( + app-emulation/xen + app-emulation/xen-tools:= + ) + udev? ( + virtual/udev + >=x11-libs/libpciaccess-0.10.9 + )" + +DEPEND="${RDEPEND} + app-text/xhtml1 + dev-lang/perl + dev-libs/libxslt + dev-perl/XML-XPath + virtual/pkgconfig" + +pkg_setup() { + enewgroup qemu 77 + enewuser qemu 77 -1 -1 qemu kvm + + # Some people used the masked ebuild which was not adding the qemu + # user to the kvm group originally. This results in VMs failing to + # start for some users. bug #430808 + egetent group kvm | grep -q qemu + if [[ $? -ne 0 ]]; then + gpasswd -a qemu kvm + fi + + # Check kernel configuration: + CONFIG_CHECK="" + use fuse && CONFIG_CHECK+=" + ~FUSE_FS" + + use lvm && CONFIG_CHECK+=" + ~BLK_DEV_DM + ~DM_MULTIPATH + ~DM_SNAPSHOT" + + use lxc && CONFIG_CHECK+=" + ~BLK_CGROUP + ~CGROUP_CPUACCT + ~CGROUP_DEVICE + ~CGROUP_FREEZER + ~CGROUP_NET_PRIO + ~CGROUP_PERF + ~CGROUPS + ~CGROUP_SCHED + ~CPUSETS + ~DEVPTS_MULTIPLE_INSTANCES + ~IPC_NS + ~MACVLAN + ~NAMESPACES + ~NET_CLS_CGROUP + ~NET_NS + ~PID_NS + ~POSIX_MQUEUE + ~SECURITYFS + ~USER_NS + ~UTS_NS + ~VETH + ~!GRKERNSEC_CHROOT_MOUNT + ~!GRKERNSEC_CHROOT_DOUBLE + ~!GRKERNSEC_CHROOT_PIVOT + ~!GRKERNSEC_CHROOT_CHMOD + ~!GRKERNSEC_CHROOT_CAPS" + # Handle specific kernel versions for different features + kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" + kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM" + + use macvtap && CONFIG_CHECK+=" + ~MACVTAP" + + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_MARK_T + ~BRIDGE_NF_EBTABLES + ~NETFILTER_ADVANCED + ~NETFILTER_XT_CONNMARK + ~NETFILTER_XT_MARK + ~NETFILTER_XT_TARGET_CHECKSUM" + # Bandwidth Limiting Support + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_T_NAT + ~NET_ACT_POLICE + ~NET_CLS_FW + ~NET_CLS_U32 + ~NET_SCH_HTB + ~NET_SCH_INGRESS + ~NET_SCH_SFQ" + + ERROR_USER_NS="Optional depending on LXC configuration." + + if [[ -n ${CONFIG_CHECK} ]]; then + linux-info_pkg_setup + fi +} + +src_prepare() { + touch "${S}/.mailmap" + + if [[ ${PV} = *9999* ]]; then + # git checkouts require bootstrapping to create the configure script. + # Additionally the submodules must be cloned to the right locations + # bug #377279 + ./bootstrap || die "bootstrap failed" + ( + git submodule status | sed 's/^[ +-]//;s/ .*//' + git hash-object bootstrap.conf + ) >.git-module-status + fi + + epatch \ + "${FILESDIR}"/${P}-do_not_use_sysconf.patch \ + "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \ + "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch + + [[ -n ${BACKPORTS} ]] && + EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \ + EPATCH_SOURCE="${WORKDIR}/patches" epatch + + epatch_user + + # Tweak the init script: + cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die + sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ + -e "s/USE_FLAG_AVAHI/$(usex avahi 'use avahi-daemon' '')/" \ + -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ + -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \ + -i "${S}/libvirtd.init" || die "sed failed" + + AUTOTOOLS_AUTORECONF=true + autotools-utils_src_prepare +} + +src_configure() { + local myeconfargs=( + $(use_with apparmor) + $(use_with apparmor apparmor-profiles) + $(use_with audit) + $(use_with avahi) + $(use_with caps capng) + $(use_with firewalld) + $(use_with fuse) + $(use_with glusterfs) + $(use_with glusterfs storage-gluster) + $(use_with iscsi storage-iscsi) + $(use_with libvirtd) + $(use_with lvm storage-lvm) + $(use_with lvm storage-mpath) + $(use_with lxc) + $(use_with macvtap) + $(use_enable nls) + $(use_with numa numactl) + $(use_with numa numad) + $(use_with openvz) + $(use_with parted storage-disk) + $(use_with pcap libpcap) + $(use_with phyp) + $(use_with policykit polkit) + $(use_with qemu) + $(use_with qemu yajl) + $(use_with rbd storage-rbd) + $(use_with sasl) + $(use_with selinux) + $(use_with systemd systemd-daemon) + $(usex systemd --with-init-script=systemd '') + $(use_with udev) + $(use_with uml) + $(use_with vepa virtualport) + $(use_with virt-network network) + $(use_with wireshark-plugins wireshark-dissector) + $(use_with xen) + $(use_with xen xen-inotify) + $(usex xen --with-libxl '') + + --without-hal + --without-netcf + --without-sanlock + --without-xenapi + --with-esx + --with-qemu-group=$(usex caps qemu root) + --with-qemu-user=$(usex caps qemu root) + --with-remote + --with-storage-fs + --with-vmware + + --disable-static + --disable-werror + + --with-html-subdir=${PF}/html + --localstatedir=/var + ) + + if use virtualbox && has_version app-emulation/virtualbox-ose; then + myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) + else + myeconfargs+=( $(use_with virtualbox vbox) ) + fi + + autotools-utils_src_configure + + if [[ ${PV} = *9999* ]]; then + # Restore gnulib's config.sub and config.guess + # bug #377279 + (cd .gnulib && git reset --hard > /dev/null) + fi + + # Workaround: Sometimes this subdirectory is missing and leads to a + # build failure. + mkdir -p "${BUILD_DIR}"/docs/internals +} + +src_test() { + # Explicitly allow parallel build of tests + export VIR_TEST_DEBUG=1 + HOME="${T}" emake check || die "tests failed" +} + +src_install() { + autotools-utils_src_compile install \ + DESTDIR="${D}" \ + SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" + + find "${D}" -name '*.la' -delete || die + + # Remove bogus, empty directories. They are either not used, or + # libvirtd is able to create them on demand + rm -rf "${D}"/etc/sysconfig + rm -rf "${D}"/var/cache + rm -rf "${D}"/var/run + rm -rf "${D}"/var/log + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + use systemd && systemd_install_serviced \ + "${FILESDIR}"/libvirtd.service.conf libvirtd.service + + systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf + + newinitd "${S}/libvirtd.init" libvirtd || die + newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die + newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die + newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die + + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +pkg_preinst() { + # we only ever want to generate this once + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml + fi +} + +pkg_postinst() { + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml + fi + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then + FORCE_PRINT_ELOG=true + fi + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") + DISABLE_AUTOFORMATTING=true + readme.gentoo_print_elog +} diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 69abb000df11..008dddbd0225 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,20 +1,13 @@ DIST ovmf-20150629.tar.bz2 24265640 SHA256 9f316dc44e192fa9d5d7486cf1dae3f3094ab4f20f282f80d6251632c2cd6118 SHA512 b15a896b5222b920a500ec8a1eba5d670505441ffd02accf9b6c0deb9a12c1c5513a016f91eae5cb33f75ee9f28435dc957686e6ce8b5d0744c11a7d7262fffd WHIRLPOOL 8db4360dcb85f183dbd827f7381787c84065f94eaf746068b11ef7b30412b16cc0ba75effb04f01dea5f4f67967721f7aca11a2550035e95c59645c7964526ac -DIST seabios-1.6.3.2.tar.gz 422376 SHA256 888aafe37ef3d1f502a73518a5e4dd0e9373ce4cd41681c354771314f1e41dd7 SHA512 c54431d8e81d25b74427696da689e90d3ab68c7c1be1dec05c81658d28b650f53daa34dcee2da826c1cf5d5d39396b12b0b16ea20ed6fd89de8f732163c8cca5 WHIRLPOOL 826c0e034ca46291661faa363189ee6cf56098cabc39f8fc84d2c442cc2da2174c2fa027cc11e11a7c3fed619f2e524f2aee804d9836d256448cdad28631d69a DIST seabios-1.7.5.tar.gz 537566 SHA256 858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51 SHA512 ecf5fb9ac44dde6e4ac00baa6c920dde51b923f23dd74e62c5a02eceaf235e57b885975c5a8bd0927e268115c72bd1143a080fdfd4eff4e168ebeaa30436280e WHIRLPOOL 5e1e99b3bd82a8607c5986fde4592c7437bec4bd78abd5873710f6c431d075436725e8d0d32e9f0dd2921c9d84b8613108b21d31c5309a73e337ead7adf35e90 DIST seabios-1.8.2.tar.gz 538497 SHA256 f59479307fdae840de398b75aacb2333c8eba24a5964d68c77e32ca6c987ee61 SHA512 798d222d5f5725a805cde9e6000b5ce714d0551fd4a3c2642cc6e77b2bdab1a9e239939a358a23bbe0e00112f5ad70696c87d20b90655463c835541fc04e1a00 WHIRLPOOL 9cda0ad502a59dd718c543b759ac3fcf5acb4adee70c3da9bfea95ab188415acf6425827de77f45421ec3be8fd9e0c37fb486e62828217ba3e83f88d942a3f4a -DIST xen-4.2.5-upstream-patches-10.tar.xz 41428 SHA256 b29ce85b049420838c3386b67184f4ba56794846d056837fa780ae89a80b40d0 SHA512 9e8046e27506d864e2d69728897cbba3eea1dd5ca748a3febb722901c5a67cca2ab49bb420071292538bd0345023fa337eb2d176b9ca05ca6bce47562f6710ec WHIRLPOOL 29e534ef6b951cf220a3a9476d1f76ac344bfc5c74998f2b472ec83cbe4781746298272e3c1fe8661a838cbc7d734d2730de6a1e9985b8a60f40c98f54449e2a -DIST xen-4.2.5-upstream-patches-9.tar.xz 23208 SHA256 2206e9a8aeeed207abbae995c5d2baa14d5f0da4120ae44f2de733ecf7ea5af1 SHA512 8a2edaba48002449a521edf2ae078ffe1b3db4f491a85b063886a147a0be3ec7fdb819ce84c90cdae80ed34c10ab2d637506700be10052a67be6ef128fa40fb1 WHIRLPOOL 037820e0fad60d1f7ed054efa797585c992d08f1ffd533705c515ad289f8cdddc72b97f2a3d75ebd683c6bb6988d7285452b4f3cebbe9a879f701156e387ff3b -DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368 DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8 -DIST xen-gentoo-patches-1.tar.xz 23044 SHA256 dcff35bbc4b6946473c9b55ad595a5fea88e8dac1bd977cbe18a644b2cced2e0 SHA512 a4c66382d44112e7be09711e3ecf0f8ebd9a30b29e04d8aca536430172bdd111ab8bab7700433e0dc35165f876eb7e9cd2e554d74ce2a166fb2dfd4de482cb7a WHIRLPOOL d0443e1501ac813ac3226df32a6b050c03302c3d74e3b3bd1293ab4ad929b5c314cc0eac13505ce8a826ee357117e8eeaf0713fd8b9c55f40296966fda082c2e DIST xen-gentoo-patches-4.tar.xz 23632 SHA256 5cdb0f93ee32d0a5fc4fc7282270ace73acfdc4df694f7b29c1135180d902049 SHA512 3006ce4cd67e80a9f79d9ba3814a64704b0d762159a439a140b1ec0a2699473cd5537950f0913b55f8f7e3d0fd2e9861f3199793120d8d2502aa3f8ef7816c8f WHIRLPOOL 4a921103df2825ccd8b0481708e7cd692fa45d5aadae286c1522c144a1576920e7d3567648565bb9af85bb6bb597ea9d0ec04ea6abd2115db4caf7e739717b1a -DIST xen-gentoo-patches-5.tar.xz 23664 SHA256 41e23ec6fb5a4ef5a1f8746de0e33579de2c725368afed6bd2b7506df5e8c2b5 SHA512 8370cef1aa06585e8fa8f8c6eb7f29375ac6f5a240c859ebb6982d1c1ec159c9c331c861f39838f53093cdceca24ee1b0d98c1c92874dd4113e73eb884842eac WHIRLPOOL 4b65283220b66555a69b65331d3dcb8b8353fef584eb723c2a703712bc6eac57b70f500eeeffc511e75d3ab5d3a1eac8aac83133baf4c90ab498b1843764eb9f DIST xen-ovmf-patches-1.tar.xz 4724 SHA256 d14e98e62c78c9f4b8a7e7b4a04de6dabf300f393eff44154d06f93aa43d7703 SHA512 a17467762f6d92018ff9bce783ce148039f23159405e801ec2aef4c3db72c3976c6f1e41d8c2a2cb704a9654556a2050302f284cfe8e32f28f393b8e2c6d2f1c WHIRLPOOL de53ad07f20aa14fe76d974db92d5b6808f0a2dd26a627b818914990add7adad8e6135d42641819dc22947031981c5815bae5aeeed0f28785c90beda0a6ff6c8 DIST xen-qemu-patches-0.tar.gz 3224 SHA256 ff1ac02a6d91e4abdbe069e1bb75d0b798deff5c2c72d1efb5459c72f4278f00 SHA512 4fd0c663a733436188aca364e927ac430d9bbef9859da65c074d7fd66c330645b05ff1f3e849f4581dfcd7054801d65edcff8445c1c63c2725f11e3903415af0 WHIRLPOOL 5504d7ffbd3c1970026c1f43252d9c76f10c5448ede247719e2698aa8f8e93b20e4cc353da5582b3b6887fb3fd7d1e13765f664ea60daeb6020f052eaca9b9f4 DIST xen-security-patches-1.tar.gz 7040 SHA256 30733e9ca71bf4291ff212eb191afb22687ccd9b2579767fe0ee013152980c76 SHA512 89c72897f18a86c2060bb76a182e7cca72ad2f33a3aab964ecae66e057aeecafee2e9986204d6feb98f81ccb740460ee2cb37663b1ab79f47adc1dd73e0091bc WHIRLPOOL c27e612b87b4a30abbf59e6be019e2c21a78bfbdf1715da5498d95607d390d616251768d419ac5ce76087bbf7cdfc410dd0088ba48e425082cea971efcb64346 DIST xen-security-patches-2.tar.gz 7370 SHA256 f24bf4b0cba29b51ee71f6ef82654cddf157c63d62fc1119f17255b2388e03ab SHA512 209dea670467ff1df18428c15b25229c05d676d1a2f646cddb221544ae888241ade48a22be037f97dce249ac322c1f30bb477675e5e2cc04a2fbd839e02f1f57 WHIRLPOOL ae66a2fbc0d0f0a555d407ebd3198fa58ee043515fb9821d7b9eda46d088bc87b3de16fe015fd1142294429dd2c1c7826e414a55980e27123185c1a86fb0a8a6 DIST xen-security-patches-3.tar.gz 7349 SHA256 a1876b918c0a608618f349deed11b547a65c5909c31d72a89340d4908c572f46 SHA512 f5e8e7ab5d9be6aa036e52627931f1b2648de642664b2922f9cab64f44d19ac8682f5beb7fdbcb842ee19346202093fade3f10e39ba60fcb12a101deb4408818 WHIRLPOOL 14ee65babe4edd901914c8b8ddb5d7b54e6738d77642514fe611bf84541ae0a932bcb48f86179d5e7a6741135b9c7b129e8244cc22922c4e592604a696b6082f -DIST xen-security-patches-6.tar.xz 24780 SHA256 b41422583e5f7b4c85b82d89ab66f3e0fa8de8fdb2ae42aa3da40822e9507ef5 SHA512 c58831eb5e26a78a3072623b83bad125ddd4cd67c0075a708be81a7f50ee936cd2e5832a9b88129e11ec81ebafc9cfbc339fb8296d6f4b44c04630b349c4a621 WHIRLPOOL edecaefef0b6dd1a10c479362362640d9bd7a43623085c1f20b1171c65746220d7fdfd0e20892f60ea7d2f6052389da2a1d3c0179a88d7c4d52b3aa33cbef05e DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d diff --git a/app-emulation/xen-tools/xen-tools-4.2.5-r10.ebuild b/app-emulation/xen-tools/xen-tools-4.2.5-r10.ebuild deleted file mode 100644 index d29aab3691f1..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.2.5-r10.ebuild +++ /dev/null @@ -1,391 +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 ) -PYTHON_REQ_USE='xml,threads' - -if [[ $PV == *9999 ]]; then - KEYWORDS="" - REPO="xen-unstable.hg" - EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" - S="${WORKDIR}/${REPO}" - live_eclass="mercurial" -else - KEYWORDS="amd64 x86" - UPSTREAM_VER=9 - SECURITY_VER=6 - # xen-tools's gentoo patches tarball - GENTOO_VER=1 - # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=0 - SEABIOS_VER=1.6.3.2 - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz - https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - S="${WORKDIR}/xen-${PV}" -fi - -inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.org/" -DOCS=( README docs/README.xen-bugtool ) - -LICENSE="GPL-2" -SLOT="0" -IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios" - -REQUIRED_USE="hvm? ( qemu ) - ${PYTHON_REQUIRED_USE}" - -DEPEND="dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libgcrypt:0 - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pypam[${PYTHON_USEDEP}] - sys-libs/zlib - sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - sys-firmware/ipxe - dev-ml/findlib - hvm? ( media-libs/libsdl ) - ${PYTHON_DEPS} - api? ( dev-libs/libxml2 - net-misc/curl ) - ${PYTHON_DEPS} - pygrub? ( $(python_gen_impl_dep ncurses) ) - sys-devel/bin86 - sys-devel/dev86 - dev-lang/perl - app-misc/pax-utils - doc? ( - app-doc/doxygen - dev-tex/latex2html[png,gif] - media-gfx/transfig - media-gfx/graphviz - dev-tex/xcolor - dev-texlive/texlive-latexextra - virtual/latex-base - dev-tex/latexmk - dev-texlive/texlive-latex - dev-texlive/texlive-pictures - dev-texlive/texlive-latexrecommended - ) - hvm? ( x11-proto/xproto - !net-libs/libiscsi )" -RDEPEND="sys-apps/iproute2 - net-misc/bridge-utils - ocaml? ( >=dev-lang/ocaml-4 ) - screen? ( - app-misc/screen - app-admin/logrotate - ) - virtual/udev" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" - -RESTRICT="test" - -pkg_setup() { - python-single-r1_pkg_setup - export "CONFIG_LOMOUNT=y" - - #bug 522642, disable compile tools/tests - export "CONFIG_TESTS=n" - - if has_version dev-libs/libgcrypt:0; then - export "CONFIG_GCRYPT=y" - fi - - if use qemu; then - export "CONFIG_IOEMU=y" - else - export "CONFIG_IOEMU=n" - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi - - use api && export "LIBXENAPI_BINDINGS=y" - use flask && export "FLASK_ENABLE=y" -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Xen Upstream patcheset" - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Security patchset - if [[ -n ${SECURITY_VER} ]]; then - einfo "Try to apply Xen Security patcheset" - source "${WORKDIR}"/patches-security/${PV}.conf - # apply main xen patches - for i in ${XEN_SECURITY_MAIN}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-security/xen/$i - done - - # apply qemu-traditional patches - pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null - for i in ${XEN_SECURITY_QEMUT}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-security/qemut/$i - done - popd > /dev/null - - # apply qemu-xen/upstream patches - pushd "${S}"/tools/qemu-xen/ > /dev/null - for i in ${XEN_SECURITY_QEMUU}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-security/qemuu/$i - done - popd > /dev/null - fi - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then - einfo "Try to apply Gentoo specific patcheset" - source "${FILESDIR}"/gentoo-patches.conf - _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} - for i in ${!_gpv}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo/$i - done - fi - - use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch - - if gcc-specs-pie; then - epatch "${WORKDIR}"/patches-gentoo/ipxe-nopie.patch - fi - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - - # try and remove all the default cflags - find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ - -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} + || die "failed to re-set custom-cflags" - fi - - if ! use pygrub; then - sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die - fi - - # Disable hvm support on systems that don't support x86_32 binaries. - if ! use hvm; then - sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - # Don't bother with qemu, only needed for fully virtualised guests - if ! use qemu; then - sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die - sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die - fi - - mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Reset bash completion dir; Bug 472438 - sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ - -i Config.mk || die - sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die - - # Bug 445986 - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die - - # fix QA warning, create /var/run/, /var/lock dynamically - sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ - tools/libxl/Makefile || die - - sed -i -e "/\/var\/run\//d" \ - tools/xenstore/Makefile \ - tools/pygrub/Makefile || die - - sed -i -e "/\/var\/lock\/subsys/d" \ - tools/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons || die - - epatch_user -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - local myopt - use debug && myopt="${myopt} debug=y" - - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - unset LDFLAGS - unset CFLAGS - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} - - use doc && emake -C docs txt html - emake -C docs man-pages -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - # Fix the remaining Python shebangs. - python_fix_shebang "${ED}" - - # Remove RedHat-specific stuff - rm -rf "${D}"tmp || die - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=1:autoballoon=1:' \ - -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ - -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ - -i tools/examples/xl.conf || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - - dohtml -r docs/ - docinto pdf - dodoc ${DOCS[@]} - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html - fi - - rm -rf "${D}"/usr/share/doc/xen/ - doman docs/man?/* - - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - if [[ "${ARCH}" == 'amd64' ]] && use qemu; then - mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die - mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a - fi - - # xend expects these to exist - keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen - - # for xendomains - keepdir /etc/xen/auto - - # Temp QA workaround - dodir "$(get_udevdir)" - mv "${D}"/etc/udev/* "${D}/$(get_udevdir)" - rm -rf "${D}"/etc/udev - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml" - elog "http://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config sytem at boot." - elog "Add by use of rc-update on completion of the install" - - # TODO: we need to have the current Python slot here. - if ! has_version "dev-lang/python[ncurses]"; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if has_version "sys-apps/iproute2[minimal]"; then - echo - ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" - ewarn "will not work until you rebuild iproute2 without USE=minimal." - fi - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi -} diff --git a/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild b/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild deleted file mode 100644 index 392be1024514..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild +++ /dev/null @@ -1,391 +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 ) -PYTHON_REQ_USE='xml,threads' - -if [[ $PV == *9999 ]]; then - KEYWORDS="" - REPO="xen-unstable.hg" - EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" - S="${WORKDIR}/${REPO}" - live_eclass="mercurial" -else - KEYWORDS="amd64 x86" - UPSTREAM_VER=10 - SECURITY_VER=7 - # xen-tools's gentoo patches tarball - GENTOO_VER=5 - # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=1 - SEABIOS_VER=1.6.3.2 - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz - https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - S="${WORKDIR}/xen-${PV}" -fi - -inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.org/" -DOCS=( README docs/README.xen-bugtool ) - -LICENSE="GPL-2" -SLOT="0" -IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios" - -REQUIRED_USE="hvm? ( qemu ) - ${PYTHON_REQUIRED_USE}" - -DEPEND="dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libgcrypt:0 - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pypam[${PYTHON_USEDEP}] - sys-libs/zlib - sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - sys-firmware/ipxe - dev-ml/findlib - hvm? ( media-libs/libsdl ) - ${PYTHON_DEPS} - api? ( dev-libs/libxml2 - net-misc/curl ) - ${PYTHON_DEPS} - pygrub? ( $(python_gen_impl_dep ncurses) ) - sys-devel/bin86 - sys-devel/dev86 - dev-lang/perl - app-misc/pax-utils - doc? ( - app-doc/doxygen - dev-tex/latex2html[png,gif] - media-gfx/transfig - media-gfx/graphviz - dev-tex/xcolor - dev-texlive/texlive-latexextra - virtual/latex-base - dev-tex/latexmk - dev-texlive/texlive-latex - dev-texlive/texlive-pictures - dev-texlive/texlive-latexrecommended - ) - hvm? ( x11-proto/xproto - !net-libs/libiscsi )" -RDEPEND="sys-apps/iproute2 - net-misc/bridge-utils - ocaml? ( >=dev-lang/ocaml-4 ) - screen? ( - app-misc/screen - app-admin/logrotate - ) - virtual/udev" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" - -RESTRICT="test" - -pkg_setup() { - python-single-r1_pkg_setup - export "CONFIG_LOMOUNT=y" - - #bug 522642, disable compile tools/tests - export "CONFIG_TESTS=n" - - if has_version dev-libs/libgcrypt:0; then - export "CONFIG_GCRYPT=y" - fi - - if use qemu; then - export "CONFIG_IOEMU=y" - else - export "CONFIG_IOEMU=n" - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi - - use api && export "LIBXENAPI_BINDINGS=y" - use flask && export "FLASK_ENABLE=y" -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Xen Upstream patcheset" - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Security patchset - if [[ -n ${SECURITY_VER} ]]; then - einfo "Try to apply Xen Security patcheset" - source "${WORKDIR}"/patches-security/${PV}.conf - # apply main xen patches - for i in ${XEN_SECURITY_MAIN}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-security/xen/$i - done - - # apply qemu-traditional patches - pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null - for i in ${XEN_SECURITY_QEMUT}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-security/qemut/$i - done - popd > /dev/null - - # apply qemu-xen/upstream patches - pushd "${S}"/tools/qemu-xen/ > /dev/null - for i in ${XEN_SECURITY_QEMUU}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-security/qemuu/$i - done - popd > /dev/null - fi - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then - einfo "Try to apply Gentoo specific patcheset" - source "${FILESDIR}"/gentoo-patches.conf - _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} - for i in ${!_gpv}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo/$i - done - fi - - use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch - - if gcc-specs-pie; then - epatch "${WORKDIR}"/patches-gentoo/ipxe-nopie.patch - fi - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - - # try and remove all the default cflags - find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \ - -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} + || die "failed to re-set custom-cflags" - fi - - if ! use pygrub; then - sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die - fi - - # Disable hvm support on systems that don't support x86_32 binaries. - if ! use hvm; then - sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - # Don't bother with qemu, only needed for fully virtualised guests - if ! use qemu; then - sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die - sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die - fi - - mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Reset bash completion dir; Bug 472438 - sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ - -i Config.mk || die - sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die - - # Bug 445986 - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die - - # fix QA warning, create /var/run/, /var/lock dynamically - sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \ - tools/libxl/Makefile || die - - sed -i -e "/\/var\/run\//d" \ - tools/xenstore/Makefile \ - tools/pygrub/Makefile || die - - sed -i -e "/\/var\/lock\/subsys/d" \ - tools/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons || die - - epatch_user -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - local myopt - use debug && myopt="${myopt} debug=y" - - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - unset LDFLAGS - unset CFLAGS - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} - - use doc && emake -C docs txt html - emake -C docs man-pages -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - # Fix the remaining Python shebangs. - python_fix_shebang "${ED}" - - # Remove RedHat-specific stuff - rm -rf "${D}"tmp || die - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=1:autoballoon=1:' \ - -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ - -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ - -i tools/examples/xl.conf || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - - dohtml -r docs/ - docinto pdf - dodoc ${DOCS[@]} - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html - fi - - rm -rf "${D}"/usr/share/doc/xen/ - doman docs/man?/* - - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - if [[ "${ARCH}" == 'amd64' ]] && use qemu; then - mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die - mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a - fi - - # xend expects these to exist - keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen - - # for xendomains - keepdir /etc/xen/auto - - # Temp QA workaround - dodir "$(get_udevdir)" - mv "${D}"/etc/udev/* "${D}/$(get_udevdir)" - rm -rf "${D}"/etc/udev - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml" - elog "http://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config sytem at boot." - elog "Add by use of rc-update on completion of the install" - - # TODO: we need to have the current Python slot here. - if ! has_version "dev-lang/python[ncurses]"; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if has_version "sys-apps/iproute2[minimal]"; then - echo - ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" - ewarn "will not work until you rebuild iproute2 without USE=minimal." - fi - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi -} diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index df9efb1e4af5..ad42f7239623 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,6 +1,3 @@ -DIST xen-4.2.5-upstream-patches-10.tar.xz 41428 SHA256 b29ce85b049420838c3386b67184f4ba56794846d056837fa780ae89a80b40d0 SHA512 9e8046e27506d864e2d69728897cbba3eea1dd5ca748a3febb722901c5a67cca2ab49bb420071292538bd0345023fa337eb2d176b9ca05ca6bce47562f6710ec WHIRLPOOL 29e534ef6b951cf220a3a9476d1f76ac344bfc5c74998f2b472ec83cbe4781746298272e3c1fe8661a838cbc7d734d2730de6a1e9985b8a60f40c98f54449e2a -DIST xen-4.2.5-upstream-patches-9.tar.xz 23208 SHA256 2206e9a8aeeed207abbae995c5d2baa14d5f0da4120ae44f2de733ecf7ea5af1 SHA512 8a2edaba48002449a521edf2ae078ffe1b3db4f491a85b063886a147a0be3ec7fdb819ce84c90cdae80ed34c10ab2d637506700be10052a67be6ef128fa40fb1 WHIRLPOOL 037820e0fad60d1f7ed054efa797585c992d08f1ffd533705c515ad289f8cdddc72b97f2a3d75ebd683c6bb6988d7285452b4f3cebbe9a879f701156e387ff3b -DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368 DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8 @@ -8,6 +5,4 @@ DIST xen-security-patches-0.tar.xz 5944 SHA256 c0456793064185f0781668264a09a2412 DIST xen-security-patches-1.tar.gz 7040 SHA256 30733e9ca71bf4291ff212eb191afb22687ccd9b2579767fe0ee013152980c76 SHA512 89c72897f18a86c2060bb76a182e7cca72ad2f33a3aab964ecae66e057aeecafee2e9986204d6feb98f81ccb740460ee2cb37663b1ab79f47adc1dd73e0091bc WHIRLPOOL c27e612b87b4a30abbf59e6be019e2c21a78bfbdf1715da5498d95607d390d616251768d419ac5ce76087bbf7cdfc410dd0088ba48e425082cea971efcb64346 DIST xen-security-patches-2.tar.gz 7370 SHA256 f24bf4b0cba29b51ee71f6ef82654cddf157c63d62fc1119f17255b2388e03ab SHA512 209dea670467ff1df18428c15b25229c05d676d1a2f646cddb221544ae888241ade48a22be037f97dce249ac322c1f30bb477675e5e2cc04a2fbd839e02f1f57 WHIRLPOOL ae66a2fbc0d0f0a555d407ebd3198fa58ee043515fb9821d7b9eda46d088bc87b3de16fe015fd1142294429dd2c1c7826e414a55980e27123185c1a86fb0a8a6 DIST xen-security-patches-3.tar.gz 7349 SHA256 a1876b918c0a608618f349deed11b547a65c5909c31d72a89340d4908c572f46 SHA512 f5e8e7ab5d9be6aa036e52627931f1b2648de642664b2922f9cab64f44d19ac8682f5beb7fdbcb842ee19346202093fade3f10e39ba60fcb12a101deb4408818 WHIRLPOOL 14ee65babe4edd901914c8b8ddb5d7b54e6738d77642514fe611bf84541ae0a932bcb48f86179d5e7a6741135b9c7b129e8244cc22922c4e592604a696b6082f -DIST xen-security-patches-3.tar.xz 17028 SHA256 fb6301beb9a5c2d1e5d4de8783d8670e382b1bef48ec61e73d2d9be6901d289f SHA512 787fee8f7822577c6de91c4cf4d56d0e73ce46bac5524537ff66a718b6d7eae9d362265515743e8577b2c75f2841baed9837f71467b3b7b91a3111220da5f236 WHIRLPOOL 5c136289e654776bf918fe125fbecba7dac0929b236f7ae8158026a6bd6be12bc786a5ec96cb4022c18a5e7ffde82155deb57eb9639600e4c42c9c209f4a2ed6 DIST xen-security-patches-4.tar.gz 7731 SHA256 b51c6616a303b4d5123fed1e58240163c8e0cf8e0de32db58c11a40a48124d52 SHA512 cef89bb68bdb4a5f947d6be8ae7a799276fd187e396c5ba85f8aa2b0b5349ba606d3742d5b8d8212df6da38f8af9711416d9a25176e713240a0a7f2194d84fc5 WHIRLPOOL 912dc869fa4eb355a86023133adcb818e87f4979d537a885b3f1c6e35ff141b7d7a33e81105dcddf34aafa4c306df79a210346f5037337173923e1dc8280ac47 -DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml index 67c5e0f5daf2..caf273c95df0 100644 --- a/app-emulation/xen/metadata.xml +++ b/app-emulation/xen/metadata.xml @@ -4,7 +4,6 @@ <herd>xen</herd> <use> <flag name='flask'>Enable the Flask XSM module from NSA</flag> - <flag name='pae'>Enable support for PAE kernels (usually x86-32 with >4GB memory)</flag> <flag name='xsm'>Enable the Xen Security Modules (XSM)</flag> <flag name='efi'>Adds efi boot support, requires LDFLAG -melf_x86_64 for amd64</flag> </use> diff --git a/app-emulation/xen/xen-4.2.5-r11.ebuild b/app-emulation/xen/xen-4.2.5-r11.ebuild deleted file mode 100644 index ad795852c063..000000000000 --- a/app-emulation/xen/xen-4.2.5-r11.ebuild +++ /dev/null @@ -1,167 +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 ) - -if [[ $PV == *9999 ]]; then - KEYWORDS="" - REPO="xen-unstable.hg" - EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" - S="${WORKDIR}/${REPO}" - live_eclass="mercurial" -else - KEYWORDS="amd64 x86" - UPSTREAM_VER=9 - SECURITY_VER=3 - GENTOO_VER= - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" -fi - -inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass} - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="http://xen.org/" -LICENSE="GPL-2" -SLOT="0" -IUSE="custom-cflags debug efi flask pae xsm" - -DEPEND="${PYTHON_DEPS} - efi? ( >=sys-devel/binutils-2.22[multitarget] ) - !efi? ( >=sys-devel/binutils-2.22[-multitarget] )" -RDEPEND="" -PDEPEND="~app-emulation/xen-tools-${PV}" - -RESTRICT="test" - -# Approved by QA team in bug #144032 -QA_WX_LOAD="boot/xen-syms-${PV}" - -REQUIRED_USE=" - flask? ( xsm ) - " - -pkg_setup() { - python-any-r1_pkg_setup - if [[ -z ${XEN_TARGET_ARCH} ]]; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi - - if use flask ; then - export "XSM_ENABLE=y" - export "FLASK_ENABLE=y" - elif use xsm ; then - export "XSM_ENABLE=y" - fi -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - # Security patchset - if [[ -n ${SECURITY_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}/patches-security/${PV}" - fi - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo - fi - - # Drop .config and fix gcc-4.6 - epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch - - if use efi; then - epatch "${FILESDIR}"/${PN}-4.2-efi.patch - export EFI_VENDOR="gentoo" - export EFI_MOUNTPOINT="boot" - fi - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; || die "failed to re-set custom-cflags" - fi - - # not strictly necessary to fix this - sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" - - epatch_user -} - -src_configure() { - use debug && myopt="${myopt} debug=y" - use pae && myopt="${myopt} pae=y" - - if use custom-cflags; then - filter-flags -fPIE -fstack-protector - replace-flags -O3 -O2 - else - unset CFLAGS - fi -} - -src_compile() { - # Send raw LDFLAGS so that --as-needed works - emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} -} - -src_install() { - local myopt - use debug && myopt="${myopt} debug=y" - use pae && myopt="${myopt} pae=y" - - # The 'make install' doesn't 'mkdir -p' the subdirs - if use efi; then - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die - fi - - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install -} - -pkg_postinst() { - elog "Official Xen Guide and the unoffical wiki page:" - elog " https://wiki.gentoo.org/wiki/Xen" - elog " http://en.gentoo-wiki.com/wiki/Xen/" - - use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!" - use efi && einfo "The efi executable is installed in boot/efi/gentoo" -} diff --git a/app-emulation/xen/xen-4.2.5-r12.ebuild b/app-emulation/xen/xen-4.2.5-r12.ebuild deleted file mode 100644 index dd72287ca48b..000000000000 --- a/app-emulation/xen/xen-4.2.5-r12.ebuild +++ /dev/null @@ -1,170 +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 ) - -if [[ $PV == *9999 ]]; then - KEYWORDS="" - REPO="xen-unstable.hg" - EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" - S="${WORKDIR}/${REPO}" - live_eclass="mercurial" -else - KEYWORDS="amd64 x86" - UPSTREAM_VER=10 - SECURITY_VER=7 - GENTOO_VER= - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" -fi - -inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass} - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="http://xen.org/" -LICENSE="GPL-2" -SLOT="0" -IUSE="custom-cflags debug efi flask pae xsm" - -DEPEND="${PYTHON_DEPS} - efi? ( >=sys-devel/binutils-2.22[multitarget] ) - !efi? ( >=sys-devel/binutils-2.22[-multitarget] )" -RDEPEND="" -PDEPEND="~app-emulation/xen-tools-${PV}" - -RESTRICT="test" - -# Approved by QA team in bug #144032 -QA_WX_LOAD="boot/xen-syms-${PV}" - -REQUIRED_USE=" - flask? ( xsm ) - " - -pkg_setup() { - python-any-r1_pkg_setup - if [[ -z ${XEN_TARGET_ARCH} ]]; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi - - if use flask ; then - export "XSM_ENABLE=y" - export "FLASK_ENABLE=y" - elif use xsm ; then - export "XSM_ENABLE=y" - fi -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - if [[ -n ${SECURITY_VER} ]]; then - einfo "Try to apply Xen Security patcheset" - source "${WORKDIR}"/patches-security/${PV}.conf - # apply main xen patches - for i in ${XEN_SECURITY_MAIN}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-security/xen/$i - done - fi - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo - fi - - # Drop .config and fix gcc-4.6 - epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch - - if use efi; then - epatch "${FILESDIR}"/${PN}-4.2-efi.patch - export EFI_VENDOR="gentoo" - export EFI_MOUNTPOINT="boot" - fi - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; || die "failed to re-set custom-cflags" - fi - - # not strictly necessary to fix this - sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" - - epatch_user -} - -src_configure() { - use debug && myopt="${myopt} debug=y" - use pae && myopt="${myopt} pae=y" - - if use custom-cflags; then - filter-flags -fPIE -fstack-protector - replace-flags -O3 -O2 - else - unset CFLAGS - fi -} - -src_compile() { - # Send raw LDFLAGS so that --as-needed works - emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} -} - -src_install() { - local myopt - use debug && myopt="${myopt} debug=y" - use pae && myopt="${myopt} pae=y" - - # The 'make install' doesn't 'mkdir -p' the subdirs - if use efi; then - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die - fi - - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install -} - -pkg_postinst() { - elog "Official Xen Guide and the unoffical wiki page:" - elog " https://wiki.gentoo.org/wiki/Xen" - elog " http://en.gentoo-wiki.com/wiki/Xen/" - - use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!" - use efi && einfo "The efi executable is installed in boot/efi/gentoo" -} diff --git a/app-misc/taskd/taskd-1.1.0-r1.ebuild b/app-misc/taskd/taskd-1.1.0-r1.ebuild index 902341923efb..e954aacb7fb0 100644 --- a/app-misc/taskd/taskd-1.1.0-r1.ebuild +++ b/app-misc/taskd/taskd-1.1.0-r1.ebuild @@ -66,7 +66,7 @@ src_install() { pkg_setup() { enewgroup taskd - enewuser taskd -1 -1 /var/lib/taskd taskd + enewuser taskd -1 /bin/bash /var/lib/taskd taskd } pkg_postinst() { diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest index 9eb96946aee5..dd7fe7df9c13 100644 --- a/app-text/blogc/Manifest +++ b/app-text/blogc/Manifest @@ -1 +1 @@ -DIST blogc-0.5.1.tar.xz 248380 SHA256 c1d3d8cb735f0dea06410a0045b78bec57adeef1c0b3c7dbc2ade9276bfefaec SHA512 9a2e5b0858f8f7ac3d54fc9e61dcdb45617ee9ce74c4c9d975ca34181c7aa9ce554f865daffe64036d71571cca78543dafd74d134a20f9c359bfb0a7ef0d6fa3 WHIRLPOOL ac7271eaeecdc1b7268ed7ebde93417c041901335f3cd46e7a60197dbc3ecb68758bda60f9dc33f633b37ef661087011db6bf528120beb22ae4c91f079d6f073 +DIST blogc-0.6.tar.xz 261992 SHA256 86e80cbd871bb08780fde2b3de165e7b17b9f5f119bb6d354082e5882bf2c03a SHA512 b51b79f5afd91d0dee3c0ae903ad915af54684b3da8f785b20b9789bfe80b825c3c5b860dcaa1a809d22bfb620867818131652e0aabb817181cab476df211df9 WHIRLPOOL 53870581bae92bc2fcb7e85b796f6b8873bc5cfd7c1eab8c68e8e816390842607e7cde3e0a4fdd4c71e71113771f84d6fef3863a9375c576c04deec2376b04ec diff --git a/app-text/blogc/blogc-0.5.1.ebuild b/app-text/blogc/blogc-0.6.ebuild index ecc0d6aecdcd..ecc0d6aecdcd 100644 --- a/app-text/blogc/blogc-0.5.1.ebuild +++ b/app-text/blogc/blogc-0.6.ebuild diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest index dfe055e3c86b..6ce947b7355c 100644 --- a/app-text/highlight/Manifest +++ b/app-text/highlight/Manifest @@ -3,5 +3,6 @@ DIST highlight-3.16.tar.bz2 613356 SHA256 994e8da0b86549fb16c4590769731315d01db6 DIST highlight-3.17.tar.bz2 617834 SHA256 87ca5907943da25c756407d35ea0df8eb7762f3e32544201da27555c8eadb301 SHA512 27d5391339e80b616146489e97f63bca336f18b26c2ff5b94ae5bf183d3d1cdbfba202ab36d8eac86dee98ff49c6cc6c41dcf31860f0277f0327688e622d954e WHIRLPOOL 53ee5a4c58021f2a395d1d2e29090a43b06f3ad4ccad4461843f5a1eedebabe5ff33d2ac0c97c9d1ea496023c3acfe9eb30ff4d9d119a0eae4173ea1f9352cc3 DIST highlight-3.18.tar.bz2 619669 SHA256 55c6f7a5aeaac2c811078a0215b27c1c80d971bba5dff51ee74a97b3303a584b SHA512 1f939e117209e96d021216addc281ca7f265822f053f577ed7cb11b8ac9a1762bf84f8e1f9f5e67277004573b98e4b8732f48549aa674fe6801bfc1c0627b930 WHIRLPOOL e08d16d632e4193e27e2a1db530218e937f04abc03d36d1cc8d096c0511a3ccf51c61078fad0bb182b145866c6aac7d7c47818014868c2ae73254c18ad80aaf7 DIST highlight-3.24.tar.bz2 625192 SHA256 4f921697de9db93fb54bb667e6245b2831c153fc00dfa592ec50e42d345679cd SHA512 41f170a436fa802393b2f37e4791b0168d1a7c723e09bc6326c389b8a266604a163c7c3bba10f456df0c5fe321914c736e07830459d5c43da9bdd6335db92086 WHIRLPOOL fc1b7eafdcb41ace65d08fd114c7dabb2169d6f1fedca99accfcb60dcd325b5db9f97e5c6c8c2ad31cc47bc9de90435cf4473e9147c562d70e87e43513320161 +DIST highlight-3.25.tar.bz2 626492 SHA256 d8a9b8989c8b4108de0a76ceb585a5777ab308a339a667a9b05ee3d059dade26 SHA512 c0249283e7c26b565170c4686fb28ddd0565716ddcd38a52cbfde03051558f4c1baf7b2605e33e1799afb7dfb79b053fffa70827d5d8dcaf42a344076d26fb11 WHIRLPOOL d2f8ae06a9b48dd88432d9550d6e456f3a3177194af72ee26023ea110046a55ea9031104e9a397bfd316d3b4c0a1f557cefaa73165bc54308725f71a7e89f1e6 DIST highlight-3.3.tar.bz2 740651 SHA256 96c415d62488c6522e9933ecdfce447eb8eecd3b88a1064f42908c936ea02d87 SHA512 10530f485e57aa8068edddca3b0f75fcdd1c756d45740e7dd4eeaeb8b87cebd022f6283ecd37a057ef18f30e8cb56eeb412e8ba0c0542320a751b8b9c3dbf1c9 WHIRLPOOL 8b0ccfa97d5343b0edb2cf11d92116df4ebdac5d7157569d758c8eb2a113dd07612438ef9eeeda9138a7aa9d64c027ba5dab31054700acbc6823b6868ff4a77c DIST highlight-3.9.tar.bz2 683718 SHA256 4ae69795e3ca4ffef47355a7b6dc371e2d781735efd44fa12ff3a1ffc990daef SHA512 4f75232eae5f18f37666e04467993eab8ba983ec86ba6fbef4fbd6fea1e4b2a388beff75a72cfb00c1a90a6fa6dcab9cd68d40cde940f6aaff5174304102cada WHIRLPOOL 1d0ab7fa034fa16cf07318a1140d261942ad98b73108b1b83c578e98f836c9d933ad731320b8aa183f958572e10f3970f64b822954fe5065f8ec6692290f6e9a diff --git a/app-text/highlight/highlight-3.25.ebuild b/app-text/highlight/highlight-3.25.ebuild new file mode 100644 index 000000000000..df1763b6c626 --- /dev/null +++ b/app-text/highlight/highlight-3.25.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit toolchain-funcs qt4-r2 flag-o-matic + +DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight" +HOMEPAGE="http://www.andre-simon.de/" +SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="examples qt4" + +RDEPEND="dev-lang/lua + qt4? ( + dev-qt/qtgui:4 + dev-qt/qtcore:4 + )" +DEPEND="${RDEPEND} + dev-libs/boost + virtual/pkgconfig" + +src_prepare() { + sed -i "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \ + src/core/datadir.cpp || die + + if has_version '<dev-lang/lua-5.2' ; then + sed -i 's/-DUSE_LUA52//' src/makefile || die + fi +} + +src_compile() { + myhlopts=( + "CXX=$(tc-getCXX)" + "AR=$(tc-getAR)" + "LDFLAGS=${LDFLAGS}" + "CFLAGS=${CXXFLAGS}" + "DESTDIR=${D}" + "PREFIX=${EPREFIX}/usr" + "HL_CONFIG_DIR=${EPREFIX}/etc/highlight/" + "HL_DATA_DIR=${EPREFIX}/usr/share/highlight/" + "doc_dir=${EPREFIX}/usr/share/doc/${PF}/" + "conf_dir=${EPREFIX}/etc/highlight/" + ) + emake -f makefile "${myhlopts[@]}" + if use qt4 ; then + cd src/gui-qt + eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"' + emake + fi +} + +src_install() { + emake -f makefile "${myhlopts[@]}" install + use qt4 && emake -f makefile "${myhlopts[@]}" install-gui + + if use examples ; then + docompress -x /usr/share/doc/${PF}/examples + else + rm -rf "${ED}"/usr/share/doc/${PF}/examples + fi +} diff --git a/dev-ml/ocaml-re/Manifest b/dev-ml/ocaml-re/Manifest index bb8b644b69ff..59ae45fe318a 100644 --- a/dev-ml/ocaml-re/Manifest +++ b/dev-ml/ocaml-re/Manifest @@ -2,3 +2,4 @@ DIST ocaml-re-1.3.1.tar.gz 98686 SHA256 0c17696232a292d599880162545234030d0ad2d9 DIST ocaml-re-1.3.2.tar.gz 98885 SHA256 3a34c3d6b6bf61e0d1eb9af74fa82c936809f7e48f8872fb6b11252c79a5d466 SHA512 6f77e53390bd223bca57ff0e0ce02986e2aad4f3e572089162db75a690273561cacc8b5ff73d03864131c240a4ffe16ca87e8841dc576b459eb526143552c9f2 WHIRLPOOL b419b1f9dc37e9addf304cdf1ec07744d4c6532f65b9ff623c551c61bff8ee33b90e41af0ec530a332aa88e5954fdae0992522705323866a6169391a0bd297c9 DIST ocaml-re-1.4.0.tar.gz 99887 SHA256 51f316d73b0c927c1d4150955737a2e78002207ba46d8d3cf18da2a495ecc369 SHA512 9ac871dfe65b8a90da2786fa565cec588f8de50ce2a12c128b307fe730fa5df6533b343ef366161f900b2809bb3930dbf5e422d5fab5d6c3e0aa805901d856d9 WHIRLPOOL 8c3fc29f7c1c635a382a90de3408c367c06af2c2865a9695dffbd88e380b626e3717fdb9cde5d16b4f4fdc40682fa57e72d60753d7093a01c03013d68fd482cf DIST ocaml-re-1.4.1.tar.gz 99877 SHA256 262554309d645f4126a2a2e21e3a798d250293264fda34d6271243cc6c16e576 SHA512 dac256a1bd2a2109d0dbc39720ac60c6e2e0c229855735972072f5b59a89a3d4a4c5b127d5b753c838a219356a9530bdd1ac40d0bd2ce32a237589ad44307736 WHIRLPOOL 5147ba6d8c4bab902914b5a7e24ea2276a9128370de4953cd43986ee1a60338b8e2ac1ded2989682a0273723b202130879e6cc623906966897fd9ca7633b0230 +DIST ocaml-re-1.5.0.tar.gz 103242 SHA256 53322f763a8d771a68f986c9c323cab7d3afa56873c3eefa528fb92b1b511dd3 SHA512 f094eadabf4fd976cbae0f288673ef27c9c3fbc4ddf6ada283e20a240fc9865139956096030b7ae8173bf71bd98cf67cadca72562524a7be168dfe77fe4c6469 WHIRLPOOL 6b13262476e9ee143a662243d1efc07bf227d48450c7892fc8667a1efd45853e48dff3d391c49ed8f43dde932a4ed3d63b63118919bc930e8d1c2ed05426e17a diff --git a/dev-ml/ocaml-re/ocaml-re-1.5.0.ebuild b/dev-ml/ocaml-re/ocaml-re-1.5.0.ebuild new file mode 100644 index 000000000000..aebbbab00859 --- /dev/null +++ b/dev-ml/ocaml-re/ocaml-re-1.5.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 + +OASIS_BUILD_DOCS=1 +OASIS_BUILD_TESTS=1 + +inherit oasis + +DESCRIPTION="Regular expression library for OCaml" +HOMEPAGE="https://github.com/ocaml/ocaml-re" +SRC_URI="https://github.com/ocaml/ocaml-re/archive/${P}.tar.gz" + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="test" + +RDEPEND=">=dev-lang/ocaml-4.02:=" +DEPEND="${RDEPEND} + test? ( dev-ml/ounit )" +DOCS=( "CHANGES" "TODO.txt" "README.md" ) +S="${WORKDIR}/${PN}-${P}" diff --git a/dev-ml/ocaml-sqlite3/Manifest b/dev-ml/ocaml-sqlite3/Manifest index bf412cebea7f..00f9351afcc3 100644 --- a/dev-ml/ocaml-sqlite3/Manifest +++ b/dev-ml/ocaml-sqlite3/Manifest @@ -5,3 +5,4 @@ DIST sqlite3-ocaml-2.0.9.tar.gz 65361 SHA256 a1143a260e0e943e39ab1c9c8a80e32f542 DIST sqlite3-ocaml-4.0.0.tar.gz 66497 SHA256 02856daa9e88124824f6055bd242a1b5770ff1e2d9876280f1022cf2ab0fcf61 SHA512 c93d98f4ba8f1700f4ffed298392d3329b13bb716e46f27898c3038503e86c6584c6facb40014eb12e261ba32e714bb6a4a877a21e875d9da64935cbdaa1fba2 WHIRLPOOL c958d5b6440822eda27e7fc74f2533510e2b81804b88617459584be782215a85f051d710cbca5fef03da44ffc1da5ea2545408eaf0e91f39c15663dca8cd9513 DIST sqlite3-ocaml-4.0.1.tar.gz 66732 SHA256 ea268103217d15b88e30389e1865e10644aaedcc1a945cc7a8ded627babfea2f SHA512 5f6db4f2b0563ff42a32bde446c5dc76f186cf34c06b748498c6a58b3ca5563dc5705a82be267a00a34f46b76ab18804c750c61505ced2b36b51590dfc06a969 WHIRLPOOL eef9618fd65959fa57563157a8e18d912ccf52723eeed5b726f8d8e1667a722a2f985c388008eba31ae7082b918c8d2fafe8a040b6970c3f92eb18782497b345 DIST sqlite3-ocaml-4.0.2.tar.gz 66901 SHA256 169767f174623b180e50f120a8df2425eec30f5218558f904eae073c06161403 SHA512 85a65c0cfefa72c87b9fb9869eaf0e820bac66ee560bd178359fd0b5005d75f5844fd4eee46ff0a3e3ac1c6e642095901731e7737e96f29aa61650debe6eb8e7 WHIRLPOOL 4835c63e98d796896dede46af2166bb025443ab96788c266ea2a9ff83b7aad77b503426033a03864bcd5b055883099aab38bec4860e269228540b1b11fed7fcc +DIST sqlite3-ocaml-4.0.3.tar.gz 67376 SHA256 390383088b07fde6f775d060e59551ea796334b23b480d9937ad6429cd615d30 SHA512 5304874ac51aba140a4f2d5bbd147092d25a7fdfb006ff89800d54d7351e717b4db28732f0c7acba80d24bc78e198249cd01c1801034040bded8ebd941bfd482 WHIRLPOOL c2ecacd570b06a3ac375cba88b54ccf5de9ae130dcffbc71d25a91f16c5ccbecdb4303e7da8e7addb4027d8b0457798e1858ec2a82866d2b6089a9d6c6243ba0 diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.0.3.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.0.3.ebuild new file mode 100644 index 000000000000..d10376724c86 --- /dev/null +++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.0.3.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +OASIS_BUILD_TESTS=1 +OASIS_BUILD_DOCS=1 + +inherit oasis + +MY_PN="sqlite3-ocaml" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="A package for ocaml that provides access to SQLite databases" +HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/" +SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" +IUSE="" + +DEPEND=">=dev-db/sqlite-3.3.3 + >=dev-ml/findlib-1.3.2" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MY_P} +DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" "TODO.md" ) diff --git a/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.180.0-r1.ebuild b/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.180.0-r1.ebuild deleted file mode 100644 index c45ffcfac24c..000000000000 --- a/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.180.0-r1.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=MSCHOUT -MODULE_VERSION=3.18 -inherit perl-module - -DESCRIPTION="Perl Authentication and Authorization via cookies" - -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=www-apache/mod_perl-2 - >=dev-perl/Apache-Test-1.32" -DEPEND="${RDEPEND}" diff --git a/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.220.0.ebuild b/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.220.0.ebuild deleted file mode 100644 index bc7e2b365b29..000000000000 --- a/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.220.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=MSCHOUT -MODULE_VERSION=3.22 -inherit perl-module - -DESCRIPTION="Perl Authentication and Authorization via cookies" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=www-apache/mod_perl-2 - >=dev-perl/Apache-Test-1.35 - >=dev-perl/CGI-3.120.0 - >=dev-perl/Class-Load-0.30.0 - >=dev-perl/autobox-1.100.0 -" -DEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker -" diff --git a/dev-perl/Apache-AuthCookie/Manifest b/dev-perl/Apache-AuthCookie/Manifest index 93f87698a313..1de73dac88c1 100644 --- a/dev-perl/Apache-AuthCookie/Manifest +++ b/dev-perl/Apache-AuthCookie/Manifest @@ -1,3 +1 @@ -DIST Apache-AuthCookie-3.18.tar.gz 45265 SHA256 d1c43bd5e94590baa49bd07eb11cebe1124634a4286f3d523fb00ff5f7d57f88 SHA512 b619d62e8d1ca4f361798847ff4e3a4be3d84cd1515ec3d32291fa0d5d3d829942643f05bbf34d1363355cd7554aa65787989e5b2c90ece908b8532eaebeef2c WHIRLPOOL c48bd6496e9ebde3e49c77d7234cccda5d063a2f537204ec593620ea61d692f2434b7037eac24f1da37dd7306fa2d88ca2ff9a35e8c32662ed30333ed23855fb -DIST Apache-AuthCookie-3.22.tar.gz 48956 SHA256 425d84f0e1d4635021e4e4edc7c88aefc2b3ad5f6cbe000e491e980f2633e537 SHA512 f5272e6adb1a99c8efda8f8f343a366779e45174a6f170af35913aea2d52340aa894e86535aeda4ad77d26f40f20c88b77d9a8404b4388cd0e7f4be40143d297 WHIRLPOOL 72c0daf526edc1c65fb186a3d513d89703d063e1ef65e9956c3b79fd8b8ac4ea2d37884a0afdcbe096082bb3e4e39d5b4611511358ce1329a9e90c7669db1f4f DIST Apache-AuthCookie-3.23.tar.gz 45053 SHA256 c40c7f28447ad1e17f00ac63c0855d0af41b31d212fcc72ae91cc284e5aee9a7 SHA512 e8948725c1f2ae3631004ec666ecd20b9c3b5fda86408b980e5d0a3e0d36a8780d905718b1c7b5ca117fc15e130bf35f59ef83c598870dc5b874ee362a4fdcb7 WHIRLPOOL 016a518371301209d4c81370e95afb071e013b4b85ad26b6b544f0a9e7383aae3b23fbfb0de446f84d55cf928eda7c64ab705698b636710bdd1460d53f5b7e13 diff --git a/dev-perl/CGI/CGI-3.650.0.ebuild b/dev-perl/CGI/CGI-3.650.0.ebuild deleted file mode 100644 index 6342bea666c2..000000000000 --- a/dev-perl/CGI/CGI-3.650.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_PN=${PN}.pm -MODULE_AUTHOR=MARKSTOS -MODULE_VERSION=3.65 -inherit perl-module - -DESCRIPTION="Simple Common Gateway Interface Class" - -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="test" - -DEPEND=" - virtual/perl-File-Spec - virtual/perl-if - test? ( - >=virtual/perl-Test-Simple-0.980.0 - ) -" -# dev-perl/FCGI" #236921 - -SRC_TEST="do" diff --git a/dev-perl/CGI/Manifest b/dev-perl/CGI/Manifest index f32f05187ca4..6f5c664a9e61 100644 --- a/dev-perl/CGI/Manifest +++ b/dev-perl/CGI/Manifest @@ -1,3 +1,2 @@ DIST CGI-4.22.tar.gz 194314 SHA256 8cd695f032b630fc4b5cf6c0a39912ff30cae0f7da03d01965ca2ac28b4dcca8 SHA512 becd37e56ca3fe8a6ab6069d99ddc65838d4aa00b57b6e30a5e2bcf73e84dff9a3f5f2841549f6627fe29d46607254197f3a03f308dc5fb6add3ece60719871d WHIRLPOOL 003483d2852493ad2b4be0bbd018e590d264592dcd3e37da6adfaa004c3818c9c4cbf631635ede5b3cf0150429f7b4ce0e8ce647969ed6fff66fc905e918c849 DIST CGI-4.25.tar.gz 194815 SHA256 efb3e5235ada6a91f97ca2905399a686bedea60f6b525e52f4a147baff4f131a SHA512 2f9befda944867d751a100024732de71073a47c2e63fdbbf86291422258da47adfe9677b7c39451958cf6e936a015c1b9c7f8338563f2548b7446128f9cb6b8b WHIRLPOOL 295a7fe94d6d7b4a6c01ce3aa41b356bb278ae9004c278b75c512094db5919860bf2d089f884d9bc77d9be4aea728f3fb964fa1f0cba45702b6a1dee1d6b153c -DIST CGI.pm-3.65.tar.gz 247466 SHA256 556d0f9047affa6873da996d8cc077bff797c13f95be89eb771d7247b8f0828a SHA512 b2022b5bf8244be65c1e25394570043585af909947f28a9b0505c0eabca642bd96f58ed90ab2e5c82146192530030cf6b88d4115851dddf3523836c8178ccb8e WHIRLPOOL c6f9251513bd09c78b0785a478047906c47fea82604aa0a64e7943a554e061563d4386fd22a5ba8a83ba98000d19ec82e582fa292c5774443fcefe9b8d98c7bc diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.540.0-r1.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.540.0-r1.ebuild deleted file mode 100644 index 9a5c79180b38..000000000000 --- a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.540.0-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=DROLSKY -MODULE_VERSION=1.54 -inherit perl-module - -DESCRIPTION="Parse and Format DateTimes using Strptime" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris" -IUSE="" - -RDEPEND=" - >=dev-perl/DateTime-0.44 - >=dev-perl/DateTime-Locale-0.45 - >=dev-perl/DateTime-TimeZone-0.79 - >=dev-perl/Params-Validate-0.91" -DEPEND="${RDEPEND} - >=virtual/perl-ExtUtils-MakeMaker-6.31" - -SRC_TEST=do diff --git a/dev-perl/DateTime-Format-Strptime/Manifest b/dev-perl/DateTime-Format-Strptime/Manifest index 48bed4ac07fc..bee802ec13e6 100644 --- a/dev-perl/DateTime-Format-Strptime/Manifest +++ b/dev-perl/DateTime-Format-Strptime/Manifest @@ -1,3 +1,2 @@ -DIST DateTime-Format-Strptime-1.54.tar.gz 26578 SHA256 00bb61b12472fb1a637ec55bbd8878db05b3aac89a67b7991b281e32896db9de SHA512 1fae82873388d1f618e037691b6466479d34be6a6d63ac52e4d34b9d73f8d62107a46de7c3622081920144bcffe850d41329cfbd4d3ca974dc3802d6a647b864 WHIRLPOOL 9b7ecaaf1708cb741391abe634c225cf96f28004c23d28252021a7aa1cb0d6d79b97a7e7c56d7d9e8ed615ed752758a3b1a42550ab833ec4baa6129ba375c900 DIST DateTime-Format-Strptime-1.56.tar.gz 36863 SHA256 2ff69d0f5a0359aab04e7276db5bee3be10040da24fbf09de1d904e7ead78b28 SHA512 cdc14515c3a5f46c93572a6a7e3b5824d668609de778c908c271950600be1c9f8a48e15265478d3fed85062b8fbca9215f0f405880225a957a45aed9a7c92e08 WHIRLPOOL 0aa4286c172a638b04da6b1b2771332bedf94c367d6c569b94411b39fd68516a70dad23bd4f426a4ff7a32201376f13c0c52d8be959f0a42193555f9e2008753 DIST DateTime-Format-Strptime-1.62.tar.gz 42268 SHA256 a03478bb832e20854f61a9aea05caf31c2c936cab759eb0b1f854ded4f0c8ae7 SHA512 beefc1aca04c21943b709d1b766b76e01209ba98173f930ea03fb6fffbda045eeacb7e52d0b8e4a4bc2f9d1b34b9d86006ceec0736a12d1487b51ca1e5c51e90 WHIRLPOOL 0366531e0d19b77988569db621c7259e479944dc7b0569edfbb9ba868bf24e60ab8ac2ea60c891f9eff6d61a0a3fa37a30269e79348d6674bfe879178479feef diff --git a/dev-python/Babel/Babel-2.2.0.ebuild b/dev-python/Babel/Babel-2.2.0.ebuild new file mode 100644 index 000000000000..55f37a6f30db --- /dev/null +++ b/dev-python/Babel/Babel-2.2.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +DESCRIPTION="A collection of tools for internationalizing Python applications" +HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel" +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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="doc test" + +RDEPEND="dev-python/pytz[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="${DEPEND} + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )" + +python_prepare_all() { + # Make the tests use implementation-specific datadir, + # because they try to write in it. + sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \ + -i tests/messages/test_frontend.py || die + sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die + distutils-r1_python_prepare_all +} + +python_test() { + # Create implementation-specific datadir for tests. + cp -R -l tests/messages/data "${BUILD_DIR}"/ || die + export BUILD_DIR + py.test || die +} + +python_compile_all() { + use doc && emake -C docs html +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest index 578cf1b1b8c8..5d85570e3514 100644 --- a/dev-python/Babel/Manifest +++ b/dev-python/Babel/Manifest @@ -1,2 +1,3 @@ DIST Babel-2.0.tar.gz 3415906 SHA256 44988df191123065af9857eca68e9151526a931c12659ca29904e4f11de7ec1b SHA512 9f12573d97f688baf0d1fc0f61055e34b67964054e70c8a6c286a8b0e42ce58da4d9c8cf54f94e51b47a5256cc4504a14bea497bd626cfad8c860d952e7a5e18 WHIRLPOOL e08b0d2d6192321f653200b9e4e96d898c12ea8176f7e0fb7c2144d3dfb6c4b6c12b85833b05b1a5e2d9ed8cec3712d09c3b0a1822ca9cc7ea4bf1cb24dac3f3 DIST Babel-2.1.1.tar.gz 3437647 SHA256 7fb6d50effe88a087feb2036cb972fd7a893bf338361516f1a55a820bf7b5248 SHA512 ec7ebb8648101588eecc72913adc45c0593ed6ee5f10874edcd4b932959f9552edcecc8e2ec966dae6ef5e8adb23341f1a4f87ea2d9e6cbba57a9b8b0a352a94 WHIRLPOOL 812badf14a74fa391851aaae048ec5d815d6d8f7abce8b918f036243cc45d91ca97281614c2ef139797719077ef4880cfafce88e9d718b3cd633ed7303e4cfd7 +DIST Babel-2.2.0.tar.gz 6334150 SHA256 d8cb4c0e78148aee89560f9fe21587aa57739c975bb89ff66b1e842cc697428f SHA512 99771f8d34303f977858926ae70f4f3a5e0a0cd7e223a7f9e64364bfd2837356daf0676b06edf7cc11913f41d973bd41e7dcf5afac0f34aca0bf7558acf93802 WHIRLPOOL 7e0c8e2e78fbae776519ea8fd802806c66d7a13426a3de9b6bd1c16c07358fe7c8dd3991c88912570e27337ec8a192a753f9ef687524a398a376a401b286fd81 diff --git a/dev-python/logbook/logbook-0.9.1.ebuild b/dev-python/logbook/logbook-0.9.1.ebuild index 35b853d12931..68f464f9b53e 100644 --- a/dev-python/logbook/logbook-0.9.1.ebuild +++ b/dev-python/logbook/logbook-0.9.1.ebuild @@ -3,7 +3,8 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy ) inherit distutils-r1 @@ -17,7 +18,8 @@ KEYWORDS="amd64 x86" IUSE="doc test" DISTUTILS_IN_SOURCE_BUILD=1 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/pytest[${PYTHON_USEDEP}] ) doc? ( >=dev-python/sphinx-1.1.3-r3[${PYTHON_USEDEP}] )" RDEPEND="dev-python/redis-py[${PYTHON_USEDEP}]" diff --git a/dev-python/nose/nose-1.3.7.ebuild b/dev-python/nose/nose-1.3.7.ebuild index 2353f021dd96..a059793bf0bf 100644 --- a/dev-python/nose/nose-1.3.7.ebuild +++ b/dev-python/nose/nose-1.3.7.ebuild @@ -21,7 +21,10 @@ SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples test" -REQUIRED_USE="doc? ( python_targets_python2_7 )" +REQUIRED_USE=" + doc? ( + || ( $(python_gen_useflags 'python2*') ) + )" RDEPEND=" dev-python/coverage[${PYTHON_USEDEP}] @@ -30,6 +33,10 @@ DEPEND="${RDEPEND} doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] ) test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )" +pkg_setup() { + use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) +} + python_prepare_all() { # Tests need to be converted, and they don't respect BUILD_DIR. use test && DISTUTILS_IN_SOURCE_BUILD=1 @@ -64,7 +71,7 @@ python_compile() { python_compile_all() { if use doc; then - python_export python2_7 EPYTHON + python_setup 'python2*' emake -C doc html fi } @@ -79,10 +86,7 @@ python_install() { python_install_all() { use examples && local EXAMPLES=( examples/. ) + use doc && HTML_DOCS=( doc/.build/html/. ) distutils-r1_python_install_all - if use doc; then - docinto html - dodoc -r -A txt doc/.build/html/. - fi } diff --git a/dev-python/numpy/numpy-1.10.2-r1.ebuild b/dev-python/numpy/numpy-1.10.2-r2.ebuild index 9dc68cdc08ff..33f693b40a1c 100644 --- a/dev-python/numpy/numpy-1.10.2-r1.ebuild +++ b/dev-python/numpy/numpy-1.10.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -105,12 +105,12 @@ python_prepare_all() { [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" fi - # don't version f2py, we will handle it. - sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die +# # don't version f2py, we will handle it. + sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die - # we don't have f2py-3.3 +# # we don't have f2py-3.3 sed \ - -e "/f2py_cmd/s:'f2py'.*:'f2py'\]:g" \ + -e 's:test_f2py:_&:g' \ -i numpy/tests/test_scripts.py || die distutils-r1_python_prepare_all @@ -135,17 +135,16 @@ python_install() { } python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt + DOCS+=( COMPATIBILITY DEV_README.txt THANKS.txt ) if use doc; then - dohtml -r "${WORKDIR}"/html/* - dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf + HTML_DOCS=( "${WORKDIR}"/html/. ) + DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf ) fi - # absent in 1.9 - #docinto f2py - #dodoc numpy/f2py/docs/*.txt - #doman numpy/f2py/f2py.1 + distutils-r1_python_install_all + + docinto f2py + dodoc doc/f2py/*.txt + doman doc/f2py/f2py.1 } diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest index ca7b6a442455..85d8bd52ea9d 100644 --- a/dev-python/prompt_toolkit/Manifest +++ b/dev-python/prompt_toolkit/Manifest @@ -6,3 +6,4 @@ DIST prompt_toolkit-0.50.tar.gz 149902 SHA256 6acd7c7d158b1dfb5907659abfae0cee2e DIST prompt_toolkit-0.52.tar.gz 152677 SHA256 35b8a34df8dea4cba92222dc1b8700c30ed7a8ba47cf3bc583768c5571a30902 SHA512 25fcbbe86bd2fed82c10a4b75671c88fad96559c192b8d722bdb335598856a419a8a99e36eb63ecdc41f4d19c794159d684f0ec1f5c053505b3074472e7ee42a WHIRLPOOL 3fff8864af716821a0d93cef0e0e0cf6174b014c32c49938d64da5ebcdf4724608dce74abc39a66850ff5e111e50aab623cea59501374d241fc5fa35c01e8baa DIST prompt_toolkit-0.53.tar.gz 153969 SHA256 a62b861a52d2a8ff3080c4e23e529c1af8d0110f8e9d378fa3ea997d1c4ce864 SHA512 5d91527c2de5650c95b42fc202be4237d3f98e9fccb5fdf2b0360ca169c5107015394ace76b06ec19d5c8b8b6e4437c75ad3068b262d26c351910ff97e1d4e9d WHIRLPOOL b12fd7021c9229332f3863531c54a5ed2b1e5ac276d8531295d7dc83c883f4fba039375e34cf9eacdad708b5ef385b31733120a6a132fbda61006918b32ed222 DIST prompt_toolkit-0.54.tar.gz 157151 SHA256 f06eff45c142fb4b82716593b85fabcee260dbcc5458a5680f81edd3cd1b4211 SHA512 cf5b43a52bc4dd08fcc8aafe9e45172c93ac71e8b32beee000c7f267f792b64265ef00d572e927cef05e3642e197ae1c0573c3ec0e95317f7a065807e86a44b4 WHIRLPOOL bb68c8767d96a9835b8b09607ecaeaf2b3c8a3858733ab1675093544c1a20d29b1098b016210263de781e0ca8d1a5b95b616ffc9a4b50d7e1e16d95220936684 +DIST prompt_toolkit-0.57.tar.gz 178829 SHA256 de6019e1ebe99647d1b6640f09a02961b26144a91d9964ed93a41ccada9a9fae SHA512 6ed966f2e4cd91e26aa5477205910db0e62a374c544a5f4fd052b22b5312a2bf49294a0bff6ad384a89e806e79eb8e7f3495ae6261b141c38b9c026f67d2b328 WHIRLPOOL 9eb33330002d67cfd26e10a4fab9f8ffbd44fd87bb745960acb734f9db4cf0fa95983dd6fded3e35a263b4297a26b019d113ed450a4c2781a7bbde4bb8eb75ff diff --git a/dev-python/prompt_toolkit/prompt_toolkit-0.57.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-0.57.ebuild new file mode 100644 index 000000000000..75e5d54fecdf --- /dev/null +++ b/dev-python/prompt_toolkit/prompt_toolkit-0.57.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=(python2_7 python3_{3,4} ) + +inherit distutils-r1 + +DESCRIPTION="Building powerful interactive command lines in Python" +HOMEPAGE="https://pypi.python.org/pypi/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + dev-python/pygments[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + dev-python/wcwidth[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] +" + +python_test() { + "${PYTHON}" "${S}"/tests/run_tests.py || die +} diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild index 9b06f54c4400..063ce707be18 100644 --- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild +++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -24,9 +24,9 @@ DEPEND="${RDEPEND} python_test() { echoit() { echo "$@"; "$@"; } local exit_status=0 test - for test in test/*.sh; do - PATH="${S}/tools:${PATH}" \ - echoit sh "${test}" || exit_status=1 + cd tools || die + for test in ../test/*.sh; do + echoit sh "${test}" || exit_status=1 done return ${exit_status} } diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest index 9c353f3a90c0..df875b16eaa3 100644 --- a/dev-python/pycurl/Manifest +++ b/dev-python/pycurl/Manifest @@ -1,3 +1,4 @@ DIST pycurl-7.19.3.1.tar.gz 116687 SHA256 c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f SHA512 65ccb07638c663bc2a723664f1ade50f08eafa70bbcdc492cc99362a91873f453b63336a6b393d9f6591308f1450dadc64ce729b29990f37b170dda0eae0b23f WHIRLPOOL bf25bbb959e30140a261b9bede2e1a3675ec99c8f6c36f8afc8ca73288aa7f7cea6fa1d28385ca808872b251a676aebf8d77d203aed60619dab8852cac17b296 DIST pycurl-7.19.5.1.tar.gz 142140 SHA256 6e9770f80459757f73bd71af82fbb29cd398b38388cdf1beab31ea91a331bc6c SHA512 89a474d7285cb040099dc6107a238f326dcb22cdb2c2325139f0d7ebea56f0860869d20b6e8e3bb43882048a261a8ff5734c7fc3e790fde8a96de3fffd04894f WHIRLPOOL 87eac50707acb4d764941e334a490d1c72c28433e8ff72caa7811f23d3f8ab2c6949a25ba8edd0cdacb27e498e60e728745c787a05853f1428ede8d91294a5cc DIST pycurl-7.19.5.3.tar.gz 154800 SHA256 24f6c4016b1dd2a5e29d1b025ac2ad61f80c17adfdcf8a7f47aefab63ace78d7 SHA512 f7e65e0c6f7d1666ed3bebc4fabb41205f6dadd96d80fb5d1985c13ab28d35effef2966e961383e01881648fca4a4d500e9692d712888313dbe164b2c651530c WHIRLPOOL c5fe1cc232bae07dfc63e1a8a3b0929b3c1bbf7adf29c2b6085e5bc1e97656d6f5afc236974bfc3febdd2ab4fe1b7cce08c96d4a8eba5ba870505c7c423badeb +DIST pycurl-7.21.5.tar.gz 170962 SHA256 8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0 SHA512 0f07b9e2256e4e019bf0ac85d9ca2fff56cffd49986495f2235f91e341ed937c9895da1636548be90523404027d063d83910055899e178e653842bc5de4151c4 WHIRLPOOL 2e46b5e16181d3cc66be56b38d40f4b7fd2ff7b9574fc4214247140a43ce70c0eac71d793ceddd24ff05bf784a1e8105c315fa4a7b0460bd908901b159e6655d diff --git a/dev-python/pycurl/metadata.xml b/dev-python/pycurl/metadata.xml index d6283f42cc2c..a560f37eab85 100644 --- a/dev-python/pycurl/metadata.xml +++ b/dev-python/pycurl/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>python</herd> diff --git a/dev-python/pycurl/pycurl-7.21.5.ebuild b/dev-python/pycurl/pycurl-7.21.5.ebuild new file mode 100644 index 000000000000..f2b51c842599 --- /dev/null +++ b/dev-python/pycurl/pycurl-7.21.5.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# The selftests fail with pypy, and urlgrabber segfaults for me. +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit distutils-r1 + +DESCRIPTION="python binding for curl/libcurl" +HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test" + +# Depend on a curl with curl_ssl_* USE flags. +# libcurl must not be using an ssl backend we do not support. +# If the libcurl ssl backend changes pycurl should be recompiled. +# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl +# does not need to initialize gcrypt threading and we do not need to +# explicitly link to libgcrypt. +RDEPEND=" + >=net-misc/curl-7.25.0-r1[ssl=] + ssl? ( + net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] + curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) + )" + +# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180 +# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802 +DEPEND="${RDEPEND} + test? ( + dev-python/bottle[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-),kerberos] + >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}] + )" +# Needed for individual runs of testsuite by python impls. +DISTUTILS_IN_SOURCE_BUILD=1 + +python_prepare_all() { + sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die + sed -e '/pyflakes/d' -i Makefile || die + distutils-r1_python_prepare_all +} + +python_configure_all() { + # Override faulty detection in setup.py, bug 510974. + export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl} +} + +python_compile() { + python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" + distutils-r1_python_compile +} + +python_test() { + emake -j1 do-test +} + +python_install_all() { + local HTML_DOCS=( doc/. ) + use examples && local EXAMPLES=( examples/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/pyshark/pyshark-0.3.6.ebuild b/dev-python/pyshark/pyshark-0.3.6.ebuild index 752b5295a71f..e9cb16034b26 100644 --- a/dev-python/pyshark/pyshark-0.3.6.ebuild +++ b/dev-python/pyshark/pyshark-0.3.6.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_{3,4,5}} ) inherit distutils-r1 eutils @@ -19,7 +19,8 @@ IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" # See pyshark.egg-info/requires.txt -RDEPEND="dev-python/py[${PYTHON_USEDEP}] +RDEPEND=" + dev-python/py[${PYTHON_USEDEP}] dev-python/logbook[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] dev-python/trollius[${PYTHON_USEDEP}] diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest index 95ea497a5f17..e1142320a5da 100644 --- a/dev-python/terminado/Manifest +++ b/dev-python/terminado/Manifest @@ -1 +1,2 @@ DIST terminado-0.5.tar.gz 10491 SHA256 63e893eff1ba84f1ee7c4bfcca7676ba1de6394538bb9aa80cbbc8866cb875b6 SHA512 8c53e2c8fa837c171a8790744770f41d4fc8fe15fe8abd28af17317950c615e4c75c22ab896fd98984fd9c2bbbc7798e5ffe319827d84eb77889bca63660e421 WHIRLPOOL 0e603e49a754a4c5fa68b1df3416a6355357ab5af6801968385525bb2df2a558ffe73030f1789610b731638b57d9d5c1a5661c86de93984f8e2047bf205925b1 +DIST terminado-0.6.tar.gz 10334 SHA256 2c0ba1f624067dccaaead7d2247cfe029806355cef124dc2ccb53c83229f0126 SHA512 9b9521917d4000aa45e61a1b88705e715f11686890671607cca81d4518f1e17feefdc2ad3de64dd0e053a6849956efbbd838c7b98d570dcc98a936c0a4cfce9c WHIRLPOOL 832f7deea094856a0bf3fed3610561896a8906c4339dcc47197b85ee36ab47a385f6e180ebe65a9141ca946761ed6a94552fe9c21e4c792cac3a061b3403a5dc diff --git a/dev-python/terminado/terminado-0.6.ebuild b/dev-python/terminado/terminado-0.6.ebuild new file mode 100644 index 000000000000..4746ac57775e --- /dev/null +++ b/dev-python/terminado/terminado-0.6.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit distutils-r1 + +DESCRIPTION="Terminals served to term.js using Tornado websockets" +HOMEPAGE="https://pypi.python.org/pypi/terminado https://github.com/takluyver/terminado" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD-2" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND=" + dev-python/ptyprocess[${PYTHON_USEDEP}] + >=www-servers/tornado-0.4[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( dev-python/nose[${PYTHON_USEDEP}] )" + +python_test() { + nosetests --verbosity=3 || die +} diff --git a/dev-python/trollius/trollius-2.0.ebuild b/dev-python/trollius/trollius-2.0.ebuild index b15094c7a12c..2d842214cb19 100644 --- a/dev-python/trollius/trollius-2.0.ebuild +++ b/dev-python/trollius/trollius-2.0.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 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} pypy ) + +PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy ) + inherit distutils-r1 DESCRIPTION="A port of the Tulip project (asyncio module, PEP3156)" diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest index af501f123312..b4a4584a0a3c 100644 --- a/dev-python/websocket-client/Manifest +++ b/dev-python/websocket-client/Manifest @@ -2,3 +2,4 @@ DIST websocket-client-0.21.0.tar.gz 190523 SHA256 0e279c371df0bc1b3a890a31e90631 DIST websocket-client-0.31.0.tar.gz 192146 SHA256 ddbba49fe9f185dec6a80a536831fa781e10e1d946eef20ebcccd75b943c6ea6 SHA512 899fb3534f76f044b5f550282a05df7d58423b1108cc3134a7b1701c03c673c5e036435218a2931330e800b3060e287f7ad87133e54b0735db1c1581e219f222 WHIRLPOOL d440db59c5f5290e81f614eb1d68d66843b3f06b7c4d7de45c61675143d26f8b507d89c8bd76923dac09f5a117c98ed8239a4acf9ee84a9e0955850c0afe5390 DIST websocket-client-0.32.0.tar.gz 192180 SHA256 cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040 SHA512 648b5ea6bbf5b402004d0dcaa3d5242580efb7803a6cbadc20448fcdedb0097508d747c6ba67d4df9e289f3917ad6e09698b0fbf1330e073e14d369cfdb98bd3 WHIRLPOOL b24791a7c3eb2994f60c5743eb858dd0b02a0c3ea36a70b1c4a0434276a19a4a73893fcf1aac6cc05ea489469cdc6a9d4d4cd1be4e906817046b711e5c3d083e DIST websocket-client-0.34.0.tar.gz 193141 SHA256 682a6241ca953499f06ca506f69aa3ea26f0ed2a41fe7982732cb8449ae92ddf SHA512 db0d87d842884a326ceee1fb089012bb49476077977e3a3a7972f52acc9770431f14d6dcab8b15942230c65c9020336785bed3bf360b0ddc3dc40348fafb18d6 WHIRLPOOL e2851eab4c53c73f229692a9981229a20b9f4e66969cd6edcbed3bd557dde0b70365e543222308ee6f226e991404de23a3be7cc0d668dd18c0ebc75d8cebc6fc +DIST websocket-client-0.35.0.tar.gz 193509 SHA256 5ac3ead091be17b680a0dda926aef1a697a2b6cf1e9ac0fbe4bffb14914c2116 SHA512 d2bfb27f1908882621db21badc9f665ed7b0c0164f47c29014fc87ae7aa52b81160c11b26dd8abd97ced5a3429a917034b1a94dfd8ecfa91637dec9d2857475a WHIRLPOOL 2d55f1dc51d94cab0724f2c48b2aed1862e00c60c5f54b369d41725bbc6ecfe45aee98f7a16338ff76950b11fc19ef477d0c1d5a98dbd0bba468720ce0e5849f diff --git a/dev-python/websocket-client/websocket-client-0.35.0.ebuild b/dev-python/websocket-client/websocket-client-0.35.0.ebuild new file mode 100644 index 000000000000..9b7d17658e21 --- /dev/null +++ b/dev-python/websocket-client/websocket-client-0.35.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit distutils-r1 vcs-snapshot + +MY_PN=${PN//-/_} + +DESCRIPTION="WebSocket client for python with hybi13 support" +HOMEPAGE="https://github.com/liris/websocket-client" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2*' ) +" + +python_test() { + esetup.py test +} + +python_install_all() { + use examples && local EXAMPLES=( examples/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest index 00962bb5444c..4f6204073451 100644 --- a/dev-python/xlsxwriter/Manifest +++ b/dev-python/xlsxwriter/Manifest @@ -2,3 +2,4 @@ DIST XlsxWriter-0.7.3.tar.gz 231999 SHA256 2fa0f2d633bfbbc55a48abd4089820c744ed7 DIST XlsxWriter-0.7.4.tar.gz 232329 SHA256 e3192763b377a588fc06113836cf74a565926168929e55ba451baa684e857b62 SHA512 03da4b7f4b93250c7e22a100f78058f22f57b0746054d88a6cf3b2ef8026be8875344e08c15c3dac3fad19aac5c216199ae0910758856eded0957ea345727a1e WHIRLPOOL d6b1c36e7eabdc4f4554ce809c8295d2bb89bbccad85edb8b9c592c693dc5f68ba83be4d0a2ab79e15a02b5c298025fec36b342e350c24aa4332856582dbe433 DIST XlsxWriter-0.7.6.tar.gz 232509 SHA256 8d32569e49c7a7e53ca26fc34e11897c80ebc94b86c4b9cc3f467d8d99cf5c64 SHA512 c40f11fc84cbbc2949d21f5d8c3eac0b826af76f6df39fbcfc5678269416fa90df8f16c8fa39de31e0ab82a0966903b72cf9ba255441cc13702963c7ac4a0bf6 WHIRLPOOL d751777eaf90737a2c1575b299c8ff186a6bced9dbc059428120c84c097ec91672b53aff6d5c313c07f9a7bd83ea48d4d67f4a1a1118f8c31f8138a3c5bf486e DIST XlsxWriter-0.7.7.tar.gz 232623 SHA256 33a6fac3b148ab6137a7e2c0869e33493aff5ccde66e434c1ccf49e8687b9606 SHA512 1779163469bb2ecb9ee75288f840f47dfca4d9f81f283411b8db00abceab855af2d06655b23d9aed378af5073a68fabef5df7e934f5166b2d7479b151a602a30 WHIRLPOOL 0b2f5cc118671b58c5743371107ab59107bcb13f49a1ab9de9397d0a4ecee91b7c7f9039d3a029588809d25e8607f779eee8a9a1734f030a7f02e6e77b195f2c +DIST XlsxWriter-0.7.8.tar.gz 233091 SHA256 2200c2a69f63b350b3b1f5db8fae3e5b7135c01b7ac9c3b1d5926cf6583dd4cd SHA512 2343155c765533bbc146e928dfc82924f089c7abee2f3607be2e5f9b1da9166090164f134256cbd36f319a97c9aa651fb346cc7502a3f1721f9687a9cddb9364 WHIRLPOOL ba498cfe5929f8d302b2f81ca0291c465759ed070d030e650d4a973706562a397fda51632b31cdac8caba134d8199f3499c7505b9990a9fa02b908b5ac971bdc diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild new file mode 100644 index 000000000000..b992bfd7d38d --- /dev/null +++ b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +MY_PN="XlsxWriter" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Python module for creating Excel XLSX files" +HOMEPAGE="https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/nose[${PYTHON_USEDEP}] ) +" + +S="${WORKDIR}"/${MY_P} + +python_test() { + nosetests --verbosity=3 || die +} diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest index 5ec280c8363f..b987a6f9e72d 100644 --- a/dev-python/zope-event/Manifest +++ b/dev-python/zope-event/Manifest @@ -1 +1,2 @@ DIST zope.event-4.0.3.tar.gz 390984 SHA256 f5fdf6ca5716f714023358b212f7f435539dea11771603cd90eebf3ad34405f1 SHA512 bc328bb588beea0cdf55d5f36ff5b269d7b75f399b6d595e1df6565bf1d1fbe2d65b63072db26d096a3fc2dfc0fcec747ea7cf8eabe3c4535084347cb149f1e7 WHIRLPOOL 58ce4490fa86c79b30edc3c96d8d9e912b5d692bffe9664a29d2a7963efb90bb6d03acbe0774eb03ac912acfe44cca1c126cc1a840538bd2abcb1848ec972b53 +DIST zope.event-4.1.0.tar.gz 476047 SHA256 dc7a59a2fd91730d3793131a5d261b29e93ec4e2a97f1bc487ce8defee2fe786 SHA512 abb0a2de578546f678eb06160b50e6c301de97d4248baed80cd76cbf666b22962052f82d8a58a3006e72d288866e5d5baec86425ab27a79926b4706ef8d5915e WHIRLPOOL 9f07da6353636371df83e6fbb6d197d14959338ace4565ba1429d8759a26c3894a27e3fdaacecf2760c709a1baecc2128cd4c5430284ac7453dc8898e79d1f68 diff --git a/dev-python/zope-event/zope-event-4.1.0.ebuild b/dev-python/zope-event/zope-event-4.1.0.ebuild new file mode 100644 index 000000000000..6880a605950c --- /dev/null +++ b/dev-python/zope-event/zope-event-4.1.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=(python{2_7,3_4,3_5}) + +inherit distutils-r1 +MY_PN=zope.event + +MY_P=${MY_PN}-${PV} +DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture" +HOMEPAGE="https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="ZPL" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="test" + +DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] ) + dev-python/setuptools[${PYTHON_USEDEP}]" + +S=${WORKDIR}/${MY_P} + +python_test() { + nosetests || die +} diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest index 5ff8dbfa4f6f..51d68d99c3f4 100644 --- a/dev-ruby/childprocess/Manifest +++ b/dev-ruby/childprocess/Manifest @@ -1,5 +1,3 @@ DIST childprocess-0.5.3.gem 28160 SHA256 9cebed1bd68f7ba0deb54683a5c05a8c3e79037f682b5d0a6ecd1d4472bbb289 SHA512 f48ab94dc3da7ca82551f480cb18214ec65f9550ef053b25216239ed92c289a7353c632fff53148b1d6ce0c7bf70188bcecbdeede3df9b8130f815599a45ac05 WHIRLPOOL 68f7e9585c39a2628c4cb162d02c7d332d116be96ce8f325308e15d530e00139d43b9dcfcdfd490c6a252057947eed4c91843d8f37b96201d95b6ff3078055da -DIST childprocess-0.5.5.gem 28672 SHA256 9b583295a11932d2eeffa1e8f5b8fb2fb0064a2f0111ad98c3b752b94f80bf33 SHA512 313f9e66da6c6e06045fd5fc9b1d87cac23ca9b2d7fc6ebcc7dd900484a3807653e5c12728fdbf65a5d82a1085f5ccdaae36561e6993684b612cea0151fa591d WHIRLPOOL b92b8756c467c0af2155bf02732cf86bc8e3907c7ac99aef7f2709bf19da1f16aa17f53ead47f7ffe8f88c3d33bb81b2c36c45dd9a6141175ad0438f1942a0ce -DIST childprocess-0.5.6.gem 28672 SHA256 999933231b469b095b1d4b24cbe3ea159f215771650ff47f77e46540192ebd48 SHA512 b4e7c7095028d03002d54d6cf05c43fb6792a3284cb879d1a29090219b6eea9e945b06f9906c308f4f1c73bb79bece178c67c17da22a1a78ad30b8f96b67df04 WHIRLPOOL 70c1e28041a7a9c86c6e0d2056c4563751614353ee97dd1539115e379140211bf86c72fdeb2e611bba45791a967e6e77338c62766102484213dfc0695c6d6cea -DIST childprocess-0.5.7.gem 29184 SHA256 1339b47d84aa381828b27ad3989d88161e2080f7e974476cb4d4809df06904c1 SHA512 96a638b53adab1960e639369009629f602acb5e979e6b824ffcb916347f8899b3e3e0d1bdd0e845ee25f8b4ab58242d11162d850a54f1eb777ebd6dd0f522b1d WHIRLPOOL 4c476e6335bbc71a915fbdecea72b8e19fc4dd6792fe45ccb7d0eae12f6be25b5bf5136871521e017ccdb876c91de8a1cc3d07a884e34294c6c0fe147519ab65 DIST childprocess-0.5.8.gem 29184 SHA256 e06178990b906c23e47960c5fd38aadae69543a703766953655a4117625767d3 SHA512 e2871861f727945ee3635364152acbb4229f5b896039f28a9735f5c42230180e4142e7ee1473cd43724483cd63c93d58502e48c9f6554e1b3036dc3f82141a56 WHIRLPOOL 3037b5f1e25d7840bdd84262371d7f2a0764b88711a2b45a578739a811954d63a82c6526bff916b546e3fca5bfaac52ddb24fab157e0acefaf57e9615f8717dd +DIST childprocess-0.5.9.gem 29184 SHA256 221f98abeacce606ab3940785217c2d4a58ddbb7d267678b185acc54f92842c7 SHA512 5a671e59d19531347438dc149d5309218c7e439cfd0bfcfe201ae8e1099a2608a0170f9a3f3752fb709afc6b68fa3a10dc60d0632af545a9ba71483c7be2c21d WHIRLPOOL 8558622ef2f0ad3d9c2d84968378034d3293b7f485d30b6361326539e329b33bb52e5b472c8880485c23f85e457ad07894036ca2adfdf148ac4b05925407ac28 diff --git a/dev-ruby/childprocess/childprocess-0.5.5.ebuild b/dev-ruby/childprocess/childprocess-0.5.5.ebuild deleted file mode 100644 index c8ceba76a36b..000000000000 --- a/dev-ruby/childprocess/childprocess-0.5.5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2014 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="rspec" - -RUBY_FAKEGEM_TASK_DOC="yard" -RUBY_FAKEGEM_EXTRADOC="README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem - -DESCRIPTION="A simple and reliable solution for controlling external programs running in the background" -HOMEPAGE="https://github.com/jarib/childprocess" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/rspec:2 )" - -ruby_add_rdepend ">=dev-ruby/ffi-1.0.11" - -all_ruby_prepare() { - # Remove bundler support - rm Gemfile || die - sed -i -e "/[Bb]undler/d" Rakefile || die - sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die - sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die -} diff --git a/dev-ruby/childprocess/childprocess-0.5.6.ebuild b/dev-ruby/childprocess/childprocess-0.5.6.ebuild deleted file mode 100644 index d9cf626acc8f..000000000000 --- a/dev-ruby/childprocess/childprocess-0.5.6.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_RECIPE_TEST="rspec" - -RUBY_FAKEGEM_TASK_DOC="yard" -RUBY_FAKEGEM_EXTRADOC="README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem - -DESCRIPTION="A simple and reliable solution for controlling external programs running in the background" -HOMEPAGE="https://github.com/jarib/childprocess" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/rspec:2 )" - -ruby_add_rdepend ">=dev-ruby/ffi-1.0.11" - -all_ruby_prepare() { - # Remove bundler support - rm Gemfile || die - sed -i -e "/[Bb]undler/d" Rakefile || die - sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die - sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die -} diff --git a/dev-ruby/childprocess/childprocess-0.5.7.ebuild b/dev-ruby/childprocess/childprocess-0.5.9.ebuild index 4530cd9175a1..1d6e50de8056 100644 --- a/dev-ruby/childprocess/childprocess-0.5.7.ebuild +++ b/dev-ruby/childprocess/childprocess-0.5.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,7 +14,7 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" inherit ruby-fakegem -DESCRIPTION="A simple and reliable solution for controlling external programs running in the background" +DESCRIPTION="Solution for controlling external programs running in the background" HOMEPAGE="https://github.com/jarib/childprocess" LICENSE="MIT" diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest index 42634bc5a940..fe3dd2d0edf6 100644 --- a/dev-ruby/maxitest/Manifest +++ b/dev-ruby/maxitest/Manifest @@ -1 +1,2 @@ DIST maxitest-1.5.4.tar.gz 13723 SHA256 d03018f2a0d0414b7ce9df7a1326e6b0d615323b109084f3191472027d60a24c SHA512 b2b7c0ac561f7f62f94a86d1f84b1aa4e9dfe65840607ebc1178055e82a759aed74637a721c7eeb234e5efdf52ef6386e36097dcb165bbd001758a96e588d8e6 WHIRLPOOL c3fbc53e5e23da0e85fcdab9578af13b278dca9bea6738ca9ebe6eeecb8e72783e5c147d4e79dbe03185e365856dbdcbadf8a936916393946fd0f9ae5b3bf097 +DIST maxitest-1.5.5.tar.gz 13753 SHA256 5b8da0bca9b099da51f2abd14c6490b178debb4d79e545b377ee29cf4110cf31 SHA512 0136597d86a5d760c221e96bf84dfe36ae18b32450d0f955760903a8eb97232bf112e2c11528f9cb293972e6a1e0531fa459c132c8551a2861d57e7de9f5a642 WHIRLPOOL bf99b3402814d04254307b917d19f97ff32d6a43c75a71cef8994ac629f98cd23e909b69a6eb5404cfb707cde9175a8a95efe1aaf1a011952db908c8245a261e diff --git a/dev-ruby/maxitest/maxitest-1.5.5.ebuild b/dev-ruby/maxitest/maxitest-1.5.5.ebuild new file mode 100644 index 000000000000..d837e7313c16 --- /dev/null +++ b/dev-ruby/maxitest/maxitest-1.5.5.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="Readme.md" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit versionator ruby-fakegem + +DESCRIPTION="Minitest + all the features you always wanted" +HOMEPAGE="https://github.com/grosser/maxitest" +SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="1" +KEYWORDS="~amd64 ~arm ~ppc64" +IUSE="" + +ruby_add_rdepend "<dev-ruby/minitest-5.9.0:5" + +ruby_add_bdepend "test? ( dev-ruby/bundler )" + +all_ruby_prepare() { + rm -f Gemfile.lock || die + # Remove developer-only gems from the gemspec and avoid git issues + sed -i -e '/\(bump\|wwtd\)/ s:^:#:' \ + -e 's/git ls-files/find/' \ + ${RUBY_FAKEGEM_GEMSPEC} || die + sed -i -e '/byebug/ s:^:#:' Gemfile || die + +} + +each_ruby_prepare() { + # Use the correct target + sed -i -e '/sh/ s:ruby:'${RUBY}':' \ + -e '/sh/ s:mtest:'${RUBY}' -S mtest:' \ + spec/maxitest_spec.rb || die +} + +each_ruby_test() { + PATH="${S}/bin:${PATH}" RSPEC_VERSION=3 ruby-ng_rspec spec +} diff --git a/dev-tex/hevea/Manifest b/dev-tex/hevea/Manifest index 4866f6ab06b9..a281fb953aae 100644 --- a/dev-tex/hevea/Manifest +++ b/dev-tex/hevea/Manifest @@ -7,3 +7,4 @@ DIST hevea-2.22.tar.gz 408147 SHA256 aba303d9067eb51ecde25b74f831a33fa58b4b15855 DIST hevea-2.23.tar.gz 968938 SHA256 db8ec1459cace8f008387dbcf745ba56917d44ff62c7bdba843da250109137b9 SHA512 674a0b3fe14314101cdbb81c572b0df1039c5d4896697405e6cd8b7f3a3a654fb7b681dd8109044ba2fb11c26d591f90d769ce6640b94d75f50b74d2a7b17d10 WHIRLPOOL 42e1753d2b6bd3fc447612538dbecae679fffcb42143da1991ec8f052b3d143e95f6bcc7dff8ba6edf2410f239e308bce4f9177ca5aa48224d2dac251d4c7d63 DIST hevea-2.25.tar.gz 969449 SHA256 e4c75b550bb2aa663052063d979dd1490fd7817e7cbb97b208dee92ed24ec94e SHA512 68b382f2c7466f092ee0b1055ff2f8659d2a0fec221b776b91ecb6b579633d5540d809a2ef68937401e870ed51ea6420bae37d8549d7d8db6a1c327051d4cf29 WHIRLPOOL 241dffbeaad6729aa0db243980c94b080651c0fc7a263e46f9f585518ccef78711322c52ab2104ee3f2f6138251b4dd071c04198419f0cb4fdf9c26de405195e DIST hevea-2.26.tar.gz 969378 SHA256 4eb43d25ff22208af5914f20e7349c92b68c21bfae95300c54578448c5377b9c SHA512 b239546b0da42dd67260c63135716e1f2822ccaf6b8b17d715cff369934579a54b19e9f0604758c3a2daecc113121cea09f43adbbed2436c12310f6524b1d140 WHIRLPOOL b35b7b3651a6415b95a6f0177b3e21389e41025984a87ae2e18f0f106902273fc649a980503a8a7e1abef705e4b5e4259b740774957d2215b8beb0a1b51b78de +DIST hevea-2.28.tar.gz 969507 SHA256 cde2000e4642f3f88d73a317aec54e8b6036e29e81a00262daf15aca47d0d691 SHA512 9df1ab91d9c15952f3b2f5b7aa8a56e24160b6447c4a6e29ba8093cb70565400d40ae840c0077c0f16249bea673b9a3ca9c9e8a0b34b272d4dffc97d3482b033 WHIRLPOOL 6c483f0627bca8d405b79129463b3510cfc463080f9d8908e7b98024899fc665444122271e06e70b253e5b0ceb17aed66e74e9364f97d427e5c087ad33a890e9 diff --git a/dev-tex/hevea/hevea-2.28.ebuild b/dev-tex/hevea/hevea-2.28.ebuild new file mode 100644 index 000000000000..90a000220df6 --- /dev/null +++ b/dev-tex/hevea/hevea-2.28.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib + +IUSE="+ocamlopt" + +DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator" +HOMEPAGE="http://hevea.inria.fr/" +SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz" + +LICENSE="QPL" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" + +DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]" +RDEPEND="${DEPEND} + dev-texlive/texlive-latexextra" + +src_compile() { + rm -f config.sh + emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh || die "Failed to create config.sh" + if use ocamlopt; then + emake PREFIX=/usr || die "Failed to build native code binaries" + else + emake PREFIX=/usr TARGET=byte || die "Failed to build bytecode binaries" + fi +} + +src_install() { + if use ocamlopt; then + emake DESTDIR="${D}" PREFIX=/usr install || die "Install failed" + else + emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install || die "Install failed" + fi + + dodoc README CHANGES +} + +# If texmf-update is present this means we have a latex install; update it so +# that hevea.sty can be found +# Do not (r)depend on latex though because hevea does not need it itself +# If latex is installed later, it will see hevea.sty + +pkg_postinst() { + if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then + /usr/sbin/texmf-update + fi +} + +pkg_postrm() { + if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then + /usr/sbin/texmf-update + fi +} diff --git a/games-board/freedoko/freedoko-0.7.13.ebuild b/games-board/freedoko/freedoko-0.7.13.ebuild deleted file mode 100644 index 9af95db6d06c..000000000000 --- a/games-board/freedoko/freedoko-0.7.13.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils gnome2-utils games - -DESCRIPTION="FreeDoko is a Doppelkopf-game" -HOMEPAGE="http://free-doko.sourceforge.net" -SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip - backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> ${PN}-backgrounds.zip ) - kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip ) - xskatcards? ( mirror://sourceforge/free-doko/xskat.zip ) - pysolcards? ( mirror://sourceforge/free-doko/pysol.zip ) - gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip ) - openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip ) - !xskatcards? ( - !kdecards? ( - !gnomecards? ( - !openclipartcards? ( - !pysolcards? ( - mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net" - -RDEPEND="net? ( net-libs/gnet dev-libs/glib:2 ) - >=dev-cpp/gtkmm-2.4:2.4" -DEPEND="${RDEPEND} - app-arch/unzip - virtual/pkgconfig" - -S=${WORKDIR}/FreeDoko_${PV} - -src_unpack() { - local cards=0 - - unpack_cards() { - use $1 && { unpack $2 ; cards=$(( $cards + 1 )); }; - } - unpack FreeDoko_${PV}.src.zip - cp /dev/null "${S}"/src/Makefile.local - - cd "${S}"/data/cardsets - - unpack_cards xskatcards xskat.zip - unpack_cards kdecards kdecarddecks.zip - unpack_cards pysolcards pysol.zip - unpack_cards gnomecards gnome-games.zip - unpack_cards openclipartcards openclipart.zip - [ $cards ] || unpack xskat.zip # fall back to xskat - - if use backgrounds ; then - cd "${S}"/data/backgrounds - unpack ${PN}-backgrounds.zip - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} - -src_compile() { - export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"${GAMES_DATADIR}/${PN}\"'" - export CPPFLAGS+=" -DMANUAL_DIRECTORY_VALUE='\"/usr/share/doc/${PF}/html\"'" - export OSTYPE=Linux - export USE_NETWORK=$(use net && echo true || echo false) - export USE_SOUND_ALUT=false # still marked experimental - emake Version - emake -C src FreeDoko -} - -src_install() { - newgamesbin src/FreeDoko freedoko - insinto "${GAMES_DATADIR}"/${PN}/ - doins -r data/{ai,cardsets,backgrounds,rules,sounds,translations,*png} - find "${D}${GAMES_DATADIR}"/${PN} -name Makefile -delete - dodoc AUTHORS README ChangeLog - newicon -s 32 src/FreeDoko.png ${PN}.png - make_desktop_entry ${PN} FreeDoko - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild index 049c1444cd63..d7266c13efb5 100644 --- a/games-emulation/dolphin/dolphin-5.0.ebuild +++ b/games-emulation/dolphin/dolphin-5.0.ebuild @@ -30,8 +30,7 @@ RDEPEND=">=media-libs/glew-1.10 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) - ffmpeg? ( virtual/ffmpeg - !!media-video/libav ) + ffmpeg? ( virtual/ffmpeg ) lzo? ( dev-libs/lzo ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index 1ee2c859b548..c44022abf3c0 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -46,10 +46,7 @@ RDEPEND=">=media-libs/libsfml-2.1 dev-libs/libevdev virtual/udev ) - ffmpeg? ( - virtual/ffmpeg - !!media-video/libav - ) + ffmpeg? ( virtual/ffmpeg ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest index 11ce73580a9e..48de226e3934 100644 --- a/games-roguelike/tomenet/Manifest +++ b/games-roguelike/tomenet/Manifest @@ -1,2 +1 @@ -DIST tomenet-4.5.9.tar.bz2 3012187 SHA256 40ce5068e2ee10ad051241d5c44423bb74a9ef4054260ee692adeccc9b46d4c7 SHA512 1e13e37b209ab274fb6aeafeb270cff0590ffa352b91b61970194e968826bed3fd365c210238a48b067d0882bac737c70250d8846acc816e3c3ac0b3b843ee1d WHIRLPOOL c9106d27be0e9f173eae24d12f79b75818b1dd23d2c1c93dd4a1a707de6ddaf7538de0dce73216d4a32a290245cd4c09dd26bbc3b54e811484a3a44bb2945fa6 DIST tomenet-4.6.0.tar.bz2 3039894 SHA256 bd1cbf05fe8cb4c8af5e658ede622cf12b54aae42c640af12677e4067902673f SHA512 73dd682158b09ede8b78ca604891eebe6534ca3e8979187ac8b938deb3b37e5fde3424122fac6fce392e0e38cc70e40ae6bb07ce7e7192a8cd43d7d8057ab9b3 WHIRLPOOL 8f03ed1b1bc962403d8ff7611857ce40daa5436fa540da96aa142bdf70d6c4dd134238b582e7c6be2e52b63ce1c92f33bef1d21799d1ff4f29684256404831f6 diff --git a/games-roguelike/tomenet/files/tomenet-4.5.9-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.9-makefile.patch deleted file mode 100644 index 0dc9fb8171c3..000000000000 --- a/games-roguelike/tomenet/files/tomenet-4.5.9-makefile.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- tomenet-4.5.9.orig/src/makefile -+++ tomenet-4.5.9/src/makefile -@@ -203,7 +203,7 @@ - # - # This is my compiler of choice, it seems to work most everywhere - # --CC = gcc -+CC ?= gcc - - # For allowing #if..#else..#endif constructs in LUA files - C. Blue - # Note: The flags must contain -@@ -215,16 +215,26 @@ - # need to use the gcc invocation below instead. - # - # cpp variant: --CPP = cpp --CPPFLAGS = -C -P -+#CPP = cpp -+#CPPFLAGS = -C -P - # gcc variant: --#CPP = gcc --#CPPFLAGS = -x c -E -Wp,-C,-P -+CPP ?= gcc -+CPPFLAGS = -x c -E -Wp,-C,-P - - - # For variations with X11 - X11BASE = /usr/X11R6 - -+# defines -+ifdef USE_SDL -+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags) -+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer -+endif -+ -+ifdef USE_X -+CFLAGS += -I${X11BASE}/include -DUSE_X11 -+LIBS += -L${X11BASE}/lib -lX11 -+endif - - ## - ## Standard version -- supports X11 (main-x11.c) -@@ -234,8 +244,11 @@ - # "CFLAGS", if your machine places files in a weird location. - # - ## With SDL --#CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags` --#LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm `sdl-config --libs` -lSDL_mixer -+ -+CFLAGS += -Wall -+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -+LIBS += -L/usr/pkg/lib $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS} -+ - ## - ## Without SDL - #CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -@@ -257,7 +270,7 @@ - # - ## With SDL - CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 --LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer -+LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm $(shell sdl-config --libs) -lSDL_mixer - ## - ## Without SDL - #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -@@ -357,9 +370,6 @@ - # Compile a client with 'test client' version/tag - tomenet.test: CFLAGS += -DTEST_CLIENT -O0 - --# Normal release build --tomenet: CFLAGS += -O2 -- - - # Lua - SRCS += $(LUASRCS) diff --git a/games-roguelike/tomenet/tomenet-4.5.9.ebuild b/games-roguelike/tomenet/tomenet-4.5.9.ebuild deleted file mode 100644 index 03bb61bb4d6d..000000000000 --- a/games-roguelike/tomenet/tomenet-4.5.9.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils gnome2-utils toolchain-funcs games - -DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien" -HOMEPAGE="http://www.tomenet.eu/" -SRC_URI="http://www.tomenet.eu/downloads/${P}.tar.bz2" - -LICENSE="Moria" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="dedicated server +sound X" - -RDEPEND="sys-libs/ncurses - !dedicated? ( - X? ( - x11-libs/libX11 - ) - sound? ( - media-libs/libsdl[sound] - media-libs/sdl-mixer[vorbis,smpeg,mp3] - ) - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - !dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )" - -S=${WORKDIR}/${P}/src - -src_prepare() { - epatch "${FILESDIR}"/${P}-makefile.patch - use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;} - - sed \ - -e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \ - "${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die - - if use server || use dedicated ; then - sed \ - -e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \ - "${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die - fi - - tc-export PKG_CONFIG -} - -src_compile() { - local mytargets="$(usex dedicated "accedit tomenet.server evilmeta" "$(usex server "all" "tomenet")")" - emake \ - $(usex dedicated "" "$(usex X "USE_X=1" "")") \ - $(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \ - -f makefile \ - ${mytargets[@]} -} - -src_install() { - dodoc ../TomeNET-Guide.txt - - if ! use dedicated ; then - newgamesbin ${PN} ${PN}.bin - dogamesbin "${T}"/${PN} - - doicon -s 48 client/tomenet4.png - make_desktop_entry ${PN} ${PN} ${PN}4 - fi - - if use server || use dedicated ; then - newgamesbin tomenet.server tomenet.server.bin - dogamesbin "${T}"/${PN}.server accedit evilmeta - fi - - insinto "${GAMES_DATADIR}/${PN}" - doins -r ../lib/* - doins ../.tomenetrc - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update - - if use sound; then - elog "You can get soundpacks from here:" - elog ' http://tomenet.net/downloads.php' - elog "They must be placed inside ~/.tomenet directory." - fi -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest index 7ff45e3e1b5e..2f298b823a8d 100644 --- a/games-rpg/manaplus/Manifest +++ b/games-rpg/manaplus/Manifest @@ -1,3 +1,2 @@ DIST manaplus-1.5.11.21.tar.xz 9556540 SHA256 57b6e0d8a730f56060062aa0d6e6baafc100860aa2cc4ba5120d21772410aae6 SHA512 145479b9b6912064356f842910c2a5bbb16bacc7372b898d98f237514722bbac4c6f3fe49ee30942b6e38820cfe9d3508ba5ac64b858a6003e27569327729d7d WHIRLPOOL 628009c082219c63f42892881060dff3784ae419d3d6dab95357272774d0d0545a97cf0d7190157e3338ac38e7f821fe9e3a893f24ee10be71ec6ac83c097722 DIST manaplus-1.5.12.19.tar.xz 9581180 SHA256 8b28cbb1f385124411f4d7c2dc7066b0c0226d9afa905401ebf79c90c4e5aa69 SHA512 afbf40c22f93a2ff7720cacebfeb90ea6669061ba5bab2f45a78bd11b890ca516606b6d260903eaa04b0cf0e3e49dce9301c030de50ffceeb70329d1284e0369 WHIRLPOOL 2fcf321101d6178942db6f51bbd38f88d6423f097ae8fd0d6415d5df2096dbd10e188e008166e57fb3f359edc9c1315dcfad78b546ba8804dabe9984cd00a066 -DIST manaplus-1.5.8.15.tar.xz 9399088 SHA256 c9ebf1c106fd04f8b192b4f07b15528a69bd3541f5eeee7cc5ecfa643a1dab9c SHA512 c99f5f782c794f0697242a2191b0eb5062964919abc6122cc88c2eb2bc32e4ce085b10c4d97d926ee72b0bac406db3130fc05d76cb8e6f1241579a115db8d44d WHIRLPOOL fc5600fe2e42f362abe507a99834bdf1810ef643709fba0005a78119728e4f204df8e7ef2672ba8548fd611f48ddb3b9a063a104b216f3c000b3ee52d83eacab diff --git a/games-rpg/manaplus/manaplus-1.5.8.15.ebuild b/games-rpg/manaplus/manaplus-1.5.8.15.ebuild deleted file mode 100644 index 6ed88b420044..000000000000 --- a/games-rpg/manaplus/manaplus-1.5.8.15.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit games - -DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World" -HOMEPAGE="http://manaplus.evolonline.org" -SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/manaplus-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="nls opengl" - -RDEPEND=" - >=dev-games/physfs-1.0.0 - dev-libs/libxml2 - media-libs/libpng:0= - media-libs/libsdl2[X,opengl?,video] - media-libs/sdl2-gfx - media-libs/sdl2-image[png] - media-libs/sdl2-mixer[vorbis] - media-libs/sdl2-net - media-libs/sdl2-ttf - net-misc/curl - sys-libs/zlib - x11-libs/libX11 - x11-misc/xdg-utils - x11-apps/xmessage - media-fonts/dejavu - media-fonts/wqy-microhei - media-fonts/liberation-fonts - media-fonts/mplus-outline-fonts - nls? ( virtual/libintl ) - opengl? ( virtual/opengl )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -src_prepare() { - sed -i \ - -e '/^SUBDIRS/s/fonts//' \ - data/Makefile.in || die -} - -src_configure() { - CONFIG_SHELL=/bin/bash \ - egamesconf \ - --with-sdl2 \ - --without-internalsdlgfx \ - --localedir=/usr/share/locale \ - --prefix="/usr" \ - --bindir="${GAMES_BINDIR}" \ - $(use_with opengl) \ - $(use_enable nls) -} - -src_install() { - default - dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf - dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono-bold.ttf - dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono.ttf - dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf - dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans-bold.ttf - dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono-bold.ttf - dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono.ttf - dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans.ttf - dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${GAMES_DATADIR}"/${PN}/data/fonts/wqy-microhei.ttf - dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-bold.ttf - dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-regular.ttf - - prepgamesdirs -} diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest index 0a0d5ba906d4..c6009134b1cf 100644 --- a/mail-mta/postfix/Manifest +++ b/mail-mta/postfix/Manifest @@ -2,5 +2,5 @@ DIST postfix-2.10.9.tar.gz 3820525 SHA256 e47eb56db2d238b9c5a5147a516fa406ab6afb DIST postfix-2.11.7.tar.gz 4031689 SHA256 05828b5b846e48fdc80db67d85409066010614af521070df4733459fbf447e20 SHA512 a1e146db6d2d71abb1dd7c70cde24e6410b599458ffa8061a0161be9475452034d9dcc7ec3976042b379cd84f5ebdba2f9d8d829637ff376ccaf7e87bcabe7a3 WHIRLPOOL 990cf17bc8d0cb8c8de0aa42f16125b1393feb42ed2eca3cb66ddd4d0b5d9425f619ee22047745fdd2f0069dc321e942ecc326bfbb88519fccf4931f95b1c483 DIST postfix-3.0.2.tar.gz 4239235 SHA256 68256314202f5f0f24022d64f7ac664d28fa1394d07c84a37c3fc7a2d040be80 SHA512 b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4ce731a2ff6a632c3341ace43afe7f1600f2096592535cf9a300322f78c92000e752e0df7d3c39021 WHIRLPOOL 3fd230321577c0226926701a17803b038a281b46abe884899ca38ea18c5fd9c13ef90900e5fdd17db20ecf8dc63b373cb9f378f1402660be2908192900cba47a DIST postfix-3.0.3.tar.gz 4240588 SHA256 401e46ec3450569dcce60d1d8ca22a19ab1f7f817b0cc730cdf4875ba608ac02 SHA512 b6cd091a8cdda9678fa2979082e47a363dd086e4376effc0a427d1beb5eb35bd7dc28003ad28323c42318d7f630e0d8b105c56fd1a63bd5b5a20501db68ac524 WHIRLPOOL b013164f12e2adde464052f37584320687716f18c65cdd01344848bbcdd5a08be16c741234a063d717474a50be0d14d7b5574ccb69dc56e00f30b619d148c9f9 -DIST postfix-3.1-20151218.tar.gz 4315185 SHA256 7b298644b729f4bae25facfee7d33eceaf5b2f87abdcaf35e4c52b1981cde87a SHA512 80f1086d9f3e3d3274903a1437df8a2c780112e39bacd2ce23188c41c62bd7efada1be00ca3c0be3d88867f513d575ab54305b1a1fd04bf16279c466e4a95b41 WHIRLPOOL 65821e9230a9da667846745d2d38fa4755a9258ca76093a2e520551e7cc2e2cd60ec0e05c8bd9cac02763f42c13e19732c173d3c6177f059a7de7c2516ea5945 +DIST postfix-3.1-20160104.tar.gz 4312368 SHA256 f61125163bd80bb51a02979cd0955502601331e547b3dad02d2b4ff06ce0e01b SHA512 6761125cdd4b7f3760db5a7b2ea5e5381cd77cab369db69d66ef607fbda70912ff4de079b57ef0952d335b6f558f8e004c1ed9f4ca100ea7c4708fabe8e6a498 WHIRLPOOL 797cc89e277fe9f9ac4ccc9729d8e4190aeb8973d3a0137d79dfc38e2a0aeb52830a35437cb1d09fbf5b9e8a3f3a7e7cf411380afe31313f1b6fb88d49826789 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3 diff --git a/mail-mta/postfix/postfix-3.1_pre20151218.ebuild b/mail-mta/postfix/postfix-3.1_pre20160104.ebuild index 9ba2dc5e1d50..0eec0d7f2dbd 100644 --- a/mail-mta/postfix/postfix-3.1_pre20151218.ebuild +++ b/mail-mta/postfix/postfix-3.1_pre20160104.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild index 4814ca82ecf5..42d3ee2739c4 100644 --- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild +++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild @@ -54,6 +54,8 @@ S=${WORKDIR}/${MY_P} src_prepare() { # upstream patch to fix building with both smpeg and mad mp3 support (bug #570804) epatch "${FILESDIR}"/${P}-mp3.patch + sed -i -e 's/configure.in/configure.ac/' Makefile.in || die + mv configure.{in,ac} || die eautoreconf } diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest index 15bc2757c3ce..01230669937f 100644 --- a/media-sound/flacon/Manifest +++ b/media-sound/flacon/Manifest @@ -1,2 +1 @@ -DIST flacon-1.0.0.tar.gz 249473 SHA256 60487a85e828a08afbaf2fe5f7228a94e1f4094606456f73d59ae351f75e1284 SHA512 2336ec0b0bc7cdaa3792f64adb88a7fd62e7b6f4c84b6cc465e6f6546ca5cae21929de87aa3ab4c7b12754d3480cc66f412f25969707765798ecbb8aea78b7db WHIRLPOOL 50c6b2737de9d82616377048a8fee0b0feec97ae337562d53ecaa2476b417d98327c481ea162d8970615becc6b75754e8cf195fd56285b34414df1d85ba37013 DIST flacon-1.2.0.tar.gz 283187 SHA256 2ebc83d733ea6d50f2bd4ad8c20c65368be5eaf351e0195c9b4d47a54957b8f8 SHA512 4cc64467350c941eed16299a562ddc3c6c83d785dddffe6825e3df50a988ce9494517b3ea862d90398110564ec3f828ef6760a6c02d24163f9247930330a3b6d WHIRLPOOL 918926069daaf5e9a16711d641c873a70d1dc97f04b05387f649f1d1d6e1d652f3e676f1100d5fe0d70d03fa9edb1d4e64fc67b489f5c5e74d21108a437f87ea diff --git a/media-sound/flacon/flacon-1.0.0.ebuild b/media-sound/flacon/flacon-1.0.0.ebuild deleted file mode 100644 index b396a74c1bc8..000000000000 --- a/media-sound/flacon/flacon-1.0.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PLOCALES="cs_CZ cs de es_MX es fr gl hu it pl_PL pl pt_BR pt_PT ro_RO ru si_LK uk zh_CN zh_TW" - -EGIT_REPO_URI="https://github.com/flacon/flacon.git" - -inherit cmake-utils l10n fdo-mime gnome2-utils -[[ ${PV} == *9999* ]] && inherit git-r3 - -DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks" -HOMEPAGE="https://flacon.github.io/" -[[ ${PV} == *9999* ]] || \ -SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="amd64 x86" -IUSE="flac mac mp3 mp4 ogg replaygain tta wavpack" - -RDEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-libs/uchardet - media-sound/shntool[mac?] - flac? ( media-libs/flac ) - mac? ( media-sound/mac ) - mp3? ( media-sound/lame ) - mp4? ( media-libs/faac ) - ogg? ( media-sound/vorbis-tools ) - tta? ( media-sound/ttaenc ) - wavpack? ( media-sound/wavpack ) - replaygain? ( - mp3? ( media-sound/mp3gain ) - ogg? ( media-sound/vorbisgain ) - ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - my_rm_loc() { - rm "translations/${PN}_${1}."{ts,desktop} || die - } - - l10n_find_plocales_changes "translations" "${PN}_" '.ts' - l10n_for_each_disabled_locale_do my_rm_loc -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest index 855db6579a70..ac0f66901db4 100644 --- a/media-sound/qtractor/Manifest +++ b/media-sound/qtractor/Manifest @@ -1,3 +1,4 @@ DIST qtractor-0.7.0.tar.gz 1447905 SHA256 5cda28d210e0301dfd1c426b015c0568dab29b8d27f8b5f0a7d0a4ae7eed22e4 SHA512 daa04b477d261ebd6d2af62db7cc708ab03960202332294ac7f62b475cbde5cb94db931674bd693ea4374aff489234ed0cefc5fc191d8ab079685b8039e03399 WHIRLPOOL 11d741a5799c352125f56a7ebcafec49442ffa4103c1be96d9e034ec0025ccbc681d26ea234e835b05d9d252e26d584810fa9dd1f05bd6adf1a866d734f65ec6 DIST qtractor-0.7.1.tar.gz 1438633 SHA256 d0425f7d48f0032fd6ae4fc4b3d8f97d3dd21d08653fb4e26be5c8471da1cd89 SHA512 fa2210426388d0efdf920f591ad776c582867e9a556efaad3a03b575cd1f5702b686d347ad6a3991db07fcd7142b227d4b812095d91e280a01dc3f8dddfc8ede WHIRLPOOL af69a1e4c77a58961b63d431fa09eff8a7a5082dd35b8887f173c462e967b4be0843e203d4ca1cc9df9b869fbe3695e3f2187bc052dcbdc3ba7b39669a1f7bd5 DIST qtractor-0.7.2.tar.gz 1452910 SHA256 829494f4def9b8579b52ba1d791ef47e3bb2cfcbadda87e0779861db806217c7 SHA512 3af60cb88f4ce6105dde4a201d0cbb43e694a7e64ecf0558bfa7cd1fa2315e9d12d148524b13f5883e70e10c8eb6b16a3893305546927d9e28fffe43a0e99a08 WHIRLPOOL 1a1ef9224f23892d9e309d29fee71143b2a26bec219c5c2fabd1a6e8afe5597ee1330b257be7164fa4c4e9c322daab08efcc1a9e78add7d25d607d4bf7550dce +DIST qtractor-0.7.3.tar.gz 1457471 SHA256 872eca726c28e10c264ab75ad6eeb370323adf7ecb7f8bca04137b5f4f12c4ef SHA512 0035633183572e69253fa8f6f80b0030a5f0a1479584e2649d96f97a63125ebd959a3745902c7a3491ac8d1a19cc12df8fa6982077799a39aae4aa072d55f4ad WHIRLPOOL f10e43588cc7a3ecc0ba3ab60ef913139554a68ae62461587759b35b99ecd97e2720d0b24913339c0ec5333f8cf707c2b9af48c0ead90394ef713d6a64fe0610 diff --git a/media-sound/qtractor/qtractor-0.7.3.ebuild b/media-sound/qtractor/qtractor-0.7.3.ebuild new file mode 100644 index 000000000000..d2f69ae51a01 --- /dev/null +++ b/media-sound/qtractor/qtractor-0.7.3.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit qmake-utils flag-o-matic eutils + +DESCRIPTION="Qtractor is an Audio/MIDI multi-track sequencer" +HOMEPAGE="http://qtractor.sourceforge.net/" +SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="debug dssi libsamplerate mad osc +qt5 rubberband vorbis cpu_flags_x86_sse zlib" + +RDEPEND=" + !qt5? ( + >=dev-qt/qtcore-4.2:4 + >=dev-qt/qtgui-4.7:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtx11extras:5 + ) + media-libs/alsa-lib + media-libs/libsndfile + media-sound/jack-audio-connection-kit + media-libs/ladspa-sdk + >=media-libs/lilv-0.16.0 + media-libs/lv2 + media-libs/suil + dssi? ( media-libs/dssi ) + mad? ( media-libs/libmad ) + libsamplerate? ( media-libs/libsamplerate ) + osc? ( media-libs/liblo ) + rubberband? ( media-libs/rubberband ) + vorbis? ( media-libs/libvorbis ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + virtual/pkgconfig + qt5? ( dev-qt/linguist-tools:5 )" + +DOCS="README ChangeLog TODO AUTHORS" + +src_configure() { + econf \ + $(use_enable mad libmad) \ + $(use_enable libsamplerate) \ + $(use_enable vorbis libvorbis) \ + $(use_enable osc liblo) \ + --enable-ladspa \ + $(use_enable dssi) \ + --enable-lilv \ + $(use_enable qt5) \ + $(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \ + $(use_enable rubberband librubberband) \ + $(use_enable cpu_flags_x86_sse sse) \ + $(use_enable zlib libz) \ + $(use_enable debug) + + if use qt5 ; then + eqmake5 ${PN}.pro -o ${PN}.mak + else + eqmake4 ${PN}.pro -o ${PN}.mak + fi +} + +src_install() { + emake DESTDIR="${D}" install + einstalldocs +} diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest index a91f2f029873..abf606a2bf7f 100644 --- a/media-video/dvdstyler/Manifest +++ b/media-video/dvdstyler/Manifest @@ -3,3 +3,4 @@ DIST DVDStyler-2.9.2.tar.bz2 7861116 SHA256 88abd17b0dcdfccbdfffe6e80bcfa59df023 DIST DVDStyler-2.9.3.tar.bz2 7861272 SHA256 ffbc22454e210ba8fcad9a7954b426d9dc5ff933527a6e39391d310101128c39 SHA512 c39a1c08ea5e86e05c25443685524c61c26a5fe11e66240884db6b54c117f1cc446634145bc99673eb7de2ed44e3d03277686470dfde3ab78a5943b2667e7b73 WHIRLPOOL d08202272c5ec9fbaec7b049e854cdb413a929b59ee047a99a4d70699f80a2a0a47786335a9bc05d8d7ca905f9137d4f81bc31fd56a78943c71b169999cc0cd3 DIST DVDStyler-2.9.4.tar.bz2 7863263 SHA256 8b15ec98e3e5ec8c5a1f23eee316f646476e76b86b80d44b7c842887946a39e0 SHA512 8ef8e0241f31957b6c1695876a2067510750b3e997d57c688ceed640110488c2989af12d23147a5b439625cafc5bf7f2d3a8cdda8304b96555f48b6f5553cde4 WHIRLPOOL 07f3a96f83e0d7bbaea4cf01f9c440d63590f632de3ebbb516d7551ced21c9597790149f252f517f627c5d8800e5a1d8737ad15a015eb1f76e7fef4d7dc15dbf DIST DVDStyler-2.9.5.tar.bz2 7864947 SHA256 4717a58fc5980e1007624be7c14ebb8b1ace7839ad38fe7fbfdc0db4e26d3e1b SHA512 fef02eb3a10b46fe6345610aa49e40a8a47e8a4fce35541f23762e75546788ab628ad70a76bf9362bdd5161101ac6be8057222f4bdcc84fb9f1eb49042de1526 WHIRLPOOL 70ffac3ca9ca9c1b38224f66a32d893ab1c92f3129be815d7b4cfec0cebf53098cee3f7169ddc942f58efc1268ea8553a3444df63a69e307df2d4a0851bd1edf +DIST DVDStyler-2.9.6.tar.bz2 8373340 SHA256 d9ac1c2fa8812c194d4a79a5954f96919a4823498a4200018964df549270c6e3 SHA512 7e45a61ecc5df29957c6ff71bf7d5032bc1cba3b43b8444f7cd065aabf3991961f998e220d41c05c3d4e9a3bc213c96bc484b467a40d1b10ab33630ea4cbbcea WHIRLPOOL d7b6f714fcde76c74f5f4dee66918ddfb17066f85147a7efd355fe19d057d3c56bf0f1116595cfa361b09f1d82ebc09ab0fad6f5fc8ab029df01a9abe267b564 diff --git a/media-video/dvdstyler/dvdstyler-2.9.6.ebuild b/media-video/dvdstyler/dvdstyler-2.9.6.ebuild new file mode 100644 index 000000000000..b5f8e7b8b70c --- /dev/null +++ b/media-video/dvdstyler/dvdstyler-2.9.6.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MY_P=${P/dvds/DVDS} +WX_GTK_VER=3.0 + +inherit wxwidgets eutils + +DESCRIPTION="A cross-platform free DVD authoring application" +HOMEPAGE="http://www.dvdstyler.org/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug libav +udev" + +COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1 + media-libs/libexif:= + >=media-libs/wxsvg-1.3:= + >=media-video/dvdauthor-0.7.1 + >=media-video/xine-ui-0.99.7 + virtual/cdrtools + libav? ( >=media-video/libav-9:0=[encode] ) + !libav? ( >=media-video/ffmpeg-2.6:0=[encode] ) + virtual/jpeg:0 + x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X] + sys-apps/dbus + udev? ( >=virtual/libudev-215:= )" +RDEPEND="${COMMON_DEPEND} + >=app-cdr/dvdisaster-0.72.4 + media-video/mjpegtools" +DEPEND="${COMMON_DEPEND} + app-arch/zip + app-text/xmlto + sys-devel/gettext + virtual/yacc + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + need-wxwidgets unicode + # disable obsolete GNOME 2.x libraries wrt #508854 + sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die + # rmdir: failed to remove `tempfoobar': Directory not empty + sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die + # fix underlinking wrt #367863 + sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die + # silence desktop-file-validate QA check + sed -i \ + -e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \ + data/dvdstyler.desktop || die +} + +src_configure() { + econf \ + --docdir=/usr/share/doc/${PF} \ + $(use_enable debug) \ + --with-wx-config=${WX_CONFIG} +} + +src_install() { + default + rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*} +} diff --git a/media-video/ffmpeg/ffmpeg-2.8.4.ebuild b/media-video/ffmpeg/ffmpeg-2.8.4.ebuild index 3cb20b46457f..83454bbf2de6 100644 --- a/media-video/ffmpeg/ffmpeg-2.8.4.ebuild +++ b/media-video/ffmpeg/ffmpeg-2.8.4.ebuild @@ -376,7 +376,7 @@ multilib_src_configure() { done # LTO support, bug #566282 - is-flagq "-flto" && myconf+=( "--enable-lto" ) + is-flagq "-flto*" && myconf+=( "--enable-lto" ) # Mandatory configuration myconf=( diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index ef2f4d1d8b35..f4be704a3490 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -392,7 +392,7 @@ multilib_src_configure() { done # LTO support, bug #566282 - is-flagq "-flto" && myconf+=( "--enable-lto" ) + is-flagq "-flto*" && myconf+=( "--enable-lto" ) # Mandatory configuration myconf=( diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index c0242470c525..dc7ef9dc3c52 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -178,6 +178,7 @@ src_configure() { --disable-optimize # Do not add '-O2' to CFLAGS --disable-debug-build # Do not add '-g' to CFLAGS + $(use_enable doc html-build) $(use_enable doc pdf-build) $(use_enable vf-dlopen vf-dlopen-filters) $(use_enable zsh-completion zsh-comp) @@ -216,7 +217,6 @@ src_configure() { $(use_enable openal) $(use_enable alsa) --disable-coreaudio - --disable-dsound --disable-wasapi # Video outputs diff --git a/net-libs/librsync/librsync-2.0.0.ebuild b/net-libs/librsync/librsync-2.0.0.ebuild index b4735718e2e4..f1e83b86e1d8 100644 --- a/net-libs/librsync/librsync-2.0.0.ebuild +++ b/net-libs/librsync/librsync-2.0.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" RDEPEND="dev-libs/popt" DEPEND="${RDEPEND}" diff --git a/net-misc/rsync/rsync-3.1.2.ebuild b/net-misc/rsync/rsync-3.1.2.ebuild index 8e7dccc8e67a..efd94c2e6588 100644 --- a/net-misc/rsync/rsync-3.1.2.ebuild +++ b/net-misc/rsync/rsync-3.1.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://rsync.samba.org/ftp/rsync/src/${P}.tar.gz" LICENSE="GPL-3" 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 ~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" +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" [[ "${PV}" = *_pre* ]] && KEYWORDS="hppa ppc64" IUSE="acl iconv ipv6 static stunnel xattr" diff --git a/net-nntp/nzbget/files/nzbget.initd b/net-nntp/nzbget/files/nzbget.initd index 736e7a528b65..c533da1034ad 100644 --- a/net-nntp/nzbget/files/nzbget.initd +++ b/net-nntp/nzbget/files/nzbget.initd @@ -3,11 +3,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -extra_started_commands="pause unpause" +extra_started_commands="reload" start() { - ebegin "Starting nzbget" - checkpath -d -m 0755 -o "${NZBGET_USER}:${NZBGET_GROUP}" /run/nzbget + ebegin "Starting ${RC_SVCNAME}" + checkpath -d -m 0755 -o "${NZBGET_USER}":"${NZBGET_GROUP}" /run/nzbget start-stop-daemon --quiet --start --user "${NZBGET_USER}" \ --group "${NZBGET_GROUP}" --exec /usr/bin/nzbget -- \ --configfile "${NZBGET_CONFIGFILE}" --daemon \ @@ -16,19 +16,14 @@ start() { } stop() { - ebegin "Stopping nzbget" - /usr/bin/nzbget --configfile "${NZBGET_CONFIGFILE}" --quit >/dev/null - eend $? -} - -pause() { - ebegin "Pausing nzbget" - /usr/bin/nzbget --configfile "${NZBGET_CONFIGFILE}" --pause >/dev/null - eend $? + ebegin "Stopping ${RC_SVCNAME}" + start-stop-daemon --stop --exec /usr/bin/nzbget -- \ + --configfile "${NZBGET_CONFIGFILE}" --daemon \ + -- ${NZBGET_OPTS} } -unpause() { - ebegin "Unpausing nzbget" - /usr/bin/nzbget --configfile "${NZBGET_CONFIGFILE}" --unpause >/dev/null +reload() { + ebegin "Reloading ${RC_SVCNAME}" + /usr/bin/nzbget --configfile "${NZBGET_CONFIGFILE}" --reload >/dev/null eend $? } diff --git a/net-p2p/i2p/Manifest b/net-p2p/i2p/Manifest index 7d3f2e208803..ffff7c12df2e 100644 --- a/net-p2p/i2p/Manifest +++ b/net-p2p/i2p/Manifest @@ -1,2 +1,3 @@ DIST i2psource_0.9.18.tar.bz2 24147960 SHA256 6f02f38c933662874c485cb52ca800a9e07c36e74a26fdfeece65e25979beb4b SHA512 6cc336f94f8e4331b26d6e42958808f193ad3709ab6098981077c9390749233fb3d20df5c8fea34ec7810bc8846fd2e11ed7a79bf7c1ec68402b1ccacae999d6 WHIRLPOOL 467285b189af69b300c56756992e53979aa049515cb89ce0d5cbff80b9270c4ab1188f419dd0206b2406780b36ddde73861b5e2e69c7b2e7d8ed00b7bcaaa7a7 DIST i2psource_0.9.22.tar.bz2 24338146 SHA256 91ac91f7a3e202d248f5294f4951f6b7d8b9bde32991adf7a813ae1bb9188898 SHA512 0fdcd0369f79cc143c449774cb205d2fb4fa5ad32e0b5bd3ed0dee5b24402cc21b1c5650d535518e68aaa98cee5380bf0af041df8b3e1724698aebf61cfb5583 WHIRLPOOL bd36ce760f7a7b942651de576662b3fadbf19bbdb84a020a16783689f3ae4919bf9441762f2d951ed1c02781e62131370b5cc36cd257c187185862901454e971 +DIST i2psource_0.9.23.tar.bz2 24427211 SHA256 24e303f2af1b7b14ed3a6e17cc7d1b6432ec99d8d00246a88486922941c72345 SHA512 1697ee03c5b09c7653f4e30e976062908e0c0ece7ee9651979384fce0d5c887d7cfbd841522d31203f23d7f5dc97d8f8ef238784199b22fe5452299587038f82 WHIRLPOOL a2141b8d9d5f8b552e354678294364bedde9cef5aa39aa95a06dbe19f5f7996b6d5eb0e1b43ad8ce5c2f9e20dc4dda792b994004a95ea1dc83c5541f46de5b89 diff --git a/net-p2p/i2p/files/i2p-0.9.23_fix-encoding.patch b/net-p2p/i2p/files/i2p-0.9.23_fix-encoding.patch new file mode 100644 index 000000000000..4c542b5ad5bc --- /dev/null +++ b/net-p2p/i2p/files/i2p-0.9.23_fix-encoding.patch @@ -0,0 +1,43 @@ +diff -Naur a/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java b/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java +--- a/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java 2016-01-07 01:40:50.225460721 +0100 ++++ b/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java 2016-01-07 01:41:19.960462373 +0100 +@@ -216,9 +216,9 @@ + * x is recovered in the following way: + * <p><ul> + * <li>x = sign(x) * sqrt((y^2 - 1) / (d * y^2 + 1)) = sign(x) * sqrt(u / v) with u = y^2 - 1 and v = d * y^2 + 1. +- * <li>Setting β = (u * v^3) * (u * v^7)^((q - 5) / 8) one has β^2 = +-(u / v). +- * <li>If v * β = -u multiply β with i=sqrt(-1). +- * <li>Set x := β. ++ * <li>Setting b = (u * v^3) * (u * v^7)^((q - 5) / 8) one has b^2 = +-(u / v). ++ * <li>If v * b = -u multiply b with i=sqrt(-1). ++ * <li>Set x := b. + * <li>If sign(x) != bit 255 of s then negate x. + * + * @param curve The curve. +@@ -511,10 +511,10 @@ + * Formula for the P^2 representation is in agreement with the formula given in [4] page 12 (with a = -1) + * up to a common factor -1 which does not matter: + * <p> +- * B = (X + Y)^2; C = X^2; D = Y^2; E = -C = -X^2; F := E + D = Y^2 - X^2; H = Z^2; J = F − 2 * H; +- * X3 = (B − C − D) · J = X' * (-T'); +- * Y3 = F · (E − D) = Z' * (-Y'); +- * Z3 = F · J = Z' * (-T'). ++ * B = (X + Y)^2; C = X^2; D = Y^2; E = -C = -X^2; F := E + D = Y^2 - X^2; H = Z^2; J = F - 2 * H; ++ * X3 = (B - C - D) . J = X' * (-T'); ++ * Y3 = F . (E - D) = Z' * (-Y'); ++ * Z3 = F . J = Z' * (-T'). + * + * @return The P1P1 representation + */ +diff -Naur a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java +--- a/core/java/src/net/i2p/data/DataHelper.java 2016-01-07 01:40:50.214460721 +0100 ++++ b/core/java/src/net/i2p/data/DataHelper.java 2016-01-07 01:41:02.491461403 +0100 +@@ -1577,7 +1577,7 @@ + } else if (adms < 0.001d) { + t = ngettext("1 ns", "{0,number,###} ns", (int) Math.round(ms * 1000000d)); + } else if (adms < 1.0d) { +- t = ngettext("1 μs", "{0,number,###} μs", (int) Math.round(ms * 1000d)); ++ t = ngettext("1 us", "{0,number,###} us", (int) Math.round(ms * 1000d)); + } else if (ams < 3 * 1000) { + t = ngettext("1 ms", "{0,number,####} ms", (int) Math.round(ms)); + } else if (ams < 2 * 60 * 1000) { diff --git a/net-p2p/i2p/files/i2p-0.9.23_fix-paths.patch b/net-p2p/i2p/files/i2p-0.9.23_fix-paths.patch new file mode 100644 index 000000000000..c30e20875026 --- /dev/null +++ b/net-p2p/i2p/files/i2p-0.9.23_fix-paths.patch @@ -0,0 +1,102 @@ +diff -Naur a/clients.config b/clients.config +--- a/clients.config 2016-01-07 00:44:46.721273819 +0100 ++++ b/clients.config 2016-01-07 00:44:52.185274122 +0100 +@@ -60,7 +60,7 @@ + clientApp.4.name=Open Router Console in web browser at startup + clientApp.4.args=http://127.0.0.1:7657/ + clientApp.4.delay=3 +-clientApp.4.startOnLoad=true ++clientApp.4.startOnLoad=false + + # BOB bridge + clientApp.5.args= +diff -Naur a/eepget b/eepget +--- a/eepget 2016-01-07 00:44:46.721273819 +0100 ++++ b/eepget 2016-01-07 00:44:52.186274123 +0100 +@@ -1,3 +1,3 @@ + #!/bin/sh +-I2P="%INSTALL_PATH" ++I2P="/usr/share/i2p" + java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@" +diff -Naur a/i2prouter b/i2prouter +--- a/i2prouter 2016-01-07 00:44:46.721273819 +0100 ++++ b/i2prouter 2016-01-07 00:44:52.188274123 +0100 +@@ -28,20 +28,22 @@ + # Note that (percent)INSTALL_PATH, (percent)USER_HOME, and (percent)SYSTEM_java_io_tmpdir + # should have been replaced by the izpack installer. + # If you did not run the installer, replace them with the appropriate paths. +-I2P="%INSTALL_PATH" ++USER_HOME="$HOME" ++SYSTEM_java_io_tmpdir="$USER_HOME/.i2p" ++I2P="/usr/share/i2p" + if [ "`uname -s`" = "Darwin" ]; then +- if [ -d "%USER_HOME/Library/Application Support" ]; then +- I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p" ++ if [ -d "$USER_HOME/Library/Application Support" ]; then ++ I2P_CONFIG_DIR="$USER_HOME/Library/Application Support/i2p" + else +- I2P_CONFIG_DIR="%USER_HOME/.i2p" ++ I2P_CONFIG_DIR="$USER_HOME/.i2p" + fi + else +- I2P_CONFIG_DIR="%USER_HOME/.i2p" ++ I2P_CONFIG_DIR="$USER_HOME/.i2p" + fi +-I2PTEMP="%SYSTEM_java_io_tmpdir" ++I2PTEMP="$SYSTEM_java_io_tmpdir" + # PORTABLE installation: + # Use the following instead. +-#I2PTEMP="%INSTALL_PATH" ++#I2PTEMP="/usr/share/i2p" + + # Application + APP_NAME="i2p" +diff -Naur a/runplain.sh b/runplain.sh +--- a/runplain.sh 2016-01-07 00:44:46.721273819 +0100 ++++ b/runplain.sh 2016-01-07 00:44:52.189274123 +0100 +@@ -11,8 +11,8 @@ + # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir + # should have been replaced by the izpack installer. + # If you did not run the installer, replace them with the appropriate path. +-I2P="%INSTALL_PATH" +-I2PTEMP="%SYSTEM_java_io_tmpdir" ++I2P="/usr/share/i2p" ++I2PTEMP="$SYSTEM_java_io_tmpdir" + + # Having IPv6 enabled can cause problems with certain configurations. Changing the + # next value to true may help. +diff -Naur a/wrapper.config b/wrapper.config +--- a/wrapper.config 2016-01-07 00:44:46.714273818 +0100 ++++ b/wrapper.config 2016-01-07 00:46:24.151279233 +0100 +@@ -60,13 +60,19 @@ + # classes, or all the classes of i2p.jar, are in a different directory). + # Be sure there are no other duplicate classes. + # +-wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar ++wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar ++wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar ++wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar ++wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar ++wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar ++wrapper.java.classpath.6=/usr/share/jrobin/lib/*.jar + # uncomment this to use the system classpath as well (e.g. to get tools.jar) + # wrapper.java.classpath.2=%CLASSPATH% + + # Java Library Path (location of Wrapper.DLL or libwrapper.so) +-wrapper.java.library.path.1=$INSTALL_PATH +-wrapper.java.library.path.2=$INSTALL_PATH/lib ++wrapper.java.library.path.1=/usr/share/i2p ++wrapper.java.library.path.2=/usr/share/i2p/lib ++wrapper.java.library.path.3=/usr/lib/java-service-wrapper + + # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. + wrapper.java.additional.auto_bits=TRUE +@@ -74,7 +80,7 @@ + # Java Additional Parameters + # Numbers must be consecutive (except for stripquotes) + wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt +-wrapper.java.additional.2=-Di2p.dir.base="$INSTALL_PATH" ++wrapper.java.additional.2=-Di2p.dir.base="/usr/share/i2p" + wrapper.java.additional.2.stripquotes=TRUE + + # Prevent the JVM from exporting stats (and thereby causing hundreds of diff --git a/net-p2p/i2p/files/i2p-0.9.23_initd b/net-p2p/i2p/files/i2p-0.9.23_initd new file mode 100644 index 000000000000..ca39586113ed --- /dev/null +++ b/net-p2p/i2p/files/i2p-0.9.23_initd @@ -0,0 +1,36 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + need net +} + +HOME="/var/lib/i2p" +USER_HOME="$HOME" +JAVABINARY="/etc/java-config-2/current-system-vm/bin/java" +INSTALL_PATH="/usr/share/i2p" +I2P="$INSTALL_PATH" +I2P_CONFIG_DIR="$USER_HOME/.i2p" +SYSTEM_java_io_tmpdir="$I2P_CONFIG_DIR" +I2PTEMP="$SYSTEM_java_io_tmpdir" +LOGFILE="$I2P_CONFIG_DIR/wrapper.log" +PIDFILE="/var/run/i2p.pid" +WRAPPER_CMD="$I2P/i2psvc" +WRAPPER_CONF="$I2P/wrapper.config" + +start() { + ebegin "Starting I2P" + start-stop-daemon --start -b -m -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -- -c $WRAPPER_CONF wrapper.daemonize=FALSE wrapper.syslog.ident=i2p wrapper.java.command="$JAVABINARY" wrapper.name=i2p wrapper.displayname="I2P Service" wrapper.statusfile="$I2P_CONFIG_DIR/i2p.status" wrapper.java.statusfile="$I2P_CONFIG_DIR/i2p.java.status" wrapper.logfile="$LOGFILE" + sleep 1 + [ -e "$PIDFILE" -a -e /proc/$(cat "$PIDFILE") ] + eend $? +} + +stop() { + ebegin "Stopping I2P" + start-stop-daemon --stop -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -R SIGTERM/20 SIGKILL/20 -P + eend $? +} + diff --git a/net-p2p/i2p/i2p-0.9.23.ebuild b/net-p2p/i2p/i2p-0.9.23.ebuild new file mode 100644 index 000000000000..bfe7595503bd --- /dev/null +++ b/net-p2p/i2p/i2p-0.9.23.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils java-pkg-2 java-ant-2 systemd user + +DESCRIPTION="A privacy-centric, anonymous network." +HOMEPAGE="https://geti2p.net" +SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2" + +LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2" +SLOT="0" + +# Until the deps reach other arches +KEYWORDS="~amd64 ~x86" +IUSE="nls" + +# dev-java/ant-core is automatically added due to java-ant-2.eclass +CDEPEND="dev-java/jrobin:0 + dev-java/bcprov:1.50 + dev-java/slf4j-api:0 + dev-java/tomcat-jstl-impl:0 + dev-java/tomcat-jstl-spec:0 + dev-java/java-service-wrapper:0" + +DEPEND="${CDEPEND} + dev-java/eclipse-ecj:* + dev-libs/gmp:* + nls? ( sys-devel/gettext ) + >=virtual/jdk-1.6" + +RDEPEND="${CDEPEND} + >=virtual/jre-1.6" + +EANT_BUILD_TARGET="pkg" +EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50" + +pkg_setup() { + java-pkg-2_pkg_setup + + enewgroup i2p + enewuser i2p -1 -1 /var/lib/i2p i2p -m +} + +src_unpack() { + unpack ${A} + cd "${S}" || die + java-ant_rewrite-classpath +} + +src_prepare() { + java-pkg-2_src_prepare + + # We're on GNU/Linux, we don't need .exe files + echo "noExe=true" > override.properties + if ! use nls; then + echo "require.gettext=false" >> override.properties + fi + + #epatch "${FILESDIR}/${P}_fix-encoding.patch" +} + +src_install() { + # Cd into pkg-temp. + cd "${S}/pkg-temp" || die + + # Apply patch. + epatch "${FILESDIR}/${P}_fix-paths.patch" + + # Using ${D} here results in an error. Docs say use $ROOT + i2p_home="${ROOT}/usr/share/i2p" + + # This is ugly, but to satisfy all non-system .jar dependencies, jetty and + # systray4j would need to be packaged. The former would be too large a task + # for an unseasoned developer and systray4j hasn't been touched in over 10 + # years. This seems to be the most pragmatic solution + java-pkg_jarinto "${i2p_home}/lib" + for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \ + jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \ + sam standard streaming systray systray4j; do + java-pkg_dojar lib/${i}.jar + done + + # Set up symlinks for binaries + dosym /usr/bin/wrapper ${i2p_home}/i2psvc + dosym ${i2p_home}/i2prouter /usr/bin/i2prouter + dosym ${i2p_home}/eepget /usr/bin/eepget + + # Install main files and basic documentation + exeinto ${i2p_home} + insinto ${i2p_home} + doins blocklist.txt hosts.txt *.config + doexe eepget i2prouter runplain.sh + dodoc history.txt INSTALL-headless.txt LICENSE.txt + doman man/* + + # Install other directories + doins -r certificates docs eepsite geoip scripts + dodoc -r licenses + java-pkg_dowar webapps/*.war + + # Install daemon files + newinitd "${FILESDIR}/${P}_initd" i2p + systemd_newunit "${FILESDIR}"/i2p.service i2p.service + + # setup user + dodir /var/lib/i2p/.i2p + fowners -R i2p:i2p /var/lib/i2p/.i2p +} + +pkg_postinst() { + elog "Custom configuration belongs in /var/lib/i2p/.i2p/ to avoid being overwritten." + elog "I2P can be configured through the web interface at http://localhost:7657/index.jsp" + + ewarn 'Currently, the i2p team do not enforce to use ECDSA keys. But it is more and' + ewarn 'more pushed. To help the network, you are recommended to have either:' + ewarn ' dev-java/icedtea[-sunec,nss]' + ewarn ' dev-java/oracle-jre-bin' + ewarn ' dev-java/oracle-jdk-bin' +} diff --git a/net-p2p/i2p/metadata.xml b/net-p2p/i2p/metadata.xml index 16fc6e2d1135..15efd3e70669 100644 --- a/net-p2p/i2p/metadata.xml +++ b/net-p2p/i2p/metadata.xml @@ -4,7 +4,7 @@ <herd>java</herd> <herd>proxy-maintainers</herd> <maintainer> - <email>sam@cmpct.info</email> + <email>tharvik@gmail.com</email> <description>Proxy-maintainer; add or CC them for bugs</description> </maintainer> <longdescription>I2P is an anonymous network, exposing a simple layer that applications can use to anonymously and securely send messages to each other.</longdescription> diff --git a/profiles/features/prefix/make.defaults b/profiles/features/prefix/make.defaults index 7357c5be4462..4884f1fb6eb5 100644 --- a/profiles/features/prefix/make.defaults +++ b/profiles/features/prefix/make.defaults @@ -18,6 +18,3 @@ FEATURES="${FEATURES} -sandbox" # this probably already is like this, but we assure that in prefix we # have a GNU userland USERLAND="GNU" - -# Python 3.4 isn't in prefix yet. -USE="python_targets_python3_3 -python_targets_python3_4" diff --git a/profiles/package.mask b/profiles/package.mask index 449e9c53c8d0..7ee454bd720f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -175,11 +175,6 @@ sys-cluster/pacemaker-gui media-video/hwdecode-demos # Pacho Ramos <pacho@gentoo.org> (06 Jan 2016) -# Unmaintained, upstream dead, doesn't work, bug #548920. Removal in a -# month. -app-admin/checkrestart - -# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016) # Fails to build, nothing in the tree needs this, bug #549686. Removal in a # month. app-i18n/xsim @@ -693,11 +688,6 @@ dev-java/jscience # Masked until we deal with SSLv3, bug #567554 =dev-libs/libressl-2.3* -# Ian Delaney <idella4@gentoo.org> (06 Dec 2015) -# Masked due to support of the hypervisor dropped in arch x86 -# rdep packages use.masked for xen under arch -<=app-emulation/xen-4.2.5-r12 - # Robin H. Johnson <robbat2@gentoo.org> (04 Dec 2015) # Much early testing needed >=sys-cluster/ceph-9 diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask index 06feb292f1ce..d797f439cf26 100644 --- a/profiles/prefix/package.mask +++ b/profiles/prefix/package.mask @@ -10,6 +10,15 @@ # +# Fabian Groffen <grobian@gentoo.org> (06 Jan 2016) +# Seriously broken on non-Linux because recursive shebangs aren't +# supported, mask everything but what's stable on amd64, bug #568974 +>=app-eselect/eselect-python-20151117-r2 +>=dev-lang/python-exec-2.0.2 +>=dev-lang/python-2.7.11:2.7 +>=dev-lang/python-3.4.3:3.4 +>=dev-lang/python-3.5.1:3.5 + # Fabian Groffen <grobian@gentoo.org> (11 Feb 2014) # Fails to compile, bug #493464 =sys-devel/autogen-5.18.1 diff --git a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild index 0fc4c83bea1f..0b2c98365ec2 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -25,12 +25,16 @@ RDEPEND=" sci-libs/scikits[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}]" + dev-python/matplotlib[${PYTHON_USEDEP}] + virtual/blas + virtual/cblas" DEPEND=" dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}] + virtual/blas + virtual/cblas doc? ( dev-python/sphinx[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] ) @@ -69,15 +73,15 @@ python_compile() { python_compile_all() { if use doc; then - cd "${S}/doc" + cd "${S}/doc" || die local d="${BUILD_DIR}"/lib ln -s "${S}"/sklearn/datasets/{data,descr,images} \ - "${d}"/sklearn/datasets + "${d}"/sklearn/datasets || die VARTEXFONTS="${T}"/fonts \ MPLCONFIGDIR="${BUILD_DIR}" \ PYTHONPATH="${d}" \ emake html - rm -r "${d}"/sklearn/datasets/{data,desr,images} + rm -r "${d}"/sklearn/datasets/{data,desr,images} || die fi } diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild index 76b1f1a2a839..c50ed8aa6c91 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -26,12 +26,16 @@ RDEPEND=" dev-python/nose[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] sci-libs/scikits[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}]" + sci-libs/scipy[${PYTHON_USEDEP}] + virtual/blas + virtual/cblas" DEPEND=" dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}] + virtual/blas + virtual/cblas doc? ( dev-python/joblib[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] @@ -69,15 +73,15 @@ python_compile() { python_compile_all() { if use doc; then - cd "${S}/doc" + cd "${S}/doc" || die local d="${BUILD_DIR}"/lib ln -s "${S}"/sklearn/datasets/{data,descr,images} \ - "${d}"/sklearn/datasets + "${d}"/sklearn/datasets || die VARTEXFONTS="${T}"/fonts \ MPLCONFIGDIR="${BUILD_DIR}" \ PYTHONPATH="${d}" \ emake html - rm -r "${d}"/sklearn/datasets/{data,desr,images} + rm -r "${d}"/sklearn/datasets/{data,desr,images} || die fi } diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild index 76b1f1a2a839..c50ed8aa6c91 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -26,12 +26,16 @@ RDEPEND=" dev-python/nose[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] sci-libs/scikits[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}]" + sci-libs/scipy[${PYTHON_USEDEP}] + virtual/blas + virtual/cblas" DEPEND=" dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}] + virtual/blas + virtual/cblas doc? ( dev-python/joblib[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] @@ -69,15 +73,15 @@ python_compile() { python_compile_all() { if use doc; then - cd "${S}/doc" + cd "${S}/doc" || die local d="${BUILD_DIR}"/lib ln -s "${S}"/sklearn/datasets/{data,descr,images} \ - "${d}"/sklearn/datasets + "${d}"/sklearn/datasets || die VARTEXFONTS="${T}"/fonts \ MPLCONFIGDIR="${BUILD_DIR}" \ PYTHONPATH="${d}" \ emake html - rm -r "${d}"/sklearn/datasets/{data,desr,images} + rm -r "${d}"/sklearn/datasets/{data,desr,images} || die fi } diff --git a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild index f4fd867256c0..46432a12aa6e 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -26,12 +26,15 @@ RDEPEND=" dev-python/nose[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] sci-libs/scikits[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}]" + sci-libs/scipy[${PYTHON_USEDEP}] + virtual/blas + virtual/cblas" DEPEND=" dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}] + virtual/cblas doc? ( dev-python/joblib[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] @@ -69,7 +72,7 @@ python_compile() { python_compile_all() { if use doc; then - cd "${S}/doc" + cd "${S}/doc" || die local d="${BUILD_DIR}"/lib ln -s "${S}"/sklearn/datasets/{data,descr,images} \ "${d}"/sklearn/datasets @@ -77,7 +80,7 @@ python_compile_all() { MPLCONFIGDIR="${BUILD_DIR}" \ PYTHONPATH="${d}" \ emake html - rm -r "${d}"/sklearn/datasets/{data,desr,images} + rm -r "${d}"/sklearn/datasets/{data,desr,images} || die fi } diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild index 987724461b1c..b7c3bcdde597 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -27,6 +27,8 @@ RDEPEND=" >=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}] sci-libs/scikits[${PYTHON_USEDEP}] >=sci-libs/scipy-0.9[${PYTHON_USEDEP}] + virtual/blas + virtual/cblas virtual/python-funcsigs[${PYTHON_USEDEP}] " DEPEND=" @@ -34,6 +36,8 @@ DEPEND=" dev-python/numpy[lapack,${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}] + virtual/blas + virtual/cblas doc? ( dev-python/joblib[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] @@ -77,15 +81,15 @@ python_compile() { python_compile_all() { if use doc; then - cd "${S}/doc" + cd "${S}/doc" || die local d="${BUILD_DIR}"/lib ln -s "${S}"/sklearn/datasets/{data,descr,images} \ - "${d}"/sklearn/datasets + "${d}"/sklearn/datasets || die VARTEXFONTS="${T}"/fonts \ MPLCONFIGDIR="${BUILD_DIR}" \ PYTHONPATH="${d}" \ emake html - rm -r "${d}"/sklearn/datasets/{data,desr,images} + rm -r "${d}"/sklearn/datasets/{data,desr,images} || die fi } diff --git a/sys-auth/yubikey-personalization-gui/Manifest b/sys-auth/yubikey-personalization-gui/Manifest index c6726f8b070d..cab51d697365 100644 --- a/sys-auth/yubikey-personalization-gui/Manifest +++ b/sys-auth/yubikey-personalization-gui/Manifest @@ -1,4 +1,2 @@ -DIST yubikey-personalization-gui-3.1.18.tar.gz 1450161 SHA256 83e375bff4844ebebf473dfa9f62526689cb5160f7a8dca56896c8f47e3cb1cb SHA512 039b27f6b475d63fb0bc5de8dfaa1f8b86652a483c2a2930d74fc7ae1105232146283071fe1e6b0225e85397fcae46a7724e7f0e5c8f20685c6b18d0dced95c8 WHIRLPOOL 83176c32fc6d252d675124a7b0a16e7be49bea758bae4dc512b2f7e14ad27bc59bdec521882863c0b77ccd6c19c36a5cce24fa9b07ffa7ad636d120fee9539b5 -DIST yubikey-personalization-gui-3.1.20.tar.gz 1458155 SHA256 70e31105900b571792de8ccd41ac4b080a10ecd8c7268c44b4676752d350f994 SHA512 d8b9165ade8f9a8be24d3aabd1b5096c01842e719bf7b70d46a54fd809d2fcbbf515ef95759f00601cf9fa6dcc01aa0e0de802da643c306eacdf7c1a1a576081 WHIRLPOOL 0c9589424a2fa51558d90bf7ee5410746683f57949836fd7c16f89f164c8eb4c60dc9386b5403f78187254d838e5eecaca8188b560a391e7da449e49e8377dfe -DIST yubikey-personalization-gui-3.1.21.tar.gz 1876316 SHA256 155cdf25088ffd5f6fdca4fa7433b23a9c30bfd778b5cffb70654839a071b5ac SHA512 4fa48fbc306c0488941a5151f91f2b00f05a5e917d664197e92d9d50f6ffc01874f85f7a37ff1fdad0f322c279ebf44deaebd75fb4671653ad7ec4cc9735571a WHIRLPOOL 2ff0619e54a4198cc916cfe24969f1a83572adebfe8ec3c0638fd3cddd898a9011a9eb32d1ea51ad2e4cceb3c59b1a32fc42d37ccd1a9c552d482e4a766c2f64 DIST yubikey-personalization-gui-3.1.23.tar.gz 1450340 SHA256 80747cca7c77c384f175b92ea360955c034dcff8f7552dae080ad2b70ff81897 SHA512 912bcbcac5cad285c43995f646de6aa68cc99a4d047b7632786cd93e38c031e2fb8dcc4f57f45647ba3e276de03aaea6ed9757f72ec2c42a43780c19edcca51b WHIRLPOOL fdc625fa4fd2a34a79c45209e274a1ddaf2934e3bf4301a790b8c1b22f4d8032f62362a31ed188025f8676d2b4f5c92270b8c0007045664af1c4d02b948ad696 +DIST yubikey-personalization-gui-3.1.24.tar.gz 947135 SHA256 98295f7ed7bda72e6f8f96351d69d41d55c09d9515f80b5efc7c722dd566482a SHA512 149237a719277a6571916473d31e6099c3f3a2003fcb2893c2becee80788102496dbbc8e424f75fe1f1dd3ac87122bd35b6908cf784458635069d89e7e706cfa WHIRLPOOL fa7610d74f2ee6a22ae622b93b11c300f327339cb47ab3c4624a1b8ac274f068a021102b29c7b3b131b8d03ff49a9630357bda8844f66d5cb636cabda55844c7 diff --git a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.18.ebuild b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.18.ebuild deleted file mode 100644 index 7f886d6d73ed..000000000000 --- a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.18.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils qt4-r2 - -DESCRIPTION="GUI for personalization of Yubico's YubiKey" -SRC_URI="http://yubico.github.io/yubikey-personalization-gui/releases/${P}.tar.gz" -HOMEPAGE="https://github.com/Yubico/yubikey-personalization-gui" - -KEYWORDS="~amd64" -SLOT="0" -LICENSE="BSD-2" -IUSE="debug" - -RDEPEND=" - >=sys-auth/ykpers-1.14.0 - >=sys-auth/libyubikey-1.6 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qttest:4 - dev-libs/glib:2 - virtual/libusb:1" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( NEWS README ) - -src_configure() { - eqmake4 YKPersonalization.pro -} - -src_install() { - dobin build/release/yubikey-personalization-gui - doman resources/lin/yubikey-personalization-gui.1 - domenu resources/lin/yubikey-personalization-gui.desktop - doicon resources/lin/yubikey-personalization-gui.xpm - doicon -s 128 resources/lin/yubikey-personalization-gui.png -} diff --git a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.20.ebuild b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.20.ebuild deleted file mode 100644 index eb899abb4023..000000000000 --- a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.20.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils qmake-utils - -DESCRIPTION="GUI for personalization of Yubico's YubiKey" -SRC_URI="http://yubico.github.io/yubikey-personalization-gui/releases/${P}.tar.gz" -HOMEPAGE="https://github.com/Yubico/yubikey-personalization-gui" - -KEYWORDS="~amd64" -SLOT="0" -LICENSE="BSD-2" -IUSE="debug" - -RDEPEND=" - >=sys-auth/ykpers-1.14.0 - >=sys-auth/libyubikey-1.6 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qttest:4 - dev-libs/glib:2 - virtual/libusb:1" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( NEWS README ) - -src_configure() { - eqmake4 YKPersonalization.pro -} - -src_install() { - dobin build/release/yubikey-personalization-gui - doman resources/lin/yubikey-personalization-gui.1 - domenu resources/lin/yubikey-personalization-gui.desktop - doicon resources/lin/yubikey-personalization-gui.xpm - doicon -s 128 resources/lin/yubikey-personalization-gui.png -} diff --git a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.21.ebuild b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.24.ebuild index eb899abb4023..17a35d652329 100644 --- a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.21.ebuild +++ b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.24.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild deleted file mode 100644 index 9ae1133b00c4..000000000000 --- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -FORTRAN_NEEDED=fortran - -inherit eutils fortran-2 java-utils-2 toolchain-funcs - -MY_P=${P/_/} -DESCRIPTION="MPI development tools" -HOMEPAGE="http://www-unix.mcs.anl.gov/perfvis/download/index.htm" -SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz" - -LICENSE="mpich2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="minimal fortran threads debug" - -COMMON_DEPEND="!minimal? ( x11-libs/libXtst - x11-libs/libXi ) - || ( sys-cluster/openmpi[fortran?,threads?] - sys-cluster/mpich2[fortran?,threads?] )" - -DEPEND="!minimal? ( >=virtual/jdk-1.4 ) - ${COMMON_DEPEND}" - -RDEPEND=" -!minimal? ( >=virtual/jre-1.4 ) - ${COMMON_DEPEND}" - -S="${WORKDIR}"/${MY_P} -MPE_IMP="" - -# README: -# This ebuild is created to handle building with both mpich2 and openmpi. -# However, without empi (in the science overlay), and some further -# conversion to use mpi.eclass, we can only handle one implementation -# at a time. I still believe it's better to have the ebuild setup -# correctly in preperation. - -pkg_setup() { - fortran-2_pkg_setup - local i - - if has_version sys-cluster/openmpi; then - MPE_IMP=openmpi - elif has_version sys-cluster/mpich2; then - MPE_IMP=mpich2 - else - die "Unknown MPI implementation" - fi - - export JFLAGS="${JFLAGS} $(java-pkg_javac-args)" - - if [[ "${MPE_IMP}" == openmpi ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then - echo - elog "Currently src_test fails on collchk with openmpi, hence" - elog "testing is disabled by default. If you would like to" - elog "force testing, please add MPE_FORCE_OPENMPI_TEST=1" - elog "to your environment." - echo - fi - - einfo "Building with support for: sys-cluster/${MPE_IMP}" -} - -src_prepare() { - # Don't assume path contains ./ - sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in - epatch "${FILESDIR}"/slog2sdk-trace_rlog-makefile-fixes.patch - epatch "${FILESDIR}"/slog2sdk-trace_sample-makefile-fixes.patch -} - -src_configure() { - local c="--with-mpicc=/usr/bin/mpicc" - - if use fortran; then - c="${c} --with-mpif77=/usr/bin/mpif77" - else - c="${c} --disable-f77" - fi - - if use minimal; then - c="${c} --enable-slog2=no --disable-rlog --disable-sample" - else - c="${c} --with-java2=$(java-config --jdk-home) --enable-slog2=build" - fi - - if [[ "${MPE_IMP}" == openmpi ]]; then - c="${c} --disable-rlog --disable-sample" - fi - - econf ${c} \ - --sysconfdir=/etc/${PN} \ - --datadir=/usr/share/${PN} \ - --with-htmldir=/usr/share/${PN} \ - --with-docdir=/usr/share/${PN} \ - --enable-collchk \ - --enable-wrappers \ - $(use_enable !minimal graphics) \ - $(use_enable threads threadlogging) \ - $(use_enable debug g) -} - -src_test() { - local rc - - cd "${S}" - if [[ "${MPE_IMP}" == mpich2 ]]; then - echo "MPD_SECRETWORD=junk" > "${T}"/mpd.conf - chmod 600 "${T}"/mpd.conf - export MPD_CONF_FILE="${T}/mpd.conf" - "${ROOT}"usr/bin/mpd -d --pidfile="${T}"/mpd.pid - elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then - elog - elog "Skipping tests for openmpi" - elog - return 0 - fi - - # No parallel make: - # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 - emake -j1 \ - CC="${S}"/bin/mpecc \ - FC="${S}"/bin/mpefc \ - MPERUN="${ROOT}/usr/bin/mpiexec -n 4" \ - CLOG2TOSLOG2="${S}/src/slog2sdk/bin/clog2TOslog2" \ - check; - rc=${?} - if [[ "${MPE_IMP}" == mpich2 ]]; then - "${ROOT}"usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid) - fi - - return ${rc} -} - -src_install() { - # No parallel make: - # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 - emake -j1 DESTDIR="${D}" install || die - rm -f "${D}"/usr/sbin/mpeuninstall || die -} diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild index 32ee5fe29c31..a0043d8dec5d 100644 --- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild +++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -154,4 +154,5 @@ src_install() { MAKEOPTS+=" -j1" default rm -f "${ED}"/usr/sbin/mpeuninstall || die + rm -f "${ED}"/usr/bin/*.in || die } diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild deleted file mode 100644 index 76d6bf0033c8..000000000000 --- a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -FORTRAN_NEEDED=fortran - -inherit eutils fortran-2 java-utils-2 toolchain-funcs - -MY_P=${P/_/} -DESCRIPTION="MPI development tools" -HOMEPAGE="http://www-unix.mcs.anl.gov/perfvis/download/index.htm" -SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz" - -LICENSE="mpich2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="minimal fortran threads debug" - -COMMON_DEPEND="!minimal? ( x11-libs/libXtst - x11-libs/libXi ) - || ( sys-cluster/openmpi[fortran?,threads?] - sys-cluster/mpich2[fortran?,threads?] )" - -DEPEND="!minimal? ( >=virtual/jdk-1.4 ) - ${COMMON_DEPEND}" - -RDEPEND=" -!minimal? ( >=virtual/jre-1.4 ) - ${COMMON_DEPEND}" - -S="${WORKDIR}"/${MY_P} -MPE_IMP="" - -# README: -# This ebuild is created to handle building with both mpich2 and openmpi. -# However, without empi (in the science overlay), and some further -# conversion to use mpi.eclass, we can only handle one implementation -# at a time. I still believe it's better to have the ebuild setup -# correctly in preperation. - -pkg_setup() { - fortran-2_pkg_setup - local i - - if has_version sys-cluster/openmpi; then - MPE_IMP=openmpi - elif has_version sys-cluster/mpich2; then - MPE_IMP=mpich2 - else - die "Unknown MPI implementation" - fi - - export JFLAGS="${JFLAGS} $(java-pkg_javac-args)" - - if [[ "${MPE_IMP}" == openmpi ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then - echo "" - elog "Currently src_test fails on collchk with openmpi, hence" - elog "testing is disabled by default. If you would like to" - elog "force testing, please add MPE_FORCE_OPENMPI_TEST=1" - elog "to your environment." - echo "" - fi - - einfo "Building with support for: sys-cluster/${MPE_IMP}" -} - -src_prepare() { - # Don't assume path contains ./ - sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in -} - -src_configure() { - local c="--with-mpicc=/usr/bin/mpicc" - - if use fortran; then - c="${c} --with-mpif77=/usr/bin/mpif77" - else - c="${c} --disable-f77" - fi - - if use minimal; then - c="${c} --enable-slog2=no --disable-rlog --disable-sample" - else - c="${c} --with-java2=$(java-config --jdk-home) --enable-slog2=build" - fi - - if [[ "${MPE_IMP}" == openmpi ]]; then - c="${c} --disable-rlog --disable-sample" - fi - - econf ${c} \ - --sysconfdir=/etc/${PN} \ - --datadir=/usr/share/${PN} \ - --with-htmldir=/usr/share/${PN} \ - --with-docdir=/usr/share/${PN} \ - --enable-collchk \ - --enable-wrappers \ - $(use_enable !minimal graphics) \ - $(use_enable threads threadlogging) \ - $(use_enable debug g) -} - -src_test() { - local rc - - cd "${S}" - if [[ "${MPE_IMP}" == mpich2 ]]; then - echo "MPD_SECRETWORD=junk" > "${T}"/mpd.conf - chmod 600 "${T}"/mpd.conf - export MPD_CONF_FILE="${T}/mpd.conf" - "${ROOT}"usr/bin/mpd -d --pidfile="${T}"/mpd.pid - elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then - echo - elog "Skipping tests for openmpi" - echo - return 0 - fi - - # No parallel make: - # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 - emake -j1 \ - CC="${S}"/bin/mpecc \ - FC="${S}"/bin/mpefc \ - MPERUN="${ROOT}/usr/bin/mpiexec -n 4" \ - CLOG2TOSLOG2="${S}/src/slog2sdk/bin/clog2TOslog2" \ - check; - rc=${?} - if [[ "${MPE_IMP}" == mpich2 ]]; then - "${ROOT}"usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid) - fi - - return ${rc} -} - -src_install() { - # No parallel make: - # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 - emake -j1 DESTDIR="${D}" install || die - rm -f "${D}"/usr/sbin/mpeuninstall || die -} diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest index d516fdd65572..8e17035cdbf8 100644 --- a/www-apps/wordpress/Manifest +++ b/www-apps/wordpress/Manifest @@ -1,4 +1 @@ -DIST wordpress-4.2.4.tar.gz 6313249 SHA256 42ca594afc709cbef8528a6096f5a1efe96dcf3164e7ce321e87d57ae015cc82 SHA512 f0f3030d12ac19b0e2ffc5692e02f3e9137b31a0b47fa64a02265ca535f37a12afe816ed728623cab4537e22f8d5e7637f0cb059d3cf875620abd6e797c154ba WHIRLPOOL 865e22ceb71fa8b63401077f2c13bd0f0a6698a1361781f762659804019afe0bee06ba1edb593d25fcb52849156223eae2c248387db4b73bc07bc8410e52673a -DIST wordpress-4.3.1.tar.gz 6526208 SHA256 df5a5bfa28c916e11e8a636297c8eeb68816fff1d1bc2564c1d73c0063f0027c SHA512 d19b9a76b10d4cc3d7f577b8196b3423e72a1847a1cb9c85fa1506c0a97f3e10f65c5b2453aacd4b963327b3209725f44e30186e69d075c093b15177587a974a WHIRLPOOL 9dbfb60e1e081a4981f54f073fa6075799b051bdd3cd64c7a27ab29fef6484299c5c5e3d06d03bd1b926d82004d0955838e1c0e96607f62d120a5b034acae4dd -DIST wordpress-4.3.tar.gz 6524201 SHA256 3b0db3abe8504f15a33cf64188a493ec0de01eaa8d20e37c3d6a1d9fa0a40fb4 SHA512 d40723efa4aac41ade734d35f985397679e4e72657724ff47a0783205ca51ce7477973e3a7bc73550a4e3d1b523991d6ece09ff652032b746adb96207de6eca1 WHIRLPOOL 474b03255ae381e6b92ae5bf094596bcd3fcd12e11271bd68d091fcce27b80ab922d3c240f2eaa2509ad603edb34a78639145b3fe6bf19a9d367fa334c4beaea -DIST wordpress-4.4.tar.gz 7079339 SHA256 02047ded951bc9d3e3d7e33dc4add71165edff202bee0c00d536e9640813ce99 SHA512 7963f42a20b0c4fb8bbab4e2ee464ed4d1fc69c194eaefb7c4a0a7a77c4f44e846e8a1322a5fee57788b8af5a5be2a946fb8615e020faa098a985aa48c9da35a WHIRLPOOL 03310277df56856e9a02b5177effc18a8e2067ec91d1e337ddaaca19f11582b04322eabc33e5b6324c21c4314109b493fa7e76b1a7a30e3ae0241eca4284370a +DIST wordpress-4.4.1.tar.gz 7099537 SHA256 4895ac8c2ee348513ead161103ae2d97d3ef3f684167e5ce602d3998370c05f4 SHA512 cea888a2a1ef81349660c6c9acdf7c6d3b388913a264a0b9cc5b8e3f58f0e02c2b72158f973f09d8d7bb30c32a01c982479bb5829a5e23927ee14ada625579d4 WHIRLPOOL 65a0c7508f2cf23adb08e4814bf0542e24530ac75d29ddea0f81bbb79331f3e13462135198e6e1f9570a84a2c2d9f86b0fd8d35355815eb65a1a1facf1101f5b diff --git a/www-apps/wordpress/wordpress-4.2.4.ebuild b/www-apps/wordpress/wordpress-4.2.4.ebuild deleted file mode 100644 index ff967901f237..000000000000 --- a/www-apps/wordpress/wordpress-4.2.4.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit webapp - -DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)" -HOMEPAGE="https://wordpress.org/" -SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz" - -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND="virtual/httpd-php - || ( dev-lang/php[mysql] dev-lang/php[mysqli] )" - -S=${WORKDIR}/${PN} - -need_httpd_cgi - -IUSE="+akismet examples +themes vhosts" - -# Override default of SLOT="${PVR}" -WEBAPP_MANUAL_SLOT=yes -SLOT="${PV}" - -src_install() { - webapp_src_preinst - - dohtml readme.html - rm readme.html license.txt || die - - if ! use akismet ; then - rm -R wp-content/plugins/akismet/ || die - fi - if ! use examples ; then - rm wp-content/plugins/hello.php || die - fi - if ! use themes ; then - rm -R wp-content/themes/*/ || die - fi - - [[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php - - insinto "${MY_HTDOCSDIR}" - doins -r . - - webapp_serverowned "${MY_HTDOCSDIR}"/index.php - webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php - webapp_serverowned "${MY_HTDOCSDIR}" - - webapp_configfile "${MY_HTDOCSDIR}"/wp-config.php - - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt - - webapp_src_install -} diff --git a/www-apps/wordpress/wordpress-4.3.1.ebuild b/www-apps/wordpress/wordpress-4.3.1.ebuild deleted file mode 100644 index ff967901f237..000000000000 --- a/www-apps/wordpress/wordpress-4.3.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit webapp - -DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)" -HOMEPAGE="https://wordpress.org/" -SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz" - -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND="virtual/httpd-php - || ( dev-lang/php[mysql] dev-lang/php[mysqli] )" - -S=${WORKDIR}/${PN} - -need_httpd_cgi - -IUSE="+akismet examples +themes vhosts" - -# Override default of SLOT="${PVR}" -WEBAPP_MANUAL_SLOT=yes -SLOT="${PV}" - -src_install() { - webapp_src_preinst - - dohtml readme.html - rm readme.html license.txt || die - - if ! use akismet ; then - rm -R wp-content/plugins/akismet/ || die - fi - if ! use examples ; then - rm wp-content/plugins/hello.php || die - fi - if ! use themes ; then - rm -R wp-content/themes/*/ || die - fi - - [[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php - - insinto "${MY_HTDOCSDIR}" - doins -r . - - webapp_serverowned "${MY_HTDOCSDIR}"/index.php - webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php - webapp_serverowned "${MY_HTDOCSDIR}" - - webapp_configfile "${MY_HTDOCSDIR}"/wp-config.php - - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt - - webapp_src_install -} diff --git a/www-apps/wordpress/wordpress-4.3.ebuild b/www-apps/wordpress/wordpress-4.3.ebuild deleted file mode 100644 index ff967901f237..000000000000 --- a/www-apps/wordpress/wordpress-4.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit webapp - -DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)" -HOMEPAGE="https://wordpress.org/" -SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz" - -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND="virtual/httpd-php - || ( dev-lang/php[mysql] dev-lang/php[mysqli] )" - -S=${WORKDIR}/${PN} - -need_httpd_cgi - -IUSE="+akismet examples +themes vhosts" - -# Override default of SLOT="${PVR}" -WEBAPP_MANUAL_SLOT=yes -SLOT="${PV}" - -src_install() { - webapp_src_preinst - - dohtml readme.html - rm readme.html license.txt || die - - if ! use akismet ; then - rm -R wp-content/plugins/akismet/ || die - fi - if ! use examples ; then - rm wp-content/plugins/hello.php || die - fi - if ! use themes ; then - rm -R wp-content/themes/*/ || die - fi - - [[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php - - insinto "${MY_HTDOCSDIR}" - doins -r . - - webapp_serverowned "${MY_HTDOCSDIR}"/index.php - webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php - webapp_serverowned "${MY_HTDOCSDIR}" - - webapp_configfile "${MY_HTDOCSDIR}"/wp-config.php - - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt - - webapp_src_install -} diff --git a/www-apps/wordpress/wordpress-4.4.ebuild b/www-apps/wordpress/wordpress-4.4.1.ebuild index 15f1314b959e..3f425a51116b 100644 --- a/www-apps/wordpress/wordpress-4.4.ebuild +++ b/www-apps/wordpress/wordpress-4.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.1-bug-88-auth-dialog-crash.patch b/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.1-bug-88-auth-dialog-crash.patch new file mode 100644 index 000000000000..51ed44789094 --- /dev/null +++ b/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.1-bug-88-auth-dialog-crash.patch @@ -0,0 +1,27 @@ +From 256ad0239728dad500018d3d5a5d8d38191a0116 Mon Sep 17 00:00:00 2001 +From: Stefan Sperling <stsp@stsp.name> +Date: Fri, 3 Apr 2015 12:47:36 +0100 +Subject: [PATCH] Fix use after free in create_smp_dialog(). + +After replacing smp_data update the local pointer variable to avoid +use-after-free memory access. Found on OpenBSD where the socialist +millionaires dialog never opened because of this. +--- + gtk-dialog.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gtk-dialog.c b/gtk-dialog.c +index 09ec12e..2021626 100644 +--- a/gtk-dialog.c ++++ b/gtk-dialog.c +@@ -778,6 +778,7 @@ static GtkWidget *create_smp_dialog(const char *title, const char *primary, + if (smp_data->their_instance != context->their_instance) { + otrg_gtk_dialog_free_smp_data(conv); + otrg_gtk_dialog_add_smp_data(conv); ++ smp_data = purple_conversation_get_data(conv, "otr-smpdata"); + } + + if (!(smp_data->smp_secret_dialog)) { +-- +2.3.4 + diff --git a/x11-plugins/pidgin-otr/pidgin-otr-4.0.1-r1.ebuild b/x11-plugins/pidgin-otr/pidgin-otr-4.0.1-r1.ebuild new file mode 100644 index 000000000000..da78b2ded9e2 --- /dev/null +++ b/x11-plugins/pidgin-otr/pidgin-otr-4.0.1-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging" +HOMEPAGE="http://www.cypherpunks.ca/otr/" +SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="dev-libs/libgcrypt:0 + net-im/pidgin[gtk] + >=net-libs/libotr-4.0.0 + x11-libs/gtk+:2" +DEPEND="${RDEPEND} + dev-util/intltool + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS README ) + +src_prepare() { + # https://bugs.otr.im/issues/88 + # (and https://bugs.otr.im/issues/128) + epatch "${FILESDIR}"/${P}-bug-88-auth-dialog-crash.patch +} |