diff options
2175 files changed, 35271 insertions, 42857 deletions
diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml index 6569104ff6e8..9cf9bbc84c78 100644 --- a/app-admin/apg/metadata.xml +++ b/app-admin/apg/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>gentoobugsie.20.dsurawicz@spamgourmet.com</email> + <email>DuPol@gmx.de</email> <name>Dustin Polke</name> <description>Proxy Maintainer. CC him on bugs.</description> </maintainer> diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest index 5fd5402239ce..77ff48bb451d 100644 --- a/app-admin/drush/Manifest +++ b/app-admin/drush/Manifest @@ -1,2 +1,2 @@ -DIST drush-5.8.tar.gz 409642 SHA256 15dd85f04c49b4a896b02dd6960d3140f3ae680bab3eea5d3aba27be0481e480 SHA512 85f7572aece8590d23164dc938e00b740718a5b9bf20ca866083f9e8ce2025ec07f57e06234bf50bfe2351f407f5bad21789103c1e04d18d2fd202fa735637e6 WHIRLPOOL 68f4a8ca09fc61c36de3d6cc6e3aeaab2021b677ba9d732a65f4d5a9940ebbee3cd63dc84f165e119770168547b1997aff6c23497dc50dbe548df348c296188c DIST drush-6.5.0.tar.gz 509643 SHA256 0e6bfb8a4bd75846dbca25f6d3e3130a706546f6a62edadce2eb00099750e2a7 SHA512 4afd348c025b9303386131687205af4219a77e6c822518b079a3f0475cbd7ed03647797d613300c7a281e2354f0d855435222fe1afe13447153cdbd6a4393add WHIRLPOOL 1f2a1a725e1c0f89cac90a1338e1541e587c7834560fd23d1a44341696be320e65cf93508d4841f02ca9b30ac62f3fed7de772e00f4eaeea64f287cf19682fcc +DIST drush-6.6.0.tar.gz 511330 SHA256 67f7a1f08238c8c3f61d4e93f8c7c83508f392086c9931865fd1022981e8f698 SHA512 d7d361628406dd0f0fc5b07e7a318abd04ca7ac63da9d3fa705b0a64b531394f6e45e944dbd1c2e7eaec6643a92792b9b8558aea6ebb5311ce7acd32aa438a21 WHIRLPOOL ff0f2b1f20cc7a5767513be78b6f7ce1d09fb8929089ac918c4982e57f7c5c4f174c5dfd75235dafde57e65b90717844d4d9dfa199871e5c65bc4deda19b6b8c diff --git a/app-admin/drush/drush-5.8.ebuild b/app-admin/drush/drush-5.8.ebuild deleted file mode 100644 index daccda321913..000000000000 --- a/app-admin/drush/drush-5.8.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit bash-completion-r1 - -DESCRIPTION="Drush is a command line shell and scripting interface for Drupal" -HOMEPAGE="http://drupal.org/project/drush" -SRC_URI="http://ftp.drupal.org/files/projects/${PN}-7.x-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+examples" - -DEPEND="dev-lang/php[cli,ctype,simplexml] - dev-php/pear - dev-php/PEAR-Console_Table - dev-php/PEAR-Console_Getopt" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}" - -src_prepare() { - sed -i -e \ - "s!/share/doc/drush!/share/doc/${PF}!" \ - -e "s!README\.txt!\0.bz2!g" \ - includes/bootstrap.inc || die - sed -i \ - -e "s!\.php'!.php.bz2'!" \ - -e "s!\.ini'!.ini.bz2'!" \ - -e "s!\.txt'!.txt.bz2'!" \ - -e "s!\.bashrc'!.bashrc.bz2'!" \ - commands/core/docs.drush.inc || die - sed \ - -e "1,2d" \ - -e "5,11d" \ - drush.complete.sh > drush.bashcomp -} - -src_install() { - local docs="README.txt docs" - use examples && docs="${docs} examples" - insinto /usr/share/drush - doins -r . - exeinto /usr/share/drush - doexe drush - dosym /usr/share/drush/drush /usr/bin/drush - dodoc -r ${docs} - # cleanup - for i in ${docs} LICENSE.txt drush.bat examples includes/.gitignore \ - .gitignore .travis.yml drush.complete.sh ; do - rm -rf "${D}/usr/share/drush/${i}" - done - keepdir /etc/drush - newbashcomp drush.bashcomp drush -} diff --git a/app-admin/drush/drush-6.6.0.ebuild b/app-admin/drush/drush-6.6.0.ebuild new file mode 100644 index 000000000000..4737c38f8b1a --- /dev/null +++ b/app-admin/drush/drush-6.6.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit bash-completion-r1 eutils + +DESCRIPTION="Command line shell and scripting interface for Drupal" +HOMEPAGE="https://github.com/drush-ops/drush" +SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="dev-lang/php[cli,ctype,json,simplexml] + dev-php/PEAR-Console_Table" + +src_prepare() { + # Fix the bash completion script, check the patch for Gentoo/upstream + # bug numbers. + epatch "${FILESDIR}/update-bash-completion-script-for-2.1.patch" + + # dodoc compresses all of the documentation, so we fix the filenames + # in a few places. + + # First, the README location in bootstrap.inc. + sed -i -e \ + "s!/share/doc/drush!/share/doc/${PF}!" \ + -e "s!README\.md!\0.bz2!g" \ + includes/bootstrap.inc || die + + # Next, the list of documentation in docs.drush.inc. Note that + # html files don't get compressed. + sed -i \ + -e "s!\.bashrc'!.bashrc.bz2'!" \ + -e "s!\.inc'!.inc.bz2'!" \ + -e "s!\.ini'!.ini.bz2'!" \ + -e "s!\.md'!.md.bz2'!" \ + -e "s!\.php'!.php.bz2'!" \ + -e "s!\.script'!.script.bz2'!" \ + -e "s!\.txt'!.txt.bz2'!" \ + commands/core/docs.drush.inc || die +} + +src_install() { + # Always install the examples; they're referenced within the source + # code and too difficult to exorcise. + dodoc -r README.md docs examples + + insinto /usr/share/drush + doins -r classes commands includes lib misc + doins drush_logo-black.png drush.info drush.php + + exeinto /usr/share/drush + doexe drush + dosym /usr/share/drush/drush /usr/bin/drush + + keepdir /etc/drush + newbashcomp drush.complete.sh drush +} diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest index c67f7f3bbd11..14d01729051e 100644 --- a/app-admin/entr/Manifest +++ b/app-admin/entr/Manifest @@ -1 +1 @@ -DIST entr-3.2.tar.gz 22203 SHA256 b1eee00afbeccf03010c1c557436854be6aaf0ef9b72ab8d44b94affdd7d7146 SHA512 7287dfe86b829a73049dfbac78c76e06e69b1172bece80120977f03492ff325d0c026cb58d1ab56a10897beebbcfb0c2130aaf5167ad68fdbc5daa0959cc22b7 WHIRLPOOL 6c139c7f841a77a7420f8a09d47dedb38685016f0f3649b6a407d6c0c88040654783a3f3457f1c9523326a209a69468428158a1c3f1341fd8608ce32d40f5ff9 +DIST entr-3.3.tar.gz 22159 SHA256 701cb7b0a72b6c9ba794ad7cc15b6ebcc2e0c978bb6906c8ae407567a044461f SHA512 aa45bef57fb12d5ddaaebd8de03df33b69a833e4b729ad9fb0844af1c8b7031fc37ca1c81170b20967aa7dbf8854849a7b1f46da6d1d13a49d4d33502269bbca WHIRLPOOL 97f256bb37f0e517365ef7f3353d08b7c702a8182051c985c13efee3613d43eeda9da8a2911407a733c5f51e66e0fd5204a07b13f11c49ab7449ddb7d69b4334 diff --git a/app-admin/entr/entr-3.2.ebuild b/app-admin/entr/entr-3.3.ebuild index fb6aaa52d2d5..6cafdf9259ba 100644 --- a/app-admin/entr/entr-3.2.ebuild +++ b/app-admin/entr/entr-3.3.ebuild @@ -20,6 +20,7 @@ src_unpack() { src_configure() { sh configure || die + sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die } src_test() { diff --git a/app-admin/fleet/metadata.xml b/app-admin/fleet/metadata.xml index a86664824b47..6e88cbd11a99 100644 --- a/app-admin/fleet/metadata.xml +++ b/app-admin/fleet/metadata.xml @@ -6,7 +6,7 @@ <name>Alex Brandt</name> </maintainer> <maintainer> - <email>code@stefanjunker.de</email> + <email>mail@stefanjunker.de</email> <name>Stefan Junker</name> </maintainer> <longdescription lang="en"> diff --git a/app-admin/glance/glance-2015.1.1-r3.ebuild b/app-admin/glance/glance-2015.1.1-r3.ebuild index 88ae90121528..f442c1aaad41 100644 --- a/app-admin/glance/glance-2015.1.1-r3.ebuild +++ b/app-admin/glance/glance-2015.1.1-r3.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 user -DESCRIPTION="Provides services for discovering, registering, and retrieving +DESCRIPTION="Services for discovering, registering, and retrieving virtual machine images" HOMEPAGE="https://launchpad.net/glance" SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz" diff --git a/app-admin/glance/glance-2015.1.2.ebuild b/app-admin/glance/glance-2015.1.2.ebuild index c024b2072b59..24084b1bfadd 100644 --- a/app-admin/glance/glance-2015.1.2.ebuild +++ b/app-admin/glance/glance-2015.1.2.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 user -DESCRIPTION="Provides services for discovering, registering, and retrieving +DESCRIPTION="Services for discovering, registering, and retrieving virtual machine images" HOMEPAGE="https://launchpad.net/glance" SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz" diff --git a/app-admin/glance/glance-2015.1.9999.ebuild b/app-admin/glance/glance-2015.1.9999.ebuild index 7b62377e0012..c6c822b90e78 100644 --- a/app-admin/glance/glance-2015.1.9999.ebuild +++ b/app-admin/glance/glance-2015.1.9999.ebuild @@ -5,9 +5,9 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 git-2 user +inherit distutils-r1 git-r3 user -DESCRIPTION="Provides services for discovering, registering, and retrieving +DESCRIPTION="Services for discovering, registering, and retrieving virtual machine images" HOMEPAGE="https://launchpad.net/glance" EGIT_REPO_URI="https://github.com/openstack/glance.git" diff --git a/app-admin/glance/glance-2015.2.9999.ebuild b/app-admin/glance/glance-2015.2.9999.ebuild index bc4768fcde24..5b3031deff07 100644 --- a/app-admin/glance/glance-2015.2.9999.ebuild +++ b/app-admin/glance/glance-2015.2.9999.ebuild @@ -5,9 +5,9 @@ EAPI=5 PYTHON_COMPAT=( python2_7 python3_4 ) -inherit distutils-r1 git-2 user +inherit distutils-r1 git-r3 user -DESCRIPTION="Provides services for discovering, registering, and retrieving +DESCRIPTION="Services for discovering, registering, and retrieving virtual machine images" HOMEPAGE="https://launchpad.net/glance" EGIT_REPO_URI="https://github.com/openstack/glance.git" diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml index e042f09cf1ed..66824a4fb790 100644 --- a/app-admin/gtkdiskfree/metadata.xml +++ b/app-admin/gtkdiskfree/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>samuel.bauer@yahoo.fr</email> + <email>BM-2cTVBXjxdVtEQCycBQjMxszLsgTNVujvM5@bitmessage.ch</email> <name>Samuel Bauer</name> </maintainer> <maintainer> diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest index 7d29ce792b00..e89ca8e8faa1 100644 --- a/app-admin/puppet-agent/Manifest +++ b/app-admin/puppet-agent/Manifest @@ -6,3 +6,5 @@ DIST puppet-agent_1.2.5-1wheezy_amd64.deb 15187830 SHA256 4d557e45571df033a9e1ba 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 diff --git a/app-admin/puppet-agent/puppet-agent-1.2.7.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.7.ebuild new file mode 100644 index 000000000000..7de77c52fb14 --- /dev/null +++ b/app-admin/puppet-agent/puppet-agent-1.2.7.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 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/puppetdb/Manifest b/app-admin/puppetdb/Manifest index 9878f83d24e8..1781d09e6716 100644 --- a/app-admin/puppetdb/Manifest +++ b/app-admin/puppetdb/Manifest @@ -1,3 +1,4 @@ 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 diff --git a/app-admin/puppetdb/puppetdb-3.2.0.ebuild b/app-admin/puppetdb/puppetdb-3.2.0.ebuild new file mode 100644 index 000000000000..512445aa334b --- /dev/null +++ b/app-admin/puppetdb/puppetdb-3.2.0.ebuild @@ -0,0 +1,91 @@ +# 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/sagan/sagan-1.0.0_rc3.ebuild b/app-admin/sagan/sagan-1.0.0_rc3.ebuild index ff7e5405b6ce..ea347ac58291 100644 --- a/app-admin/sagan/sagan-1.0.0_rc3.ebuild +++ b/app-admin/sagan/sagan-1.0.0_rc3.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="geoip +libdnet +lognorm mysql +pcap smtp snort" RDEPEND="dev-libs/libpcre diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest index 414c944f76b3..91f8db96501f 100644 --- a/app-admin/sudo/Manifest +++ b/app-admin/sudo/Manifest @@ -1,3 +1,3 @@ DIST sudo-1.8.12.tar.gz 2493373 SHA256 163b51841de8ad19276581a6782d61f5948f1f72a0a843371a1c167d3dc4f3b0 SHA512 1815343eceb7cfa6e37c961ce1c68cf96fc290356b92078d6d24a2c85d8b7a7236df78d3ff7f5e30eba492dc8407346d884e01c0b989eef4414156cfec80b67b WHIRLPOOL 0d9e618937a08b9bf74aaebf12f5b9f96afd827728f90fa95b6a2a4f932cc84240d56674aa903062247068ec5aa3369b14bad64130caeb313330286510c2d3f6 -DIST sudo-1.8.13.tar.gz 2515307 SHA256 e374e5edf2c11c00d6916a9f51cb0ad15e51c7b028370fa15169b07e61e05a25 SHA512 d5498ce8136e903a5ee9e6b1e9b69149b2268798f0678bf7fa82d56947c60d0dec1d7ee25df382e2ee05ecb660720af6b6bc24ad1b6493834e158ee3b186d03c WHIRLPOOL b06256020e5c21159f1b7ff7a9849053f89e95c58fce850653e60d625ad71f8cf9caf9421765398ed73d2ca4756483dcd9535dc856e681dc3b8d7c1206ae5553 DIST sudo-1.8.14p3.tar.gz 2570892 SHA256 a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237 SHA512 022e75a4171c0d9b87569adc5b08afc1b8f2adb7dbc6c80dfb737029dbca560a08e317ce37f117b614f36b54666ed01559a72d0c92523a5a2ee3531f520d7a2b WHIRLPOOL 143ff1c464b539e79172cd0340a089739207d2b99fc01d183a27b24b5172c834d6ed0f7258116542ffa559a3a4c3540924261170655dd7bedb449f8d93496bbd +DIST sudo-1.8.15.tar.gz 2660128 SHA256 4316381708324da8b6cb151f655c1a11855207c7c02244d8ffdea5104d7cc308 SHA512 f2bff92104ddc4cbea8c788da446043cbfe02c977cedf18d46b1c82e98d7227432cb5a61233e7a06af84e3637f906edd5e02bb88c03a2ce4a16df410469a5dab WHIRLPOOL 3da64eda51f22d7fc0ea76f0693e9960d511b7c762b5d6237318d17436fd64b58ae90caa9bf4e125ebee70b83eac7cba2c7451fb62fafd8ee3d133c4ae2037b9 diff --git a/app-admin/sudo/sudo-1.8.13.ebuild b/app-admin/sudo/sudo-1.8.13.ebuild deleted file mode 100644 index d36ae5e10180..000000000000 --- a/app-admin/sudo/sudo-1.8.13.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils pam multilib libtool - -MY_P=${P/_/} -MY_P=${MY_P/beta/b} - -uri_prefix= -case ${P} in -*_beta*|*_rc*) uri_prefix=beta/ ;; -esac - -DESCRIPTION="Allows users or groups to run commands as other users" -HOMEPAGE="http://www.sudo.ws/" -SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz - ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz" - -# Basic license is ISC-style as-is, some files are released under -# 3-clause BSD license -LICENSE="ISC BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris" -IUSE="ldap nls pam offensive selinux skey +sendmail" - -DEPEND="pam? ( virtual/pam ) - skey? ( >=sys-auth/skey-1.1.5-r1 ) - ldap? ( - >=net-nds/openldap-2.1.30-r1 - dev-libs/cyrus-sasl - ) - sys-libs/zlib" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-sudo ) - ldap? ( dev-lang/perl ) - pam? ( sys-auth/pambase ) - >=app-misc/editor-wrapper-3 - virtual/editor - sendmail? ( virtual/mta )" -DEPEND="${DEPEND} - sys-devel/bison" - -S=${WORKDIR}/${MY_P} - -REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" - -MAKEOPTS+=" SAMPLES=" - -src_prepare() { - elibtoolize -} - -set_rootpath() { - # FIXME: secure_path is a compile time setting. using ROOTPATH - # is not perfect, env-update may invalidate this, but until it - # is available as a sudoers setting this will have to do. - einfo "Setting secure_path ..." - - # first extract the default ROOTPATH from build env - ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}") - if [[ -z ${ROOTPATH} ]] ; then - ewarn " Failed to find ROOTPATH, please report this" - fi - - # then remove duplicate path entries - cleanpath() { - local newpath thisp IFS=: - for thisp in $1 ; do - if [[ :${newpath}: != *:${thisp}:* ]] ; then - newpath+=:$thisp - else - einfo " Duplicate entry ${thisp} removed..." - fi - done - ROOTPATH=${newpath#:} - } - cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}} - - # finally, strip gcc paths #136027 - rmpath() { - local e newpath thisp IFS=: - for thisp in ${ROOTPATH} ; do - for e ; do [[ $thisp == $e ]] && continue 2 ; done - newpath+=:$thisp - done - ROOTPATH=${newpath#:} - } - rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*' - - einfo "... done" -} - -src_configure() { - local ROOTPATH - set_rootpath - - # audit: somebody got to explain me how I can test this before I - # enable it.. - Diego - # plugindir: autoconf code is crappy and does not delay evaluation - # until `make` time, so we have to use a full path here rather than - # basing off other values. - econf \ - --enable-zlib=system \ - --with-secure-path="${ROOTPATH}" \ - --with-editor="${EPREFIX}"/usr/libexec/editor \ - --with-env-editor \ - $(use_with offensive insults) \ - $(use_with offensive all-insults) \ - $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \ - $(use_with ldap) \ - $(use_enable nls) \ - $(use_with pam) \ - $(use_with skey) \ - $(use_with selinux) \ - $(use_with sendmail) \ - --without-opie \ - --without-linux-audit \ - --with-rundir="${EPREFIX}"/var/run/sudo \ - --with-vardir="${EPREFIX}"/var/db/sudo \ - --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} -} - -src_install() { - default - - if use ldap ; then - dodoc README.LDAP doc/schema.OpenLDAP - dosbin plugins/sudoers/sudoers2ldif - - cat <<-EOF > "${T}"/ldap.conf.sudo - # See ldap.conf(5) and README.LDAP for details - # This file should only be readable by root - - # supported directives: host, port, ssl, ldap_version - # uri, binddn, bindpw, sudoers_base, sudoers_debug - # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key - EOF - - insinto /etc - doins "${T}"/ldap.conf.sudo - fperms 0440 /etc/ldap.conf.sudo - fi - - pamd_mimic system-auth sudo auth account session - - keepdir /var/db/sudo - fperms 0700 /var/db/sudo - - # Don't install into /var/run as that is a tmpfs most of the time - # (bug #504854) - rm -rf "${D}"/var/run -} - -pkg_postinst() { - if use ldap ; then - ewarn - ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration." - ewarn - if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then - ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly" - ewarn "configured in /etc/nsswitch.conf." - ewarn - ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:" - ewarn " sudoers: ldap files" - ewarn - fi - fi - if use prefix ; then - ewarn - ewarn "To use sudo, you need to change file ownership and permissions" - ewarn "with root privileges, as follows:" - ewarn - ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo" - ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so" - ewarn " # chown root:root ${EPREFIX}/etc/sudoers" - ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d" - ewarn " # chown root:root ${EPREFIX}/var/db/sudo" - ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo" - ewarn - fi - - elog "To use the -A (askpass) option, you need to install a compatible" - elog "password program from the following list. Starred packages will" - elog "automatically register for the use with sudo (but will not force" - elog "the -A option):" - elog "" - elog " [*] net-misc/ssh-askpass-fullscreen" - elog " net-misc/x11-ssh-askpass" - elog "" - elog "You can override the choice by setting the SUDO_ASKPASS environmnent" - elog "variable to the program you want to use." -} diff --git a/app-admin/sudo/sudo-1.8.14_p3.ebuild b/app-admin/sudo/sudo-1.8.14_p3.ebuild index d36ae5e10180..c4e80afad003 100644 --- a/app-admin/sudo/sudo-1.8.14_p3.ebuild +++ b/app-admin/sudo/sudo-1.8.14_p3.ebuild @@ -23,7 +23,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz # 3-clause BSD license LICENSE="ISC BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris" IUSE="ldap nls pam offensive selinux skey +sendmail" DEPEND="pam? ( virtual/pam ) diff --git a/app-admin/sudo/sudo-1.8.12-r1.ebuild b/app-admin/sudo/sudo-1.8.15-r1.ebuild index 237f5c892c78..1d919c9a407a 100644 --- a/app-admin/sudo/sudo-1.8.12-r1.ebuild +++ b/app-admin/sudo/sudo-1.8.15-r1.ebuild @@ -50,7 +50,6 @@ REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" MAKEOPTS+=" SAMPLES=" src_prepare() { - epatch "${FILESDIR}"/${P}-include-sys-types-h.patch elibtoolize } @@ -129,7 +128,7 @@ src_install() { default if use ldap ; then - dodoc README.LDAP doc/schema.OpenLDAP + dodoc README.LDAP dosbin plugins/sudoers/sudoers2ldif cat <<-EOF > "${T}"/ldap.conf.sudo @@ -138,12 +137,15 @@ src_install() { # supported directives: host, port, ssl, ldap_version # uri, binddn, bindpw, sudoers_base, sudoers_debug - # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key + # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key} EOF insinto /etc doins "${T}"/ldap.conf.sudo fperms 0440 /etc/ldap.conf.sudo + + insinto /etc/openldap/schema + newins doc/schema.OpenLDAP sudo.schema fi pamd_mimic system-auth sudo auth account session diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index e43478750012..0f39aace9e6a 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -1,4 +1,5 @@ DIST syslog-ng-3.7.1.tar.gz 3509575 SHA256 4c19841b9079b377cd814b1e6ebbf273af41d04d51c648f4c31f19bfadc20220 SHA512 6f9a68aec2594d83c43cf40e12a3d56e65661929a47c2a053ae120e34ad358d4dfd0b5b0303a374a5557f2ac0670114037a339530b111b1078b56e5baf284ed4 WHIRLPOOL 247498f144aec419d1214378332bc286795fa8f59ba33ce75b3d000be6340758f00a694d76b5cbfdd6b68d138a6cd373c06bb52c70e6ed6de29189c03a56d16b +DIST syslog-ng-3.7.2.tar.gz 3558377 SHA256 b1b3ccc0ce7f0d8bf15b23e59f2f4f5ded70eed410dfd27105219bc8856388a5 SHA512 dbf58b51b68bc6616a136df5eb67a120718d8c83f785218d40f62e5f7b3691a3ad4d21db617551e4192e053dc9340440424e3d3b072b47ca590d4eac0dbf0e6f WHIRLPOOL 3721841f6e5ea883cd5ee71bf1651fa0861904008eb1136127c36990e2fe8801deafdf31ce880677eff7739b0b07411eee4542d8d4a80b60819fa3bd9ab24b9e DIST syslog-ng_3.4.8.tar.gz 3169372 SHA256 96c2f970fbba4fdd7659b1fee5e476d2858c911d4304d42099f495493762ff49 SHA512 23ba9908664e594c186cbe4bd5dcfb5d2ed3faf02ec45b931bb91b078660547989c2340a08b478a33adb530d39a6d6f39a2e7519107a3f6b923ac9f39529620e WHIRLPOOL 1085fa2c90e0c85421c64ed50e8a357f29006afea2f3e329e42d1e27f4210a10fe0f05d4af95a11c245d68b43644a4a829a50c05b7d541f59a6f580b3643b434 DIST syslog-ng_3.6.2.tar.gz 3207456 SHA256 ef47fada52981e09af570457a5af30f815f5d5b6c2e33754cedd4ca9780d8261 SHA512 15603b4df2001e1ce7e0019d0dd9a0f4295445e3fd19a527ebf3d49486da7da27fac6c465727ec0354f8f70ca0f671a285ec132f9aa0de62b40f18b44af2a226 WHIRLPOOL 7135db242374d6e5789c0820a06187b7e325054fd214e3aee75aac5b8dde56786b432cc4519c07ce0cd413c3a560e8e74ee6eca319c21eaa750ca8140ef1b63f DIST syslog-ng_3.6.4.tar.gz 3276432 SHA256 7be11df31ac7d716f1f952e22b5ae8e2049edd633a41b223776a853d9106f4e7 SHA512 9c648628b9bd3ebb25bc44fa6586e88a4b9ed7c24b1c337569d3cccb04bf2f427ba1218900f8dfd8f668f245d6ab44ad45b67da661b7c2af68c6c42101b722e1 WHIRLPOOL 496a9b2e06e33b0c42726f3b13f859f356f136367c48363cd22b086b72f4f54a32cc057235636f2d2ea3ad7bdd622354ea67df1cbc770be608a84bc861fce93d diff --git a/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild index 1d1b717bad5e..8847eec17611 100644 --- a/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild +++ b/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" IUSE="amqp caps dbi geoip ipv6 json mongodb pacct python redis smtp spoof-source systemd tcpd" RESTRICT="test" diff --git a/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild new file mode 100644 index 000000000000..0a1f05026e38 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +inherit autotools python-any-r1 eutils multilib systemd versionator + +MY_PV=${PV/_/} +MY_PV_MM=$(get_version_component_range 1-2) +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="http://www.balabit.com/network-security/syslog-ng" +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd" +RESTRICT="test" + +RDEPEND=" + caps? ( sys-libs/libcap ) + dbi? ( >=dev-db/libdbi-0.8.3 ) + geoip? ( >=dev-libs/geoip-1.5.0 ) + json? ( >=dev-libs/json-c-0.9 ) + python? ( ${PYTHON_DEPS} ) + redis? ( dev-libs/hiredis ) + smtp? ( net-libs/libesmtp ) + spoof-source? ( net-libs/libnet:1.1 ) + systemd? ( sys-apps/systemd ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + dev-libs/libpcre + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + >=dev-libs/eventlog-0.2.12 + >=dev-libs/glib-2.10.1:2" +DEPEND="${RDEPEND} + virtual/pkgconfig + sys-devel/flex" + +S=${WORKDIR}/${PN}-${MY_PV} + +pkg_setup() { + use python && python-any-r1_pkg_setup +} + +src_prepare() { + epatch_user + use python && python_fix_shebang . + + if use !json ; then + sed -i \ + -e '1 s/cim //' \ + scl/Makefile.am || die + eautoreconf + fi + + cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die + cd "${TMPDIR}" || die + + for f in *logrotate*.in ; do + if use systemd ; then + sed \ + 's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \ + $f > ${f/.in/} || die + else + sed \ + 's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:' \ + $f > ${f/.in/} || die + fi + done +} + +src_configure() { + econf \ + --disable-java \ + --disable-docs \ + --enable-manpages \ + --with-embedded-crypto \ + --with-ivykis=internal \ + --with-libmongo-client=internal \ + --sysconfdir=/etc/syslog-ng \ + --localstatedir=/var/lib/syslog-ng \ + --with-pidfile-dir=/var/run \ + --with-module-dir=/usr/$(get_libdir)/syslog-ng \ + $(systemd_with_unitdir) \ + $(use_enable systemd) \ + $(use_enable caps linux-caps) \ + $(use_enable geoip) \ + $(use_enable ipv6) \ + $(use_enable json) \ + $(use_enable mongodb) \ + $(use_enable pacct) \ + $(use_enable python) \ + $(use_enable redis) \ + $(use_enable smtp) \ + $(use_enable amqp) \ + $(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \ + $(use_enable spoof-source) \ + $(use_enable dbi sql) \ + $(use_enable tcpd tcp-wrapper) +} + +src_install() { + # -j1 for bug #484470 + emake -j1 DESTDIR="${D}" install + + dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \ + contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \ + "${TMPDIR}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" + + # Install default configuration + insinto /etc/syslog-ng + if use userland_BSD ; then + newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf + else + newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf + fi + + insinto /etc/logrotate.d + newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng + newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng + keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng + prune_libtool_files --modules + + use python && python_optimize +} + +pkg_postinst() { + elog "For detailed documentation please see the upstream website:" + elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.7-guides/en/syslog-ng-ose-v3.7-guide-admin/html/index.html" + + # bug #355257 + if ! has_version app-admin/logrotate ; then + echo + elog "It is highly recommended that app-admin/logrotate be emerged to" + elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" + elog "for logrotate to use." + echo + fi +} diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest index 9f18dae1c17c..605792b35930 100644 --- a/app-admin/sysstat/Manifest +++ b/app-admin/sysstat/Manifest @@ -1,5 +1,5 @@ DIST sysstat-11.0.2.tar.xz 291256 SHA256 acd87fdfbe7c796480f14fc26119d8f785d26827d74a0f5bced6c492a91f1b96 SHA512 4bb5f2ee14346d83c59bd4da36ae8fc6c13197eabb808b1b5db84b593f07d8b366b1f6329abed8d43e2a8497a89de0f89a398b741d4ca23b4a3a95973b5f0f54 WHIRLPOOL 98daee288e22f803f19bbe423eb999f527e8997f2ffd3fe1fe784363260365ee833dd33b755f44d6bfcc685f70b47cb8fd70fdd9a3fa679829c1e608bd65f8e2 -DIST sysstat-11.0.6.tar.xz 304516 SHA256 596a375bce1830514e26dd6c47ff366ec3113c637765a33f8924b43f97a16b49 SHA512 68f14790d535499ab8b116b77e812730eda003f9d11dd68b5089b284611a928679b538ecd5f139fe72cd737b27eaa972d386e7f81e0e5c4aaa27eae111196bcb WHIRLPOOL 2312c1198910bd1b89e6f87ff3cc0d350e3d84dde375a527b6d5895fe05a3f95c584a8999bdcc87556632d9d903a16adb0b0f58b53aedf2466aa62dd8554f7e0 DIST sysstat-11.0.7.tar.xz 305548 SHA256 39dcaa3a174f110cc885ac2508292a4a459d60ea56818a0bd3d0c3d05b2e458a SHA512 4547c7ddf3519dc0e14ad9496f0c6cccb26a8e4df97638b755f792df3914f321284f0e60ce27b3c4642bb757fa7c5006a806fd14f816f578e12b7d20f3cdcd51 WHIRLPOOL 324a3b8718240234c6a94118accd3ea5d849b1c3976ef81d5a178f7daf2e5e3e3806c6f4fb914de3062df0be0d9e6e188e42a5b5cde17ac244f3ab453d69daa0 -DIST sysstat-11.1.6.tar.xz 318752 SHA256 e1792aaae343e9c29d962b453e6eab2b3269474bfac2c8e1df463735e706595f SHA512 670cc25400459532721cb2cbcfb9a57612811ea261a888d37e8fe87755556bc2c37bb0ebd7f3c8c5e1d11bfa08c7b20bad77795b6f7c9ce90a8185b4eb3f541c WHIRLPOOL f30291a1e4b1affa382067f688c4c1af5a5fe5a5d20d5580be5bb6e5b2f67cf9eb2018ec672f50396a1c326b0c607994e4c874eb6e2477edc6b6224bb088bff4 +DIST sysstat-11.0.8.tar.xz 294828 SHA256 d073b0e95820254a3fbf53ae3fb27db91d5b11778875034cd39c4d56d8e23695 SHA512 bae205b90d3b908de14d568a7872cca1fe0b2a6e423b74d4f837ebd9f9892abc742f8dc746dde559763c982cf0fd73fafc9ad116ea827ff1189c92488fc8696e WHIRLPOOL 375c3e9af3634c151605f89f1debea3148e2d890f9c43cf4dcb834977c093d2622832c0f0773ef05330f6d9dacb3abfd74acc10ae56251b812a7c6c528007232 DIST sysstat-11.1.7.tar.xz 321488 SHA256 c6767f14b157118189ac3228c650f4657399dc2a3ee8cecd7c9e6237865c02b5 SHA512 b7cfa950987668dcff8e2e342f6b789c191bfeed9eb8d0f4d72d51b87c017134252df9c50c31c895be9e0da7e82a74e332de46571d2b3562870fc2506237a240 WHIRLPOOL 23459acb6ceb4323b558ea056bed727a2275bec69235775209783bfcc627b10c01187e4d4377f5198acb46edeb86fdcfd0a559327532c9b1502a2b1ca7a5dd2f +DIST sysstat-11.1.8.tar.xz 323512 SHA256 9c7eb478e6a3e6f3f19ef7e00438318e9f8e87a6608a242502a0828b6a41704a SHA512 4427f6e1a17cee2b56e624ab6c615d421e8a2a78b23dd6907a97f8946c20eefd2c181afe02652ad387a94d53d1d7203c6aee4d36d34424c9b2b03ee8b53366ce WHIRLPOOL 87c10b46f758efdee4e8dfedbc945a496e2f644de80632dd13fe7d99d81eca42d58a28946e138adcd4a8f9cdf22a1e1db14af548ebc4e55ad6a6eb2695bb7d65 diff --git a/app-admin/sysstat/sysstat-11.0.6.ebuild b/app-admin/sysstat/sysstat-11.0.8.ebuild index afcb07805d22..afcb07805d22 100644 --- a/app-admin/sysstat/sysstat-11.0.6.ebuild +++ b/app-admin/sysstat/sysstat-11.0.8.ebuild diff --git a/app-admin/sysstat/sysstat-11.1.6.ebuild b/app-admin/sysstat/sysstat-11.1.8.ebuild index 5737c3628eb3..5737c3628eb3 100644 --- a/app-admin/sysstat/sysstat-11.1.6.ebuild +++ b/app-admin/sysstat/sysstat-11.1.8.ebuild diff --git a/app-admin/tenshi/metadata.xml b/app-admin/tenshi/metadata.xml index 158d49339334..a0fb5e875c40 100644 --- a/app-admin/tenshi/metadata.xml +++ b/app-admin/tenshi/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>bldewolf@csupomona.edu</email> + <email>bldewolf@cpp.edu</email> <name>Brian De Wolf</name> </maintainer> <maintainer> diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest index 8392508578e9..d969037d459d 100644 --- a/app-admin/ulogd/Manifest +++ b/app-admin/ulogd/Manifest @@ -1,2 +1 @@ -DIST ulogd-2.0.4.tar.bz2 452234 SHA256 56b30a13a8832e97178f39b7bb173a0b1dfe173dbb60d99a1a386c0962a2effd SHA512 08e88661fcfbcfd327b03b7a883dc239991f47d5a4e4561f3ada5f6acc8f2349f3bd38c1c67f28e42bbccf4cad63b2b7c3b732c23bf24b7c5f05320d27977773 WHIRLPOOL 94ee731cee8b95295d1c675bb3904be1a5b27a1e901d462f248116c865e79d52703b5330882110d7212bda1bb964fc0c97c3e704589071f47fab4475e1c91161 DIST ulogd-2.0.5.tar.bz2 456258 SHA256 a221cb9f77347c0ca00d0937e27c1b90e3291a553cc62a4139b788e2e420e8c0 SHA512 bf00b8adaad7bd04077a83521b0d7accc26e644c8f3386819e7f91476178b6733f1c6554fb82dd0d3913398c83a61d65f61dc973f199f610bfaadc6251504819 WHIRLPOOL fe499ac7b4070581439a05f4f2245f7a42fe5630da5dc32b9b069511ed1faa15fe482eee08d50477d3fb1d0bf0d3855a69fc82fb0f3e8eecdf082fb642519f91 diff --git a/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch b/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch deleted file mode 100644 index f8c10622e229..000000000000 --- a/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 30e24dbfc7a8644e29664070e8c16e5c3997f87e Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Fri, 7 Nov 2014 18:33:01 +0100 -Subject: [PATCH] include: keep a copy of linux/netfilter_ipv4/ipt_ULOG.h - -This fixes compilation if you use a Linux kernel >= 3.17. This problem -occurs since ULOG was removed from mainstream: - -http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=7200135bc1e61f1437dc326ae2ef2f310c50b4eb - -Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=986 -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> - -diff --git a/configure.ac b/configure.ac -index 522c345..c5f573c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -142,7 +142,7 @@ dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x) - - AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefile \ - include/linux/Makefile include/linux/netfilter/Makefile \ -- libipulog/Makefile \ -+ include/linux/netfilter_ipv4/Makefile libipulog/Makefile \ - input/Makefile input/packet/Makefile input/flow/Makefile \ - input/sum/Makefile \ - filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \ -diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index ca80d0d..18af1c2 100644 ---- a/include/linux/Makefile.am -+++ b/include/linux/Makefile.am -@@ -1,2 +1,2 @@ -- --SUBDIRS = netfilter -+SUBDIRS = netfilter \ -+ netfilter_ipv4 -diff --git a/include/linux/netfilter_ipv4/Makefile.am b/include/linux/netfilter_ipv4/Makefile.am -new file mode 100644 -index 0000000..41819a3 ---- /dev/null -+++ b/include/linux/netfilter_ipv4/Makefile.am -@@ -0,0 +1 @@ -+noinst_HEADERS = ipt_ULOG.h -diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/linux/netfilter_ipv4/ipt_ULOG.h -new file mode 100644 -index 0000000..417aad2 ---- /dev/null -+++ b/include/linux/netfilter_ipv4/ipt_ULOG.h -@@ -0,0 +1,49 @@ -+/* Header file for IP tables userspace logging, Version 1.8 -+ * -+ * (C) 2000-2002 by Harald Welte <laforge@gnumonks.org> -+ * -+ * Distributed under the terms of GNU GPL */ -+ -+#ifndef _IPT_ULOG_H -+#define _IPT_ULOG_H -+ -+#ifndef NETLINK_NFLOG -+#define NETLINK_NFLOG 5 -+#endif -+ -+#define ULOG_DEFAULT_NLGROUP 1 -+#define ULOG_DEFAULT_QTHRESHOLD 1 -+ -+#define ULOG_MAC_LEN 80 -+#define ULOG_PREFIX_LEN 32 -+ -+#define ULOG_MAX_QLEN 50 -+/* Why 50? Well... there is a limit imposed by the slab cache 131000 -+ * bytes. So the multipart netlink-message has to be < 131000 bytes. -+ * Assuming a standard ethernet-mtu of 1500, we could define this up -+ * to 80... but even 50 seems to be big enough. */ -+ -+/* private data structure for each rule with a ULOG target */ -+struct ipt_ulog_info { -+ unsigned int nl_group; -+ size_t copy_range; -+ size_t qthreshold; -+ char prefix[ULOG_PREFIX_LEN]; -+}; -+ -+/* Format of the ULOG packets passed through netlink */ -+typedef struct ulog_packet_msg { -+ unsigned long mark; -+ long timestamp_sec; -+ long timestamp_usec; -+ unsigned int hook; -+ char indev_name[IFNAMSIZ]; -+ char outdev_name[IFNAMSIZ]; -+ size_t data_len; -+ char prefix[ULOG_PREFIX_LEN]; -+ unsigned char mac_len; -+ unsigned char mac[ULOG_MAC_LEN]; -+ unsigned char payload[0]; -+} ulog_packet_msg_t; -+ -+#endif /*_IPT_ULOG_H*/ --- -2.0.4 - diff --git a/app-admin/ulogd/files/ulogd.init b/app-admin/ulogd/files/ulogd.init-r2 index ace6e8b51c91..c994507f9935 100644 --- a/app-admin/ulogd/files/ulogd.init +++ b/app-admin/ulogd/files/ulogd.init-r2 @@ -7,17 +7,18 @@ extra_started_commands="reload reopen" : ${ULOGD_BINARY:=/usr/sbin/ulogd} : ${ULOGD_PIDFILE:=/run/${SVCNAME}.pid} +: ${ULOGD_WAIT:=200} : ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}} depend() { - before iptables ip6tables ebtables firewall + before iptables ip6tables ebtables nftables firewall after mysql postgresql } start() { ebegin "Starting ${SVCNAME}" start-stop-daemon --start \ - --exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} \ + --exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} --wait ${ULOGD_WAIT} \ -- ${ULOGD_OPTS} eend $? } diff --git a/app-admin/ulogd/files/ulogd.service b/app-admin/ulogd/files/ulogd.service deleted file mode 100644 index ec22db0ad663..000000000000 --- a/app-admin/ulogd/files/ulogd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=A userspace logging daemon for netfilter/iptables related logging -Before=iptables.service ip6tables.service -After=mysql.service postgresql.service - -[Service] -Type=forking -PIDFile=/run/ulogd.pid -ExecStart=/usr/sbin/ulogd --daemon --uid ulogd --pidfile /run/ulogd.pid -ExecReload=/bin/kill -USR1 $MAINPID - -[Install] -WantedBy=network.target diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml index 0a868141b02f..7662d064012c 100644 --- a/app-admin/ulogd/metadata.xml +++ b/app-admin/ulogd/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>itumaykin@gmail.com</email> + <email>itumaykin+gentoo@gmail.com</email> </maintainer> <use> <flag name='json'>Build JSON output plugin to save packets in JSON file format.</flag> diff --git a/app-admin/ulogd/ulogd-2.0.4-r1.ebuild b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild index a49fa0235214..71cf91e2eaab 100644 --- a/app-admin/ulogd/ulogd-2.0.4-r1.ebuild +++ b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild @@ -2,11 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=5 AUTOTOOLS_AUTORECONF=1 AUTOTOOLS_IN_SOURCE_BUILD=1 -inherit autotools-utils eutils linux-info readme.gentoo systemd user + +inherit autotools-utils eutils flag-o-matic linux-info readme.gentoo systemd user DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging" HOMEPAGE="http://netfilter.org/projects/ulogd/index.html" @@ -15,10 +16,11 @@ SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ia64 ppc x86" -IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite" +KEYWORDS="~amd64 ~ia64 ~ppc ~x86" +IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog" -RDEPEND="net-firewall/iptables +RDEPEND=" + || ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) @@ -31,20 +33,23 @@ RDEPEND="net-firewall/iptables mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) - sqlite? ( dev-db/sqlite:3 )" - + sqlite? ( dev-db/sqlite:3 ) +" DEPEND="${RDEPEND} doc? ( app-text/linuxdoc-tools app-text/texlive-core virtual/latex-base - )" + ) +" -PATCHES=( "${FILESDIR}/${P}-linux-headers-3.17-ipt_ulog.patch" ) +PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" ) DOCS=( AUTHORS README TODO ) -DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work. -Please edit example configuration located at /etc/ulogd.conf" +DOC_CONTENTS=" + You must have at least one logging stack enabled to make ulogd work. + Please edit example configuration located at /etc/ulogd.conf +" pkg_setup() { enewgroup ulogd @@ -53,21 +58,19 @@ pkg_setup() { linux-info_pkg_setup if kernel_is lt 2 6 14; then - die "ulogd2 requires kernel newer than 2.6.14" + die "ulogd requires kernel newer than 2.6.14" fi if kernel_is lt 2 6 18; then - ewarn ewarn "You are using kernel older than 2.6.18" - ewarn "Some ulogd2 features may be unavailable" - ewarn + ewarn "Some ulogd features may be unavailable" fi if use nfacct && kernel_is lt 3 3 0; then ewarn "NFACCT input plugin requires kernel newer than 3.3.0" fi - if ! use nfacct && ! use nfct && ! use nflog && kernel_is gt 3 17 0; then + if use ulog && kernel_is gt 3 17 0; then ewarn "ULOG target was removed since 3.17.0 kernel release" ewarn "Consider enabling NFACCT, NFCT or NFLOG support" fi @@ -81,6 +84,7 @@ src_prepare() { -e 's:tmp:run:g' \ ulogd.conf.in || die 'sed on ulogd.conf.in failed' + append-lfs-flags autotools-utils_src_prepare } @@ -95,6 +99,7 @@ src_configure() { $(use_with pcap) $(use_with postgres pgsql) $(use_with sqlite) + $(use_enable ulog) ) autotools-utils_src_configure } @@ -103,7 +108,7 @@ src_compile() { autotools-utils_src_compile if use doc; then - # prevent access violations from generation of bitmap font files + # Prevent access violations from bitmap font files generation export VARTEXFONTS="${T}"/fonts emake -C doc fi @@ -129,8 +134,8 @@ src_install() { fowners root:ulogd /etc/ulogd.conf fperms 640 /etc/ulogd.conf - newinitd "${FILESDIR}/${PN}.init" ${PN} - systemd_dounit "${FILESDIR}/${PN}.service" + newinitd "${FILESDIR}/${PN}.init-r2" ${PN} + systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service insinto /etc/logrotate.d newins "${FILESDIR}/${PN}.logrotate" ${PN} diff --git a/app-admin/vault/files/vault.initd b/app-admin/vault/files/vault.initd index e4fb31bfafe8..8d3e2cc3ecd4 100644 --- a/app-admin/vault/files/vault.initd +++ b/app-admin/vault/files/vault.initd @@ -8,7 +8,7 @@ group=${group:-${SVCNAME}} pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"} user=${user:-${SVCNAME}} -command="/usr/sbin/${SVCNAME}" +command="/usr/bin/${SVCNAME}" command_args="agent -config-dir=/etc/vault.d ${command_args}" command_background="true" start_stop_daemon_args="--user ${user} --group ${group} \ diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild index 3194624bf16d..d64b534f0d9a 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) inherit distutils-r1 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="http://sourceforge.net/projects/webapp-config/" diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest index 44c4c6179ae4..9b0a18804289 100644 --- a/app-arch/p7zip/Manifest +++ b/app-arch/p7zip/Manifest @@ -1,2 +1,3 @@ +DIST p7zip_15.09_src_all.tar.bz2 4048481 SHA256 8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f SHA512 4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd WHIRLPOOL 71d1cdb9b3b1208197b2c056670d057b00e9a5f80cf08b5914b5d25f2f6756d4cb53e5a000ec76b7b879f82302fca6d012a2cd397e8aa95ae4fc21fd620eb1ab DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3 DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04 WHIRLPOOL 6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24 diff --git a/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch b/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch new file mode 100644 index 000000000000..dc813174fb39 --- /dev/null +++ b/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch @@ -0,0 +1,284 @@ + CPP/7zip/UI/Agent/Agent.cpp | 2 +- + CPP/7zip/UI/Client7z/Client7z.cpp | 19 ++++++++++- + CPP/7zip/UI/Common/ArchiveExtractCallback.cpp | 14 +++++++-- + CPP/7zip/UI/Common/ArchiveExtractCallback.h | 6 +++- + CPP/7zip/UI/Common/Extract.cpp | 2 +- + CPP/Windows/FileDir.cpp | 45 +++++++++++++++++++++++++-- + CPP/Windows/FileDir.h | 31 +++++++++++++++++- + 7 files changed, 109 insertions(+), 10 deletions(-) + +diff --git a/CPP/7zip/UI/Agent/Agent.cpp b/CPP/7zip/UI/Agent/Agent.cpp +index 201e82c..b0b8316 100644 +--- a/CPP/7zip/UI/Agent/Agent.cpp ++++ b/CPP/7zip/UI/Agent/Agent.cpp +@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const UInt32 *indices, + HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(), + realIndices.Size(), testMode, extractCallback); + if (result == S_OK) +- result = extractCallbackSpec->SetDirsTimes(); ++ result = extractCallbackSpec->SetFinalAttribs(); + return result; + COM_TRY_END + } +diff --git a/CPP/7zip/UI/Client7z/Client7z.cpp b/CPP/7zip/UI/Client7z/Client7z.cpp +index c6522fe..1919389 100644 +--- a/CPP/7zip/UI/Client7z/Client7z.cpp ++++ b/CPP/7zip/UI/Client7z/Client7z.cpp +@@ -230,8 +230,11 @@ private: + COutFileStream *_outFileStreamSpec; + CMyComPtr<ISequentialOutStream> _outFileStream; + ++ CObjectVector<NWindows::NFile::NDir::CDelayedSymLink> _delayedSymLinks; ++ + public: + void Init(IInArchive *archiveHandler, const FString &directoryPath); ++ HRESULT SetFinalAttribs(); + + UInt64 NumErrors; + bool PasswordIsDefined; +@@ -449,11 +452,23 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResult(Int32 operationResult) + } + _outFileStream.Release(); + if (_extractMode && _processedFileInfo.AttribDefined) +- SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib); ++ SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib, &_delayedSymLinks); + PrintNewLine(); + return S_OK; + } + ++HRESULT CArchiveExtractCallback::SetFinalAttribs() ++{ ++ HRESULT result = S_OK; ++ ++ for (int i = 0; i != _delayedSymLinks.Size(); ++i) ++ if (!_delayedSymLinks[i].Create()) ++ result = E_FAIL; ++ ++ _delayedSymLinks.Clear(); ++ ++ return result; ++} + + STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password) + { +@@ -914,6 +929,8 @@ int MY_CDECL main(int numArgs, const char *args[]) + // extractCallbackSpec->PasswordIsDefined = true; + // extractCallbackSpec->Password = L"1"; + HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, extractCallback); ++ if (result == S_OK) ++ result = extractCallbackSpec->SetFinalAttribs(); + if (result != S_OK) + { + PrintError("Extract Error"); +diff --git a/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp b/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp +index 877326b..05b13f3 100644 +--- a/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp ++++ b/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp +@@ -1502,7 +1502,7 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResult(Int32 opRes) + NumFiles++; + + if (!_stdOutMode && _extractMode && _fi.AttribDefined) +- SetFileAttrib(_diskFilePath, _fi.Attrib); ++ SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks); + + RINOK(_extractCallback2->SetOperationResult(opRes, BoolToInt(_encrypted))); + +@@ -1584,8 +1584,9 @@ static unsigned GetNumSlashes(const FChar *s) + } + } + +-HRESULT CArchiveExtractCallback::SetDirsTimes() ++HRESULT CArchiveExtractCallback::SetFinalAttribs() + { ++ HRESULT result = S_OK; + CRecordVector<CExtrRefSortPair> pairs; + pairs.ClearAndSetSize(_extractedFolderPaths.Size()); + unsigned i; +@@ -1622,5 +1623,12 @@ HRESULT CArchiveExtractCallback::SetDirsTimes() + (WriteATime && ATimeDefined) ? &ATime : NULL, + (WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL)); + } +- return S_OK; ++ ++ for (int i = 0; i != _delayedSymLinks.Size(); ++i) ++ if (!_delayedSymLinks[i].Create()) ++ result = E_FAIL; ++ ++ _delayedSymLinks.Clear(); ++ ++ return result; + } +diff --git a/CPP/7zip/UI/Common/ArchiveExtractCallback.h b/CPP/7zip/UI/Common/ArchiveExtractCallback.h +index 1e9f0b6..b51d78f 100644 +--- a/CPP/7zip/UI/Common/ArchiveExtractCallback.h ++++ b/CPP/7zip/UI/Common/ArchiveExtractCallback.h +@@ -6,6 +6,8 @@ + #include "../../../Common/MyCom.h" + #include "../../../Common/Wildcard.h" + ++#include "../../../Windows/FileDir.h" ++ + #include "../../IPassword.h" + + #include "../../Common/FileStreams.h" +@@ -237,6 +239,8 @@ class CArchiveExtractCallback: + bool _saclEnabled; + #endif + ++ CObjectVector<NWindows::NFile::NDir::CDelayedSymLink> _delayedSymLinks; ++ + void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath); + HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined); + HRESULT GetUnpackSize(); +@@ -330,7 +334,7 @@ public: + } + #endif + +- HRESULT SetDirsTimes(); ++ HRESULT SetFinalAttribs(); + }; + + bool CensorNode_CheckPath(const NWildcard::CCensorNode &node, const CReadArcItem &item); +diff --git a/CPP/7zip/UI/Common/Extract.cpp b/CPP/7zip/UI/Common/Extract.cpp +index 5b96071..98192fa 100644 +--- a/CPP/7zip/UI/Common/Extract.cpp ++++ b/CPP/7zip/UI/Common/Extract.cpp +@@ -207,7 +207,7 @@ static HRESULT DecompressArchive( + else + result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs); + if (result == S_OK && !options.StdInMode) +- result = ecs->SetDirsTimes(); ++ result = ecs->SetFinalAttribs(); + return callback->ExtractResult(result); + } + +diff --git a/CPP/Windows/FileDir.cpp b/CPP/Windows/FileDir.cpp +index 422edfc..baa6255 100644 +--- a/CPP/Windows/FileDir.cpp ++++ b/CPP/Windows/FileDir.cpp +@@ -347,7 +347,8 @@ static int convert_to_symlink(const char * name) { + return -1; + } + +-bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes) ++bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes, ++ CObjectVector<CDelayedSymLink> *delayedSymLinks) + { + if (!fileName) { + SetLastError(ERROR_PATH_NOT_FOUND); +@@ -379,7 +380,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes) + stat_info.st_mode = fileAttributes >> 16; + #ifdef ENV_HAVE_LSTAT + if (S_ISLNK(stat_info.st_mode)) { +- if ( convert_to_symlink(name) != 0) { ++ if (delayedSymLinks) ++ delayedSymLinks->Add(CDelayedSymLink(name)); ++ else if ( convert_to_symlink(name) != 0) { + TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes))) + return false; + } +@@ -814,6 +817,44 @@ bool CTempDir::Remove() + return !_mustBeDeleted; + } + ++#ifdef ENV_UNIX ++ ++CDelayedSymLink::CDelayedSymLink(const char * source) ++ : _source(source) ++{ ++ struct stat st; ++ ++ if (lstat(_source, &st) == 0) { ++ _dev = st.st_dev; ++ _ino = st.st_ino; ++ } else { ++ _dev = 0; ++ } ++} ++ ++bool CDelayedSymLink::Create() ++{ ++ struct stat st; ++ ++ if (_dev == 0) { ++ errno = EPERM; ++ return false; ++ } ++ if (lstat(_source, &st) != 0) ++ return false; ++ if (_dev != st.st_dev || _ino != st.st_ino) { ++ // Placeholder file has been overwritten or moved by another ++ // symbolic link creation ++ errno = EPERM; ++ return false; ++ } ++ ++ return convert_to_symlink(_source) == 0; ++} ++ ++#endif // ENV_UNIX ++ ++ + }}} + + #ifndef _SFX +diff --git a/CPP/Windows/FileDir.h b/CPP/Windows/FileDir.h +index b13d1cc..7429a81 100644 +--- a/CPP/Windows/FileDir.h ++++ b/CPP/Windows/FileDir.h +@@ -4,6 +4,7 @@ + #define __WINDOWS_FILE_DIR_H + + #include "../Common/MyString.h" ++#include "../Common/MyVector.h" + + #include "FileIO.h" + +@@ -11,11 +12,14 @@ namespace NWindows { + namespace NFile { + namespace NDir { + ++class CDelayedSymLink; ++ + bool GetWindowsDir(FString &path); + bool GetSystemDir(FString &path); + + bool SetDirTime(CFSTR path, const FILETIME *cTime, const FILETIME *aTime, const FILETIME *mTime); +-bool SetFileAttrib(CFSTR path, DWORD attrib); ++bool SetFileAttrib(CFSTR path, DWORD attrib, ++ CObjectVector<CDelayedSymLink> *delayedSymLinks = 0); + bool MyMoveFile(CFSTR existFileName, CFSTR newFileName); + + #ifndef UNDER_CE +@@ -76,6 +80,31 @@ public: + bool Remove(); + }; + ++// Symbolic links must be created last so that they can't be used to ++// create or overwrite files above the extraction directory. ++class CDelayedSymLink ++{ ++#ifdef ENV_UNIX ++ // Where the symlink should be created. The target is specified in ++ // the placeholder file. ++ AString _source; ++ ++ // Device and inode of the placeholder file. Before creating the ++ // symlink, we must check that these haven't been changed by creation ++ // of another symlink. ++ dev_t _dev; ++ ino_t _ino; ++ ++public: ++ explicit CDelayedSymLink(const char * source); ++ bool Create(); ++#else // !ENV_UNIX ++public: ++ CDelayedSymLink(const char * source) {} ++ bool Create() { return true; } ++#endif // ENV_UNIX ++}; ++ + #if !defined(UNDER_CE) + class CCurrentDirRestorer + { diff --git a/app-arch/p7zip/p7zip-15.09.ebuild b/app-arch/p7zip/p7zip-15.09.ebuild new file mode 100644 index 000000000000..2b4b810a842b --- /dev/null +++ b/app-arch/p7zip/p7zip-15.09.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" + +inherit eutils multilib toolchain-funcs wxwidgets + +DESCRIPTION="Port of 7-Zip archiver for Unix" +HOMEPAGE="http://p7zip.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" + +LICENSE="LGPL-2.1 rar? ( unRAR )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" +IUSE="doc kde rar +pch static wxwidgets abi_x86_x32" + +REQUIRED_USE="kde? ( wxwidgets )" + +RDEPEND=" + kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" +DEPEND="${RDEPEND} + amd64? ( dev-lang/yasm ) + abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) + x86? ( dev-lang/nasm )" + +S=${WORKDIR}/${PN}_${PV} + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-CVE-2015-1038.patch + + if ! use pch; then + sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die + fi + + sed \ + -e 's:-m32 ::g' \ + -e 's:-m64 ::g' \ + -e 's:-pipe::g' \ + -e "/^CXX=/s:g++:$(tc-getCXX):" \ + -e "/^CC=/s:gcc:$(tc-getCC):" \ + -e '/ALLFLAGS/s:-s ::' \ + -e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \ + -i makefile* || die + + # remove non-free RAR codec + if use rar; then + ewarn "Enabling nonfree RAR decompressor" + else + sed \ + -e '/Rar/d' \ + -e '/RAR/d' \ + -i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die + rm -rf CPP/7zip/Compress/Rar || die + fi + + if use abi_x86_x32; then + sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die + cp -f makefile.linux_amd64_asm makefile.machine || die + elif use amd64; then + cp -f makefile.linux_amd64_asm makefile.machine || die + elif use x86; then + cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die + elif [[ ${CHOST} == *-darwin* ]] ; then + # Mac OS X needs this special makefile, because it has a non-GNU linker + [[ ${CHOST} == *64-* ]] \ + && cp -f makefile.macosx_64bits makefile.machine \ + || cp -f makefile.macosx_32bits makefile.machine + # bundles have extension .bundle but don't die because USE=-rar + # removes the Rar directory + sed -i -e '/strcpy(name/s/\.so/.bundle/' \ + CPP/Windows/DLL.cpp || die + sed -i -e '/^PROG=/s/\.so/.bundle/' \ + CPP/7zip/Bundles/Format7zFree/makefile \ + $(use rar && echo CPP/7zip/Compress/Rar/makefile) || die + elif use x86-fbsd; then + # FreeBSD needs this special makefile, because it hasn't -ldl + sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine + fi + + if use static; then + sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die + fi + + if use kde || use wxwidgets; then + need-wxwidgets unicode + einfo "Preparing dependency list" + emake depend + fi +} + +src_compile() { + emake all3 + if use kde || use wxwidgets; then + emake -- 7zG +# emake -- 7zFM + fi +} + +src_test() { + emake test test_7z test_7zr +} + +src_install() { + # this wrappers can not be symlinks, p7zip should be called with full path + make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr" + make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za" + make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z" + + if use kde || use wxwidgets; then + make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG" +# make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM" + +# make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression" + + dobin GUI/p7zipForFilemanager + exeinto /usr/$(get_libdir)/${PN} +# doexe bin/7z{G,FM} + doexe bin/7zG + + insinto /usr/$(get_libdir)/${PN} + doins -r GUI/{Lang,help} + + insinto /usr/share/icons/hicolor/16x16/apps/ + newins GUI/p7zip_16_ok.png p7zip.png + + if use kde; then + rm GUI/kde4/p7zip_compress.desktop || die + insinto /usr/share/kde4/services/ServiceMenus + doins GUI/kde4/*.desktop + fi + fi + + dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip + doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 + + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx + doexe bin/*$(get_modname) + if use rar; then + exeinto /usr/$(get_libdir)/${PN}/Codecs/ + doexe bin/Codecs/*$(get_modname) + fi + + doman man1/7z.1 man1/7za.1 man1/7zr.1 + dodoc ChangeLog README TODO + + if use doc; then + dodoc DOC/*.txt + dohtml -r DOC/MANUAL/* + fi +} diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest index 86315bfe9b58..4930f6b8399d 100644 --- a/app-arch/unrar/Manifest +++ b/app-arch/unrar/Manifest @@ -2,3 +2,4 @@ DIST unrarsrc-5.1.6.tar.gz 215185 SHA256 3c38eaabc655527244fd0c3ba3beff567ea24aa DIST unrarsrc-5.2.7.tar.gz 218880 SHA256 ef14757e943787b439fedf2c564c1f38d0db315528a928e0de170860717e2fac SHA512 95e06451e2bec46a12e5b9b1423c3ea31ce86859f8086812d9c442aaa69627f72635a6a8c197b30dbc7e99bbf7c7caaa25d703caecbe03c697cc0e5b7644d638 WHIRLPOOL 49f5492a7441192d96616f892012ca2dac8a94063e806ece3c62bf13d29beb9d2d0368a186c0f0bff8814c9e6af542ba6b447a61683295f560f120ff75507379 DIST unrarsrc-5.3.3.tar.gz 221930 SHA256 099c67a2fdb76e55386e4496d28cf6fd1ffd9ac394b95c46b73926c5f69bd107 SHA512 5dffa77043992b72dab10752c547c30d2ff884a18c8b19ddbbcd711e4a9f7f82020edfeb560bd10122c18296aaf08d27c7c1db4f6b62e3ec2a4cd0c449ec7d52 WHIRLPOOL 8be0c41a1ac81d9e9a16ce6b7cbc3479929ec65df8040a58a91c0c89d9b02a8ccde584e829e6ceea6ffa645939d68998f46627ba7df54942f76595cea8f26aaf DIST unrarsrc-5.3.6.tar.gz 223184 SHA256 b917f2c5258ff2012008f9aa46984ad22dce21702eb264623b256bb8c2577c1b SHA512 b596f69a7d1b5f6a1e3dc0f060018589dc415463c2a9f403a365e10f8e362c09de4d295df04939f2a33c8daf88de7fbe32395043b978636ea7eaa1c1d2ad80fc WHIRLPOOL 6016b9ead3c2ef573e28ff05809c56e8037c23c01ee05fca0ef46eccbcc7e673b5fa57a0a6839ac2670cce928234c290e82a21a83471818e9a56eeff7984fb3e +DIST unrarsrc-5.3.7.tar.gz 223455 SHA256 10b49c416df3ef38ad1d289b06d642c76f7cc44902adfc5bbed76096ef70d154 SHA512 ca07935e1febc471d770a992a50bdd2b3fa60f70b4a97a8b76e3eef6038644a2dcfa9726c2d630a35704762a5d69496ac00a700018831779ec1e4fc08b90919e WHIRLPOOL 3aee2f87bb7f09a78cbb45b86fb83565207dd72760ecbea6e2279f42f6b486651bd36bd972b032a75f49ae164ea698703914bd4e6bfb78d07cd1adbe6ac10ef6 diff --git a/app-arch/unrar/unrar-5.3.7.ebuild b/app-arch/unrar/unrar-5.3.7.ebuild new file mode 100644 index 000000000000..71373bb52655 --- /dev/null +++ b/app-arch/unrar/unrar-5.3.7.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic multilib toolchain-funcs + +MY_PN=${PN}src + +DESCRIPTION="Uncompress rar files" +HOMEPAGE="http://www.rarlab.com/rar_add.htm" +SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz" + +LICENSE="unRAR" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="" + +RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417" + +S=${WORKDIR}/unrar + +src_prepare() { + epatch "${FILESDIR}"/${PN}-5.0.2-build.patch + epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218 + local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" ) + if [[ ${CHOST} == *-darwin* ]] ; then + sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" ) + else + sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" ) + fi + sed -i "${sed_args[@]}" makefile || die +} + +src_configure() { + mkdir -p build-{lib,bin} + printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die + cp build-{lib,bin}/Makefile || die +} + +src_compile() { + unrar_make() { + emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@" + } + + unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib + ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die + ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die + + unrar_make -C build-bin +} + +src_install() { + dobin build-bin/unrar + dodoc readme.txt + + dolib.so build-lib/libunrar* + + insinto /usr/include/libunrar${PV%.*.*} + doins *.hpp + dosym libunrar${PV%.*.*} /usr/include/libunrar +} diff --git a/app-backup/tsm/Manifest b/app-backup/tsm/Manifest index 7bb8e27e1ec3..e0af9e2405c4 100644 --- a/app-backup/tsm/Manifest +++ b/app-backup/tsm/Manifest @@ -12,6 +12,20 @@ DIST 6.2.2-TIVsm-msg.RU_RU.i386.rpm 4222991 SHA256 20a28cdb598b273569071f997ddad DIST 6.2.2-TIVsm-msg.ZH_CN.i386.rpm 3030842 SHA256 6bf834e71053ad1264ce7fb631679664fe1ffd94690ff1d8f62da056c6b5cd15 SHA512 3331d0ea08451415641b34566117c4c91245796e58a3bc85270f952bed8d866973e77158e34f1f8859fe4f8d62010a1370de3fa6032660015a2ad726c66f9723 WHIRLPOOL 26fd7ab9af26a28f603d34a4ea74dc4116ae4b2b98abef8d4d8ed3eba03ee8383c72985b41d4dc1618410da9070189ef05766394afe66bec12e8d684481b0518 DIST 6.2.2-TIVsm-msg.ZH_TW.i386.rpm 3151673 SHA256 faa2fc951cbf1ae28b98b286030ea54b48fd4a4252aeeb035ecee63a2403b3e9 SHA512 20511841192c624e5a8a608f632baa27f8d331e69e178f33d533440b6bc646d08737210dff6a7c3458bed7fe730903fe7cbd1cdc6ada757cb2b680d127959edd WHIRLPOOL b6139b5e4887b74fd43dc4b33388d9763d61cc53c1219478a9c593ff4b697fed6695e9d53bad1836ba82d89936531b6782d151019d969a26d3ff8a39c2414ec1 DIST 6.2.2.0-TIV-TSMBAC-LinuxX86.tar 102215680 SHA256 6c1883a34c38ade6961ffd6c6837fd82051edfa97bce19b7ad76ced4c2683b7c SHA512 be981b57e859943650d09bec2176ccac89b88861ba8d97182495b0d86ce50f491a893c6fc930b6de70c4594b8a3d78a0a2f05ef11d6cda137f76ddae9d1524fb WHIRLPOOL 94921b4dca1a58458bc882ff69e9a2055fe22d32208c2bb9aea9dbaddc3396890c7a4002b569a80d905b5b771b0255d59ab080129e304c4d135c1e61d8fb8e52 +DIST 6.2.5-TIVsm-msg.CS_CZ.i386.rpm 4800856 SHA256 07f47b43aeb218fbb79a59d4fc96403c6e8e9f28bdc6d73bb8b2be9dc13e8520 SHA512 32e5b3f433012427c67ebbd416f4dbf87f603da4245d04a75da65438438a27c1b75e95440019313e6100d55fc50bb425ccade768fd578fcf13ccdf4b0d0b1c11 WHIRLPOOL 09fc5aacaa8462a2fce8f06f944c8bf02646aa0538a537ebad1baf867c81993895e37ed92bedc6b322f397a68ec4450e26f1a1894aef06694c97bfd9e269bbaa +DIST 6.2.5-TIVsm-msg.DE_DE.i386.rpm 3456289 SHA256 db4e5c71f092569264b5a546d7fb957b61dbce83cfd779fa2c874c77a4428aa2 SHA512 a41d2345a0dd19a13124454df3fd19c5e7c7b707b2547c5f4151ee00fe2a9d808c9b47c817a89fe41ced0fdbc4b3f69f98093c03db895f4e56b2c6bfa61f5d5f WHIRLPOOL 66b4a2304db83a8b3f401e889e3df581ee41e58cf7b5ee4d70cebdb76a6f79f92b88bdf7fddb76552bfd2de8872542325c1c4553eb439c47f5d7407b487128b2 +DIST 6.2.5-TIVsm-msg.ES_ES.i386.rpm 3509147 SHA256 d7dbac54b8a59a70ab31ee5e537213d36dba81dea73378bea2c4b80aadc346a1 SHA512 914c68bb783eeba2892ea07a436e06de596da153159e6a7f779412db574e4b4c974ea77220605cf43743451d5c56769f6eb7252b6caab698a4e1a85b0ca9b503 WHIRLPOOL ee880d0070de517718a503ebb4d3c2627df28b43f93948bfa1d6306040930e64b5e50196f1c6dc9df1c0d109a3de13ee6ebd4e9f863341e344ed63ca1bc56614 +DIST 6.2.5-TIVsm-msg.FR_FR.i386.rpm 3719029 SHA256 32fc549b190218bdf3b6a2834560b2f8a567a0539280c13215b8b761144070b1 SHA512 fe932634b1a816fafe36b61fae55638ef9d6835c4d702c237e4c0f8ee393c7c3cc8559b6feba7ab53ae9f589de6ac23f764594b4731f669065788c84c88e66d2 WHIRLPOOL 338bce5fa65fa36455a0d456d8bb0f2e92f99bacacabde7a896dc592ebb12ba27897b39975119341ce324d9a863e2c88966770d896f4ffd4ca109ce7871f4482 +DIST 6.2.5-TIVsm-msg.HU_HU.i386.rpm 3414093 SHA256 c32c86d8c16790ab8cc71a7870919e5f750aa5a220b0dc7cf178a976d4be793e SHA512 3f7ed14cccb73e3b018e67783abec9d29d3da9745ea3db50b4eec0cb5e8e49f56c9fe45932f812ca8b8fed6b61f020507a4c3cbd3c96757c02e71ab9cff053ac WHIRLPOOL 607a4059e0e31930a2e7ef2b16d85e30573c7b08530c571f95cd5cc539b5256cfdd108aec70ab91baabc874e84ba776474fc6f6fc7ccbef8b9901b259dc565bd +DIST 6.2.5-TIVsm-msg.IT_IT.i386.rpm 3282355 SHA256 a43f78e7335938741addccba74b09e95f24cd096ed6a23d5f439303e16eef8f5 SHA512 005e49348b1e391e19102e02803fa674f73814e12e293b3ad53705cc8925fa8ad0f6464f7f2a65fc9139dd1709e8ceea5c84528a39b35e44f5851fc1cf53848f WHIRLPOOL 0ba926a852ace1a7b2a7bafbcd231b5b7d4ffbe0891958c4ee80a4306079664f5dcea5def136b91c5fdd2f0c56baac07d11a97bd65c3776310ee0dab37b49a62 +DIST 6.2.5-TIVsm-msg.JA_JP.i386.rpm 3426786 SHA256 fbdf981a7a8cca7208dfb6a2234414d3d19936bef80dbc72b5f20e969515ce09 SHA512 6e32ab4ddd161ddac4d8d286bd28f97c3bc9cec08468877059d6ef5d58d9011fce6ef1a9330bc0ef9c79001f571af886f3d9fe3595bdb5a978ce251b6281b1ab WHIRLPOOL 7c2593ce09622c08700631e0bf489283362f478e9a6f22368da3c3490c9944caaef64444202cab39578dca83240c7e20b63a697faaa0ea69c5a1936ef0f25872 +DIST 6.2.5-TIVsm-msg.KO_KR.i386.rpm 3344401 SHA256 5df78c088f2d0c69b8f4b022e32dc966320f8e8d51c09bd97f6a7b5ae90e4802 SHA512 29ba8ff373a0c461f5bba3055057c0d5c3c174bce887e9c7bf6b9f63083fda364408137a295f29c2de60c6a4142cb2a5d8dea5ddd6919227a49c3f2315e67c41 WHIRLPOOL 8419ea138a321ef1c9e98c179e7faa5db96f2233c002fe9460b8a08f5cd5ae7164ece754dfa9556df54e8d0ce9ab005d80d85201d48ee5b2e381a2a9d862a3a1 +DIST 6.2.5-TIVsm-msg.PL_PL.i386.rpm 3260918 SHA256 27693227b4da08aa3f4c38167f4c430e52145bba175fbc6a729ef152e1786a00 SHA512 2acc5f5a7e5e907fd69e4b9877e7a50718967acfa00e25fe34ec787835fe3c22dad519f1887ce7a3d0f59369f0b1d0d281174227dbbf32d0a61df568e723d935 WHIRLPOOL f1c1ea79ef34b7d9aa18ad6ed18e5837f52655e1e09de26ae52a8e72df1279494183e62219c80c745907bd194663c192eb89786c3b4881e51fa7961e4fb02285 +DIST 6.2.5-TIVsm-msg.PT_BR.i386.rpm 3419164 SHA256 9c940a88d1c9ea413883b6fa1e6f58ebeae8df113d70577a81056cc688934502 SHA512 11fd6907f2435fc74cb617a883a0c83b725fac41f529c5052de1b6455ba6e7c2ff8829ec3affb81a801182753b5ec5939f3707ee6d880a2cf218dabdd3423bf5 WHIRLPOOL c87d858671fd5611f6a1ba6519a331644f8c1dde0facfdcfc0227f95d23cb2d43fa23d05d3b733f1f15d25d1d4cea299a616cede0d93435de48969c022fda935 +DIST 6.2.5-TIVsm-msg.RU_RU.i386.rpm 4251314 SHA256 35840ad981017ccf598904b04327d14bc5fe0ea53d6a355beaa6f51ba8a5d952 SHA512 be2dd6d7d635411e01211855c4841844981e196e68474b0e83b8a6c1ffa44427b5a4549672c17c16806b4e252d728bdc1b459afedeaf374940be9d5e2afa8260 WHIRLPOOL e4aa63549cd10b446e47ca97d5bd62d81058efb4a1b514ca478dc826f85e834cf86bf741f50b4b8f2871605e6ad744093455439b4f4524785de18ee6632ab9d0 +DIST 6.2.5-TIVsm-msg.ZH_CN.i386.rpm 3060726 SHA256 7a5e0df2d3c7da4b84ace6f70e48e78954118d16e7f53373505e40cb38c03df4 SHA512 e9f3a22bdf460bf326c018c6f016c5709b4fd235da0585a198e493a56b7ac9d7f1ed827696da7cbe0a1176a37fe2360009aa099f2ec908944c96f744fbb8c85d WHIRLPOOL 6d42fd895d1169a34371da693f9ec2b4f5f8e344f5554d721cf67fb821349688d3ef84db9218b2938b1231bdf33ac106816d12228d1dcbd1310bb06f0123f1c9 +DIST 6.2.5-TIVsm-msg.ZH_TW.i386.rpm 3181619 SHA256 4ec5d47fd9f36791a8e2321c2e03382634aabbc26366958c4b12fc3d9d6d5bb7 SHA512 f2c9a47c89166e453d2083efbc819a96116a78167b4818c4e92929a32b3dd1d41883b6ca5effea42dd42e1254d935dd2ca02ba3886cd49522305b065329b5a64 WHIRLPOOL c8262a71ed0af12ba2789b2d12ee0c7dc53c7b1147ebc09159a57fda4acaa0adaaefd23af9169e9cc744f42ad726b38437c1cb37c2b9d2260eba661d426c6089 +DIST 6.2.5.4-TIV-TSMBAC-LinuxX86.tar 102727680 SHA256 752a1c94b3dcb21ce096fd73d081340212d999a29344f5589c25e12d5d74a55e SHA512 92857490728f13c2ebcf4cb32dcc43b6a3ae1ac11e6b409435509d3b5412ff78179c1eaf43591057646008178376eb0336aa14c3b88aaef9adbf520182e85c44 WHIRLPOOL dbe5ed6341a3bf8adac6450de2ac71fcd084df6f912225c04f7921808c6464a9962f5349aa8c7a6e8fcc81d82b7b96981aa69988c006f2d6194889c1baa1c145 DIST 6.3.0.5-TIV-TSMBAC-LinuxX86.tar 127825920 SHA256 8af4112da3450865af2db4cfe3ac0c50aeaba41c7b5d648e44bf169172ebb471 SHA512 92e11084481beeba3a35b6324fd3afc557aa28924f72a34710f8a62aff41a8397a5886919777ff9868384dabc3fd3d0c4290f38ea0b8962fde084b13e9430947 WHIRLPOOL 69f8eb3dbdce913c0f9c9cd35d35c03d381b3fd8709d8e44a8cef35b32b3442936a71c2494051153be11471e4b346de0c3a45a13c554f7ebc058697ef673b575 DIST 6.3.0.5-TIVsm-msg.CS_CZ.x86_64.rpm 4957692 SHA256 84748fb6e95717322dcfdffef04ebc39c31a73428f027f23bb828f4b739bba62 SHA512 bad32bb3d0faa75c696506d191e1af97efbf89d9109a2c11e065a8e21c2d0d3dc499faee1845031311356275fc6508f1ad85b0f9057feace7ba8751c4eb4e21e WHIRLPOOL 2f53fd6c5ef333ca1cdfa1b58a9ccbd8571b65851b20b89160b7d5d8e5cd3879560c5ee270c90d88630bcc2940eee975147f2a3cc9a1dec6f9fbd3216ac703b8 DIST 6.3.0.5-TIVsm-msg.DE_DE.x86_64.rpm 3593003 SHA256 c589e5267726f8e660e0c82136d2d25d5505dc58ece6e43440a10d5abed2ab81 SHA512 4b55f8a68fb9344347c42877f225c8af583224aa644c0c3400a9f4ce256b00f0eede58b34e801301b53d2daca3a6ae2e1f4750293f016d27e1df697d940865ba WHIRLPOOL 53021f3c52a6c5c9b8fa5aefd7832a07aa718ea5ee0207817b7cc9ce508afaf7619b834336e4c55be4d7a75938a05d7bbf3d95d74d039ee51bec07efe209b5a9 diff --git a/app-backup/tsm/metadata.xml b/app-backup/tsm/metadata.xml index a7b841e12d53..6328f119b348 100644 --- a/app-backup/tsm/metadata.xml +++ b/app-backup/tsm/metadata.xml @@ -15,6 +15,11 @@ <email>dilfridge@gentoo.org</email> <description>Proxy maintainer, CC him in bugs.</description> </maintainer> + <maintainer> + <email>xmw@gentoo.org</email> + <name>Michael Weber</name> + <description>Proxy maintainer, CC him in bugs.</description> + </maintainer> <use> <flag name="hsm">Installs Tivoli Storage Manager for Space Management</flag> <flag name="tsm_cit">IBM Tivoli Common Inventory Technology</flag> diff --git a/app-backup/tsm/tsm-6.2.5.4.ebuild b/app-backup/tsm/tsm-6.2.5.4.ebuild new file mode 100644 index 000000000000..42a39190419f --- /dev/null +++ b/app-backup/tsm/tsm-6.2.5.4.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit versionator multilib eutils rpm pax-utils user + +DESCRIPTION="Tivoli Storage Manager (TSM) Backup/Archive (B/A) Client and API" +HOMEPAGE="http://www.tivoli.com/" + +MY_PV_MAJOR=$(get_major_version) +MY_PV_MINOR=$(get_version_component_range 2) +MY_PV_TINY=$(get_version_component_range 3) +MY_PV_PATCH=$(get_version_component_range 4) + +MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}" +MY_PVR_ALLDOTS=${PV} + +if [[ ${MY_PV_PATCH} == 0 ]]; then + MY_RELEASE_PATH=maintenance +else + MY_RELEASE_PATH=patches +fi +BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/" +BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/" +BASE_URI+="Linux/LinuxX86/v${MY_PV_NODOTS}/" +SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar" +SRC_URI="${BASE_URI}${SRC_TAR}" + +RESTRICT="strip" # Breaks libPiIMG.ss and libPiSNAP.so +LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab + dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a + ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C + || ( BSD GPL-2+ ) gSOAP libpng tsm" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="hsm" + +QA_PREBUILT="*" + +MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT + ja:JA_JP ko:KO_KR pl:PL_PL pt:PT_BR ru:RU_RU zh:ZH_CN zh_TW:ZH_TW" +MY_LANG_PV="$(get_version_component_range 1-3)-" +for lang in ${MY_LANGS}; do + IUSE="${IUSE} linguas_${lang%:*}" + SRC_URI="${SRC_URI} linguas_${lang%:*}? ( ${BASE_URI}TIVsm-msg.${lang#*:}.i386.rpm -> ${MY_LANG_PV}TIVsm-msg.${lang#*:}.i386.rpm )" +done +unset lang + +DEPEND="" +RDEPEND="sys-libs/libstdc++-v3" + +S="${WORKDIR}" + +pkg_setup() { + enewgroup tsm +} + +src_unpack() { + local rpm rpms lang + unpack ${SRC_TAR} + + for rpm in *.rpm; do + case ${rpm} in + gsk*64-*|*API64*) + use amd64 && rpms="${rpms} ./${rpm}" + ;; + *HSM*) + use hsm && rpms="${rpms} ./${rpm}" + ;; + *) + rpms="${rpms} ./${rpm}" + ;; + esac + done + for rpm in ${A}; do + case ${rpm} in + *.rpm) + rpms="${rpms} ${rpm}" + ;; + esac + done + + rpm_unpack ${rpms} + + # Avoid strange error messages caused by read-only files + chmod -R u+w "${S}" +} + +src_prepare() { + # Avoid unnecessary dependency on ksh + sed -i 's:^#!/usr/bin/ksh:#!/bin/bash:' \ + opt/tivoli/tsm/client/ba/bin/dsmj || die +} + +src_install() { + cp -a opt "${D}" + cp -a usr "${D}" + + # The RPM files contain postinstall scripts which can be extracted + # e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 . + # Below we try to mimic the behaviour of these scripts. + # We don't deal with SELinux compliance (yet), though. + local RPM_INSTALL_PREFIX CLIENTDIR TIVINV_DIR TIVINVFILE i + RPM_INSTALL_PREFIX=/opt + CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client + + # We don't bother setting timestamps to build dates. + # But we should delete the corresponding files. + rm -f "${D}"$CLIENTDIR/api/bin*/.buildDate + rm -f "${D}"$CLIENTDIR/ba/bin*/.buildDate + rm -f "${D}"$CLIENTDIR/lang/.buildDate + + # Create links for messages; this is spread over several postin scripts. + for i in $(cd "${D}"/${CLIENTDIR}/lang; ls -1d ??_??); do + dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i} + dosym ../../lang/${i} $CLIENTDIR/api/bin/${i} + use amd64 && dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i} + done + + # Mimic TIVsm-API and -API64 postinstall script + for i in libgpfs.so libdmapi.so; do + dosym ../..$CLIENTDIR/api/bin/${i} /usr/lib + done + dosym ../..$CLIENTDIR/ba/bin/libzephyr.so /usr/lib/libTSMNetAppzephyr.so + + # Mimic TIVsm-BA postinstall script + for i in /etc/adsm{,/SpaceMan,/config,/status}; do + keepdir ${i} + fowners bin:bin ${i} + fperms 2775 ${i} + done + TIVINV_DIR="/opt/tivoli/tsm/tivinv" + TIVINVFILE="TIVTSMBAC0602.SYS2" + dodir $TIVINV_DIR + echo " " \ + > "${D}$TIVINV_DIR/$TIVINVFILE" + fperms 555 $TIVINV_DIR/$TIVINVFILE + + # Haven't ported the TIVsm-HSM postinstall script (yet). + if use hsm; then + ewarn "This ebuild doesn't mimic the HSM postinstall script." + fi + + # The gscrypt{32|64} postinstall script only deals with s390[x] SELinux. + + # Mimic gskssl32 postinstall script + for i in acmeidup valn km cms p11 dbfl kicc ssl sys ldap drld iccs; do + dosym ../local/ibm/gsk8/lib/libgsk8${i}.so /usr/lib/libgsk8${i}.so + done + for i in capicmd ver; do + dosym ../local/ibm/gsk8/bin/gsk8${i} /usr/bin/${i} + done + + # Mimic gskssl64 postinstall script + if use amd64; then + for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do + dosym ../local/ibm/gsk8_64/lib64/libgsk8${i}_64.so \ + /usr/lib64/libgsk8${i}_64.so + done + for i in capicmd ver; do + dosym ../local/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/${i}_64 + done + fi + + # Done with the postinstall scripts as the RPMs contain them. + # Now on to some more Gentoo-specific installation. + + use amd64 && mv "${D}usr/lib" "${D}usr/lib32" + + fowners -R :tsm /opt/tivoli + fperms -R g+rX,o-rX /opt/tivoli # Allow only tsm group users to access TSM tools + fperms 4710 /opt/tivoli/tsm/client/ba/bin/dsmtca + + keepdir /var/log/tsm + fowners :tsm /var/log/tsm + fperms 2770 /var/log/tsm + insinto /etc/logrotate.d + newins "${FILESDIR}/tsm.logrotate" tsm + + keepdir /etc/tivoli + + cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" + echo ' PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys + echo ' PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys + + # Added the hostname to be more friendly, the admin will need to edit this file anyway + echo ' NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys + echo ' ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys + echo ' SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys + dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys + + cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt" + dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt + + # Setup the env + dodir /etc/env.d + ENV_FILE="${D}/etc/env.d/80tivoli" + echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE} + echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE} + echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE} + echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE} + + newconfd "${FILESDIR}/dsmc.conf.d" dsmc + newinitd "${FILESDIR}/dsmc.init.d" dsmc + newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad + + elog + elog "Note that you have to be either root or member of the group tsm to be able to use the" + elog "Tivoli Storage Manager client." + elog + +} + +pkg_postinst() { + local i + for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do + if [[ ! -e $i ]]; then + touch $i + chown :tsm $i + chmod 0660 $i + fi + done +} + +pkg_postinst() { + pax-mark psme /opt/tivoli/tsm/client/ba/bin/dsmc + # most likely some of the other executables (e.g. dsm) need this as well, but I + # cannot test it at the moment. - dilfridge +} diff --git a/app-backup/tsm/tsm-6.3.0.5-r2.ebuild b/app-backup/tsm/tsm-6.3.0.5-r2.ebuild index f75386b7d441..7990d47ffcd8 100644 --- a/app-backup/tsm/tsm-6.3.0.5-r2.ebuild +++ b/app-backup/tsm/tsm-6.3.0.5-r2.ebuild @@ -35,7 +35,7 @@ LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exola || ( BSD GPL-2+ ) gSOAP libpng tsm" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 -*" IUSE="acl java +tsm_cit +tsm_hw" QA_PREBUILT="*" diff --git a/app-backup/tsm/tsm-6.4.0.0-r1.ebuild b/app-backup/tsm/tsm-6.4.0.0-r1.ebuild index d8d6afaf927a..4af8b46e06c2 100644 --- a/app-backup/tsm/tsm-6.4.0.0-r1.ebuild +++ b/app-backup/tsm/tsm-6.4.0.0-r1.ebuild @@ -35,7 +35,7 @@ LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exola || ( BSD GPL-2+ ) gSOAP libpng tsm" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 -*" IUSE="acl java +tsm_cit +tsm_hw" QA_PREBUILT="*" diff --git a/app-backup/tsm/tsm-7.1.0.0-r1.ebuild b/app-backup/tsm/tsm-7.1.0.0-r1.ebuild index 9cf6102dce4f..06b5839e054d 100644 --- a/app-backup/tsm/tsm-7.1.0.0-r1.ebuild +++ b/app-backup/tsm/tsm-7.1.0.0-r1.ebuild @@ -35,7 +35,7 @@ LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exola || ( BSD GPL-2+ ) gSOAP libpng tsm" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 -*" IUSE="acl java +tsm_cit +tsm_hw" QA_PREBUILT="*" diff --git a/app-backup/tsm/tsm-7.1.2.0.ebuild b/app-backup/tsm/tsm-7.1.2.0.ebuild index 7bdbe858b56b..a7ec829db66f 100644 --- a/app-backup/tsm/tsm-7.1.2.0.ebuild +++ b/app-backup/tsm/tsm-7.1.2.0.ebuild @@ -35,7 +35,7 @@ LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exola || ( BSD GPL-2+ ) gSOAP libpng tsm" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 -*" IUSE="acl java +tsm_cit +tsm_hw" QA_PREBUILT="*" diff --git a/app-crypt/cryptkeeper/metadata.xml b/app-crypt/cryptkeeper/metadata.xml index ad4f9bee6d8f..085212f60315 100644 --- a/app-crypt/cryptkeeper/metadata.xml +++ b/app-crypt/cryptkeeper/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>phobosk@kbfx.net</email> + <email>phobosk@fastmail.fm</email> <name>PhobosK</name> <description>Proxy maintainer. Assign bugs to him.</description> </maintainer> diff --git a/app-crypt/mit-krb5/files/CVE-2015-2695.patch b/app-crypt/mit-krb5/files/CVE-2015-2695.patch new file mode 100644 index 000000000000..08bc8ab4bb55 --- /dev/null +++ b/app-crypt/mit-krb5/files/CVE-2015-2695.patch @@ -0,0 +1,564 @@ +From b51b33f2bc5d1497ddf5bd107f791c101695000d Mon Sep 17 00:00:00 2001 +From: Nicolas Williams <nico@twosigma.com> +Date: Mon, 14 Sep 2015 12:27:52 -0400 +Subject: [PATCH] Fix SPNEGO context aliasing bugs [CVE-2015-2695] + +The SPNEGO mechanism currently replaces its context handle with the +mechanism context handle upon establishment, under the assumption that +most GSS functions are only called after context establishment. This +assumption is incorrect, and can lead to aliasing violations for some +programs. Maintain the SPNEGO context structure after context +establishment and refer to it in all GSS methods. Add initiate and +opened flags to the SPNEGO context structure for use in +gss_inquire_context() prior to context establishment. + +CVE-2015-2695: + +In MIT krb5 1.5 and later, applications which call +gss_inquire_context() on a partially-established SPNEGO context can +cause the GSS-API library to read from a pointer using the wrong type, +generally causing a process crash. This bug may go unnoticed, because +the most common SPNEGO authentication scenario establishes the context +after just one call to gss_accept_sec_context(). Java server +applications using the native JGSS provider are vulnerable to this +bug. A carefully crafted SPNEGO packet might allow the +gss_inquire_context() call to succeed with attacker-determined +results, but applications should not make access control decisions +based on gss_inquire_context() results prior to context establishment. + + CVSSv2 Vector: AV:N/AC:M/Au:N/C:N/I:N/A:C/E:POC/RL:OF/RC:C + +[ghudson@mit.edu: several bugfixes, style changes, and edge-case +behavior changes; commit message and CVE description] + +ticket: 8244 +target_version: 1.14 +tags: pullup +--- + src/lib/gssapi/spnego/gssapiP_spnego.h | 2 + + src/lib/gssapi/spnego/spnego_mech.c | 254 ++++++++++++++++++++++++--------- + 2 files changed, 192 insertions(+), 64 deletions(-) + +diff --git a/src/lib/gssapi/spnego/gssapiP_spnego.h b/src/lib/gssapi/spnego/gssapiP_spnego.h +index 57372de..5c82764 100644 +--- a/src/lib/gssapi/spnego/gssapiP_spnego.h ++++ b/src/lib/gssapi/spnego/gssapiP_spnego.h +@@ -103,6 +103,8 @@ typedef struct { + int firstpass; + int mech_complete; + int nego_done; ++ int initiate; ++ int opened; + OM_uint32 ctx_flags; + gss_name_t internal_name; + gss_OID actual_mech; +diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c +index ef76e1f..7849c85 100644 +--- a/src/lib/gssapi/spnego/spnego_mech.c ++++ b/src/lib/gssapi/spnego/spnego_mech.c +@@ -102,7 +102,7 @@ static OM_uint32 get_negotiable_mechs(OM_uint32 *, spnego_gss_cred_id_t, + gss_cred_usage_t, gss_OID_set *); + static void release_spnego_ctx(spnego_gss_ctx_id_t *); + static void check_spnego_options(spnego_gss_ctx_id_t); +-static spnego_gss_ctx_id_t create_spnego_ctx(void); ++static spnego_gss_ctx_id_t create_spnego_ctx(int); + static int put_mech_set(gss_OID_set mechSet, gss_buffer_t buf); + static int put_input_token(unsigned char **, gss_buffer_t, unsigned int); + static int put_mech_oid(unsigned char **, gss_OID_const, unsigned int); +@@ -454,7 +454,7 @@ check_spnego_options(spnego_gss_ctx_id_t spnego_ctx) + } + + static spnego_gss_ctx_id_t +-create_spnego_ctx(void) ++create_spnego_ctx(int initiate) + { + spnego_gss_ctx_id_t spnego_ctx = NULL; + spnego_ctx = (spnego_gss_ctx_id_t) +@@ -477,6 +477,8 @@ create_spnego_ctx(void) + spnego_ctx->mic_rcvd = 0; + spnego_ctx->mech_complete = 0; + spnego_ctx->nego_done = 0; ++ spnego_ctx->opened = 0; ++ spnego_ctx->initiate = initiate; + spnego_ctx->internal_name = GSS_C_NO_NAME; + spnego_ctx->actual_mech = GSS_C_NO_OID; + +@@ -642,7 +644,7 @@ init_ctx_new(OM_uint32 *minor_status, + OM_uint32 ret; + spnego_gss_ctx_id_t sc = NULL; + +- sc = create_spnego_ctx(); ++ sc = create_spnego_ctx(1); + if (sc == NULL) + return GSS_S_FAILURE; + +@@ -659,10 +661,7 @@ init_ctx_new(OM_uint32 *minor_status, + ret = GSS_S_FAILURE; + goto cleanup; + } +- /* +- * The actual context is not yet determined, set the output +- * context handle to refer to the spnego context itself. +- */ ++ + sc->ctx_handle = GSS_C_NO_CONTEXT; + *ctx = (gss_ctx_id_t)sc; + sc = NULL; +@@ -1108,16 +1107,11 @@ spnego_gss_init_sec_context( + } + gss_release_buffer(&tmpmin, &mechtok_out); + if (ret == GSS_S_COMPLETE) { +- /* +- * Now, switch the output context to refer to the +- * negotiated mechanism's context. +- */ +- *context_handle = (gss_ctx_id_t)spnego_ctx->ctx_handle; ++ spnego_ctx->opened = 1; + if (actual_mech != NULL) + *actual_mech = spnego_ctx->actual_mech; + if (ret_flags != NULL) + *ret_flags = spnego_ctx->ctx_flags; +- release_spnego_ctx(&spnego_ctx); + } else if (ret != GSS_S_CONTINUE_NEEDED) { + if (spnego_ctx != NULL) { + gss_delete_sec_context(&tmpmin, +@@ -1285,7 +1279,7 @@ acc_ctx_hints(OM_uint32 *minor_status, + if (ret != GSS_S_COMPLETE) + goto cleanup; + +- sc = create_spnego_ctx(); ++ sc = create_spnego_ctx(0); + if (sc == NULL) { + ret = GSS_S_FAILURE; + goto cleanup; +@@ -1367,7 +1361,7 @@ acc_ctx_new(OM_uint32 *minor_status, + gss_release_buffer(&tmpmin, &sc->DER_mechTypes); + assert(mech_wanted != GSS_C_NO_OID); + } else +- sc = create_spnego_ctx(); ++ sc = create_spnego_ctx(0); + if (sc == NULL) { + ret = GSS_S_FAILURE; + *return_token = NO_TOKEN_SEND; +@@ -1750,13 +1744,12 @@ spnego_gss_accept_sec_context( + ret = GSS_S_FAILURE; + } + if (ret == GSS_S_COMPLETE) { +- *context_handle = (gss_ctx_id_t)sc->ctx_handle; ++ sc->opened = 1; + if (sc->internal_name != GSS_C_NO_NAME && + src_name != NULL) { + *src_name = sc->internal_name; + sc->internal_name = GSS_C_NO_NAME; + } +- release_spnego_ctx(&sc); + } else if (ret != GSS_S_CONTINUE_NEEDED) { + if (sc != NULL) { + gss_delete_sec_context(&tmpmin, &sc->ctx_handle, +@@ -2069,8 +2062,13 @@ spnego_gss_unwrap( + gss_qop_t *qop_state) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ + ret = gss_unwrap(minor_status, +- context_handle, ++ sc->ctx_handle, + input_message_buffer, + output_message_buffer, + conf_state, +@@ -2090,8 +2088,13 @@ spnego_gss_wrap( + gss_buffer_t output_message_buffer) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ + ret = gss_wrap(minor_status, +- context_handle, ++ sc->ctx_handle, + conf_req_flag, + qop_req, + input_message_buffer, +@@ -2108,8 +2111,14 @@ spnego_gss_process_context_token( + const gss_buffer_t token_buffer) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ /* SPNEGO doesn't have its own context tokens. */ ++ if (!sc->opened) ++ return (GSS_S_DEFECTIVE_TOKEN); ++ + ret = gss_process_context_token(minor_status, +- context_handle, ++ sc->ctx_handle, + token_buffer); + + return (ret); +@@ -2133,19 +2142,9 @@ spnego_gss_delete_sec_context( + if (*ctx == NULL) + return (GSS_S_COMPLETE); + +- /* +- * If this is still an SPNEGO mech, release it locally. +- */ +- if ((*ctx)->magic_num == SPNEGO_MAGIC_ID) { +- (void) gss_delete_sec_context(minor_status, +- &(*ctx)->ctx_handle, +- output_token); +- (void) release_spnego_ctx(ctx); +- } else { +- ret = gss_delete_sec_context(minor_status, +- context_handle, +- output_token); +- } ++ (void) gss_delete_sec_context(minor_status, &(*ctx)->ctx_handle, ++ output_token); ++ (void) release_spnego_ctx(ctx); + + return (ret); + } +@@ -2157,8 +2156,13 @@ spnego_gss_context_time( + OM_uint32 *time_rec) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ + ret = gss_context_time(minor_status, +- context_handle, ++ sc->ctx_handle, + time_rec); + return (ret); + } +@@ -2170,9 +2174,20 @@ spnego_gss_export_sec_context( + gss_buffer_t interprocess_token) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = *(spnego_gss_ctx_id_t *)context_handle; ++ ++ /* We don't currently support exporting partially established ++ * contexts. */ ++ if (!sc->opened) ++ return GSS_S_UNAVAILABLE; ++ + ret = gss_export_sec_context(minor_status, +- context_handle, ++ &sc->ctx_handle, + interprocess_token); ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) { ++ release_spnego_ctx(&sc); ++ *context_handle = GSS_C_NO_CONTEXT; ++ } + return (ret); + } + +@@ -2182,11 +2197,12 @@ spnego_gss_import_sec_context( + const gss_buffer_t interprocess_token, + gss_ctx_id_t *context_handle) + { +- OM_uint32 ret; +- ret = gss_import_sec_context(minor_status, +- interprocess_token, +- context_handle); +- return (ret); ++ /* ++ * Until we implement partial context exports, there are no SPNEGO ++ * exported context tokens, only tokens for underlying mechs. So just ++ * return an error for now. ++ */ ++ return GSS_S_UNAVAILABLE; + } + #endif /* LEAN_CLIENT */ + +@@ -2203,16 +2219,48 @@ spnego_gss_inquire_context( + int *opened) + { + OM_uint32 ret = GSS_S_COMPLETE; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (src_name != NULL) ++ *src_name = GSS_C_NO_NAME; ++ if (targ_name != NULL) ++ *targ_name = GSS_C_NO_NAME; ++ if (lifetime_rec != NULL) ++ *lifetime_rec = 0; ++ if (mech_type != NULL) ++ *mech_type = (gss_OID)gss_mech_spnego; ++ if (ctx_flags != NULL) ++ *ctx_flags = 0; ++ if (locally_initiated != NULL) ++ *locally_initiated = sc->initiate; ++ if (opened != NULL) ++ *opened = sc->opened; ++ ++ if (sc->ctx_handle != GSS_C_NO_CONTEXT) { ++ ret = gss_inquire_context(minor_status, sc->ctx_handle, ++ src_name, targ_name, lifetime_rec, ++ mech_type, ctx_flags, NULL, NULL); ++ } + +- ret = gss_inquire_context(minor_status, +- context_handle, +- src_name, +- targ_name, +- lifetime_rec, +- mech_type, +- ctx_flags, +- locally_initiated, +- opened); ++ if (!sc->opened) { ++ /* ++ * We are still doing SPNEGO negotiation, so report SPNEGO as ++ * the OID. After negotiation is complete we will report the ++ * underlying mechanism OID. ++ */ ++ if (mech_type != NULL) ++ *mech_type = (gss_OID)gss_mech_spnego; ++ ++ /* ++ * Remove flags we don't support with partially-established ++ * contexts. (Change this to keep GSS_C_TRANS_FLAG if we add ++ * support for exporting partial SPNEGO contexts.) ++ */ ++ if (ctx_flags != NULL) { ++ *ctx_flags &= ~GSS_C_PROT_READY_FLAG; ++ *ctx_flags &= ~GSS_C_TRANS_FLAG; ++ } ++ } + + return (ret); + } +@@ -2227,8 +2275,13 @@ spnego_gss_wrap_size_limit( + OM_uint32 *max_input_size) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ + ret = gss_wrap_size_limit(minor_status, +- context_handle, ++ sc->ctx_handle, + conf_req_flag, + qop_req, + req_output_size, +@@ -2245,8 +2298,13 @@ spnego_gss_get_mic( + gss_buffer_t message_token) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ + ret = gss_get_mic(minor_status, +- context_handle, ++ sc->ctx_handle, + qop_req, + message_buffer, + message_token); +@@ -2262,8 +2320,13 @@ spnego_gss_verify_mic( + gss_qop_t *qop_state) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ + ret = gss_verify_mic(minor_status, +- context_handle, ++ sc->ctx_handle, + msg_buffer, + token_buffer, + qop_state); +@@ -2278,8 +2341,14 @@ spnego_gss_inquire_sec_context_by_oid( + gss_buffer_set_t *data_set) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ /* There are no SPNEGO-specific OIDs for this function. */ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_UNAVAILABLE); ++ + ret = gss_inquire_sec_context_by_oid(minor_status, +- context_handle, ++ sc->ctx_handle, + desired_object, + data_set); + return (ret); +@@ -2359,8 +2428,15 @@ spnego_gss_set_sec_context_option( + const gss_buffer_t value) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)*context_handle; ++ ++ /* There are no SPNEGO-specific OIDs for this function, and we cannot ++ * construct an empty SPNEGO context with it. */ ++ if (sc == NULL || sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_UNAVAILABLE); ++ + ret = gss_set_sec_context_option(minor_status, +- context_handle, ++ &sc->ctx_handle, + desired_object, + value); + return (ret); +@@ -2377,8 +2453,13 @@ spnego_gss_wrap_aead(OM_uint32 *minor_status, + gss_buffer_t output_message_buffer) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ + ret = gss_wrap_aead(minor_status, +- context_handle, ++ sc->ctx_handle, + conf_req_flag, + qop_req, + input_assoc_buffer, +@@ -2399,8 +2480,13 @@ spnego_gss_unwrap_aead(OM_uint32 *minor_status, + gss_qop_t *qop_state) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ + ret = gss_unwrap_aead(minor_status, +- context_handle, ++ sc->ctx_handle, + input_message_buffer, + input_assoc_buffer, + output_payload_buffer, +@@ -2419,8 +2505,13 @@ spnego_gss_wrap_iov(OM_uint32 *minor_status, + int iov_count) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ + ret = gss_wrap_iov(minor_status, +- context_handle, ++ sc->ctx_handle, + conf_req_flag, + qop_req, + conf_state, +@@ -2438,8 +2529,13 @@ spnego_gss_unwrap_iov(OM_uint32 *minor_status, + int iov_count) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ + ret = gss_unwrap_iov(minor_status, +- context_handle, ++ sc->ctx_handle, + conf_state, + qop_state, + iov, +@@ -2457,8 +2553,13 @@ spnego_gss_wrap_iov_length(OM_uint32 *minor_status, + int iov_count) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ + ret = gss_wrap_iov_length(minor_status, +- context_handle, ++ sc->ctx_handle, + conf_req_flag, + qop_req, + conf_state, +@@ -2475,8 +2576,13 @@ spnego_gss_complete_auth_token( + gss_buffer_t input_message_buffer) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_UNAVAILABLE); ++ + ret = gss_complete_auth_token(minor_status, +- context_handle, ++ sc->ctx_handle, + input_message_buffer); + return (ret); + } +@@ -2721,8 +2827,13 @@ spnego_gss_pseudo_random(OM_uint32 *minor_status, + gss_buffer_t prf_out) + { + OM_uint32 ret; ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ + ret = gss_pseudo_random(minor_status, +- context, ++ sc->ctx_handle, + prf_key, + prf_in, + desired_output_len, +@@ -2863,7 +2974,12 @@ spnego_gss_get_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, + gss_qop_t qop_req, gss_iov_buffer_desc *iov, + int iov_count) + { +- return gss_get_mic_iov(minor_status, context_handle, qop_req, iov, ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ ++ return gss_get_mic_iov(minor_status, sc->ctx_handle, qop_req, iov, + iov_count); + } + +@@ -2872,7 +2988,12 @@ spnego_gss_verify_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, + gss_qop_t *qop_state, gss_iov_buffer_desc *iov, + int iov_count) + { +- return gss_verify_mic_iov(minor_status, context_handle, qop_state, iov, ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ ++ return gss_verify_mic_iov(minor_status, sc->ctx_handle, qop_state, iov, + iov_count); + } + +@@ -2881,7 +3002,12 @@ spnego_gss_get_mic_iov_length(OM_uint32 *minor_status, + gss_ctx_id_t context_handle, gss_qop_t qop_req, + gss_iov_buffer_desc *iov, int iov_count) + { +- return gss_get_mic_iov_length(minor_status, context_handle, qop_req, iov, ++ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; ++ ++ if (sc->ctx_handle == GSS_C_NO_CONTEXT) ++ return (GSS_S_NO_CONTEXT); ++ ++ return gss_get_mic_iov_length(minor_status, sc->ctx_handle, qop_req, iov, + iov_count); + } + diff --git a/app-crypt/mit-krb5/files/CVE-2015-2696.patch b/app-crypt/mit-krb5/files/CVE-2015-2696.patch new file mode 100644 index 000000000000..c1f50a59c294 --- /dev/null +++ b/app-crypt/mit-krb5/files/CVE-2015-2696.patch @@ -0,0 +1,731 @@ +From e04f0283516e80d2f93366e0d479d13c9b5c8c2a Mon Sep 17 00:00:00 2001 +From: Nicolas Williams <nico@twosigma.com> +Date: Mon, 14 Sep 2015 12:28:36 -0400 +Subject: [PATCH] Fix IAKERB context aliasing bugs [CVE-2015-2696] + +The IAKERB mechanism currently replaces its context handle with the +krb5 mechanism handle upon establishment, under the assumption that +most GSS functions are only called after context establishment. This +assumption is incorrect, and can lead to aliasing violations for some +programs. Maintain the IAKERB context structure after context +establishment and add new IAKERB entry points to refer to it with that +type. Add initiate and established flags to the IAKERB context +structure for use in gss_inquire_context() prior to context +establishment. + +CVE-2015-2696: + +In MIT krb5 1.9 and later, applications which call +gss_inquire_context() on a partially-established IAKERB context can +cause the GSS-API library to read from a pointer using the wrong type, +generally causing a process crash. Java server applications using the +native JGSS provider are vulnerable to this bug. A carefully crafted +IAKERB packet might allow the gss_inquire_context() call to succeed +with attacker-determined results, but applications should not make +access control decisions based on gss_inquire_context() results prior +to context establishment. + + CVSSv2 Vector: AV:N/AC:M/Au:N/C:N/I:N/A:C/E:POC/RL:OF/RC:C + +[ghudson@mit.edu: several bugfixes, style changes, and edge-case +behavior changes; commit message and CVE description] + +ticket: 8244 +target_version: 1.14 +tags: pullup +--- + src/lib/gssapi/krb5/gssapiP_krb5.h | 114 ++++++++++++ + src/lib/gssapi/krb5/gssapi_krb5.c | 105 +++++++++-- + src/lib/gssapi/krb5/iakerb.c | 351 +++++++++++++++++++++++++++++++++---- + 3 files changed, 529 insertions(+), 41 deletions(-) + +diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h +index 9aae12a..97e090d 100644 +--- a/src/lib/gssapi/krb5/gssapiP_krb5.h ++++ b/src/lib/gssapi/krb5/gssapiP_krb5.h +@@ -621,6 +621,21 @@ OM_uint32 KRB5_CALLCONV krb5_gss_accept_sec_context_ext + ); + #endif /* LEAN_CLIENT */ + ++OM_uint32 KRB5_CALLCONV krb5_gss_inquire_sec_context_by_oid ++(OM_uint32*, /* minor_status */ ++ const gss_ctx_id_t, ++ /* context_handle */ ++ const gss_OID, /* desired_object */ ++ gss_buffer_set_t* /* data_set */ ++); ++ ++OM_uint32 KRB5_CALLCONV krb5_gss_set_sec_context_option ++(OM_uint32*, /* minor_status */ ++ gss_ctx_id_t*, /* context_handle */ ++ const gss_OID, /* desired_object */ ++ const gss_buffer_t/* value */ ++); ++ + OM_uint32 KRB5_CALLCONV krb5_gss_process_context_token + (OM_uint32*, /* minor_status */ + gss_ctx_id_t, /* context_handle */ +@@ -1302,6 +1317,105 @@ OM_uint32 KRB5_CALLCONV + krb5_gss_import_cred(OM_uint32 *minor_status, gss_buffer_t token, + gss_cred_id_t *cred_handle); + ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_process_context_token(OM_uint32 *minor_status, ++ const gss_ctx_id_t context_handle, ++ const gss_buffer_t token_buffer); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_context_time(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ OM_uint32 *time_rec); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_inquire_context(OM_uint32 *minor_status, ++ gss_ctx_id_t context_handle, gss_name_t *src_name, ++ gss_name_t *targ_name, OM_uint32 *lifetime_rec, ++ gss_OID *mech_type, OM_uint32 *ctx_flags, ++ int *locally_initiated, int *opened); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_get_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ gss_qop_t qop_req, gss_buffer_t message_buffer, ++ gss_buffer_t message_token); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_get_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ gss_qop_t qop_req, gss_iov_buffer_desc *iov, ++ int iov_count); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_get_mic_iov_length(OM_uint32 *minor_status, ++ gss_ctx_id_t context_handle, gss_qop_t qop_req, ++ gss_iov_buffer_desc *iov, int iov_count); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_verify_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ gss_buffer_t msg_buffer, gss_buffer_t token_buffer, ++ gss_qop_t *qop_state); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_verify_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ gss_qop_t *qop_state, gss_iov_buffer_desc *iov, ++ int iov_count); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_wrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ int conf_req_flag, gss_qop_t qop_req, ++ gss_buffer_t input_message_buffer, int *conf_state, ++ gss_buffer_t output_message_buffer); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_wrap_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ int conf_req_flag, gss_qop_t qop_req, int *conf_state, ++ gss_iov_buffer_desc *iov, int iov_count); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_wrap_iov_length(OM_uint32 *minor_status, ++ gss_ctx_id_t context_handle, int conf_req_flag, ++ gss_qop_t qop_req, int *conf_state, ++ gss_iov_buffer_desc *iov, int iov_count); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_unwrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ gss_buffer_t input_message_buffer, ++ gss_buffer_t output_message_buffer, int *conf_state, ++ gss_qop_t *qop_state); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_unwrap_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ int *conf_state, gss_qop_t *qop_state, ++ gss_iov_buffer_desc *iov, int iov_count); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_wrap_size_limit(OM_uint32 *minor_status, ++ gss_ctx_id_t context_handle, int conf_req_flag, ++ gss_qop_t qop_req, OM_uint32 req_output_size, ++ OM_uint32 *max_input_size); ++ ++#ifndef LEAN_CLIENT ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_export_sec_context(OM_uint32 *minor_status, ++ gss_ctx_id_t *context_handle, ++ gss_buffer_t interprocess_token); ++#endif /* LEAN_CLIENT */ ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_inquire_sec_context_by_oid(OM_uint32 *minor_status, ++ const gss_ctx_id_t context_handle, ++ const gss_OID desired_object, ++ gss_buffer_set_t *data_set); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_set_sec_context_option(OM_uint32 *minor_status, ++ gss_ctx_id_t *context_handle, ++ const gss_OID desired_object, ++ const gss_buffer_t value); ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_pseudo_random(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ int prf_key, const gss_buffer_t prf_in, ++ ssize_t desired_output_len, gss_buffer_t prf_out); ++ + /* Magic string to identify exported krb5 GSS credentials. Increment this if + * the format changes. */ + #define CRED_EXPORT_MAGIC "K5C1" +diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c +index 0be92e4..c4dfdd6 100644 +--- a/src/lib/gssapi/krb5/gssapi_krb5.c ++++ b/src/lib/gssapi/krb5/gssapi_krb5.c +@@ -351,7 +351,7 @@ static struct { + } + }; + +-static OM_uint32 KRB5_CALLCONV ++OM_uint32 KRB5_CALLCONV + krb5_gss_inquire_sec_context_by_oid (OM_uint32 *minor_status, + const gss_ctx_id_t context_handle, + const gss_OID desired_object, +@@ -465,7 +465,7 @@ static struct { + }; + #endif + +-static OM_uint32 KRB5_CALLCONV ++OM_uint32 KRB5_CALLCONV + krb5_gss_set_sec_context_option (OM_uint32 *minor_status, + gss_ctx_id_t *context_handle, + const gss_OID desired_object, +@@ -929,20 +929,103 @@ static struct gss_config krb5_mechanism = { + krb5_gss_get_mic_iov_length, + }; + ++/* Functions which use security contexts or acquire creds are IAKERB-specific; ++ * other functions can borrow from the krb5 mech. */ ++static struct gss_config iakerb_mechanism = { ++ { GSS_MECH_KRB5_OID_LENGTH, GSS_MECH_KRB5_OID }, ++ NULL, ++ iakerb_gss_acquire_cred, ++ krb5_gss_release_cred, ++ iakerb_gss_init_sec_context, ++#ifdef LEAN_CLIENT ++ NULL, ++#else ++ iakerb_gss_accept_sec_context, ++#endif ++ iakerb_gss_process_context_token, ++ iakerb_gss_delete_sec_context, ++ iakerb_gss_context_time, ++ iakerb_gss_get_mic, ++ iakerb_gss_verify_mic, ++#if defined(IOV_SHIM_EXERCISE_WRAP) || defined(IOV_SHIM_EXERCISE) ++ NULL, ++#else ++ iakerb_gss_wrap, ++#endif ++#if defined(IOV_SHIM_EXERCISE_UNWRAP) || defined(IOV_SHIM_EXERCISE) ++ NULL, ++#else ++ iakerb_gss_unwrap, ++#endif ++ krb5_gss_display_status, ++ krb5_gss_indicate_mechs, ++ krb5_gss_compare_name, ++ krb5_gss_display_name, ++ krb5_gss_import_name, ++ krb5_gss_release_name, ++ krb5_gss_inquire_cred, ++ NULL, /* add_cred */ ++#ifdef LEAN_CLIENT ++ NULL, ++ NULL, ++#else ++ iakerb_gss_export_sec_context, ++ NULL, ++#endif ++ krb5_gss_inquire_cred_by_mech, ++ krb5_gss_inquire_names_for_mech, ++ iakerb_gss_inquire_context, ++ krb5_gss_internal_release_oid, ++ iakerb_gss_wrap_size_limit, ++ krb5_gss_localname, ++ krb5_gss_authorize_localname, ++ krb5_gss_export_name, ++ krb5_gss_duplicate_name, ++ krb5_gss_store_cred, ++ iakerb_gss_inquire_sec_context_by_oid, ++ krb5_gss_inquire_cred_by_oid, ++ iakerb_gss_set_sec_context_option, ++ krb5_gssspi_set_cred_option, ++ krb5_gssspi_mech_invoke, ++ NULL, /* wrap_aead */ ++ NULL, /* unwrap_aead */ ++ iakerb_gss_wrap_iov, ++ iakerb_gss_unwrap_iov, ++ iakerb_gss_wrap_iov_length, ++ NULL, /* complete_auth_token */ ++ NULL, /* acquire_cred_impersonate_name */ ++ NULL, /* add_cred_impersonate_name */ ++ NULL, /* display_name_ext */ ++ krb5_gss_inquire_name, ++ krb5_gss_get_name_attribute, ++ krb5_gss_set_name_attribute, ++ krb5_gss_delete_name_attribute, ++ krb5_gss_export_name_composite, ++ krb5_gss_map_name_to_any, ++ krb5_gss_release_any_name_mapping, ++ iakerb_gss_pseudo_random, ++ NULL, /* set_neg_mechs */ ++ krb5_gss_inquire_saslname_for_mech, ++ krb5_gss_inquire_mech_for_saslname, ++ krb5_gss_inquire_attrs_for_mech, ++ krb5_gss_acquire_cred_from, ++ krb5_gss_store_cred_into, ++ iakerb_gss_acquire_cred_with_password, ++ krb5_gss_export_cred, ++ krb5_gss_import_cred, ++ NULL, /* import_sec_context_by_mech */ ++ NULL, /* import_name_by_mech */ ++ NULL, /* import_cred_by_mech */ ++ iakerb_gss_get_mic_iov, ++ iakerb_gss_verify_mic_iov, ++ iakerb_gss_get_mic_iov_length, ++}; ++ + #ifdef _GSS_STATIC_LINK + #include "mglueP.h" + static int gss_iakerbmechglue_init(void) + { + struct gss_mech_config mech_iakerb; +- struct gss_config iakerb_mechanism = krb5_mechanism; +- +- /* IAKERB mechanism mirrors krb5, but with different context SPIs */ +- iakerb_mechanism.gss_accept_sec_context = iakerb_gss_accept_sec_context; +- iakerb_mechanism.gss_init_sec_context = iakerb_gss_init_sec_context; +- iakerb_mechanism.gss_delete_sec_context = iakerb_gss_delete_sec_context; +- iakerb_mechanism.gss_acquire_cred = iakerb_gss_acquire_cred; +- iakerb_mechanism.gssspi_acquire_cred_with_password +- = iakerb_gss_acquire_cred_with_password; + + memset(&mech_iakerb, 0, sizeof(mech_iakerb)); + mech_iakerb.mech = &iakerb_mechanism; +diff --git a/src/lib/gssapi/krb5/iakerb.c b/src/lib/gssapi/krb5/iakerb.c +index f30de32..4662bd9 100644 +--- a/src/lib/gssapi/krb5/iakerb.c ++++ b/src/lib/gssapi/krb5/iakerb.c +@@ -47,6 +47,8 @@ struct _iakerb_ctx_id_rec { + gss_ctx_id_t gssc; + krb5_data conv; /* conversation for checksumming */ + unsigned int count; /* number of round trips */ ++ int initiate; ++ int established; + krb5_get_init_creds_opt *gic_opts; + }; + +@@ -695,7 +697,7 @@ iakerb_get_initial_state(iakerb_ctx_id_t ctx, + * Allocate and initialise an IAKERB context + */ + static krb5_error_code +-iakerb_alloc_context(iakerb_ctx_id_t *pctx) ++iakerb_alloc_context(iakerb_ctx_id_t *pctx, int initiate) + { + iakerb_ctx_id_t ctx; + krb5_error_code code; +@@ -709,6 +711,8 @@ iakerb_alloc_context(iakerb_ctx_id_t *pctx) + ctx->magic = KG_IAKERB_CONTEXT; + ctx->state = IAKERB_AS_REQ; + ctx->count = 0; ++ ctx->initiate = initiate; ++ ctx->established = 0; + + code = krb5_gss_init_context(&ctx->k5c); + if (code != 0) +@@ -732,7 +736,7 @@ iakerb_gss_delete_sec_context(OM_uint32 *minor_status, + gss_ctx_id_t *context_handle, + gss_buffer_t output_token) + { +- OM_uint32 major_status = GSS_S_COMPLETE; ++ iakerb_ctx_id_t iakerb_ctx = (iakerb_ctx_id_t)*context_handle; + + if (output_token != GSS_C_NO_BUFFER) { + output_token->length = 0; +@@ -740,23 +744,10 @@ iakerb_gss_delete_sec_context(OM_uint32 *minor_status, + } + + *minor_status = 0; ++ *context_handle = GSS_C_NO_CONTEXT; ++ iakerb_release_context(iakerb_ctx); + +- if (*context_handle != GSS_C_NO_CONTEXT) { +- iakerb_ctx_id_t iakerb_ctx = (iakerb_ctx_id_t)*context_handle; +- +- if (iakerb_ctx->magic == KG_IAKERB_CONTEXT) { +- iakerb_release_context(iakerb_ctx); +- *context_handle = GSS_C_NO_CONTEXT; +- } else { +- assert(iakerb_ctx->magic == KG_CONTEXT); +- +- major_status = krb5_gss_delete_sec_context(minor_status, +- context_handle, +- output_token); +- } +- } +- +- return major_status; ++ return GSS_S_COMPLETE; + } + + static krb5_boolean +@@ -802,7 +793,7 @@ iakerb_gss_accept_sec_context(OM_uint32 *minor_status, + int initialContextToken = (*context_handle == GSS_C_NO_CONTEXT); + + if (initialContextToken) { +- code = iakerb_alloc_context(&ctx); ++ code = iakerb_alloc_context(&ctx, 0); + if (code != 0) + goto cleanup; + +@@ -854,11 +845,8 @@ iakerb_gss_accept_sec_context(OM_uint32 *minor_status, + time_rec, + delegated_cred_handle, + &exts); +- if (major_status == GSS_S_COMPLETE) { +- *context_handle = ctx->gssc; +- ctx->gssc = NULL; +- iakerb_release_context(ctx); +- } ++ if (major_status == GSS_S_COMPLETE) ++ ctx->established = 1; + if (mech_type != NULL) + *mech_type = (gss_OID)gss_mech_krb5; + } +@@ -897,7 +885,7 @@ iakerb_gss_init_sec_context(OM_uint32 *minor_status, + int initialContextToken = (*context_handle == GSS_C_NO_CONTEXT); + + if (initialContextToken) { +- code = iakerb_alloc_context(&ctx); ++ code = iakerb_alloc_context(&ctx, 1); + if (code != 0) { + *minor_status = code; + goto cleanup; +@@ -983,11 +971,8 @@ iakerb_gss_init_sec_context(OM_uint32 *minor_status, + ret_flags, + time_rec, + &exts); +- if (major_status == GSS_S_COMPLETE) { +- *context_handle = ctx->gssc; +- ctx->gssc = GSS_C_NO_CONTEXT; +- iakerb_release_context(ctx); +- } ++ if (major_status == GSS_S_COMPLETE) ++ ctx->established = 1; + if (actual_mech_type != NULL) + *actual_mech_type = (gss_OID)gss_mech_krb5; + } else { +@@ -1010,3 +995,309 @@ iakerb_gss_init_sec_context(OM_uint32 *minor_status, + + return major_status; + } ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_unwrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ gss_buffer_t input_message_buffer, ++ gss_buffer_t output_message_buffer, int *conf_state, ++ gss_qop_t *qop_state) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_NO_CONTEXT; ++ ++ return krb5_gss_unwrap(minor_status, ctx->gssc, input_message_buffer, ++ output_message_buffer, conf_state, qop_state); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_wrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ int conf_req_flag, gss_qop_t qop_req, ++ gss_buffer_t input_message_buffer, int *conf_state, ++ gss_buffer_t output_message_buffer) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_NO_CONTEXT; ++ ++ return krb5_gss_wrap(minor_status, ctx->gssc, conf_req_flag, qop_req, ++ input_message_buffer, conf_state, ++ output_message_buffer); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_process_context_token(OM_uint32 *minor_status, ++ const gss_ctx_id_t context_handle, ++ const gss_buffer_t token_buffer) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_DEFECTIVE_TOKEN; ++ ++ return krb5_gss_process_context_token(minor_status, ctx->gssc, ++ token_buffer); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_context_time(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ OM_uint32 *time_rec) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_NO_CONTEXT; ++ ++ return krb5_gss_context_time(minor_status, ctx->gssc, time_rec); ++} ++ ++#ifndef LEAN_CLIENT ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_export_sec_context(OM_uint32 *minor_status, ++ gss_ctx_id_t *context_handle, ++ gss_buffer_t interprocess_token) ++{ ++ OM_uint32 maj; ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ /* We don't currently support exporting partially established contexts. */ ++ if (!ctx->established) ++ return GSS_S_UNAVAILABLE; ++ ++ maj = krb5_gss_export_sec_context(minor_status, &ctx->gssc, ++ interprocess_token); ++ if (ctx->gssc == GSS_C_NO_CONTEXT) { ++ iakerb_release_context(ctx); ++ *context_handle = GSS_C_NO_CONTEXT; ++ } ++ return maj; ++} ++ ++/* ++ * Until we implement partial context exports, there are no SPNEGO exported ++ * context tokens, only tokens for the underlying krb5 context. So we do not ++ * need to implement an iakerb_gss_import_sec_context() yet; it would be ++ * unreachable except via a manually constructed token. ++ */ ++ ++#endif /* LEAN_CLIENT */ ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_inquire_context(OM_uint32 *minor_status, ++ gss_ctx_id_t context_handle, gss_name_t *src_name, ++ gss_name_t *targ_name, OM_uint32 *lifetime_rec, ++ gss_OID *mech_type, OM_uint32 *ctx_flags, ++ int *initiate, int *opened) ++{ ++ OM_uint32 ret; ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (src_name != NULL) ++ *src_name = GSS_C_NO_NAME; ++ if (targ_name != NULL) ++ *targ_name = GSS_C_NO_NAME; ++ if (lifetime_rec != NULL) ++ *lifetime_rec = 0; ++ if (mech_type != NULL) ++ *mech_type = (gss_OID)gss_mech_iakerb; ++ if (ctx_flags != NULL) ++ *ctx_flags = 0; ++ if (initiate != NULL) ++ *initiate = ctx->initiate; ++ if (opened != NULL) ++ *opened = ctx->established; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_COMPLETE; ++ ++ ret = krb5_gss_inquire_context(minor_status, ctx->gssc, src_name, ++ targ_name, lifetime_rec, mech_type, ++ ctx_flags, initiate, opened); ++ ++ if (!ctx->established) { ++ /* Report IAKERB as the mech OID until the context is established. */ ++ if (mech_type != NULL) ++ *mech_type = (gss_OID)gss_mech_iakerb; ++ ++ /* We don't support exporting partially-established contexts. */ ++ if (ctx_flags != NULL) ++ *ctx_flags &= ~GSS_C_TRANS_FLAG; ++ } ++ ++ return ret; ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_wrap_size_limit(OM_uint32 *minor_status, ++ gss_ctx_id_t context_handle, int conf_req_flag, ++ gss_qop_t qop_req, OM_uint32 req_output_size, ++ OM_uint32 *max_input_size) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_NO_CONTEXT; ++ ++ return krb5_gss_wrap_size_limit(minor_status, ctx->gssc, conf_req_flag, ++ qop_req, req_output_size, max_input_size); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_get_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ gss_qop_t qop_req, gss_buffer_t message_buffer, ++ gss_buffer_t message_token) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_NO_CONTEXT; ++ ++ return krb5_gss_get_mic(minor_status, ctx->gssc, qop_req, message_buffer, ++ message_token); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_verify_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ gss_buffer_t msg_buffer, gss_buffer_t token_buffer, ++ gss_qop_t *qop_state) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_NO_CONTEXT; ++ ++ return krb5_gss_verify_mic(minor_status, ctx->gssc, msg_buffer, ++ token_buffer, qop_state); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_inquire_sec_context_by_oid(OM_uint32 *minor_status, ++ const gss_ctx_id_t context_handle, ++ const gss_OID desired_object, ++ gss_buffer_set_t *data_set) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_UNAVAILABLE; ++ ++ return krb5_gss_inquire_sec_context_by_oid(minor_status, ctx->gssc, ++ desired_object, data_set); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_set_sec_context_option(OM_uint32 *minor_status, ++ gss_ctx_id_t *context_handle, ++ const gss_OID desired_object, ++ const gss_buffer_t value) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)*context_handle; ++ ++ if (ctx == NULL || ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_UNAVAILABLE; ++ ++ return krb5_gss_set_sec_context_option(minor_status, &ctx->gssc, ++ desired_object, value); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_wrap_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ int conf_req_flag, gss_qop_t qop_req, int *conf_state, ++ gss_iov_buffer_desc *iov, int iov_count) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_NO_CONTEXT; ++ ++ return krb5_gss_wrap_iov(minor_status, ctx->gssc, conf_req_flag, qop_req, ++ conf_state, iov, iov_count); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_unwrap_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ int *conf_state, gss_qop_t *qop_state, ++ gss_iov_buffer_desc *iov, int iov_count) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_NO_CONTEXT; ++ ++ return krb5_gss_unwrap_iov(minor_status, ctx->gssc, conf_state, qop_state, ++ iov, iov_count); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_wrap_iov_length(OM_uint32 *minor_status, ++ gss_ctx_id_t context_handle, int conf_req_flag, ++ gss_qop_t qop_req, int *conf_state, ++ gss_iov_buffer_desc *iov, int iov_count) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_NO_CONTEXT; ++ ++ return krb5_gss_wrap_iov_length(minor_status, ctx->gssc, conf_req_flag, ++ qop_req, conf_state, iov, iov_count); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_pseudo_random(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ int prf_key, const gss_buffer_t prf_in, ++ ssize_t desired_output_len, gss_buffer_t prf_out) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_NO_CONTEXT; ++ ++ return krb5_gss_pseudo_random(minor_status, ctx->gssc, prf_key, prf_in, ++ desired_output_len, prf_out); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_get_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ gss_qop_t qop_req, gss_iov_buffer_desc *iov, ++ int iov_count) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_NO_CONTEXT; ++ ++ return krb5_gss_get_mic_iov(minor_status, ctx->gssc, qop_req, iov, ++ iov_count); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_verify_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, ++ gss_qop_t *qop_state, gss_iov_buffer_desc *iov, ++ int iov_count) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_NO_CONTEXT; ++ ++ return krb5_gss_verify_mic_iov(minor_status, ctx->gssc, qop_state, iov, ++ iov_count); ++} ++ ++OM_uint32 KRB5_CALLCONV ++iakerb_gss_get_mic_iov_length(OM_uint32 *minor_status, ++ gss_ctx_id_t context_handle, gss_qop_t qop_req, ++ gss_iov_buffer_desc *iov, int iov_count) ++{ ++ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; ++ ++ if (ctx->gssc == GSS_C_NO_CONTEXT) ++ return GSS_S_NO_CONTEXT; ++ ++ return krb5_gss_get_mic_iov_length(minor_status, ctx->gssc, qop_req, iov, ++ iov_count); ++} diff --git a/app-crypt/mit-krb5/files/CVE-2015-2697.patch b/app-crypt/mit-krb5/files/CVE-2015-2697.patch new file mode 100644 index 000000000000..af2f42a3ab46 --- /dev/null +++ b/app-crypt/mit-krb5/files/CVE-2015-2697.patch @@ -0,0 +1,50 @@ +From f0c094a1b745d91ef2f9a4eae2149aac026a5789 Mon Sep 17 00:00:00 2001 +From: Greg Hudson <ghudson@mit.edu> +Date: Fri, 25 Sep 2015 12:51:47 -0400 +Subject: [PATCH] Fix build_principal memory bug [CVE-2015-2697] + +In build_principal_va(), use k5memdup0() instead of strdup() to make a +copy of the realm, to ensure that we allocate the correct number of +bytes and do not read past the end of the input string. This bug +affects krb5_build_principal(), krb5_build_principal_va(), and +krb5_build_principal_alloc_va(). krb5_build_principal_ext() is not +affected. + +CVE-2015-2697: + +In MIT krb5 1.7 and later, an authenticated attacker may be able to +cause a KDC to crash using a TGS request with a large realm field +beginning with a null byte. If the KDC attempts to find a referral to +answer the request, it constructs a principal name for lookup using +krb5_build_principal() with the requested realm. Due to a bug in this +function, the null byte causes only one byte be allocated for the +realm field of the constructed principal, far less than its length. +Subsequent operations on the lookup principal may cause a read beyond +the end of the mapped memory region, causing the KDC process to crash. + +CVSSv2: AV:N/AC:L/Au:S/C:N/I:N/A:C/E:POC/RL:OF/RC:C + +ticket: 8252 (new) +target_version: 1.14 +tags: pullup +--- + src/lib/krb5/krb/bld_princ.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c +index ab6fed8..8604268 100644 +--- a/src/lib/krb5/krb/bld_princ.c ++++ b/src/lib/krb5/krb/bld_princ.c +@@ -40,10 +40,8 @@ build_principal_va(krb5_context context, krb5_principal princ, + data = malloc(size * sizeof(krb5_data)); + if (!data) { retval = ENOMEM; } + +- if (!retval) { +- r = strdup(realm); +- if (!r) { retval = ENOMEM; } +- } ++ if (!retval) ++ r = k5memdup0(realm, rlen, &retval); + + while (!retval && (component = va_arg(ap, char *))) { + if (count == size) { diff --git a/app-crypt/mit-krb5/files/mit-krb5kadmind.confd b/app-crypt/mit-krb5/files/mit-krb5kadmind.confd new file mode 100644 index 000000000000..f6029b60979c --- /dev/null +++ b/app-crypt/mit-krb5/files/mit-krb5kadmind.confd @@ -0,0 +1,2 @@ +# Define startup options for Kerberos administration server +KADMIND_OPTS="" diff --git a/app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r2 b/app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r2 new file mode 100644 index 000000000000..54dcb87fbb83 --- /dev/null +++ b/app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r2 @@ -0,0 +1,25 @@ +#!/sbin/runscript + +#--------------------------------------------------------------------------- +# This script starts/stops the MIT Kerberos 5 Admin daemon +#--------------------------------------------------------------------------- + +daemon="MIT Kerberos 5 Admin daemon" +exec="/usr/sbin/kadmind" + +depend() { + need mit-krb5kdc + use net +} + +start() { + ebegin "Starting $daemon" + start-stop-daemon --start --quiet --exec ${exec} -- "${KADMIND_OPTS}" 1>&2 + eend $? "Error starting $daemon" +} + +stop() { + ebegin "Stopping $daemon" + start-stop-daemon --stop --quiet --exec ${exec} 1>&2 + eend $? "Error stopping $daemon" +} diff --git a/app-crypt/mit-krb5/files/mit-krb5kdc.confd b/app-crypt/mit-krb5/files/mit-krb5kdc.confd new file mode 100644 index 000000000000..887d3d8c7bd4 --- /dev/null +++ b/app-crypt/mit-krb5/files/mit-krb5kdc.confd @@ -0,0 +1,2 @@ +# Define startup options for Kerberos KDC +KDC_OPTS="" diff --git a/app-crypt/mit-krb5/files/mit-krb5kdc.initd-r2 b/app-crypt/mit-krb5/files/mit-krb5kdc.initd-r2 new file mode 100644 index 000000000000..12bb47a0413a --- /dev/null +++ b/app-crypt/mit-krb5/files/mit-krb5kdc.initd-r2 @@ -0,0 +1,24 @@ +#!/sbin/runscript + +#--------------------------------------------------------------------------- +# This script starts/stops the MIT Kerberos 5 KDC +#--------------------------------------------------------------------------- + +daemon="MIT Kerberos 5 KDC" +exec="/usr/sbin/krb5kdc" + +depend() { + use net +} + +start() { + ebegin "Starting $daemon" + start-stop-daemon --start --quiet --exec ${exec} -- "${KDC_OPTS}" 1>&2 + eend $? "Error starting $daemon" +} + +stop() { + ebegin "Stopping $daemon" + start-stop-daemon --stop --quiet --exec ${exec} 1>&2 + eend $? "Error stopping $daemon" +} diff --git a/app-crypt/mit-krb5/files/mit-krb5kpropd.confd b/app-crypt/mit-krb5/files/mit-krb5kpropd.confd new file mode 100644 index 000000000000..d75d41ab813a --- /dev/null +++ b/app-crypt/mit-krb5/files/mit-krb5kpropd.confd @@ -0,0 +1,2 @@ +# Define startup options for Kerberos incremental propagation server +KPROPD_OPTS="" diff --git a/app-crypt/mit-krb5/files/mit-krb5kpropd.initd-r2 b/app-crypt/mit-krb5/files/mit-krb5kpropd.initd-r2 new file mode 100644 index 000000000000..222c5f7d11f5 --- /dev/null +++ b/app-crypt/mit-krb5/files/mit-krb5kpropd.initd-r2 @@ -0,0 +1,24 @@ +#!/sbin/runscript + +#--------------------------------------------------------------------------- +# This script starts/stops the MIT Kerberos 5 kpropd +#--------------------------------------------------------------------------- + +daemon="MIT Kerberos 5 kpropd" +exec="/usr/sbin/kpropd" + +depend() { + use net mit-krb5kdc mit-krb5kadmind +} + +start() { + ebegin "Starting $daemon" + start-stop-daemon --start --quiet --exec ${exec} -- "${KPROPD_OPTS}" 1>&2 + eend $? "Error starting $daemon" +} + +stop() { + ebegin "Stopping $daemon" + start-stop-daemon --stop --quiet --exec ${exec} 1>&2 + eend $? "Error stopping $daemon" +} diff --git a/app-crypt/mit-krb5/mit-krb5-1.13.2-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.13.2-r2.ebuild new file mode 100644 index 000000000000..e2af1b38781f --- /dev/null +++ b/app-crypt/mit-krb5/mit-krb5-1.13.2-r2.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 versionator + +MY_P="${P/mit-}" +P_DIR=$(get_version_component_range 1-2) +DESCRIPTION="MIT Kerberos V" +HOMEPAGE="http://web.mit.edu/kerberos/www/" +SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar" + +LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )" +SLOT="0" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86" +IUSE="doc +keyutils libressl openldap +pkinit selinux +threads test xinetd" + +CDEPEND=" + !!app-crypt/heimdal + >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}] + || ( + >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}] + >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}] + >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}] + ) + keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] ) + openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] ) + pkinit? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) + ) + xinetd? ( sys-apps/xinetd ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" +DEPEND="${CDEPEND} + ${PYTHON_DEPS} + virtual/yacc + doc? ( virtual/latex-base ) + test? ( + ${PYTHON_DEPS} + dev-lang/tcl:0 + dev-util/dejagnu + )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-kerberos )" + +S=${WORKDIR}/${MY_P}/src + +MULTILIB_CHOST_TOOLS=( + /usr/bin/krb5-config +) + +src_unpack() { + unpack ${A} + unpack ./"${MY_P}".tar.gz +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch" + epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch" + epatch "${FILESDIR}/CVE-2015-2695.patch" \ + "${FILESDIR}/CVE-2015-2696.patch" \ + "${FILESDIR}/CVE-2015-2697.patch" + + eautoreconf +} + +src_configure() { + append-cppflags "-I${EPREFIX}/usr/include/et" + # QA + append-flags -fno-strict-aliasing + append-flags -fno-strict-overflow + + multilib-minimal_src_configure +} + +multilib_src_configure() { + use keyutils || export ac_cv_header_keyutils_h=no + ECONF_SOURCE=${S} \ + WARN_CFLAGS="set" \ + econf \ + $(use_with openldap ldap) \ + "$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \ + $(use_enable pkinit) \ + $(use_enable threads thread-support) \ + --without-hesiod \ + --enable-shared \ + --with-system-et \ + --with-system-ss \ + --enable-dns-for-realm \ + --enable-kdc-lookaside-cache \ + --with-system-verto \ + --disable-rpath +} + +multilib_src_compile() { + emake -j1 +} + +multilib_src_test() { + multilib_is_native_abi && emake -j1 check +} + +multilib_src_install() { + emake \ + DESTDIR="${D}" \ + EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \ + install +} + +multilib_src_install_all() { + # default database dir + keepdir /var/lib/krb5kdc + + cd .. + dodoc README + + if use doc; then + dohtml -r doc/html/* + docinto pdf + dodoc doc/pdf/*.pdf + fi + + newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind + newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc + newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd + newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind + newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc + newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd + + insinto /etc + newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example + insinto /var/lib/krb5kdc + newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example + + if use openldap ; then + insinto /etc/openldap/schema + doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema" + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}/kpropd.xinetd" kpropd + fi +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-1.8.0" ; then + elog "MIT split the Kerberos applications from the base Kerberos" + elog "distribution. Kerberized versions of telnet, rlogin, rsh, rcp," + elog "ftp clients and telnet, ftp deamons now live in" + elog "\"app-crypt/mit-krb5-appl\" package." + fi +} diff --git a/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild b/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild new file mode 100644 index 000000000000..ea0df559a95b --- /dev/null +++ b/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" +HOMEPAGE="http://gnupg.org/aegypten2/index.html" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static" + +CDEPEND=" + >=dev-libs/libgpg-error-1.17 + >=dev-libs/libassuan-2 + >=dev-libs/libgcrypt-1.6.3 + ncurses? ( sys-libs/ncurses:0= ) + gtk? ( x11-libs/gtk+:2 ) + qt4? ( + >=dev-qt/qtgui-4.4.1:4 + ) + qt5? ( + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + caps? ( sys-libs/libcap ) + static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) + app-eselect/eselect-pinentry + gnome-keyring? ( app-crypt/libsecret ) +" + +DEPEND="${CDEPEND} + sys-devel/gettext + virtual/pkgconfig +" + +RDEPEND=" + ${CDEPEND} + gnome-keyring? ( app-crypt/gcr ) +" + +REQUIRED_USE=" + || ( ncurses gtk qt4 qt5 ) + gtk? ( !static ) + qt4? ( !static ) + qt5? ( !static ) + static? ( ncurses ) + ?? ( qt4 qt5 ) +" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +src_prepare() { + epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch" + epatch "${FILESDIR}/${P}-add-disable-pinentry-qt5-option.patch" + eautoreconf +} + +src_configure() { + local myconf=() + use static && append-ldflags -static + [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 + + QT_MOC="" + if use qt4; then + myconf+=( --enable-pinentry-qt + --disable-pinentry-qt5 + ) + QT_MOC="$(qt4_get_bindir)"/moc + # Issues finding qt on multilib systems + export QTLIB="$(qt4_get_libdir)" + elif use qt5; then + myconf+=( --enable-pinentry-qt ) + QT_MOC="$(qt5_get_bindir)"/moc + export QTLIB="$(qt5_get_libdir)" + else + myconf+=( --disable-pinentry-qt ) + fi + + econf \ + --enable-pinentry-tty \ + $(use_enable emacs pinentry-emacs) \ + $(use_enable gtk pinentry-gtk2) \ + $(use_enable ncurses pinentry-curses) \ + $(use_enable ncurses fallback-curses) \ + $(use_with caps libcap) \ + $(use_enable gnome-keyring libsecret) \ + $(use_enable gnome-keyring pinentry-gnome3) \ + "${myconf[@]}" \ + MOC="${QT_MOC}" +} + +src_install() { + default + rm -f "${ED}"/usr/bin/pinentry || die + + if use qt4 || use qt5; then + dosym pinentry-qt /usr/bin/pinentry-qt4 + fi +} + +pkg_postinst() { + if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then + elog "We no longer install pinentry-curses and pinentry-qt SUID root by default." + elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes." + elog "The soft resource limit for memory locking specifies the limit an" + elog "unprivileged process may lock into memory. You can also use POSIX" + elog "capabilities to allow pinentry to lock memory. To do so activate the caps" + elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" + elog "your users." + fi + + eselect pinentry update ifunset +} + +pkg_postrm() { + eselect pinentry update ifunset +} diff --git a/app-crypt/pius/metadata.xml b/app-crypt/pius/metadata.xml index bf95fd0f85bd..37d849914336 100644 --- a/app-crypt/pius/metadata.xml +++ b/app-crypt/pius/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>crypto</herd> @@ -14,5 +14,6 @@ </longdescription> <upstream> <remote-id type="sourceforge">pgpius</remote-id> + <remote-id type="github">jaymzh/pius</remote-id> </upstream> </pkgmetadata> diff --git a/app-doc/doxygen/doxygen-1.8.10-r1.ebuild b/app-doc/doxygen/doxygen-1.8.10-r1.ebuild index e467e299a41d..ecc56abe2a06 100644 --- a/app-doc/doxygen/doxygen-1.8.10-r1.ebuild +++ b/app-doc/doxygen/doxygen-1.8.10-r1.ebuild @@ -10,10 +10,10 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="git://github.com/doxygen/doxygen.git" SRC_URI="" - KEYWORDS="" + KEYWORDS="amd64 hppa ppc ppc64 x86" else SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" fi SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png" diff --git a/app-doc/pms/pms-5-r2.ebuild b/app-doc/pms/pms-5-r2.ebuild index f0f73a7749bb..8f7c7a22006d 100644 --- a/app-doc/pms/pms-5-r2.ebuild +++ b/app-doc/pms/pms-5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -38,7 +38,8 @@ src_compile() { src_install() { dodoc pms.pdf eapi-cheatsheet.pdf if use html; then - dohtml *.html pms.css $(shopt -s nullglob; echo *.png) + docinto html + dodoc *.html pms.css $(shopt -s nullglob; echo *.png) dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf fi } diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild index 20ca87f6a087..10f044aa4c2d 100644 --- a/app-doc/pms/pms-9999.ebuild +++ b/app-doc/pms/pms-9999.ebuild @@ -36,7 +36,8 @@ src_compile() { src_install() { dodoc pms.pdf eapi-cheatsheet.pdf if use html; then - dohtml *.html pms.css $(shopt -s nullglob; echo *.png) + docinto html + dodoc *.html pms.css $(shopt -s nullglob; echo *.png) dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf fi } diff --git a/app-doc/root-docs/Manifest b/app-doc/root-docs/Manifest index 8d75ae63a58c..26a3239b9125 100644 --- a/app-doc/root-docs/Manifest +++ b/app-doc/root-docs/Manifest @@ -7,3 +7,4 @@ DIST root6-banner.jpg 32319 SHA256 9d6d226bbe61db257a1796a3ad04dfe97b3bb500a2934 DIST root_v5.34.26.source.tar.gz 75171961 SHA256 c1fd2a249bb7210914b42e35dba4f1262cfa46b79ef7a41f73d7f08f8c54a643 SHA512 f5da5e20d1763608a32d78c48581e574a3f51aef47ecf6987a4064d1fb3234dfc9f626e041a17213f881f52f807ed6a6da60bf1d24951fa7dc2cadd94f8dd8b4 WHIRLPOOL 77b48b815c971642da68b71732a0ea3372648634281be634037b13cb58488f7075ec8bfc9a684e55d85cd9b038f229be29b19a15dfc829f0ce63a5f17241c23c DIST root_v5.34.32.source.tar.gz 75170203 SHA256 939c7592802a54b6cbc593efb6e51699bf52e92baf6d6b20f486aaa08480fc5f SHA512 6485f2bb544947173e1feb2cfb41d6a176020027f1193d9388700a797ba4badbf497022e6129fdc4879e709460bf1efabf3e51c51840f0c781fa12e631419afc WHIRLPOOL 695147a519415b99e73fdad1cd61bb1944e292628236b5a7cbf1835174c950fa9cb068431a8164f24663323163012ea652db84d082f9f1eb1fcae79489575d9e DIST root_v6.02.05.source.tar.gz 99121880 SHA256 7a5d4af171ba3b8a736c462b2041f8f35bd4c1d3b6a22c32a3ebd3ffe144ae60 SHA512 b30bc4aafe294ee069ee4c884ff70c983539a48eda586cd1938d00d4688f10e94a435640965b89c6d100fdd998453a4c1ae2109d5f1427f23865a868c561d684 WHIRLPOOL de363835fa00ffa0ff6e596b3c92b59ed59378bac3a344c066f7603d6104058203f76181d4c15478fd9066aedbe6a514257d5796feedb2d5d0d789b263e92955 +DIST root_v6.04.06.source.tar.gz 99180724 SHA256 6deac9cd71fe2d7a48ea2bcbd793639222c4743275dbc946c158295b1e1fe330 SHA512 ac96ac998ed4894587b7d286d79bcbea7b33f15764cc2513ae089e86c584e2dcb064cd135d44a4bfd2bede368eb772ccbffcd6bf426857a1236f5d7e9f5ce6fd WHIRLPOOL 7ffca036917d798ade31e1a22e9518d567e4267af5d1db555ea0e82c1bc2c7a1f665c8cd76d3ce6511507ab7befea4881580259c6142f1e668edafbcbc5e496e diff --git a/app-doc/root-docs/metadata.xml b/app-doc/root-docs/metadata.xml index 97772ba5c40c..4947d04a2988 100644 --- a/app-doc/root-docs/metadata.xml +++ b/app-doc/root-docs/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> <maintainer> diff --git a/app-doc/root-docs/root-docs-6.04.06.ebuild b/app-doc/root-docs/root-docs-6.04.06.ebuild new file mode 100644 index 000000000000..634695228441 --- /dev/null +++ b/app-doc/root-docs/root-docs-6.04.06.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROOT_PN="root" +ROOFIT_DOC_PV=2.91-33 +ROOFIT_QS_DOC_PV=3.00 +TMVA_DOC_PV=4.2.0 + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils multilib virtualx python-any-r1 + +DESCRIPTION="Documentation for ROOT Data Analysis Framework" +HOMEPAGE="http://root.cern.ch/drupal" +SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz + math? ( + http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf + http://root.cern.ch/download/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf + http://root.cern.ch/drupal/sites/default/files/roofit_quickstart_${ROOFIT_QS_DOC_PV}.pdf ) + api? ( + ${HOMEPAGE}/sites/default/files/images/root6-banner.jpg + ${HOMEPAGE}/sites/all/themes/newsflash/images/info.png )" + +SLOT="0" +LICENSE="LGPL-2.1" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="api +math +metric http" + +VIRTUALX_REQUIRED="api" + +DEPEND=" + app-text/pandoc + dev-haskell/pandoc-citeproc[bibutils] + dev-texlive/texlive-latex + virtual/pkgconfig + api? ( + media-fonts/dejavu + ~sci-physics/root-${PV}[X,graphviz,opengl] + )" +RDEPEND="" + +DOC_DIR="/usr/share/doc/${ROOT_PN}-${PV}" + +S="${WORKDIR}/${ROOT_PN}-${PV}" + +src_prepare() { + epatch \ + "${FILESDIR}/${PN}-6.00.01-makehtml.patch" + + # prefixify the configure script + sed -i \ + -e "s:/usr:${EPREFIX}/usr:g" \ + configure || die "prefixify configure failed" +} + +src_configure() { + # we need only to setup paths here, html docs doesn't depend on USE flags + if use api; then + ./configure \ + --prefix="${EPREFIX}/usr" \ + --etcdir="${EPREFIX}/etc/root" \ + --libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --tutdir="${EPREFIX}/usr/share/doc/${PF}/examples/tutorials" \ + --testdir="${EPREFIX}/usr/share/doc/${PF}/examples/tests" \ + --with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \ + --with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" \ + --nohowto + fi +} + +src_compile() { + pdf_target=( primer users-guide ) + local pdf_size=pdfa4 + use metric || pdf_size=pdfletter + use math && pdf_target+=( minuit2 spectrum ) + use http && pdf_target+=( HttpServer JSROOT ) + + local i + for (( i=0; i<${#pdf_target[@]}; i++ )); do + emake -C documentation/"${pdf_target[i]}" "${pdf_size}" + done + + if use api; then + # video drivers may want to access hardware devices + cards=$(echo -n /dev/dri/card* /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g') + [[ -n "${cards}" ]] && addpredict "${cards}" + + ROOTSYS="${S}" Xemake html + # if root.exe crashes, return code will be 0 due to gdb attach, + # so we need to check if last html file was generated; + # this check is volatile and can't catch crash on the last file. + [[ -f htmldoc/WindowAttributes_t.html ]] || die "html doc generation crashed" + fi +} + +src_install() { + insinto "${DOC_DIR}" + + local i + for (( i=0; i<${#pdf_target[@]}; i++ )); do + doins documentation/"${pdf_target[i]}"/*.pdf + done + unset pdf_target + + use math && doins \ + "${DISTDIR}/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf" \ + "${DISTDIR}/roofit_quickstart_${ROOFIT_QS_DOC_PV}.pdf" \ + "${DISTDIR}/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf" + + if use api; then + # Install offline replacements for online messages + cp "${DISTDIR}"/{root6-banner.jpg,info.png} htmldoc/ || die "cp failed" + # too large data to copy + dodir "${DOC_DIR}/html" + mv htmldoc/* "${ED}${DOC_DIR}/html/" || die + docompress -x ${DOC_DIR}/html + fi +} diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index 8ea700a3a5a8..cf57844bce5f 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1,4 +1,2 @@ -DIST neovim-0.0.0_pre20150627.tar.xz 4715400 SHA256 5e5769c81a60637b731dc13e7584b6f91c7a4f2fa9116c7d688b938aa000ab69 SHA512 44f527e82dc8d70735110b7da687b87fb622127078dd32b9d8b284d8f3c3bce2c9978640234583f130e71378190c29e9c37cc19be8fd994eb338d1d9a5a98701 WHIRLPOOL 08125b0a0d96d2f5202b314e85b26e32e7aaf2170dfa69df660b2d36ad3218b24a9313c6f7a7c0e0ed8677a717e5d478851d1dc6bc8c020dc6798e3dd4462a2d -DIST neovim-0.0.0_pre20150727.tar.xz 4703336 SHA256 da9bd3070ac60691be4e033947548c13b0ede86b2422d66bd207ac2310b735c1 SHA512 db225fff860d730d4514a33c363ed7748949aaeb3a5fb31c0775120d31219a9fad154ff6f457c4ea25aff666e34dc0e7c8ab1acbc3bbe73bed17d01c67d13627 WHIRLPOOL 23b553f6be136f42c7279d332e1c917083d48aa0ae27df949972ce4eae93d07ea301f9b5853d3d320cc4a6366a483f3f9d43e016607d500646c71ea33e5ffdb8 -DIST neovim-0.0.0_pre20150814.tar.xz 4718836 SHA256 e7abdb0b3a44ec3c312b06aa825caca4520f1b857045c45c925e8005e2bf3ada SHA512 638e6807929880c2648bd2d0efde509842423488272926bb3ae89a6681144b86fe5137ef313ae102fe8c2fa82819fe96e0dcc0a8d45e3ccaf18b207cf9c1aad1 WHIRLPOOL f1ca40e0bef46da63c466e0fcc51bcf37c57f64009a680f6e51cb1cf3b0d481011dff33957b5da38dfe8d55978c368efe9d905d4f26a272e915470fab239dcff -DIST neovim-0.0.0_pre20151022.tar.xz 4947140 SHA256 8b090b130f6eb47021d872e8e33691cbd6169f7f0650389cfd0a3bfc194bafc5 SHA512 262b37d1937982bd86f436ecc9c055fdbd650a227c7da77d203e26c9a885b32dc584b4b098f7f2bcea31e7fdb40b51c5a7d337ca4b794b0114c1115e642406ea WHIRLPOOL ca6e50a0225bfea9161c2b7432886377e6a9962fdde3f35f8a091fc26b35fb44d87d4a327b56b428dbcee9d91f66fe2365a33b158b92bf1b5cff08d326e91320 +DIST neovim-0.0.0_pre20151025.tar.xz 4947384 SHA256 62b3bd93e0395c3f2d1f829a1e4e444ac081de1acc99114f6ceba7d61a7055a3 SHA512 a0390097cc0cfae401779ddd229a6237fa63522caaa6515dfff025b506b83e2597a10711bae0a1a60770d2a244963aa56af58f734885ce73091a19865a420bf0 WHIRLPOOL becfec39f4aa1a22f48991f17dbca003f38dfa6b085ed6043e34ed7e852217dddd3e4fce4d33873b0385e1b46754ae11db21ce47cbecd12822e5073d38a5fda1 +DIST neovim-0.1.0.tar.gz 7644722 SHA256 e8659558103b8f5a65aac84007a12e3581b32736321778028017fd07365cfff8 SHA512 b91e5ce5561155ecb3554f56fd4371219612ed3bc35dfeb60a225eb1dbe1473fce5f573eb996bdb01fd9569f764da86493108665c98dc7555fc44f410befb00a WHIRLPOOL 33d7b88588c214ddc670a7b3cffcfd855699e90b15c5e327ac0c17972fddb73bd519b1a8eb609f8454d6c463f18764f17bc1314b6b27448c5ac4607cdbce1551 diff --git a/app-editors/neovim/files/automagic-jemalloc.patch b/app-editors/neovim/files/automagic-jemalloc.patch new file mode 100644 index 000000000000..a08fc07b28c7 --- /dev/null +++ b/app-editors/neovim/files/automagic-jemalloc.patch @@ -0,0 +1,35 @@ +commit bb3c3cbee65ef42b2b3048afae008c719bc2056a +Author: Ole Reifschneider <mail@ole-reifschneider.de> +Date: Sat Oct 24 18:48:01 2015 +0200 + + Make jemalloc optional + + Don't enable it automagically if it exists + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 348e138..53e3873 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -260,12 +260,16 @@ if((CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) AND NOT CMAKE_C_COMPILER_ID MA + message(FATAL_ERROR "Sanitizers are only supported for Clang.") + endif() + +-if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) +- message(STATUS "Sanitizers have been enabled; don't use jemalloc.") +-else() +- find_package(JeMalloc) +- if(JEMALLOC_FOUND) +- include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS}) ++option(ENABLE_JEMALLOC "enable jemalloc" OFF) ++ ++if (ENABLE_JEMALLOC) ++ if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) ++ message(STATUS "Sanitizers have been enabled; don't use jemalloc.") ++ else() ++ find_package(JeMalloc) ++ if(JEMALLOC_FOUND) ++ include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS}) ++ endif() + endif() + endif() + diff --git a/app-editors/neovim/files/sysinit.vim b/app-editors/neovim/files/sysinit.vim new file mode 100644 index 000000000000..635fc62a0c27 --- /dev/null +++ b/app-editors/neovim/files/sysinit.vim @@ -0,0 +1,105 @@ +" Default Gentoo configuration file for neovim +" Based on the default vimrc shipped by Gentoo with app-editors/vim-core +" $Id$ + +" You can override any of these settings on a global basis via the +" "/etc/vim/nvimrc.local" file, and on a per-user basis via "~/.nvimrc". +" You may need to create these. + +" Neovim comes with sensible defaults, see: +" https://github.com/neovim/neovim/issues/2676 +" Most of the general settings from Gentoo's vimrc have been dropped here. +" We add only some necessary fixes and a few Gentoo specific settings. + +" {{{ Locale settings +" If we have a BOM, always honour that rather than trying to guess. +if &fileencodings !~? "ucs-bom" + set fileencodings^=ucs-bom +endif + +" Always check for UTF-8 when trying to determine encodings. +if &fileencodings !~? "utf-8" + " If we have to add this, the default encoding is not Unicode. + let g:added_fenc_utf8 = 1 + set fileencodings+=utf-8 +endif +" }}} + +" {{{ Fix &shell, see bug #101665. +if "" == &shell + if executable("/bin/bash") + set shell=/bin/bash + elseif executable("/bin/sh") + set shell=/bin/sh + endif +endif +"}}} + +" {{{ Our default /bin/sh is bash, not ksh, so syntax highlighting for .sh +" files should default to bash. See :help sh-syntax and bug #101819. +if has("eval") + let is_bash=1 +endif +" }}} + +" {{{ Autocommands +if has("autocmd") + +augroup gentoo + au! + + " Gentoo-specific settings for ebuilds. These are the federally-mandated + " required tab settings. See the following for more information: + " http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml + " Note that the rules below are very minimal and don't cover everything. + " Better to emerge app-vim/gentoo-syntax, which provides full syntax, + " filetype and indent settings for all things Gentoo. + au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab + + " In text files, limit the width of text to 78 characters, but be careful + " that we don't override the user's setting. + autocmd BufNewFile,BufRead *.txt + \ if &tw == 0 && ! exists("g:leave_my_textwidth_alone") | + \ setlocal textwidth=78 | + \ endif + + " When editing a file, always jump to the last cursor position + autocmd BufReadPost * + \ if ! exists("g:leave_my_cursor_position_alone") | + \ if line("'\"") > 0 && line ("'\"") <= line("$") | + \ exe "normal g'\"" | + \ endif | + \ endif + + " When editing a crontab file, set backupcopy to yes rather than auto. See + " :help crontab and bug #53437. + autocmd FileType crontab set backupcopy=yes + + " If we previously detected that the default encoding is not UTF-8 + " (g:added_fenc_utf8), assume that a file with only ASCII characters (or no + " characters at all) isn't a Unicode file, but is in the default encoding. + " Except of course if a byte-order mark is in effect. + autocmd BufReadPost * + \ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" && + \ ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable | + \ set fileencoding= | + \ endif + + " Strip trailing spaces on write + autocmd BufWritePre *.e{build,class} + \ if ! exists("g:leave_my_trailing_space_alone") | + \ :%s/\s\+$//e | + \ endif + +augroup END + +endif " has("autocmd") +" }}} + +" {{{ nvimrc.local +if filereadable("/etc/vim/nvimrc.local") + source /etc/vim/nvimrc.local +endif +" }}} + +" vim: set tw=80 sw=2 sts=2 et foldmethod=marker : diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml index 4ead8c2a61bf..c15da2ea5362 100644 --- a/app-editors/neovim/metadata.xml +++ b/app-editors/neovim/metadata.xml @@ -4,6 +4,7 @@ <herd>vim</herd> <use> <flag name='nvimpager'>Install nvimpager symlink to less.sh macro</flag> + <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag> </use> <upstream> <remote-id type="github">neovim/neovim</remote-id> diff --git a/app-editors/neovim/neovim-0.0.0_pre20150627.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150627.ebuild deleted file mode 100644 index a5438d37ece6..000000000000 --- a/app-editors/neovim/neovim-0.0.0_pre20150627.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit cmake-utils flag-o-matic - -DESCRIPTION="Vim's rebirth for the 21st century" -HOMEPAGE="https://github.com/neovim/neovim" -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://github.com/neovim/neovim.git" -else - SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Apache-2.0 vim" -SLOT="0" -IUSE="perl python" - -CDEPEND="dev-lang/luajit:2 - >=dev-libs/libtermkey-0.17 - dev-libs/libvterm-neovim - >=dev-libs/unibilium-1.1.1 - >=dev-libs/libuv-1.2.0 - >=dev-libs/msgpack-0.6.0_pre20150220 - dev-lua/lpeg - dev-lua/messagepack" -DEPEND="${CDEPEND} - virtual/libiconv - virtual/libintl" -RDEPEND="${CDEPEND} - perl? ( dev-lang/perl ) - python? ( dev-python/neovim-python-client )" - -src_prepare() { - # use our system vim dir - sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \ - -i src/nvim/os_unix_defs.h || die - cmake-utils_src_prepare -} - -src_configure() { - export USE_BUNDLED_DEPS=OFF - append-cflags "-Wno-error" - append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1" - local mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release - -DLIBUNIBILIUM_USE_STATIC=OFF - -DLIBTERMKEY_USE_STATIC=OFF - -DLIBVTERM_USE_STATIC=OFF - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - # install a default configuration file - insinto /etc/vim - doins "${FILESDIR}"/nvimrc -} diff --git a/app-editors/neovim/neovim-0.0.0_pre20150727.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150727.ebuild deleted file mode 100644 index 993129756fb1..000000000000 --- a/app-editors/neovim/neovim-0.0.0_pre20150727.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit cmake-utils flag-o-matic - -DESCRIPTION="Ambitious vim fork focused on extensibility and agility" -HOMEPAGE="https://github.com/neovim/neovim" -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://github.com/neovim/neovim.git" -else - SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Apache-2.0 vim" -SLOT="0" -IUSE="perl python" - -CDEPEND="dev-lang/luajit:2 - >=dev-libs/libtermkey-0.17 - dev-libs/libvterm-neovim - >=dev-libs/unibilium-1.1.1 - >=dev-libs/libuv-1.2.0 - >=dev-libs/msgpack-0.6.0_pre20150220 - dev-lua/lpeg - dev-lua/messagepack" -DEPEND="${CDEPEND} - virtual/libiconv - virtual/libintl" -RDEPEND="${CDEPEND} - perl? ( dev-lang/perl ) - python? ( dev-python/neovim-python-client )" - -src_prepare() { - # use our system vim dir - sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \ - -i src/nvim/os/unix_defs.h || die - cmake-utils_src_prepare -} - -src_configure() { - export USE_BUNDLED_DEPS=OFF - append-cflags "-Wno-error" - append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1" - local mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release - -DLIBUNIBILIUM_USE_STATIC=OFF - -DLIBTERMKEY_USE_STATIC=OFF - -DLIBVTERM_USE_STATIC=OFF - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - # install a default configuration file - insinto /etc/vim - doins "${FILESDIR}"/nvimrc -} diff --git a/app-editors/neovim/neovim-0.0.0_pre20151022.ebuild b/app-editors/neovim/neovim-0.0.0_pre20151025.ebuild index 11a72f35b252..c084410b7ae6 100644 --- a/app-editors/neovim/neovim-0.0.0_pre20151022.ebuild +++ b/app-editors/neovim/neovim-0.0.0_pre20151025.ebuild @@ -3,9 +3,9 @@ # $Id$ EAPI=5 -inherit cmake-utils flag-o-matic +inherit cmake-utils eutils flag-o-matic -DESCRIPTION="Ambitious vim fork focused on extensibility and agility" +DESCRIPTION="Vim-fork focused on extensibility and agility." HOMEPAGE="https://github.com/neovim/neovim" if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -17,16 +17,18 @@ fi LICENSE="Apache-2.0 vim" SLOT="0" -IUSE="+nvimpager perl python" +IUSE="+nvimpager perl python jemalloc" CDEPEND="dev-lang/luajit:2 >=dev-libs/libtermkey-0.17 - dev-libs/libvterm - >=dev-libs/unibilium-1.1.1 >=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-0.6.0_pre20150220 + >=dev-libs/unibilium-1.1.1 + dev-libs/libvterm dev-lua/lpeg - dev-lua/messagepack" + dev-lua/messagepack + jemalloc? ( dev-libs/jemalloc ) +" DEPEND="${CDEPEND} virtual/libiconv virtual/libintl" @@ -45,14 +47,17 @@ src_prepare() { # make less.sh macro actually work with neovim sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die + # make sure the jemalloc dependency is not automagic + epatch "${FILESDIR}"/automagic-jemalloc.patch + cmake-utils_src_prepare } src_configure() { export USE_BUNDLED_DEPS=OFF append-cflags "-Wno-error" - append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1" local mycmakeargs=( + $(cmake-utils_use_enable jemalloc JEMALLOC) -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLIBUNIBILIUM_USE_STATIC=OFF -DLIBTERMKEY_USE_STATIC=OFF diff --git a/app-editors/neovim/neovim-0.0.0_pre20150814.ebuild b/app-editors/neovim/neovim-0.1.0.ebuild index be0dcda5653c..3c041c40b273 100644 --- a/app-editors/neovim/neovim-0.0.0_pre20150814.ebuild +++ b/app-editors/neovim/neovim-0.1.0.ebuild @@ -5,28 +5,30 @@ EAPI=5 inherit cmake-utils flag-o-matic -DESCRIPTION="Ambitious vim fork focused on extensibility and agility" -HOMEPAGE="https://github.com/neovim/neovim" +DESCRIPTION="Vim-fork focused on extensibility and agility." +HOMEPAGE="https://neovim.io" if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="git://github.com/neovim/neovim.git" else - SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz" + SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi LICENSE="Apache-2.0 vim" SLOT="0" -IUSE="+nvimpager perl python" +IUSE="+nvimpager perl python +jemalloc" CDEPEND="dev-lang/luajit:2 >=dev-libs/libtermkey-0.17 - dev-libs/libvterm-neovim - >=dev-libs/unibilium-1.1.1 >=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-0.6.0_pre20150220 + >=dev-libs/unibilium-1.1.1 + dev-libs/libvterm dev-lua/lpeg - dev-lua/messagepack" + dev-lua/messagepack + jemalloc? ( dev-libs/jemalloc ) +" DEPEND="${CDEPEND} virtual/libiconv virtual/libintl" @@ -34,6 +36,8 @@ RDEPEND="${CDEPEND} perl? ( dev-lang/perl ) python? ( dev-python/neovim-python-client )" +CMAKE_BUILD_TYPE=RelWithDebInfo + src_prepare() { # use our system vim dir sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \ @@ -51,9 +55,8 @@ src_prepare() { src_configure() { export USE_BUNDLED_DEPS=OFF append-cflags "-Wno-error" - append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1" local mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release + $(cmake-utils_use_enable jemalloc JEMALLOC) -DLIBUNIBILIUM_USE_STATIC=OFF -DLIBTERMKEY_USE_STATIC=OFF -DLIBVTERM_USE_STATIC=OFF @@ -66,7 +69,7 @@ src_install() { # install a default configuration file insinto /etc/vim - doins "${FILESDIR}"/nvimrc + doins "${FILESDIR}"/sysinit.vim # conditionally install a symlink for nvimpager if use nvimpager; then diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest index a6dafa6f84de..2d6975b60cef 100644 --- a/app-emacs/dash/Manifest +++ b/app-emacs/dash/Manifest @@ -1 +1,2 @@ DIST dash-2.12.0.tar.gz 140949 SHA256 272b337f31edb95c5aadc8e953d522bd307dc522588f246cc9157edee10b1a76 SHA512 7697083daad4e927aa30a238c3181c4a4ba0e30a2034f0975d4e29e5c2b89ff9f3c8b150ec74811e67fc539b4fb618ed7772f06ace959724a786f25e34276499 WHIRLPOOL c8787267c79d1fb023ee2a27cab7cfb06f4d863093ad95b5710fea1b613e3a2b7a0e3398d94698babc0a5310ac7d64eed5fc54269bd653724a04423014d040c3 +DIST dash-2.12.1.tar.gz 142247 SHA256 41460193aa74787b247b09ad7cae696016110abba2a922ef1a067472eba15220 SHA512 66cfd1da52e77c766677bdcf85b3369aa0ae96775f45cf1dc4a87d3d5cfad60594d3ba603ec5d1ff8ad4db983806b6a012065ae8eeb7a06c6095065c7de9d1d7 WHIRLPOOL 79910beee0e2875640bbe92f1065c5a53791b84bc1c134977c562049baaebf12c096a38160d0a1e7f1ec7360a963caa1bf163db006ffe8f1f48ff7b165f175a9 diff --git a/app-emacs/dash/dash-2.12.1.ebuild b/app-emacs/dash/dash-2.12.1.ebuild new file mode 100644 index 000000000000..15be9733759d --- /dev/null +++ b/app-emacs/dash/dash-2.12.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit elisp + +DESCRIPTION="A modern list library for Emacs" +HOMEPAGE="https://github.com/magnars/dash.el" +SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +S="${WORKDIR}/${PN}.el-${PV}" +SITEFILE="50${PN}-gentoo.el" +ELISP_TEXINFO="dash.texi" +DOCS="README.md" + +src_test() { + ./run-tests.sh || die +} diff --git a/app-emacs/magit/magit-2.2.2-r2.ebuild b/app-emacs/magit/magit-2.2.2-r2.ebuild new file mode 100644 index 000000000000..acb718137f8b --- /dev/null +++ b/app-emacs/magit/magit-2.2.2-r2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +NEED_EMACS=24 + +inherit elisp + +DESCRIPTION="A Git porcelain inside Emacs" +HOMEPAGE="http://magit.vc/" +SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +S="${WORKDIR}/${P}/lisp" +SITEFILE="50${PN}-gentoo.el" +ELISP_TEXINFO="../Documentation/*.texi" +DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/${PV}.txt" + +DEPEND=">=app-emacs/dash-2.12.1" +RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4" diff --git a/app-emacs/magit/magit-2.2.2.ebuild b/app-emacs/magit/magit-2.2.2.ebuild deleted file mode 100644 index 8a803afff163..000000000000 --- a/app-emacs/magit/magit-2.2.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit elisp - -DESCRIPTION="An Emacs mode for GIT" -HOMEPAGE="http://magit.github.io/" -SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-3+ FDL-1.2+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="contrib" -RESTRICT="test" - -SITEFILE="50${PN}-gentoo.el" - -CDEPEND=">=app-emacs/dash-2.12.0" - -DEPEND="${CDEPEND}" -RDEPEND="${CDEPEND} >=dev-vcs/git-1.9.4" - -src_prepare() { - # Makefile expects this to be present at the current directory - ln -s lisp/magit-version.el magit-version.el || die -} - -src_compile() { - # The upstream build system ignores errors during byte-compilation - # and happily installs broken files, causing errors at runtime. - # Call elisp-compile, in order to catch them here already. - pushd lisp || die - elisp-compile *.el - popd || die - emake docs - use contrib && emake contrib -} - -src_install() { - elisp-install ${PN} lisp/*.{el,elc} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - doinfo Documentation/*.info - dodoc README.md - - if use contrib; then - elisp-install ${PN} contrib/*.{el,elc} - dobin contrib/magit - fi -} diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild index b51729bb386d..0cee0eb9e7bb 100644 --- a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild +++ b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}/emacs" SITEFILE="50${PN}-gentoo-3.12.1.el" diff --git a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild new file mode 100644 index 000000000000..71afd50ccd87 --- /dev/null +++ b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit readme.gentoo elisp + +DESCRIPTION="An Emacs mode for notes and project planning" +HOMEPAGE="http://www.orgmode.org/" +SRC_URI="http://orgmode.org/org-${PV}.tar.gz" + +LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos" +IUSE="contrib doc odt-schema" +RESTRICT="test" + +DEPEND="doc? ( virtual/texi2dvi )" + +S="${WORKDIR}/org-${PV}" +SITEFILE="50${PN}-gentoo.el" + +DOC_CONTENTS=" +Org mode has a large variety of run-time dependencies, so you may have to +install one or more additional packages. A non-exhaustive list of these +dependencies may be found at <http://orgmode.org/worg/org-dependencies.html>. +" + +src_compile() { + emake datadir="${EPREFIX}${SITEETC}/${PN}" + use doc && emake pdf card +} + +src_install() { + emake \ + DESTDIR="${D}" \ + ETCDIRS="styles $(use odt-schema && echo schema)" \ + lispdir="${EPREFIX}${SITELISP}/${PN}" \ + datadir="${EPREFIX}${SITEETC}/${PN}" \ + infodir="${EPREFIX}/usr/share/info" \ + install + + cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die + + if use contrib; then + elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el + insinto /usr/share/doc/${PF}/contrib + doins -r contrib/README contrib/scripts + find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \ + -exec rm -f '{}' '+' + # add the contrib subdirectory to load-path + sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \ + "${T}/${SITEFILE}" || die + fi + + elisp-site-file-install "${T}/${SITEFILE}" + readme.gentoo_create_doc + dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS + use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf +} diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest index d45da42ec9bc..563196bb4356 100644 --- a/app-emulation/bochs/Manifest +++ b/app-emulation/bochs/Manifest @@ -1 +1,2 @@ +DIST bochs-2.6.8.tar.gz 5075617 SHA256 79700ef0914a0973f62d9908ff700ef7def62d4a28ed5de418ef61f3576585ce SHA512 5e7438a6a09417cbc0b311810a485374bb9b10be452edd9daff0afacd487ada66f37b8189d4868d3420dae82ef6c38fe279d541d24f8a41bf1ca59359572e7bd WHIRLPOOL 798a40aafad7269e4708b443d6511d86236289b7b19b14d2ed33f2c80618b5b3251a7294c70433cfd0f63ebdbcf8d34fc4aa407f70c9874ff1ce2f226d72c4a0 DIST bochs-2.6.tar.gz 4212828 SHA256 65123e44a6d2c1148d741da025d16311b9ccd600ef268b911aba73c67eaf86e1 SHA512 506e7816c96caf56005c74df20d243aef111dded41b65dbf440844af3d49bc5987af333ef65a53f90de9fbdfc4d18e3e23fff1157ccb08bd95afff8fdbbcfba3 WHIRLPOOL 4598ad37b6792a001e3301770318c6a6d53bda98dc9a21337db4659573d8bf4ec64cf3376386f5e298dc25813c9bcc5e29b7a82383b96c1e2f82c77a75877001 diff --git a/app-emulation/bochs/bochs-2.6.8.ebuild b/app-emulation/bochs/bochs-2.6.8.ebuild new file mode 100644 index 000000000000..847f5e47db7d --- /dev/null +++ b/app-emulation/bochs/bochs-2.6.8.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER=2.8 + +inherit eutils wxwidgets + +DESCRIPTION="LGPL-ed pc emulator" +HOMEPAGE="http://bochs.sourceforge.net/" +SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" +IUSE="3dnow avx debugger doc gdb ncurses readline svga sdl +smp wxwidgets vnc X +x86-64" +REQUIRED_USE="avx? ( x86-64 ) + gdb? ( !debugger !smp ) + debugger? ( !gdb )" + +RDEPEND="X? ( x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXpm ) + sdl? ( media-libs/libsdl ) + svga? ( media-libs/svgalib ) + wxwidgets? ( x11-libs/wxGTK:2.8[X] ) + readline? ( sys-libs/readline:= ) + ncurses? ( sys-libs/ncurses:= )" + +DEPEND="${RDEPEND} + doc? ( app-text/docbook-sgml-utils ) + X? ( x11-proto/xproto ) + sys-apps/sed + >=app-text/opensp-1.5" + +src_prepare() { + sed -i "s:^docdir.*:docdir = ${EPREFIX}/usr/share/doc/${PF}:" \ + Makefile.in || die +} + +src_configure() { + use wxwidgets && \ + need-wxwidgets unicode + + econf \ + --enable-all-optimizations \ + --enable-idle-hack \ + --enable-cdrom \ + --enable-clgd54xx \ + --enable-cpu-level=6 \ + --enable-disasm \ + --enable-e1000 \ + --enable-gameport \ + --enable-iodebug \ + --enable-monitor-mwait \ + --enable-ne2000 \ + --enable-plugins \ + --enable-pci \ + --enable-pnic \ + --enable-raw-serial \ + --enable-sb16=linux \ + --enable-usb \ + --enable-usb-ohci \ + --enable-usb-xhci \ + --prefix=/usr \ + --with-nogui \ + $(use_enable 3dnow) \ + $(use_enable avx) \ + $(use_enable debugger) \ + $(use_enable doc docbook) \ + $(use_enable gdb gdb-stub) \ + $(use_enable readline) \ + $(use_enable smp) \ + $(use_enable x86-64) \ + $(use_with ncurses term) \ + $(use_with sdl) \ + $(use_with svga) \ + $(use_with vnc rfb) \ + $(use_with wxwidgets wx) \ + $(use_with X x) \ + $(use_with X x11) \ + ${myconf} +} diff --git a/app-emulation/bochs/bochs-2.6.ebuild b/app-emulation/bochs/bochs-2.6.ebuild index 78fef9536d8c..934cca694bcc 100644 --- a/app-emulation/bochs/bochs-2.6.ebuild +++ b/app-emulation/bochs/bochs-2.6.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=5 WX_GTK_VER=2.8 @@ -27,8 +27,8 @@ RDEPEND="X? ( x11-libs/libICE sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) - readline? ( sys-libs/readline ) - ncurses? ( sys-libs/ncurses )" + readline? ( sys-libs/readline:= ) + ncurses? ( sys-libs/ncurses:= )" DEPEND="${RDEPEND} doc? ( app-text/docbook-sgml-utils ) diff --git a/app-emulation/lxc/lxc-1.1.3.ebuild b/app-emulation/lxc/lxc-1.1.3.ebuild index 4a336ef0ddc8..b41c68543906 100644 --- a/app-emulation/lxc/lxc-1.1.3.ebuild +++ b/app-emulation/lxc/lxc-1.1.3.ebuild @@ -61,6 +61,8 @@ CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE ~!GRKERNSEC_CHROOT_PIVOT ~!GRKERNSEC_CHROOT_CHMOD ~!GRKERNSEC_CHROOT_CAPS + ~!GRKERNSEC_PROC + ~!GRKERNSEC_SYSFS_RESTRICT " ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" @@ -89,6 +91,8 @@ ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC featu ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes" ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes" ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers" +ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers" DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt) diff --git a/app-emulation/lxc/lxc-1.1.4.ebuild b/app-emulation/lxc/lxc-1.1.4.ebuild index 734490497674..12c175199343 100644 --- a/app-emulation/lxc/lxc-1.1.4.ebuild +++ b/app-emulation/lxc/lxc-1.1.4.ebuild @@ -61,6 +61,8 @@ CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE ~!GRKERNSEC_CHROOT_PIVOT ~!GRKERNSEC_CHROOT_CHMOD ~!GRKERNSEC_CHROOT_CAPS + ~!GRKERNSEC_PROC + ~!GRKERNSEC_SYSFS_RESTRICT " ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" @@ -89,6 +91,8 @@ ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC featu ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes" ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes" ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers" +ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers" DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 6dfb0307ab3a..a514240afe09 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -567,12 +567,12 @@ src_install() { doins "${FILESDIR}/bridge.conf" # Remove the docdir placed qmp-commands.txt - mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/" + mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/" || die cd "${S}" dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt newdoc pc-bios/README README.pc-bios - dodoc docs/qmp/*.txt + dodoc docs/qmp-*.txt if [[ -n ${softmmu_targets} ]]; then # Remove SeaBIOS since we're using the SeaBIOS packaged one diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild index 9a9386a08de4..279fcef823a8 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild @@ -30,7 +30,7 @@ MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vbo pkg_setup() { linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR}" + BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" enewgroup vboxusers } diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.30.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.30.ebuild index 40c8bf58c9d1..dead91c82887 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.30.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.30.ebuild @@ -30,7 +30,7 @@ MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vbo pkg_setup() { linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR}" + BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" enewgroup vboxusers } diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.32.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.32.ebuild index 40c8bf58c9d1..dead91c82887 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.32.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.32.ebuild @@ -30,7 +30,7 @@ MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vbo pkg_setup() { linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR}" + BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" enewgroup vboxusers } diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.6.ebuild index fe93a351b196..4bf941558d0d 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.6.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.6.ebuild @@ -30,7 +30,7 @@ MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vbo pkg_setup() { linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" + BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" enewgroup vboxusers } diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.8.ebuild index fe93a351b196..4bf941558d0d 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.8.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.8.ebuild @@ -30,7 +30,7 @@ MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vbo pkg_setup() { linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" + BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" enewgroup vboxusers } diff --git a/app-emulation/vpcs/metadata.xml b/app-emulation/vpcs/metadata.xml index 2391c644fe52..ae582a9022b5 100644 --- a/app-emulation/vpcs/metadata.xml +++ b/app-emulation/vpcs/metadata.xml @@ -2,12 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>idella4@gentoo.org</email> - </maintainer> - <maintainer> - <email>aaron@flappyport.com</email> - <name>Arron Bauman</name> - <description>proxy maintainer</description> + <email>bman@gentoo.org</email> + <name>Aaron Bauman</name> </maintainer> <upstream> <remote-id type="sourceforge">vpcs</remote-id> diff --git a/app-emulation/xe-guest-utilities/metadata.xml b/app-emulation/xe-guest-utilities/metadata.xml index b3d0d6c19577..789adcec8fa5 100644 --- a/app-emulation/xe-guest-utilities/metadata.xml +++ b/app-emulation/xe-guest-utilities/metadata.xml @@ -5,7 +5,7 @@ <herd>virtualization</herd> <herd>xen</herd> <maintainer> - <email>chris@camisa.org</email> + <email>bugs@camisa.org</email> <name>Christopher J. Camisa</name> <description>proxy maintainer</description> </maintainer> diff --git a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild index 3d88ce40000d..8b9676f82223 100644 --- a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild +++ b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ottxor/distfiles/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos" IUSE="" src_install() { diff --git a/app-eselect/eselect-maven/eselect-maven-0.2-r3.ebuild b/app-eselect/eselect-maven/eselect-maven-0.2-r3.ebuild new file mode 100644 index 000000000000..1029d2d23837 --- /dev/null +++ b/app-eselect/eselect-maven/eselect-maven-0.2-r3.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="Manages Maven symlinks" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="" + +RDEPEND=">=app-admin/eselect-1.2.8 + !<dev-java/maven-bin-2.0.10-r1:2.1 + !app-eselect/eselect-java" +PDEPEND=" +|| ( + dev-java/maven-bin:3.1 + dev-java/maven-bin:3.2 + dev-java/maven-bin:3.3 +)" + +src_install() { + insinto /usr/share/eselect/modules + newins "${FILESDIR}/maven-${PV}.eselect" maven.eselect \ + || die "newins failed" +} diff --git a/app-i18n/ibus-libpinyin/metadata.xml b/app-i18n/ibus-libpinyin/metadata.xml index 5188ad1e2c5c..04783a72c06d 100644 --- a/app-i18n/ibus-libpinyin/metadata.xml +++ b/app-i18n/ibus-libpinyin/metadata.xml @@ -4,7 +4,7 @@ <herd>cjk</herd> <herd>proxy-maintainers</herd> <maintainer> - <email>graham.ramsey@gmail.com</email> + <email>ramsey.graham@ntlworld.com</email> <name>Graham Ramsey</name> </maintainer> <longdescription lang="en"> diff --git a/app-misc/dvtm/dvtm-0.14.ebuild b/app-misc/dvtm/dvtm-0.14.ebuild index 56d8eb740282..53f94a85e9cb 100644 --- a/app-misc/dvtm/dvtm-0.14.ebuild +++ b/app-misc/dvtm/dvtm-0.14.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then KEYWORDS="" else SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm x86" fi LICENSE="MIT" diff --git a/app-misc/eid-viewer-bin/Manifest b/app-misc/eid-viewer-bin/Manifest index d3c3e74720eb..b7a2aae7a64b 100644 --- a/app-misc/eid-viewer-bin/Manifest +++ b/app-misc/eid-viewer-bin/Manifest @@ -1 +1,2 @@ DIST eid-viewer-4.0.7_p184.tar.gz 9908119 SHA256 923962eecd907ac8e123fecbedd6c5988352e557ec0c4b95df4eac11433cd7be SHA512 65b93e86e0175ca9aea8b5fb237aaa8b3fcab838d7507db335e163a6927e1c214248764b96c61eb3bbec6caf19440f7b7cd60dff79482ad249e23770b51fafa9 WHIRLPOOL 735ac73bec1a674e3338fefb378d0cb2e601e019463db60efb9d205e3a840c911f77bda46ba0e0304eaac43bb4b57b80869fbed7b5af534ce347d507e2c0e59f +DIST eid-viewer-4.1.9.tar.gz 9924753 SHA256 8ff4e0a1c435efa63e08e5dd5d3e10c442ccc36299910f5d03f2243a0995092f SHA512 536387f93e0fee3f39145a888df93b58fdf4e92389ea5eee99c41713f2eef22e136ef674c7c59790e8484d2353820c4b6b104ea45dd41036fcdeb5f7754fb52f WHIRLPOOL 59a0d0aa478d2392f57d5f7fff288fa0fb0ce8cb34da9b1beac7e8866bd27f2ad2279540a368b0d9ba94c606028f93d97287e3a14058a66087d3f3d4f8e6a08b diff --git a/app-misc/eid-viewer-bin/eid-viewer-bin-4.0.7_p184.ebuild b/app-misc/eid-viewer-bin/eid-viewer-bin-4.0.7_p184.ebuild index e7a284dfbfe5..eb6d187e8f66 100644 --- a/app-misc/eid-viewer-bin/eid-viewer-bin-4.0.7_p184.ebuild +++ b/app-misc/eid-viewer-bin/eid-viewer-bin-4.0.7_p184.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,7 +20,7 @@ SRC_URI="http://eid.belgium.be/en/binaries/eid-viewer-4%2E0%2E7-184%2Esrc%2Etar_ HOMEPAGE="http://eid.belgium.be" RDEPEND=" - virtual/jre + virtual/jre:* sys-apps/pcsc-lite" DEPEND="${RDEPEND}" diff --git a/app-misc/eid-viewer-bin/eid-viewer-bin-4.1.9.ebuild b/app-misc/eid-viewer-bin/eid-viewer-bin-4.1.9.ebuild new file mode 100644 index 000000000000..a990d3769623 --- /dev/null +++ b/app-misc/eid-viewer-bin/eid-viewer-bin-4.1.9.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +MY_P="${P/-bin/}" +SLOT="0" +LICENSE="LGPL-3" +KEYWORDS="~amd64 ~x86" +DESCRIPTION="Graphical interface to the Belgian Electronic Identity Card" + +SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}-v${PV}.src.tar.gz -> ${MY_P}.tar.gz" +HOMEPAGE="http://eid.belgium.be" + +RDEPEND=" + virtual/jre:* + sys-apps/pcsc-lite" +DEPEND="${RDEPEND}" + +IUSE="" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + sed -i -e 's:icons:pixmaps:' Makefile.in || die + sed -i -e 's:Application;::' eid-viewer.desktop.sh.in || die +} diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest index e8b1d2517d74..a658364c142a 100644 --- a/app-misc/pax-utils/Manifest +++ b/app-misc/pax-utils/Manifest @@ -7,4 +7,5 @@ DIST pax-utils-1.0.tar.xz 619104 SHA256 c39fcc181c7c6a03527687d9977e1c2ce2b47b28 DIST pax-utils-1.1.1.tar.xz 627640 SHA256 9ea1f28b3665da08fd80384e56d2a71bfa9f279983e683a162eb4993b2df8d3e SHA512 a8680f9bc99edef56d24175b5967dd967daaa8ae40c0c68f0e9ff3a23ac90a7cb341c99a47a0f6e29504c3f2740039920258a69267ee89549525d02306a8d70e WHIRLPOOL 7ee993224d54d82527c99d9d46c30f2bca0e464660b2ebedaf43076287894247db8111e3f5b558140f03b743939939849f03bcb134b2ac7776bb30553a183c45 DIST pax-utils-1.1.2.tar.xz 627732 SHA256 49390215f6a4773a9c0a99a6de90ff768d13ce2eb4ba1a869603b81f697fce3e SHA512 7a97ff3f68ef67084d1785c95aed2bef5c3bd6fe0c67b96310bd236dc0a403ab5fa86d2b719bdc493b6d6ce07e43af41cc1ff3aa0bd726f2896494079996bff7 WHIRLPOOL c94e1c55a183ce6a6d44a0993ca6c3c34d41f1fad43dabdc9994357747a159e1578e61f13634c4379d324640c4b1d67073e82992f521964acd64598fa7c342f8 DIST pax-utils-1.1.3.tar.xz 627536 SHA256 b80c923c0231a17aa2db5fce3d81c3b7d061cd8e6b356fecceadb2e9a8ee9bc6 SHA512 0bd5efe455edfbe06e938fab62f7d452bcefe6f426881bfebc8252bf386807a3f50ffa9cadbf8cf4aa514839ba94d3f28b16fea163ae738ef8fdeed28fe9204c WHIRLPOOL 1730c25bfda22d4523c8d8f30fe01a09790131efbfeae21ef1e1917c8fdcd9f8aa0053194c7f32a254fa70b963594e5f399f79f287793afd5b8b7fbafcafc806 +DIST pax-utils-1.1.4.tar.xz 627880 SHA256 796860fbd48c5f811e699e8492dc1110459bad0a62efa8d346b74a4f6f556414 SHA512 9557d0a80c2a94f28760665a258e0670ee2dd585b128d644ea3be310128bfd26db1bc19bed8623cf2c886979d0094ba9b92577b3899d363b5d418986a2f52795 WHIRLPOOL 27ab9694528cada62f76592df6414a47af4ceb967871ddfe295be01a3c590ae398612030b28b94025a27f112c8a293a300cc9ddb008082f1c76e8ba3ce2eae1d DIST pax-utils-1.1.tar.xz 627392 SHA256 97ed475ae9f91cf5ca47eeb39abe6033db77e480469dad7c7823ed16be2475ad SHA512 24569a8bbcd635b163f1dc84d4a74dac2e89fc5a18bdb0ead8db78dde5f0661f3d4d51118818f028bc5359447a2d9156ab394ffb26b5c64e377f3bf4536cecb5 WHIRLPOOL e5d1782904bd31ad93e09486ee01bf0af7a33db7bde6eaefdfeaaa462632b1f66633065509b7b79bf493030b0c104472446f7aaf7fbc549564715ffebe5eeb38 diff --git a/app-misc/pax-utils/pax-utils-1.1.4.ebuild b/app-misc/pax-utils/pax-utils-1.1.4.ebuild new file mode 100644 index 000000000000..fc7931905711 --- /dev/null +++ b/app-misc/pax-utils/pax-utils-1.1.4.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils toolchain-funcs unpacker + +DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties" +HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities" +SRC_URI="mirror://gentoo/${P}.tar.xz + http://dev.gentoo.org/~solar/pax/${P}.tar.xz + http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="caps debug python seccomp" + +RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) + python? ( dev-python/pyelftools ) + seccomp? ( sys-libs/libseccomp )" +DEPEND="${RDEPEND} + caps? ( virtual/pkgconfig ) + seccomp? ( virtual/pkgconfig ) + app-arch/xz-utils" + +_emake() { + emake \ + USE_CAP=$(usex caps) \ + USE_DEBUG=$(usex debug) \ + USE_PYTHON=$(usex python) \ + USE_SECCOMP=$(usex seccomp) \ + "$@" +} + +src_configure() { + # Avoid slow configure+gnulib+make if on an up-to-date Linux system + if use prefix || ! use kernel_linux || \ + has_version '<sys-libs/glibc-2.10' + then + econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp) + else + tc-export CC + fi +} + +src_compile() { + _emake +} + +src_test() { + _emake check +} + +src_install() { + _emake DESTDIR="${ED}" PKGDOCDIR='$(DOCDIR)'/${PF} install +} diff --git a/app-misc/pwsafe/metadata.xml b/app-misc/pwsafe/metadata.xml index 690806854e51..bc5ec521530d 100644 --- a/app-misc/pwsafe/metadata.xml +++ b/app-misc/pwsafe/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>headch@gmail.com</email> + <email>chead@chead.ca</email> <name>Christopher Head</name> <description>Proxy maintainer, assign bugs</description> </maintainer> diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild b/app-misc/sphinx/sphinx-2.1.9.ebuild index 3f2b3307dbb4..9fa5e9f97f8a 100644 --- a/app-misc/sphinx/sphinx-2.1.9.ebuild +++ b/app-misc/sphinx/sphinx-2.1.9.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris" IUSE="debug id64 mysql odbc postgres stemmer syslog test xml" RDEPEND="mysql? ( virtual/mysql ) diff --git a/app-misc/subsurface/metadata.xml b/app-misc/subsurface/metadata.xml index b8135a4151e7..84651c1efeea 100644 --- a/app-misc/subsurface/metadata.xml +++ b/app-misc/subsurface/metadata.xml @@ -7,10 +7,6 @@ <name>Martin Gysel</name> <description>Proxy maintainer. Assign bugs to him.</description> </maintainer> - <maintainer> - <email>bman@gentoo.org</email> - <name>Aaron Bauman</name> - </maintainer> <longdescription lang="en"> An open source dive log program. </longdescription> diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild deleted file mode 100644 index 5d2c52c3fea5..000000000000 --- a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -if [[ $PV = *9999* ]]; then - scm_eclass=git-r3 - EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" ) - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2" - KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" - S="${WORKDIR}/${P/-server/}" -fi - -inherit cmake-utils ${scm_eclass} - -DESCRIPTION="The server part of Akonadi" -HOMEPAGE="https://pim.kde.org/akonadi" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="+mysql postgres +qt4 qt5 sqlite test" - -REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )" - -CDEPEND=" - dev-libs/boost:= - x11-misc/shared-mime-info - qt4? ( - >=dev-qt/qtcore-4.8.5:4 - >=dev-qt/qtdbus-4.8.5:4 - >=dev-qt/qtgui-4.8.5:4 - >=dev-qt/qtsql-4.8.5:4[mysql?,postgres?] - >=dev-qt/qttest-4.8.5:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[mysql?,postgres?] - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND="${CDEPEND} - dev-libs/libxslt - >=dev-util/automoc-0.9.88 - test? ( sys-apps/dbus ) -" -RDEPEND="${CDEPEND} - postgres? ( dev-db/postgresql[server] ) -" - -RESTRICT="test" - -PATCHES=( "${FILESDIR}/${P}-mysql56-crash.patch" ) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \ - && die "Sorry, but gcc-4.6 and earlier won't work (see bug #520102)." - fi -} - -pkg_setup() { - # Set default storage backend in order: MySQL, SQLite PostgreSQL - # reverse driver check to keep the order - if use postgres; then - DRIVER="QPSQL" - AVAILABLE+=" ${DRIVER}" - fi - - if use sqlite; then - DRIVER="QSQLITE3" - AVAILABLE+=" ${DRIVER}" - fi - - if use mysql; then - DRIVER="QMYSQL" - AVAILABLE+=" ${DRIVER}" - fi - - # Notify about MySQL is recommend by upstream - if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then - ewarn - ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your" - ewarn "user configuration. This is the backend recommended by KDE upstream." - ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite" - ewarn "backend anymore." - ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." - ewarn "Available drivers are:${AVAILABLE}" - ewarn - fi -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_QSQLITE_IN_QT_PREFIX=ON - -DWITH_SOPRANO=FALSE - $(cmake-utils_use test AKONADI_BUILD_TESTS) - $(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE) - $(cmake-utils_use qt5 QT5_BUILD) - ) - - cmake-utils_src_configure -} - -src_test() { - export $(dbus-launch) - cmake-utils_src_test -} - -src_install() { - # Who knows, maybe it accidentally fixes our permission issues - cat <<-EOF > "${T}"/akonadiserverrc -[%General] -Driver=${DRIVER} -EOF - insinto /usr/share/config/akonadi - doins "${T}"/akonadiserverrc - - cmake-utils_src_install -} - -pkg_postinst() { - elog "${DRIVER} has been set as your default akonadi storage backend." - elog "You can override it in your ~/.config/akonadi/akonadiserverrc." - elog "Available drivers are: ${AVAILABLE}" -} diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild index 05a483904734..b59b6115fdd4 100644 --- a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild +++ b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild @@ -8,10 +8,10 @@ if [[ $PV = *9999* ]]; then scm_eclass=git-r3 EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" ) SRC_URI="" - KEYWORDS="" + KEYWORDS="ppc ppc64" else SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2" - KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" S="${WORKDIR}/${P/-server/}" fi diff --git a/app-office/geierlein/Manifest b/app-office/geierlein/Manifest index 0e33726dd8fe..21595a5a181b 100644 --- a/app-office/geierlein/Manifest +++ b/app-office/geierlein/Manifest @@ -3,3 +3,4 @@ DIST geierlein-0.6.2.tar.gz 994962 SHA256 1a247c95122758f86fdebd5b3f55bcdd9c6c04 DIST geierlein-0.7.1.tar.gz 999105 SHA256 63bfba1cea558797c300a1e96122fb56a9ae6a83be02e82681ddfcdbb37515ce SHA512 6cb6f8b45406e51c8fdf407cc0b70dae19327556daff3db2ac34908775ebed51434dd5878254495f150bf0487eda65647aa79f7e03fb073b8c2486b8bfa691fc WHIRLPOOL 00100fd7732ca3500b00aa428979ce36c06ae992b4e4917c8b72d07cd051ef75fc8c0047acd3fc0e2f2dd3f503162e4be83b5173e238745f53cc25cb129daec3 DIST geierlein-0.7.3.tar.gz 999078 SHA256 81c3e7f5d37fe275260e6a00123c335ffb2deb056c657c5c5e9b7e78724a457c SHA512 b21d2e66ff5a7474be3c05aa7cb25be7c4dc3cb3c1728c54b64942827a822aeacea0b1fe3b04e403504bb01e7fd7fbf9e6cdc4d7bd522d1000915dc6a27114f8 WHIRLPOOL 52a5ae2dfb33f66e588b152928c68e4bf49d2afb22af89742e786f29fed2a0939c3422f2c71baa87de1025465bb294b3720f4065703bd2e8f2c036f04761adc3 DIST geierlein-0.7.8.tar.gz 999082 SHA256 7060242b791966cd222d7b704beb2c78a40e2b2cab068c8a5174a0dc2c0edfe8 SHA512 8be34d6bed34af4dc9d1182916b1ce763c66a5426a271cc06655dee80f782c22edceded2202131cabf8752b46b68d6effe81f1fcb4f1e60a88814d6d4680e0c2 WHIRLPOOL 908b6b4af239eeeb8616f626a69e373de85cd955f2247d6d7cf4db34b8cc491e063c011f3bfe6c3d067a858a404e52648b136b695514343a47b67773b6635ee5 +DIST geierlein-0.8.0.tar.gz 1123882 SHA256 1eeb1d0e055a92a4c5e2a102280e7488c292981a0575865e2df2c364d9aa294b SHA512 6df69690c94a94f69cb7d22dc62dca6cbc48dbd7701cf1751b179afadd7bf642fe6b8dcb1da77caf094c4b351049ee2d6aa40eb6cb019b66c132af4b1416c3e8 WHIRLPOOL 170633fefdb87f94ef8aa5525aa211b6784012f623ae69dee6dc94a4d6b456d2cd8ad563727497abadbb76401c2cb940274e5682aa4c7672f4806d27752ef4cf diff --git a/app-office/geierlein/geierlein-0.8.0.ebuild b/app-office/geierlein/geierlein-0.8.0.ebuild new file mode 100644 index 000000000000..f7b04b9c354e --- /dev/null +++ b/app-office/geierlein/geierlein-0.8.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="Submit tax forms (Umsatzsteuervoranmeldung) to the german digital tax project ELSTER" +HOMEPAGE="https://stesie.github.com/geierlein/" +SRC_URI="https://github.com/stesie/geierlein/archive/V${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" +RDEPEND="|| ( www-client/firefox www-client/firefox-bin )" +DEPEND="" + +# needs nodejs and a couple of modules we don't have packaged +RESTRICT="test" + +src_compile() { + emake prefix=/usr +} + +src_install() { + emake \ + DESTDIR="${D}" \ + prefix=/usr \ + install || die + dodoc README.md +} diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest index 24ef33e87a78..68dd3eb56433 100644 --- a/app-office/libreoffice-l10n/Manifest +++ b/app-office/libreoffice-l10n/Manifest @@ -165,174 +165,6 @@ DIST LibreOffice_4.4.5_Linux_x86_rpm_langpack_xh.tar.gz 506422 SHA256 e29bc60342 DIST LibreOffice_4.4.5_Linux_x86_rpm_langpack_zh-CN.tar.gz 576705 SHA256 00e9543c903e266883cb2ff5b7f5ebfd9a3422093e5e51b056ff438fd3e0789b SHA512 30f9b0e53686efae34eb0dbac04a542919719c4d4c33e5bd96ed610ba2612a371568283225a6e7e1c7753f6c6ecce597c57cfcc138207fa60077d65c80ca88fa WHIRLPOOL 6087d366bb111b1f581bdd28b9886de061f45f457dadd2bd12d6215e48034c939c1270f86c32a3d1d6634f940d626635bd18288e628eedcb4872539648440aac DIST LibreOffice_4.4.5_Linux_x86_rpm_langpack_zh-TW.tar.gz 573973 SHA256 41dd6cebacf1bb54048e6b95f57d4f280930d27cb5360f63281b8fe689e040cc SHA512 5bfddf487e5f02b3d1f38fd71f112812e0d720541940b2114d729a9373a01d2f264893484ef86887f60ff332cb5c6a9d69fcb64ac6ee3108e0f6196b8e3fd20b WHIRLPOOL 31f2ad4d94ffd03dd439745c9a2805c00d904fdbcc3b694e3e8476c8787f2636efa007ee9c4f64fed6ac4e2fd7decf55415d07b532cff7f1a8c94c52a5cab88e DIST LibreOffice_4.4.5_Linux_x86_rpm_langpack_zu.tar.gz 508197 SHA256 a5560bc63deb053bac8d63eb64f1150c34e3d206ffa605bda6735059b34f5418 SHA512 2a8dca6a4f0fcab490466ece7d99bc1d3370257bcdf9246f954ac6b7b8efdcf3ebd16e7a0841c538169606e9c67064a9b9f9c40e564abc03f93c3af22b1606c1 WHIRLPOOL 57343e25f03cf57c02d8ea8a58325d96b986f7434dd15f2452d5b7507bd3ca7a32e4ea32f3fa682aea06f7c2d6bccb80bda8744154cac87ca7f319ad39fb54bf -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_am.tar.gz 7151165 SHA256 09b21ed93e47f00da8635ce53575e00b1237f804a633444a38c2e82c56743b78 SHA512 c90204863dd752ed9e1ca9972782f2ae86bdba158835c3d8521810c645d14f12493dc0a21d536afcd3824b7713e7f33c2cc625979745498bf464a1531e499722 WHIRLPOOL b51a93986d378729dd2ee38b8bd16b5b87f98d5db2bd605bc61af45b5ed41ba832c6b241ce529311bc7c74d464e307a2ade3348ad243d8adce2a815db1b34304 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ast.tar.gz 8012650 SHA256 f434c2f0cc7187e03062c52f8d25b373734e2cb8fb83f00b9aefb36c9014c45a SHA512 daaed88009cc2d91e981c0c732e999093b18c0f0fc61bee7a798d7320edc3216d89d9b77204c26f0b08bcd5760f339f5df9c9982f0b0d6d52fd9ccc7b0c0c931 WHIRLPOOL 2933f87e2e7552a7497c8bb38ba3da07753a98a08422eff56b78fb356c05da4c5390b1d431aed24f2a1c3d9f7ff8c1d04640246d0eabbff37680221e561e12a1 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_bg.tar.gz 8239187 SHA256 943d2f314049379f75c0953ce913b7ff2f134b4df0c5c2b499b349d37ac37b24 SHA512 ddff114f806e0e63f25cbc8d2b622387f4fad741fb049e55c8a4125c2910df9262394a68ceb867faff45ee289ed642c7dd58bb5aa4dbbb1c92b8541a9e7e5eba WHIRLPOOL c653bef292935e0011e58373438cf88c8494c000ffd2f999c68dfc9d249ba6b439ad3e0cee3eba5bc255e249dca7ac8f968dce17bf19b5fa80de608b5b1ab732 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_bn-IN.tar.gz 9793807 SHA256 16b18222831d80c392fe8a1f1648e6bc9d98e9dce762ad3fd1712d52919738af SHA512 cedba98205f03af040bdc762dd14b74eb635550efd3ef475379dccc22596dfd64ff2ccd8dc27bc75f5c4db12123247b135d2bfa9181a464f5fc63ebb243b81fe WHIRLPOOL 810a93c567baed2dd140cf0b1328312b1de23da16a8b2a236f7883d81deb947692314485a96d38dbd3a65039f1223f20301dd15ccc419f15287fcccb08b043ad -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_bn.tar.gz 9793955 SHA256 c0b8796c8467e13be6a41e77bc6f7805fb7d681f4cb15b3170477ff6bbb74244 SHA512 c35673fa0128e0b669b72c4b4ba3ace74eead8b13f0dbb4a31913a09a498fa88ee31eebc0a85254e070ba36c28838e7a9ece9fa9e227671da4f6f6cfe5ed7a2d WHIRLPOOL 51c4e2854d6497f8a85825bfda357c49301a178ecf1c64272cb0ec062b8e8ac93fa27bfeb3f2529940a7449c03edb5c9949ec0e566f7108f653b7c93d5e1468e -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_bo.tar.gz 9461532 SHA256 91b8859bfa2ac4fd46af16a13ce989afb57d8c49ad8398297caeeee18e2ecb43 SHA512 963b727eb27b9567f731e2a7b060a3418ffa9e5c4f3d5cbad6571b87baa7243be571c44f7b31211b5d7d3a52bc70786d76834c0e15fc6b72f31d6a29a2f3c739 WHIRLPOOL c42b1edaa18e9b84e0cc903f8b34969da235c9c5c9ad73916e4da2f598727d249291b9777fc0cb7185baa25a8ef039b2235eafe70d86df671a8b0b1ff7195e13 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_bs.tar.gz 7075180 SHA256 38afabac4b4748c4de8c82687fd12845d30c0ad57ff285e4275ab39ecd4b8540 SHA512 9fc0303b413c933f0a2892a46fa83354445c92fd114ea87ddbe46086e77047d248db1cc09a7695c441cb453baf01f4194b36bcfce22b790227873ca381387217 WHIRLPOOL 0cc0f5861861c50302983ac0ec3590d5884689cccc241e4ccfc510b8cc23be7530be43f3b015eb71c43f338fcb85c59d5055ebb8743b8431c64b47b867d3e7c5 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz 7886011 SHA256 b2965effce8414d7325f5f591739c373129a4d92928f9f1fd251158a0af2b3ba SHA512 a2362293bf5481a31c43dfe284261b1ff5cd87a66b1ed6b085fb4e6c36ebf6141e6f1a8e3c2baac1eca987c86154f928ffc9bef7ece0b73896c3a3c760a57d98 WHIRLPOOL 2d3254f2277b43a8a503a76a071659f99dd4e24a1276fff83088b0587614b6164f332e18cbc9d282bd445a76ff8824667341160d92f53436bae63a0d074419cb -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ca.tar.gz 7880000 SHA256 a579825a88be24d95dbb061c42974a909ed02139e205b8e47562c46a82365610 SHA512 e23c371f9f35811ed3b02b78c6bbe36366b6219b9763de6a6f1a5a0432f4b09020b4a7fd00471cc45bc1863a0fd1e69c72d7bbe79ee9b697213c241f76bf4a6d WHIRLPOOL 65b42e5765998a5a1474f88e702ea4ee8235c79c5d00d3c1678d3469bcae3557728d600989614249cc50383e2ea7d5cc8a9a9dbef9d72f518f7e74691f632642 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_cs.tar.gz 7497308 SHA256 f3b3bd0797145625b252c6c664e1bc8990593d81904f9cf03b7b7d090f4335c1 SHA512 a47c1e865a09932775d4a452c29c21696454fcd70b2fbd14da3785f22d92406f186ebe5b7c56e1a6aa03045968c557ee13600a309a0c20fa0821364cede2e916 WHIRLPOOL 8382a65d02d896e66f1c8e0c5a3342e727055cb6d20eca8fe5e22417def1ea3791b052733885eb09ea75902a366a75ef6e5a8edb6b5e025feef8843c02b73c4b -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_da.tar.gz 7527802 SHA256 6d82fa791716dfe62267392b03dd5fab09e6ed93a5292ec8c3758c1a50fb5703 SHA512 e5bae14cd39fb1d0001db08f6b63ccdca5d8b6edf83b6da5548df5178401d2481c9b05ce82b3516ed0687d01e6563e69e8237a6a486b66bfbda2966545a42480 WHIRLPOOL 091466906f0a63d0365b83b22dd70e4776ddaa4d3368bcd8d1cd810b384337f2142324e564625a854624b69336a4310363f658aaaff18a8fcc9295726b80dd72 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_de.tar.gz 8062941 SHA256 639ebba331bcf888328fbbf44db380c7c7e100675567d53c56198406a481dce6 SHA512 2097e88d844b2b59382e34ff9ccac95ddb7d066e5c45c84ccd6657f6fc89d2645258ca1bdeabb2acb6783b2252a6b1f9a3dc5a014f7fb5d25ec8c99a0ab38cc4 WHIRLPOOL 926a09d04f7f47299895733ca6f0280781e1b83615d04c6958cc37941858089eae83da424a972b84c729e94fdbf32aae0a46e4cd4615782c2a503185d8d5cb25 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_dz.tar.gz 10364413 SHA256 e8f0e9eee760989002df300a1505110c192d4ac64dbf88de23e194928ed8d2e5 SHA512 2e91edd66828c3de1570dc3788576397392fa23490b8d9483e7e3bfc43fe75cff1fd13ac461ca78971897607612a47c29a2e4870b42ea6b092157639cfe9e978 WHIRLPOOL cc05ae494951b80e286abad593820f25a9431c22bf42cd2df129793903c62e2bccac5be8bbb20b73d0c91b71b72fffe8a7cbcd85bee30cf9bbee1df8478ac3d1 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_el.tar.gz 8876901 SHA256 3d9c42dee9e8eae869d4531ac5a095d4df8345cd4128e5310a15632b89bf015a SHA512 45b3ad1809f649569d62444c56c989d90c4f909995aad9695e0399a355b7729826b3e977212ade7cfd2db6136b1d0fbe13ac28046d33abbd919deca3dd363f7a WHIRLPOOL c038c57a22706a51e778af651066119170097608741c8fb4822dd2c69447d8de9a31f2c872f70836849569d5bddd2ca3d558cd5dad1ad02d2ca2464b2f61de04 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_en-GB.tar.gz 6374464 SHA256 c6a550c5896b978b4048e6cbb30a614634616ff9efdd3f8162bbbd702b8fd66e SHA512 3b6707421ca030f79c70950b441ba43f8b0dbf02bcf707de2612a62632005c0366b74ea5918049d9dfcc7b25f5b504dd1a19d10749990f5a2579bfc27dda51d6 WHIRLPOOL e27f0fe21b11f2753af720a4689ecef22c3f97a6216efc161f3cc2ad098bf8424e9de9e85f30f19e38548cd6854fd851b84f681e4b83f9b156a7f3a2af70e20b -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_en-US.tar.gz 6414260 SHA256 bcc3442a2d96420bb4ef601ddff0d9d014bfaf6c7fdfeb75d4e5fa9f0b993f38 SHA512 e2ed8fbf69796c70d48a67faeb69417d3d3131f59a120623d162abac5886cec73aeaf228b1405c984107a0c3bdd3974b5181204561674520515b0eb228b089b7 WHIRLPOOL c18098d848aeff128213a4988f48a6e7e70a8daf8d65b42eb9f15e40132326e4a6004a5340e4e53f6831497f17fc93368176f32e9dd8309d93d91c2da52ac6b3 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_en-ZA.tar.gz 6360446 SHA256 a5c83408280877b0781314c770ed76dab38d9816c66956da2006ac20a5af55c0 SHA512 f17484974b6a19b9b6a965ddffe2f6f8af4928e9e25d06f1574feac5f64fe4cc69bca1d3e87c533bbaf7b60bfaffb49a29875b205692aed7c2ac714363831571 WHIRLPOOL 6207b6a16c8256c200c2b96acba5e679d26694c1db8d19886805db9b176cb4befae9a0275b6a5a8c2823b69d48f3c6b54fed9c0d53e95ba74783f44bd09031db -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_eo.tar.gz 6943387 SHA256 f58d52818542fddfb7b5dd1cb1c71131508c743ad888cca4a4b16c8ee7c20f87 SHA512 246dc234e8118c14108b0da86fc505ddaf85f8c50f5c9cb9a5d592cf4223a1bc22ab30d160083a7356592fc03e07c88d14fd92143c429bb33678a61e04746c23 WHIRLPOOL 1c863a78bdc15224410be25ff32da441b1eb25d1002fbcf9b05f5703718a341da8dc4854332b0d925282663bdc6439313ecf23d5549d8d94acdafbd2f0f72780 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_es.tar.gz 7919893 SHA256 73c1fcf3060cc270b355fcb4f16a97d3805d5da6cdbfd0bb8f4b81e49bbd4418 SHA512 9599a7b54d9d9223514bd44d7136174a9831ac292a286533ae732700be92ecd33fd3a1995a1e2d06991763f8ffd5a8f87a8889be0ea1f79ed92f081630d088f3 WHIRLPOOL 00c9c1776014fbd9992b2db75e1713852d377d7366bd143f2ae01355d687f06e3f23e8991738548a2df03c9501390dbb7eeef7fb23088024fbd0c7beb491aa68 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_et.tar.gz 7427271 SHA256 8172bc1f7e9e0ea631d2562b13644a45503c315508265569ac27b6782c13ec29 SHA512 547256d9a83a42592b97f417e222781106779adc4e831446c296780a76fc2a2ea446452e24ee28fc5746a4896f800899e6926f18a34bb2266e37daf276716dcf WHIRLPOOL 2c6fa998ac28a844398244851e6c3fbe7ad7f38f1fbe13ef6ef6176746088e17fde8c0fa73c9483df009c84582f83fbe2221bf03d53ee6386779f4a3a77b3381 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_eu.tar.gz 7567698 SHA256 044ea85deff785541534ff9779d76a70f567e2afc352ac3ca87187f64518a650 SHA512 5dff371aa30f8d8a71c9ed5b95c13da2f5510ef14df3b7abd8741bd796e770a6b2966442eb865d7f7a0167b68057546c6fa6e9982883a226f8152cae9f0a1298 WHIRLPOOL 9e0e7828ed05d23ffc0f26406345915823af802b3e6cf13d02d64d9dbd5b875d3fd98a48bee070fb19a0f882b2e243ee287d80db9a8c396c2cdf8eb029dceabe -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_fi.tar.gz 7679936 SHA256 5855545a262187b559cf3eb8afa4347930e595ece01e14471f18872845e93118 SHA512 81a931404a43162ef965af68134e6f2b8aadacf6ac4063d9bc2fa4f1c2b3ac6e82430a9e0e9ac620a4af4107e453670f095e1912ce03d581de4377d984bdc1b6 WHIRLPOOL 261f926e87cc37ceda4a40f728729c0053ba216739bd2706b5ececb3b9c2f68a7b4a298c488c99bcf6b29d39c443eab1204943dc7c050c0b98ba12629b83c82b -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_fr.tar.gz 8094476 SHA256 084bf74cd19d64c5d62d3cebf4a79e096e43cf4d6738d17375a3130e5ca56f45 SHA512 e6bf6ddbb1249e5fe517083d85153d653b6e85434b93cf43e86b6054d295388ae38e7374b1157dc4824697bae12794d39c8e33f4738cd60bce34e6a920822ea4 WHIRLPOOL 2a5b93cdba44a62deed226d9490b5f320a1f7145a2fb5e28190b1dccc7997b2a263cd863e1a3c62debe099cd56fa46967e69d4b740ce1c8cbe3c814a83f28519 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_gl.tar.gz 7663266 SHA256 37d046636697e30f1af5afccb95e42cfddb5350db7aa729c6cf189796dca0672 SHA512 a53e14d452ab14646339c62b6931fe47f25abef1623efdb56451bd8fafe2830049de90407025380f5b129a7c6da7ab72e08feca656c23d65c81edc14b8f447c8 WHIRLPOOL e7c24370c0b63c33c4d20ff4dce3b4825f0791f77a635fa8d3717d9006abb74ac3cb5c8fe58dca7b3f1f336734d82353ead773c44617a420bd719e27a28e59bd -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_gu.tar.gz 6583087 SHA256 13597545d665696b90f8340f63fe160d2794a81cc2530126303396ac6f465760 SHA512 17eadfdfa78db0ee928557ed152c23b5253f47e693d5527cf446d4afee71f0d6190575df733fd7fc8d32bef6567212ff7fd3dc70bbb7959c5db4d3e0a73cae9f WHIRLPOOL e93600c34b295836c0f83e64283da5db8489b117cdb15efc27ebb96af06ca98bcac575d8273a17916d18642d50b497924df4f46096976e4d30ea1f458776c628 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_he.tar.gz 6200539 SHA256 59d484e67da71b7efbfcc1f010179d0031e058c269f04bbc2e81d3028c555d54 SHA512 e8658599e69c12a51d113dc7cc34adca4e6b53ef2d01520656702bcfb0fc2d1300ffffe8d57c933305daee157c5845d93a0d88bbd8eff480c1ca575adb9919f6 WHIRLPOOL 26090eb6213a14a403c938d8c642fc7aa832e4ef16c3a2522140d9ee0fee9a330a80688faa07d469677546e8278816b67cb7787965238c71c2da82f04caa4c3e -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_hi.tar.gz 7272278 SHA256 7dd0717fd61977acef120f0715f553434c33d6f20b4d09046fea509921f2efd1 SHA512 a77c4412c97e39b7c39d0aebcc9cf9d3a8d410f4f97f47a9b84a31bf29a434c33e1780bfd782032047e7730ab5e39ee95622db46096fb32adbaf2aeab83ce54d WHIRLPOOL 06c4c6e39d0f8b1131a233061f241adc1dd79a0ab2b8645c5de23bb3b739f942973b56246bdc62909cfb16fc23d0776ea3c83407adcd4807ff0a0e82b2e88b74 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_hr.tar.gz 6753925 SHA256 b667080c77c75695707f746d8a750ea81c4b1f7d5bd05211242beace9f5ac84e SHA512 8f5cca5fe42fa748258e194679afecb8208b00bce29050848d3c7c3f66ac61909d9279a2193b4ad13bef12f1867c9a9a8798fdf1d84301645bf142e74aada351 WHIRLPOOL 70c1e45b374389d099ecd53ff90a2c75ebd75f81615377c9f365f1da368646dc9c0e90e07d3a44108e3500bb50161975d58526953e033f06b764113898eef941 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_hu.tar.gz 7927240 SHA256 672c328695dc5e28197c13d9663d7d9b7fab3097c714288a1304700b798fd324 SHA512 7081f27404a1403d6a6b886aae0b63c8abc8c6c6e5b4a67bc57dd0f9b251e7e254b84aa4b46ec99f791a0ce52dc05f30c422c5f28a1a34a7d7c1c252ff496d15 WHIRLPOOL 011701c6c12826fdb681b7d2fccca1668d4f63b67b970aec45494ffadf98908f27f3d80be1f3644e8f4c778aee760966ac6a5bfa434cb6ab882e9ec04921282e -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_id.tar.gz 6742480 SHA256 0e62257a6746219cfa329a9984f426c5c159c363659bcbf8c6907edc59e31f65 SHA512 476141f8a32d8461b0974feedcaf01c65b8fce23fc998fe94dd11e98be862faed10c899677aae73bde4b255b5789745759d7c5f8c87a045e596cb1fcd78bed9c WHIRLPOOL 3ab8e56143d986786ad37dbbf8c1de284c8b577728d3b39011645ee750aed89ae12ab37599073a62c81542b9b450ad994b3b5ad8a83e7febc7cb2c4af2fa68c1 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_is.tar.gz 6795991 SHA256 c8ea5854ad9f5b6c0171318a4a1a9d3c6d1ac2f7f5fdaddde1761974256e695e SHA512 8d004011b24b1863079bac8a2e559f172888545f60ea61c8809f2b4dd2e7e08ec92a817d01dbe30ba941cc2d809bb1234e1c05ad67e75baab01875e04636f1e4 WHIRLPOOL cd6a9ca4d6091a85101a9ed0434fb2cb32b298d8562808d290318e67e895100c121992235aabf511a06618578f55a5df050e00d2602237fbb4339e1f378439cb -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_it.tar.gz 7845835 SHA256 edd47e87875d07b2979ed9462532176773eb4306d3cc0530fc18ad52efd9c724 SHA512 78124052b33c6e9fc66fac25384b07a92c51747e27c970e104e5e95dd5ca93d254afdbe509540d9394bf8dd145cb7db3ad2400dc35c93061eb70054df5df20d3 WHIRLPOOL fa166d477f3a95ad9521d9c5d3287d1bcfee703ed7e3c391bb48941d31c3552ace0083f8da51c1d684eaaa69cf5e8ecd35792da114402974fed749533c10f447 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ja.tar.gz 13421424 SHA256 852955bcc20e46cf46fa86c2c5dbc4204ec0358b2a9cb872b85667d45dde28f0 SHA512 7739896ba155c785fe8dbe0d0721a27776c52d3f79c691e32a5a3c6f57da3d0ec68962df8cf65117c2b97266b837b8006e71aec869083a93176cb90868b08935 WHIRLPOOL 363f01fdd30f037575eb97025e0fcd7b8c61eaf4310c4d84f6bce3bfcb51bb5c2d879d2e06cdb4c1f86395ef65f646bddea21305535caad55bd370f7841d2ef1 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ka.tar.gz 7059026 SHA256 d331e40a10eafb3702f571738b325936a73fbfc7b62bd196c7e25b8a324a449c SHA512 ecaf9cd4b57c828199a60219ecdec52b5cb48967a4174c778d9c21f79ba53f1a0d4672621355e5511474dcd01c9d1b14c06ced845b49460bd417e03ee27dff91 WHIRLPOOL 456998adf94aa13b0760c79c59cba83cc97bc6c1f785ec8dec583520790a88afc43cdbf3ede2946d89bf7a826af1842146843869d4ab5a9f21a10f24479ecb44 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_km.tar.gz 10319827 SHA256 73169732764d9f540acaa6cacf6259ba1c416351fe47c6cfbd068abbd89179fa SHA512 11efc4fa356e5c03742e28c15dcfcf92ef554ebec55ce6ca7129c262b163d8a5cea57b68f25f8b16f1e5fad21837aba09007f0f38298894096f4e87aa17557f3 WHIRLPOOL 6576ba327763ae9c7a8f102a20b73b6ede51b937a783c92d9b488611e8060a909ac27a2dffc1cfa8ba6672bd9c601d8dc549b471e1434b3b0a68acc7d31f016b -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ko.tar.gz 9296339 SHA256 b3a78c84d9540a5043ff72ad826f0a6e8f09416de178475cea5513d5bd33f6d3 SHA512 f4a9f0b33ca71f14abbd243b3d8e36e2ef6e3582ca425bfd5071e628dbdb84ce465b6d17d1bd2d40174751e3cba3b4b62e5f197d6187a6f2e7ff07ef2daa2e2b WHIRLPOOL f49e676c8797c5b75f87d3dba98f7d31b1ce42d1d36a614714f9a138075775494d0d217c88f4862c29fad1e7aca266c3be1373934679c89f53ee0aa4c6cf538d -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_mk.tar.gz 7295691 SHA256 d2ac4866975f33332206fe5aa461d2bbee6ac15fcedd07751dbf6da0d54991b3 SHA512 0d449f28238caad77cfb65cd1678200cebe4f57ab832a18f55fe41b2be9435faade3f2942a2dd86c32b485069e1a22c45272c730d5f0d59757565f8ae8430d07 WHIRLPOOL 4da2208171a617eb61e346fc922c1e9822e56476f035f12c3eab9d7a838e8cffef0bd490a9a37ad15a3a2ef0b14013acea8cb9ec026398dd216cce5186600791 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_nb.tar.gz 7595955 SHA256 ef3a9bdb3355d131bdf004a10499589b9d1c6823e01444a291421fc12e7e6f69 SHA512 eb548a868da88b1de11ed25f44adfe6c0c8875462b202d0546a1c24428d1bea16f7effd9118df05ac483ac96fd2b3635d5e87ccf9a94aa7b151797c960644cc4 WHIRLPOOL 7b18e37a1f26cf7997ccdd0659c6254424ac6512ad95585f79e4a5e5514d0b75bbcdbd74f6515c1b63a7f9ec561dd513a31a51d9be0d876d4a412168992c859c -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ne.tar.gz 9832454 SHA256 4797d7cd5078508b5f6a26803823fc1c17bdff3b3e1b453bc84b47d810b2d35d SHA512 75e7a99320ee19630a6170099a372cd137cd4be1e1942cc37f62763351e351a088642934c4aca1a98e61cbcac7bef5bdecf956a600e262f9726aa96b268a5683 WHIRLPOOL cc81b5b026dd8c48b37646ff7da0614d4560f63d6633ffc8c342bbc1a93f8ee85928835680f826ff56b6bbbf293d0ee302c73f90b15c76c478ad5d4e9793bc3c -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_nl.tar.gz 7669416 SHA256 9ce7849f549cfed18fb85a166318e475984ec7dff7a788dd6fe3e51afbc42582 SHA512 db1547d2dc48bbb86dea5615d45edb4b9c067196e057d84f218dab66bddbc341d79c042addfa30e975c77c9e576b80021dae446f3b0367c31a4c6868d5f40cbd WHIRLPOOL f134c0e38f04869ff60dca59aa002abfa62926e3e440e154f371b7cd3ed61379122aca86b723f4f41b45ea1a2a298977feff86ffed9a41827e533b08cbb7b55c -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_nn.tar.gz 7550694 SHA256 16cf977a669b3b7709eb12fe5b0b14925e46e40fe216e81ff569abef581fa1fa SHA512 47b82596357c977828180129038d78ecb6744283c03f72ae37e07cb938f2a9aefd1e7c755272dad447332b02042f5a891c7c523cbefa79652410c58bb12d2a79 WHIRLPOOL 28c8b748122607e4a7c3306b3684aada7cd2aa5ae56f52bd532ef8b940f08395eae6e2eeda1678eba03cef509d543eb8a7e4d1a8edbe8bb7ff4236bfd816a385 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_om.tar.gz 7934496 SHA256 1f84c621ac42996c59371580bc99153f464fe94596bd24494dd3868bc3835820 SHA512 e7a7243af418b7668aa37d0022adb52028123ecc4470ea7eda63fd49620fceb9c818f51cd81c5e3c3580c0e2ec4f0a49c794178f1016a265f52becc2c62511e9 WHIRLPOOL 35fe421a363ade30de74b6f7c98d9f1aabc25ca7196f55b64a1546e4d50c17bb751044e392be59bea23737876093fe0ac695c052dc7db57b8e33c1331a080855 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_pl.tar.gz 7933529 SHA256 6762e3aa61d1dea772c89e8f95fbacbcf80035d38e2e6bf19e9c78ff1428df04 SHA512 d03fdeade88f9375c6f5e0f663b2d95e57c8c72ec8cd690aa63df7cf2cc2505104f9691d27c0f3924c6a8736616ae1061c33d3573e361d4d7352823569cedbb4 WHIRLPOOL a68b1980ec5f40303d4cf84a4f76dc9d23f8b11b06579676d6cbb2c72c525888c20bbbd69419947d679b9cac049af32061fec202228881b69b079a8b8fda7516 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_pt-BR.tar.gz 7681612 SHA256 1d9889ea72fea5f750302e70ffd0e99a25caa9d28603e3d46fd40742afd132f5 SHA512 3836fd2a772c7051438cfa85671ba00ba417dc7f8f3090a52a0986647dd7f070b160f9fbf0aea43b63fd4af0b0017d57db7ff2dfa58c4860fd687121c8183812 WHIRLPOOL 3d9d873c15fd491f55aa535a5166b0926a9baeab34a5c37560edba52c221dcd54bf8b3233328e93cc0599c7c37217a2beb1b7932827bf0bb33377f75b335508c -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_pt.tar.gz 7613578 SHA256 854515fe868d5023df4a68dab62b9e425c10ae2b1606bee5470665c1029556bd SHA512 13e51ae0e33bc3cac458fe448eb9fa48db9f3a70f10f8673a24c2a6a1d7fad4c2394277e550f876bd8e1dea7c421bfe4f8848807c4d3651b8e36c89a9038e5a8 WHIRLPOOL 601e79100d8eee159f5ee2cabce487d9e06844202aaf0b92fdedd664988443831543a45196f2188ebf5df7f5ea61cd0a032d2289f2065f152191c32383230604 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ru.tar.gz 8347026 SHA256 7ed6ca1bf55958e283d98f587e2640c8ffbcecfb4710c2e78a7c25e452a4d70f SHA512 bc86752692e99011508c35f7787b9f2dd50855c7bd1a032edf02e37bff5c21bd4f0ec7269f99ca565f23d59499330eb03a489075262aaef8f9eef3b63d3df6e2 WHIRLPOOL 60a33d8aaa12a2378a01825b65c230893202a8967435e35c09e0d4e7e674bf644c27b2049e5a1b871a2a573274308f8b1523253dc1708493966770280991860b -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_si.tar.gz 7160600 SHA256 2093dca78e0c9373b6b383ced1d2713d8a0c469109ba7a8a236a6c89cf304ef5 SHA512 25a44b9c9976bba35dcb0a232411a837b5c2026a22cfa299517556fcd603ff1220a1e06b120ca23379a0bb21070ef3f6310fade113238d8433a67992ffdebbf0 WHIRLPOOL 9e37ebc4e20b47ce08c9bd9e2779e5dcb4ae08012f5f3e873f808e38fa476fafd4fd47c4438df3d4753c410bd71b87759331fa4d781c72868a08a9123e21001d -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_sk.tar.gz 7436233 SHA256 594346c316157ecb13cf4dd719eddc8babfd63e52918315e4126d964b8ba6bdf SHA512 11abe10f33309e11115ac5342f77c79744a440b2abb7eb32a058a81edd117b7a40aee9065cd73ac3d412968efb2f090310b4e37cf797356981b1b04d41b399b0 WHIRLPOOL 65e5272a0c3a881862f67d31a1d94a097985a82c36dccbe520763aee8aca12c7033b51f28d1c88ab26ad2d6a059eb116bcd728abfe5bf8b14f53242527054770 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_sl.tar.gz 7674908 SHA256 06b89eccac68087418d73663dcda68eacfb9371472497a56a86d77cdfaec982f SHA512 575b60bff8f1bad6b15280b1cb94100ba19220014c81d5667eb5db646e953e183de8809cfafdb71d79bd5e9708c22d8e9dbf4cc383d7ef33c4ec21e5f58e4694 WHIRLPOOL 801191ccd6ed3375f6be12717ea288904638406f90236cfb6d4da2aed53bd077de6861bd229db4638ce619e5ed391eb90b58a38a130f7936a7b1e06929930c5d -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_sq.tar.gz 6792570 SHA256 dd3b4619deee4861f27147953783564356001492b93463088ab8eba487c27e02 SHA512 2c31d9b05830636e759b65ba131416c843ad523d958a73cfd0e5490d4dd2a16b8d5d9b86894f5c314d35409110fd449e436a6a569086dc6832066a1596641c9a WHIRLPOOL 697fd458b0940367fee1c64c2446874783250f09eed23ca88bb13d1dbc04de074bd27c0dc53ccfe503e03c5e9f2e680d2c363d41fe8631aef40a613b941f2565 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_sv.tar.gz 7593836 SHA256 1eb60f200301c5e7ad18fd973eb893b8a2c7e45a338d15b3d99fdde2a8fe68cd SHA512 e5b8abf7ec63e80ac41fd7cfc81d66437dfd6f92c7f58755e5a30a4300885b869406b70a754b02d42c350b42a793bbe28ec22b21b2e765d948c3cd801d5150cd WHIRLPOOL 824ffd56b61700d475597a1a71ef5f8500bd8712f5309f8b8cf83bd00390842965a10a6609f5fad411961d4f2e6141ddd1603b26015f7f257ecc0f360f4f4698 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_tg.tar.gz 7121596 SHA256 9d15975d3d29638bfa93a2a72890daf49ca345083a8e8047ca4cbfbd54a9facc SHA512 3199e05771da8008d03e914fa1760efc792a053792eacb545fdc3ce99f7ef087ec100c21620500e5793e522f75e0475ef7182ef7ceb9279b1257edb5ba0ee646 WHIRLPOOL b93a3f1e1162a9bfb18028b26c57249d3c39f5cdad109d0138f59bfd9f53bf92eaf722d127fddef57707ec17fa6a17b5eecdc27970fca65349ce2afac02ea3e2 -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_tr.tar.gz 7832210 SHA256 25a5393d7086d90cc248bafe91ab07cc0576eab9252faee11748161edb66d38c SHA512 4836ff6475b9964ea40049cdf5f4ab3dac5a9adfd36224bf8d9a6b7b5ecf64e798578e69a4b8e8ee5f72f4ae301d92afd4c209fa91421374b5106a7758780f0c WHIRLPOOL 9306bc9ac29915f4e0da7cccf138c86ed256b14a529d905d57f0164db5f53dc9334f767bc023397f11bb83bdc78f5b8e07d4ab4b190fd343702518651b1f8efe -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ug.tar.gz 6781789 SHA256 61a2c8aa501b766f71ee4d25721759fb3ed912e4e512a026a85581f4de6fa3f9 SHA512 17ce44d693885b126dc2119d6c709de0db8d453dcf58d9336367571f8cf7533c622616823403768cc4560f87cd7993c719e26ca26f99c3ae0153cede786e11d8 WHIRLPOOL cb5a817c4acc9d8259782eb4cb7b11b9011a5f78afb766a4fddb2b0b1af6240564286359647c4be4f0c3ec7551c974b44ab5c775b07fc5601fae3f7fb77ce3ae -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_uk.tar.gz 7232544 SHA256 dc28e61f438deee21f07ab8dc34ff6fb5b69e3357af33539a0bd0f3ee197bac0 SHA512 d2085a78c7571d7ba5921614cf5120f25281df2c9c6d1a024cc6e1c3eda3f553fc9ea38b0846d81de3b987522efeafecee3a6f58266e6eb5de4f327ba6f09ec1 WHIRLPOOL 4e48216bbbf6547b99c017086cc0d1179ee750053779b3b3b32f1ed27d88a5932953669dd03b8d55f476a945b9e1de94e7b6e006922a396c43578366e56d04db -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_vi.tar.gz 8097718 SHA256 eb892cc0b612dd575f56bb057c14b712d140e7c53637a018a4ea325a25a356a6 SHA512 c8305bda3f2f9eb56ddc46e57518ea960006f3c05bd64de061c1ab49b21b9a35f348aa682aa01601b236b4109a186602358fa76dd43fa8c0cea72cd0a713ccb7 WHIRLPOOL 2f17289ea71a6ab6ed0395e0020858d0513a1e893c00c1b821707c090b18e8909687bb63d4a67666d21ffe60219565c591daadc809b266d01308bd8ef78415fe -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_zh-CN.tar.gz 10641849 SHA256 1f9e2a96f67d270c8b96697ac9d836034062aedd81c5d7b0a1885f7bfedbc9ea SHA512 f0408a20b43f3108152702afa67bb4d39729be5bbd14eb13afe13a67167d65ce027ba7b5ebbf8a879715eddc1687d739d8d32cdd595b74a61795acb21f9cb19a WHIRLPOOL 8716fbe2f61cd1ea9289e8f0facc97eadae26723b5879976bede6decbe8c577ff1efc251b97654fedc11b185cefc15843b6c432a37851399218efc53523b3c5d -DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_zh-TW.tar.gz 10698600 SHA256 d64d1e0c3a7f2638ed025777011c58cdf67f575a8087e0b67be5b3668973fad3 SHA512 f2f2f47c6f411741fe74685962cfe3ce2293a863493a759658d9fca7b6db6e3afa322538134f8cb0c63fe6a160110cce212e07ac45e3da155f4433bb9f519fa4 WHIRLPOOL 1d2a478f7ded9e954691938fafe3db36ecf116bcf3d5ce8e38c22113398ce9ad52e67d6f55da832180df6f53cf5f7c4ee5a89be485e7e50476d5e8f2c8f38b8f -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_af.tar.gz 1113426 SHA256 c76daa689630b9fdb383c99063cfb8380b3cd4de289c5f7ce343d204ae25c23c SHA512 78912b00f2fa4a99d0cf32df2594fc661c093d18309a86f4819886402ed7f66bbe2a16364c4a352fa6b3bf2d712f1aa6d16717a7f14d731545a71d00fcf9ab96 WHIRLPOOL c3442062f1ef32ef7a22ee10a5f51eb324024f0dae6bbc412bc264d0f90bf8ee85f324029c1385f8080526ed5749a143d2254663613d64c704c0f1285911a12a -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_am.tar.gz 519201 SHA256 dcba55469175f86dba9f4f45cf813a3f178f02bd152da4687cf321ee1ed29749 SHA512 3f6aca1b28d11175652d63dfe55612e04c486217878f08d1d51108b2f8aa7fd7406a3559e4f50827b602934d05aa55f8a07b1cef2c18bc11954cfd9d5e2c614d WHIRLPOOL e9ac40ef4cc586ca10587b0a88a357305e2f2d923aa6cdfe68f341c270cc0960a4b202f3bb80e4fdc872bfcb5f2e7d0f1d4ea6684672ca410ee750904235e5b1 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ar.tar.gz 2260964 SHA256 cc6728eeb5bb268ad2f404f0c6ea84db258e40f1215f2d58f28e9ef1d2c66875 SHA512 7461e957c6fafc1ffe21bdd29e271f432b6960bbb667863fc15563635145c48bcb01bbce0ab70abf6006efba81827f47c64b8b546b31ad0b7da4a1a1bd5f2ea7 WHIRLPOOL 661c498887e6fdd13c95e6a98a3a205be99b58d8ed67ebd31395c59b04d87872db3f630d4efb3cab15c44b216346482bd48839104a18ebfd50afcb3365c924ed -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_as.tar.gz 546397 SHA256 339640a82d4c20fc2d481ac60cff8b2d15af18b5ccda9c53289c2c8ef88a99ce SHA512 a7250ddb2a1cf54a8e469a68a1257981583442bee792b385b7a0b9fb7744f86c650b1159591bd569e12ed17520eff6d72d705dfd0a8a8bd9ce6d77f017f1e6a6 WHIRLPOOL 720030b78f1abd7961c24d09c7b8796343e1390b28f944dfb6a943fb2288e7f13c2cdf4258415ea4a2f4ed32ef6e0783b12206d1b51bd1e76e6c415f78dfde59 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ast.tar.gz 502005 SHA256 b1715449ae992c69f548566b09101c52211fd63ba93159951e9d97de6e5b5ec3 SHA512 f174c0597ef894702b880c07113e910d63872791ce2a592b18d2f7c50aa1531fa1c042fa33203d17ac434cd62df5f7c7142bc3f2cfbf7ce0d3e7a4b6a969f6e7 WHIRLPOOL e484da2142fa5c872db3b250deff661e4a347db93d4926b13184d0baabee83b39d58d82f594034b4f8b9fc64605d225c34dda07c6a48482a36b66078c26c84fb -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_be.tar.gz 882938 SHA256 b71d317ccaaeae8ac4e4d55ab9a8c1f49cc21b0d659f693ee4c43096aa80ae41 SHA512 4d2600184ad76b8a37ce8e4801618a0cba7629c3ba77567baeaf23b04bfc8aa5d2442314dbe30da4a86ac1bb20d6b6b737458d7eb34249ed712e51d6dc30f28b WHIRLPOOL 41b2162a0890bea109fbf947d80bf10e76ae492bbe56e721d8a281f4c8c22f59d51b6e740a9fb4743f003f944e8d0df694c2d403026793125255a8fb76b9fe8a -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_bg.tar.gz 1962506 SHA256 b331bc7284f62dde2ea01fb2fc284600995510ec16032b1bcabaf01f7318aeaa SHA512 d9bd23e1da8919f891b355cbcb1e5fd92b3b04bd66f7d8b4915de68155fdc21665537dd77864fadce8290c581e67e37d5919c4c0ec8b741750a906f55869aac2 WHIRLPOOL ec3e6bdb190dec9e4bba9e6697958b0f706f76ea3d94eeedf4a2cdab931840cb9f8bfa6462e845648cc8871d663324c055ba7e1a55e02edc0b1ee4feb5dd446a -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_bn-IN.tar.gz 552397 SHA256 e96e071c528d856222e5934dd4b280014f59b47e8e701d04b0c4f56aa34923cc SHA512 de1a05aad9cc9e3b0240b723fa79817f9edad5bd5429658c21e37de5eb9735e4264c6a6a56236a220348309273ec95b18870923d07a5f01964f4705a42e6c4ba WHIRLPOOL 540dd0ac652c8548d1dbe8e983182b9f0ef4d5c1f8b37f731f3ff5d24ff5103f87a13e27a8cdab34c04dd59ace6326afc01a21c2a4cdcca1ae43fe982fbe91ab -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_bn.tar.gz 901319 SHA256 743fa3f9eea6238fb9a5534208cd9864063c1e354a89819a4a63230b752e8f97 SHA512 a18e2353abd490f7fab8b5a51f303aef606582eb8e563aa0aaa3bfcb46de9dd19f9e9b6fae52a56d23459a40041e03161ff71ff54306b4c929b8ef11deb5a2aa WHIRLPOOL 70cac79e038766214aae2f041a3c7d9b2037f77bd80993b1afd489f7a71b6418039483ed84175c79d5a75580dc49d7f37b5104d96f37254f12b2a0e83d6f721d -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_bo.tar.gz 536028 SHA256 4826931a48a38a4fa119087c5deed21e1ae842a13989f2001b18a53596213fc2 SHA512 ae11a26e1d174810ab2ce0ada4a40f0a4db06a300bfa0f98b548f84146380b93549eda103cb8e02c799de590f4d0b6a6d2fbe78b86c057b99433507e196f1166 WHIRLPOOL b12281fd083767c362079ea999c72116b80be65962a910d585fabbc357ce74d9bd3af958b94f3cf335e486431b2b21119b89647d31fb03f1cddeb50995e0e75b -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_br.tar.gz 1717553 SHA256 ad645491e2f8579251a2c4e69193289c93a8e9ae31b910e7b64bf36f4660192a SHA512 f16ad27eb352c06395c34cb46b0588d289941d9b41c10bfc0cf3e008de8de7b5ec45f8fe8ec4bc80dab7726ebace569dba00cea39cde2d62fd0ded483aceb85f WHIRLPOOL 1a8aa82c82e6ebab9b58f95061a66a2a44f351731b559fb41cad26c315c4f61dcbadbce46162eb3fd4a46422c4b83b8a543e96c280113827cc2cd44bb36cbb74 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_brx.tar.gz 515699 SHA256 06d4f76667ac906fd5cf7f32ec721f9d259f5a0597af56c94c371b4533510b17 SHA512 e618f320401eb09b4b098b93e4fd37455c28500826446f2470983d8a1e00431503c2cbf2ddfc3f7d6fcbb34f6f3ead9a14bfd97bc1622f3e29225e6e961080db WHIRLPOOL 3f31affb4a9d0980adc67c16f301b16ef73e2f32eaac023f9e7defe29553159c9532ec01eec70850aac0a791826deeb10a3648b3255836a82bd9dffa1b2f96c3 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_bs.tar.gz 615521 SHA256 d1e7cd7e4dcb7e5f7dd583d490e193e9bcce7b177d0220061e2babecf1c72504 SHA512 dd37c49a0ad7ce9e6469b129423eda1ddad44c03183421bdce41c6abf818d19581e8ffde552269fae429e314c2e5db9bb5c96314c90658055fd0b58f84501b35 WHIRLPOOL 0f7af6bc9bd7b7bec65ab476c1a03cf07543f7957fe2f4412998752a37ed575f92befe139d249974b484f15107713c57dd97f7e7be28ab96465949f3688fcf14 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1770835 SHA256 e671c6d2d0dcc367f5134bc7b1174340b4c4ff159a688608f0d91297130a7c55 SHA512 1cd3af99dfb45bc453a1dea3f2dea022c1bcd9279e77a3697a5f2c7c4697081aaec0f5afd6435ef14713a6971145dcda5bb5bda99bcef15785f0663d197733c3 WHIRLPOOL bc39bda38e1da8c971879a3e0cd0f8a755cbcca8b70408641bda7e0812d410e28eb1bc2d0394667c80ac81eb559e32597f99621d6f7497ca60c2aaf6ec920d06 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ca.tar.gz 1773699 SHA256 75bd3d76a11419a91b2a8a76c9e995f12a27acba1d62af3336c1a22e6c8d2151 SHA512 614e096eff0182ddeac6ba529fef019979fb21b9eb4714b340775fc171dcf5221472484351656ccb1053dbd62e1edb6c525a6c5f7b1ec0fe695ecdd3a68e6dc1 WHIRLPOOL bb4a388be0abef293de3b73044398f7ebf31202d986e9e5728813846d29ad15744fd01eaabc3ac7365ae5b926b909a3ef961b7a4583fa0dc5e33055b7d4fa419 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_cs.tar.gz 2046920 SHA256 2ebccefab1630992aed06a9b3dc7e232e6ffeb892bad958d2b55a2a094f37fc8 SHA512 0538e5ffe97ffc12070a94411f754f92f77d25803000feb8f0c9f772992111265e4a920998300c5f0145a46a52824813ac775ca7f9d9a812b95043820b1060c2 WHIRLPOOL 474454cd80c7f4d63097677f89e23be27daf5292feaef08aec44689b8c7e26c38f4afc315a71492b6dee1892025d05744344d4d4f74860ade1b63e7fdcaab073 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_cy.tar.gz 481182 SHA256 7f1cfe012e7960420c42ee46f56e73a9f192c478470834bfa8eb73ecf66be00f SHA512 d20b1b61f58e32a9149273198875ded987554b691af67ea80364874047cfe4ddf33b428182607559129b846a22816e14e4fb292bcd96b5f50298027ca1abdbe3 WHIRLPOOL 92c7a04b20b9d0ceabbd89bd89b79cc5ac64839b77383266a3740c6179db2539ad0d6741ba236f7689fa01352b1ee06ddbea965d502ce63f2fe82342cb6bd034 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_da.tar.gz 2386202 SHA256 da2f8ff5303ae99aa6381f3ee8d5b66e2d2cbad694eae43da154b73bb2041878 SHA512 48a0f7475bd2248ebbeac4e97e7c3314b36675a166c5d8fd4f1205d32654a01d7d38c5415fdc4e7038a4436fadd663d3b29fdf4cd22900d1a73e485d30b359ef WHIRLPOOL 3b5cee9e9e8adfdd4c00c0e6158c410bfd1825b648a6ce8b5d05ff7f4b1ab4f0fb149bbbc346cd63e6f4b2d404fbd5b9b8e9333e72d61f3bc7c4228718a14094 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_de.tar.gz 14122403 SHA256 b19230f38c13d84738703332fdd72c36aa4f97a9cd376b964d1c0b3f384a79b7 SHA512 37d58f57c8865e1725e62784d3a84354837b20a9e3358865363b6322f53a29313185d433f9b32c83f4dae1fe249f574f7edb2656ddc4ccd4f59d587f08da588b WHIRLPOOL 30212696f799248d69e8d666373fcdc8e89000c3d5a5f2141f92440168f9f6b2f66d8fc2aaf54bf1042a23c791aa03824301c2632ff9f4e0191ab4be447c53e0 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_dgo.tar.gz 547345 SHA256 2393e24fd1475b1b8f24f944d5eb7a88d3f36388c3172cfd262b55621292d1dd SHA512 3e518af6b12a9c44f811c899f4a77db23b9b881e27be01aeba74335970b445c9bf5d932397f69a2b3b89ee94d2e89480447817c7c9e4c14c5eb953045d42f9df WHIRLPOOL c0e678d838dc309b9aa3a58d2a9e7b6cb48accf71008a5d990ebbe47016a07703d2bd3a7a0e0a15dd6054c0a81b01e7eea24106d414fb1aa390649e941487500 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_dz.tar.gz 542313 SHA256 da690d01ff367894d8d1a67371ab6b042c5118ac1a7f3256495553bd5f978e48 SHA512 3889569e659bec95b12dd11c0c659d3369e5c2b1aa66b10018c4bc4ed72c64d5503bb54d426e964f4d0f975bbfb9b0f0e9e3e9c3a8c1dba016a941a71901fc9a WHIRLPOOL 178ff85ab482754a443d00ac585b383036506eb9d3a78cd760b32ec225eb11450a6f08ab991e72db1913d1a4c027e42ef493a4771d3ffffba24e658c3c46e97d -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_el.tar.gz 2088455 SHA256 bd791585a021d999d9b9cc728a454bc8ccf26197501c9a8c02c96e83494f7ad9 SHA512 4f8a917cb99a1d80c83319ccc9dfeca7fd4b033ffb75041086728865ca490dd1016420ddef655279cdad8302c7a18dab5fde7be47a89171c0b63778ebb4c6b48 WHIRLPOOL 03cc7957502709409db1b2f070ca0be5a4d4fd71674139ba31f35ef331f06a50d063d43788b7bdd4a6b6c96c3b24a92c55b25eef5c0c6dc880ed74f0fc86fad3 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_en-GB.tar.gz 7117774 SHA256 bd62306bac2d5919cc99af6c817459813c9c27f151933bece54d9ad2284d97d5 SHA512 a33f8b43f7e52d7579dfae1cdd9b3cd86a7b559aab0783633be7ea99c9950d84458e516740b4e6d6ee0f265627e15e2b43e19f7b8ca7b4760a23dced6c9b7d68 WHIRLPOOL 5e99a7d01c547efd5d1091e8b297123e932e1aca7080bfd210f1cb681101c8c7085500ad39c601c29395cfbccb691960a7c6c47c94e864ffd65615a523ca82bb -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_en-ZA.tar.gz 7034171 SHA256 ea1abee7a44c809d530eb6f143d32c5f06a6f72e61f8b9ce3b9c854932d5e2f9 SHA512 8ca2be72a3e7a3ec061dfd238ccf7d77e65d2f416154c5d81cf16c5fb2d318c9735d5374b8318d02f3bd492388844d1ff8921d509ed03c52566f72545eca36b6 WHIRLPOOL c02fa0a66979a9796bac410567890819f3f9fd436612430050830ae3999bcf74a233569ff0b2e68142b6dcf1efac076fdd7bac21919f233ecddaa7ddea3688d2 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_eo.tar.gz 478265 SHA256 2d42d8e0bdff9a1794131dbd42992f367d74c37154049c65127d82eb31d9bfa7 SHA512 afc99d4905368e157f3289e26c9e1e467b24b0efa8fb700b3f5e537b9488a4bcedff2759d3f5965b3569e1d64ac0db97b8d154712156190d50a5f35eac3dc5b5 WHIRLPOOL c68c2ff51665c55cac3b1ff49a60373aa0afaef4768214da98cb821256c216d274bb84b3f59a6815b594b978f125b2ba19aac50625cd10e6e657f41ce3003565 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_es.tar.gz 1959372 SHA256 9daa2489d6fe58b16e7ab175d7ab574b1f078f5168fe7c724b15beae7862a3eb SHA512 b7a6c1776f9fec7cdad172868fded0b421d1f52b5979f2223866a5a883fc3f7ab979ddb5e7a154a687c9a508f707812afee21adb0ce4256cac211c9b77a9d91f WHIRLPOOL bfb83a7cea3c13d8a309f2f6a40b1fd993927ebdcb4e0f40a0aee06024751b4be8c1dded786ddc6b2f86bc1c307dc3b17c1aaba18ba9847dc2da7a6ccc91a9e7 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_et.tar.gz 1388520 SHA256 6c5fe14d6bf7fe256023995341f1f391b2ac1c0c1799bb8e9a6beb795342d6b1 SHA512 14cea7b08efd92350f8bb1fbb4ebed64620ee3a2e259defb14bc9217a917af0f682067fcb35fa4d752377269f065857002110391d8e9fd15c545ebb31f4b7bca WHIRLPOOL f0a32eace6a0385616db17de098ed54ee65de48dcb760d23ca83760229edc015b0e55abd779f535116c32dd8d74c258867e3a062647c68ce4ce358f395bd6de4 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_eu.tar.gz 487307 SHA256 a8260e3d226b7b4982c33645179376b109354b1b4d8d90f3b90d2d2c51a492eb SHA512 84224525c312c06f8cfe536ef760a3c32e89acb0f1e979f26ed5c995ec61ac7a9760a644d845717e0042d454c6235c51413e7cb86c2d4ac818b78ea4a979c220 WHIRLPOOL eb85650e4071f5d6ef3b7000083a144d1f56e98bd3aba5a589ac642d1f242082643e46b427f01ce5235027db6d7f4e23883dfb5f76081a0c3620b9ed6a5940b7 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_fa.tar.gz 510373 SHA256 8f7a028191493078d514a078498f05857e82bbc1301eda128dbe012fc40e0a56 SHA512 ccce6e95fe92bba7342dfc2275c881f7055b7df76c1ab58e6a4f9e9e786dd990726feab2e75f6c15fc8305cf2a376ea38a3a11fd605cd43c21807cb8193df744 WHIRLPOOL 94b94fd7dc520bd3dae0a0fd0d2fbc02820b6543951852e365aebd0119b2d904d6c2a59a1e84638967de53f1b70972edecdf75adaba76f20ce6e424d55a0f162 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_fi.tar.gz 494520 SHA256 b7820e8d5e4552540c98e48ef1e839aaa373f3fd3ca3adf973a323e047eef40c SHA512 2d91d4cdd6c0dde5bee726bc14ed6181eba8b3df484e502447e8e255e58a599be7e9faa2bc190bff26c439ec70cf7d278bb8e28f8096ef1728ceaace9b25cf59 WHIRLPOOL 31b77e9bf7a666bdb01c928d881b9e976cb542d8bd30a478aeb115fcb5c9b9f48e24ce0338686882f5d54b6309820e446dc2599eba1b48d1e4eaefa1425babee -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_fr.tar.gz 2815033 SHA256 bd379bbe330ca3e81af0ccbe922ca874627372e4f86ba9828bfaec4cb7ba7df0 SHA512 604418a3a01b71ecc91db296fd3a44195ee177572aa0df08bcc9c66c237441072e8b7749264a42400c3b372f3e5a220d9f69c9d46eeabd8313492c87121cf027 WHIRLPOOL 4a3bcbdc070bb91a79735a5f48a6ddf69f406869c6cbebfa39285c4201750c9ead9d97cb2ebba305f78803f848f7f18df7ecf33098985509c0f237e5ddd4aa3e -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ga.tar.gz 503830 SHA256 5f3451032b3e8251664d3d134ecbd594e2a03be868e13acb54d8588a0a5f4a9f SHA512 5c1609a875f24a9340a5852a4f64be3e26952e1c53566719983ee0ca6b48ba370d29624df9b9de2e63b2d7aecc1e847eaa95332fbe8ebe87922cc18766829f61 WHIRLPOOL 305e4f43638be1ffd79aef6d640308d0a719a1f3abfb58bdf37b54d8ce6286bec2d1030e54570c5a0cb49dbcfdbc2123989e2639bd46649d2a0a4fe6fa807dc4 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_gd.tar.gz 1082950 SHA256 c36e3159a0d541c9e772933f954ecbe1eefaeeaabbb08282354e5d368ddec725 SHA512 05e3bfd65f1abe7393d2955f00075c08992372b5fc8eea4340424e34155426480e747baf73b825ea4b96568dd07b4c306d79757ac2bee4c7afc117aaf4f9e13d WHIRLPOOL 7353968830e3c2ffc3989d3c83bd83ff344bb4a9904704cc9675be43170fa0da16dbafa2603d54b9bfc89fb2005035d4ab1ceec2297603df6ee710e306914120 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_gl.tar.gz 1053368 SHA256 29b40a8db7a90d9de2ba78b7c690999f65f86a1a4524e691e84c56b3274078c1 SHA512 eb51595ad35603f9ca0f071b0140642ca01b802c1d3cf1e2b0e1686f92ab120aa4b0bf550be7b7c0d0c8c7cffe2897c5c71cd741b57d7e41e9047af29dcca1eb WHIRLPOOL ca1bde7d8b717c52d2898804d2e86591c393de6ba2a29db8af6e200e9b826aa7266519ec399819b70747e5e9bfad236b9a357f1f1b4594773d5d016e24cc8a3d -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_gu.tar.gz 1189808 SHA256 6bf7c490c2128386c8277b7c9c24dd9fd9af33a7c78b0b8a19f972f1589974b8 SHA512 0d25540da089c2c2758cff4d802f2683581ad3790aaf0fd2a5d2096c59b7ec44665bcecc7716121e007a553f054c6317751bbdb514043ddd920980cfe1f75ec1 WHIRLPOOL ec1de59d5a346bacc3e9d86759b05a6e191fdd41b99bebc28d105aea211a665df7fefc89453d3486857372419827bed9b9690f3fb9cae3906caf62cdb5edd139 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_gug.tar.gz 500789 SHA256 db78a2c6b3e636ea36082d74176c4c8da57b27a557bd29dc1c6163bab1a41bb0 SHA512 bf248d92f3a081d089debe94d73fa43a46505e5b9b22b5b73c9b0bd3fdac6df96e3fef28e6d6391342c40d44b256ff2fe13ea1c3cf4a2ab2cf12491c04cc9701 WHIRLPOOL b1dd9b30bfb9649e7240d10c74b02ed0ed8c3c3f282bc92d2c1680ff46eefa08cc22e2ded7ae72d3bab6cdcb7c12551869961b833998f8bcd5281eb2ebb319d5 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_he.tar.gz 1580923 SHA256 7c6df25b14ed2c82a5f9b34142ce9f0874725e0bdf9c624362c3ce2de9100d16 SHA512 12cfcd3799107dfe0093a2a5779064ca3cc4154d6c9c881f7e52c51a5567a3639c086f1b147728afb116b3d2d5ac6b8a19346fb2520b23a1620fbb681a05a523 WHIRLPOOL 4721fe41b5d36f668820247a11123a2e6d57ca26118c49f61dcc074fdd0b7c8a550891abab0f29ae0927e0ecf896fcd4fdfd15a53729c39f29d07a58da077dd4 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_hi.tar.gz 610635 SHA256 3d510a71c0b3a6625e8d3125765c327396b207ac34ca8463564d3477c27d10e8 SHA512 3488b977c8b5cd14b04e9f414f3f767e6ff5ed5f6f88b7690af5febcb5ac635b23a98c243b2170d95a5b90bc8130a1e0b519179411bd06b3e6a59df58376d4a8 WHIRLPOOL 7e6eff00ab1f05803507aa00a4a31b15ab998869b4172bab311ff08b10c2547fa778fbcb9e2f4d274a5d5dfb024217338620893adce50d4d86e3c036bec02ccd -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_hr.tar.gz 1256430 SHA256 98ea4e978a6d1de2c7b7bae899b7d396d54c1f62cebcedad92116875c960a0da SHA512 b0fe1846a604ee324184b54c435863693ac20ebfff30f7ebb699d26e878f4222f69386b78e6c5b12d0868a680443d0ca648e33622147578e889ad599b8e6f2b8 WHIRLPOOL 7b1bb051e4a4bee0535fd338b7f61a226f3b2b0ef754085e12b36e214ab3cd980c7c0e4c2d9cbe83d574c5eebd91ea28c688bc13b212818b335716e86d6bc1be -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_hu.tar.gz 2710630 SHA256 51f509efa9c7bdbf1525ba00c3ad749b179eb0010af1d17e93da88fccba8e6f9 SHA512 f27397fb3387f5a07bb3637f16fdd4349533d6c95990c41ffc4a537ecf8829b77234431fa30279eac46fc7d7a14933033b30ee3d54a690f31c39a0b694b68cfe WHIRLPOOL 5193f59aa7d04f6f4890d172064261d1ef6ed0afef8b8f30c7b7ce9adf1651aa3b054b0700f227f8bad9a5aefc38c52a8528a3df9d938d26ab1fa9de6fd6b1b0 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_id.tar.gz 478712 SHA256 31a6df99f262c51bdbb95b973ea0e17b7d0abd3de0f0046383dc384cfad90ac3 SHA512 cfd6fd0f4060b62a0f72663b54cb5732528ee65736c743a1edfc65cad5db381517fd1c625ce91c5ca8591a3e30bf25e7b03314b109e7db091af57ae782c8a62a WHIRLPOOL 3e89da0cfb16eff963747969cf00f542346c849aff717b1333e5c9388ab5689eb18bb297a52f6df8b5519285cc7a7156c5848aa63efb33dfbf093cd762a1552c -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_is.tar.gz 1193316 SHA256 fd8641872d921af48d849f4d1740e6dded4392eb62026a043f2b40a8d29baaf6 SHA512 6fbec2f6708d465c3b8f3c53fc56be3d89c166d10662feb0f5a9ec2b1bcd534fcabdc982b539b602b0a2f52e294e31686d9e7be9fcef9b782d32de813a093e9f WHIRLPOOL e00ce2ec3406f773cb25fc8abecf1e984c97c95de4cf874ea17ca529a1917c75f455eff80ac2e42901ff381e01d21d2642cba04ae59d9e5efdd3149da1d2f372 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_it.tar.gz 1825540 SHA256 a05e89c0e1e8d5f79c54e6dbc9068b616ce7946c0eb595d767b9f0a84308f8ae SHA512 c6f00d6f71ec7af360ed0fbb3358455151f0a3d391449618cee6eae6531cda87abe645440a5be3d4667122be0dc27480a36bdf9535dc43c3e06482085664745a WHIRLPOOL 9964fe783a1fe91a677a0dcfd9f9c360c4fa361c289911f63bead87b923fb6635d87adf70c813eb47e131fb12d80806ea4bf180748c59989167bbddd197184cd -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ja.tar.gz 588202 SHA256 d8183ec1a36f98d37feec6c9a34af840a8110c1c7242236a2ff63be5cb33d2b6 SHA512 bfffd64ab657c86eb303a673392207390199ebb729440754db75787cb37a310b7c3fbbe9c5a2190cd1926d916dc24052327bf663e4a8d773a2261fddba5a6a80 WHIRLPOOL 61490177dae5d28df97f76e568c1297655eea741e2af68eedaabd39b1ef7cf2c819104b7f9449e55bf0feae5e9250e60224f2ec4071cae3341e2326c623f4d70 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ka.tar.gz 524764 SHA256 9f8256de640a6ea3ee62409c51751ccc84e4705956d4c0e5fb1b179545bbb424 SHA512 14b639b372f690f52ec42170e642cb9099bfa52d72799fc5c4c4c9c0b13f1d2a1978302424ef8f9f6d86de67a6ae71735c70784775013b1e4664c0b75acede5b WHIRLPOOL 1c39f2fabe8eb9a77284f32bc161296af7f1af6ec81a6d35a48aa6d0149d308563a8bbea0b77515fed511c8af412a0bd734437472cba8295152ad2deae5c6873 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_kk.tar.gz 535414 SHA256 ad28b5c268713a5069b42bfb34303f00a1e6c930e4e747b5a67c9dc7da5d1c5f SHA512 fe72db11b1c3fb4c59dca8a6c9f611d2d0ad57f19a0771d8ff7dcb6a6fe38c653f1514ca7e6e6e5aa8318c704daa8d2456289ef95ccb4ed9da4a402b265bc40d WHIRLPOOL 39cda4245366b5f26e8e392a29135e2bfae852600b45a142f323cea560d2988d4ba73082a3878b4c6b4d34c218a6e35754b31fd1306c4b6fe970486a722a54d0 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_km.tar.gz 641516 SHA256 6f72cb53e53a63d12fc34fd7ff9da7833a3531618e5c40456e764c2c458c485d SHA512 f76f20c2e88ed2a05715c94112d348ff36b2348efd57b2980e9e87d90d56af0e4cdfc4b6e6a0c1ee6e2df221397d451a27fb39b1a72415a542e7526b5effe16d WHIRLPOOL c062b96f498fb81ee064f06c095dfe951fc6ce1be61b42b2c3f50bcebd294f653291e590016c2deb2b9cab7ed24d9b97a1c0985978ceb09bb1aa540bd0bed743 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 496392 SHA256 26d4fc62504065724bcec67305e4f91466268a80cc7d781ab0890a2b009caae5 SHA512 b45d5a2e5dca22b6446ca3163f59e1c9132e86549789c6edced93b638ba0e8557de619ef84bd87618ff7111a93ed8c4b5a0714ead236d98d4400046f1344775e WHIRLPOOL 92a698b1034c160a2eb977cb4b93cfbf26c3f51a9225c114b0cec0019a16c1f800e1cd253b541c8bc0421994a9d91993d382ee69709dc6d5402fcca87659cb74 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_kn.tar.gz 553061 SHA256 413bacd195948d6f3c815b18f54d7fea4c9184cfa2f8a9ebae195a21d4a9330c SHA512 441b5ede5989b7decf138f7f5dd6b8e1a68994f1cbebc9ae166ddcc2743bf5bfae7c9980efc175f7a2400eac777250f846e054db3d7753b7ed4e01b8178d398b WHIRLPOOL d9ed0a956d829bab3c9f0e310c7e04d3779a2f2f7f68127655e503e0c8db080e2aa12244bba3eef49ddb4a5a68c542328241ead76c38b3410d705fda0fcf9182 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ko.tar.gz 582676 SHA256 0858fd9b9031e10c00cebe94499defa1c086a14834d4e7c6e19c2d5abdb6555c SHA512 86f5d8ccc1d440bea1a9232c542d447fb222a66a7f8531dfcca2e15a60d387027d8e2761af510eeba5c8d51cba79f10f03e297603a727e6f14678ef51ae80abd WHIRLPOOL aaa518bd044c4b24610fb0f1a98891fd701dd69e6f1e3ace18d95a681011ff1e485d716fe8b5ee8ea0c78d6e9e08f38c75e6db8c22db743fda4208d085ca3834 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_kok.tar.gz 537957 SHA256 14f9e6bedce37bbf47eb5c61e7c38e282be74fdd9f7427ae7b2747378c50a39f SHA512 dce25ec6515797cf674bac9a0b1027003a97629beca1898cf6049a0f3df6d3a537441a89865a8feea29cf15fa7c38b33d1a1f08810805872f6e0a4789a890d59 WHIRLPOOL 41d0c8fbb33384c793b058895663c14aab3e79a3e83dcc96cbe09ec2fcf0735ca41adb259efb41d5d23d6ba3551fd54d74450c41bb335245f0cd9aaed69114c0 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ks.tar.gz 517460 SHA256 982c23cdbfcd9080f00d9621602a5414127afe5ed811672783c7e8a5d8e6debb SHA512 1eef2c813af0be7a39fd1eb7d505c03e320d92f045946490fa5f0e2de8279e537bcafc65042207e8c391a6803d768a92feced8df115c964180547dbc197a7094 WHIRLPOOL 75c670540f871fa71e414b6fa0fe7535635a1e317bf3ecd674e3fe29091336f6911eda846fd5a196f7a98d2b4e7ffba8e8866f8e6554653ee5f8f17fcb506b9c -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_lb.tar.gz 470751 SHA256 8672ffc608e2717034a016bdca4452b14322e70ad5c064d85c5466d652787fa6 SHA512 276091789ef90a9965cc6cc62d977ee0ba8055180da1fd768e3f61eb8e942569e6cb27a14f9ffa566cb56e6e776a8bca56c000270771cd59fa35db7a2a75adf9 WHIRLPOOL 4af5921298a36ec635c228672e14b0435a7c6df39aeb29556685c8584aeae099462d38e0948fa4e6fc8c9e70644727272b3173444a690d77fcbad9fe40009ba1 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_lo.tar.gz 560459 SHA256 beda99a65c650bec79e6399733d7f3ba73d268b7c0666ef910e299b87219c5f4 SHA512 fe0088db53cd22a8f3ee504d4a85fad24246e3a1632c5c9e720715e7326988d92b37c4d240210459ee122bc2564087b119a6920e8ad02cb1553fdd1b903155c2 WHIRLPOOL e2710a330817983ff4bb5910fff3d1f8d2ce8cd6943af72c0975916e59367713aa7c74d05479bc4d4963591faff639bb0e514421b390b44cbcaef3be82d587da -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_lt.tar.gz 833548 SHA256 7845bc5dea7ff5fe45c004f79d1574cf0660d99c12145dc4751a5f3ef7699a8c SHA512 8d6debca65afbe1717006eb837c76dd67284f978ce53196ce0b7eeb0d28f980a212f0b06afaad76d6e0c3e4302f2603a7903cddab27ae97808197072ed5b88f4 WHIRLPOOL 1640490ae63181fb2ca9427a0d7c581aaf85d303cf90de65d583f631600fa23be994d1c7e06e1a0429f295fd6d876c7fbe329365db40f5655fd1f6e305b49561 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_lv.tar.gz 1250419 SHA256 edfd2cba040b139d840a30ee88d961335a05b12598e7cc1dceebf89fbc4373ee SHA512 ae47b66d9a495e69e038722cff55ea5c1aeba88ded0263ddb9290e74c65bc0c32542ef46366bcf792ef2d46105abeeff41102f7f802cf1b14ad725abd99c9a03 WHIRLPOOL 50be9b3349c38e32861627b36f9c4f6a5d891f0109eade2e580613447ad098dc110ef4843d660d4d19a699a03c51d2265487631e8541939c74a5ae8578e42c82 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_mai.tar.gz 520294 SHA256 37f426435807d95f6abc74f72e5e51281eda1491794d16cb05cb9aac57622fb7 SHA512 5a53024c710c4d6ebe986026800938f6b5541f43f9a6e4b1eaa506208d2644330486d6c1d80ff8d344b5a09af3babbd7e2e2d13cdf6cca6578992577dd15886a WHIRLPOOL 6794845928e3b61cf1e7aa2affb082480e5196dbf2153ef1ceef0d7a45975edc40a9719daae9094973524d7e397c504625ce762a718bd957b399f72cffa8c025 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_mk.tar.gz 520110 SHA256 d36aaad1e3565c124e48686db8cb18e66b664ee376b1fa1e636768cc449dc93b SHA512 82771525e3bca90d75b79b821ecb5e947d6e5988692a84eb80e0af11722699fb78b740c9a0b86d68c9ea7dea2bc94e4e7d8901730339c9c420bda7e13fe73c6f WHIRLPOOL 6eb88a0ed1e08d25dc72bb6974fe8654ba0a20ab887f4ba79cf6725f32eb2594d7d596832ec5d4bb2c52417584a67584bdfbf26e81a5280dd576fa2c5f228329 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ml.tar.gz 558360 SHA256 46fe340676e5defb20eb33ac7c5358c7e88a3f5a792484b6818e746795083caa SHA512 4ed860de4f9dd3153fb473e5d8de4fa660fe2f22a94d01a28f6b652a0fe2d3120a109026f5c5cf1dc71953de049566d65f98860a9e16dda46532c3e0d5465052 WHIRLPOOL 8f200bd06b5f323ad959f9d1374e7dbe9ef0ce98bffde844aa4e350a7c9f04a9d55c6abb492b103b78e1d82fe55450c290c938acc9e3db90c0c42f54cff4080f -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_mn.tar.gz 603838 SHA256 f132da87c7e94db9390d10140a9b6e1ecd128bb71b76d6e0a6b4f3c20efe8109 SHA512 2e3649cc1f9663a5d9537f7ead5dd6dd22844648f89c63c28c97633e862e8e7b3507124ffaa5df4149d5e70c585cfad4e555215f58769571c5a0c5b8d654f9c2 WHIRLPOOL b12806f8bd469b3822484406717bfbe9ec5eeb3d65741c1bd7bb883d428978ec860db22227d4c7ffbf84a361bd6628eea39fd5e12b8f2efa1611f35cb22b5836 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_mni.tar.gz 532336 SHA256 2c8a796fe3f0b2f36a86abc67919aaba121703357708ee043f1594bff24df799 SHA512 973c573a7bfb9d630c29dbff8ee8675dabdcb77070e5810ec829f944490163e14a7b9048c00135c298124ec8a278e3b775cd94947a47fdaac9c166d9e7c1bf5f WHIRLPOOL 24d70a385f1c297ca9f8c865709f273a2808b6689249f85837d51bc08c7086434a94d33b5d5c4318b2baad370a43c807a9b6310342ee1fe4811ccf231cf2143d -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_mr.tar.gz 553313 SHA256 322410fb9c933cd99a60c1dec2878b90e77cdc71c53f5eb2772e96c731edcb9a SHA512 afb3b7da9b7a773a67ae170e73fd91d366ca821e6a91c397c19ccdb6f621c637faa3e37274c19fc0de2a98402d3d506a03a8ed7d445c13b28e0a77fda6651e91 WHIRLPOOL 8bbbe87465407b650a2c73137841e40f49e62eb1926723d15dbaa7bfb44b48d441f55fb775015768189546436db2a9a27dbef4029d94bddd793a9848feff3241 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_my.tar.gz 552498 SHA256 22d45c9b0ca1450e8897beefa22055c363d51faf4c8c282b7db729ba05642337 SHA512 560506a246daf1ae7589360dbb9ca74a619b7ed791cfff9c4a06655d177ddefc716b65ef833d7ebb37ab7126bd6ee8f9774224090e52c5c957d31f251a8c9845 WHIRLPOOL b2912c618032400e43a9f6d2697732073926559d311db34256019978fac58eb5a32835dfbdd5f8834841bb3ca637b06cb38da305b2bbb17c7340cb4b133212b1 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_nb.tar.gz 3483636 SHA256 0fd575cdd4023135c9afba65b8389e45863b706b71d16826a5685895433e0dc6 SHA512 b835d4dd887b7c0aeb3e237eb4be4f4da974c7147ac9dd2b0e4a44a9e50ee453e97c9010fa49e783efc2f8e304f793e75c7752c66a2ad860eafe1fa47232eb65 WHIRLPOOL b35b4152c6a636d2f68214be315192cda7939ea0b46393b46eb032fed801b525d589ac46f1d856bfbf9c3de45d256370ba12896bf7c28ec68fe9a6ce697e65cf -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ne.tar.gz 920314 SHA256 b3ebd98c3c69ccec5acb2fcdd5780cd7eb69912592469ad0054933132479508a SHA512 8cd271ad078989dc7cc77236cc5b79d363def6a206ad1a164f39d32823240cce335e2b9c4754c24e3d072cede0d1a7c8d35df956bde6809b85a469fdf215b483 WHIRLPOOL 056e76ff25860212f9de63380d45bc148b919c383fec8be08a3e939213ccac023a2db18a7a7734add4824cc1a98e826cb7e49491cd7f976e078ed49bd2bd06e2 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_nl.tar.gz 1282434 SHA256 9457b6e82b7c5c3b6a65e8b82850356494b3334d796c8acd6f817f4b6005ed77 SHA512 d8d9023a4ae9369fe5dbb02d576b7335261e2dce04bd8fb43783881e8bfd973b5a5cb7cf5d8069d51cf4af6b850def593f4d38ae1fcc0783833f0debb9420fc5 WHIRLPOOL e6c18b9b0f8e44df7b8796973040f629ce2ea07feb1e2c630eb70b985a70d5238aa20937c56a94534c9031962ccc655b5aa9c10950157f605db5b345e22cc96c -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_nn.tar.gz 3481342 SHA256 6b4cd7d9334addfdb1f3f12a73d1ae0e29ac416649c081d7ce682640ca450bcb SHA512 84787e627b1fbac4f5c7a99fceb97a60585bf36e6c89b13faf82821dc7d6d77bd553d6be5cb0e0704fc495bed42ea1db1aaeb996bc8780498b0599a3d7d11b31 WHIRLPOOL 4611b8309e06ea29b649bf822b789cf574436aa441f976e8b7512183b1413c43ab22b62cdd1f9d15a0bd3587068fd459fd58723a15f0f43c057d42aced2706b6 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_nr.tar.gz 496397 SHA256 1887be89202399a5258573e3e2abb400e7bed7f3fd91489361443ca27edbb3ff SHA512 7a3e203bfe5cd81c074e74e58474ba7a7c86f322e414c981553682775a4603ae10e4de79c34cfd8ab045b35b23e871315bf28fa7f4df3b1927c537ee488d91b1 WHIRLPOOL 52529e4b59ac8786a45407a3d3f101ee230ea1da7c2e8ff1c602b7e1bd65dd672525257e1a9b23b7df1d5024b88d24f0249e1192889fe8d4ddd478585d48adc1 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_nso.tar.gz 492987 SHA256 9f7639fb92ee20eadfb34b2d9ed48828980810abac291816bcfa891ce1a33875 SHA512 ab3d8634623543eed806622f4a689010285be5f55ee6f459ca8e99a4d6b85a6f91e774422db5c1811bf18ab070d74fb606bdda7912508c63e0a00fc944cf12d9 WHIRLPOOL c9099e127279383276b20777bffe5d4bcec141fd60635abd328898fc87f53572e837d0665b1a1c2de30fac773025e600af5dfdb515838142399cadcb5573b7b4 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_oc.tar.gz 694766 SHA256 208011ca75643b36939deb66629284d4ee37b9f7a5d53252309a080cc975d2de SHA512 19c854c9c57cd2d6c1a537d9d62baf13ebec5cec0e6d65b5545baa35b84cad05b0237c4c7fad5e5d7bbb79b8fd1652c256a2328822075f0e76e0f7fd0932c642 WHIRLPOOL 326e85783c2a7e02c0bbac6b489afbcb65181228cab72e0403294811e4d85e4219dbb1eaa6fc756134d4a8169445baf8cac03f5e2af88fea2261271615e2d16b -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_om.tar.gz 485543 SHA256 9f648f1ee258d9d4ffc5a1b516dff6cac88bda636b590770a8a618bc6cac43ec SHA512 167dd195a09d04e2e07323f81f308660cec4d097bb9bc836006c7f60b4982d73e09346bb36d84d88fe8d786f36bdfd05388fa6b8db63402e26a01a600dc1e353 WHIRLPOOL 7d3f362697ff66704ce3782823d2f0bc09144c16e8a02343e07f0c0f2e4e569092837b4e19c094462d2cfd5ed1971d286126a75688483e1745be6d716cea7c2d -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_or.tar.gz 551287 SHA256 28110b0be08dd3f4e5d567f5dce05ab1db650f7f2ffc9d9554be86a19d883a86 SHA512 acba664169481a1443836bf1e68b607a1ec34f9d527674b31ddb4189c8bc498ad70f5dfabf6ddd20f23be5fccc109780fcd4aecee9abd4572bef975f976d3a13 WHIRLPOOL a8cefad35cf13204364e1d5112548322ce7508e9dbdc86b2ce77f80e8e66b68f31f54b260f05a0481d5fc5f26ff6525dcb509ff869e4cdeb97565a3268b331c8 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_pa-IN.tar.gz 523815 SHA256 5ebb108945e5a3dc57dfe2ce93152857b8a79d520a6702808d6301af47af325d SHA512 a4df44278b1bdbc981514cb8a10456d6ae1289fe4bdbfc78ebbac9e759fcfec4c2a669aab6c58ead9fa3986aa026d07822d7f7728900ac7eec9c25fdd1bd6d08 WHIRLPOOL 260d3185e3e819437cbe150731844ca99dea7c616c810adcea0aba4f92be242d45d5aaa0479cc91794f40d433a65b0b8165a7dce08bc00705bb7c301a001c26f -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_pl.tar.gz 3277455 SHA256 951243551f57f0c273419064b1114e1e516f319365150b7abecaa4518ffb27f1 SHA512 3309ccb6626f300c1bc731624a2ddec0ed23df173cefed1c773af529e80b2cae8cfa42013b25780e99a8d64e4fa0a6ec89e830ded86d9cb7a99768c07350e678 WHIRLPOOL 0ec4fe6236e9ed3bfe95517eb55ae004595522f1776dac9b48da2b60be47e0e655f70acffaa3135c5f24376098dd20dd6b1baa5a89da46537f1aabb71a3f9e37 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_pt-BR.tar.gz 2574535 SHA256 86abb3669b7d866b7c883a3f781858f32ccc241d31a8c9ad5244f66a02b78f57 SHA512 81faefe176936e410a7d71c0c41ca370e27252c730a469db9a14556f96a582fc61601fef574531afff21042ad98169518e208c306bcc3d528c4fd2c61716e33a WHIRLPOOL 3567ba610cf8d03d41423401494beacf53d00b01747f37e2e138664608bb32b4fd918f334acf6e2ff5b1433e7a6259a8ba7c02f5af1b6a935d994aff338f997d -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_pt.tar.gz 1127472 SHA256 898be27597742937b811a9ead1197f86623f278b796b9f79d65c09dc7e3716e0 SHA512 6ef631da652ed7e3cba49801be5c79958baa5ff11f6ce9845592fb2c4d45ccee8864795c3a917b55075bd42be94815ab2b0b7dd5cf03079e0019764c3b01826b WHIRLPOOL 532fbfbc725ac0c7a9eb93aea2dc7e5a20a168ee6fb60c5b91b0994d19ea79cacf588db18215befc57c3cb82f6bfcb88b5a76bd9864a0050f62770f7fae2d043 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ro.tar.gz 2360999 SHA256 a9c74830201e0a54291c46e5e70b75c7da2741b300ac1c835365c668a66e7c00 SHA512 8f22fdc8231daf355ae76f405e233b9e494626ce50eb0a432bf3ebad9224a73df4584b17144289558931db78c7ce7a421ef04a82c7677d7c779bbb6276d21517 WHIRLPOOL bb40187a2d7e56889807f27511aba3ee6afe9a4a6f98355ff647570928eab3a10514390da689234ba9f547db3a1e906202f728a62436de2463b5f1d26dc1ce1f -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ru.tar.gz 1648638 SHA256 29e606df6504ec4e1ef991dcf7e1dc37aa30c6e58d594e6511a36cbf59d7bf7b SHA512 dd3fcfedbad917d34533703e578044e6acfb2382d122b1da0c135e75d33522e2e1fe5102984e120ceab2039ff69ebe3eacabd7ea7deb601f8674a30a74938191 WHIRLPOOL c57cd9e42acf0cb7087643a1405f1a760511f812ee2a02f4e46b5c4dad3a82eae973e2b5b3a765581621009952d827b712e0e972f1dc859a239104ccb8055071 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_rw.tar.gz 489174 SHA256 e164567a2965f692d26c2e299642fb9ae79958742439afa6c78c98cab16ee560 SHA512 3711dc1458f5077fa4ae4a3f8a4ab51b63d4cee12f6b1e14b188ffd9bafcadb3122e19ba1895d62313458d1b539abbdd14d4852b46fe1b8d07d0d1287e36e60e WHIRLPOOL 037ec6e39bf089129bef2ef10d5370bbfdc4b3b30b536a79501710f080dd17646c23817cd145d1d0a2f0cc91d0f261fa616a9f7800855596ca42754e01a98085 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sa-IN.tar.gz 540008 SHA256 9913b83f954b3a4ca8cd3487571d11ec8a80e83a1f38090f47105f17991b4f5f SHA512 e7d1793f50e9ece42876e75d121b0ba38e539a21c40f31b9361b27bf387a80818e5907a327a041aba9968544c105f7aed66945e7bff70d50c5aad9c2261010a8 WHIRLPOOL 4f8ef80c2ee8553f5084b2bdda1f81130be9e4cef91559338fc56a0320797a7a964105c7c3c3538c2fdcb9a948da5f3e66b078d7d10cf16ddc45ae3fc9727980 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sat.tar.gz 581755 SHA256 ef87d22fe5d760114e2b77075faa25e95b2f7c09a873c249c76ca5d76a359a94 SHA512 011830bf4f9e0c76d203ed8354af1d49c3d1c5c3da58f865ad9743a87d1828db54033255d918133fbbb458b0425abf5f7149319aa7e3ec25d7e5bc2c388c8168 WHIRLPOOL 1bd3d575e2863b1db28c5ad89acd40b284f872858cd407a6de11f8b84f8fbd9e34a6e4bd4913ffa60ef242cc9b9d43c56b4b1dcd6c1a2b7b682e3de3b6349f4d -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sd.tar.gz 531905 SHA256 e7ff505194aa1da476cc4985a2d5af85729bc3cf0bbdf24840cc11dd6c9f4cb0 SHA512 4eb418c74089902a948d8a1729086ee31cd449a50e99fcd2c698610e584fdef2f8528d9f04ab27eb35a9847d27af74c65ec4263df7ff7975169a26ef92ed6858 WHIRLPOOL f3b18d39e939eec52e06ec5b6e78cf1aac4ac455eaf29db30f418bc0db592a6fa2536c7a8fecf7f0939c893bfe8c34bc910e2ac83dc02805961cf58e97d53909 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_si.tar.gz 822411 SHA256 fb8a6373a26010751906ef56e49d3d6473205640658b12d32ca1243d5b7cf807 SHA512 cb1a8e0138351a0cb80cfa63b845dc42727050800877987e09e74d98ea567d72ef10c4f34825f8691ea7af4eafc90afdbd3036d73615d1fdb3082ee4387c6434 WHIRLPOOL f9732178e22fc90aed3ca72f29109613018d3d1b10fb56708430591300e3347306baf7833f15cd1aa16b64452ab652a88e41f548c82c046b352dd5b5d4caa769 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sid.tar.gz 492082 SHA256 6f6dd9578da8bfbb9d306d38d2fed16fcff2f98ac29139aeb18ea42796193151 SHA512 992d668d3c5f8e4d733fd760b5c4fd62ba025d910936f2023f7d827931fcfd9f6cdbdce0c5e13c79be0513d66373fe4dc92d3df7a064093f6f9094e19b9d742f WHIRLPOOL 3a1eabdfe05e6b9f2f512317658bfe8b5a4c8620849122c9aed5bebb596ed6f45e34779c333f7df8ce197f81a4a02d805586196974f641dc0a2a335160889779 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sk.tar.gz 1782147 SHA256 2175715e349ff6a09caf782152db8fe119c8e4087ce95e5405c92f41c079ea05 SHA512 a773a0fd4038b150013fb59d7c27167ac856843da5461fabb5c53c31efffaede26820cc08588c18d834faf41eb9b995c8ca7384fa4d6d81d0bb55e351f3d9fbb WHIRLPOOL 0801120a80d972b1fa34ab852eb86fea6b2eb20c357489df260be57f4d48d53373868167ca83568eb979d88090245a0dd89cbe101eadf58f791a094fb0772449 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sl.tar.gz 2147685 SHA256 b7a7947dadf36bc7391c56de4ed40355f662f2f3dc040a91baa15144c4362bb1 SHA512 27da2bcfb067498ac8f971254e03849c4dd9d3cef775e0749280a8e4c3c39c351fa17297d5ce891dba4b5f4e91b0b3c6fa744b3d068c8926d0d6e1e83dc4ea95 WHIRLPOOL 835046cae4cb2b59c26af7ffacaf0299d1e0d6db462b5b43bb37d60484a164428e1c47196296ac0517db2c178a6575008da9ce86d2e91fec46912a68650a6acd -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sq.tar.gz 507910 SHA256 0a24550e4f195521988a591ecdbbe929aff01c8771c1976cfe81d600cb97d334 SHA512 7818e0ddb4fd806fc35bb9d11de7c5ae1a02dbd6cddba9ffb87f0e0d5c781ddb8a97a67503768f980f73f68aa4c3726d10594834cbeafcb1831db118780760c8 WHIRLPOOL a6e58575a8d81927e9ae559adc392e85f8fb6e13e8c295ef88c7a72630a5e27d600bd9374298f606cb6af0b1d817920fc1019f9ab74c0c4f3b5a469cbcbd8dfc -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1687616 SHA256 eebc52d819a8aed50bc76725005e989113f1725a2dc772e5290cdf584bec6475 SHA512 9b176c75c5fc0d977df1d213a64c3f516d21f28fb25fa03295981bbef442fa6d15a7f48a79158dbfb3f1f66a2a44102baae23a52fd04e055ce04d6476c8af307 WHIRLPOOL 33848a3b4a598fefca5f89d1e5559fc61b7077e21e6540377d3aada9882644c2502546b24a8460438ca91d0d8e2e8a3bec99bdc3084e9950795697c0ced5ee41 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sr.tar.gz 1716251 SHA256 89e5393054f340a85b9b98ec8e3899a347a80a577d13aadbc796db93b3e7d3c0 SHA512 606bbfa1ba7743d8fdd4f433ebfc5caa288234109293ed5238804ecfaccdc9a6d92bc34a4628090d4c84a7718271065b594fa565d252190c1bda558bd1a3f4f5 WHIRLPOOL 9613cf0fc4952c2da6c0605e7698aa518f1e010ed912133287ca977df795190bb0cb4d3f74eb75bb0f12dd0d3380c184199470284e2ec9d21720684085b6644b -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ss.tar.gz 494032 SHA256 8b84f80fe304fea15e1628cb77b5f5532dcf0aded0b7816eb84650353f583732 SHA512 2bbfec0fadbd01ae0a05974da1bf414ce6b1f4a3a6f851a0bbad1fc46b8ca826c58073b056bb9d4be086d8c56be936b8b8c38a3360ffac2b6b3de44f447ccd78 WHIRLPOOL 0a3df5eec3936dfd36ef86a730e47f05235b170f4708d1aebaa9953f641ab60e3acf0a11da88c5c7cd52e81328a9247f920288defae25e44aa8bc97357db300d -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_st.tar.gz 492977 SHA256 bc6e7803b594ad953d79b8de7256e7d3910bc5c8a3e021201d7ab9ea70629a21 SHA512 f08dfd1c8280b3f1028f852f6d05848b978d445b74b9672721d4b10680227d48ac2b5f489ee82088288127c8c907e2cdb938e1580633022d67defd4d0dd50e98 WHIRLPOOL 4506786975f0e09779d93c2047a3f525107b8eeceacb9ff3481282cad453a0de46e338f888ca002d52db0a9f30ae7ca6f061bc1d7bdfb3b98f40335aaf4d9825 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sv.tar.gz 2296478 SHA256 41b5770d3bf7c455195c6f4350410d2f28b801a615aea9115d01e3661f78d6c8 SHA512 6d1d3f49f18d165f864a211557dcebeb9692fa66d11f468351f21209d3450893907d16e724886938a802bf2b5325f27515e64cdc3ac5fccf678499f28d914ca7 WHIRLPOOL 7701d0bf0492c2862516801bcee1592d878ec5de29778821a4c6424d154d54e61573e49edeae432676d617fe4c08cacafe7250e20797f41327ce8b3c15695faa -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz 479446 SHA256 b852830f4d16d5a5f532bf1e2341b4a6410e19308952426c0908b4028395c858 SHA512 dc791fae2c12b841f81dcb183568daeaddf7866627b47fdab92219057e452fdd7ad7e37ad2d65888d2f83c84bdc52c2a6577c19075b2585123aeb5c2c5948d72 WHIRLPOOL 1f4e6e618face88bed9a5eabf0fa64e0b20a66c6789af1821c46c7d90c513df12954d282095bf179978a32666875ea85036c355a12ef4ea10704da786b8d49ce -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ta.tar.gz 547872 SHA256 ab9fb9962bb907a3ec734213ff55a7680d781a7ea26dca6dba5069ee7f2c6d1c SHA512 9f6f9f92a8ab0e90673ab3ed1e47b3066eceb28355348c4de7ebb63c6f7ce572bfe503835208ae3640b4fcfe1ba7911aadc157c8bdaf52a71f966b3aa97a246b WHIRLPOOL 3603665705482bbeb2e1fd1f975bd55809c063847280723a690fe4f8984d83e362c1a61f71f19588f71cca4df4125f0dccd100888b292d92ca7fdb4f77225548 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_te.tar.gz 1105539 SHA256 543508ee90f13c5804db49b71f4867693e2307c512491b8040806186638b6c4b SHA512 01c404480ed0584a9002c3b2ef51cdf5c46603d46426f79596395c6bc0ab3c88e23f497a5aa98df08dfd9df04374d57444215a444d9e0d8c39f3d55ddb2f28ec WHIRLPOOL a3a9139ff658c9c48d0f939f4e0be699851e37147798ead28a172fa417482e6400c92f361e2fd6ea32da24e82a4e8d4db3aa60da150e8954dcdc52b96ff437fe -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_tg.tar.gz 510358 SHA256 f98e6209f9c516c24b6699df8b74b4302a859ce3e835ee995da00c1c106a2569 SHA512 b3288a149efba52a26f9ecc3f907af61a5903eb9fb480cc5ea72c199cdec602a24e435d41abf685ced1f3a4dfd37e426a9f6ba3519f086eefdc9e355dc9281ab WHIRLPOOL 611b18326b8faf182f7aa6da2bc254da8d2d110deb35de290bf1dd64c5ed55ae6d85147a5e6ae733b2350283222394ee20715829b5764a4ca7f953b34abba800 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_th.tar.gz 691163 SHA256 7d644ee0820ba1a5c5bf8c0dc935a731061c5fe0963b311c8e9d040b838641d7 SHA512 efbfa03e3cedd7c84b470b45867ad31edad97d692920f09d3b8cd8eb6d194f14d132bbebb0d55a2b64eba18be569e1d9b3449de0341c6771ee656d6949abffbf WHIRLPOOL 83758e26068b1ffe9ea9fdd674b257d22da1f146936c65dc5e78fe18abe94bdc53d56154ef509b5d4b1fd8707240179c6c48261a17bdacb94cf1774d7bbce5a5 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_tn.tar.gz 484416 SHA256 b039df6197d4b8a3af6917241b5215d0fdaa24bcef8bfb8cbda4a4eda777ce04 SHA512 ad5c8130f0877276f7c4567b60744210e96b08b3d35aab9cfc29a66cd8c50a0dea135085452655b3eb7cf03728511d7c03229824819899a76908d6ca310eae26 WHIRLPOOL 1fcb327ec95ffe1e0ee849b768daaf2c9f0416ac5e461d39adab0781d17a480ada52bdff81d5b75dfb4b97986795f88d241830e6287e2235001a5aaf1e803057 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_tr.tar.gz 532631 SHA256 6d1c87feb26adde7698e97d8032698e1b9a30c0169529747ae45e164a520681c SHA512 3d61c6378b856cbdba3b37e3a3da9f11243b8bd0f816a8b5f5029cc2e82668816f02f95988d5461f97de981d2f2f4ca1a0ddf500b2d10244b87b76e621fc6d21 WHIRLPOOL be3bd691e9dbdb613d4a148aef43647f07295d3228fb8d8186d871c827f5bbd194f89b97daa7bfd1feba5f85f7412e5f801dec7c0f805a2f3221d25fefe2ae1e -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ts.tar.gz 494136 SHA256 f2ae5501f4734c60d4acac59a17f3a476842e5e14080bd19048c0d4da2f24556 SHA512 db7ed7bd3621841f2da7c9a4c67b0f982675f5e6ea3fa938b1cbdaf918f1ff3e0702f1230da0636501bcf14e8337e2d5f19d3d1f8f8b8f73e8fa69237e34d8a0 WHIRLPOOL c79ec56ddda9414298a6721d7691c16da30532b976c70af19802d0329f9edb2978597e9a8668a6374e1a7d79f3e3c73a7669f280dc5fc7b92a331880ba177ba7 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_tt.tar.gz 489562 SHA256 688f613e3d3f91e3460e1db58fa3d6b72e63b73d877b62cc6e1266aba584cf07 SHA512 5501f1708683a25f15f7ae945550f56dbe4f057703de1bd3b5755156c4cd815af0a99481c08a00f0038fa09241975622f21a983fa5c89e973f8a30f3d7c3fc39 WHIRLPOOL 36bd489ea1264a74df7ad6bfa9350615a61e89f668fd54468bd2d537d9d2d9d6316fcac013ac9625a3bd9fea0c5f5697ac56893c62084e618472cf9954afb40d -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ug.tar.gz 523169 SHA256 36b907da2ade424203294dd272a06b832224bbb7de12f5bf42129cd74d4c44a6 SHA512 6099e4ecb6b7b21d37ce4c88c99f5f898c216d3755ff204fbe041dbae676dae92d07ecb9b7303f7ec1fd230d350a286ea27eb4dec399d2a9fb5887ce8e9d0142 WHIRLPOOL 6ff0b000dd466cf9d10ddca4d7104f3ba9eacfe86cfbdae5df07462d592ad317027c2e6dca4b4f1584802ddae91f57099dbff85c34e908c026bc0c10515125f4 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_uk.tar.gz 1372495 SHA256 0fc765bdb12b830c5e20be33012b2d210004d55ec72e507be3fe331178232605 SHA512 4eb0f5a695f7712ef20d6c2c76f4af71602ac1b296b41f96bcb66a4ea3930325ee71f63fd38a47572e233a3525f048ad50a0fa3ce55f49786c8eeebc8ff45120 WHIRLPOOL 223f1bbe811a6f7902e096a819abf8e45a8e1cd163d06674aa31db1ce7a074f7cc3f44d173b73009cfee3cff5a187bd8d7235b945beff9cdbc7d9413366e6336 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_uz.tar.gz 484549 SHA256 f79019d4e4a937f3ae1ca7c7994c35533bede17dedfa7acd40743002f7fb04ee SHA512 41acce113b37af8df5612ac022e3305dd3494572a43da5906b1a930332d89ba8b6c234b669886b62ca1903cc446452264a962cf8b448376ccd75a7006bcd6a0a WHIRLPOOL b4fa795e334e5783e6c59423a446836bb33f87f0ec8b35b7fb5082c99efe9999af92daeb56b8fa9634b4d0eba5507a053cc5e84d66c1b256b394a19b42fd6dd4 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ve.tar.gz 496230 SHA256 52954aa8a9c16507ff014deaf8dfb3f77c473f050db21f7c5ee482a497408e1b SHA512 2373f44aaa769c79de0b91f5bea757e5a319b181280eca62ce0b39994a42f4bb60b343466f7c478066093ab0d040bd8a8ab1c638032acae9a3f859b7789c020c WHIRLPOOL c3a05c51334ffd0ab82a02fc21d3164a010b13cab6a69968c798be7b5d01c6c347efc246c1df228c011f1b6b05c29e79999248fd30ed5cd89f7d43a1a5b8cee1 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_vi.tar.gz 524210 SHA256 1a48d26d6b872ba2ee872bd16744b4ac27fe6e00787b5d221e999dd3dae51f9f SHA512 511e6dec35e4bd55e4fca6eb9b72b1c4642360e685fd1f6c8ab31e9d94db7536eb206e9e71b8fd637406388c6e2e25db11a7fc48f72a09cdfb4298de48607d26 WHIRLPOOL 8514d1d29b6d1207585b59cba958bf5be2f4ff0a6485ee0095c1c3b4402d9096405873bd0fbba7ed77f2e090a17982fd889fb5cc5de3faf18a07caba44823122 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_xh.tar.gz 501715 SHA256 b5804517e27b5550b64558f5787a998505f21f0bf5c3b3a17cae87730dfda448 SHA512 b72e187ddb21ea3ce800f3051d2b6075d81a9349c574d270df164db596c37b3a6ed3fb1dfd0f122d508287ff48c534f70dc755a1181f70606ea9ad314fefe603 WHIRLPOOL bf611f6e301fa40b455c5da6b68526ff82e35915f5da672d77ecc4c800490997df7a4abcffca946e7d9e04b380d7127c12b8937947ec9e6619e45fbb3cc9b9fd -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_zh-CN.tar.gz 571357 SHA256 94f0c98c54a56582ef85d59c3814c0399fb621cb84d357ef8a59cad2c44eb57f SHA512 ea4c3fd95dfa3c88aa5324ba022de4ddaffc57d21d21fde77b3e5e7852f656a2e9b9462c042552dd4390c79dac73de8d058d9c7005bce8b7d7b0f223c5222c66 WHIRLPOOL faa325c1e1e9fb14642542461fdb65cbf572bd84331fac18e95fe49cd316442ebb48709e966c6bac390274234c0fc29c56ffb77c3e7b82f4be6c5bc0c7140337 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_zh-TW.tar.gz 569576 SHA256 791838b21d9c447338495b0e947ac43ca2b3fb203df7b6981698d663309d7613 SHA512 58537813caa39476f9f10d34a1d02cae6cddde9baab12b2b8b3c618f85126c176c3228decdaaa8e303242e2fb759b998759cbd13cde982de210d7b062a1183bc WHIRLPOOL 5e08532f7ca54e0240ff5f2fb714fc1bbef0adf7aabf2d35e27e66551916d7945360511d98e6a0248062fe17b12f9400cd96d8b0184349644d072000da88ad50 -DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_zu.tar.gz 503097 SHA256 bd9b1cdb335ea9c98a420ade49c1d766df157d4a9caf7358b1a20125cea43f16 SHA512 dcf76bcb13a86229bdd6ca065cd08a2b991c30d12d2f17d12486c02f9764f3b192e919c4d1b7dfba33b8797f58891d7f5a37129f30c203d57a6a49ad3457ec0c WHIRLPOOL 7dd6bd3d17be3632f4b90bd54e8dfd4410be39204174c8df942eb958c2361ba23bf36d4d719fc2d5485fa95d9eddc5ef446299e859d64906dc94cb9dc4d56c24 DIST LibreOffice_5.0.2_Linux_x86_rpm_helppack_am.tar.gz 7192940 SHA256 2703cf0d2c8812ed5828a3e05f3da3c9a955d04e1eac704d05caa424542be678 SHA512 4bd463cbf1cc53e5f000b1b6a555609bd9992a5f46a25ea324ca6fe05caf1da2bde93da2665ca961d17b9c3736dcb47f25406aae5c94d5cf5dbbf8761eada6d3 WHIRLPOOL c2c6344106ffbc6999ea258806115e13c24a10e5eac53612c824ef0929872876d640e41761ffb63b0c866c16dee1a2db95c87284d1964b4345ad1dccfc2bc9f1 DIST LibreOffice_5.0.2_Linux_x86_rpm_helppack_ast.tar.gz 8012805 SHA256 baea8d5085c0321674b48c524826f09974730fdc6549e1e1c1dd63e154b18bc4 SHA512 b622469810e08e40595cd935e8a3becf9b04714ac85432000dd4f8eb9b25279b09b89e8d6080879b4237bf1265c52c859a706a1d1aedab505eecabc35d26c3b0 WHIRLPOOL 871a90f97b09a0a02bdf22ec41741fd3c2daac8af0581b14c8f87e1f2bd2409fcc34cfe39066dfec3cf23efd241bbd8409184b5baf72747b4ca13fc8f9bb6da2 DIST LibreOffice_5.0.2_Linux_x86_rpm_helppack_bg.tar.gz 8239355 SHA256 6fed70ced82cdfa85cf74b1504630875466ce0e190374731a9937ba561e03ee7 SHA512 8d63f25785d2d77969b5f098a6c33e3d5c71f9107d6d3ee3c558d5f5728e9e8d4dcc590d97fb6ad152fb7901f93992f6aae136c60829d295da746bbab266682b WHIRLPOOL e87994618c2de7bb44f94f8f21c342091ffab511991e46576f02ad72b558e0a3445775b92ce8bee314515d497d7a9b97072d940f2affc0b8c88eccc96bfc1530 @@ -501,3 +333,171 @@ DIST LibreOffice_5.0.2_Linux_x86_rpm_langpack_xh.tar.gz 502265 SHA256 bc1dca4bfa DIST LibreOffice_5.0.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 571604 SHA256 b1eae1ce5fe9532d80dae739b1fd8627577f0a65007c2dd32782a757c4279e65 SHA512 e453d8fd7b1fec62eaba552d010b58ccd37cdb5c92483033f9c4755fec319a0bd622d7ae3bd7bd94faf320e2ba02523b8d6e8dca784eea9dfc84cee9e663abf1 WHIRLPOOL d6b6e43f249b5167a8901199187e768e682bf634d5f1648bba22b2eba8c6b3001933db9a3844152fa6704049095ed9fb1ec464a94f1c7c0bfcbbc607e2436343 DIST LibreOffice_5.0.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 569461 SHA256 6afba6aa9b5b911f058bd291dda5688f65249095f8b5d00184b60c05d9446e6f SHA512 b7ff7df17001847326a85bdfceb204215a1dda9f49d8d94f0c3af752591ceb8815e495244b5a07e5f8a6ec4b5fb01611ac0c58e70fbd8ac009b6d69cbe50a9f3 WHIRLPOOL 7b59f4e2ab376fd25451656c02a69ec3064c3182562e7391c46733153d2db5bbe54dea11c8150620ebff91f9723bd2e454a5536dfd42127ff265c780c58d2d6e DIST LibreOffice_5.0.2_Linux_x86_rpm_langpack_zu.tar.gz 503111 SHA256 61b74897af9ba17177b5c1b16effb1ea334be55551f1234a4a64146d999c4bde SHA512 b6750bcd1146ebd1443973c08eb8c9ad0287f4fa8e7d806d3b8b9fee79809324dc7eac920f852f3e84815db292d96ed80467977fea2c3311a9051d71e88fd1a9 WHIRLPOOL e248599df65c0dd446178159b196635d34b9424cecf6d2e13aaf6d4e7a9a150e471098527f1116a2f9a4b1c9f1c21d9461cc5265916778f46340e5c905f1f39d +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_am.tar.gz 7195394 SHA256 aff82b6662fe8030cee69868a52e1932f42153f077c0842a4e1dedbddf46aa4d SHA512 e6763b3ab467f514e2daaf8f1419a00f2e32eb485030e554e1b0a7aadc929f7f49ec56c358abd7833d9e6233faaa0ec14cf0e6829e381ff3c73d312d158e334b WHIRLPOOL 4c1a5585d7181560c76044ef348725356b395c88c37270ec802cc2da5c9ad1d0c73c4d0eb72fed91980ad8d1c29e3b5609d204d91610466a0cf269b059e6ba9a +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ast.tar.gz 8013157 SHA256 41cf2675f4121351c553f69ca6e9bc9cf572bfd31aa4c135321bda96ceb2e264 SHA512 b872862e491f94f82801f12fa75db5859181e1a308e0dc2679e3f503da7d7a6eb19429163cc8d553fa591059ce5b05c5754304ad167df6515bb83f22842d9bdd WHIRLPOOL 6e19c5d5754eeb3c8470bcefd0a83fc971ce5b2508b9e3cb58352301af26bfddc806bdda98a9244081c14a725c374d971456529267a37fb143edc033d1af3d91 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_bg.tar.gz 8239310 SHA256 41b7e61e6ba09a76a78639d80a7aa30cc3212393f72edd1e0ef0b48db5765ce7 SHA512 843313ec08f1ee1600ba083056f8cb369610043c4e90bd87c4c0bd402a8b0d4b8787d7c8e57749721972ecb4eefca4270e6c692e5164c5c9587e4a62cb40a58b WHIRLPOOL 0c6044658b61174857c2337d9748c23edc6dff97ebeec3197e40c4b42ff884afec2d89996c97640cb15eaf58a568ef9ba0082f0f23a84a7afafe72891ed4791c +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 9794166 SHA256 8938df9a64dd16cf0b84429a7b086f73493d06fcb452bdfc94e32bab1c1ed2c8 SHA512 ab5e2ff1ac45411ab097733538596e6fa196df79960873391fe9b05bf92c55b0bb1a39680b353df21bf605d9e78ae0206f102d851b9dc539e23dc7bca60d529c WHIRLPOOL 7ff8438b603da194ef1505c56a4e8640fae726adc1cea1d1afd66f29509146b1e4badaa862b04c2079b31e9e570d4e2f7c418b0074a0c944d2be69af4c5a7ec8 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_bn.tar.gz 9794266 SHA256 b992b2ee8577cccd18735bd5b64feedd9d253d289e37da76d94f512ddc6f5aed SHA512 9d5697315a02b0a28de15c6d187c1192397786081e2d1a739fd79c7741b57865793280feffec8ec4a0c47b716f6870239b173765d8a4a343cb4cc26c415acca3 WHIRLPOOL 37f90749af5f91780c0fbe0039cf84f3a18f956eaaf5e6c863e416c02eb09c4a5bed49de9809e3fa22f313e7a98c04bafd8a79af42b8090552ecfe24c68b0438 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_bo.tar.gz 9461697 SHA256 5ddf7cecd31130cf38af4eda601b9db0980c40edee2814006e1b08db2b17394a SHA512 e3ad34606518add632d5e30bbb7d9e0bf7cb135654537213f3b71baa0e8a1488888460e13fe7a1fe2ebbdba6672eb17a934d35235bbaab4e2ad089ce982fa1bd WHIRLPOOL fc7ddde2b26335a053658b832edd1fd4de7eb6e8df51e4c52e825ef93b3c92dd88f81e8de210b449290ab31a06a8f7df0332285993f8ccd8255afc8cb1870103 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_bs.tar.gz 7075725 SHA256 46c003324157c77b7d46bed33ab44397c515cb42a375867d38999b2817719f9c SHA512 68d1acf4b064bdc10cb81a58ebfa41e22e1b970e8a008190f5859cb95c335e6e57e186a3d24d6e0d7742d45d79f0485fd279f37f2db6bdfdfbdc59835c73f485 WHIRLPOOL 66f9c680c8cd7a6ccd2a555ea8fc8f486fe7cf63ff39c88f9b2b95c939bf908bf3a06c8816dae90ec270e02cd26042758cb183271557c5d25a622b4473eb8b08 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 7886180 SHA256 215cd39f24966e7e1694c0a0807f143a1077a21d1b62e68dbda69e807685ed38 SHA512 6e8be4c35aa3c4fc4526ccd64490d68d938bb09c69f414db3b74d87bd35734a5e463305e6c173f658ef05e8200dc76b54cf4e0fcbce173dfabbafc3a140c11ea WHIRLPOOL afd4a16c557a433b5dff27b9ffe472e24ac51f220b9511fbc1ad720ff70c729ef964adf5788bd85c50f7d431802b067748c8be93b1e08e9c311ac7acf9a1e43b +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ca.tar.gz 7879923 SHA256 722cbacfc0cbd699ced786fe62bab6dfc0a2f878ba348e8d1fc1541a8fb35262 SHA512 2b616d9a433f7a18017dfd1853ac20577a993cb940381b2433c810fa89b2cb677262b5ae61e3f914cfacd5740d292fd3cfbb1f2a09685d84d0436a85277aa644 WHIRLPOOL 22fdc3f34febdd7c66e988c43fc4681ae0abc3684aaa390e0a2dd786de3645d985278985d2354ee1d66e1595d1e1dd1c1f217c508e9f8f076a1535bb7323dfd1 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_cs.tar.gz 7497329 SHA256 fc1a5af4ea35a9a13780e9adeb9304ab9167fb3cb8f25a03691422a2aeefeb42 SHA512 568fb5921877fe7049046acdb5d4ff8b1b4eed20889fba228ec75040b31d1a5f923967a6def5b7e5365fcbf9bba5c09d40edfb7d4caca3280da2bbb227a6fd60 WHIRLPOOL dee320591baaaa5ebb67cc803ada5fc1203f8611cd460ee0f46e12b6260ce453936921164b5c1e456152e203b51397374330624d3ad8e5e355e8808559266dcc +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_da.tar.gz 7528315 SHA256 26bb58b18605c316da6cbc64b8a8d9020ba7d848eac4f3b2d60b41fe30b9b8bd SHA512 c4a6008c35fee2d085d2f68ba3bcb12fc289788c5866778754326d1106316bc62a7d2dd1808b9479b9d431971b5591a01fc06adc126b93bdabee1692d8a0f088 WHIRLPOOL 8b373bacabf5752a738b946332ec0ba39b82d61132416a85482014869db236f710942880cb8b051a77f5936c7c2e84d5129da01226fdd2688f152f74e3aa7c08 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_de.tar.gz 8063484 SHA256 4b1c67b80ea16f2027b1a666dec8de7d989b7e0cb7ad9a118163117b1782cb82 SHA512 07a3b0f8e2c7cb68ee19e425972d25da011e75ca8e7ffc6fc2fedb0abf9c720ef5cf6e4839b439c3dc0725a714a471322e2bb85b270185d1678e0541ad752f2c WHIRLPOOL fc87b97ce191a2408447438c21248cc9b272f9c6680c0be6e55827b73e2c0cded6c7b5f8eec576b3f9a9291ab068950636e40d9ae26d576350a0d44392bb1286 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_dz.tar.gz 10365444 SHA256 00626dca64a6fb601cdb7d0523fbb0d0b3994aee8d11e53cc3342c4b1037a3d6 SHA512 9aea34463bff2f80ef199fb10593232e964f0a4b9b81b512552739c0a809c8bcbde320a11e22cb9a45279a212d8c45feb8a63c0f28b5581b9c7763dde5f5b69a WHIRLPOOL 32b6c6cdd7b26f53c12cab30b08935a169f7cb99a9347a23fbda9ed43bcda1dcbe046f0ea55d801872ed6ad5be82ae9abf713f2381ea10abc1d5f61af789087f +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_el.tar.gz 8877045 SHA256 b6752a7edd58ec4e80a30a1bab20e55c34145203c2b1e468b2e069a158ccc11b SHA512 1fd5bed213cbf9a612242c09a1d23188553f5c9b64ef30e34823fb15dca8e87a2542175158185463b8f89589eaa86be92d944cee95c1eab19161c888062f3dee WHIRLPOOL d7d20b2dc97874e6889eb0f960f965a8e2b7caf7468798b515a0680fe15ac57c888385d66aee7251f20786004dc8085b0e9feb204890873653b386cce32e9673 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_en-GB.tar.gz 6374977 SHA256 d7b949a0fde56d74b0a6750f357f1583a6c0735511796a182d7084957149f776 SHA512 64c326f985f478d87f4fed5171eef9fd9b8c5cf69364c4d12c08353fa238680be7e1b961c2e27ba786b1c8d18b234fa530d625376c79b28fd0b70328a5d38367 WHIRLPOOL fcd5a0711dc0c61614eb8202dda8b0673729e838815c08834bcd78e35517fb87efdb51fe89390200b89c54b62ca0594c35985c3147c2dbe7e4296d1632c5cadc +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_en-US.tar.gz 6414401 SHA256 c14058cac96a9b096cc3fd5e83f324ba09b7ad7aecf4fefc9f71e69c8689e729 SHA512 31de01e0e6216a53cf82cee1d865e66f16e743d9169085356ca971b713f2c90e91861918c6b796d4858866d05ab5b62598ce8f431b17bdb9c21eaecccc6f4c81 WHIRLPOOL 17e427ad7f73ce9a50b620105d4788341f43246daf8744a1749a9a2e3c676be4028b499523ed8e8159cc3d8675c09c29aedb3ee26095fae40225f272104fc39b +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 6360894 SHA256 961fec5dd18fa48c48ef313ef6c2e3155f0cb19ac9c5e2ca932b8556fbedcb32 SHA512 1aee69b6bf0e296e7969f4739131723385c07ace7b154aedb022b50efb86fa5da94d60f6dffb3e2eec7987b2749ad9cfdc36705af5d99fae2870983b22810a17 WHIRLPOOL 38159392d98398e63f6622723e6dad369cffccd3d5e721ee53cf85867576f7d703e9a34e207ac9cddb68f8d52eff4d6a076b806edf43570ee231bf8240b36b63 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_eo.tar.gz 6943891 SHA256 9d26b07813dac0a7262f78fd774361a6c8fa56267740ccc3c33afd8d368c4716 SHA512 a9710c1699d1fa24ce3a47d09c9a3566509149093c3f6913eaf56dc19c0f7ac5490488e056807a447f72786575e7c80075ebf889a4ff8acb7476778d2e30f46c WHIRLPOOL 185906d4fea76449768b545e78f9948e33ce1964fd8288ddb151ff85c1ffde59ef6e7c3cb8eaf27d499da90aa99897ce858f0e067eb8c0483fe2d1ad0f3ca7e7 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_es.tar.gz 7918736 SHA256 92719f76a0dd3fec863a5377293da565183a138c01c7d96f8a15ee49aefd71ba SHA512 c7dc95792cdd9c147db286be7d9a8a8926886bd03c82e1b2db0a29b4da0f3330e84b0b95b8f73d74b7d86758660b473eb51f5bf5f2d1c2204e049cf9bdd985d5 WHIRLPOOL 66f2c51757b6746798824b9147cdd725c5c82f829f80a93b40ab5d83a09595a7b443ccfc48d235d035b91e6cfde3e76f55fe755d1fe111aec46b750d3b4dc126 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_et.tar.gz 7427923 SHA256 d7b3ef6746405fa77856fd910bf396255827877f1d892aa35b324dad3a1d9939 SHA512 a9833f50a6da16a0224540c3c317a38635e9e570694db856b3a851291ca6ebe6a284ceb232ed43874f8de9bf2c90c2d78fc88b654a4ec913731175e25ac25a71 WHIRLPOOL 84df522357df8bf4cfad76c5d30d7004e139074e8a8ca29e256d506bff21db1aec9ce89be7d0dced179f342fd8db66422e76793e2d23b0a426303686ebdabca0 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_eu.tar.gz 7568345 SHA256 b15e8434d504af06a5880b8b69fc43939959ebcda0cfe23a77265e81d9b10ecd SHA512 38210afaac2a41c552bf2f66ccae9b55262f5026b73e686119add365a317669fbbe8e3c34f9377eefc38e00890a310e1c98d79736563da8f822dc50d52773821 WHIRLPOOL 8fcb0378917fa57086c84c69f794f3f913d43ff7e7a0c2869007b51456ae17cb32030cee0b5ee2a316d9d3f63ab184284f605ea14b625ae0bfa522aa6a2fd3b7 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_fi.tar.gz 7678681 SHA256 d96414132bcee4b4b593a0ce1a844f67612f593f422a99e7d92f0d78233012e2 SHA512 39b7df661d9cebfcaf8fbac3e19bfd868f763a642ec7a263cbac1fe172612af17969a086b0842735577a2bea0cffd7562ebaea82c893e4e13c9ea071d8b46f37 WHIRLPOOL 2c1bcdef5dc58025d56c03ca3d33fb5a92cbce54ab2c8a2f421647bc33c6b6c4db9d4f34d669c9d6f52387ffbee1b43988e9b6625e6c83dfac28cea2f7375420 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_fr.tar.gz 8094697 SHA256 cc7d82917a4c4bba0ae27ecedee57536f9a0f0e43c9192368a33bf88c364678b SHA512 39662e695b63773e7864e949f0c18230095d5d62fc30f6c45c452bc9f57f5f9684e40c2e7a9dfecbb7596b4aa0b1cbb5c465d967b49f79147ce24dd9915753df WHIRLPOOL c49c2617748916ce79eb83bbe0f305021f3e7116ad141f8adf168fafc02d3128fca05e92b1ed7144bfea57b69b2850bd0e9e6ac6adb0f353cbf16d73cac1a030 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_gl.tar.gz 7663830 SHA256 9341a4ea9977c6f9e0d971d669a2c89ed3337dc98eb0b4a17d4b79bcfe3d1541 SHA512 120418e49e1b6acc40aeca06d7e3e59cd8fe71d4565f25f2da814850632831be5d55249ed162d9e4ae2be2c5b9d42985089971220ce2f4844474f00d0476f73f WHIRLPOOL d9bcf02509964c7a8c6d5e7b3e879c86ce85b852502bf069a373df0bc63a4f16847d1402139f85c3459a0d52092ab84574e3119ee1fac0ca484773a9dc2d2cf0 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_gu.tar.gz 6584006 SHA256 a2e7dc03f074fe5ace3906d1b9c2b3cc426dd3f84fc9ee2c3906899a17ac2565 SHA512 3791703070490a10cd96b6f95fa4cc4c612117c7da14f32456c3a91a5a0216b40a3c84bb8b22e8422b60062ff9174eca54641416a9e99e64407c7ce736292185 WHIRLPOOL 81b45ddc334da4258474daebd12ada70c0696090b581950b76b73e452812e4d0ef73d3b186a59bffb3c0abcd198b0ee3fc77bad463879423255126c129bdb009 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_he.tar.gz 6201364 SHA256 697f9dd5c873f0582df86263bc06d2379cd3eeca32d526deba3af7f9fbf3f0c9 SHA512 cd69ed9b34ef29029c34755c63ae896788f639f2de99379e8fc419a2742afbfdd34cf9487ece50ffdd9b36275f3c98dfc955c27fce53b792db721a768b108c9f WHIRLPOOL f06a1f9c7990ed25b80591f297935d4f9703dde0384645cb919409a7417a25ad1225174633caeccf1a8db75724a984e256cae5186ffc5fc2c7059c6896a8078d +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_hi.tar.gz 7273618 SHA256 7bbbfc4c71acfb89268f94c0ef8f1ba8db5f680539abf03ad367c79bebef4303 SHA512 422b9f877bdfe7d90f9fd7e75de603b06f2a6d282dec7f7a5aba591983e303f7adb4ed356f4a4a7ba1d238d8d7cffea630aaf56bd8a4ee3878ad79a070405ecc WHIRLPOOL e91a69cb2adf3f395a8b6df8a596f737dce9ec6678b1028d8b69bf0193b0dea7b6ac6bb7c3b44f3f478bc1beda40e8b55f87126ad6d8769796c02d672dbb7b1e +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_hr.tar.gz 6754829 SHA256 116d651b6724cff5d5b1ea9065cd45d2f1cee03fea800e4e07ed92346d239c9d SHA512 e34256880f605569fe0345584900bee434aae1cedca7220482af44222e50e1514a1fa7dc279b595f802f35ff0b3407ff393acfa78249b7e70ee874bd87d3f29f WHIRLPOOL 1fa2d5a07ae2b3b7fea0110757c5230a2353f955b644cd6ea250749c4ccf11406903b6638ab3b01d5404f4f6b37f07c29762465b50d09cdadcfbd42ac91d48c2 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_hu.tar.gz 7927345 SHA256 82eb5cf350efe61197c7e5dbc48e9b4712a604c4934f4c46cf19a493d2be80c5 SHA512 23bda6dbb4edbfa60bd2a6a668b6dd0b9cd267fad4bae3bf2a9b7fdf02b573ec6a98a8f87ba4e57fc6b4a610a3c895711a237128e81ef7a16e10d75cb5412433 WHIRLPOOL 51aecb85f525d6dda3f4187143e0ed29bdc217d64bf106874cbb4d90abdcafb28dc1a3feda67a5dbf078124109f4e10659b8e1c8b3d6b1daa553216c38b71772 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_id.tar.gz 6742803 SHA256 8ce1a2ce5be81abb035c23fb619870008be7ba45e1978d581e25b80590f1cadc SHA512 bc481e431b4a3119b47658c8f6491d0b6f6477617163a4a2fb387e362d7c9b41285594ba530e71a03040c5c9842b105f34b1817871125dab6b9fc92ef5d1ecd6 WHIRLPOOL b894e8d85751ffb27ae8395e8a197b493f8c601e2f7b45df8941b8b8e33c9450ae7da0d0f2a3567633c22e0836e7c98c75701586a5f4de93d01fdeda40f25047 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_is.tar.gz 6844377 SHA256 1a59ace1456573c9a3eb830c7350cbb1af843d62d80b246c5a9fa9e4b2fc016c SHA512 5de9a8dd825187cc02a0c9cf2a0b8be95f31dc4b95da2700ba407c679ca5bdb16a6972d4edddae7bb898b657cc89876455d6965be45a54a36986ed1cd67ee80b WHIRLPOOL b2353b7df39b25e5e19ac03c1566b93def373bd2727ebbd19fa07489fb7f372d412078613772955de7d36b350ba339a80276e107ea33fbfd54d6c8ceb59e8c07 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_it.tar.gz 7846299 SHA256 f4cca7e364761c082aa1c7befef1d2182e6aeec831794b9b6e815b12dd6ab53e SHA512 7c2f4a248252f58c82727580a9773651e9e99b63ea3fc4c6621004157519506196660e737ba26b2907fbe3229e784712a6fd6d97180d5593e267dfa4cd69ad33 WHIRLPOOL 34cbba2218207db7d7bfeb1068f09424c67af433dd6712a4b9209ca5db5829992f4444b1baafa0b083ae4b6bbd963fbedd51a5491ee1efeb7532335189b264c1 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ja.tar.gz 13422317 SHA256 b997b32449c04764e4d29ae975ab7d09197bb2f90390ef32d4501d88d9140f5f SHA512 d5b8edc5153a78f8d4073dd53e7e30fef4717e34cfb34fd0b54aaecf23b5776432d9b9257ac4bf24850b175695a9e9ce3d849ceaa84abcea1ea33b1d509724cf WHIRLPOOL 2cd2d7eeec0a66f1b936355ef52b9acfd2cc17ce7d53061294111fd17e5ad7abd4a655ddd2abbcfc216802c1c7cbd0e92e25910627acabb15b0bb3c326ad17ba +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ka.tar.gz 7058916 SHA256 edbc55d651efbe0d4f2c9ddde0a92eb13a1d81de124a38c6b61acd85eeb929c2 SHA512 1f5b310d7bf0d21d2bef0a6d06bcfefda23aad8c1e65da10736ef7ead44cad9875102858fa274ed58d8a14a9da6b147cea2850094614c27681ead305933c2393 WHIRLPOOL 1437083718d4f306143753a3169e79d1b3132f65649884e6a87d65d8c95b9a2e961e144e292115b24594ddc003b74da33e0d161a06cd82c5563d88d1e2791df2 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_km.tar.gz 10319785 SHA256 e8611aa1fdff5c41ced6816a0ca79a2538e713d82893eef8c1b98b165a4dd2bc SHA512 e19a7f7078b715d5d97ef77e636cb34df6b793a19ef20871cf5fe0668a588c1bbc7cab5bf3c46f9211792e31c725a7fc5532d080e2f90555f6e5ef207dbe1131 WHIRLPOOL fcc56dc8094b92624f7679fbfeafb159bc21f2b17d845497d22da737effdfe01723439109986b2e1c1b3de4c8575aa96a9ee667c1e161f6e01221c07fe46b7e9 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ko.tar.gz 9296352 SHA256 0978165cc70550b8149ee5d21066bba04e3dab8a3aedb2baf651900123c34e75 SHA512 9185da556bba8cffe692868d8bd4f51290f1542e491f03d0296cd0adab2ee74929dc50110eef0cc49914da1196c1e88043a426fa356b5c0a668b0bb579ee4d9f WHIRLPOOL 8f87ebb388455c117fc3f61b9b0a26ed5cc09562189e9e7a078c6adb780a6c74096464316069c0f000bdd741b21cb1f4e1deda96a5ca1e208b66ef90d6936d07 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_mk.tar.gz 7296092 SHA256 69846d7ee72ada807cfa84ab30983aea3ad87a8f0f41e26c2956e3eb14e29f96 SHA512 60d01bc92805a37432972b73f38d3654a423edacbcd490a86b1ccc57cbbe416ae20d3fa208ecb464604d53e17a41a18da8b69e2e2a3fba175f1c5e689db3e064 WHIRLPOOL bddfb216288fdb3e5e08b18908fed4d6a4aa71e048882c79dc8ad0a90caf3d762d3c3e08e21f145ee275e6b483f9b1fd93e01ea3d52b14969b338a38613726eb +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_nb.tar.gz 7596132 SHA256 38d0e534e5b1d7b3ad51afdbeb05274dc9a67a8c802021eea2fc1cc439f8b548 SHA512 d81d7a9e4866fdf17511dc3c1afca48c257d6dd967b65ce0dc8e498a0d450a7670c9036196b3eef37d5ab07ceff2043c59abf3df1c220d345a6bd5ce9c8c190a WHIRLPOOL 7b794cd169fd9d3e7dfa79c78123f75b927661df84e0933b3296bd2ecd5eac269d5991e757b416edf99933210f88adbf2e46527594cd25db31935e17f6871863 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ne.tar.gz 9832622 SHA256 299c67643783ab05e2b4d0020c5c5e0c11b2f47ac957c8d143363f2965abdca5 SHA512 5f7523ba2b01d4fea0601a677be95a2fc3662839a156a8d7214d106ee7ddcb28403853d4317720ccf7150d2bb67da2d8bca146854a67a79165eaa136a9c2923f WHIRLPOOL 890a9f61a04a7aa51bb1b501d25419c5178afcf4a075fc503fcafd5500d5b195a246cd955e269c2fb249954e451e2459a22c1eea218a8c9609ae0681e91c6f01 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_nl.tar.gz 7669749 SHA256 52e51ad41a65222e2d94db06ba18efc1b3da3814d469bb16dc5467d83d87805a SHA512 74b059a8cd95a2b48e28fdba15eea0e9dc52a8e19622c3e2f49fe3f87b4966c135a4ac0647ff8ae470cfdb2e48ea5cd73d26f3727f7992f20988ab02ff084934 WHIRLPOOL 11f4cc1270586d83ae413964d2e05da7e43c6ef36be5aa3445b8fbf7c0405f542019b2c47fc9ccf9932e2c0442515a27bfe03fd8ee6f1ca178799833816c1bc1 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_nn.tar.gz 7550920 SHA256 334eaef6321ce1a81251176f1106daf1595df19e962fae308375621f857cb007 SHA512 a092497686f428ed76f4b9c3ff2119e122047742e167defa393c3aa7684bf8f5e790d6fbf495a99e2fe5e67545ef47c62e29c12f1b990d37a43c703953edce32 WHIRLPOOL 6c28b1c93a26dbcf3f1947dfc607b35cb6cc005efa4755b6d9b1f8fdcf5a934e01036aa589dbcea6e9f4feb5e29ea33bf80f9747fcb27112c7f562e87d6cd042 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_om.tar.gz 7935093 SHA256 0eb9fda423824d0877285c78b3862872f31424820121cd43ce6e6b94d00cdb16 SHA512 214a487cac1d1f96f4014f93b98d6a28d8bbe800f6187de9a7288f55ba8d0eb231c4aa2029b5090ae836e942a8cbafb0f68ac8bf658d6fd901449d4ede8736ca WHIRLPOOL 0d0e52a83425b76f52555757bf0d5876465cb8ec240a40566c0ed62043713da979623f5f80b95b0059e30f6ecfb74c57cf0531af48bb2199cdac70df674054cd +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_pl.tar.gz 7933735 SHA256 f48de07bccdbcddc9796ff03c2c832a2b3965424455e5a0b8c17be885abf40bd SHA512 14e1b2bdce7eaed0755e9471329404bd0ca807ed69b5d39f7538122271c42501757d6c5edaecb9c58272a7378a68194ff47ef6016c40f5d06388045987dbf9a7 WHIRLPOOL 9889e557ceb95cc867ecd8a923b2b36e8fc0d2ff2ec9bc1e20903e5d2c6a401f0b38b21c5d7e1869977d3ca8823171b36e572c70f051736bbcb13d677a55303b +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 7681356 SHA256 92ba146a1903edb9dc716bffa25f1f544129eff7088bcd6559ecc03f30f9985d SHA512 87fcc5adb30bcb3ef63156eb6732939fb13b8ae3140610170fde4222c6c6dd46abe16c585dd209a373b6a2565e9b1e510d9e1136a2a7f7f81bcb5f9a90869863 WHIRLPOOL 9cfd776ed157b085521f2cdf138326e126c306e2cc40b05da2f2d7c5e3db2e87be3aa7b55b15d99f6cb3db18da6d7d265ae2bd7c78ac686c1238aba67c69abf5 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_pt.tar.gz 7613589 SHA256 39c093198a65e32223b728a2283c5c236e9ba57ec013c4e9fc5eec7ad8abcbb8 SHA512 aea378fba484e6bfef34442e6790cb79ce2c0b5a45743535fef7413dd281a3da80575abf1439e24404caf9ce1374d883a21634d46ef727a71b2f963191a0cfb7 WHIRLPOOL 1a9aab12a24e7369848fdcf68a8075766f95e022ff2874d6753c343b9ed4c42c2e98fa3fa76913cf63bb13d89994537f277848d01c208309af97dd7eec462163 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ru.tar.gz 8347651 SHA256 e7ce29363a869b3ad91a2c2aca724e5eb10bf95e07f2340b8bfa6ce116aa1793 SHA512 47449609c1abf190802b75eae65364c4630453cc87d9cf78669cc7db20ed9d730aa33c7a3408351ce2b6e46d607e426734589528e676037b361611a453368006 WHIRLPOOL 97b128870c0afeb40f17779ee4d6a751f4e1c841732d2741f218b09a05499da67395b0cc5ac5edf52e7d39002b9dc2e09c09987e97cbfaef5edfdb951768490b +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_si.tar.gz 7160727 SHA256 e6373cb7fccb91c1de41469321b546ac9158dc81c31e33215cde174674371472 SHA512 097b18a96e74ca1300e8593e4a6c6bafe4eb33d24151d5a8c89809254fd0c9524bf03e4695ca26ace024642b311636ed9be1bd161b8fa6622a39984763063b78 WHIRLPOOL e3b60f18d82a0cdb70783013be81ef0667b631bed0913137a00edabb04cea83063525c49ddf414a347a392dd646916bf83f66a099c48d01bea3da308f04be5d9 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_sk.tar.gz 7437333 SHA256 f1073e8b6de614591e5c7dac9a9946e721b0f8e49e5087140a0d269ca4f66964 SHA512 a6baabeb2048c9cb4e3190d17dae3180e24ad200e36d16d802a877b5c72687da12b4a5126e444bd98bd155ca95de398e60f36029f4e049875f7475d3e0b49eae WHIRLPOOL a13c4be56888ecfb0f44c6352d7e407499c11decb08c0aeb586dadc2b906c7c9cd3ff5a0944a369dcb5dc9cc22022e17eb8334b1ce6e90a7a0420dca96067892 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_sl.tar.gz 7675056 SHA256 fa9bad151c4923a9f73837519c5fdd66fe180d211ab88060a062ed428fb53e3c SHA512 d679c7c8bfb816f5552e41a3ffcb46fde554d38022fa6a724a5a766dea4a6019b8836d70537b38d9f1f04f27589a928a1b618f9c5f087d18e29467adbec21326 WHIRLPOOL 020e89f792e8d61f89bb437533b395893f2a11da193cc3b399d901f8b8e22761053d85695b96b5f9115a076d53ac0058d4507162dfa288dfd1ade33aa815d5cb +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_sq.tar.gz 6792769 SHA256 b739712b6a425fd16da29705fddda678f46739aa687c5dfe1d521d4f2b4c51ba SHA512 3f95df69e2cdde281393b1a098232877ab64e75fe5dfc83c66350f5caf926de7c286f623e7351be1e481705d98b6e2ccb331ce790045857254fefc703993204d WHIRLPOOL 06d86aed692b271b63d9a8675c14d57aadeba976470d3eb8a12d81f5e0a0ea8bb63808b1cb5b84e15c6c23abf507d8b022ed8f4c2ce0db08eec004b0b4c83840 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_sv.tar.gz 7594395 SHA256 0e382246c30df9463ee646cd4d0f94b50426c9b87d55201a3b357973627a2601 SHA512 d3df0109f1673b7da18aaf1c21e49d836626c0de90821ddbc7e66c677dfa8a9d5b1da09ba1713de2487955e7bb34c16050cfaa72df072d5413ac65268bc88e20 WHIRLPOOL 022efd8ce63db24b4599302c6a74fe15b24114c15971d26aa18f6b53f78a76159a8e94faa2f84ea803802d2f78d2f821a2d116db543a6eb7466ed755c0fb5e84 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_tg.tar.gz 7121345 SHA256 98c76560c46fdf6bac8ac8714bf7e65a040e28d6737c171c4543d7b4190a23eb SHA512 cc4bd282542f1973af372415d6a74800eb65f0e0fed5cafa2fda0aa9448a2f97a9b57a7c1c2b3e9454a6cc9af36c2de6382140f6c92ce1a2875695cc13b487a9 WHIRLPOOL 267963f5c06e77874aed8050f814916274d589c62a3b64e22505e5be8e877b8506b5034f7bc8c7cc0d900b66d99794b5783a5a8e3f2c571c1f14439a54d152af +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_tr.tar.gz 7831512 SHA256 38fed66d248d6a2b3860f7d091e714216655096325b811f5055018ade8b07af7 SHA512 cd501ea9c9a4e9de4557c0d71c062b632a28e5836ab70f9606cf6466fb1bc44cdfa96b7a486ac40a9932200f913ae6934e5658311831ec77473de96135d1c829 WHIRLPOOL d880fca70bfb9e66e92690a14c43c01324e2ea83ace98772b7750b5bd541667611d7d47fb5a0f69f93359ac6c9ea53018b08585cb48903cdcb32cbf75ff62368 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ug.tar.gz 6782066 SHA256 c56d17c01367c3e36455ce86f0295d5bfc16b1ff0df2b8d6c74fd708f52d6215 SHA512 b48d6ed8b6bfbbf17136baeb8110310a1bff91afc28f905ac4f417e71db1ff359623a90b0e3ba3e4265bc8dd1789ea2988a12ae451c97965fc3c3d453689d831 WHIRLPOOL a5c55febb55be3aa2d51c33c1ad057b22694f426834d7a199a909458186041267577ae45640b54a43dffce65625cb8f86a64d88f97f60c8f243289edaef230de +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_uk.tar.gz 7232730 SHA256 844091b0d14d6ddc865572917f701b11a9a89f953a35d821fab244f6c448d0fc SHA512 d0e365a65dc9cb53659f5b3c3f58f879dafc372d2d1385aa740933104b28ee0f6eacfbcdbd73e5b32502725fa06dffa8ae5c37de0157ada6793deca27121dd04 WHIRLPOOL 3a20f1b8e8d163dcb6243ccd28329a0a87b8a72ffd4d235c35beba2bc2a9b5be14a446454b993d0a656d05fee89428d2ccd164044b8da7009f593828891bce1a +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_vi.tar.gz 8098059 SHA256 3afda4499f023988ba43c37d27b3dca1b0d25700700c27e8034db6602a70f531 SHA512 711226dfd619e174679f74f1bdce989516ac4bb7e30d922c718d8b2dbbc9373fbb0384604fd0af72c9ef48179a9c5a4c59f4d49f941d16458b5d48e7da2b6b6f WHIRLPOOL c66c4d2556a1516ca8817c67c62c26c7b837081a520f21dc7f97194b855723af6279623f869c650e98cab6dc04fd0e0178110f3f084ade4f4ba24947b5991d8c +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 10642296 SHA256 99a5258d6fb3a253f47943f7ef1f6c16992d13795f170a518318171037e8ae44 SHA512 2b69043a256159707118dd4ab6a62dbeefbab1af06c89a997b4adb93c7b0ab24d12377141076103d87796f95d9311adbe7cf864c5e2887777af208f02f61c061 WHIRLPOOL 1d0ba73af23e8433cb6268fb16220f1f7ad2358781e25957db7db333e87ef5bdf2d63484764ce04b7d806befc22459a4ee7ce0000c2187cdfd804f6d224d99cc +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 10698896 SHA256 b55655a1d3fc9597ed01b0ef6a2cee381b178e0acef22cc330045f2762bf592c SHA512 9b572955f72fd85cbe2208b3a9084f2172a4ba8cb5a90fb4a5c41243a1f117d934841a94dbf8c8f9776a0b1326cf63f29a337213a90f19380cfab3a2548113d3 WHIRLPOOL 3d5c8cf11d9a95f9a1b197795165d761eff57d0b4c0eca41c2fdd0a8eee7bebd35b0049dc6993b1ad7a7e86df1d752907bab7a750f2a69c6fe2b7edf92e30e36 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_af.tar.gz 1113418 SHA256 328f4f1546e3a2ded11244cda6ef02fb2729cd638ab7802c1e592ba3931520ee SHA512 4860134248db10289c34f6be026b89c24859e80e711e6ebd356a853589e32006d27281e1c4528d00332daa3e2795ad3fcdc95a07cd90444c72c73e5cb06b2fe3 WHIRLPOOL 8321ebcd5d134fdf239c6bafe065e9123529f294f4c954f998800d508e98af37f58d6b43e106d2dc4080367e2499deb868966f8130d928a61af6264a4ddc0b9a +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_am.tar.gz 518640 SHA256 42364d80a43930f93d8948b85e8344280d9a77de72b051ee93968a6c73b14c67 SHA512 23d513ae278f019a453ff90433f20291b078527d7e0e55216b9ae578b96deea69994304a0c6cd5b0d298e1d4a632638d38887ee291bb78b7985ec8317df2a0a9 WHIRLPOOL cda0d5b1f4d6d7e74064ca44efefc5465c1f036f1038d8306381a132f3c2dfd15142d407490aaf902f04cff8ed6bafb396fc01d21fb685d93fcaa821b6f29a59 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ar.tar.gz 2261692 SHA256 d087b983527d0ec3c87ee0c49017721da90a9b94324155fec9256c8276ec37d0 SHA512 f2d7f9fcf47c2ef323b464c0ef86d78f2a6dc5d66e5ed36dc7b776c0b5edbac439fe05258bc00f29fad5805dc85db75fd79642c70dd2fc0b3280b48a6ec2aa2f WHIRLPOOL 63bf2cc8593948dd43a7d4539495a996c1c971f6057f02151483b31bae316fd6f14d70a06b167d4ad32908e865963dbb8bc5f8b26aff260f87217a6b88bbb81f +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_as.tar.gz 545711 SHA256 7c2d424bbb6bd82fd9bff1422b13161c3e884d4b60257daf29c8bce6eb80932b SHA512 afbc7d1d943ad9d4890c916b8d13556259572e304127e789c42e187ee64629d68183c01436c6da0a823c284714c9ee1d9fdf5509756473c0ed32b71e223ef65e WHIRLPOOL 56ef1ec1b08f849312e94a785da2183dc7d261bff5aa3743509f55a83fa8c236f6f1e501e047cfaebe49d8d9d401c7c723694ce7cea8e6ee1022968f15fc5ddc +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ast.tar.gz 501950 SHA256 3a2fa0fb5fdb980ac5ac19d1830705794a43c921defee6fbcc5ed88d89ed11d5 SHA512 14bc82d381336b523bee5c59d1f299d1f81293dc322235057008d02cd3d4aff90ba07048b449a93e39c681de92f6b2ed36e91340d016895f5a421ffb50fb38ce WHIRLPOOL 77b3406fd290e0f9fd384783740ac9aa95c9a98eac1a3dffefffe0764daeee502d93737524d56fa3b247c9d3ac9bfe41652066121abf23d36ffb9758297a330c +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_be.tar.gz 883490 SHA256 75f952a9f8a7e0478f3c444ca90ec8ccd09c2e1bcc711305b156e08f1000cffe SHA512 225c415b2fc4cbdfa432565d4a8d743563c4070712e371e8f6b7c21cb12347a0c6bf32cd0aa226f062da2774ff814f039a8e12c41031b07808208b2a6faa4b75 WHIRLPOOL 3d9536a762c826c65d20663634ec398422cabf9f4b4507820c329bb5c61f65196c36843b99fca294d6289d7aa6aee2d373d9a967c1cd0c9121d53d3c40da236c +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_bg.tar.gz 1962342 SHA256 4f55c70161bcf161e0183c3129cf5d2f2148161af6e27550a7e2bde1c4dd268a SHA512 5aa50df8704b8e31ddbe7f85b965f94e420d1cfcf97edae3eefa0c12a9ec02d84cb4a6781c8dae84d6cb65e8932cc7a43f7f60d25973ae6371422c4c8378afc5 WHIRLPOOL 144c31cd98ad2514df6545bf889483befff56a378b4202e6de37ad903c0a44e1f2174456bcd8d2337da843e4e30efe79c6e396a9a6040e2ef80fc2403971290c +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 552000 SHA256 c3bc8ea622ba23db32198cdc9ba64ecfbecf8d03cfdab749a5c2fb2ad49a927a SHA512 2e5106283231c03a546554264e4225a1c37ebb4e4875279c82e17924b66d0c83e7513ed9af6c1a4d74f1e050b6e83efb8f1da0448a335cf103180caa123a6585 WHIRLPOOL b6739d5069eb05f41f219a3cfd8978a0a041e633cc267f0e1545d4d405099d46a5a58d7c2fcbc0c9fd5619145b3db2d3f2e0208e92cd8114a88a64eb8f1c16e9 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_bn.tar.gz 900875 SHA256 74c7188ee4606e3ba4a52d3eb48feb5e291b19b95f016ec5358d89806964bfb9 SHA512 0e9845e62221ce2228de1fb6492032a544054ccae6b77e9a0409eda0332d3a851e4476343ffa82a5111468fd87d00e93cb16cfceef385c7d9ae8bb0fae6b29e3 WHIRLPOOL 6df7513b1a4f5cc6219eba7f1378c30f2dcbcc028deebfcae6e2563c1e42eba586c6a4e2bd0e273a018379b79204c79d5a67eb5fda75e4e9202f1cb9747f09b7 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_bo.tar.gz 535890 SHA256 83ce9fb07e897a34ac317e8289155ac5442f58bb125e6e5ac7012b4a00a9cbbe SHA512 3aea2cbcff6447110e210a7bf93d3bf173497833f224483fb8c1861731df46da5432ff83322298896250cb56184b85ffc8459e07fe2eb2a4efe619096f169cb4 WHIRLPOOL 27cdc2b4218dbe9e594c0328f6a96f6787d48f6e68a4f6c34cfdbbaeb2254c4903e3c7abce6339c015aa83c341943a9899ac3731e14fd22cbb2d9126052f6849 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_br.tar.gz 1717568 SHA256 aefe95f7850ed8566f2833e649f73f257e7a762e7c687555ab89cfe6a3033ef7 SHA512 18fc9b5e1ebb1f8e77c0e5ff95a0238ad3d35829afa15a9708e0001dfdb75161112cf1974d11d52cd120eeb45a0a0707330d73bae7dafd8c02ef86ec14945581 WHIRLPOOL f9befa2790f26f006c2fbf44bf104fcb21187d2ee50b381765be8d40fc1920e5d7a17233545bdd953df24240e935ff1b5ed8e2c997e7e4f49e0275478b5dcf44 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_brx.tar.gz 515719 SHA256 d13613e7acf8cbd29bd3ec0451b94f8bd54dfbc7aed0d8a3416d178f69e880c6 SHA512 cb2b35e36c67c2610dcb040c0b07b0a7fb4429e323c2514c41edd3b564c32b599b1a673403549b5b76eeffa369da4cc45d909220017d9694b0355233406d8443 WHIRLPOOL 76502e8f9a4cd7edcc64ba7eb808847e5054bc64a4f8a865275b91f3ea30ddf6461dfb66b6232167e8dc6988ffa2995147344fed7a71bce5f63029cae188171e +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_bs.tar.gz 616291 SHA256 1f9aad4cbc25dff4bd0c3f440bf14a0f74275be6047672452c03dd9db20a5276 SHA512 8236d484d5c13b087bbab5759c78c35b21023c330b417d896679026da0367ace28b466e05ee1419c1e9f1a6a41496a824960222269d46128a0696da1ec54c77e WHIRLPOOL d02f722fd19b2874779e59e15fe9a9b7dc9161ad93d668ba293b3c9b013a42889505fb618a88128806a04ab05df085e1d8897848c3e6a2325d40ff51d64371a0 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1771807 SHA256 d1820c0f975eb68544684a5f267151631be36c1f16ea413eb42ea232436cbf90 SHA512 94f8cf32301fb92370abb4221b9c6e659d5aa284ed2e73592496fd0c9ecd13cb0c63ceeb34261e928a5c298275b1d52b30a637714ceca1c01da75f378a7fd857 WHIRLPOOL bd1e0dad801c844583e23db70aaad7926bf933f040c42e51573fcd70cbf3bad0d020522967e88cd2b563d5a3a5491958d97e13173201afbfa34b8807a3d7cdfc +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ca.tar.gz 1772867 SHA256 b2146881fee688e729b533276889741154fb5aa8a177ce740348651ea804f807 SHA512 0f5a130207f08eda506bd1de297ae90f15a918ce172f3bb99d8edf07042eddb38caae0157d199adc524668efb2fe00c989a00660580fafd3e6562af0d1373f68 WHIRLPOOL 8f934a07435f1be96b9561147e66454e6b49ef7d78e22e3ccd75c89ba0f6fef07dd45dce82468c4e3d0482408e68107b0bbbaaf93e2b2be32260115020876edb +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_cs.tar.gz 1234760 SHA256 88fd16945ed2f47342c6b5c7eb2d55ffdc9676921a285f7034ece172c615093b SHA512 0255d62efd7daf563912c1a0a042de67703396df4211fa6894b2c0d775378a4085edf8438d80e8d3ae1989d123102ce439b5b8d1b214738dbe00e5fef425db62 WHIRLPOOL d2eec5a52db57490c0526f073a634bd5b54f20ce51db480a4653044b2e741634d2866d33d6c4ef2fc6e658e0314bf58231b9f822e5a09cf606f0343d8871d701 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_cy.tar.gz 481760 SHA256 c694e519ca3a88b0f31f9ff3de7641408ce666e070d15221c84fc1a24c9413d2 SHA512 10c4a86bf47e6106986767b07e361bf7aeea00de95ed7af651390482a9c76449aecb643d1d8228edc0060d85aa0d06baf4dab320c1bd9701c640880f4ffd1c43 WHIRLPOOL f92073d871ccb7d3a81a3e10f3c6dce7e5fdb6d2f1a47ac6dc77f0a982f7f262000907ef4365132dcd9bfad5a17c3865e5482a2f0ab49df693d95d5a0c2fc495 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_da.tar.gz 2386134 SHA256 1d1a269461e96cdc8ffa137b881e2dc037ff9e8ff324f202a7cf0e344b9cd27e SHA512 6c709422153b5f278c6729bcbf063778f81e7c49718ee1b727f05214ce6d10549b2850f98ce1c9316e8755828837adccabcc04c5594f24ec7a68b13c4bcb8d81 WHIRLPOOL 0f76fdd57d1ca8d8829acabf29bbf6ead46c0ef91acab8072518e98ea246a88dee2504371096edc4d0c711cbabf15e45e7e85fe13ad5b0718132b4496c55c7f2 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_de.tar.gz 14122031 SHA256 e0b6a11f9c26ffcedba08cce4f5f932e37dddc29128c5cb08b885552fbd46068 SHA512 2ffefe5095438c5a6bc040f7de77c09a609494b4c0187d63586c6df30cfb96756ff9f56f89d3c97324da84a17e8f4f1e374247007a27691e445753b47304e660 WHIRLPOOL 5e03b88daa1ca4b53766474e321eaa963858f5d640e07fba6ff7b0899d97cf72372d2f39239a837ebffc9f1053df3386977cf4c606398e2db5d0148769c3ab9d +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_dgo.tar.gz 546102 SHA256 48462fa313c128ca6060ee2d831928a1e953e5bdcab2fe77701ad0322088428e SHA512 71a8539b1eca4607594192f75d7525ff76668da83d69422df08af8e710eabc8630d401961510a1bf0bcac3aa6975e37689e2bd4ef24f5fa84e4dfec457b9ec7d WHIRLPOOL b162fca4abc0b763769060d942a1e780005b44b3ed590f6aa1738208f6ebfb504fabaabbf4bc93f3e3a6f4a17aaf8ed0799f74bd3f5a43bb8d931e3aae191824 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_dz.tar.gz 542828 SHA256 5e9aaf223b95f5437d22af7bf98273def4ef7c688902df9cdfc8f2cee8f6135d SHA512 ad23cb73ff7a3db048cf6e50f6401805be01aa02bf593471d67bd0ea3f87304aa27882539b24cc395c94bb6f11c42c35edb7ab2a26cca69cd736f7daf1b3b7bb WHIRLPOOL ac120efffe109421876926fed72be0d5cf3be736e23d1311cf61a39b9545c58633e8805d2b296d42b7d6f0de292e8a84a56aec29be6b2ca39acc28d77481ba6e +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_el.tar.gz 2579004 SHA256 3576d0b368ea5012f77ac6c6433272482b5dda6b357914a30c173fa7f480afbd SHA512 b4623669028103e6f081dc1e35e6b657ea6240607e7720133d4dee5c2850658577345c46e405d7033477d8fbdae0a592f89a3cc7aa089126831a214959818d63 WHIRLPOOL e34a598a784a96b7a92600a17b9960089796b2cd143db3a772fdeea9557d6f74c405656131f070462b9586a580df6ab801be952a2fe17bd7cb66590e9efa1170 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_en-GB.tar.gz 7117669 SHA256 f31fda1b4df5d3cfe89a1764050f1271b6be39ce6faa311510a48f37830a544f SHA512 b21224be9e4b4c9e5ab97bf23e9bf5e0676fe8d375b34b4f24eb063b24e88cf6b2ab6eece750fcf069e3dfe7d8cf05c0fa84a8ac4b731b6957b57d86a126cf30 WHIRLPOOL 6c16b42dd351f63280836bcf3d8371dbfa22708007d6ab9837bddb57a45f68875a6fc3fda6d5594c4c0bf44fd6e7d19c378016f4faf5ee4356c5e06272e3e3ca +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 7035099 SHA256 005053adf58752f7d39c70646be05fa32157009d66d1d74c4e4af3163dbfd2ef SHA512 21594926d35e9566ed38771272ce686b9b7f6ab5e010058da161c8b1a2809858842d761335767a9ad523910749cf394c5f2ec6712791a5eb23341b9f74015c08 WHIRLPOOL 84b9eefb0a29b7c4bbad3911a25328457168bdacfdbdc5e73233640dd21ec6e2294d7008274abb6483c00ddba9b0d604919e05d85c3316c80fcecb50e4b21cde +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_eo.tar.gz 478490 SHA256 f547e473bc268567590ec0e5c5717539806c55e31a133e5803c17d9dbe31e473 SHA512 cd352ead5fe144081763b55fba49bad05ccd72d6433bd8e03632bf53272615ffecf650dee25566780b30fcd1e9595af3c0b70511eb9fe58683b6b8533c2eddaa WHIRLPOOL 194fb408fd5142d94b840a849162e2112d4cabb7f67199c4d77d2ee4c777e5569058342f2c2e3272adfd415072ae2859af5d80b585e2bddb5dc4cd66c18d9b12 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_es.tar.gz 1960201 SHA256 8b0a2e816c2b82c1b927c0b9f99787e6c03463bafa29c1618bfbcf51e9b7ae2f SHA512 90bb8aac5e2d6ce9e51b2053bf0b9c462dc80cf81b26b630c5abcd7da7bb403136c0da573920085697bf1c8e77ec2d386de363221cb56ebe7e003f36305be03b WHIRLPOOL d9873159d370992f563a703e66a3d1d1ced7c25bc1833898b693b3f5870d98a02229707012bacac52a8b9d5da36def6d7c18230f7ead590e3918330990d1c40d +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_et.tar.gz 1388386 SHA256 f63e728c15b225d9beffd22a21a03fff70ad5ebeabd59fe185d29093d0b7c8d2 SHA512 4aac4ed038d4a7026700f6edfcfe7b68237daca0f1ab39d0fd40e1634fe31bcf835168429ba1a0837730de0b638a17d7c65218e9e761d0d375c7897d4b32a9ec WHIRLPOOL 574f2ee453c87fc19ad8257b61744391f88682a3ea93522c04fe811e60fed349709d6906fca162b760724da21a0ecbebb725842ab2af0f73fc1f1aa28dcb28d6 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_eu.tar.gz 486850 SHA256 50c19c3539ef2dd2db58821749923a0ac6f87535003c9152956309cd8534bfce SHA512 df1c69d7d5fdef95ea37f763c2591bec134faedbb94b032ce73e7ca618dccc2aac6c9d35e9e5974ac303affc0744dd61b6d4aa473d7ce0300e7e3f709bcc4514 WHIRLPOOL 676e6ce36aeba30f5abc8ecb52e227598452e8c9d1cfbc428f6433fb9d9c61e5fd9ccc31af40f8115c16fd84f478ab64831a63fdc835fe7b8c1f2ebe649f8480 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_fa.tar.gz 510587 SHA256 60877cfe080784108f70b8fabb35462b2c02559549ed69173926e9941cf2ad91 SHA512 967127b94d069e041cdfd961b98f68b558ab692f435dde1b65cb6008841a395e71474e0df6abe301c9b011244bdbe501ec26e6bcc5cc86a5ad1acef97a7d310d WHIRLPOOL e1c3bdc8f4b7dfbf04084c002e23d48b7609433529808d683d9dcd090f1e3767cd6f3bc5a8d559249acd660045d84dd3cda8e8428f8b9e36ce5277636fe393dd +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_fi.tar.gz 493766 SHA256 00d445e3b8ef01085ffb03999e6ba37cae5a600347a9dcaa8f5112d11a2a2337 SHA512 178f8c5c75cf9317735677e6640c5cd730b5ef4a6306ecc015100c485dc7afe75f1251567176cfea95ab09f450d4cf9c90cb2fadf67aa04ab6665d066ab6509b WHIRLPOOL 39a720764fa5c90fcadbe23165dce438f3cc34367c76f7bcc6e2da0c485a8d981d5bd23484f202d7783d1309059d9ebc6ff284370c260dde32a8a6247300c490 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_fr.tar.gz 2815365 SHA256 cee84082794c108af533ae6e26060114c515918ca7a738000682df7676a30923 SHA512 844c2dd44dbdc247d15ef65f82efb5a17b0a45ef130210c645f86f8d62b921fff79be19de1081de219ec0b69b3fe8ba8e95ffa5d1ebe96f58a545caa3d68226d WHIRLPOOL 8df592d5ebd10da688074af661e7c4deab0dd4d09144be008fdbd40e2b4e6f78e358e8cc7b583ea1c92891a76e251a3229e8363415d2f126197492f722349bdd +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ga.tar.gz 504140 SHA256 b5074e8109faedd7d259ea35ecf186ae0ad84014334180c745e8391f00d65bbc SHA512 b41e1ace0f13a4384a641656c04f656492ce5389b49419c87327c930af8393d625790cb7b4b5ccb7be5330ba2cee6b04ad38130c96fef01c56328cfe624b045b WHIRLPOOL d7ed2ea21b3596d822a5a21f39f61534cbd1853c3f26721c9a04fc59d5d7d7d1679872f25b56390b184789f34f06a7625350a81586127b360d6d016abb03acc0 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_gd.tar.gz 1083914 SHA256 6ad4f4b69af1a083053661150669662948ecc4b27f1553517002e376385c67b8 SHA512 2b44f9fce471394422c28f103c0eb2c3a85e00534f7774640de6266e67af23c3048fef921f19adc1ab0880949e7e2c1b7eefff7de79bd02c3b8ec7ffa547e081 WHIRLPOOL da4f97f3863c4d20d3bb6435a1134a36a5189b26efb9fd4293580487e16951a0805291fd8a5ec1ee1068738efdf2a9b4f91140e790eee0a31958c659c987246e +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_gl.tar.gz 1052917 SHA256 0544835157357dab78da32b1dc1e4edaacbe9f0046b686791824acacd723e04e SHA512 1a1ec2269b6fec8292b32e2cb0f71559064f045a244c51651d6817a66128f41b550bf7daaf05766546b488f443f7bbc0468bef23c7379afab33a2903c1c09357 WHIRLPOOL 32b6479ceccb227d4534093bac73c9a702ab02f3095d34ca105f4f10ce863ec736ff02427449acc9d806be1e117c8528b036e5f129f5cf5f5d28876e85044ab4 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_gu.tar.gz 1189702 SHA256 8bd7d3c63246c8775cd79d1a26cf1619c3204d13dae9c7db4d04b8f27ba89d7f SHA512 d3a52451aca57078587eb24fc98947472df0556e6a6414d9b35a994b40ae70ef00a4abb59fd40b0e5cde4dcf237dc09832549e5b97f324c0d83a88e4f5764f4e WHIRLPOOL c2c5d4d683fd1f28ec86e13f08279713854c4a851eed14e287fef1ee2cc2d5d50f6471e2eada1fb08ece26d303dad764a08a3bb4a40324c4cbb43f8cc3cc03c3 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_gug.tar.gz 501810 SHA256 78f37bec08d7190a5afef3b9c7f5e08c072a35dc3ff80345deec1ff576e85771 SHA512 cd38dff1fc58c71c170620626c2441a141295630c8ac91ef7da2c5cb75317490ec4740680abbd353271b423ff009aa9880743accde7a52a54869a16e2ec0c02f WHIRLPOOL 8059cda336e84521e4685353468f03bf0dc094cc6df8e1ba255cf3c0fdf85e7e04a9a99d2129751b216b4081ead92f165d8e3264c012d03b29cafbcea420dfd0 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_he.tar.gz 1581239 SHA256 78fb2c0cee7d99de21b44a6ca4548a9e698e88f214862cbbf2175156f43694b8 SHA512 de9187eaafc4843bc058ac26b2ba55d9aed817db488e806a739d9ba01c50adcc862be767a74d57cad2dc9eef763b90b34f710307cac256b689505bb881808810 WHIRLPOOL 6a1ac0d5e98794f79a40f995d25cdf885298664def70951766b9c12b0519b28b1b739ee94b4bda804a0083b61d7ee8c1a87c5ddadc5247831e73a94507946e6f +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_hi.tar.gz 610797 SHA256 fd4d939699fad6b68589d496186ddd5522ef30a9b396dcda8218d97803e71f5c SHA512 b4b4dafded3eb16a0f331c9ae12903a7a15eb3fd5c0efe3d9c21d59e5e889d0f61697a238ca7365e00de2e60c73f598f47474a5fc0990b8527553bf56df1fd1d WHIRLPOOL c15ddd1c8744ab7dfccd8cca670e1fdd5de29d6bcf317d7e03cbd54d3de5ef05318db93603523ddc9097d9f84ece81fa47ba53c102f05b211ac7441ce6b1e80b +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_hr.tar.gz 1256150 SHA256 314324d8dd057a7e21df284dbe48cb10e7e62c11d011b32263de94e2137e63d6 SHA512 4a71430a170fbd51cd2491592df1201d803680baad62b29b02fc1aa0da20b3ff5e2ce72e4257fa0c930dfd8f1badcc06d9ac70c8036fdfc0590a870852ed65c1 WHIRLPOOL b34163a9877793a1736dcccc73eee79de69606c6ff3998341021ac5414275e8ff79eff1d1d9652535266cbbb1a8df53d3af42a12f0f6186c96b103748e860e56 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_hu.tar.gz 2709515 SHA256 a44516cf071e8bbeabee309ae7719becb5ef2dbafb3b2aefaacc20df5d9ab90d SHA512 f2241c0d1f7b28ec895d9282c8b7247e9c08182d96dade97d6fdf784149ded063c2af15086f5ad7a566ba671c3ea0bcf8ca46f8070f9cfda36ea40c0a6edda4e WHIRLPOOL 2ab614c0bfb7a6905486bf92315320f7eee8ec2a483f8452176bb6d8588dafcc30e7dd49ddf23dc50c6b5b7da08d2c05f628e6a59547fa3e3e7edea1dfdf286c +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_id.tar.gz 479166 SHA256 eba952bd35ecd863add69913516108dc20ad1b8f39912714cd79a8de5930f824 SHA512 ca3d48b40a200a1add9c3ec4cbb971ecac2844c7ed4264b1408a46f955d4577790490f3ebad3b9f11ea9af105977fdd7e98f8a3cd3d276d4284cc342ccc8cea1 WHIRLPOOL 18240c861ffd60630bafc4410ba240fdbdc8a267f618d6bb218c47e29c2f2fa1747bbef17afe658611a10f16e119f3b6cc6fc861a984b8c2d7d1cb81c5068204 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_is.tar.gz 1192773 SHA256 817f0fa77954d55936fc7ffeb8e6f0ca8dc9e6bb016d20f980041b18e4e11291 SHA512 d8ce7747a44675e61f840f9bcbb92d45ea2cc6da517575e2da35ecec52a318d6718ed4ea327b9de48bbcec22f805ee93e6a105c0d9d816c5fdfbde28ffe5f042 WHIRLPOOL ca35ee26059e93879d90d2c17a718e77ad5e6f93e348f30afb599246c30ec52c0eeeb2a3be2d8f3d80f3b502a51312c393442cee021e8281df6d1423d07f9ded +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_it.tar.gz 1823810 SHA256 97764d128108176f72811e0222421dd675d70a3cd78f7071784bdbaceef3e622 SHA512 78c376840b3cd4c5baa765dd61d2d25cb7730078856a042693626039913f4d915776ead6c6d8c677fed31688fdb70ecf458a63e93d5953ce30bcfb90d3cb3aac WHIRLPOOL 91a9142a28f6f47741fe19a80224a0f819bbff2fd180c661ef7a04a47af584eb3e8368c579ccf416c91b1858ab886d758c7a79290f1fc148513b6a9b19a9e81f +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ja.tar.gz 587969 SHA256 4c3d726ace6bda575fa605ccaf141a8bda454ab5c7e4f04c228b48901359d443 SHA512 07732cc1466147cedab1cb7abba563285875d682135e45e3f88be5c9611323f55befd14fc60208e5b8f83b545c3d3c10200fad717bdfb574fd4d7fc1ac63eb84 WHIRLPOOL 19c772575989d1468d87e9015f259f9ae0ae0d3da348a983906d92984a1c52abb58cb183c42dc6f83eb93cca81a77e2504ffc783b9800b6cff20a596007a0dbe +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ka.tar.gz 523977 SHA256 9de292cfa3666c67afbd60b40c55d03de36a19075089118e8e94ad9a4e5f6a62 SHA512 7f6fdc60f2080c99c3abc3d845bc10af0a0be1963b58364d0137c81cc0aaadce65e4e88e762e245cdb80b1ffd07cc6c29e9bbe86423677d9a3bb0eaf325f9628 WHIRLPOOL 2411d4c9a91b6a55c9b487da20cbec907f7a7918e88de2a6ba867e5d4e7f067579a359f9e77aa39e98219e88426d1f698b5970c1fc494a3e03283d45995524b2 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_kk.tar.gz 535028 SHA256 9ca7ffc252aac9e8fdac3c0abd45b187611f9df98a37bbbf0c0c39e5a9472747 SHA512 9938385051ee36f4ffc7a7a1ee4945c03b62c24571b2741f4c25e7319b96c0c3300cf321ec2b92cf5ea37716917b42ad68c2a05bc4b89ac43c9afc3c5a1c4328 WHIRLPOOL 4114c0f897e10a9bec2c6823819d5b50bcf7f0ade691137e3cc1d7ff41c812390b042388e3a20ab189e5b5e7291e9abe1c6af71254d60e101a7849e903b19bcf +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_km.tar.gz 642011 SHA256 51eeb68bb45d0fcd4fe78f8dda19245e64d6e29a544fc50ed93c6535d26d5d1d SHA512 e020ff3ce38383ff5d06417a652a6c4604f9169aa8214a9301f718f62edde37a7b4d97b545ce26d87c32dde52b69c1827db5cd1e51801f323beb2f47f1f3dbea WHIRLPOOL 95ca64d2fa67bd54c32656b158aa54b8711d843aa17948f650abe449bf19acecbcfff9d4027a30c93446e09daa4fe058eb0601a11bda23de1bdf3857fca4d436 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 497286 SHA256 46b32a19ba08f15e386cdfcf8d33efaf717ae248f2347073f4c0742a57abd8e2 SHA512 d554d36fc768d43ea76831e9818c1e0b49ea5984b091cd0a9cf9cd26cc913d031e25104a35d369c4560ddd1d88ed6b209c829fbb8a890c859b379f9af95b4601 WHIRLPOOL 22b7e628442272197d108750316b0a733504fa4a6d0ca42913963141f87227928d35736b19a1cbfcbfa272b7e340f6d59f40f7c00b5cc5ca794d253711b63699 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_kn.tar.gz 553670 SHA256 68bfa276bdb8de16954ca61d63e21c4db0e0ba935277d2258c6aec70a1d37891 SHA512 16a3828685a8e8ced4c5cf0c742efa66a9535781c0fde97191b67757a10c33d9e9d236a8c1c33a2ebbe9765176f78f18aa9c297f33dd3ff7d6f5448c39e5ef96 WHIRLPOOL 71a3865ac033abffcb987a181026f56bade6654b7e97b6c4003dfa523e803ee8012bfa4ca413bbc87852be5f30d10358c4927e63e5917a4feaf606aef44d1aeb +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ko.tar.gz 582345 SHA256 a14fab66cee88a20ce4637541c5926059ef1758bd795b9340399d266fb7596d3 SHA512 a8fba149078622e31ec76c833ba03bca326da573b98541183006c7ab472b7ac77898178f6fb4909b91c20929c6df09ac6dd1f79c62ec49b9453a4b23229146bd WHIRLPOOL c9e7dd3d60f570d9ee685b4459ae0b1ee205d335c7c425c555ae43573d275f5174f79f429eb52d77bd807ee5da63970d610c973edb91f8011d8498d9324cceb4 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_kok.tar.gz 538406 SHA256 04f8e5e3a39709576d0bc5d4b81c8546a90e275535583813e7d8e5aa44383992 SHA512 537ab59af4faa89110bc5a4a676fd5ef1b6e9aae09fb5ec42c63ce26a58d42a383b1c81b4ef2fd986e7bcdc0fdcdc0092c43a51fa5d9e3ac74832e29c040d271 WHIRLPOOL 2620e827db0fbde593ed036e884bdb897b0ff3cc0fcf80bffc4263f185ca00eb094ef621f03e6b23b0b9f267bb9785740788d798a8391c1ac871a292792119cf +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ks.tar.gz 517000 SHA256 f36dfe468f3a39122bceefe3cf00f3dae70420195fa03f03c1442f1d57bd7ae7 SHA512 0170d5d56664670a4b2b8e42669945daef0e15086c3b741eec1afb7f2927502237aa9ceb2160c994f874e0e5f17ea2aaa61d25ce7901e16cd857e7bbd68cbb6b WHIRLPOOL 25478a4a8ae4f35fbdeaa68de65f3cf6b98478b9b53228b0baa6e431e79b845d7a9c80c9ef7f77dc549591a68c865f19160eb75709d647aa8c2edd07f8f77ff6 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_lb.tar.gz 471149 SHA256 56bcc354d81f0f36e637746a16fa7030a87278220bd8c5969bb149a5dbef08e9 SHA512 a9305f7b21708c8c7701d887e3b2504be6a63203b867e8be23c154716f40b3766ac55694201a1260d2768e8b5e55443866d4e661e8c928c1b532faaadf02d160 WHIRLPOOL 664477908c04cd7667ad32db46d2a91f6da5961a272b2aa36a375b91a8459df6dfa40c6dc2d13e155163a5d2970ab3c39e4168c4c6f300c094ca3ffec3993056 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_lo.tar.gz 560048 SHA256 77ef2e4cc2a30683ba81f449885f5c92acda433927506b6806f1f34a3f7be6b1 SHA512 a5a8c670615b135e2c54b0b9a91b3e4791a0cc168513c367329de80bbaf8ebb44bb1b86b6eb7720aa3ef1f4204da88233db00ddc619d3d38ff60f5c0e5563309 WHIRLPOOL ebba39e5d7035d976003f9742b88b28d9d3074bfde9fcedcb494b1cdc802818e0340f3fae1aef655a754bba19a3c5c11705b7041fafa77312b966378e1773a0c +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_lt.tar.gz 833491 SHA256 0a778d1dcd77e271e84bea761153074d06e25aa7c760fc2f18c3c16b29cb11d0 SHA512 8b9dba51a0ed2805c3b129bd9832a0c2bc11e69abfca7c1dc5b7da652bbf5d006813a323ce9ef48b8b37da78e6d71ebe8a8c3c30d400802596474917b0630e7a WHIRLPOOL dbfc054cbb6e9fde04d43d272863a589b27878175168afb000c6c2e387e00baa82a147ed25a33c4f715a69117a6d8a37f7a1639e1f6dfc646cfc5cfea4d66fb5 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_lv.tar.gz 1250447 SHA256 44de637785df499b6777c84a00a24b0ac73c7b7499c592942175466c9d20eeb8 SHA512 f9f7b36203b0669708a013a4b8d3183d6f2d20ea79db285f7bf7f4bc286de818ef1f7771ffc159377c76fbb16a24f98ec8a48210b5048dc0ea44c1a34d175ed3 WHIRLPOOL 97940cf8bb056aa67ce78caaf42124ba898e2b19d928c76fd3df4628719d7cd295c38d9a57145e477010e721ffa480d9288e2aa8fdbdfc7ca8b74cdb9cba6a27 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_mai.tar.gz 520909 SHA256 48ee82e6fe095fed75dba73b237860ff322ab5336c26c4f9e3e1274b3f0b87f2 SHA512 f23174e2d2079f7b52b85907975758ccb67c823accd80e592337671975300534c5baf79cc32a93bedcc707cd4d621bc04e8d743da3df58707a010d70dbd842e3 WHIRLPOOL 6df124301ad8e7c98a62bda74b59961af4e2ce9b4c17b9c0c8a8e6c3c80c2bdbc47ee0cf5bb131bc88d5fb3d134f8a4c22ed28de14cbe1f72e83256fc6f915ed +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_mk.tar.gz 520192 SHA256 a7e82236551e18eab6cf70173ffc8c78e49784cf6018663326bfbdc2708639ac SHA512 d466ec33b585d2801dfa49e89a7620082bfc863d3a4647985dfa1aec89ba98fe22f2a39ea99776fed600253f9ac5669ae7d9037602a97c6746ad8264eb9dc37d WHIRLPOOL da798aeeda97d2d8cbdbfa42ab6b1a709800102177d997a6ccfa70730078d1d36d9fb47707715e021713e4783137e7ae1efc8d8bdfad46b48310f1693f8e72cd +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ml.tar.gz 557769 SHA256 5419551ecbb503c8d1b785e1d26560a9135e7042b1585e3625d93e6c88fabdca SHA512 c6873ed2eaf9227908e7dae83fedb8d8935900116c5579c3330fdaee0c9296f26faa40b93957475506dee1c8a063111b517b59261dfd012b7278a5b2e4a0e830 WHIRLPOOL 30a0c703ea3904d0e3a3e14ee0f8f2a49856c4739828aac7626b1baf5855587a013f731b0359a6e28cdd9429fb7b05d4baee9a425d84cabebddaf973348c8934 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_mn.tar.gz 603553 SHA256 352932d7de9bdcb288cb35ddf1a14ff6e86a0c7a5fd61164c617f76fe51cf6d7 SHA512 55b331f78c428ceb9e6698247192e93daa18182f26ca4fb38bc71e6be194658f9972fb83be5986a8cba6e2e9d74b6f32e3588a3b3854d50db5a4d0c9547e3643 WHIRLPOOL 5b843bd46aad62be5b6a3b7b121e2d53882ffc466490237a3a80aa8e1d076f872fd794fcd4e82a5a76b7541b4142013eda36fbe56fbdc4ff74e265c33c776c9e +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_mni.tar.gz 532270 SHA256 953350f810731ab69e36fd2b597cc3a1746d5cba09bcded2525733cc39edd264 SHA512 3e39510043d4ec17a5dc0416a104d0cbef0e2d48e7533b64129737310a8027cd2e9aac36f5a9a78a90d5f0e24d7517a662fd60af0b84fb6cd5b8eadae8479bec WHIRLPOOL 9183775b6a45c7546ab8c6cf1fdec2bf238fefe6b9f3f4e1d5d4e4c8315b152434512b8468459aee216dcbe2f86fa22a6736b9539ddcdf18a442ec578dfb05f0 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_mr.tar.gz 552910 SHA256 e16f866ac7695df6e5407a95d9de69306e43be67a6ad750a77fc23c948467701 SHA512 33480089bd3f70620468b3ba59c4b799aba3e5769afe6f488a3276d8b44ba03d2ba47bd6ebe82fe25dc5aa3f8b027aa208675f901abd3c9aeaa68481a2628ea7 WHIRLPOOL 2a558f1864e2eb438625bc00af7c12cefc6e105f690a57488005e5ee08f7dda1951e0ba186a6d132e147e9419cfb1d3bcae53500ebd1e7fbf9b67e44787b4f12 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_my.tar.gz 552047 SHA256 123bb954249caa0ec97263e2cb7f59493db73da9ab0a9c165a3b01df6eab41ad SHA512 80c45af51e900f2720d21fca5d39962a9f92d790fc88525e5f13c57540611e264fd7ea6afcc3c0f09ea22cb0c0669df3e733ed8db9066a3581f79f9ae1b3bdda WHIRLPOOL 04ac3dcd7072277bef6032c64ad4995de2e6632e12bb0bfdd30ba79c134b5c9fe35e84eeb5ec51e227e99cb01d741f0a14326e57cb3547661aeaeb96a196516e +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_nb.tar.gz 3484170 SHA256 e0fc3286c83f04d4688858643f535d4065f8d122c3863a0be1eee8f3fe9e259e SHA512 67f8fa7701ccde6f015b28bb7e950744dc7f278c9970fcaffc7da1e056d5a47ab23fd6d2ce0ecd34110db7bb843a6c992c1188c40b8635ffca9ab2aa71abca3e WHIRLPOOL 9859a7dd1c57f3fca5ca904f5d2cf36129ace5f2edd8183a449977b93fff2de3ac819ec4d816cc8f2a17d49d4511908dd1f94dbb824341cc7bcb7492ecbb0b6d +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ne.tar.gz 920511 SHA256 ec4d96fc8b94cd982d3c1dc08081d62a01cd754ee241d381b70323f89b09b2a9 SHA512 c57bb23977aba112d439d774de39d7fa7f76815db7e6174379aeecf5e7c12faa9cbba4c517ccdb4487b9bfd3b3090e7613bedf0e66ce55947b3de75eab0ac5e9 WHIRLPOOL 9378464fd7a6b6b61cdc99f5f2d238749a221c9af3bfaf44c57cdcc5df7514b44258678176f671fc14c7e940499fd844d1f3c68aec21bfb8e2e13e7384f45a44 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_nl.tar.gz 1282023 SHA256 5dd3ac73816ed6db2a881d2ea1e7a90413b492c8ec68bd316382ff2e1803ec1f SHA512 a8e9a28c54488ccedbaaa4ef201d4aa5f8f7a2bf49ec184d757e0ad8101d0a47284e9129ba107c0475445790f0cc5d685641c22e02e37ad17297a60c7c67fcb9 WHIRLPOOL 98322776693249842ff7a77ea305783f0692e616b05f26ea435b05b9f8a0761d68627ce98522ac3b4f165c5c977c6ac8e610f482b1bc998255c77eaee1c9affc +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_nn.tar.gz 3481366 SHA256 0326451b746f42062fcfd76c8f82041145b1e66a6ff1ddad14642a3ee8078070 SHA512 2ef4591be5f64160be5e19ba1b62660c94c30e7ae19e4782fb339a098560a6be1f99958aeb63abfabaffa9c6a44cc3c70b718b4e80240ceb0044c1c9a9016cf8 WHIRLPOOL d4f6d3c0f056b7407ded8cb220f57cdd1450d47af1de8f918143e29b072e2181d65ce855e07258f763127eea97a93b355c847ba3b01898dcf6e42888f6788673 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_nr.tar.gz 496401 SHA256 de9e0f468e3e489d8b1296d60f721bd310b859eea9d486c389ba59798b34b47b SHA512 6cc7a2e656929af4187141054557025cd27054da4b83026d5e2f6b52726848f3e2bc432423d9c54a674cc8ce78bcc2f158d0f8073ae998abcdcabd102969c2c3 WHIRLPOOL 7990cec33c188887cbc9bcc7edd2308f5ceaf4a4991a1d4991d56c90172c03abe3acc1bad750e8bc9e804bc75180ddab8b9984b78307e59c518962607155f7f7 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_nso.tar.gz 492157 SHA256 339b9aba85fa76d2f409e51a271100c38a0fa64bc33ce2fd9f519d68a034be84 SHA512 c4a9ef4ce9c6ba2eab201bddc2a7aae31136d0e17a3e61173b08abe79eb2a15f035a20bb1b393a3b5dcffc8d306f5e162ada3e7a4c275f1e7800a062a6103522 WHIRLPOOL e6b4d739c29e507a5ac7df28f0daf42ee6222784a9829c9b5d3d99b6e49a628c2d86ac17cc141538c23b1794758b72a71d9a420b8d1f61f586ab689d2835157e +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_oc.tar.gz 693912 SHA256 c3b86ffaef9006f981e1d5762a5bb42b748f06b0ab850b93180bb9bbf112e831 SHA512 8f17c5564daa10ca0866323925e7301cf9bafdbaa567c06211fa491fe35080d41c6bb2925e6915d67e9a1c111e3b6a18d03f18192565b28ff0505db0ef9b5ec4 WHIRLPOOL 3228a83f652f36f4525ffcff8df5bb46fa45b1e0a3d19ee579dcc04e0dede5f4316b3a9fea44eb62e3c5ce2972ac7c70f8574061b49a93a91a2e4483e8b2a45a +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_om.tar.gz 485936 SHA256 fbd723e0619e65d816c1ff5f8ac6d90aaf2f20b51ddb6f9988f6adf8ee55baa7 SHA512 c54980b1c7bd0fe0c78f608c50fd6d8859bd101317f1ab7ab1bce5bc35d1e0b3fc5ed3aa968c09dcb8f8b8a46bc4cf6f673e959fa7c868fb1f9fe50ad4c60d5e WHIRLPOOL c080530865bd35b910f08be17b08bcfafffddce575df0b8a73fcc27c7748a435f96df11b019349a17119a2e382509ffdc9648c292b0b117ca11ed790e8b63c36 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_or.tar.gz 551295 SHA256 a259aee2e3270ac84781b21c7facbd77dc112c81c1a366a0e908b9e02c73992b SHA512 c0eb310d7d16dce6503b75424047e0095940c73dc569279a8ab2b806ce4b1fefae2c294e2f2dd02b5899203715f014fec92031b39049bac78499a399b575c74d WHIRLPOOL 3c36ce181c9455be486d3add298688e05a3b4a6d18573767dec93ca60562be2bb4c8345bea26fc79dd60c1b96abce5670feca8cea585e4139f53760c905c8811 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 523805 SHA256 9bbb867467c7683f7b77aeb2b0f515065a153c99f433fa3d479a98bf082a909a SHA512 53b7d1bf1603e2720c03ba686bb43bc8b4d036d2d145c0c91ce08986d624194512f4c4f9f7a518cffecf6b5514590c1bcedf6833734326549d0fbe1c6ac5e56e WHIRLPOOL be128846cbebde30aea5d6eb9d4d122e769e571669c8d9a75027c97da1ec00c53dde85b6a41e1838e3f55d86933fed581b0e8b800ec6d05934ae0eb1ffdb579d +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_pl.tar.gz 3277581 SHA256 4ce68bfe84206d2b1dc42e00ac704796a475b07a43650941a8a51de6844f47a7 SHA512 3f050f0e92054fdded7475b4b72dbd16243c19fbcc833baf72ae06d227e0dff2d06dde4ccbd0f820c9f616cc6201d0c6af41060dd8ccb4a2f55089cd6c978f56 WHIRLPOOL 5859e257db6c738d770a609550ca2093314830eedebbf7ad223f036d66c48966bb7a9f80f6c2b01e20e0589fca6609faf64782b8b1a73cf78e92f8f99c1aeca3 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2574415 SHA256 5f69c5a60cf854890350a333599c91e80abce8038975ac4120e23465fcb55f0f SHA512 b903c4697377b216bf4bb2ba9a844c69eae658d3786a19ffbec20570429b32b4405538553745b5f302910dd71b48d2c14d4a351b59d6be5ad6292ed169ed9ed3 WHIRLPOOL 18e0bab7e11b9667a8ce920ce4cfce3b4adc2517561a81745639db5ec1231f0c491bbaf740c466cfc40321084b089b23a0fbea166ce44af01a45919dda6dea7b +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_pt.tar.gz 1128220 SHA256 22449db1d46a9cc818201dbd899c2af98b52f13e1f30ca23d8dd1e7db03fd194 SHA512 d1dce159ed0a586ea8495801413b099f3df2506483227c8521f79123d4f511477c726bc7fa57e511e807e66dd5e2d7b3db2e7b7435d11d006ba517e5d5bc2b8b WHIRLPOOL 95ff2612bfac26dded569f61c98d36eeb4846967988c1b0e3182c212aafdf1506e126de1ae966f4c77f08989c20680fbc9726075df91ba2c9e27e5059dd51dbd +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ro.tar.gz 2361172 SHA256 f278b6103b2243e406c004e9cddc97fa4f139f409e4e3c472e7fb9f093d88ec3 SHA512 933f566459f15ea06537a8da53d12a9f149df8239ac2e3a1be2dfdfac96a3b78542f3a8f391c1bd567fd6c8b22d87740b3cab313ca04e289563835ece7589fa2 WHIRLPOOL c29d730c6259131ea3be27beec1c5178fb63de48879dce7f4ec49c967ca5425f58e0f742e97744d96a4a27441b00252458f1011b91b66ca7a946b96f0022e368 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ru.tar.gz 1649671 SHA256 714042397b095220c6c90370ef20b34ba3295f5132e1ae97a1055ab9159a7407 SHA512 3cfdddc9f238d1e31838afd64f8afb5349ad29a571ec32b8e378a1f2f588503a7ba6b1e965dd4f5b008f25c2dceabcda778bd2b6ef4a95ec5e973ccbb5207a64 WHIRLPOOL b168beeb5de643150acaec89b703fcab4fef50338ea335a954a33d467dbbb3cfc4f1081255eca3c019e5febf63c74cd4da901bd9d86b442082d7d05a4bd6bd21 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_rw.tar.gz 489016 SHA256 2d531e6477022b27152c1b2b43aee7ce03d0bb93ee4aed10d72fedf4546fbafd SHA512 5f0653da1ee4ea36831803850e673e9c547099e6074c6320d5712e402570dcab4c43fc617c4a4ecfae8b44b62f3ecc46be7c1d7f9ac1dd4bc8eeb333099fd864 WHIRLPOOL 2c7e67fa7f96e2a66ef58f04f1219f4731e64114eccfb51bf7bc3302e0e238e5d388f5ae55ced75baf6e67051585d875bbaacbfd256aaf0123e4ec7cc2054eed +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 539211 SHA256 fa69bf2328b90a617aa436133881ca044af38219d68d86b87b2f29cb59d8ce99 SHA512 6b7e34a5968519389949c15d9a3c10d8cbb12d3f50db77e6baf8ae0bb1a1b19333584ab895edbb051c1d3af68b3e461bf56252fd52665b81d1dcb0481dd3b278 WHIRLPOOL 80d5d875e828aaddcd471ab32eb5a66f6d825eb5d71e4d59db1c7de1edc569a45d71f8d3883fd02350faf90f6d2cfb50d0e198c0081e21e52bd02c7463bdcd1e +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sat.tar.gz 581778 SHA256 ce51ea2167743dc95644af251287d7a3c638222eec6ac2836ab1962249efeecd SHA512 15f18892ddd40007ba51f73258a171ec9141cfd232cbf8320cdd4d94ac06fe2d9ac5132caac385e4ca4266880491f3fa69bb80eedbce8c8e61de321c36e2e44a WHIRLPOOL 943cfce43e0eaebd2fb27fa7ccf477454fdf73584e5911eb5dff5c0922922d4f6f992d2a6c0097bda5b161552f9bc987af45b5fabea081dbefbb6997a229ab0c +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sd.tar.gz 532270 SHA256 be2edf68a6d583294e252ba6c9e1e1452beb171c05f33d2543657906e308044d SHA512 de3aaa88f5952b9ffbad0769c161d30f001ed59e35089a8524b73746a7b876d927af09cdd62c2fffb0ff6d8c02b176f8094314ffcfa355d24b18798099b39f98 WHIRLPOOL db4014a05c449bf0bf14f41e55fd2988803d5fc0d84908745479b26fcf3f71456a9231a2e3163700a91d23a24ea96b65ac6458bdac2815a6607ae1458e12e4c3 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_si.tar.gz 822517 SHA256 a36e8784dd7ee49159d3a4a23637d5b8abb839d3545b761b9eb0387ff61b8839 SHA512 ea6167e1467bf615baefdf1f8872954b7e002589c4f43d0ddff73d73aef6ebab9b855b38b98a5747577155c471c085f3d803e36ce2440d74c6fda25b57a41c97 WHIRLPOOL f3608a7ec90c1055a9222d77691b494d8a8f863c95a79e34737345353e25407967f7f7a3659cfcffb505af10422ebe713a7c732c0fb674d6aeee61ca98a89c60 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sid.tar.gz 492527 SHA256 6a214f994b0c647a5787fae4516f929332516f426f49821559f3fc31621a4df1 SHA512 5b74a5c17842a9ad803acb248aa41a61177fb5c58edb8e5b2f7b109a90b2357160dee6e3709f778da388d64a03f9cd0354365425d684e2ceeeb3704e71fc7e3a WHIRLPOOL 2043a322f748ff55075a2039deee1c6c91a3a064b4ec574529db82df81ef2f1f7d42d5b31ca64fe6d18b046b81f33c71be814959864ea0d5d39271341224feeb +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sk.tar.gz 1781594 SHA256 45240e3e926b2124dfd228a373c02d397c21ad38eaad059c5ee96e1000ee8ff9 SHA512 cc5195f3379d978a0c978d5b3a0385150ce344e1eaf782745caa82be1794c02e13359c4549c03b5000e47b14741a2838fb8d2fa439c39e574fec01de9a89989b WHIRLPOOL 86a472c9fd65d2b0a8668b12e0354d6f835a878b33c9dedb9104df265495807bab5b95e8ace88b3fdb99bd3519b5b07f0f1c071a0ae81736ff07ddbd66d55792 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sl.tar.gz 2147290 SHA256 af0133bf89ad9935b4227a3cb4fbd277b21b70a6b48aad1bb26e91f7106d7e12 SHA512 6d51e92c38f4231644093a6ed905bd0bc01df03b6f786eec8b53b882571796c79c2843466f127da41383a0e6b365a260d7bbd8e0d32dc548cc169a89757159c8 WHIRLPOOL c503adfefd96dd76a6b5d20c143bc425ebe1bde97aa015ea72b4537a047b24fcf9eb53340926bb37a2faa39fe8775f786e8c9d83c858fc5d7956fed714cadc06 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sq.tar.gz 507369 SHA256 142bb5cf9cde40dd6263a3e00de49fdd8447ff9037985d6d4ffe0c443646e156 SHA512 31bed3d7b0834e4fb0d1a286be169229bcc2136c5ecd77c18c430d7ca04b3641896f60ade86222e00d442a85a23edac1b7f345ef4f68439107af4e6943d2bec9 WHIRLPOOL 644e1723629f0d28e9a9d2ff63d3b83cad9c38ee7159f292dbb18b2947becac7693f36495e777ff4b8ab49e98e79eb50cfb8cb0d3e3984f5dc04d676d63b6e83 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1687515 SHA256 b21ffc4b043010251e0d7663199210d4ea5acba82be51df3759bff3434fcbaf1 SHA512 0c508decfad4003d530b5482750ae1b4822adc51b02aa38418bd1ed655ab5c96e456d33537fcf56643ecb5376d6688315f3dfc10792a1949212cfc694fdbfe43 WHIRLPOOL d7d5671e7e493d97f930f59fa4bc1dd8312c8c93912f14738f8a6b9a520546c227c0cedfa0a56056fe30798e9ae3de7e518900f18cb7d59ee86f17e43fa60fcf +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sr.tar.gz 1716605 SHA256 52ae3b5c60676f1dea6a1c4924967f7bcd257d0757351b14064305b94705dff6 SHA512 4914acc6f11c1c38c1570c3c7065840f703f1fee75aedba070512b49aecfc79d5be799b13e58b83830c92e63fe0fb74504e2218dbe65fe9bd0e95d10974e81f0 WHIRLPOOL 728e36dc1a2d718040f16cec9e71ee894542c76c9a5adf80f784595155d107877812d26069f6f88ce288b76015ff8c8a850524b571f0b89f66eebec058aac753 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ss.tar.gz 493100 SHA256 b2f0dde3617731a27f06898047f5093d3e3df359abdde47b0a42e0a29a17cd07 SHA512 4f7cfa747348e4dac1f4ab69987ec2ccea43995181cfdc575d6b5876d9f64ac7f8014a38c3594c70c0a4f9946b4e537cc8af6be56ddc72be3f91639c81cc6a3f WHIRLPOOL 2b5e38b7873d39ab3e1fc1a5105ba6f38d0bec2591af55086284048106d8c23a00fc4eaec6dcb8fa36496342de2d92a45fa4f78eebe3e4e9bc9435fbd15f4ebe +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_st.tar.gz 492615 SHA256 6486628cd51f904c0ba4e6b64967ad47129e7417d41ddc9f78af8ea470fe4fd0 SHA512 8e4f65098fe5fe9b3b3e1a0a8511b854623fb91f03663593f1187a8087dc7b16968d1bb49dcb9a19bafe08edd25e1217950e581362d5d1549a59fa42b787658f WHIRLPOOL 39ebaf736bb52f551de9e4c620b1772f727775d662b574cd9ac7facafdcad09c326b78c96b5d570ec58bad1ea0d1e96241e4c06cf0e34fb62ee020b683620898 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sv.tar.gz 2361958 SHA256 49a45483b60e0d826178e54d1c29dc9bca787f3e875912b7b483214fabbacfa2 SHA512 29bc82e70f73290ce5c01e43e8dd24d4c264d07a88206686f814fda51c55702b64a0cfe137b92f72e0fa6b2173874646c0c4d4f754bb11b849152fe94aa7f0b2 WHIRLPOOL a3357a14ed59ff89bc235d6b4279697a1e0a7061eeb93a836a1aad36824e7598cbb414a4732c7b55463819b5073653e3a0704317a076bc22ef6707053ce28290 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 479450 SHA256 6d5c74b172e810d62c5955fced012b9c78197681ca4f76b218b3b4c3051ccd76 SHA512 90b716f2ef8aeb72ad365146bc12ec71f81eba57c201b39df8a5ef1adc7f801158c730d8d26126df4db1d550c720086d09d616e605e5c401ae49e5b5c8dd8e87 WHIRLPOOL 3e8fa827e324f869d31cb535b9ffcee026bb516cc9efefc89e5af69c8aed494d236113c1bbbbae5543217e84c7aec657faa69406fe7cfef07dcf07de755f0e1e +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ta.tar.gz 547446 SHA256 86eba26bee1dc7d09071de99b874e2c6d7d8168a905285651ea90cdd68ced214 SHA512 6382056d9b9bbaf9261debd3712cf8d9811ea67983a75f534673b2c03cce77649e43811cb91acf89437bf694168d573a20cc0844e2a2baef9233985455e978f2 WHIRLPOOL d5de277a053bcf77d108eb72d68af681194ba8b7d61a80c89bca9da7960b03d656d1942d8f3fa4ac330f0a7a2e85a26499e6a5cd2ec01a98c64f3bc60e79c9a1 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_te.tar.gz 1104796 SHA256 2fd85c073f65c318b3689d5159310356b1f009a1b507097d67b82883c2c89793 SHA512 f7953e371794a3f824281b0e162a417b9fe386f6d164b57d82789f97279f2b58e09f5be4692e7e2e0c3728ec788a70132d4dd98a856082f541b0f055c006cf44 WHIRLPOOL 7578cf2aea9a46950adb159003db69c77e4bb6980585d96205ff94724eec3b11bbf68d31994f77d89f24f492a60f912ec4cc46428af3db779dcbdc16bb594e16 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_tg.tar.gz 510794 SHA256 a987b8361beb016d4d2b3451bf191a1b548f45c8301881d44a8a93f6561e2a80 SHA512 1f38278eb49944f076824af2a05859d8ad4a6330f3caf22af98639d02201e881cee8f266532834291cfaa788384e0ba6a61e81dd70a2e07340ed29e7b34d2ebe WHIRLPOOL 3ce1b3475a4e52f2367a50a5030018dc47e10b8ca1e47737d81bc208b979bbbf06790e6862da7a06020ae3e173f26261dbe9f9cd142b8b36da5ddf9627c446b6 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_th.tar.gz 691299 SHA256 0608ec2c639557ebcad0873984ddd2902dcbefee78e1664c0f80f3fbdbabd056 SHA512 42f864acc404d2b6b2fb061666e5f6e611bc55d66fac68fa7635c005e6d50a1ba59f2cc4d4b00781c2b4b538c5485e15c92e5a9e118df2437549e1260eaf33c2 WHIRLPOOL 37eba697de2c5f374169fe9fbf8fbab0df6cc983d6cb8aa27bcf853ec7330b483cbdaf6bd705d7354a98493bd24ed9e7eb84793235c7e6c1e4b9d15539163f68 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_tn.tar.gz 484727 SHA256 5316b23d86a07d1ccaa30100f816619a3d9d6a95b9013f7cf5f979ca8d9768be SHA512 11a52e198c93298da117c5b6869169405973dadf99a8c4c72f0a9ad0e6396010ab9f11579495665525dbf42a4ab8583b51a95301ae5d6780cbdd84624b023b20 WHIRLPOOL 43c23f07094f91e522a1b426e8d1c54bb7e557022e43d3d35d6ff536d1cd46f2493c66ab9963fe57f2a4902837f6a2baaa59ec72f1d4fe9049af35e58056638a +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_tr.tar.gz 532760 SHA256 fe39b86fb56005b81235df861d39f2448bad8da680e2667c8b31e0cb23714237 SHA512 098ee5eabcfb32b14c9e20d39b8ea4154d59cf99e1fbb8ab5f40d9d581ec565d1f6d7f2110aeff544dc0c8a6894a0346f778bc18ef05af6ee667fc5cad829c9b WHIRLPOOL 3114c44257c522ec27be9c1cbb1277567498e365bb76a5bf067ce9532ed9e7f7c19c25c8c452aeb7e35270d0ec727830f913aed5d342de2b15d7190a703d3015 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ts.tar.gz 494625 SHA256 3f3be1eaa746db59ddbee0fc55dc327a79959c32d30fed3811898c06e1b615e0 SHA512 7d684ce3721badc3be2536588dfa2e1ebff6659d0428b13b958e8611078723bf9ff7c705a582e59788ebfc0ec5a05260087a99f99a9f5a17563d0a6bc324566f WHIRLPOOL 6846587db433bc4f447d3ed095257cb27410616ed9ae7689622c2e550d71fa7a3ac01dd20c112aa32286358678e5e047a9cf14c0fba7193b08af5c80c3888766 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_tt.tar.gz 490761 SHA256 6b297e9781f58df99131aac03485fd7f432e91254a221dcf993e40d529b14d0b SHA512 c6caba43edf0d70eb6633de1e453dae44ec290fc7efc63f1498f762f29e55a8f6ac5d92369f6b0ef11d3989adf52bfee720a88cdbd895c73936e13974a80c3b0 WHIRLPOOL a91cecc900d83bc6b62342fe1c312c3eff419a1a9aff4fad80cebeb031fad3d2b3b3d6a356434b9e595e572cf83c3634ab9e1e636bdf466fd59ce13942623460 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ug.tar.gz 522706 SHA256 f6f6838dd3c02de249ab681958413b8624c7d31bc486c7eb1296bb10fb57594b SHA512 ac332bb3161627f985ed5390c85fecb2e498a76729b75c11f89497038ace41098e91d98a030567e7d59a685d8d9230ae89c05e0d6e11310257b51e5ac2afef0a WHIRLPOOL 032ede689ffdb626150a0d263437ae66b9b061c31a73cc904935e76154214a2f2824cdb2f953ad146081de2f8abbd4c81994d93d9b5515cf1890daca0a68018f +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_uk.tar.gz 1372547 SHA256 9d8340430c9dcb6b6d576fa7a4c67398b63dd137b1ca416faa8759cc16d38801 SHA512 0343df0cd4e6bdd7c21b756cbf4ccc38934431e764ae62026533ac67914160906a6ed84c91c9e3f2175ae17d1f232d22b317893971a7ac995ad634aca273f59b WHIRLPOOL 8a5cc348d2ab953848833f91cebe075397269d074a2ac963285d8d37051b342d7432dfe55e2c70df5a14a989ed50183c3bd92c023762af0e78791a9017f2807b +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_uz.tar.gz 484659 SHA256 240f77186e6c773ccd14c2bfdedebc76109188dbe54f612432d9fa58ab7fec1c SHA512 a3cd34493183bb2fbee174970fb064042e378eeb4d77dd5f64edfcd9fc41be894bffd20517a52eb4207fe45814d4a2cb5e10e3c69b87cda87ea7eee51bdfd137 WHIRLPOOL bf1ec6b33ed4d6d0255e135df02214b8e78cd9aef9eb732509b1c7390090f77b46dd4ba2953cf51fb83ba0b9a721fca298d0cadf91988056feee9861834e4d62 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ve.tar.gz 496730 SHA256 c040ba6ea39315fafce4ddadb955a9143a39107a16885b80dffa096a08cbcbff SHA512 6465556dd927e673a7b3b52c723281b2b2df94f368895cc3043b7ac3a50549dcfbad83db2ed2066a5f5d54cf848a839e9dbfbf3075a559869d97c9ec7d4af77b WHIRLPOOL 39b0d0c63dc66ab19db24e5ed819c02d1ef502865fab93edb6a5787419a9d38d75b70720905e79f2cfe910f0213dc1e89e7054107fe692a7d2cfa7064b4236ca +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_vi.tar.gz 524142 SHA256 2a2e63ab4083b0995e10bbfdab538ac1c9467ce2cc125bd05095443cfa67d594 SHA512 0709e46b0bbab59d1eb106f37ac2486b93e7a58fef29c8d5aa6be3b2e7846190616fddc3b1ff67fdc228b38b1ebaedfcb94dc69ec9b6b311ddca36e842b258d6 WHIRLPOOL a7c9ccb6221596baf4dc9ab99d76ed8498ea3f9ac10e159305067e900b69c3da7b768f9b5eac064dd969d5e391aa9cd78ff1a8d1893a45ce755bf3656aef702a +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_xh.tar.gz 502094 SHA256 dd3a23ae0122a7757f0daac83425432a4e0aff1ab98d387db7547b62804c0ed3 SHA512 b8a7471a9faf0f6de102a3b4867a3f68128a7b42f78cee714ae2dc24454a2e3a22a9bd08ddfe336e95bf00528fafdc72925cdf496b3c2d0ecc2ea1d908c33479 WHIRLPOOL 1d7c68667f7b8984bcc3b12cd603341ffd50aec3167436332c0d90d18b53ab03e1d3ff3870a31b52fcadea3af2e9d27a0b71e9582729823ef121aa80ccc595c1 +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 572232 SHA256 7cba01645dd6c8f8caac196ed11b57ce2e96170131233ff49eef85ef3f6758df SHA512 cf9a9cd3e000ddc6f925d0dbcf59daaa5721344b08a55dc3a181b25c9fd4c2a27a104b77c0ed69fb40ac875f9b4e4565a8d04e4e6b18e030952bf86007d94a0d WHIRLPOOL 5f15fb4f43017f10c2e8ce3157bb9626496983780e15c89e42fdec9df07df7a0f3e3c7b4301b686f03ad014e8f818c5093543a56bf350f99156b14aa8561599e +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 568879 SHA256 4a3df5838145dc076882b34acb4ca498fbc337fbc092ca1ac25ddfda414fc545 SHA512 ab9a7375af460ff51e71b2a4eb32c700146ced309cf69affd7b32d41cfba07649516c2b7495c03ac516b595ee549d92839e3f9e4deb21612777a5025c87e2ca9 WHIRLPOOL 0479eab1f6b164271605930068fc6be1aec38abe97fbbfa6a2636dee0b2093e6792a3d01b6ee8e2d399677f15ff284560eb20c7cf079313e2198ce463f26bc8b +DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_zu.tar.gz 503399 SHA256 37520bc730ef06985c154b2076b8898cbfba2049210177957e4bf5906392a88e SHA512 e5017abdf158fc63e42b6258044c7c54ae771862835aa56e43243fcdc284657c87b6fae3dab9ea5bb278ecadb1008413ac214eb66688267f73218c7a3ce96503 WHIRLPOOL 665b755c6fcca4ef01d16114c0b5be9b9001a1a81f339c40d45e959c9e0530c5cbff32c0bfba8d3ef71a70eac91764acef4a47bbef953b87ac0694262949fe0c diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.1.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.3.2.ebuild index beacbf0064c7..90fc1a5d2563 100644 --- a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.1.2.ebuild +++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.3.2.ebuild @@ -10,11 +10,12 @@ MY_PV=$(get_version_component_range 1-3) DESCRIPTION="Translations for the Libreoffice suite" HOMEPAGE="http://www.libreoffice.org" -BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm" +BASE_SRC_URI_TESTING="http://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm" +BASE_SRC_URI_STABLE="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm" LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" IUSE="offlinehelp" # @@ -26,13 +27,13 @@ LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn k for lang in ${LANGUAGES_HELP}; do helppack="" [[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang} - helppack="offlinehelp? ( ${BASE_SRC_URI}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )" + helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )" SRC_URI+=" linguas_${lang}? ( ${helppack} )" done for lang in ${LANGUAGES}; do langpack="" [[ ${lang} == en ]] \ - || langpack="${BASE_SRC_URI}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz" + || langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz" [[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )" IUSE+=" linguas_${lang}" done diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index a7c9abacebff..d8db86e9d2dd 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -7,11 +7,9 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab0 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0 DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6 -DIST libreoffice-5.0.1.2.tar.xz 167364360 SHA256 0751b9caebeb54e2c6702a58aae66a29ac59414088ccd4e7d84625d02d0fd21a SHA512 d58d104705fd80425a00ce61771dbd4bef74cda20028fb2afcc1ea44aa304048b8e96bf654ecc2619362a09d05801212bee1e9bc9c80e693c986021a55c0e725 WHIRLPOOL eadd72f705745632c05efcb2e4c85c3440be18f16f16805f241a653c39f204145a10e6e2cbb432d3a4801e652affd677756ee1f6cad1db120c5ffc47843a89f6 DIST libreoffice-5.0.2.2.tar.xz 166869100 SHA256 01f0680709432039762fa608bcb1240786d2b6549099a96095aab92dcebbc176 SHA512 7a72ed01b0f9fc131b7241ea4d1bb70bc813752e33d8e823e91a769d77308d2eec2d32a0fac61bdb41fd605a6f91dbaa3d5478a0b150e64fa9f7e47724f46cce WHIRLPOOL 85a592a0f478b1957d22d932adee758d48084c0c7ee00c0549fa8c956fd30f5eead09f6fc802d22d9613bda8da0c708ec99fb6d10fd82e0922c6da96a326a14c -DIST libreoffice-5.0.3.1.tar.xz 166989184 SHA256 5502477772d6b986fc0486e7ec4e1fd7d99796f9bf63610d4dec84d77f165585 SHA512 0e157f2f126f530dbcf4849a78ce04e6abb92aed3308aae5d0b644377afea572869660624ef4ceeedcb29eaefb3c9e6defd1241a4e6be931dd39a7286325a288 WHIRLPOOL 3074c618bf98f88de6b21759c6b183e2c836e0f1577ed5b1af4eb2cd1de71b606abc151a29d2f491f4bdfbecd1f6df9eb3f21252c81205c4edcfbd1ae9611619 +DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538 DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49 -DIST libreoffice-help-5.0.1.2.tar.xz 1884112 SHA256 c71db94564307f4bcea4d556a37d5ea946c87007fbf03fc7801fbe7bc197e947 SHA512 edea7ade0a4a742788b8ceba627e9afe7ed29b4feaf6d091023697fb676421ee0a191e592991c6627d22ba7a41af2d847b188c23e42ef25f1067533b5d2a80c2 WHIRLPOOL fc54629ee68f7c22ab07295b2569313a129f63850e67f1f3bd50bdc20a3d494ad48ca14f14f0a440fef78cceed2117ba31cac0930ac5b0382f285a31acc77b86 DIST libreoffice-help-5.0.2.2.tar.xz 1882964 SHA256 4342a5593ba8a33b1d63549f256a4127a0b51cc1a53faffdc2708f04fef5f094 SHA512 1000423578211dc843dcedb9f864634235ab09d5234f8d8fe2897065207bdf6cd3bca7cdc1b3c012de0c78b585978a25c0df5048779bd0b9a734c9160064e313 WHIRLPOOL 8b92bcd19487c1c286a477ff0dc1b7e6bd9aaf862cfe002fadc25d461add4c4f2f8ee1e45ac0426dc2d27a6322317cacb7f65e9d0a6e6d6dad01075d18476363 -DIST libreoffice-help-5.0.3.1.tar.xz 1882408 SHA256 22187900e65408f03ecb0a6463d7587ca27e32cd341d9ba0e55a99d8cdb3bc45 SHA512 25bcc9343b6df145618e6e6a6427173418243bdc066b447764999704ffae2dcafa1a295828512aa3c8362e9a843267b7634d6b2c268bb57587fdd77c03b37522 WHIRLPOOL cce758b2a8d66218bd94c4c66680a847cb5a0b9583798e8252acbd491bd18cfca56951fddc17ae270f69423346a7023f078d655bd6c07a51abef04887e0c4d51 +DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac diff --git a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild deleted file mode 100644 index a8bb49b2e41e..000000000000 --- a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild +++ /dev/null @@ -1,607 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_REQUIRED="optional" -QT_MINIMAL="4.7.4" -KDE_SCM="git" -CMAKE_REQUIRED="never" - -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) -PYTHON_REQ_USE="threads,xml" - -# experimental ; release ; old -# Usually the tarballs are moved a lot so this should make -# everyone happy. -DEV_URI=" - http://dev-builds.libreoffice.org/pre-releases/src - http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ - http://download.documentfoundation.org/libreoffice/old/${PV}/ -" -EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice" -ADDONS_URI="http://dev-www.libreoffice.org/src/" - -BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" -inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="LibreOffice, a full office productivity suite" -HOMEPAGE="http://www.libreoffice.org" -SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" -[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" - -# Split modules following git/tarballs -# Core MUST be first! -# Help is used for the image generator -MODULES="core help" -# Only release has the tarballs -if [[ ${PV} != *9999* ]]; then - for i in ${DEV_URI}; do - for mod in ${MODULES}; do - if [[ ${mod} == core ]]; then - SRC_URI+=" ${i}/${P}.tar.xz" - else - SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" - fi - done - unset mod - done - unset i -fi -unset DEV_URI - -# Really required addons -# These are bundles that can't be removed for now due to huge patchsets. -# If you want them gone, patches are welcome. -ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code -ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" -ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" -ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino -ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable -SRC_URI+=" ${ADDONS_SRC}" - -unset ADDONS_URI -unset EXT_URI -unset ADDONS_SRC - -IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer -+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc" - -LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -# Unpackaged separate extensions: -# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf? -# hunart: only on ooo extensions -> fubared download path somewhere on sf -# numbertext, typo, validator, watch-window: ^^ -# oooblogger: no homepage or anything -# Extensions that need extra work: -for lo_xt in ${LO_EXTS}; do - IUSE+=" libreoffice_extensions_${lo_xt}" -done -unset lo_xt - -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - app-arch/zip - app-arch/unzip - >=app-text/hunspell-1.3.2-r3 - app-text/mythes - >=app-text/libabw-0.1.0 - >=app-text/libexttextcat-3.2 - >=app-text/libebook-0.1.1 - >=app-text/libetonyek-0.1.2 - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.5 - >=app-text/libodfgen-0.1.0 - app-text/libwpd:0.10[tools] - app-text/libwpg:0.3 - =app-text/libwps-0.4* - >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] - >=dev-cpp/clucene-2.3.3.4-r2 - =dev-cpp/libcmis-0.5* - dev-db/unixODBC - >=dev-libs/boost-1.55:= - dev-libs/expat - >=dev-libs/hyphen-2.7.1 - >=dev-libs/icu-4.8.1.1:= - =dev-libs/liborcus-0.7* - >=dev-libs/librevenge-0.0.1 - >=dev-libs/nspr-4.8.8 - >=dev-libs/nss-3.12.9 - >=dev-lang/perl-5.0 - >=dev-libs/openssl-1.0.0d:0 - >=dev-libs/redland-1.0.16 - media-gfx/graphite2 - >=media-libs/fontconfig-2.8.0 - media-libs/freetype:2 - >=media-libs/glew-1.10 - >=media-libs/harfbuzz-0.9.18:=[icu(+)] - media-libs/lcms:2 - >=media-libs/libpng-1.4:0= - >=media-libs/libcdr-0.1.0 - >=media-libs/libfreehand-0.1.0 - media-libs/libpagemaker - >=media-libs/libvisio-0.1.0 - >=net-misc/curl-7.21.4 - net-libs/neon - net-nds/openldap - sci-mathematics/lpsolve - virtual/jpeg:0 - >=x11-libs/cairo-1.10.0[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - virtual/glu - virtual/opengl - bluetooth? ( net-wireless/bluez ) - coinmp? ( sci-libs/coinor-mp ) - collada? ( >=media-libs/opencollada-1.2.2_p20150207 ) - cups? ( net-print/cups ) - dbus? ( >=dev-libs/dbus-glib-0.92 ) - eds? ( gnome-extra/evolution-data-server ) - firebird? ( >=dev-db/firebird-2.5 ) - gltf? ( media-libs/libgltf ) - gnome? ( gnome-base/gconf:2 ) - gtk? ( - x11-libs/gdk-pixbuf[X] - >=x11-libs/gtk+-2.24:2 - ) - gtk3? ( >=x11-libs/gtk+-3.2:3 ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - jemalloc? ( dev-libs/jemalloc ) - libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) - libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) - libreoffice_extensions_wiki-publisher? ( - dev-java/commons-codec:0 - dev-java/commons-httpclient:3 - dev-java/commons-lang:2.1 - dev-java/commons-logging:0 - dev-java/tomcat-servlet-api:3.0 - ) - mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) - postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) - telepathy? ( - dev-libs/glib:2 - >=net-libs/telepathy-glib-0.18.0 - >=x11-libs/gtk+-2.24:2 - ) -" - -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - !<app-office/openoffice-bin-3.4.0-r1 - !app-office/openoffice - media-fonts/libertine - media-fonts/liberation-fonts - media-fonts/urw-fonts - java? ( >=virtual/jre-1.6 ) - kde? ( $(add_kdeapps_dep kioclient) ) - vlc? ( media-video/vlc ) -" - -if [[ ${PV} != *9999* ]]; then - PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" -else - # Translations are not reliable on live ebuilds - # rather force people to use english only. - PDEPEND="!app-office/libreoffice-l10n" -fi - -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -DEPEND="${COMMON_DEPEND} - >=dev-libs/libatomic_ops-7.2d - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt - dev-perl/Archive-Zip - dev-util/cppunit - >=dev-util/gperf-3 - dev-util/intltool - >=dev-util/mdds-0.12.0:= - media-libs/glm - net-misc/npapi-sdk - >=sys-apps/findutils-4.4.2 - sys-devel/bison - sys-apps/coreutils - sys-devel/flex - sys-devel/gettext - >=sys-devel/make-3.82 - sys-devel/ucpp - sys-libs/zlib - virtual/pkgconfig - x11-libs/libXt - x11-libs/libXtst - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - java? ( - >=virtual/jdk-1.6 - >=dev-java/ant-core-1.7 - ) - odk? ( >=app-doc/doxygen-1.8.4 ) - test? ( dev-util/cppunit ) -" - -PATCHES=( - # not upstreamable stuff - "${FILESDIR}/${PN}-4.4-system-pyuno.patch" -) - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - bluetooth? ( dbus ) - collada? ( gltf ) - gnome? ( gtk ) - eds? ( gnome ) - telepathy? ( gtk ) - libreoffice_extensions_nlpsolver? ( java ) - libreoffice_extensions_scripting-beanshell? ( java ) - libreoffice_extensions_scripting-javascript? ( java ) - libreoffice_extensions_wiki-publisher? ( java ) -" - -CHECKREQS_MEMORY="512M" -if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi - -pkg_pretend() { - local pgslot - - if [[ ${MERGE_TYPE} != binary ]]; then - check-reqs_pkg_pretend - - if [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ - ; then - eerror "Compilation with gcc older than 4.6 is not supported" - die "Too old gcc found." - fi - fi - - # Ensure pg version but we have to be sure the pg is installed (first - # install on clean system) - if use postgres && has_version dev-db/postgresql; then - pgslot=$(postgresql-config show) - if [[ ${pgslot//.} < 90 ]] ; then - eerror "PostgreSQL slot must be set to 9.0 or higher." - eerror " postgresql-config set 9.0" - die "PostgreSQL slot is not set to 9.0 or higher." - fi - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - kde4-base_pkg_setup - python-single-r1_pkg_setup - - [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup -} - -src_unpack() { - local mod mod2 dest tmplfile tmplname mypv - - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - use branding && unpack "${BRANDING}" - - if [[ ${PV} != *9999* ]]; then - unpack "${P}.tar.xz" - for mod in ${MODULES}; do - [[ ${mod} == core ]] && continue - unpack "${PN}-${mod}-${PV}.tar.xz" - done - else - for mod in ${MODULES}; do - mypv=${PV/.9999} - [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" - [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}" - EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - git-r3_src_unpack - if [[ ${mod} != core ]]; then - mod2=${mod} - # mapping does not match on help - [[ ${mod} == help ]] && mod2="helpcontent2" - mkdir -p "${S}/${mod2}/" || die - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die - rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" - fi - done - unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH - fi -} - -src_prepare() { - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python 2.7 enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - if use collada; then - export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser" - export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser" - fi - - # patchset - if [[ -n ${PATCHSET} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - - base_src_prepare - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # system pyuno mess - sed \ - -e "s:%eprefix%:${EPREFIX}:g" \ - -e "s:%libdir%:$(get_libdir):g" \ - -i pyuno/source/module/uno.py \ - -i pyuno/source/officehelper.py || die - # sed in the tests - sed -i \ - -e 's#all : build unitcheck#all : build#g' \ - solenv/gbuild/Module.mk || die - sed -i \ - -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \ - -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \ - Makefile.in || die - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die - fi -} - -src_configure() { - local java_opts - local internal_libs - local lo_ext - local ext_opts - - # sane: just sane.h header that is used for scan in writer, not - # linked or anything else, worthless to depend on - # vigra: just uses templates from there - # it is serious pain in the ass for packaging - # should be replaced by boost::gil if someone interested - internal_libs+=" - --without-system-sane - --without-system-vigra - " - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})" - else - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})" - fi - done - - if use java; then - # hsqldb: system one is too new - java_opts=" - --without-junit - --without-system-hsqldb - --with-ant-home="${ANT_HOME}" - --with-jdk-home=$(java-config --jdk-home 2>/dev/null) - --with-jvm-path="${EPREFIX}/usr/lib/" - " - - use libreoffice_extensions_scripting-beanshell && \ - java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" - - use libreoffice_extensions_scripting-javascript && \ - java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" - - if use libreoffice_extensions_wiki-publisher; then - java_opts+=" - --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) - --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar) - --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar) - --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar) - --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) - " - fi - fi - - # system headers/libs/...: enforce using system packages - # --enable-cairo: ensure that cairo is always required - # --enable-graphite: disabling causes build breakages - # --enable-*-link: link to the library rather than just dlopen on runtime - # --enable-release-build: build the libreoffice as release - # --disable-fetch-external: prevent dowloading during compile phase - # --disable-gnome-vfs: old gnome virtual fs support - # --disable-kdeab: kde3 adressbook - # --disable-kde: kde3 support - # --disable-systray: quickstarter does not actually work at all so do not - # promote it - # --enable-extension-integration: enable any extension integration support - # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --disable-report-builder: too much java packages pulled in without pkgs - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ - --with-system-headers \ - --with-system-libs \ - --with-system-jars \ - --with-system-dicts \ - --enable-cairo-canvas \ - --enable-graphite \ - --enable-largefile \ - --enable-mergelibs \ - --enable-neon \ - --enable-python=system \ - --enable-randr \ - --enable-randr-link \ - --enable-release-build \ - --disable-hardlink-deliver \ - --disable-ccache \ - --disable-crashdump \ - --disable-dependency-tracking \ - --disable-epm \ - --disable-fetch-external \ - --disable-gnome-vfs \ - --disable-gstreamer-0-10 \ - --disable-report-builder \ - --disable-kdeab \ - --disable-kde \ - --disable-online-update \ - --disable-systray \ - --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ - --with-build-version="Gentoo official package" \ - --enable-extension-integration \ - --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-tar="${DISTDIR}" \ - --with-lang="" \ - --with-parallelism=$(makeopts_jobs) \ - --with-system-ucpp \ - --with-vendor="Gentoo Foundation" \ - --with-x \ - --without-fonts \ - --without-myspell-dicts \ - --without-help \ - --with-helppack-integration \ - --without-sun-templates \ - $(use_enable bluetooth sdremote-bluetooth) \ - $(use_enable coinmp) \ - $(use_enable collada) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable dbus) \ - $(use_enable eds evolution2) \ - $(use_enable firebird firebird-sdbc) \ - $(use_enable gltf) \ - $(use_enable gnome gconf) \ - $(use_enable gnome gio) \ - $(use_enable gnome lockdown) \ - $(use_enable gstreamer gstreamer-1-0) \ - $(use_enable gtk) \ - $(use_enable gtk3) \ - $(use_enable kde kde4) \ - $(use_enable mysql ext-mariadb-connector) \ - $(use_enable odk) \ - $(use_enable postgres postgresql-sdbc) \ - $(use_enable telepathy) \ - $(use_enable vlc) \ - $(use_with coinmp system-coinmp) \ - $(use_with collada system-opencollada) \ - $(use_with gltf system-libgltf) \ - $(use_with java) \ - $(use_with mysql system-mysql-cppconn) \ - $(use_with odk doxygen) \ - ${internal_libs} \ - ${java_opts} \ - ${ext_opts} -} - -src_compile() { - # more and more LO stuff tries to use OpenGL, including tests during build - # bug 501508, bug 540624, bug 545974 and probably more - addpredict /dev/dri - addpredict /dev/ati - addpredict /dev/nvidiactl - - # hack for offlinehelp, this needs fixing upstream at some point - # it is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - ( - grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" - source "${T}/config_host.mk" 2&> /dev/null - - local path="${WORKDIR}/helpcontent2/source/auxiliary/" - mkdir -p "${path}" || die - - echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=icon-themes/galaxy/res/helpimg \ - > "${path}/helpimg.ilst" - [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug." - ) - - local target - use test && target="build" || target="build-nocheck" - - # this is not a proper make script - make ${target} || die -} - -src_test() { - make unitcheck || die - make slowcheck || die -} - -src_install() { - # This is not Makefile so no buildserver - make DESTDIR="${D}" distro-pack-install -o build -o check || die - - # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} - bashcomp_alias \ - libreoffice \ - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - rm -rf "${ED}"/etc/ || die - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} - fi - - # Hack for offlinehelp, this needs fixing upstream at some point. - # It is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - insinto /usr/$(get_libdir)/libreoffice/help - doins xmlhelp/util/*.xsl - - # Remove desktop files for support to old installs that can't parse mime - rm -rf "${ED}"/usr/share/mimelnk/ - - # FIXME: Hack add missing file - insinto /usr/$(get_libdir)/${PN}/program - doins "${S}"/instdir/program/libsaxlo.so - - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin -} - -pkg_preinst() { - # Cache updates - all handled by kde eclass for all environments - kde4-base_pkg_preinst -} - -pkg_postinst() { - kde4-base_pkg_postinst - - use java || \ - ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' -} - -pkg_postrm() { - kde4-base_pkg_postrm -} diff --git a/app-office/libreoffice/libreoffice-5.0.3.1.ebuild b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild index 912f7c6388d2..7765a006b3f1 100644 --- a/app-office/libreoffice/libreoffice-5.0.3.1.ebuild +++ b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4" KDE_SCM="git" CMAKE_REQUIRED="never" -PYTHON_COMPAT=( python2_7 python3_4 ) +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) PYTHON_REQ_USE="threads,xml" # experimental ; release ; old @@ -27,10 +27,10 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" -inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS} +inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS} unset SCM_ECLASS -DESCRIPTION="LibreOffice, a full office productivity suite" +DESCRIPTION="A full office productivity suite" HOMEPAGE="http://www.libreoffice.org" SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" @@ -58,15 +58,21 @@ unset DEV_URI # Really required addons # These are bundles that can't be removed for now due to huge patchsets. # If you want them gone, patches are welcome. -ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code -ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" -ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" -ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino -ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable -SRC_URI+=" ${ADDONS_SRC}" +ADDONS_SRC=( + "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" + "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code + "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" + "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" + # no release for 8 years, should we package it? + "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" + # Does not build with 1.6 rhino at all + "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" + # requirement of rhino + "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" + # not packageable + "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" +) +SRC_URI+=" ${ADDONS_SRC[*]}" unset ADDONS_URI unset EXT_URI @@ -174,7 +180,6 @@ COMMON_DEPEND=" dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 - dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) @@ -243,11 +248,6 @@ DEPEND="${COMMON_DEPEND} test? ( dev-util/cppunit ) " -PATCHES=( - # not upstreamable stuff - "${FILESDIR}/${PN}-4.4-system-pyuno.patch" -) - REQUIRED_USE=" ${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) @@ -261,18 +261,26 @@ REQUIRED_USE=" libreoffice_extensions_wiki-publisher? ( java ) " +PATCHES=( + # not upstreamable stuff + "${FILESDIR}/${PN}-4.4-system-pyuno.patch" +) + CHECKREQS_MEMORY="512M" if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi pkg_pretend() { local pgslot + use java || \ + ewarn "If you plan to use lbase application you should enable java or you will get various crashes." + if [[ ${MERGE_TYPE} != binary ]]; then check-reqs_pkg_pretend - if [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ - ; then + if [[ $(gcc-major-version) -lt 4 ]] || { + [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; } + then eerror "Compilation with gcc older than 4.6 is not supported" die "Too old gcc found." fi @@ -282,7 +290,7 @@ pkg_pretend() { # install on clean system) if use postgres && has_version dev-db/postgresql; then pgslot=$(postgresql-config show) - if [[ ${pgslot//.} < 90 ]] ; then + if [[ ${pgslot//.} -lt 90 ]] ; then eerror "PostgreSQL slot must be set to 9.0 or higher." eerror " postgresql-config set 9.0" die "PostgreSQL slot is not set to 9.0 or higher." @@ -299,7 +307,7 @@ pkg_setup() { } src_unpack() { - local mod mod2 dest tmplfile tmplname mypv + local mod [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} use branding && unpack "${BRANDING}" @@ -311,38 +319,21 @@ src_unpack() { unpack "${PN}-${mod}-${PV}.tar.xz" done else + local base_uri branch checkout mypv + base_uri="git://anongit.freedesktop.org" for mod in ${MODULES}; do + branch="master" mypv=${PV/.9999} - [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" - [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}" - EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - git-r3_src_unpack - if [[ ${mod} != core ]]; then - mod2=${mod} - # mapping does not match on help - [[ ${mod} == help ]] && mod2="helpcontent2" - mkdir -p "${S}/${mod2}/" || die - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die - rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" - fi + [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}" + git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}" + [[ ${mod} != core ]] && checkout="${S}/${mod}" + [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help + git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout} done - unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH fi } src_prepare() { - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python 2.7 enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - if use collada; then - export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser" - export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser" - fi - # patchset if [[ -n ${PATCHSET} ]]; then EPATCH_FORCE="yes" \ @@ -351,25 +342,25 @@ src_prepare() { epatch fi - base_src_prepare + epatch "${PATCHES[@]}" AT_M4DIR="m4" eautoreconf # hack in the autogen.sh touch autogen.lastrun # system pyuno mess - sed \ + sed -i \ -e "s:%eprefix%:${EPREFIX}:g" \ -e "s:%libdir%:$(get_libdir):g" \ - -i pyuno/source/module/uno.py \ - -i pyuno/source/officehelper.py || die + pyuno/source/module/uno.py \ + pyuno/source/officehelper.py || die # sed in the tests sed -i \ - -e 's#all : build unitcheck#all : build#g' \ + -e "s#all : build unitcheck#all : build#g" \ solenv/gbuild/Module.mk || die sed -i \ - -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \ - -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \ + -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ + -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ Makefile.in || die if use branding; then @@ -384,6 +375,17 @@ src_configure() { local lo_ext local ext_opts + # optimization flags + export GMAKE_OPTIONS="${MAKEOPTS}" + # System python 2.7 enablement: + export PYTHON_CFLAGS=$(python_get_CFLAGS) + export PYTHON_LIBS=$(python_get_LIBS) + + if use collada; then + export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser" + export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser" + fi + # sane: just sane.h header that is used for scan in writer, not # linked or anything else, worthless to depend on # vigra: just uses templates from there @@ -425,7 +427,6 @@ src_configure() { --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar) --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar) --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar) - --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) " fi fi @@ -532,7 +533,7 @@ src_compile() { # it is broken because we send --without-help # https://bugs.freedesktop.org/show_bug.cgi?id=46506 ( - grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" + grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die source "${T}/config_host.mk" 2&> /dev/null local path="${WORKDIR}/helpcontent2/source/auxiliary/" @@ -542,7 +543,8 @@ src_compile() { perl "${S}/helpcontent2/helpers/create_ilst.pl" \ -dir=icon-themes/galaxy/res/helpimg \ > "${path}/helpimg.ilst" - [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug." + [[ -s "${path}/helpimg.ilst" ]] || \ + ewarn "The help images list is empty, something is fishy, report a bug." ) local target @@ -562,17 +564,17 @@ src_install() { make DESTDIR="${D}" distro-pack-install -o build -o check || die # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} + newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN} bashcomp_alias \ libreoffice \ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - rm -rf "${ED}"/etc/ || die + rm -rf "${ED}"etc/ || die if use branding; then insinto /usr/$(get_libdir)/${PN}/program newins "${WORKDIR}/branding-sofficerc" sofficerc dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die fi # Hack for offlinehelp, this needs fixing upstream at some point. @@ -582,14 +584,14 @@ src_install() { doins xmlhelp/util/*.xsl # Remove desktop files for support to old installs that can't parse mime - rm -rf "${ED}"/usr/share/mimelnk/ + rm -r "${ED}"usr/share/mimelnk/ || die # FIXME: Hack add missing file - insinto /usr/$(get_libdir)/${PN}/program - doins "${S}"/instdir/program/libsaxlo.so + exeinto /usr/$(get_libdir)/${PN}/program + doexe "${S}"/instdir/program/libsaxlo.so - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin + pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin } pkg_preinst() { @@ -599,9 +601,6 @@ pkg_preinst() { pkg_postinst() { kde4-base_pkg_postinst - - use java || \ - ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' } pkg_postrm() { diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild index bfc62fb88e23..79f1fe43d30e 100644 --- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild @@ -115,7 +115,7 @@ COMMON_DEPEND=" app-text/libwpd:0.10[tools] app-text/libwpg:0.3 =app-text/libwps-0.4* - >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] + >=app-text/poppler-0.16:=[cxx] >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 7528c3c5c50b..a8aafcfc93aa 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4" KDE_SCM="git" CMAKE_REQUIRED="never" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{3_4,3_5} ) PYTHON_REQ_USE="threads,xml" # experimental ; release ; old @@ -115,7 +115,7 @@ COMMON_DEPEND=" app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4.2 - >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] + >=app-text/poppler-0.16:=[cxx] >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC @@ -161,7 +161,7 @@ COMMON_DEPEND=" eds? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) - gnome? ( gnome-base/gconf:2 ) + gnome? ( dev-libs/glib:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 @@ -180,11 +180,7 @@ COMMON_DEPEND=" libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) - telepathy? ( - dev-libs/glib:2 - >=net-libs/telepathy-glib-0.18.0 - >=x11-libs/gtk+-2.24:2 - ) + telepathy? ( >=net-libs/telepathy-glib-0.18.0 ) " RDEPEND="${COMMON_DEPEND} @@ -249,9 +245,9 @@ REQUIRED_USE=" ${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) collada? ( gltf ) - gnome? ( gtk ) eds? ( gnome ) - telepathy? ( gtk ) + gnome? ( gtk ) + telepathy? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -374,7 +370,7 @@ src_configure() { # optimization flags export GMAKE_OPTIONS="${MAKEOPTS}" - # System python 2.7 enablement: + # System python enablement: export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) @@ -481,9 +477,7 @@ src_configure() { $(use_enable eds evolution2) \ $(use_enable firebird firebird-sdbc) \ $(use_enable gltf) \ - $(use_enable gnome gconf) \ $(use_enable gnome gio) \ - $(use_enable gnome lockdown) \ $(use_enable gstreamer gstreamer-1-0) \ $(use_enable gtk) \ $(use_enable gtk3) \ diff --git a/app-office/lyx/lyx-2.1.4.ebuild b/app-office/lyx/lyx-2.1.4.ebuild index f36bc9e28e9e..2b66f17b1456 100644 --- a/app-office/lyx/lyx-2.1.4.ebuild +++ b/app-office/lyx/lyx-2.1.4.ebuild @@ -19,7 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${MY_P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos" IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant" LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW" diff --git a/app-office/mdbtools/metadata.xml b/app-office/mdbtools/metadata.xml index cb9bc68a291e..433061b93a94 100644 --- a/app-office/mdbtools/metadata.xml +++ b/app-office/mdbtools/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>gingekerr@yahoo.co.uk</email> + <email>chris.kerr@mykolab.ch</email> <name>Chris Kerr</name> <description>Maintainer. Assign bugs to him</description> </maintainer> diff --git a/app-office/sc/sc-7.16-r1.ebuild b/app-office/sc/sc-7.16-r1.ebuild index d9e0962abbb8..3c3083ee7a36 100644 --- a/app-office/sc/sc-7.16-r1.ebuild +++ b/app-office/sc/sc-7.16-r1.ebuild @@ -3,6 +3,7 @@ # $Id$ EAPI=5 + inherit eutils multilib toolchain-funcs DESCRIPTION="sc is a free curses-based spreadsheet program that uses key bindings similar to vi and less" @@ -17,9 +18,7 @@ COMMON_DEPEND=">=sys-libs/ncurses-5.2" DEPEND="virtual/pkgconfig" RDEPEND=" ${COMMON_DEPEND} - !dev-lang/stratego - !<sci-chemistry/ccp4-apps-6.1.3-r4 -" + !dev-lang/stratego" src_prepare() { epatch \ diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest index 4a92895fd3c0..211faf64658c 100644 --- a/app-office/texstudio/Manifest +++ b/app-office/texstudio/Manifest @@ -1,2 +1,3 @@ DIST texstudio-2.10.2.tar.gz 25669897 SHA256 0cf97c752ba30aba8a0536492893b71ed454c62e6a6e34cff65a8a4eeb308e64 SHA512 3c29b2ef0bb8ed290c66802ffc9419f39d5ff5c4905523ee3adb7177f1159739639d5e4eb9d038fd28472c6618e68b7839b9c816da462dd24046691ebcd9796c WHIRLPOOL e66da4486fa17aa940557af75a098cd03eeaefabe2bf16d38589a37fd065c313c911f76d44b7b81054ae8460a93da323d3472139445fa67df21bb661143ba607 +DIST texstudio-2.10.4.tar.gz 25810583 SHA256 87e7b7c52d51791178fac4c48feeded7a920bc39bcfb710a745b467d80111c3c SHA512 13c6624bf38ee2633f9a86eb9c7ba03503b63de1f954c3f7c4a24182127b9d4db1e8524a122552412a2ceccb288a0dad3d70e9368fd897d6ec123a16e37816e5 WHIRLPOOL 357796f638d3e558a9560a62d972555474850ebd6b5a61bdaa14037b728113222ce9c9f2438b851fdaa20687e1444a8913cd222d5849de67293b0589085a6dc9 DIST texstudio-2.9.4.tar.gz 25292627 SHA256 dc71590e3745ac193a640667737befd665d549e642e268eec7a8238d3b61b5ea SHA512 6fd35a6490451f9cc3292245857e66d6b0d18d2fb06e0482a8e9bbb8695923c8d3da32a6aa6b8ec591c74ccd81f797ddb958e85db26c90d0096cc678a5f14a49 WHIRLPOOL 9ca5ad727d0096bd986b39b34691167bfafe6ae44c4193fdd1f6f02bdd8c4b8b0cd4ac31af3c1c2833c1ba13f0acf814d3ba14fb0709dc3bbd5ee50729968cdf diff --git a/app-office/texstudio/texstudio-2.10.2.ebuild b/app-office/texstudio/texstudio-2.10.2.ebuild index 4a6d581398c8..d9d19650f982 100644 --- a/app-office/texstudio/texstudio-2.10.2.ebuild +++ b/app-office/texstudio/texstudio-2.10.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~ppc ppc64 ~x86 ~x86-fbsd" IUSE="video qt4 +qt5" REQUIRED_USE="^^ ( qt4 qt5 )" diff --git a/app-office/texstudio/texstudio-2.10.4.ebuild b/app-office/texstudio/texstudio-2.10.4.ebuild new file mode 100644 index 000000000000..fe75dafa7c82 --- /dev/null +++ b/app-office/texstudio/texstudio-2.10.4.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit base fdo-mime prefix qmake-utils + +DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)" +HOMEPAGE="http://texstudio.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE="video qt4 +qt5" + +REQUIRED_USE="^^ ( qt4 qt5 )" + +COMMON_DEPEND=" + app-text/hunspell + app-text/poppler:=[qt4?,qt5?] + >=dev-libs/quazip-0.7.1[qt4?,qt5?] + dev-qt/qtsingleapplication[qt4?,qt5?] + x11-libs/libX11 + x11-libs/libXext + qt4? ( + dev-qt/designer:4 + >=dev-qt/qtgui-4.8.5:4 + >=dev-qt/qtcore-4.6.1:4 + >=dev-qt/qtscript-4.6.1:4 + >=dev-qt/qtsvg-4.6.1:4 + >=dev-qt/qttest-4.6.1:4 + ) + qt5? ( + dev-qt/designer:5 + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtsvg:5 + dev-qt/qttest:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + ) + video? ( media-libs/phonon[qt4?,qt5?] )" +RDEPEND="${COMMON_DEPEND} + virtual/latex-base + app-text/psutils + app-text/ghostscript-gpl + media-libs/netpbm" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" + +S="${WORKDIR}"/${P/-/} + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.4-hunspell-quazip.patch + "${FILESDIR}"/${PN}-2.8.2-desktop.patch + ) + +src_prepare() { + find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die + + if use video; then + sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die + fi + + sed \ + -e '/hunspell.pri/d' \ + -e '/quazip.pri/d' \ + -e '/qtsingleapplication.pri/d' \ + -e '/QUAZIP_STATIC/d' \ + -i ${PN}.pro || die + +# cat >> ${PN}.pro <<- EOF +# exists(texmakerx_my.pri):include(texmakerx_my.pri) +# EOF + + cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die + eprefixify ${PN}.pri + + epatch ${PATCHES[@]} +} + +src_configure() { + if use qt5; then + eqmake5 + else + eqmake4 + fi +} + +src_install() { + local i + for i in 16x16 22x22 32x32 48x48 64x64 128x128; do + insinto /usr/share/icons/hicolor/${i} + newins utilities/${PN}${i}.png ${PN}.png + done + emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install +} + +pkg_postinst() { + fdo-mime_desktop_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} diff --git a/app-portage/conf-update/conf-update-1.0.3.ebuild b/app-portage/conf-update/conf-update-1.0.3.ebuild index 77f9b8d9e8b1..dd15e6e400e9 100644 --- a/app-portage/conf-update/conf-update-1.0.3.ebuild +++ b/app-portage/conf-update/conf-update-1.0.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${PF}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ppc x86" IUSE="colordiff" RDEPEND=">=dev-libs/glib-2.6 diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild index 05eebf08549e..c4d7b3176197 100644 --- a/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild +++ b/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild @@ -11,8 +11,9 @@ inherit python-r1 if [[ ${PV} == 9999 ]]; then inherit git-r3 - EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoolkit-dev.git - https://anongit.gentoo.org/git/proj/gentoolkit-dev.git" + EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoolkit.git + https://anongit.gentoo.org/git/proj/gentoolkit.git" + EGIT_BRANCH="gentoolkit-dev" else SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest index 18b28356ba3c..59601888da74 100644 --- a/app-portage/metagen/Manifest +++ b/app-portage/metagen/Manifest @@ -1 +1,2 @@ DIST metagen-0.6.2.tar.gz 6100 SHA256 d1f6c7a24fa9f7f119c9309ed2ec217bc0fd3da48568417a46220a40e2c74201 SHA512 0ab8d7755259b870c995c471f366a976f4acc336dda4c2fa1c4e5b78b5aa701fb75d4dd88ac0ee069a231550b07b89b4a8f724c94ec791efe6c4c64b97ac19ff WHIRLPOOL fa6b85934e58cc5b73237fb619d64bd87df148b8f70fa5df2bbf94ef986f1ea3e693b7e3eb25b56cbe26fe35fff5102ba5787a22ec94800d3d328ccc9606473c +DIST metagen-0.6.3.tar.bz2 6118 SHA256 655253786c3dafe2426a61d8585acfbbd4a560e0a2609331e230c72699b10494 SHA512 1a25e1ebd35ae97e0823aee2f929c09b9041c78496c2425cf5c0bf3d9f1747313dcf30b7e0a5d4e861cbd0caaf48b506f85eb5f25ab0b9e75a62514b0bb64ecd WHIRLPOOL 5e0c594ad728b6646a324d7c8115ad19f15304baad1922fb45e96a771355092e43ba3ae98f0f44e87f2c8e9d74af5ee75c09e86472329e1497dd81959467f927 diff --git a/app-portage/metagen/metagen-0.6.3.ebuild b/app-portage/metagen/metagen-0.6.3.ebuild new file mode 100644 index 000000000000..57a5477c6318 --- /dev/null +++ b/app-portage/metagen/metagen-0.6.3.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="metadata.xml generator for ebuilds" +HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git" +SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 hppa ~ppc ~x86 ~amd64-linux ~x86-linux" + +IUSE="" +DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}] + >=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND}" + +python_install() { + distutils-r1_python_install + python_newscript metagen/main.py metagen +} + +python_install_all() { + distutils-r1_python_install_all + doman docs/metagen.1 +} + +python_test() { + "${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die +} diff --git a/app-shells/z/Manifest b/app-shells/z/Manifest new file mode 100644 index 000000000000..4f551bd05edc --- /dev/null +++ b/app-shells/z/Manifest @@ -0,0 +1 @@ +DIST z-1.9.tar.gz 5894 SHA256 28aaff75254c8914063ce2534a4b882845054701230475b11dba6d7a305d82c9 SHA512 8e22c04075d502dfbb0225518c923065347aa842d463237e927c2f9e4c6a2c5d211cd43c06a374f078090b4418849afdfabd6a3d249e9c35f9423dffe8078733 WHIRLPOOL 21a7d5e10b69b2f898254fd89f7be42aea1364fd81604d17bf58e244ce8a0a4b6cc92b41062eb008304522cf9623a50745dda7d9466a1a8a1fe3a8a8e5cac4f4 diff --git a/app-shells/z/metadata.xml b/app-shells/z/metadata.xml new file mode 100644 index 000000000000..ad3df7c0d9b7 --- /dev/null +++ b/app-shells/z/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>aidecoe@gentoo.org</email> + <name>Amadeusz Żołnowski</name> + </maintainer> + <longdescription lang="en"> + Tracks your most used directories, based on 'frecency'. After a short + learning phase, z will take you to the most 'frecent' directory that + matches ALL of the regexes given on the command line, in order. + </longdescription> +</pkgmetadata> diff --git a/app-shells/z/z-1.9.ebuild b/app-shells/z/z-1.9.ebuild new file mode 100644 index 000000000000..f107e3c0a52a --- /dev/null +++ b/app-shells/z/z-1.9.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="Change directory command that learns visited paths" +HOMEPAGE="https://github.com/rupa/z/" +SRC_URI="https://github.com/rupa/${PN}/tarball/v${PV} -> ${P}.tar.gz" + +LICENSE="WTFPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/rupa-z-5dc2a86" + +src_compile() { + : +} + +src_install() { + insinto "/usr/share/${PN}/" + doins z.sh + doman z.1 +} + +pkg_postinst() { + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog "To enable 'z' command you need to source /usr/share/${PN}/z.sh." + elog "Add following line to your ~/.bashrc, ~/.zshrc or equivalent" + elog "in other shells:" + elog "" + elog " [ -r /usr/share/${PN}/z.sh ] && . /usr/share/${PN}/z.sh" + elog "" + elog "See z(1) man page for usage and configuration options." + fi +} diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest index 34d9772e6460..86d36ee9e5fa 100644 --- a/app-text/blogc/Manifest +++ b/app-text/blogc/Manifest @@ -1 +1 @@ -DIST blogc-0.3.tar.xz 243464 SHA256 da775a84056b594922547d18f56aeb9a9b0a1bf83e25b12e9a4723186cf5bf8b SHA512 8fcdaa9d4c24f8fdf6d2b4ce66a6d6c4e88141ffa2c186f75d717eb9ca16ac8ecfc766e297563e13dab410b46102f5c78edee55d96fedd7fabb2c9e7d244835c WHIRLPOOL a5b574e81219b61cdea0f23241bcfdb3baaac9cf92d1e50b572e8585800855f3811ef3e8db839e9d1b55ff30e7b203f534bcad7fded487987815a01b5d1d26f2 +DIST blogc-0.4.tar.xz 247932 SHA256 77686e770c8706941d49c74887c0dda7a17a286718ccb96264392d18be8087b9 SHA512 a1d235f010a700afc4b60b560770567d3fa2ffd28bba1104955ba88fcd4dd1add1ee42c96227ec152e396259312701e64713916c6331608b2a170227446aa7fe WHIRLPOOL f5d428758df2052dbdf06b70beb2453688d1725c3fb545fb1c82589b2ac4b993534fa9c82c203c0e6ba66c7dc6786c5d8f9c4fc3d71923471cfd3c317d518710 diff --git a/app-text/blogc/blogc-0.3.ebuild b/app-text/blogc/blogc-0.4.ebuild index da3dfcab90be..ecc0d6aecdcd 100644 --- a/app-text/blogc/blogc-0.3.ebuild +++ b/app-text/blogc/blogc-0.4.ebuild @@ -10,6 +10,8 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 autotools fi +inherit eutils + DESCRIPTION="A blog compiler" HOMEPAGE="http://blogc.org/" @@ -42,6 +44,7 @@ DEPEND="${DEPEND} src_prepare() { [[ ${PV} = *9999* ]] && eautoreconf + epatch_user default } diff --git a/app-text/blogc/blogc-9999.ebuild b/app-text/blogc/blogc-9999.ebuild index da3dfcab90be..ecc0d6aecdcd 100644 --- a/app-text/blogc/blogc-9999.ebuild +++ b/app-text/blogc/blogc-9999.ebuild @@ -10,6 +10,8 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 autotools fi +inherit eutils + DESCRIPTION="A blog compiler" HOMEPAGE="http://blogc.org/" @@ -42,6 +44,7 @@ DEPEND="${DEPEND} src_prepare() { [[ ${PV} = *9999* ]] && eautoreconf + epatch_user default } diff --git a/app-text/calibre/calibre-1.20.ebuild b/app-text/calibre/calibre-1.20.ebuild index 97e04cfb5b17..7eb5fa02c2fa 100644 --- a/app-text/calibre/calibre-1.20.ebuild +++ b/app-text/calibre/calibre-1.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -45,7 +45,7 @@ COMMON_DEPEND=" dev-python/apsw >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces - >=dev-python/dnspython-1.6.0 + >=dev-python/dnspython-1.6.0:0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 diff --git a/app-text/calibre/calibre-1.47.ebuild b/app-text/calibre/calibre-1.47.ebuild index 0061c4181b76..6126c17ada0d 100644 --- a/app-text/calibre/calibre-1.47.ebuild +++ b/app-text/calibre/calibre-1.47.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -45,7 +45,7 @@ COMMON_DEPEND=" >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] dev-python/netifaces[python_targets_python2_7(-)] - >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] + >=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)] diff --git a/app-text/calibre/calibre-1.48-r1.ebuild b/app-text/calibre/calibre-1.48-r1.ebuild index 099fe1f113a6..c247c51e5a3d 100644 --- a/app-text/calibre/calibre-1.48-r1.ebuild +++ b/app-text/calibre/calibre-1.48-r1.ebuild @@ -49,7 +49,7 @@ COMMON_DEPEND=" >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}] >=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}] >=dev-python/dbus-python-0.82.2[${PYTHON_USEDEP}] - >=dev-python/dnspython-1.6.0[${PYTHON_USEDEP}] + >=dev-python/dnspython-1.6.0:0[${PYTHON_USEDEP}] >=dev-python/lxml-3.2.1[${PYTHON_USEDEP}] >=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}] >=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}] diff --git a/app-text/calibre/calibre-2.27.0.ebuild b/app-text/calibre/calibre-2.27.0.ebuild index d17a1202337c..d2edbbbb5102 100644 --- a/app-text/calibre/calibre-2.27.0.ebuild +++ b/app-text/calibre/calibre-2.27.0.ebuild @@ -43,7 +43,7 @@ COMMON_DEPEND=" >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] - >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] + >=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)] diff --git a/app-text/calibre/calibre-2.31.0.ebuild b/app-text/calibre/calibre-2.31.0.ebuild index d17a1202337c..d2edbbbb5102 100644 --- a/app-text/calibre/calibre-2.31.0.ebuild +++ b/app-text/calibre/calibre-2.31.0.ebuild @@ -43,7 +43,7 @@ COMMON_DEPEND=" >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] - >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] + >=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)] diff --git a/app-text/calibre/calibre-2.33.0.ebuild b/app-text/calibre/calibre-2.33.0.ebuild index 0706d00caf41..d2585c90a9e5 100644 --- a/app-text/calibre/calibre-2.33.0.ebuild +++ b/app-text/calibre/calibre-2.33.0.ebuild @@ -42,7 +42,7 @@ COMMON_DEPEND=" >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] - >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] + >=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)] diff --git a/app-text/calibre/calibre-2.34.0.ebuild b/app-text/calibre/calibre-2.34.0.ebuild index 0706d00caf41..d2585c90a9e5 100644 --- a/app-text/calibre/calibre-2.34.0.ebuild +++ b/app-text/calibre/calibre-2.34.0.ebuild @@ -42,7 +42,7 @@ COMMON_DEPEND=" >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] - >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] + >=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)] diff --git a/app-text/calibre/calibre-2.35.0.ebuild b/app-text/calibre/calibre-2.35.0.ebuild index 0706d00caf41..8a2a6eeb5fc7 100644 --- a/app-text/calibre/calibre-2.35.0.ebuild +++ b/app-text/calibre/calibre-2.35.0.ebuild @@ -42,7 +42,10 @@ COMMON_DEPEND=" >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] - >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] + || ( + >=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)] + virtual/dnspython[python_targets_python2_7(-)] + ) >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)] diff --git a/app-text/calibre/metadata.xml b/app-text/calibre/metadata.xml index f372a0d645a2..459ff02ab7ee 100644 --- a/app-text/calibre/metadata.xml +++ b/app-text/calibre/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> <maintainer> diff --git a/app-text/cuneiform/metadata.xml b/app-text/cuneiform/metadata.xml index 5c81a0d544ac..bcd97db18036 100644 --- a/app-text/cuneiform/metadata.xml +++ b/app-text/cuneiform/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>yaleks@gentoo.ru</email> + <email>yaleks@gmail.com</email> <name>Aleksandr Yakimov</name> </maintainer> <maintainer> diff --git a/app-text/djvu/djvu-3.5.25.3.ebuild b/app-text/djvu/djvu-3.5.25.3.ebuild index e4efe101312a..a7cda09ac081 100644 --- a/app-text/djvu/djvu-3.5.25.3.ebuild +++ b/app-text/djvu/djvu-3.5.25.3.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 + inherit autotools eutils fdo-mime flag-o-matic MY_P="${PN}libre-${PV#*_p}" @@ -63,9 +64,8 @@ src_install() { pkg_postinst() { fdo-mime_mime_database_update - if ! has_version app-text/djview; then - elog "For djviewer or browser plugin, emerge app-text/djview." - fi + has_version app-text/djview || \ + optfeature "For djviewer or browser plugin" app-text/djview } pkg_postrm() { diff --git a/app-text/djvu/djvu-3.5.27.ebuild b/app-text/djvu/djvu-3.5.27.ebuild index be1c6c35e06d..1322b75fda9e 100644 --- a/app-text/djvu/djvu-3.5.27.ebuild +++ b/app-text/djvu/djvu-3.5.27.ebuild @@ -3,6 +3,7 @@ # $Id$ EAPI=5 + inherit eutils fdo-mime flag-o-matic MY_P="${PN}libre-${PV#*_p}" @@ -54,9 +55,8 @@ src_install() { pkg_postinst() { fdo-mime_mime_database_update - if ! has_version app-text/djview; then - elog "For djviewer or browser plugin, emerge app-text/djview." - fi + has_version app-text/djview || \ + optfeature "For djviewer or browser plugin" app-text/djview } pkg_postrm() { diff --git a/app-text/dvisvgm/dvisvgm-1.10.ebuild b/app-text/dvisvgm/dvisvgm-1.10.ebuild index b90fc24db684..d96094e121f5 100644 --- a/app-text/dvisvgm/dvisvgm-1.10.ebuild +++ b/app-text/dvisvgm/dvisvgm-1.10.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="test" # Tests don't work from $WORKDIR: kpathsea tries to search in relative # directories from where the binary is executed. diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest index 915f49e65994..942455e565d4 100644 --- a/app-text/kchmviewer/Manifest +++ b/app-text/kchmviewer/Manifest @@ -1,3 +1,4 @@ DIST kchmviewer-6.0.tar.gz 310642 SHA256 81c856434a86977039c36cb10f2427cc8cb1ea29a778f24fff2285d49c717979 SHA512 029335e4acea711f31c7d17751292c6b755504b97b73864b5d25a7a8a2853c0499658056bad9f9c0b6324f61c024feb5a943dc670fdccb37fcdee1346d7334d9 WHIRLPOOL 2b368654d50d0e553d116ca52f3b1ebe3d709a6b52933d54a54d2360c51356628d58c3cc789e32da54a5897b1cbee185380dbcbe0b6824146ec1ad39dc5c9280 DIST kchmviewer-6.1.tar.gz 346587 SHA256 f673c3aaca735d799d14b9f6f1b302e9bb77d5c0a0b601b4b5e0beed1c99fe78 SHA512 aabcf98510a5a0cd38f3937e14c86e15b2514cf118e7d17e96a3a4779bb7c0985248f352844a021a66d482cfecdc3c405c816f71a7bec02d1765f8e4d7510126 WHIRLPOOL 1585726cdf4295a49c16733ee9a93d97d6087977dd8e151681bb73d19d34052c9a9423e3488e4152b7736ce8e9bf3cf02be26554ea6fffe2ccaaef9297f593a7 DIST kchmviewer-7.1.tar.gz 340934 SHA256 a410d0a343d8a871cc860e2983079981806eb70cbf0c970fa1bcf5689821144f SHA512 6e98441358eab74d80adee437b1ad24dbf3e5b5a6ae4c5d7744537a169a6a64303b8e2b4bf1e636c0f6d955bdd1a59b7f1db2d45fc6dfecb6bb3a31088abce61 WHIRLPOOL 6e5bf2639057aa5f55ce25e9d457ca267b2ab015b5553e9edbc7bbe2997bc1d6ebcdadc656b06b15ada115eb196104a3770fdd68234b47bb3f352d3d6a9b23b3 +DIST kchmviewer-7.3.tar.gz 344483 SHA256 7cb805c9a836b7622bbea1d5df8873fb711979285abb21bccf095f25cf3f6007 SHA512 b4861e157f850413051df70dbdf90c7bcc9eebd58a0e6a4990a0eab232ec02ace44c4fe4367f74d23bbc0fab32e61e149b474db43efb45ef08f42af97e6af093 WHIRLPOOL 3705f565f1b5333471b75b5e48e9b10cb795b195b4d2cc44b7bd9905743082264993ed25c7fc4618dc8e5bc13f41abf1b3a8a4783f54adf98b6512f411735ef9 diff --git a/app-text/kchmviewer/kchmviewer-7.3.ebuild b/app-text/kchmviewer/kchmviewer-7.3.ebuild new file mode 100644 index 000000000000..d3a3ee17c32d --- /dev/null +++ b/app-text/kchmviewer/kchmviewer-7.3.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils fdo-mime qmake-utils + +DESCRIPTION="A feature rich chm file viewer, based on Qt" +HOMEPAGE="http://www.kchmviewer.net/" +SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug qt5" + +RDEPEND=" + dev-libs/chmlib + dev-libs/libzip + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + ) + !qt5? ( + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtgui:4 + dev-qt/qtwebkit:4 + ) + +" +DEPEND="${RDEPEND}" + +src_prepare() { + # fix parallel build wrt bug #527192 + echo "src.depends = lib" >> ${PN}.pro || die +} + +src_configure() { + if use qt5; then + eqmake5 + else + eqmake4 + fi +} + +src_install() { + dodoc ChangeLog DBUS-bindings FAQ README + doicon packages/kchmviewer.png + + dobin bin/kchmviewer + domenu packages/kchmviewer.desktop + +} + +pkg_postinst() { + fdo-mime_desktop_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} diff --git a/app-text/libexttextcat/libexttextcat-3.4.4.ebuild b/app-text/libexttextcat/libexttextcat-3.4.4.ebuild index 212e49baf50b..f5e29c6fd0cb 100644 --- a/app-text/libexttextcat/libexttextcat-3.4.4.ebuild +++ b/app-text/libexttextcat/libexttextcat-3.4.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="static-libs" DEPEND="" diff --git a/app-text/linuxdoc-tools/metadata.xml b/app-text/linuxdoc-tools/metadata.xml index 50afcfdcf587..e1eb74722693 100644 --- a/app-text/linuxdoc-tools/metadata.xml +++ b/app-text/linuxdoc-tools/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>itumaykin@gmail.com</email> + <email>itumaykin+gentoo@gmail.com</email> <name>Coacher</name> </maintainer> <longdescription> diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest index 72dc712e9acb..3a134546932f 100644 --- a/app-text/multitail/Manifest +++ b/app-text/multitail/Manifest @@ -1 +1,2 @@ DIST multitail-6.4.1.tgz 155717 SHA256 8a6baecf3537c791f70645f3613bfea0c91a22040f2531bfe03b6d0cdd112134 SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b WHIRLPOOL 467d9fd6d089aebe597475d07217baadcb280ea952ae731310365a55046009c808b16657485c037f54dd746e2103f318c3555de04d4e14f2ab2ef19bbc408543 +DIST multitail-6.4.2.tgz 155757 SHA256 af1d5458a78ad3b747c5eeb135b19bdca281ce414cefdc6ea0cff6d913caa1fd SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd WHIRLPOOL c74a85671f2772a6b5d8cc224481fc1793d851573e77e9b7cc4bc3e0569b4ba58ca63989f7f82e2e91dabc29363b87dd361305178b8c174fe2a7b250c86e731b diff --git a/app-text/multitail/multitail-6.4.2.ebuild b/app-text/multitail/multitail-6.4.2.ebuild new file mode 100644 index 000000000000..372f054c5a1d --- /dev/null +++ b/app-text/multitail/multitail-6.4.2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Tail with multiple windows" +HOMEPAGE="http://www.vanheusden.com/multitail/" +SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux" +IUSE="debug examples unicode" + +RDEPEND=" + sys-libs/ncurses:0=[unicode?] +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" +RESTRICT="test" # bug #492270 + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-6.4.1-gentoo.patch + + sed \ + -e "/^DESTDIR/s:=.*$:=${EROOT}:g" \ + -i Makefile || die + + sed \ + -e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \ + -i xclip.c ${PN}.conf || die + + tc-export CC PKG_CONFIG + + use debug && append-flags "-D_DEBUG" +} + +src_compile() { + emake UTF8_SUPPORT=$(usex unicode) +} + +src_install () { + dobin multitail + + insinto /etc + doins multitail.conf + + DOCS=( readme.txt thanks.txt ) + HTML_DOCS=( manual.html ) + einstalldocs + + doman multitail.1 + + if use examples; then + docinto examples + dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl + fi +} + +pkg_postinst() { + optfeature "send a buffer to the X clipboard" x11-misc/xclip +} diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest index 7e72ff8d46ef..8f804945e362 100644 --- a/app-text/pdfgrep/Manifest +++ b/app-text/pdfgrep/Manifest @@ -1,3 +1,2 @@ -DIST pdfgrep-1.3.1.tar.gz 111653 SHA256 6e8bcaf8b219e1ad733c97257a97286a94124694958c27506b2ea7fc8e532437 SHA512 7a13016a8cf4f8a7387940d7e3862a1fb83f3aa6240084f835e92e958836dff0788db2ae39f35db25d679a2857ddf0b9bcbd7b1aacb10c2a16c3165d56f4efcf WHIRLPOOL 94b69bd0e16d4f0b1b389b09c2330516f25cc772be58e7ad49a2cf1ac0633539bb16a5df595052f468ab89d38ebeeb26b7f2be866555756f423febbf0a600b4b DIST pdfgrep-1.3.2.tar.gz 114754 SHA256 386b167434443dd299d389a0ef292d708123255cbab0e179e11b65ba51d9b386 SHA512 dd5d26999405e1e84f5639ea48e15d2aab951a766f828e8e7b45409a7e027a5312757ac64952da56b8a37cf0cd0bc6f43cd16d78600dcc6c8fcb4deabecf0a5b WHIRLPOOL d2ca79e647a21767e0296d72dcdb511157352adf1f1d60beec9d15eb46554f3ec6d9c11f1dfda8988d4f6dcf4a814c52a8ffc28f72c2f227e01430354a8b99f9 DIST pdfgrep-1.4.1.tar.gz 151926 SHA256 db04a210e6bb7b77cd6c54b17f0f6fed0d123a85f97a541b270736a5d3840f2c SHA512 27ce23c25a5f284b3eba92a0f8dbf02600248548967c1e71dfb41e43528824d9add587ea0ac23899ff07d2ffc6c74c2e6e4c2e7240e69494b8d31b7a4afc3735 WHIRLPOOL f08308a13b0b577215521b116db7b4c787b34993665031a690308e45333f35e86419928310b303060cda40aaf4ed5d474400bcee0e29106c9f8c8935d779687e diff --git a/app-text/pdfgrep/pdfgrep-1.3.1.ebuild b/app-text/pdfgrep/pdfgrep-1.3.1.ebuild deleted file mode 100644 index a45031e5aaab..000000000000 --- a/app-text/pdfgrep/pdfgrep-1.3.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -DESCRIPTION="A tool similar to grep which searches text in PDFs" -HOMEPAGE="http://pdfgrep.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="unac" - -RDEPEND=" - app-text/poppler:=[cxx] - unac? ( app-text/unac )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - econf $(use_with unac) -} diff --git a/app-text/pdfgrep/pdfgrep-1.3.2.ebuild b/app-text/pdfgrep/pdfgrep-1.3.2.ebuild index c2860e39c96f..a45031e5aaab 100644 --- a/app-text/pdfgrep/pdfgrep-1.3.2.ebuild +++ b/app-text/pdfgrep/pdfgrep-1.3.2.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="unac" RDEPEND=" diff --git a/app-vim/exheres-syntax/metadata.xml b/app-vim/exheres-syntax/metadata.xml index 9c029ee6ee30..3b9019c0cc6f 100644 --- a/app-vim/exheres-syntax/metadata.xml +++ b/app-vim/exheres-syntax/metadata.xml @@ -4,8 +4,8 @@ <herd>vim</herd> <herd>proxy-maintainers</herd> <maintainer> - <email>ahf@exherbo.org</email> - <name>Alexander H. Faeroy</name> + <email>ahf@0x90.dkg</email> + <name>Alexander Faeroy</name> <description>Proxied upstream</description> </maintainer> </pkgmetadata> diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest index 0f3f68ac3578..290ed2ad0135 100644 --- a/dev-cpp/eigen/Manifest +++ b/dev-cpp/eigen/Manifest @@ -1,3 +1,4 @@ DIST eigen-2.0.17.tar.bz2 367890 SHA256 7255e856ed367ce6e6e2d4153b0e4e753c8b8d36918bf440dd34ad56aff09960 SHA512 8fa0e4507864f61c30de14e3b29d963eb8b777d1a6bb04192d53e1f4c9db323b9fab2ddcedb63bf2af243fe0e26dcd717e97eb72216b6a1d444e455520192c72 WHIRLPOOL d80f12b378e23b758e4dbd173b87bed93bc42a97f2541b653b4373ea6ce0803bd712de00cf5a014a72cd439bb3ad10fd24b2ef8982975e044ff4d7bb2b63f585 DIST eigen-3.1.3.tar.bz2 1052724 SHA256 1a443145f321dd47a5ca11f176e7319056198a6124a7577723d92e3c3cd59ece SHA512 7b6b816416570c9592ed9ca09e61970346f02bed492df7073fed3e657ded0c2bb736fb024554f92064ee783cbf1180952ccb87ed724899fa353f34c6a49210a4 WHIRLPOOL 53c667def19d882bff0e6a7b8476028a211ca2b4617d579b8555738c726ed1d4f3d4aed0e87b39c00a941484505f2a54fb82dba19444cc04f7f438fa1fc22c45 DIST eigen-3.2.5.tar.bz2 1151510 SHA256 5f6e6cb88188e34185f43cb819d7dab9b48ef493774ff834e568f4805d3dc2f9 SHA512 5a90a312c3503bb91293aa9ed69258f36c6a3a06a64ff851c8b57a4df01bd467e22e5ba95221bce97a8cf2d3fb9f0ad1c1c40116a3c9c9b1f80d7fc7b0a96c7a WHIRLPOOL 21333e30f77b4712d21eb4bed6159c0e0bfb769ed65d01d4cf5cfeb1a9105f2a3c2ccbc41d251fc09399ee8ad8a50d2eb9d1ea5d38d98ca1df12f8972b24a630 +DIST eigen-3.2.6.tar.bz2 1152805 SHA256 8a3352f9a5361fe90e451a7305fb1896fc7f771dc16cc0edd8e6b157f52c343e SHA512 a1abcef36d774ab29418961143174e460e11c05f40d493844e4d4e8024e0b60c453cb007e96ed05d786eec3214d72f15ead0ac49ed84762d3037db90f11c935a WHIRLPOOL e15f917ad6b8aeda2e11c6af186073921d78c3b96c922f1068989b64a2ec7c3d58df280ce809be877b6e93a691c0d511afa601cb806bf4d9f29e9133c62e280c diff --git a/dev-cpp/eigen/eigen-3.2.6.ebuild b/dev-cpp/eigen/eigen-3.2.6.ebuild new file mode 100644 index 000000000000..4c51aedddccc --- /dev/null +++ b/dev-cpp/eigen/eigen-3.2.6.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="C++ template library for linear algebra: vectors, matrices, and related algorithms" +HOMEPAGE="http://eigen.tuxfamily.org/" +SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2" + +LICENSE="LGPL-2 GPL-3" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="debug doc" + +DEPEND="doc? ( app-doc/doxygen[dot,latex] )" +RDEPEND="!dev-cpp/eigen:0" + +src_unpack() { + default + mv ${PN}* ${P} || die +} + +src_prepare() { + sed -i CMakeLists.txt \ + -e "/add_subdirectory(demos/d" \ + -e "/add_subdirectory(blas/d" \ + -e "/add_subdirectory(lapack/d" \ + || die "sed disable unused bundles failed" + + sed -i -e "/Unknown build type/d" CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_compile() { + cmake-utils_src_compile + if use doc; then + cmake-utils_src_compile doc + fi +} + +src_test() { + local mycmakeargs=( + -DEIGEN_BUILD_TESTS=ON + -DEIGEN_TEST_NO_FORTRAN=ON + -DEIGEN_TEST_NO_OPENGL=ON + ) + cmake-utils_src_configure + cmake-utils_src_compile buildtests + cmake-utils_src_test +} + +src_install() { + cmake-utils_src_install + if use doc; then + dohtml -r "${BUILD_DIR}"/doc/html/* + fi + + # Debian installs it and some projects started using it. + insinto /usr/share/cmake/Modules/ + doins "${S}/cmake/FindEigen3.cmake" +} diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild new file mode 100644 index 000000000000..5e335ed4b6ea --- /dev/null +++ b/dev-db/cdb/cdb-0.75-r4.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils multilib toolchain-funcs + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" + +DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases" +HOMEPAGE="http://cr.yp.to/cdb.html" +SRC_URI="http://cr.yp.to/cdb/${P}.tar.gz" +LICENSE="public-domain" +SLOT="0" +IUSE="" + +DEPEND=">=sys-apps/sed-4 + !dev-db/tinycdb" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-errno.diff + epatch "${FILESDIR}"/${P}-stdint.diff + + sed -i -e 's/head -1/head -n 1/g' Makefile \ + || die "sed Makefile failed" +} + +src_configure() { + echo "$(tc-getCC) ${CFLAGS} -fPIC" > conf-cc + echo "$(tc-getCC) ${LDFLAGS}" > conf-ld + echo "${EPREFIX}/usr" > conf-home +} + +src_install() { + dobin cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest \ + || die "dobin failed" + + # ok so ... first off, some automakes fail at finding + # cdb.a, so install that now + dolib *.a || die "dolib failed" + + # then do this pretty little symlinking to solve the somewhat + # cosmetic library issue at hand + dosym cdb.a /usr/$(get_libdir)/libcdb.a || die "dosym failed" + + # uint32.h needs installation too, otherwise compiles depending + # on it will fail + insinto /usr/include/cdb + doins cdb*.h buffer.h alloc.h uint32.h || die "doins failed" + + dodoc CHANGES FILES README SYSDEPS TODO VERSION +} diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index a187030b0827..bea73bfd2303 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -1,10 +1,8 @@ DIST mariadb-10.0.21.tar.gz 56216903 SHA256 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 SHA512 75aa4b019f3432a61483bb325a0f088ea92d6fede44d7a300c15659411c8927fa2a0586182226315b6d6796641ca1d8746f7fd49e21fe21505adec1fc38ae32f WHIRLPOOL b086fb34363b2426f5e91c14916b747787feadf37c609f4aea1f08bd235e9e97df17f5bfa0eb9e65e93fbed3df5eb6c021287c4eb987a3362ea87cf96eaf268e -DIST mariadb-10.1.7.tar.gz 53812743 SHA256 5bd3b80cf0f312751271a3446c12579c7081f93406e59a0cdfda8e133423c88f SHA512 4a496ba22ccc839d412dd4858cb66464b499693c4ff89ea773a967bccc7d53a52622f3d494d6f889c5325b079d83ba17b25abae2bc9fc22b76c601fc51542f5a WHIRLPOOL 2366c46a7c6d83dd9fe7cac9affcb00387a574912ad9350c11279d31fd384e5fcc18a5d297765086b2f9208e5b899a7707cfb199d047309b89725d0e9582cd9d +DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d DIST mariadb-10.1.8.tar.gz 53920483 SHA256 7cbf6a4649aa6dc9cd1dc24424ade7b994de78582ce4d47ca0f4cd1c4c003bfa SHA512 6bb282f814a0d7a6d8e06feb11a819bf9fc6f240428e4a03716a50f2291e070d789224e7f88b4b9b33a160424c4cc0b9deef96c280dcc900476ffc9888dccb45 WHIRLPOOL 65d6857a5f10880aadd391e5eff1fc2c2cc68909e94b75da7e4d52e5405d780ecfaeb4d51f6e7d1ed9a531ef206c64057a17c028d1c5e0ba85dae185234eac37 -DIST mariadb-5.5.45.tar.gz 45686618 SHA256 4dc3aff6941ef1068412002915d795bcf67db0eaa38a5c6f3af57474c4226fb0 SHA512 57501670605cfcdd231ef57d2db7ac9bf460856e63c0660d050ad11aa0392d3d6ce6730ae119dca5d00847c9170990f375c8499593bf0d02c1995395191236ba WHIRLPOOL e5ef471c097c2b8921596b88f26df6914e031daafdcd878d79a16c20be6ba8c97fb79069e48d7d1b9aa405ced063f66feac1c52503907e06ee4b577def2c57fa DIST mariadb-5.5.46.tar.gz 45683962 SHA256 45b66b7adc87cad32e553df1d5211e5b6426b78a3bc318a5ccde088bf93e6e10 SHA512 91e5d3d46da9932fdd80125abf77cea411158e04212ae6dea1aa7a9260626c9dfded967af7173a152f488f38c35ff423fcba4098fa337814956c6fa8719c6080 WHIRLPOOL 7da1dc60dca37605c56291544b6d0dfc09a7a76c139b14d1277980d079251d02389efdbde56d23402d659e9c0830fd7ab7998833e1b5fcd33dcab436ea21b74c DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326 DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22 -DIST mysql-extras-20150914-1946Z.tar.bz2 1491203 SHA256 4bc3842c74ae48297e8eaef71f76461dad2ed5f804c1811ab289643088f1d48e SHA512 75d57703d43a25b74a8c72a08eb9f582b470d3108532dd3fecbdc4a928e1e7ce99f8c02fb667b069a6f036a5e528e67a86e8508a4916b0b20bc3193d5a9f1212 WHIRLPOOL 588366aeaa50da09134d9c0eefe8922b8cde5514373d1e25f2c311ed7a023f792cb1dc69e4cd61e9732d051f26c2ce5bf90991502f6135e7578b36f64f23590d DIST mysql-extras-20151019-1714Z.tar.bz2 1490296 SHA256 f27297292f91c698b1ab7118740728c05a3ebfcd0bfad575898d112faaef4f4b SHA512 00db9c76847a0f58915890e34a9487c147d25fba7b33db3aa1037e8f5d6afb32448b5eae7a5583c52c03b53693b792e077dc963b7dc84356d382ba46bebc8777 WHIRLPOOL a0912ad0ecde9044761312586edb2899b58663517a8d8bab3f2c59938282bb472bdb97ed25ce097f9b18c1ad35a185494f8ad2e630c2004b717f1b61573335ca diff --git a/dev-db/mariadb/mariadb-10.1.7_rc.ebuild b/dev-db/mariadb/mariadb-10.0.22-r1.ebuild index f84820b43be4..fbba5c33531d 100644 --- a/dev-db/mariadb/mariadb-10.1.7_rc.ebuild +++ b/dev-db/mariadb/mariadb-10.0.22-r1.ebuild @@ -3,27 +3,24 @@ # $Id$ EAPI="5" -MY_EXTRAS_VER="20150914-1946Z" -WSREP_REVISION="25" +MY_EXTRAS_VER="20150717-1707Z" +HAS_TOOLS_PATCH="1" SUBSLOT="18" -HAS_TOOLS_PATCH="yes" inherit toolchain-funcs mysql-multilib -# only to make repoman happy. it is really set in the eclass -IUSE="$IUSE mroonga" +IUSE="${IUSE}" # REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" # When MY_EXTRAS is bumped, the index should be revised to exclude these. -#EPATCH_EXCLUDE='20014_all_mariadb-innodb-compression.patch' +EPATCH_EXCLUDE='' -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) - mroonga? ( app-text/groonga-normalizer-mysql )" +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" RDEPEND="${RDEPEND}" # Official test instructions: -# USE='client-libs community embedded extraengine perl server openssl static-libs tools' \ +# USE='embedded extraengine perl openssl static-libs' \ # FEATURES='test userpriv -usersandbox' \ # ebuild mariadb-X.X.XX.ebuild \ # digest clean package @@ -86,13 +83,16 @@ multilib_src_test() { # main.mysql_client_test_comp: # segfaults at random under Portage only, suspect resource limits. # - # plugins.cracklib_password_check - # Can randomly fail due to cracklib return message + # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam + # fails due to bad cleanup of previous tests when run in parallel + # The tool is deprecated anyway + # Bug 532288 for t in main.mysql_client_test main.mysql_client_test_nonblock \ - main.mysql_client_test_comp main.bootstrap \ + main.mysql_client_test_comp \ binlog.binlog_statement_insert_delayed main.information_schema \ - main.mysqld--help plugins.cracklib_password_check \ + main.mysqld--help main.bootstrap \ + archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do mysql-multilib_disable_test "$t" "False positives in Gentoo" done diff --git a/dev-db/mariadb/mariadb-5.5.45.ebuild b/dev-db/mariadb/mariadb-10.0.22.ebuild index 5417effc9869..825bd6f28470 100644 --- a/dev-db/mariadb/mariadb-5.5.45.ebuild +++ b/dev-db/mariadb/mariadb-10.0.22.ebuild @@ -3,17 +3,15 @@ # $Id$ EAPI="5" -MY_EXTRAS_VER="20150509-1847Z" +MY_EXTRAS_VER="20141215-0144Z" +SUBSLOT="18" -# Build system -BUILD="cmake" - -inherit toolchain-funcs mysql-v2 +inherit toolchain-funcs mysql-multilib # only to make repoman happy. it is really set in the eclass IUSE="$IUSE" # REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" # When MY_EXTRAS is bumped, the index should be revised to exclude these. EPATCH_EXCLUDE='' @@ -21,16 +19,17 @@ EPATCH_EXCLUDE='' DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" RDEPEND="${RDEPEND}" -# Please do not add a naive src_unpack to this ebuild -# If you want to add a single patch, copy the ebuild to an overlay -# and create your own mysql-extras tarball, looking at 000_index.txt - # Official test instructions: -# USE='embedded extraengine perl openssl static-libs community' \ +# USE='embedded extraengine perl openssl static-libs' \ # FEATURES='test userpriv -usersandbox' \ # ebuild mariadb-X.X.XX.ebuild \ # digest clean package -src_test() { +multilib_src_test() { + + if ! multilib_is_native_abi ; then + einfo "Server tests not available on non-native abi". + return 0; + fi local TESTDIR="${BUILD_DIR}/mysql-test" local retstatus_unit @@ -65,39 +64,40 @@ src_test() { # create directories because mysqladmin might right out of order mkdir -p "${T}"/var-tests{,/log} - # create symlink for the tests to find the replace util - ln -s "${BUILD_DIR}/extra/replace" "${BUILD_DIR}/client/" - - # These are failing in MariaDB 5.5 for now and are believed to be + # These are failing in MariaDB 10.0 for now and are believed to be # false positives: # # main.information_schema, binlog.binlog_statement_insert_delayed, # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, - # funcs_1.is_columns_mysql + # funcs_1.is_columns_mysql main.bootstrap # fails due to USE=-latin1 / utf8 default # - # main.mysql_client_test, main.mysql_client_test_nonblock: + # main.mysql_client_test, main.mysql_client_test_nonblock + # main.mysql_client_test_comp: # segfaults at random under Portage only, suspect resource limits. # # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam + # + # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam # fails due to bad cleanup of previous tests when run in parallel # The tool is deprecated anyway # Bug 532288 for t in main.mysql_client_test main.mysql_client_test_nonblock \ + main.mysql_client_test_comp \ binlog.binlog_statement_insert_delayed main.information_schema \ - main.mysqld--help \ + main.mysqld--help main.bootstrap \ archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do - mysql-v2_disable_test "$t" "False positives in Gentoo" + mysql-multilib_disable_test "$t" "False positives in Gentoo" done # Run mysql tests pushd "${TESTDIR}" # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ - --testcase-timeout=30 + perl mysql-test-run.pl --force --vardir="${T}/var-tests" + retstatus_tests=$? [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild index e1744ebda54f..7978dfd0b7c2 100644 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ~ppc ppc64 sparc x86" +KEYWORDS="amd64 arm ppc ppc64 sparc x86" IUSE="debug examples gcov static-libs" DEPEND="virtual/libmysqlclient:= diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 059566be58e3..45935018c502 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,9 +1,6 @@ -DIST mysql-5.5.44.tar.gz 21789766 SHA256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de SHA512 05707b96c3e0d39ca103d965640aa1a9461a513f788fc7f2acce4b3933ec578b3d66df53955b0dff1b6c9e5acd98441cfe1df5b3154a1058293babc39c26dad5 WHIRLPOOL 870d9728c78f6732fcd6f95e62833a769c937c96298a39bb023b33a9138552e254d2a3f6285d8f4f0b740de9d7397fa1a0987234a0a4dfa13c787fc068053d78 -DIST mysql-5.5.45.tar.gz 21832364 SHA256 744efd3c39265b5fdeebd25f58ecb34a6eb06e02d9ec2febd3164942f2c89332 SHA512 1c8ddf294232b106562537d6e9b4a3956dd1a290562f313d311f2bbe09f1cb95c28e7e9a4c92a1fcc91a394514bc1190d185b1134003a9f6183ecc2a06d618e8 WHIRLPOOL 3daed09edfc1ca7a0ae379b876e061c2318755fdd14be9630b7c5311985e91ea46cf0e0b1eab98c758cc2809d5d562fcfd2f22022100051746343e147f3d4ebc DIST mysql-5.5.46.tar.gz 21838374 SHA256 93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e SHA512 c2db730318d4c16793d62dbd937c1ff739fffabab6d1689b94252f5501ff36917ddf80a8144583492c05220b3ae33f29ecbcec10f6d8ae0a0b10142be719fc27 WHIRLPOOL 355260ae0e7385c7d00b289e37af09374bc8320f69a55d7ee0469283382f197fd430be32019668b1f29cda69f9d76965d4ee749cb93f1e8263799673e4f0f535 DIST mysql-5.6.26.tar.gz 33278710 SHA256 b44c6ce5f95172c56c73edfa8b710b39242ec7af0ab182c040208c41866e5070 SHA512 455bf66e1c63e3368a3dd53f80a3393e33a20605cde320ee0bb61339d0853c2187d4947812405b85ea93a7da722787e958515fc69807c3fab131878fe9604f62 WHIRLPOOL e5fe46e4f1c8a20d955b5921c6773823cb1c01bd78319485528c478f213a37dc8ce8a1bc5c61904595e8931dec1376d471387a3f85119a0791cb8f6d9303eb6f DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7 DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4 DIST mysql-extras-20150410-1944Z.tar.bz2 1493690 SHA256 e327adf02be4c2bce5121f01d6b139309c72814b8c50a29559dfddee12a0b4e2 SHA512 e2e5345290134e597734514041e413f0633b8078bfddb8b8e7695468ce7341735b732d5bb602ab7aa9a4045d71571b73aac01a5d96687d4fbd380736f5ed650c WHIRLPOOL f65f294905fd1d04e2be79a803b658ed432338501665a75cbe0cc5b3af8abf0615f1f808465c3ca3c7e850b9277f451f5c77b518977f4bee8dc77d6089ff88fb DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22 -DIST mysql-extras-20150729-1849Z.tar.bz2 1491783 SHA256 18c3fadae04f1729169e587083135353680d7c59478cdb6ec0784b238ae8d34a SHA512 555156a00305732093173f83dd22dfa545ef0a3215d7cf419298b7f5be0f9bb8a527ae9c03f58d845223b40543e3dbd054ea103a105f282892cdbce67a864308 WHIRLPOOL 56a61fcd4af096b69318d9d158bf012944dc104aff01b2a55d20ae4a53dc462e9d7c67afb4a6643f93eef8da1f150f613b87880044fc244b040cbbc080c96034 diff --git a/dev-db/mysql/mysql-5.5.44.ebuild b/dev-db/mysql/mysql-5.5.44.ebuild deleted file mode 100644 index 9cd6470d4a9a..000000000000 --- a/dev-db/mysql/mysql-5.5.44.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -MY_EXTRAS_VER="20150127-1351Z" -MY_PV="${PV//_alpha_pre/-m}" -MY_PV="${MY_PV//_/-}" - -# Build type -BUILD="cmake" - -inherit toolchain-funcs mysql-v2 -# only to make repoman happy. it is really set in the eclass -IUSE="$IUSE" - -# Define the mysql-extras source -EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -# When MY_EXTRAS is bumped, the index should be revised to exclude these. -EPATCH_EXCLUDE='' - -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" -RDEPEND="${RDEPEND}" - -# Please do not add a naive src_unpack to this ebuild -# If you want to add a single patch, copy the ebuild to an overlay -# and create your own mysql-extras tarball, looking at 000_index.txt - -# Official test instructions: -# USE='embedded extraengine perl ssl static-libs community' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mysql-X.X.XX.ebuild \ -# digest clean package -src_test() { - - local TESTDIR="${BUILD_DIR}/mysql-test" - local retstatus_unit - local retstatus_tests - - # Bug #213475 - MySQL _will_ object strenously if your machine is named - # localhost. Also causes weird failures. - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" - - if ! use "minimal" ; then - - if [[ $UID -eq 0 ]]; then - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." - fi - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - addpredict /this-dir-does-not-exist/t9.MYI - - # Run CTest (test-units) - cmake-utils_src_test - retstatus_unit=$? - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - # Enable parallel testing, auto will try to detect number of cores - # You may set this by hand. - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased - export MTR_PARALLEL="${MTR_PARALLEL:-auto}" - - # create directories because mysqladmin might right out of order - mkdir -p "${T}"/var-tests{,/log} - - # create symlink for the tests to find mysql_tzinfo_to_sql - ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" - - # These are failing in MySQL 5.5 for now and are believed to be - # false positives: - # - # main.information_schema, binlog.binlog_statement_insert_delayed, - # main.mysqld--help-notwin - # fails due to USE=-latin1 / utf8 default - # - # main.mysql_client_test: - # segfaults at random under Portage only, suspect resource limits. - # - # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam - # fails due to bad cleanup of previous tests when run in parallel - # The tool is deprecated anyway - # Bug 532288 - - for t in main.mysql_client_test \ - binlog.binlog_statement_insert_delayed main.information_schema \ - main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do - mysql-v2_disable_test "$t" "False positives in Gentoo" - done - - # Run mysql tests - pushd "${TESTDIR}" - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ - --testcase-timeout=30 - retstatus_tests=$? - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - popd - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - - failures="" - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - [[ -z "$failures" ]] || die "Test failures: $failures" - einfo "Tests successfully completed" - - else - - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mysql/mysql-5.5.45.ebuild b/dev-db/mysql/mysql-5.5.45.ebuild deleted file mode 100644 index 45c467ce099e..000000000000 --- a/dev-db/mysql/mysql-5.5.45.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -MY_EXTRAS_VER="20150729-1849Z" -MY_PV="${PV//_alpha_pre/-m}" -MY_PV="${MY_PV//_/-}" - -# Build type -BUILD="cmake" - -inherit toolchain-funcs mysql-v2 -# only to make repoman happy. it is really set in the eclass -IUSE="$IUSE" - -# Define the mysql-extras source -EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -# When MY_EXTRAS is bumped, the index should be revised to exclude these. -EPATCH_EXCLUDE='' - -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" -RDEPEND="${RDEPEND}" - -# Please do not add a naive src_unpack to this ebuild -# If you want to add a single patch, copy the ebuild to an overlay -# and create your own mysql-extras tarball, looking at 000_index.txt - -# Official test instructions: -# USE='embedded extraengine perl ssl static-libs community' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mysql-X.X.XX.ebuild \ -# digest clean package -src_test() { - - local TESTDIR="${BUILD_DIR}/mysql-test" - local retstatus_unit - local retstatus_tests - - # Bug #213475 - MySQL _will_ object strenously if your machine is named - # localhost. Also causes weird failures. - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" - - if ! use "minimal" ; then - - if [[ $UID -eq 0 ]]; then - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." - fi - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - addpredict /this-dir-does-not-exist/t9.MYI - - # Run CTest (test-units) - cmake-utils_src_test - retstatus_unit=$? - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - # Enable parallel testing, auto will try to detect number of cores - # You may set this by hand. - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased - export MTR_PARALLEL="${MTR_PARALLEL:-auto}" - - # create directories because mysqladmin might right out of order - mkdir -p "${T}"/var-tests{,/log} - - # create symlink for the tests to find mysql_tzinfo_to_sql - ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" - - # These are failing in MySQL 5.5 for now and are believed to be - # false positives: - # - # main.information_schema, binlog.binlog_statement_insert_delayed, - # main.mysqld--help-notwin - # fails due to USE=-latin1 / utf8 default - # - # main.mysql_client_test: - # segfaults at random under Portage only, suspect resource limits. - # - # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam - # fails due to bad cleanup of previous tests when run in parallel - # The tool is deprecated anyway - # Bug 532288 - - for t in main.mysql_client_test \ - binlog.binlog_statement_insert_delayed main.information_schema \ - main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do - mysql-v2_disable_test "$t" "False positives in Gentoo" - done - - # Run mysql tests - pushd "${TESTDIR}" - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ - --testcase-timeout=30 --reorder - retstatus_tests=$? - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - popd - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - - failures="" - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - [[ -z "$failures" ]] || die "Test failures: $failures" - einfo "Tests successfully completed" - - else - - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mysql/mysql-5.6.26-r1.ebuild b/dev-db/mysql/mysql-5.6.26-r1.ebuild deleted file mode 100644 index 4ff5c0d796e7..000000000000 --- a/dev-db/mysql/mysql-5.6.26-r1.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -MY_EXTRAS_VER="20150717-1707Z" -MY_PV="${PV//_alpha_pre/-m}" -MY_PV="${MY_PV//_/-}" -HAS_TOOLS_PATCH="1" -SUBSLOT="18" - -inherit toolchain-funcs mysql-multilib -# only to make repoman happy. it is really set in the eclass -IUSE="$IUSE" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -# When MY_EXTRAS is bumped, the index should be revised to exclude these. -EPATCH_EXCLUDE='' - -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" -RDEPEND="${RDEPEND}" - -# Please do not add a naive src_unpack to this ebuild -# If you want to add a single patch, copy the ebuild to an overlay -# and create your own mysql-extras tarball, looking at 000_index.txt - -# validate_password plugin uses exceptions when it shouldn't yet (until 5.7) -# disable until we see what happens with it -MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1" - -src_prepare() { - mysql-multilib_src_prepare - if use libressl ; then - sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ - "${S}/cmake/ssl.cmake" || die - fi -} - -# Official test instructions: -# USE='server embedded extraengine perl ssl static-libs community' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mysql-X.X.XX.ebuild \ -# digest clean package -multilib_src_test() { - - if ! multilib_is_native_abi ; then - einfo "Server tests not available on non-native abi". - return 0; - fi - - local TESTDIR="${BUILD_DIR}/mysql-test" - local retstatus_unit - local retstatus_tests - - # Bug #213475 - MySQL _will_ object strenously if your machine is named - # localhost. Also causes weird failures. - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" - - if use server ; then - - if [[ $UID -eq 0 ]]; then - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." - fi - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - addpredict /this-dir-does-not-exist/t9.MYI - - # Run CTest (test-units) - cmake-utils_src_test - retstatus_unit=$? - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" - - # Create a symlink to provided binaries so the tests can find them when client-libs is off - if ! use client-libs ; then - ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die - ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die - mysql-multilib_disable_test main.perror "String mismatch due to not building local perror" - fi - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - # Enable parallel testing, auto will try to detect number of cores - # You may set this by hand. - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased - export MTR_PARALLEL="${MTR_PARALLEL:-auto}" - - # create directories because mysqladmin might right out of order - mkdir -p "${T}"/var-tests{,/log} - - # create symlink for the tests to find mysql_tzinfo_to_sql - ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" - - # These are failing in MySQL 5.5/5.6 for now and are believed to be - # false positives: - # - # main.information_schema, binlog.binlog_statement_insert_delayed, - # funcs_1.is_triggers funcs_1.is_tables_mysql, - # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter, - # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt, - # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql - # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter - # fails due to USE=-latin1 / utf8 default - # - # main.mysql_client_test: - # segfaults at random under Portage only, suspect resource limits. - # - # rpl.rpl_plugin_load - # fails due to included file not listed in expected result - # appears to be poor planning - # - # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam - # fails due to bad cleanup of previous tests when run in parallel - # The tool is deprecated anyway - # Bug 532288 - for t in \ - binlog.binlog_mysqlbinlog_filter \ - binlog.binlog_statement_insert_delayed \ - funcs_1.is_columns_mysql \ - funcs_1.is_tables_mysql \ - funcs_1.is_triggers \ - main.information_schema \ - main.mysql_client_test \ - main.mysqld--help-notwin \ - perfschema.binlog_edge_mix \ - perfschema.binlog_edge_stmt \ - rpl.rpl_plugin_load \ - main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ - ; do - mysql-multilib_disable_test "$t" "False positives in Gentoo" - done - - if ! use extraengine ; then - # bug 401673, 530766 - for t in federated.federated_plugin ; do - mysql-multilib_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)" - done - fi - - # Run mysql tests - pushd "${TESTDIR}" - - # Set file limits higher so tests run - ulimit -n 3000 - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ - --suite-timeout=5000 --reorder - retstatus_tests=$? - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - popd - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - - failures="" - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - [[ -z "$failures" ]] || die "Test failures: $failures" - einfo "Tests successfully completed" - - else - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/postgresql/files/postgresql.service b/dev-db/postgresql/files/postgresql.service index 20ed27a10f29..a607169d22f4 100644 --- a/dev-db/postgresql/files/postgresql.service +++ b/dev-db/postgresql/files/postgresql.service @@ -47,5 +47,9 @@ TimeoutSec=300 # Disable OOM kill on the postmaster OOMScoreAdjust=-1000 +# Make sure the required runtimedir is present +RuntimeDirectory=postgresql +RuntimeDirectoryMode=1775 + [Install] WantedBy=multi-user.target diff --git a/dev-db/postgresql/files/postgresql.tmpfilesd b/dev-db/postgresql/files/postgresql.tmpfilesd deleted file mode 100644 index 26f44efa3288..000000000000 --- a/dev-db/postgresql/files/postgresql.tmpfilesd +++ /dev/null @@ -1 +0,0 @@ -d /run/postgresql 1775 postgres postgres - diff --git a/dev-db/postgresql/postgresql-9.0.23.ebuild b/dev-db/postgresql/postgresql-9.0.23-r1.ebuild index 174a686213e4..ac1b4fe859aa 100644 --- a/dev-db/postgresql/postgresql-9.0.23.ebuild +++ b/dev-db/postgresql/postgresql-9.0.23-r1.ebuild @@ -198,8 +198,6 @@ src_install() { "${FILESDIR}/${PN}.service" | \ systemd_newunit - ${PN}-${SLOT}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf - newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session diff --git a/dev-db/postgresql/postgresql-9.1.19.ebuild b/dev-db/postgresql/postgresql-9.1.19-r1.ebuild index e2ab37ede1c9..817622c4a539 100644 --- a/dev-db/postgresql/postgresql-9.1.19.ebuild +++ b/dev-db/postgresql/postgresql-9.1.19-r1.ebuild @@ -202,8 +202,6 @@ src_install() { "${FILESDIR}/${PN}.service" | \ systemd_newunit - ${PN}-${SLOT}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf - newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session diff --git a/dev-db/postgresql/postgresql-9.2.14.ebuild b/dev-db/postgresql/postgresql-9.2.14-r1.ebuild index 6ec39d36a746..83a2fa7543ce 100644 --- a/dev-db/postgresql/postgresql-9.2.14.ebuild +++ b/dev-db/postgresql/postgresql-9.2.14-r1.ebuild @@ -196,8 +196,6 @@ src_install() { "${FILESDIR}/${PN}.service" | \ systemd_newunit - ${PN}-${SLOT}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf - newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session diff --git a/dev-db/postgresql/postgresql-9.3.10.ebuild b/dev-db/postgresql/postgresql-9.3.10-r1.ebuild index dc084ca55d17..2367c975064a 100644 --- a/dev-db/postgresql/postgresql-9.3.10.ebuild +++ b/dev-db/postgresql/postgresql-9.3.10-r1.ebuild @@ -196,8 +196,6 @@ src_install() { "${FILESDIR}/${PN}.service" | \ systemd_newunit - ${PN}-${SLOT}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf - newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session diff --git a/dev-db/postgresql/postgresql-9.4.5.ebuild b/dev-db/postgresql/postgresql-9.4.5-r1.ebuild index a411b3837669..d705b1003811 100644 --- a/dev-db/postgresql/postgresql-9.4.5.ebuild +++ b/dev-db/postgresql/postgresql-9.4.5-r1.ebuild @@ -228,8 +228,6 @@ src_install() { "${FILESDIR}/${PN}.service" | \ systemd_newunit - ${PN}-${SLOT}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf - newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session diff --git a/dev-db/postgresql/postgresql-9.5_beta1.ebuild b/dev-db/postgresql/postgresql-9.5_beta1-r1.ebuild index 50d2cecefa65..cc14882a351c 100644 --- a/dev-db/postgresql/postgresql-9.5_beta1.ebuild +++ b/dev-db/postgresql/postgresql-9.5_beta1-r1.ebuild @@ -234,8 +234,6 @@ src_install() { "${FILESDIR}/${PN}.service" | \ systemd_newunit - ${PN}-${SLOT}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf - newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild index 36e35fdb8ba3..c2fe866097b0 100644 --- a/dev-db/postgresql/postgresql-9999.ebuild +++ b/dev-db/postgresql/postgresql-9999.ebuild @@ -186,8 +186,6 @@ src_install() { "${FILESDIR}/${PN}.service" | \ systemd_newunit - ${PN}-${SLOT}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf - newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session diff --git a/dev-db/repmgr/metadata.xml b/dev-db/repmgr/metadata.xml index ed88a4488c95..48b021f0c8f6 100644 --- a/dev-db/repmgr/metadata.xml +++ b/dev-db/repmgr/metadata.xml @@ -5,7 +5,7 @@ <email>robbat2@gentoo.org</email> </maintainer> <maintainer> - <email>betelguese@gentoo.org</email> + <email>betelgeuse@gentoo.org</email> </maintainer> <use> </use> diff --git a/dev-db/wxsqlite3/Manifest b/dev-db/wxsqlite3/Manifest index c971129d0f62..1c83f8025c37 100644 --- a/dev-db/wxsqlite3/Manifest +++ b/dev-db/wxsqlite3/Manifest @@ -1 +1,2 @@ DIST wxsqlite3-3.0.6.1.tar.gz 2707120 SHA256 c1d828782c72b86733ddfc8c1591040db8cb3c814871816374a7989727290996 SHA512 b7f496f7a9f8bbb9aa32049689efba9cc32dae868f56f26837c2dcb4546c88a488955c6d71776b4f9996090680d92e23834d6757ccd77e9507a55dc7e60e2f04 WHIRLPOOL b459c75929f209a17ca0cc757afe2ed2e4404c9654bd8db6c8fb61571746b6ce20c1623d4c8698569c9a35fd11ed77635e2a408c31701324fa09b84585660412 +DIST wxsqlite3-3.2.1.tar.gz 2810940 SHA256 312f2cf63c76a70bae92b78ea6fb7e9485fb23c3ee728daa418babab881939e4 SHA512 c62380815d881e9f08727cf28047d81acabf791429ee1a5df4db4a6e101a5c7c5fe6e314b18e83eda9c330fb62c996db7a560163d25dc8b948a04a970e7be3d6 WHIRLPOOL 2cbf9095f08dddba4671cb5be18b980e8387365e2e7c85fde31a60fd4d6f77ec1fdca07500e29e540bd94dcd439ed55768c47c07c7089cfdaabd37a5601f244b diff --git a/dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in b/dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in new file mode 100644 index 000000000000..112fa14432c3 --- /dev/null +++ b/dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in @@ -0,0 +1,14 @@ +# Package Information for pkg-config + +prefix=/usr +wxver=@WXVERSION@ +includedir=${prefix}/include/wx-${wxver}/ +libdir=${prefix}/@LIBDIR@ + +Name: wxsqlite3-@WXVERSION@ +Description: SQLite3 C++ wrapper for use in programs based on the wxWidgets +Version: @VERSION@ +#Requires: sqlite3 +Libs: -L${libdir} -lwxcode_gtk2_wxsqlite3-@WXVERSION@ +Libs.private: -lpthread +Cflags: -I${includedir} diff --git a/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild b/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild new file mode 100644 index 000000000000..07e4bd799237 --- /dev/null +++ b/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" + +inherit eutils multilib wxwidgets + +DESCRIPTION="C++ wrapper around the public domain SQLite 3.x database" +HOMEPAGE="http://wxcode.sourceforge.net/components/wxsqlite3/" +SRC_URI="mirror://sourceforge/wxcode/${P}.tar.gz" + +LICENSE="wxWinLL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + x11-libs/wxGTK:3.0[X] + dev-db/sqlite:3" +RDEPEND="${DEPEND}" + +#S="${WORKDIR}/${P%.1}" + +src_prepare() { + rm -rf sqlite3 || die + cp configure30 configure || die + sed \ + -e "s:@WXVERSION@:${WX_GTK_VER}:g" \ + -e "s:@LIBDIR@:$(get_libdir):g" \ + -e "s:@VERSION@:${PV}:g" \ + "${FILESDIR}"/${P}.pc.in > ${PN}.pc || die +} + +src_configure() { + econf \ + --enable-shared \ + --enable-unicode \ + --with-wx-config="${WX_CONFIG}" \ + --with-wxshared \ + --with-sqlite3-prefix="${PREFIX}/usr" +} + +src_install() { + default + + insinto /usr/$(get_libdir)/pkgconfig + doins ${PN}.pc + + dodoc Readme.txt + dohtml -r docs/html/* + docinto samples + dodoc -r samples/* +} diff --git a/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.5.0-r1.ebuild b/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.5.0-r1.ebuild index bcc9c7e606cf..d8abcf3ca34e 100644 --- a/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.5.0-r1.ebuild +++ b/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.5.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://github/mono/dbus-sharp/${P}.tar.gz" LICENSE="MIT" SLOT="1.0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="" RDEPEND="dev-lang/mono diff --git a/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.6.0.ebuild b/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.6.0.ebuild index 319bd4e26a83..7e6b6dc72a37 100644 --- a/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.6.0.ebuild +++ b/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.6.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mono/${PN}/releases/download/v${PV%.*}/${P}.tar.gz" LICENSE="MIT" SLOT="2.0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="" RDEPEND="dev-lang/mono diff --git a/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r2.ebuild b/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r2.ebuild index e43724d8a183..3e380b81d07c 100644 --- a/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r2.ebuild +++ b/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://github/mono/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="1.0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="" RDEPEND="dev-lang/mono diff --git a/dev-dotnet/dbus-sharp/dbus-sharp-0.8.1.ebuild b/dev-dotnet/dbus-sharp/dbus-sharp-0.8.1.ebuild index 35323863dc02..396d99718108 100644 --- a/dev-dotnet/dbus-sharp/dbus-sharp-0.8.1.ebuild +++ b/dev-dotnet/dbus-sharp/dbus-sharp-0.8.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mono/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="MIT" SLOT="2.0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="" RDEPEND="dev-lang/mono diff --git a/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild b/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild new file mode 100644 index 000000000000..b193f6a93107 --- /dev/null +++ b/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +WX_GTK_VER="3.0" + +inherit eutils cmake-utils flag-o-matic wxwidgets + +MY_PN="OpenSceneGraph" +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Open source high performance 3D graphics toolkit" +HOMEPAGE="http://www.openscenegraph.org/projects/osg/" +SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip" + +LICENSE="wxWinLL-3 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k +openexr openinventor osgapps pdf png qt4 qt5 sdl svg tiff truetype vnc wxwidgets +xine xrandr zlib" + +REQUIRED_USE=" + qt4? ( !qt5 ) + qt5? ( !qt4 ) +" + +# TODO: COLLADA, FBX, GTA, ITK, OpenVRML, Performer, DCMTK +RDEPEND=" + x11-libs/libSM + x11-libs/libXext + virtual/glu + virtual/opengl + asio? ( dev-cpp/asio ) + curl? ( net-misc/curl ) + examples? ( + fltk? ( x11-libs/fltk:1[opengl] ) + fox? ( x11-libs/fox:1.6[opengl] ) + glut? ( media-libs/freeglut ) + gtk? ( x11-libs/gtkglext ) + sdl? ( media-libs/libsdl ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) + ) + ffmpeg? ( virtual/ffmpeg ) + gdal? ( sci-libs/gdal ) + gif? ( media-libs/giflib ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( media-libs/jasper ) + openexr? ( + media-libs/ilmbase + media-libs/openexr + ) + openinventor? ( media-libs/coin ) + pdf? ( app-text/poppler[cairo] ) + png? ( media-libs/libpng:0 ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtopengl:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + ) + svg? ( + gnome-base/librsvg + x11-libs/cairo + ) + tiff? ( media-libs/tiff:0 ) + truetype? ( media-libs/freetype:2 ) + vnc? ( net-libs/libvncserver ) + xine? ( media-libs/xine-lib ) + xrandr? ( x11-libs/libXrandr ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND} + app-arch/unzip + virtual/pkgconfig + x11-proto/xextproto + doc? ( app-doc/doxygen ) + xrandr? ( x11-proto/randrproto ) +" + +S=${WORKDIR}/${MY_P} + +DOCS=(AUTHORS.txt ChangeLog NEWS.txt) + +PATCHES=( + "${FILESDIR}"/${PN}-3.2.1-cmake.patch + "${FILESDIR}"/${PN}-3.2.1-gdal-2.0.patch +) + +src_configure() { + if use examples && use wxwidgets; then + need-wxwidgets unicode + fi + + # Needed by FFmpeg + append-cppflags -D__STDC_CONSTANT_MACROS + + mycmakeargs=( + -DDYNAMIC_OPENSCENEGRAPH=ON + -DWITH_ITK=OFF + -DGENTOO_DOCDIR="/usr/share/doc/${PF}" + $(cmake-utils_use_with asio) + $(cmake-utils_use_with curl) + $(cmake-utils_use_build doc DOCUMENTATION) + $(cmake-utils_use_build osgapps OSG_APPLICATIONS) + $(cmake-utils_use_build examples OSG_EXAMPLES) + $(cmake-utils_use_with ffmpeg FFmpeg) + $(cmake-utils_use_with fltk) + $(cmake-utils_use_with fox) + $(cmake-utils_use_with gdal) + $(cmake-utils_use_with gif GIFLIB) + $(cmake-utils_use_with glut) + $(cmake-utils_use_with gtk GtkGl) + $(cmake-utils_use_with jpeg) + $(cmake-utils_use_with jpeg2k Jasper) + $(cmake-utils_use_with openexr OpenEXR) + $(cmake-utils_use_with openinventor Inventor) + $(cmake-utils_use_with pdf Poppler-glib) + $(cmake-utils_use_with png) + $(cmake-utils_use_with sdl) + $(cmake-utils_use_with svg rsvg) + $(cmake-utils_use_with tiff) + $(cmake-utils_use_with truetype Freetype) + $(cmake-utils_use_with vnc LibVNCServer) + $(cmake-utils_use_with wxwidgets wxWidgets) + $(cmake-utils_use_with xine) + $(cmake-utils_use xrandr OSGVIEWER_USE_XRANDR) + $(cmake-utils_use_with zlib) + ) + if use qt4; then + mycmakeargs+=( -DOSG_USE_QT=ON -DDESIRED_QT_VERSION=4 ) + elif use qt5; then + mycmakeargs+=( -DOSG_USE_QT=ON -DDESIRED_QT_VERSION=5 ) + else + mycmakeargs+=( -DOSG_USE_QT=OFF ) + fi + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads +} diff --git a/dev-haskell/extra/metadata.xml b/dev-haskell/extra/metadata.xml index ecc6a874133f..3fc308824577 100644 --- a/dev-haskell/extra/metadata.xml +++ b/dev-haskell/extra/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>haskell</herd> @@ -8,4 +8,7 @@ <use> <flag name="network-uri">use network-uri package</flag> </use> + <upstream> + <remote-id type="github">ddssff/haskell-extra</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-haskell/fclabels/metadata.xml b/dev-haskell/fclabels/metadata.xml index 1ad043312608..5a4a3c8ebb9d 100644 --- a/dev-haskell/fclabels/metadata.xml +++ b/dev-haskell/fclabels/metadata.xml @@ -1,16 +1,16 @@ -<?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>haskell</herd> <longdescription> This package provides first class labels that can act as bidirectional record fields. The labels can be derived - automatically using Template Haskell which means you don't have + automatically using Template Haskell which means you don't have to write any boilerplate yourself. The labels are implemented as lenses and are fully composable. Labels can be used to /get/, /set/ and /modify/ parts of a datatype in a consistent way. - See "Data.Label" for an introductory explanation. + See "Data.Label" for an introductory explanation. Internally lenses are not tied to Haskell functions directly, but are implemented as arrows. Arrows allow the lenses to be run @@ -18,9 +18,12 @@ make partial lenses that point to fields of multi-constructor datatypes in an elegant way. - See the "Data.Label.Maybe" module for the use of partial labels. + See the "Data.Label.Maybe" module for the use of partial labels. > 1.0.3 -> 1.0.4 > - Bugfix to compile on GHC 6.12 again. </longdescription> + <upstream> + <remote-id type="github">sebastiaanvisser/fclabels</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-haskell/ghc-syb-utils/metadata.xml b/dev-haskell/ghc-syb-utils/metadata.xml index 52a967b11aa3..e20125f4c06c 100644 --- a/dev-haskell/ghc-syb-utils/metadata.xml +++ b/dev-haskell/ghc-syb-utils/metadata.xml @@ -1,8 +1,11 @@ -<?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>haskell</herd> <longdescription> Scrap Your Boilerplate utilities for the GHC API. </longdescription> + <upstream> + <remote-id type="github">nominolo/ghc-syb</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-haskell/monad-journal/metadata.xml b/dev-haskell/monad-journal/metadata.xml index 2ba2db87a036..bf882924003b 100644 --- a/dev-haskell/monad-journal/metadata.xml +++ b/dev-haskell/monad-journal/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>haskell</herd> @@ -10,4 +10,7 @@ sink them through `IO` if you're logging in `(MonadIO m) => m`. </longdescription> + <upstream> + <remote-id type="github">phaazon/monad-journal</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest index 173d1b6a7564..98c63ab69d90 100644 --- a/dev-java/asm/Manifest +++ b/dev-java/asm/Manifest @@ -3,3 +3,4 @@ DIST asm-2.2.3.tar.gz 287535 SHA256 56c5ce25bff92c3641b6435e28eee71718bc4eb62d49 DIST asm-3.3.1.tar.gz 854626 SHA256 69a523d41c82d7979c9b47271e31187e23c064e1d2a93b52950463bcb80197f5 SHA512 b0dffde873dcdfd8328736cfaeb8a3fca2e0788fa642d3af0c995d55c6ca4b1847e35c24100277a453b518305c5fe234d1935fa8de9b25bddd5dee5f1d4a4d44 WHIRLPOOL 90158f7fd87eae641e20aaca736debbd34b70e22feae1021c5f47255b8b9e8305460444e1f070288292b64a6aef3c083c81b520343f97b570ec1799d56d13874 DIST asm-4.0.tar.gz 752187 SHA256 feb2b078f10d420b6ab04cca136db1b57935170d53d12c64d381e118185c7b0e SHA512 642bc32fc0310b8e4291386866e53ba62802f2ae888163cd6e879232bbe3c3728c3a135aa667f91aec5bbb743621c2ee2d2a1a1d1ccb36c5249874a5ba9b08db WHIRLPOOL 8ac20fd836a97572c0b449637491e31a01d29f65eac71cf5412ae0948d1264ed098fd9fbe6ee51af386b78c25bef38c6878693144875e3f29692ad6daf320bd0 DIST asm-5.0.3.tar.gz 781742 SHA256 36e8b760d40898cce83e913e78cf6e631a6a3dc3b448895bb35c02d298c21c4b SHA512 fb2fbddbd01ec6d355d5f218db801512a160b505e91c4ad81cc1a0f1265c358cf8df6140c216e2d5acc109dc2286c29de6bf5b60b29a094e70c96070a54b20af WHIRLPOOL e93cbf659b224d50b8a0971ceaacbcb72acfbf23347baf4a9875e647c5f43b70587a5e24ea01f3ecb57eee31e0550144b59d55e97daafba9d76158427518f667 +DIST asm-5.0.4.tar.gz 781781 SHA256 3e6e25f1013ec016bd11c90ee41faa6226b5bd50385d0cd51df8a81d2db3525d SHA512 997b77ff45a3b1538d75e64700556f1e405f84aac5d99536b77338714c5dc2e7f973b2a6507f75d56e50a146a4744698e8e35cd4714a9127e2b09bfb5f9a346e WHIRLPOOL df6c5d60dbbe5343cb6e216bd22c0ec5c2c24f350b0106c4938cc558fdfa99700717a8ec06505fddf2633d236a2774ffad0ddff81ee694ed0cc7b34476d32b61 diff --git a/dev-java/asm/asm-5.0.4.ebuild b/dev-java/asm/asm-5.0.4.ebuild new file mode 100644 index 000000000000..ecc14322ad0b --- /dev/null +++ b/dev-java/asm/asm-5.0.4.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +OLD_P="${PN}-4.0" +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Bytecode manipulation framework for Java" +HOMEPAGE="http://asm.ow2.org" +SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz + http://download.forge.objectweb.org/${PN}/${OLD_P}.tar.gz" +LICENSE="BSD" +SLOT="4" +IUSE="" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x64-macos" + +DEPEND=">=virtual/jdk-1.6" +RDEPEND=">=virtual/jre-1.6" + +# Needs dependencies we don't have yet. +RESTRICT="test" + +EANT_DOC_TARGET="jdoc" + +# Fails if this objectweb.ant.tasks.path is not set. +# Java generics seem to break unless product.noshrink is set. +EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true" + +java_prepare() { + # Borrow some ant scripts from an old version to avoid requiring + # bndlib and friends. This may not work forever! + cp -vf "../${OLD_P}/archive"/*.xml archive/ || die +} + +src_install() { + for x in output/dist/lib/*.jar ; do + java-pkg_newjar "${x}" $(basename "${x%-*}.jar") + done + + use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/ + use source && java-pkg_dosrc src/* +} diff --git a/dev-java/byaccj/byaccj-1.15-r1.ebuild b/dev-java/byaccj/byaccj-1.15-r1.ebuild index d2477b29c143..76cdf988d153 100644 --- a/dev-java/byaccj/byaccj-1.15-r1.ebuild +++ b/dev-java/byaccj/byaccj-1.15-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" IUSE="" S="${WORKDIR}/${PN}${PV}" diff --git a/dev-java/commons-modeler/Manifest b/dev-java/commons-modeler/Manifest deleted file mode 100644 index 653505cf0b19..000000000000 --- a/dev-java/commons-modeler/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST commons-modeler-2.0.1-src.tar.gz 116785 SHA256 e10a7ac6b6827cba25f40fed43380051023097244fe34b012227aabd5d01e8f0 SHA512 8d1b0c34c63201b6eddece2211c68f549ee95e37b1a458e27a4b56b3750573bd54c803b1182a7afa2e4d0ac9a164f6afce0c05aab6aab6f1a6fefae7d7a7b216 WHIRLPOOL 6ffaac2d167c1acccb11fa2de547cbc922ac04b49ef828b00296d04dad384f9cc59b96e8b836a9d67ee26abc27097298ecb52d0b80103070e09774b4b8bb0612 diff --git a/dev-java/commons-modeler/commons-modeler-2.0.1-r1.ebuild b/dev-java/commons-modeler/commons-modeler-2.0.1-r1.ebuild deleted file mode 100644 index 558b7302a330..000000000000 --- a/dev-java/commons-modeler/commons-modeler-2.0.1-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -JAVA_PKG_IUSE="doc source test" -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="A lib to make the setup of Java Management Extensions easier" -SRC_URI="mirror://apache/commons/modeler/source/${P}-src.tar.gz" -HOMEPAGE="http://commons.apache.org/modeler/" -LICENSE="Apache-2.0" -SLOT="0" - -# Provides ant tasks for ant to use -RDEPEND=">=virtual/jre-1.5 - dev-java/mx4j-core:3.0 - dev-java/commons-logging:0 - commons-digester? ( dev-java/commons-digester:3.2 )" -DEPEND=">=virtual/jdk-1.6 - source? ( app-arch/zip ) - test? ( dev-java/junit:0 )" - -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" -IUSE="commons-digester" - -S=${WORKDIR}/${P}-src - -java_prepare() { - # Setup the build environment - use commons-digester && echo "commons-digester.jar=$(java-pkg_getjar commons-digester-3.2 commons-digester.jar)" >> build.properties - echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties - echo "jmx.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j.jar)" >> build.properties - - mkdir dist || die -} - -EANT_BUILD_TARGET="prepare jar" - -src_test() { - eant test -Djunit.jar=$(java-pkg_getjar --build-only junit junit.jar) -} - -src_install() { - java-pkg_dojar dist/${PN}.jar - dodoc RELEASE-NOTES.txt || die - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc src/java/org -} diff --git a/dev-java/commons-modeler/metadata.xml b/dev-java/commons-modeler/metadata.xml deleted file mode 100644 index 6b2a1753c60d..000000000000 --- a/dev-java/commons-modeler/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>java</herd> - <use> - <flag name="commons-digester">Add support for the commons-digester based Mbeans Descriptor source</flag> - </use> -</pkgmetadata> diff --git a/dev-java/commons-transaction/Manifest b/dev-java/commons-transaction/Manifest deleted file mode 100644 index c56d85d71a73..000000000000 --- a/dev-java/commons-transaction/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST commons-transaction-1.2-src.tar.gz 868372 SHA256 9ba7fd4b48f6a5b9ffbc8069ddcf2d9a3dd53bae269809cb55fd1569a832bc8f SHA512 397a3da012ac1220c6f0c8fd7adf744f5e08658a202639b5232496455597b53cba61afdf0f7fbb5e9ebad1d16162270157c892e316993714461f8bfd51791bff WHIRLPOOL 09a6790ef7641a20117abc66eeeb94ea0f048951f790aa2cc380f3be06ae480fb8beca489dcf9db74b2f4a5d5df0b367a57d1669e9888bac278d991586375c17 diff --git a/dev-java/commons-transaction/commons-transaction-1.2.ebuild b/dev-java/commons-transaction/commons-transaction-1.2.ebuild deleted file mode 100644 index 5b19f143a136..000000000000 --- a/dev-java/commons-transaction/commons-transaction-1.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="A library of utility classes commonly used in transactional Java programming" -SRC_URI="mirror://apache/commons/transaction/source/${P}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=virtual/jre-1.4 - dev-java/commons-codec:0 - java-virtuals/transaction-api - dev-java/log4j:0 - dev-java/commons-logging:0 - dev-java/glassfish-connector-api:0" -DEPEND=">=virtual/jdk-1.4 - ${RDEPEND}" - -S="${WORKDIR}/${P}-src" - -java_prepare() { - rm -v *.jar lib/*.jar || die -} - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="commons-codec,log4j,transaction-api,commons-logging,glassfish-connector-api" -EANT_DOC_TARGET="javadocs" -EANT_EXTRA_ARGS="-Djta.present=true -Djca.present=true -Dservlet.present=true" - -src_install() { - java-pkg_newjar dist/lib/${P}.jar ${PN}.jar - - dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die - dohtml -r xdocs/* || die - use doc && java-pkg_dojavadoc build/doc/apidocs - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/commons-transaction/metadata.xml b/dev-java/commons-transaction/metadata.xml deleted file mode 100644 index 89a65435ed4c..000000000000 --- a/dev-java/commons-transaction/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>java</herd> - <longdescription> - Commons Transaction aims at providing lightweight, standardized, well - tested and efficient implementations of utility classes commonly used - in transactional Java programming. - </longdescription> -</pkgmetadata> diff --git a/dev-java/cssparser/Manifest b/dev-java/cssparser/Manifest index 618b261384c0..391b46375c19 100644 --- a/dev-java/cssparser/Manifest +++ b/dev-java/cssparser/Manifest @@ -1 +1,2 @@ DIST cssparser-0.9.17-sources.jar 244187 SHA256 5bb68dd6788951487eedeb1ba198a290899e9fe04eab9598ef051e42218aaa88 SHA512 6506483bb11d0d1a306308d8f458057f410b7e26db2f930e433878dfa97d29a3ece42cb27ce8715d908360e5ff7cacaf9d09323510ba036c7599ec67de970414 WHIRLPOOL 46781cb9d1fd939c11d5e2d816c70d3eef0bb7c2c421c9a45ddce5d2433a7e75d9540848743a62b7494ee2cd162ed10e71a9faacabc5bd897107627b011cea9a +DIST cssparser-0.9.18-sources.jar 247345 SHA256 41a5a7ff5cbf264634cad4f36eb3b7711f652271b66f858ad690fb5d457f8a08 SHA512 626ba47e5c222fff5438976ec53cd595864036f12788d84661c40d81975f14361461e176484ce063a9451eb572f3f4a881e88521be36b2903e9ec88b6a6c34a9 WHIRLPOOL 70cccda4d6c205f65b09c01474cf2fa0588cfdaad2c011ccf8c82828ff2813abe082ef52a596bf1300c0c2a56185e818bbc672f845cbf66aa4035bdca77a53db diff --git a/dev-java/cssparser/cssparser-0.9.18.ebuild b/dev-java/cssparser/cssparser-0.9.18.ebuild new file mode 100644 index 000000000000..cda7022c6d7b --- /dev/null +++ b/dev-java/cssparser/cssparser-0.9.18.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +EAPI="5" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="API for parsing CSS 2 in Java" +HOMEPAGE="http://cssparser.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar" +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +CDEPEND="dev-java/sac:0" +DEPEND=">=virtual/jdk-1.6 + ${CDEPEND}" +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +JAVA_GENTOO_CLASSPATH="sac" diff --git a/dev-java/emma/emma-2.0.5312-r2.ebuild b/dev-java/emma/emma-2.0.5312-r2.ebuild index aa5d87cc9a0a..66b1fc1ef323 100644 --- a/dev-java/emma/emma-2.0.5312-r2.ebuild +++ b/dev-java/emma/emma-2.0.5312-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip" LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" +KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd" IUSE="+launcher" diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest index d77a48e4c768..feba17be4ee3 100644 --- a/dev-java/fec/Manifest +++ b/dev-java/fec/Manifest @@ -1,2 +1 @@ -DIST fec-1.0.4.tar.bz2 611131 SHA256 978d0ef609ec334ea85e3f70e46a94f6c2cc04393b590a2addfc74e03634b8dd SHA512 45e33fc4b71fcd78a7c5310f2b58df8b83a988500d0de7efebbeade712f5c93d57bbe63fd7dc148ccb1cc6418fc9c79e27be6fe0512e2294c289b192c01ab871 WHIRLPOOL cef5de5b24ddc33f6a85581cd149d3c5887f8f49843df5918158d137b263a58b888149fe68e293bc697db0b7b74e3952fabc1842f8b8f80932de379f2c7bf0d2 DIST fec-1.0.4.tar.gz 449406 SHA256 b33f5558f53e1abd9a4e58b5898cd605607698f22679f577f5fdf6cb1a2dd48a SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343 WHIRLPOOL 3179b18a341b65b6cd295cf5f716887f8c90f03f81017444468dd57220afa4c4e58c5112fd4ef898d4f7fd7a307eb5846ffed6bead8d13fedfc30dc41fbb23d5 diff --git a/dev-java/fec/fec-1.0.4-r1.ebuild b/dev-java/fec/fec-1.0.4-r1.ebuild deleted file mode 100644 index 089e66f337cb..000000000000 --- a/dev-java/fec/fec-1.0.4-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_PKG_IUSE="doc source" - -inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs - -DESCRIPTION="Forword error correction libs" -HOMEPAGE="http://www.onionnetworks.com/developers/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -COMMON_DEPEND="dev-java/log4j - dev-java/concurrent-util" - -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEPEND}" -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - ${COMMON_DEPEND}" -EANT_BUILD_TARGET="jars" - -src_unpack() { - unpack ${A} - cd "${S}" || die - sed -i -e 's/build.compiler=jikes/#build.compiler=jikes/g' build.properties || die - sed -i -e 's/test.lib/lib/g' build.properties || die - epatch "${FILESDIR}"/${P}-{libfec8path,build,soname}.patch - - eant clean - cd lib || die - rm -v *.jar || die - java-pkg_jar-from log4j - java-pkg_jar-from concurrent-util concurrent.jar concurrent-jaxed.jar - cd "${S}" || die - unzip -q common-20020926.zip || die - cd common-20020926 || die - eant clean - cp -r src/com ../src/ || die -} - -src_compile() { - java-pkg-2_src_compile - cd "${S}"/src/csrc - append-flags -fPIC - emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die -} - -#there seem to be unit tests, but they are in such a state. - -src_install() { - java-pkg_newjar lib/onion-${PN}.jar ${PN}.jar - use doc && java-pkg_dojavadoc javadoc - use source && java-pkg_dosrc src/com - dolib.so src/csrc/libfec{8,16}.so || die -} diff --git a/dev-java/fec/fec-1.0.4-r2.ebuild b/dev-java/fec/fec-1.0.4-r2.ebuild index f589f89eb993..71521a4f7a4a 100644 --- a/dev-java/fec/fec-1.0.4-r2.ebuild +++ b/dev-java/fec/fec-1.0.4-r2.ebuild @@ -13,16 +13,19 @@ SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" CDEPEND="dev-java/log4j:0" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip - ${CDEPEND}" +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.6" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-1.6 + app-arch/unzip" PATCHES=( "${FILESDIR}"/"${P}-libfec8path.patch" diff --git a/dev-java/fec/files/libfec8path.patch b/dev-java/fec/files/libfec8path.patch deleted file mode 100644 index 928e3fec62d3..000000000000 --- a/dev-java/fec/files/libfec8path.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- src/com/onionnetworks/fec/Native8Code.java 2002-09-30 20:19:24.000000000 +0200 -+++ src/com/onionnetworks/fec/Native8Code.java.new 2008-03-24 01:38:35.000000000 +0100 -@@ -3,6 +3,7 @@ - //import java.security.AccessController; - //import sun.security.action.*; - import com.onionnetworks.util.*; -+import java.io.File; - - /** - * This class is the frontend for the JNI wrapper for the C implementation of -@@ -21,13 +22,9 @@ - private int code; - - static { -- String path = NativeDeployer.getLibraryPath -- (Native8Code.class.getClassLoader(),"fec8"); -- if (path != null) { -- System.load(path); -- } else { -- System.out.println("Unable to find native library for fec8"); -- } -+ File path = new File("/usr/lib/libfec8.so"); -+ System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']'); -+ System.load(path.getAbsolutePath()); - } - - public Native8Code(int k, int n) { diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest index df6264077a63..d14223eb4f6b 100644 --- a/dev-java/groovy/Manifest +++ b/dev-java/groovy/Manifest @@ -1,2 +1,3 @@ +DIST groovy-2.4.5.zip 10214173 SHA256 6fbbe2c1e16bd1c56b889cbcadff04d055a96568883f885ed904265e4e9d8780 SHA512 055b664d2bc9966f9dd5933ec89f22c28c18323b57db66eeec524c88bdc6ea1090f6f1dd866433d7232d837ca31ca83164d8894c0db1d69e72c7d41f20a8382d WHIRLPOOL c05dcb4afddc9ad217bb99d6cc9618e6a67e7f13f52b99ecc155a9b8e97079dcd8f83402cad61acdbcca4141018965320b8194a84dbf6036f2daf699a2111149 DIST groovy-src-1.7.5.zip 12875363 SHA256 9864b36d681ecc4e4a8f86c8b958203f8e2c01c150a3f992f5f63df552979067 SHA512 fa0f617d1894e6fd7b30216b69dc3060154a31d28a3831e7135b18377c5bc368d193d914d2b77a7daf28498562fb96c04794c874101b23dafb4421e3a1d59404 WHIRLPOOL 478346b89661f6b57cc5740df038e8bf3ced62a84a4de1dea3da94a9519cae6eba43cf583c4a81b2f459f6409a7387c2079098b12495b9f1b669260af4efaccb DIST groovy-src-1.8.5.zip 13131836 SHA256 82f1e45e5886278a4c86ed15dfd90a84b7e43848c72537a235835c7557e8f8cd SHA512 23cddae38b6d0b1b83dae7cf7ebc3fe68f7e8ddb33cd6fa421c0c3c76ca8bf5a8b3fe72cabe915901305f513a2b3269baf205a7a0dd6b1c6f751496d51e0557a WHIRLPOOL 9db6d1da9304e8000de9954faf91d26d76c15e628a25a09c1291afc2ca8b33bbe24d44d891599548df6931db632ae6cd801e83cb05fb6abf33f3282f463a4482 diff --git a/dev-java/groovy/files/groovy-2.4.5-utils.gradle.patch b/dev-java/groovy/files/groovy-2.4.5-utils.gradle.patch new file mode 100644 index 000000000000..6f4638a1bf1d --- /dev/null +++ b/dev-java/groovy/files/groovy-2.4.5-utils.gradle.patch @@ -0,0 +1,116 @@ +--- gradle/utils.gradle.orig 2015-11-01 21:06:26.246486000 +0000 ++++ gradle/utils.gradle 2015-11-01 21:06:57.719486000 +0000 +@@ -16,57 +16,47 @@ + * specific language governing permissions and limitations + * under the License. + */ +-import org.codehaus.groovy.classgen.AnnotationVisitor +-import org.objectweb.asm.ClassWriter +-import org.objectweb.asm.FieldVisitor +-import org.objectweb.asm.Label +-import org.objectweb.asm.MethodVisitor +- +-import static org.objectweb.asm.Opcodes.* +- +-buildscript { +- repositories { +- mavenCentral() +- } +- dependencies { +- classpath "org.ow2.asm:asm:$asmVersion" +- } +-} ++import static org.objectweb.asm.Opcodes.ACC_PUBLIC; ++import static org.objectweb.asm.Opcodes.ACC_STATIC; ++import static org.objectweb.asm.Opcodes.ACC_SUPER; ++import static org.objectweb.asm.Opcodes.ALOAD; ++import static org.objectweb.asm.Opcodes.ATHROW; ++import static org.objectweb.asm.Opcodes.INVOKESPECIAL; ++import static org.objectweb.asm.Opcodes.RETURN; ++import static org.objectweb.asm.Opcodes.V1_5; ++ ++import java.io.File; ++import java.io.FileOutputStream; ++ ++import org.objectweb.asm.ClassWriter; ++import org.objectweb.asm.Label; ++import org.objectweb.asm.MethodVisitor; + +-/** +- * This tasks generates an utility class which allows sneaky throwing. +- */ +-task exceptionUtils { +- ext.classFiles = [ +- "${buildDir}/generated-classes/org/codehaus/groovy/runtime/ExceptionUtils.class", +- "${compileJava.destinationDir}/org/codehaus/groovy/runtime/ExceptionUtils.class"] +- outputs.files classFiles ++public class ExceptionUtils { ++ private final static String gentooClassDestination = "target/classes/org/codehaus/groovy/runtime/ExceptionUtils.class"; + +- doLast { ++ public static void main(String[] args) { + ClassWriter cw = new ClassWriter(0); +- FieldVisitor fv; + MethodVisitor mv; +- AnnotationVisitor av0; +- +- cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, 'org/codehaus/groovy/runtime/ExceptionUtils', null, 'java/lang/Object', null); + +- cw.visitSource('ExceptionUtils.java', null); ++ cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, "org/codehaus/groovy/runtime/ExceptionUtils", null, "java/lang/Object", null); ++ cw.visitSource("ExceptionUtils.java", null); + +- mv = cw.visitMethod(ACC_PUBLIC, '<init>', '()V', null, null); ++ mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null); + mv.visitCode(); + Label l0 = new Label(); + mv.visitLabel(l0); + mv.visitLineNumber(18, l0); + mv.visitVarInsn(ALOAD, 0); +- mv.visitMethodInsn(INVOKESPECIAL, 'java/lang/Object', '<init>', '()V', false); ++ mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false); + mv.visitInsn(RETURN); + Label l1 = new Label(); + mv.visitLabel(l1); +- mv.visitLocalVariable('this', 'Lorg/codehaus/groovy/runtime/ExceptionUtils;', null, l0, l1, 0); ++ mv.visitLocalVariable("this", "Lorg/codehaus/groovy/runtime/ExceptionUtils;", null, l0, l1, 0); + mv.visitMaxs(1, 1); + mv.visitEnd(); + +- mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, 'sneakyThrow', '(Ljava/lang/Throwable;)V', null, null); ++ mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "sneakyThrow", "(Ljava/lang/Throwable;)V", null, null); + mv.visitCode(); + Label l2 = new Label(); + mv.visitLabel(l2); +@@ -75,19 +65,21 @@ + mv.visitInsn(ATHROW); + Label l3 = new Label(); + mv.visitLabel(l3); +- mv.visitLocalVariable('e', 'Ljava/lang/Throwable;', null, l2, l3, 0); ++ mv.visitLocalVariable("e", "Ljava/lang/Throwable;", null, l2, l3, 0); + mv.visitMaxs(1, 1); + mv.visitEnd(); + + cw.visitEnd(); ++ FileOutputStream fos = null; + +- logger.lifecycle('Generating ExceptionUtils') +- classFiles.each { classFile -> +- def output = file(classFile) +- output.parentFile.mkdirs() +- output.withOutputStream { +- it << cw.toByteArray() +- } +- } +- } ++ File f = new File(gentooClassDestination); ++ f.getParentFile().mkdirs(); ++ try { ++ fos = new FileOutputStream(f); ++ fos.write(cw.toByteArray()); ++ fos.close(); ++ } catch (Exception e) { ++ e.printStackTrace(); ++ } ++ } + } diff --git a/dev-java/groovy/groovy-2.4.5.ebuild b/dev-java/groovy/groovy-2.4.5.ebuild new file mode 100644 index 000000000000..62183ff87c6d --- /dev/null +++ b/dev-java/groovy/groovy-2.4.5.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple versionator + +MY_PN="${PN^^}" +MY_PV="$(replace_all_version_separators _ ${PV})" +MY_P="${MY_PN}_${MY_PV}" + +DESCRIPTION="A multi-faceted language for the Java platform" +HOMEPAGE="http://www.groovy-lang.org/" +SRC_URI="https://github.com/apache/incubator-${PN}/archive/${MY_P}.zip -> ${P}.zip" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +CDEPEND=" + dev-java/jansi:0 + dev-java/xstream:0 + dev-java/commons-cli:1 + >=dev-java/asm-5.0.3:4 + >=dev-java/antlr-2.7.7-r7:0 +" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.6" +DEPEND=" + ${CDEPEND} + >=virtual/jdk-1.6 + app-arch/unzip" + +JAVA_GENTOO_CLASSPATH=" + asm-4 + antlr + jansi + xstream + commons-cli-1 +" + +S="${WORKDIR}/incubator-${PN}-${MY_P}" + +# ExceptionUtil filename. +EU="ExceptionUtils.java" + +# List of antlr grammar files. +ANTLR_GRAMMAR_FILES=( + org/codehaus/groovy/antlr/groovy.g + org/codehaus/groovy/antlr/java/java.g +) + +# Patches utils.gradle. It basically rewrites ExceptionUtils. +PATCHES=( + "${FILESDIR}"/"${P}-utils.gradle.patch" +) + +# Add target/classes to the CP as we're generating an extra class there. +JAVA_GENTOO_CLASSPATH_EXTRA="target/classes" + +# This function cleans up the source directory. +# We're ONLY interested in the "src/main" directory content and nothing else. +# (for the time being). +groovy_cleanup_source_files() { + ebegin "Cleaning up useless files" + mv src/main "${T}" || die + mv gradle/utils.gradle "${T}" || die + rm -rf * || die + mv "${T}"/main/* . || die + rm -rf "${T}"/main || die + eend $? +} + +java_prepare() { + epatch "${PATCHES[@]}" + groovy_cleanup_source_files +} + +# This function generates the ANTLR grammar files. +generate_antlr_grammar() { + for grammar_file in "${@}"; do + local my_grammar_file=$(basename ${grammar_file}) + + einfo "Generating \"${my_grammar_file}\" grammar file" + local my_grammar_dir=$(dirname ${grammar_file}) + + cd "${S}/${my_grammar_dir}" || die + antlr ${my_grammar_file} || die + + cd "${S}" || die + done +} + +# This function generates ExceptionUtils.class. +# ExceptionUtils is a helper class needed when compiling Groovy 2.x. +# Normally, this class is generated via a Gradle task at compile time. Since we +# don't use Gradle here.. we've translated it into a plain Java file and have +# it generate the same data. +generate_exceptionutils() { + ebegin "Copying ${EU}" + mv "${T}/utils.gradle" "${EU}" || die + eend $? + + ejavac -classpath "$(java-pkg_getjar --build-only asm-4 asm.jar)" ${EU} + + ebegin "Running ${EU%.java}" + $(java-config -J) -classpath "$(java-pkg_getjar --build-only asm-4 asm.jar):." ${EU%.java} || die + eend $? +} + +src_compile() { + generate_antlr_grammar "${ANTLR_GRAMMAR_FILES[@]}" + generate_exceptionutils + java-pkg-simple_src_compile +} + +src_install() { + java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler + java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain + java-pkg-simple_src_install + + # TODO: groovy console and groovy shell are parts of the "subprojects" + # directory. figure out a way to compile them. :\ + # java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell + # java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console + + # TODO: grape is written in groovy and to compile it, you need .. groovy. + # java-pkg_dolauncher "grape" --main org.codehaus.groovy.tools.GrapeMain +} diff --git a/dev-java/groovy/metadata.xml b/dev-java/groovy/metadata.xml index 7b8ff2d0f24f..55f62111c613 100644 --- a/dev-java/groovy/metadata.xml +++ b/dev-java/groovy/metadata.xml @@ -2,23 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>java</herd> - <herd>proxy-maintainers</herd> <maintainer> - <email>the.dmol@gmail.com</email> - <name>Ivan Baidakou</name> + <email>monsieurp@gentoo.org</email> </maintainer> - <longdescription> -Groovy is a new agile dynamic language for the JVM combining lots of great -features from languages like Python, Ruby and Smalltalk and making them -available to the Java developers using a Java-like syntax. - -Groovy is designed to help you get things done on the Java platform in a -quicker, more concise and fun way - bringing the power of Python and Ruby inside -the Java platform. - -Groovy can be used as an alternative compiler to javac to generate standard Java -bytecode to be used by any Java project or it can be used dynamically as an -alternative language such as for scripting Java objects, templating or writing -unit test cases. - </longdescription> </pkgmetadata> diff --git a/dev-java/guava/guava-13.0.1-r3.ebuild b/dev-java/guava/guava-13.0.1-r3.ebuild index b29b74c5cd66..e048dc3f9ba2 100644 --- a/dev-java/guava/guava-13.0.1-r3.ebuild +++ b/dev-java/guava/guava-13.0.1-r3.ebuild @@ -15,12 +15,12 @@ LICENSE="Apache-2.0" SLOT="13" KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -DEPEND=" +CDEPEND=" dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0" -RDEPEND="${DEPEND} +RDEPEND="${CDEPEND} virtual/jre:1.7" -DEPEND="${DEPEND} +DEPEND="${CDEPEND} app-arch/unzip virtual/jdk:1.7" # https://github.com/google/guava/issues/1738 JAVA_GENTOO_CLASSPATH="jsr305" diff --git a/dev-java/guava/guava-14.0.1.ebuild b/dev-java/guava/guava-14.0.1.ebuild index 3dcbc4a576cf..0a7d17f1a020 100644 --- a/dev-java/guava/guava-14.0.1.ebuild +++ b/dev-java/guava/guava-14.0.1.ebuild @@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$ LICENSE="Apache-2.0" SLOT="14" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -COMMON_DEP=" +CDEPEND=" dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0" -RDEPEND="${COMMON_DEP} +RDEPEND="${CDEPEND} || ( virtual/jre:1.7 virtual/jre:1.6 )" -DEPEND="${COMMON_DEP} +DEPEND="${CDEPEND} app-arch/unzip virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635 diff --git a/dev-java/guava/guava-15.0.ebuild b/dev-java/guava/guava-15.0.ebuild index 28aac3df2740..511bca4b6a68 100644 --- a/dev-java/guava/guava-15.0.ebuild +++ b/dev-java/guava/guava-15.0.ebuild @@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$ LICENSE="Apache-2.0" SLOT="15" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -COMMON_DEP=" +CDEPEND=" dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0" -RDEPEND="${COMMON_DEP} +RDEPEND="${CDEPEND} || ( virtual/jre:1.7 virtual/jre:1.6 )" -DEPEND="${COMMON_DEP} +DEPEND="${CDEPEND} app-arch/unzip virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635 diff --git a/dev-java/guava/guava-16.0.1.ebuild b/dev-java/guava/guava-16.0.1.ebuild index 6f6c46b11c76..e3d99f816aba 100644 --- a/dev-java/guava/guava-16.0.1.ebuild +++ b/dev-java/guava/guava-16.0.1.ebuild @@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$ LICENSE="Apache-2.0" SLOT="16" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -COMMON_DEP=" +CDEPEND=" dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0" -RDEPEND="${COMMON_DEP} +RDEPEND="${CDEPEND} || ( virtual/jre:1.7 virtual/jre:1.6 )" -DEPEND="${COMMON_DEP} +DEPEND="${CDEPEND} app-arch/unzip virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635 diff --git a/dev-java/guava/guava-17.0.ebuild b/dev-java/guava/guava-17.0.ebuild index 4cd108577c1d..8ebfe1f7ca65 100644 --- a/dev-java/guava/guava-17.0.ebuild +++ b/dev-java/guava/guava-17.0.ebuild @@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$ LICENSE="Apache-2.0" SLOT="17" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -COMMON_DEP=" +CDEPEND=" dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0" -RDEPEND="${COMMON_DEP} +RDEPEND="${CDEPEND} || ( virtual/jre:1.7 virtual/jre:1.6 )" -DEPEND="${COMMON_DEP} +DEPEND="${CDEPEND} app-arch/unzip virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635 diff --git a/dev-java/guava/guava-18.0.ebuild b/dev-java/guava/guava-18.0.ebuild index 4f13f4070653..12979a4db65a 100644 --- a/dev-java/guava/guava-18.0.ebuild +++ b/dev-java/guava/guava-18.0.ebuild @@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$ LICENSE="Apache-2.0" SLOT="18" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -COMMON_DEP=" +CDEPEND=" dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0" -RDEPEND="${COMMON_DEP} +RDEPEND="${CDEPEND} || ( virtual/jre:1.7 virtual/jre:1.6 )" -DEPEND="${COMMON_DEP} +DEPEND="${CDEPEND} app-arch/unzip virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635 diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild index 8c12be844710..51ec8db2597c 100644 --- a/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild +++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/fusesource/hawtjni/archive/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 x86 ppc ppc64" DEPEND=">=virtual/jdk-1.5" RDEPEND=">=virtual/jre-1.5" diff --git a/dev-java/hibernate-annotations/Manifest b/dev-java/hibernate-annotations/Manifest deleted file mode 100644 index e97387832c46..000000000000 --- a/dev-java/hibernate-annotations/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST hibernate-3.2.0.ga.tar.gz 19744419 SHA256 e242eb6b243e7b0fac132f37f4e29bf06ec87c37be5a80a0849709a6cb89b03f SHA512 2c2c8ab8c15df1a36305da1a705ea0f1ab59f306f2cd07520ed95a68bd60f0322a8813d5eed7408e89b5e79cb7eb0e6acc364f72c3a59ca05b2de0d53ffb8c3a WHIRLPOOL 05054879c82ad573d7e714150cf2a90bff4ed88cb161ec9bcc4fcd6d8068f066aed156b5d46e56df10e00f91dc96f55958b3bca0a3bc1c1a5b80cb9e94951d0c -DIST hibernate-annotations-3.2.0.GA.tar.gz 2075220 SHA256 7ac81b03c4d4623cb7c883a3f85a47078edb261cde3fee2bfbc4fcf70a4e9bc8 SHA512 b6ee844fed4f1c2636669155051d082c167f26653b4dfb663e9fd154c6ced63034d62907ab095955cacef26ec61762ba1cdf693a08073f7c48fb530148a9d391 WHIRLPOOL 454e6f69d6558b2baf614a4b68241968198ca669f21974805b1537920b1147cbef9d473f541a8319fd5b81511912da880df891d909e144be9fc3a39771d9986e diff --git a/dev-java/hibernate-annotations/hibernate-annotations-3.2.0.ebuild b/dev-java/hibernate-annotations/hibernate-annotations-3.2.0.ebuild deleted file mode 100644 index c5733befdf22..000000000000 --- a/dev-java/hibernate-annotations/hibernate-annotations-3.2.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit java-pkg-2 java-ant-2 - -MY_PV="${PV}.GA" -MY_P="${PN}-${MY_PV}" -HIBERNATE_P="hibernate-3.2.0.ga" - -DESCRIPTION="Annotations support for Hibernate" -HOMEPAGE="http://annotations.hibernate.org" -SRC_URI="mirror://sourceforge/hibernate/${MY_P}.tar.gz mirror://sourceforge/hibernate/${HIBERNATE_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="3.2" -KEYWORDS="~amd64" - -IUSE="doc source" - -COMMON_DEPS=" - dev-java/commons-logging:0 - dev-java/dom4j:1 - dev-java/glassfish-persistence:0 - dev-java/hibernate:3.1 - dev-java/lucene:2.1" - -DEPEND=">=virtual/jdk-1.5 - app-arch/zip:0 - dev-java/ant-antlr:0 - dev-java/ant-junit:0 - dev-java/commons-collections:0 - ${COMMON_DEPS} - " -RDEPEND=">=virtual/jre-1.5 - dev-java/lucene:1 - ${COMMON_DEPS} - " - -S="${WORKDIR}/${MY_P}" -HIBERNATE_S="${WORKDIR}/hibernate-${SLOT}" - -java_prepare() { - cd "${HIBERNATE_S}"/lib || die - - java-pkg_jar-from --build-only ant-antlr,commons-collections - java-pkg_jar-from --build-only ant-core ant.jar - - java-pkg_jar-from commons-logging,dom4j-1,glassfish-persistence,hibernate-3.1,lucene-2.1 -} - -src_install() { - java-pkg_dojar ${PN}.jar - - use doc && java-pkg_dojavadoc doc/api - use source && java-pkg_dosrc src/* -} diff --git a/dev-java/hibernate-annotations/metadata.xml b/dev-java/hibernate-annotations/metadata.xml deleted file mode 100644 index 5d17a7d4a79d..000000000000 --- a/dev-java/hibernate-annotations/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>java</herd> - <upstream> - <remote-id type="sourceforge">hibernate</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest deleted file mode 100644 index e0725a4b8069..000000000000 --- a/dev-java/hibernate/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST hibernate-3.1.3.tar.gz 18529984 SHA256 e34feddabd7e1a432f11c670d08338720beb6c1dc5bb62952612f05260944c49 SHA512 5a5acf5abc82bbc38313148dc73cea981f69c68fb6b3023f1c6261a392853b5bd4a9852991011891e8b678ff0c35aea9554ebdd17e0da1b8fdf816ffcaca4dea WHIRLPOOL 0c2c6d5f0d5c04e9cb5e10f9eb22dbb796133791a57b8c4c18e780aa8eb637fd5fe2fa793da4885fdfe8902f7676bcce8e740219afc5176be4284bb575c99497 diff --git a/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch b/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch deleted file mode 100644 index 16d0a05a7709..000000000000 --- a/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/org/hibernate/cache/EhCache.java.orig 2015-10-07 14:06:39.968486000 +0000 -+++ src/org/hibernate/cache/EhCache.java 2015-10-07 14:06:49.900486000 +0000 -@@ -192,9 +192,9 @@ - catch (IllegalStateException e) {
- throw new CacheException(e);
- }
-- catch (IOException e) {
-- throw new CacheException(e);
-- }
-+ // catch (IOException e) {
-+ // throw new CacheException(e);
-+ // }
- }
-
- /**
-@@ -289,4 +289,4 @@ - return "EHCache(" + getRegionName() + ')';
- }
-
--} -\ No newline at end of file -+}
diff --git a/dev-java/hibernate/hibernate-3.1.3-r5.ebuild b/dev-java/hibernate/hibernate-3.1.3-r5.ebuild deleted file mode 100644 index 151b3535e9a6..000000000000 --- a/dev-java/hibernate/hibernate-3.1.3-r5.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" - -WANT_ANT_TASKS="ant-antlr ant-swing ant-junit" -JAVA_PKG_IUSE="doc source" -JAVA_PKG_WANT_BOOTCLASSPATH="1.5" - -inherit java-pkg-2 java-ant-2 - -MY_PV="3.1" -DESCRIPTION="A powerful, ultra-high performance object / relational persistence and query service for Java" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.hibernate.org" -LICENSE="LGPL-2" -IUSE="" -SLOT="3.1" -KEYWORDS="amd64 x86" - -CDEPENDEND=" - >=dev-java/antlr-2.7.7:0[java] - dev-java/c3p0:0 - dev-java/cglib:3 - dev-java/commons-collections:0 - dev-java/commons-logging:0 - dev-java/dom4j:1 - dev-java/ehcache:1.2 - dev-java/oscache:0 - dev-java/proxool:0 - dev-java/swarmcache:1.0 - java-virtuals/transaction-api:0 - dev-java/sun-jacc-api:0 - dev-java/ant-core:0 - dev-java/asm:2.2" -RDEPEND=">=virtual/jre-1.6 - ${CDEPENDEND}" -DEPEND=">=virtual/jdk-1.6 - ${CDEPENDEND}" - -S="${WORKDIR}/${PN}-${MY_PV}" - -JAVA_ANT_ENCODING="ISO-8859-1" - -PATCHES=( - "${FILESDIR}"/"${P}-EhCache.java.patch" -) - -java_prepare() { - epatch "${PATCHES[@]}" - - java-ant_rewrite-bootclasspath 1.5 - - # this depends on jboss - rm src/org/hibernate/cache/JndiBoundTreeCacheProvider.java \ - src/org/hibernate/cache/TreeCache.java \ - src/org/hibernate/cache/TreeCacheProvider.java - - rm -v *.jar lib/*.jar || die -} - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH=" -c3p0,commons-collections,commons-logging,cglib-3,transaction-api -dom4j-1,ehcache-1.2,oscache,proxool,swarmcache-1.0 -sun-jacc-api,antlr,ant-core,asm-2.2 -" -EANT_EXTRA_ARGS="-Dnosplash -Ddist.dir=dist" - -src_install() { - java-pkg_dojar hibernate3.jar - dodoc changelog.txt readme.txt - use doc && java-pkg_dohtml -r doc/api doc/other doc/reference - use source && java-pkg_dosrc src/* -} diff --git a/dev-java/hibernate/metadata.xml b/dev-java/hibernate/metadata.xml deleted file mode 100644 index 5d17a7d4a79d..000000000000 --- a/dev-java/hibernate/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>java</herd> - <upstream> - <remote-id type="sourceforge">hibernate</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild index fa953f27cdfa..9d00dfd58828 100644 --- a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild +++ b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild @@ -38,7 +38,7 @@ src_prepare() { } src_configure() { - JAVA_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core) + JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core) } src_install() { diff --git a/dev-java/jansi-native/jansi-native-1.5.ebuild b/dev-java/jansi-native/jansi-native-1.5.ebuild index 680d5edf6bbc..9e37c8008e98 100644 --- a/dev-java/jansi-native/jansi-native-1.5.ebuild +++ b/dev-java/jansi-native/jansi-native-1.5.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/fusesource/${PN}/tarball/${P} -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 x86 ppc ppc64" CDEPEND="dev-java/hawtjni-runtime:0" diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest index cb067a4ddfc3..c581060feeac 100644 --- a/dev-java/jansi/Manifest +++ b/dev-java/jansi/Manifest @@ -1,3 +1,2 @@ -DIST jansi-1.1-sources.jar 18401 SHA256 c347970cb7e74832ddc7a37966ec9e1697965200eaaadcf4f1f3f407ad965ce4 SHA512 6f731c3e87b3662ce03a951bea837aa02822cb21ad477e458f8a6ce11b6943fba88d5b6c3786bf47fb9e48d4d30debb4527812fa6c58fe973244ace459b6031d WHIRLPOOL 532adaac74483967079676569c446cfe903a7b22dabffddd4be69dac0c7c4c45ea9bad21fcd5658f5768be68650fe971773a549bcbb6973768a0cd912ba00329 DIST jansi-1.11.tar.gz 252095 SHA256 e5c7bd4d9ccba7a2f191380111960c7bd699a7ffee370891b2ef7f905047cccf SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1 WHIRLPOOL 30bc2f3bcf1f74ed5b939e9cfb2c16e54f41e679a97c9983643207b264ddd8fdaf9a898c188f12ea2e84742c45942946f59dda97de1b76f39da050329ef91c24 DIST jansi-1.5.zip 211616 SHA256 e904c8197f100d91c84207e0ec97aa7d197ea8c916d3aa668526b2d4d0279773 SHA512 784c01b7ab48307cf881439d5c3531949a6459e8a90667f1ee7a73f9cbce72710fcf4af8b4cae610d15085641567c0d51cab487488daa0c1b0a4605864de2775 WHIRLPOOL ddc5fcdcb04115b7c24ada6ebf8be9c374fbfd09bf368a9388110b9f8e509c2ae20ec78874767a52ffeed9ecf3ff3ee3c4bf59efcee304d274aa8154ad28cf72 diff --git a/dev-java/jansi/jansi-1.1.ebuild b/dev-java/jansi/jansi-1.1.ebuild deleted file mode 100644 index 52ddcb5e8ee8..000000000000 --- a/dev-java/jansi/jansi-1.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 - -DESCRIPTION="Jansi is a small java library that allows you to use ANSI escape sequences in your console output" -HOMEPAGE="http://jansi.fusesource.org/" - -SRC_URI="http://jansi.fusesource.org/repo/release/org/fusesource/jansi/jansi/${PV}/${P}-sources.jar" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="" - -RDEPEND=">=virtual/jre-1.5 - dev-java/jna" - -DEPEND=">=virtual/jdk-1.5 - dev-java/jna" - -src_compile() { - mkdir target - ejavac -classpath "$(java-pkg_getjars jna)" org/fusesource/jansi/*.java org/fusesource/jansi/internal/*.java -d target - jar -cf jansi.jar -C target . - - use doc && mkdir target/html && javadoc org/fusesource/jansi/*.java org/fusesource/jansi/internal/*.java -d target/html -} - -src_install() { - java-pkg_newjar "${PN}.jar" - use doc && java-pkg_dojavadoc "target/html/" - use source && java-pkg_dosrc "org" -} diff --git a/dev-java/jansi/jansi-1.5.ebuild b/dev-java/jansi/jansi-1.5.ebuild index 844359ff128b..5b7e58f57c33 100644 --- a/dev-java/jansi/jansi-1.5.ebuild +++ b/dev-java/jansi/jansi-1.5.ebuild @@ -5,7 +5,7 @@ EAPI="5" JAVA_PKG_IUSE="source test doc" -inherit vcs-snapshot java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 DESCRIPTION="Jansi is a small java library that allows you to use ANSI escape sequences in your console output" HOMEPAGE="http://jansi.fusesource.org/" @@ -13,7 +13,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.zip" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86 ppc ppc64" CDEPEND="dev-java/jansi-native:0" diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest index 5d18634502db..314e6743e9f4 100644 --- a/dev-java/javacup/Manifest +++ b/dev-java/javacup/Manifest @@ -1,2 +1,3 @@ DIST java-cup-src-11b-20150326.tar.gz 376913 SHA256 3df107f48b9726d1bf6c4061f6a1304b125aa766da211cd17ff85a2d56339825 SHA512 020beda9f019e03b1d35a20b7c10f4d43d5d39e46f3beb0a993fe6471f4c1369440d76b4f88a6161f8169406760720c7811c07396ca0ad7eab5ee9e4b091b733 WHIRLPOOL 54e2b7d53918c0e053c690c0db14e5ab2ddc2454c64f7a531690b9e4fe37e76aee1e9bb3711cc515423cf2d288ca7054a903d331619b1dd0a28f62121555e004 +DIST java-cup-src-11b-20151001.tar.gz 313405 SHA256 959189360a8530c9e06cbf8cb99795bb4fcc25a00d774e961c98611c769b8f33 SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e WHIRLPOOL cba8a784f156b21ae2a40afe02112b5bded04176bd54b3190f1d210e5603334553f170b02f91f970ade3f68d8d00715f1237dd43476712f4e24c5d0857bf6304 DIST javacup-0.11a_beta20060608.tar.bz2 285727 SHA256 cb3ad4951d734bd1e5a6ff835018dea26a47564f820ae0a925f9c30f2fb7e1ff SHA512 383172f7d9cb127ad5d1d6de561eaf53b057bf7511f6f8c353fc03860daabb023e11330e0518b9c390e255a643c9c1e609b5fbdfd3c2e92dd68dc2d2354a931f WHIRLPOOL 6480219de3a997eb9a942ce816f9868dc13d06b8c0553521e9cf37fe568265cf752efcd36d9b64ea424d225d4823fce0652c9b0d7e1c853e38cd9f00fb12ce30 diff --git a/dev-java/javacup/javacup-0.11b_p20151001.ebuild b/dev-java/javacup/javacup-0.11b_p20151001.ebuild new file mode 100644 index 000000000000..ad8742f2b4c4 --- /dev/null +++ b/dev-java/javacup/javacup-0.11b_p20151001.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="doc source" + +inherit eutils java-pkg-2 java-ant-2 + +MY_PV=${PV/_beta/-} +MY_PV=${MY_PV/_p/-} +MY_PV=${MY_PV#0.} +MY_P=java-cup-${MY_PV%-*} + +DESCRIPTION="CUP Parser Generator for Java" +HOMEPAGE="http://www2.cs.tum.edu/projects/cup/" +SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +DEPEND=">=virtual/jdk-1.7 + >=dev-java/ant-core-1.7.0:0 + >=dev-java/jflex-1.6.1:0" + +RDEPEND=">=virtual/jre-1.7" + +JAVA_ANT_REWRITE_CLASSPATH="yes" +JAVA_ANT_CLASSPATH_TAGS+=" taskdef" + +S="${WORKDIR}" + +java_prepare() { + # Bizarrely, you can't build from the tarball without this patch. + epatch "${FILESDIR}"/${PN}-0.11b_beta20150326-build-xml-svn.patch + + # The JFlex package name has changed to lower case. + sed -i "s/JFlex\./jflex./g" build.xml || die + + # Remove the bundled JFlex. + rm -v bin/JFlex.jar || die +} + +src_configure() { + EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core,jflex) + java-ant-2_src_configure +} + +src_compile() { + einfo "Bootstrapping with bundled javacup ..." + EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/bin/${MY_P:0:-1}.jar" eant + + # Clean everything except the new jar. + rm -rv java/ classes/ || die + + einfo "Recompiling with newly built javacup ..." + EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/dist/${MY_P}.jar" eant + + use doc && ejavadoc -sourcepath src/ -d javadoc java_cup +} + +src_install() { + java-pkg_newjar dist/${MY_P}.jar + java-pkg_newjar dist/${MY_P}-runtime.jar ${PN}-runtime.jar + java-pkg_dolauncher ${PN} --jar ${PN}.jar + java-pkg_register-ant-task + + dodoc changelog.txt + docinto html + dodoc manual.html + + use source && java-pkg_dosrc java/* + use doc && java-pkg_dojavadoc javadoc +} diff --git a/dev-java/javax-inject/Manifest b/dev-java/javax-inject/Manifest index d24bcf5991d3..02ae8060380e 100644 --- a/dev-java/javax-inject/Manifest +++ b/dev-java/javax-inject/Manifest @@ -1 +1,2 @@ DIST javax.inject-1-bundle.jar 43323 SHA256 efe257736656de99747098ceafd64dae7b5722a585176eb79ee9dbf7cd995ee5 SHA512 397db77e3426a4539b895535557cbe9e1795c186a9bc397efa716b42d02b03c4403f20c4c13fb2b99b25e5a14abd3407e9d0d843cd4c3442a1386a2b30ba50e3 WHIRLPOOL 466ae846ad0c8abcc1279e314f79121bd17c627d3729e7dd1c144b5d67f161e0f5fdee278b51c689cdcdcc01ac5fe5f2c8b8b103d94e18413f2b37cfb1b4b7f7 +DIST javax.inject-1-sources.jar 10928 SHA256 c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b WHIRLPOOL 4ae44b7088d381f8875d910bafb74e99b724277bffc5274bde75588b614aa0defd66b43a0774957f9cba4d28435397b3e130d9373b0e68e3a29857f0a36cf18b diff --git a/dev-java/javax-inject/javax-inject-1-r2.ebuild b/dev-java/javax-inject/javax-inject-1-r2.ebuild new file mode 100644 index 000000000000..ce059bbcc4ab --- /dev/null +++ b/dev-java/javax-inject/javax-inject-1-r2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +MY_PN="${PN/-/.}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Dependency injection for Java (JSR-330)" +HOMEPAGE="https://code.google.com/p/atinject/" +SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +IUSE="" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.6" +DEPEND=" + ${CDEPEND} + >=virtual/jdk-1.6 + app-arch/unzip" diff --git a/dev-java/jax-rpc/Manifest b/dev-java/jax-rpc/Manifest deleted file mode 100644 index e91430bba90e..000000000000 --- a/dev-java/jax-rpc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jax-rpc-1.1.3.01.tar.bz2 763737 SHA256 54d29016732aefb35892b98a7393a8d47061e37933e8387292fd103d2488542e SHA512 a08e5389a93ddbe72c0598bb96698f2b1b87030aa9cc5ac33460eaeeb639970ee1662aeef9c0e703dac202bf27f9996b2f5e5bf48821786a32e3c67e9f1bc45d WHIRLPOOL 4309eedb2aa5a673e9a4d4314ef4eb1ebdb653f9941172a4a372f4723186eda63025dc2e2e59bb7a073459329f4d32a3d30b7126b4b305f75b970015734a9ebe diff --git a/dev-java/jax-rpc/files/jax-rpc-1.1.3.01-length.patch b/dev-java/jax-rpc/files/jax-rpc-1.1.3.01-length.patch deleted file mode 100644 index 990b17457476..000000000000 --- a/dev-java/jax-rpc/files/jax-rpc-1.1.3.01-length.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/com/sun/xml/rpc/streaming/FastInfosetReader.java.vanilla 2007-03-18 16:27:14.000000000 +0100 -+++ src/com/sun/xml/rpc/streaming/FastInfosetReader.java 2007-03-18 16:26:23.000000000 +0100 -@@ -296,7 +296,7 @@ - - private boolean isWhiteSpaceCharacters() { - int i = _charactersOffset; -- final int end = i + _charactersLength; -+ final int end = i + _characters.length; - while (i < end) { - if (_characters[i++] > '\u0020') { - return false; diff --git a/dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild b/dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild deleted file mode 100644 index 4175ef0b59c9..000000000000 --- a/dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 eutils - -DESCRIPTION="Reference Implementation of JAX-RPC, the Java APIs for XML based RPC" -HOMEPAGE="http://jax-rpc.dev.java.net/" -# CVS: cvs -d :pserver:guest@cvs.dev.java.net:/cvs checkout -r JAXRPC_1_1_3_01_PKG_081806 jax-rpc/jaxrpc-ri -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="CDDL" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="" - -COMMON_DEP="=dev-java/servletapi-2.4* - dev-java/fastinfoset - dev-java/jaxp - dev-java/jsr67 - dev-java/jsr101 - dev-java/jsr173 - dev-java/relaxng-datatype - dev-java/saaj - dev-java/sax - dev-java/sun-jaf - java-virtuals/javamail - dev-java/xsdlib - >=dev-java/xerces-2.8" -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.5 - ${COMMON_DEP}" - -EANT_BUILD_TARGET="image" -EANT_DOC_TARGET="javadocs" -EANT_EXTRA_ARGS="-Djava.mail=lib/mail.jar" - -S="${WORKDIR}/jaxrpc-ri" - -src_unpack() { - - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-length.patch" - - cd "${S}/lib" - - java-pkg_jar-from --build-only ant-core - java-pkg_jar-from fastinfoset fastinfoset.jar FastInfoset.jar - java-pkg_jar-from jaxp - java-pkg_jar-from jsr67 jsr67.jar saaj-api.jar - java-pkg_jar-from jsr101 - java-pkg_jar-from jsr173 jsr173.jar jsr173_api.jar - java-pkg_jar-from relaxng-datatype - java-pkg_jar-from saaj saaj.jar saaj-impl.jar - java-pkg_jar-from sax - java-pkg_jar-from servletapi-2.4 servlet-api.jar servlet.jar - java-pkg_jar-from sun-jaf - java-pkg_jar-from --virtual javamail - java-pkg_jar-from xsdlib - java-pkg_jar-from xerces-2 - - cd "${S}/src" - find . -name '*.java' -exec sed -i \ - -e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \ - {} \; - -} - -src_install() { - - java-pkg_dojar "build/lib/jaxrpc-spi.jar" - java-pkg_dojar "build/lib/jaxrpc-impl.jar" - - use doc && java-pkg_dojavadoc build/javadocs - use source && java-pkg_dosrc src - -} diff --git a/dev-java/jax-rpc/jax-rpc-1.1.3.01.ebuild b/dev-java/jax-rpc/jax-rpc-1.1.3.01.ebuild deleted file mode 100644 index d32b93a6406b..000000000000 --- a/dev-java/jax-rpc/jax-rpc-1.1.3.01.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 eutils - -DESCRIPTION="Reference Implementation of JAX-RPC, the Java APIs for XML based RPC" -HOMEPAGE="http://jax-rpc.dev.java.net/" -# CVS: cvs -d :pserver:guest@cvs.dev.java.net:/cvs checkout -r JAXRPC_1_1_3_01_PKG_081806 jax-rpc/jaxrpc-ri -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="CDDL" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~x86-fbsd" - -IUSE="" - -COMMON_DEP="=dev-java/servletapi-2.4* - dev-java/fastinfoset - dev-java/jaxp - dev-java/jsr67 - dev-java/jsr101 - dev-java/jsr173 - dev-java/relaxng-datatype - dev-java/saaj - dev-java/sax - dev-java/sun-jaf - dev-java/sun-javamail - dev-java/xsdlib - >=dev-java/xerces-2.8" -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.5 - ${COMMON_DEP}" - -EANT_BUILD_TARGET="image" -EANT_DOC_TARGET="javadocs" -EANT_EXTRA_ARGS="-Djava.mail=lib/mail.jar" - -S="${WORKDIR}/jaxrpc-ri" - -src_unpack() { - - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-length.patch" - - cd "${S}/lib" - - java-pkg_jar-from --build-only ant-core - java-pkg_jar-from fastinfoset fastinfoset.jar FastInfoset.jar - java-pkg_jar-from jaxp - java-pkg_jar-from jsr67 jsr67.jar saaj-api.jar - java-pkg_jar-from jsr101 - java-pkg_jar-from jsr173 jsr173.jar jsr173_api.jar - java-pkg_jar-from relaxng-datatype - java-pkg_jar-from saaj saaj.jar saaj-impl.jar - java-pkg_jar-from sax - java-pkg_jar-from servletapi-2.4 servlet-api.jar servlet.jar - java-pkg_jar-from sun-jaf - java-pkg_jar-from sun-javamail - java-pkg_jar-from xsdlib - java-pkg_jar-from xerces-2 - - cd "${S}/src" - find . -name '*.java' -exec sed -i \ - -e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \ - {} \; - -} - -src_install() { - - java-pkg_dojar "build/lib/jaxrpc-spi.jar" - java-pkg_dojar "build/lib/jaxrpc-impl.jar" - - use doc && java-pkg_dojavadoc build/javadocs - use source && java-pkg_dosrc src - -} diff --git a/dev-java/jaxr/jaxr-1.0.6-r1.ebuild b/dev-java/jaxr/jaxr-1.0.6-r2.ebuild index 90a19b0bfbe7..aadbcad020b5 100644 --- a/dev-java/jaxr/jaxr-1.0.6-r1.ebuild +++ b/dev-java/jaxr/jaxr-1.0.6-r2.ebuild @@ -16,18 +16,23 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" -CDEPEND="dev-java/jaxb:2 - dev-java/jsr173:0 +CDEPEND=" + dev-java/jaxb:2 dev-java/jsr67:0 dev-java/jsr93:0 - dev-java/sun-jaf:0" -DEPEND=">=virtual/jdk-1.6 - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" + dev-java/jsr173:0" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-1.6" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.6" S="${WORKDIR}/${PN}-ri" +JAVA_ANT_REWRITE_CLASSPATH="yes" EANT_BUILD_TARGET="compile" EANT_DOC_TARGET="javadoc-build" @@ -36,7 +41,6 @@ EANT_GENTOO_CLASSPATH=" jsr67 jsr173 jsr93 - sun-jaf " java_prepare() { @@ -45,8 +49,7 @@ java_prepare() { java-pkg_jar-from --into lib jaxb-2 java-pkg_jar-from --into lib jsr67 jsr67.jar saaj-api.jar java-pkg_jar-from --into lib jsr173 jsr173.jar jsr173_1.0_api.jar - java-pkg_jar-from --into lib jsr93 jsr93-api.jar jaxr-api.jar - java-pkg_jar-from --into lib sun-jaf + java-pkg_jar-from --into lib jsr93 epatch "${FILESDIR}/${P}-javadoc.patch" diff --git a/dev-java/jcommander/Manifest b/dev-java/jcommander/Manifest index 5725b416cb5e..d7d7f2ae526a 100644 --- a/dev-java/jcommander/Manifest +++ b/dev-java/jcommander/Manifest @@ -1 +1,2 @@ DIST jcommander-1.32.tar.gz 61837 SHA256 21f8dd9aaae91800648a81d44a71b6b7574e828de7faa1667c9c4c64c653f6c5 SHA512 dd23674e5ca91f770ec677579f3c2eb16cbf4f82154f9d1a728debeaef75f0e00e50d58336e7b05b63f601188380d62075df0889b2df8e1fffe48c472cfa5df0 WHIRLPOOL 3971b6c7b2d799f1d1063167d4079365d77086bbf0a76e9f8990febc01e82f78f7c2aa9dc809b04acbf21af5bd8cfb5b5c1de6fd506951e031d5b01e512076b6 +DIST jcommander-1.48.tar.gz 64544 SHA256 dcba3a05e60731c8945166089f7f1a1600150f438e5f23d36e6e766d1a34c5e2 SHA512 1304bb14ecb89f9945e8219f3229941e556c7cccef52a2eb4e4663da9dbf9fa5ecec4914275a743fb7d90ca301153284dc76dd380903aac93db1507894d72a6e WHIRLPOOL 85d1bb10129e93c69932b84d5af7c6084fa089c51a8afdfe980512a52dfe47ec9c678bfc91cfaffa61a13a4dea8953a3df50d96fdbc53ec3e2fd8870dc34afca diff --git a/dev-java/jsr311-api/files/jsr311-api-1.1-maven-build.xml b/dev-java/jcommander/files/jcommander-1.48-build.xml index 326cfda665c2..f788b920aa34 100644 --- a/dev-java/jsr311-api/files/jsr311-api-1.1-maven-build.xml +++ b/dev-java/jcommander/files/jcommander-1.48-build.xml @@ -1,44 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Ant build modified for Gentoo @ Mon, 23 Feb 2009 08:35:22 +0000 --> -<!-- Robin H. Johnson <robbat2@gentoo.org> --> - <!-- ====================================================================== --> <!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> <!-- ====================================================================== --> -<project name="jsr311-api-from-maven" default="package" basedir="."> +<!-- ====================================================================== --> +<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== --> +<!-- ====================================================================== --> +<!-- --> +<!-- Any modifications will be overwritten. --> +<!-- --> +<!-- Generated by Maven Ant Plugin on 10/25/15 2:23 PM --> +<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> +<!-- --> +<!-- ====================================================================== --> + +<project name="jcommander-from-maven" default="package" basedir="."> <!-- ====================================================================== --> <!-- Build environment properties --> <!-- ====================================================================== --> + <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="jsr311-api-1.1"/> + <property name="maven.build.finalName" value="jcommander-1.48"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> - <property name="maven.build.srcDir.0" value="src"/> + <property name="maven.build.srcDir.0" value="src/main/java"/> <property name="maven.build.resourceDir.0" value="src/main/resources"/> <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> - <property name="maven.build.testDir.0" value="test"/> + <property name="maven.build.testDir.0" value="src/test/java"/> <property name="maven.build.testResourceDir.0" value="src/test/resources"/> <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> + <property name="maven.repo.local" value="${user.home}/.m2/repository"/> + <property name="maven.settings.offline" value="false"/> <property name="maven.settings.interactiveMode" value="true"/> <!-- ====================================================================== --> <!-- Defining classpaths --> <!-- ====================================================================== --> - <path id="build.classpath"> - </path> - <path id="build.test.classpath"> - <fileset dir="."> - <include name="lib/junit.jar"/> - </fileset> - </path> + <path id="build.classpath"/> + <path id="build.test.classpath"/> <!-- ====================================================================== --> <!-- Cleaning up target --> @@ -55,15 +61,15 @@ <target name="compile" description="Compile the code"> <mkdir dir="${maven.build.outputDir}"/> <javac destdir="${maven.build.outputDir}" + encoding="UTF-8" nowarn="false" debug="true" optimize="false" deprecation="true" - target="1.5" + target="1.6" verbose="false" fork="false" - source="1.5" - classpath="${gentoo.classpath}"> + source="1.6"> <src> <pathelement location="${maven.build.srcDir.0}"/> </src> @@ -81,15 +87,15 @@ unless="maven.test.skip"> <mkdir dir="${maven.build.testOutputDir}"/> <javac destdir="${maven.build.testOutputDir}" + encoding="UTF-8" nowarn="false" debug="true" optimize="false" deprecation="true" - target="1.5" + target="1.6" verbose="false" fork="false" - source="1.5" - classpath="${gentoo.classpath}"> + source="1.6"> <src> <pathelement location="${maven.build.testDir.0}"/> </src> @@ -98,6 +104,9 @@ <pathelement location="${maven.build.outputDir}"/> </classpath> </javac> + <copy todir="${maven.build.testOutputDir}"> + <fileset dir="${maven.build.testResourceDir.0}"/> + </copy> </target> <!-- ====================================================================== --> @@ -105,7 +114,8 @@ <!-- ====================================================================== --> <target name="test" - depends="compile-tests" + depends="compile-tests, junit-missing" + unless="junit.skipped" description="Run the test cases"> <mkdir dir="${maven.test.reports}"/> <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> @@ -134,6 +144,34 @@ </junit> </target> + <target name="test-junit-present"> + <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> + </target> + + <target name="test-junit-status" + depends="test-junit-present"> + <condition property="junit.missing"> + <and> + <isfalse value="${junit.present}"/> + <isfalse value="${maven.test.skip}"/> + </and> + </condition> + <condition property="junit.skipped"> + <or> + <isfalse value="${junit.present}"/> + <istrue value="${maven.test.skip}"/> + </or> + </condition> + </target> + + <target name="junit-missing" + depends="test-junit-status" + if="junit.missing"> + <echo>=================================== WARNING ===================================</echo> + <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> + <echo>===============================================================================</echo> + </target> + <!-- ====================================================================== --> <!-- Javadoc target --> <!-- ====================================================================== --> @@ -165,11 +203,10 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile" description="Package the application"> + <target name="package" depends="compile,test" description="Package the application"> <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" - manifest="manifest" basedir="${maven.build.outputDir}" excludes="**/package.html"/> </target> @@ -180,4 +217,14 @@ <target name="jar" depends="package" description="Builds the jar for the application"/> + <!-- ====================================================================== --> + <!-- Download dependencies target --> + <!-- ====================================================================== --> + + <target name="test-offline"> + <condition property="maven.mode.offline"> + <equals arg1="${maven.settings.offline}" arg2="true"/> + </condition> + </target> + </project> diff --git a/dev-java/jcommander/jcommander-1.48.ebuild b/dev-java/jcommander/jcommander-1.48.ebuild new file mode 100644 index 000000000000..c87bd7692bb7 --- /dev/null +++ b/dev-java/jcommander/jcommander-1.48.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Command line parsing framework for Java" +HOMEPAGE="https://github.com/cbeust/jcommander" +SRC_URI="https://github.com/cbeust/${PN}/archive/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=">=virtual/jdk-1.6" +RDEPEND=">=virtual/jre-1.6" + +S="${WORKDIR}/${PN}-${P}" + +JAVA_ANT_REWRITE_CLASSPATH="yes" + +java_prepare() { + cp "${FILESDIR}"/${P}-build.xml build.xml || die +} + +src_install() { + java-pkg_newjar target/${P}.jar + + dodoc README.markdown CHANGELOG + use doc && java-pkg_dojavadoc target/site/apidocs + use source && java-pkg_dosrc src/main/java +} diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest index 5a41a586d2dd..b4c0417d84c3 100644 --- a/dev-java/jflex/Manifest +++ b/dev-java/jflex/Manifest @@ -1 +1,2 @@ DIST jflex-1.6.0.tar.gz 3035885 SHA256 0774da0ee2d01fc9274179de4243e0d229c01b5cf0fbb78952fb7fdc4672190c SHA512 16ce4a89f75ce5f3da02433ff66d39ed4db567b4cf7469997dd2617b82e52d589bb17ec3a2f36b4d00a62233e48820bc2e043dcc9ae3c01f1eeca323c0166eba WHIRLPOOL 4d9e7e8c3a0da66d860b895699d5b50e29f781f1cf18cab436f545b1fb007297ca9433694ce3808452c5d9340eddc978c2b32019b5a8d5d8c6cb0558543ea18e +DIST jflex-1.6.1.tar.gz 3027791 SHA256 9879fb4ea7b286af3c3439cf148f5739dfa722edbd978f2f798268b2e016f8c0 SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b WHIRLPOOL 27e2769b1b1dc720cee71718eca024905fd9e200c53771c2db293471b0190d9a3c9d2245fbbc5ab76a1f22e1496053d35d625a34c09819b1e367f78840152666 diff --git a/dev-java/jflex/files/icedtea-arm.patch b/dev-java/jflex/files/icedtea-arm.patch new file mode 100644 index 000000000000..acefd9b553e2 --- /dev/null +++ b/dev-java/jflex/files/icedtea-arm.patch @@ -0,0 +1,18 @@ +http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678 + +diff -Naur jflex-1.6.1.orig/src/main/java/jflex/Emitter.java jflex-1.6.1/src/main/java/jflex/Emitter.java +--- jflex-1.6.1.orig/src/main/java/jflex/Emitter.java 2015-03-16 17:27:31.000000000 +0000 ++++ jflex-1.6.1/src/main/java/jflex/Emitter.java 2015-10-25 23:33:35.784487747 +0000 +@@ -1304,8 +1304,10 @@ + + for (int i = 0; i < dfa.numStates; i++) { + char j = 0; +- while ( !isTransition[i] && j < dfa.numInput ) +- isTransition[i] = dfa.table[i][j++] != DFA.NO_TARGET; ++ while ( !isTransition[i] && j < dfa.numInput ) { ++ isTransition[i] = dfa.table[i][j] != DFA.NO_TARGET; ++ j++; ++ } + } + } + diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild new file mode 100644 index 000000000000..50f314d50813 --- /dev/null +++ b/dev-java/jflex/jflex-1.6.1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="doc source" + +inherit eutils java-pkg-2 java-pkg-simple + +DESCRIPTION="JFlex is a lexical analyzer generator for Java" +HOMEPAGE="http://www.jflex.de/" +SRC_URI="http://${PN}.de/${P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos" +IUSE="examples test vim-syntax" + +CDEPEND="dev-java/ant-core:0" + +RDEPEND=">=virtual/jre-1.6 + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + ${CDEPEND}" + +DEPEND=">=virtual/jdk-1.6 + test? ( dev-java/junit:4 ) + ${CDEPEND}" + +PDEPEND=">=dev-java/javacup-0.11b_p20151001:0" + +S="${WORKDIR}/${P}" +JAVA_SRC_DIR="src/main/java" + +java_prepare() { + # See below for details. + epatch "${FILESDIR}/icedtea-arm.patch" + + # We need the bundled jflex.jar. + rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die + + # Remove the bundled java-cup.jar if unneeded. + if has_version ${PDEPEND}; then + rm -v lib/java-cup-*.jar || die + fi +} + +src_configure() { + # javacup is a cyclic dependency. Use the package if we have it, + # otherwise use the bundled version and install the package later. + if has_version ${PDEPEND}; then + # Use PORTAGE_QUIET to suppress a QA warning that is spurious + # thanks to has_version above. This is Portage-specific but + # showing the warning elsewhere isn't the end of the world. + JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar) + else + JAVACUP=$(echo lib/java-cup-*.jar) + fi + + JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}" +} + +jflex_compile() { + java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die + java-pkg-simple_src_compile + java-pkg_addres ${PN}.jar src/main/resources +} + +src_compile() { + java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die + + # The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running + # jflex. We have patched jflex to fix it but we have to run the + # bundled version first. -Xint works around the problem. See + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678. + use arm && local JFLEX_ARGS="-Xint" + + # First compile (without doc/source) using the bundled jflex. + JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS} + + # Then recompile using the fresh jflex. + jflex_compile -cp "${PN}.jar:${JAVACUP}" +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dolauncher ${PN} --main ${PN}.Main + + java-pkg_register-dependency javacup javacup-runtime.jar + java-pkg_register-ant-task + + use examples && java-pkg_doexamples examples + dodoc {changelog,README}.md + + if use doc; then + dodoc doc/*.pdf + docinto html + dodoc doc/*.{css,html,png} doc/COPYRIGHT + fi + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins lib/${PN}.vim + fi +} + +src_test() { + if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then + # This results in a StackOverflowError as of 1.8.0.65 but works + # fine on icedtea:7. Don't know about icedtea:8 yet. + rm -v src/test/java/jflex/EmitterTest.java || die + fi + + local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)" + + local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n") + TESTS="${TESTS//.java}" + TESTS="${TESTS//\//.}" + + ejavac -classpath "${CP}" $(find src/test/java -name "*.java") + ejunit4 -classpath "${CP}" ${TESTS} +} diff --git a/dev-java/jmock/jmock-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild index e3e6ff3a66dc..242b92132677 100644 --- a/dev-java/jmock/jmock-1.2.0-r1.ebuild +++ b/dev-java/jmock/jmock-1.2.0-r1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://www.jmock.org/" LICENSE="BSD" SLOT="1.0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="" CDEPEND="dev-java/junit:0" diff --git a/dev-java/jsr181/Manifest b/dev-java/jsr181/Manifest index 3e7631d7f0e9..6039b18b0d86 100644 --- a/dev-java/jsr181/Manifest +++ b/dev-java/jsr181/Manifest @@ -1,2 +1 @@ -DIST JAXWS2.0.1m1_source_20060817.jar 8993405 SHA256 9725cfb91cecff833055d7af45c3413ca9d1a818a4cfdb86211ed82f383f3865 SHA512 55454a8270310b9778c69aad8b8ace45dc4ba3059b33ac48dcfd5d771fade2d6e4c46a5a65a522ae5cca0438f159ba84c90d8e74d54731a9c6c0caa9d84a0314 WHIRLPOOL fe0727935c592b538b7042808fffa987ea5ae47554367ea0cfc91f65d765bd234713aaa142b2297988d74eec01fce9cd4bedceb0fb7b0068eb38084a1d5f5ba7 DIST jsr181-api-1.0-MR1-sources.jar 3929 SHA256 abb37e9c15043bde98ad27bae9b955bb43ccf5c27c1a0f88d57d2bb8bc509b14 SHA512 383806428ebe80e94af2c80a3d383f24e934cde57d5628e60b2e2335052ac037ad45f1e8c265c579cf60ed7383b15fd8f2e8dda6b08d8edf1d171b9f0ef0080e WHIRLPOOL 0e611e08d8aa78555fecefd7a6e56a488e555db0dfdc62c1ff1e96f643f8e5b67f62142d1935190ac7a23aa7555a2ce389bd459f0d482cbba03bdedf365408e2 diff --git a/dev-java/jsr181/files/build.xml b/dev-java/jsr181/files/build.xml deleted file mode 100644 index cfc6aabd8867..000000000000 --- a/dev-java/jsr181/files/build.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" standalone="yes"?> -<project basedir="." default="jar"> - <target name="compile"> - <mkdir dir="bin"/> - <javac srcdir="src" destdir="bin"> - <include name="**/*.java"/> - <classpath> - <fileset dir="lib"> - <include name="**/*.jar"/> - </fileset> - </classpath> - </javac> - </target> - <target name="jar" depends="compile"> - <jar destfile="jsr181.jar" manifest="META-INF/MANIFEST.MF"> - <zipfileset dir="bin"/> - </jar> - </target> - <target name="doc"> - <mkdir dir="api"/> - <javadoc packagenames="javax.*" destdir="api"> - <fileset dir="src/" includes="**/*.java"/> - </javadoc> - </target> -</project> diff --git a/dev-java/jsr181/jsr181-1.0-r1.ebuild b/dev-java/jsr181/jsr181-1.0-r1.ebuild deleted file mode 100644 index 2dce026627a7..000000000000 --- a/dev-java/jsr181/jsr181-1.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-2 - -DESCRIPTION="JSR 181 API classes" -HOMEPAGE="http://jax-ws.dev.java.net/" -DATE="20060817" -MY_P="JAXWS2.0.1m1_source_${DATE}.jar" -SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}" - -LICENSE="CDDL" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=virtual/jre-1.6" -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip - ${RDEPEND}" - -S="${WORKDIR}/jaxws-si" - -src_unpack() { - printf '%s\n' "A" | $(java-config --java) -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed" - unpack ./jaxws-src.zip || die "unzip failed" -} - -src_compile() { - : -} - -src_install() { - java-pkg_newjar lib/jsr181-api.jar -} diff --git a/dev-java/jsr181/jsr181-1.0-r2.ebuild b/dev-java/jsr181/jsr181-1.0-r2.ebuild index c0cb7daa49a5..4e26906849b8 100644 --- a/dev-java/jsr181/jsr181-1.0-r2.ebuild +++ b/dev-java/jsr181/jsr181-1.0-r2.ebuild @@ -3,6 +3,7 @@ # $Id$ EAPI=5 +JAVA_PKG_IUSE="source doc" inherit java-pkg-2 java-pkg-simple @@ -16,7 +17,7 @@ SRC_URI="http://central.maven.org/maven2/javax/jws/${MY_PN}/${MY_PV}/${MY_P}-sou LICENSE="CDDL" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="" RDEPEND=">=virtual/jre-1.6" diff --git a/dev-java/jsr181/jsr181-1.0.ebuild b/dev-java/jsr181/jsr181-1.0.ebuild deleted file mode 100644 index f18794bfea8b..000000000000 --- a/dev-java/jsr181/jsr181-1.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit java-pkg-2 - -DESCRIPTION="JSR 181 API classes" -HOMEPAGE="http://jax-ws.dev.java.net/" -DATE="20060817" -MY_P="JAXWS2.0.1m1_source_${DATE}.jar" -SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}" - -LICENSE="CDDL" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=virtual/jre-1.6" -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip - ${RDEPEND}" - -S="${WORKDIR}/jaxws-si" - -src_unpack() { - printf '%s\n' "A" | $(java-config --java) -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed" - unpack ./jaxws-src.zip || die "unzip failed" -} - -src_compile() { - : -} - -src_install() { - java-pkg_newjar lib/jsr181-api.jar -} diff --git a/dev-java/jsr223/jsr223-1.0-r1.ebuild b/dev-java/jsr223/jsr223-1.0-r1.ebuild deleted file mode 100644 index 8abb2b368f8c..000000000000 --- a/dev-java/jsr223/jsr223-1.0-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" -JAVA_PKG_IUSE="" - -inherit java-pkg-2 - -DESCRIPTION="Scripting for the Java(TM) Platform" -HOMEPAGE="http://jcp.org/en/jsr/detail?id=223" - -# http://download.java.net/openjdk/jdk6/promoted/b19/openjdk-6-src-b19-15_apr_2010.tar.gz -# tar xvf openjdk-6-src-b19-15_apr_2010.tar.gz jdk/src/share/classes/javax/script -# tar cjvf jsr223-openjdk-6-src-b19.tar.bz2 jdk/ -SRC_URI="mirror://gentoo/jsr223-openjdk-6-src-b19.tar.bz2" - -LICENSE="GPL-2-with-linking-exception" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="" - -RDEPEND=">=virtual/jre-1.5" -DEPEND=">=virtual/jdk-1.5" - -S="${WORKDIR}" - -src_compile() { - mkdir build || die - ejavac -d build jdk/src/share/classes/javax/script/*.java - jar -cf script-api.jar -C build javax || die -} - -src_install() { - java-pkg_dojar script-api.jar -} diff --git a/dev-java/jsr223/jsr223-1.0-r2.ebuild b/dev-java/jsr223/jsr223-1.0-r2.ebuild index 1d7b318f91ff..46843a880a7f 100644 --- a/dev-java/jsr223/jsr223-1.0-r2.ebuild +++ b/dev-java/jsr223/jsr223-1.0-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${PN}-openjdk-6-src-b19.tar.bz2" LICENSE="GPL-2-with-linking-exception" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="" RDEPEND=">=virtual/jre-1.6" diff --git a/dev-java/jsr305/Manifest b/dev-java/jsr305/Manifest index d1d8464f63c8..6d9c7fad0094 100644 --- a/dev-java/jsr305/Manifest +++ b/dev-java/jsr305/Manifest @@ -1,2 +1 @@ -DIST jsr-305-source.tar.gz 36865 SHA256 87bcc526872fb430a8f02a1e0445175b38e73b809392398601570158373aa9b6 SHA512 7821865ade33e1ca4f59da3e6c8b888f26c21853aa0f8578299a4205cd931900be294aaf85036ba54646a66efe3d9ae0a5653ef756710521be03882b9e0b82e5 WHIRLPOOL 0768571aeef2ae0758ed70c8569f06567ac45ad7900808ad7843ee01e1311c0521f76ff750e45983cbdf585ab9e4df5eb3a1ffd8bdf27d9fb7afd02cae424007 DIST jsr305-3.0.1-sources.jar 16622 SHA256 56c80429d828bfaaefbf0358334c2629228a0ca25c073707be589e9d6c9406e6 SHA512 ca9902929de94fbc03b848599bb1f5f542898ade724eb0d6022f799733c9093bb27c0a565f0a90f47dba7bff72d5a6d24de687746721a1bec2050c2061ecd148 WHIRLPOOL d57e98eb34fc46b82946287cb73fb1009ab5347fad6e4407e7d94e9337ccc1d4552084a2eda0fb4c5b9d29b68d1ab97cdf6d6880352559b4b022e8ffb1021a99 diff --git a/dev-java/jsr305/jsr305-1.0-r1.ebuild b/dev-java/jsr305/jsr305-1.0-r1.ebuild deleted file mode 100644 index 9b85abcae22e..000000000000 --- a/dev-java/jsr305/jsr305-1.0-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -JAVA_PKG_IUSE="doc examples source test" -inherit eutils java-pkg-2 java-ant-2 -MY_PN=jsr-305 - -DESCRIPTION="Reference implementation for JSR 305: Annotations for Software Defect Detection in Java" -SRC_URI="mirror://gentoo/${MY_PN}-source.tar.gz" -HOMEPAGE="https://code.google.com/p/jsr-305/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="" - -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip - test? ( dev-java/ant-junit )" -RDEPEND=">=virtual/jre-1.5" - -S="${WORKDIR}/${MY_PN}" - -src_compile() { - # create jar - cd ri - mkdir -p build/classes - ejavac -sourcepath src/main/java -d build/classes $(find src/main/java -name "*.java") \ - || die "Cannot compile sources" - mkdir dist - cd build/classes - jar -cvf "${S}"/ri/dist/${PN}.jar javax || die "Cannot create JAR" - - # generate javadoc - if use doc ; then - cd "${S}"/ri - mkdir javadoc - javadoc -d javadoc -sourcepath src/main/java -subpackages javax \ - || die "Javadoc creation failed" - fi -} - -src_install() { - cd ri - java-pkg_dojar dist/${PN}.jar - - if use examples; then - dodir /usr/share/doc/${PF}/examples/ - cp -r "${S}"/sampleUses/* "${D}"/usr/share/doc/${PF}/examples/ || die "Could not install examples" - fi - - if use source ; then - cd "${S}"/ri/src/main/java - java-pkg_dosrc javax - fi - - if use doc ; then - cd "${S}"/ri - java-pkg_dojavadoc javadoc - fi -} diff --git a/dev-java/jsr305/jsr305-3.0.1.ebuild b/dev-java/jsr305/jsr305-3.0.1.ebuild index 187bbe019333..a554d39f1ab0 100644 --- a/dev-java/jsr305/jsr305-3.0.1.ebuild +++ b/dev-java/jsr305/jsr305-3.0.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${ LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="" RDEPEND=">=virtual/jre-1.6" diff --git a/dev-java/jsr311-api/Manifest b/dev-java/jsr311-api/Manifest index 796db455c11f..94f951212bc9 100644 --- a/dev-java/jsr311-api/Manifest +++ b/dev-java/jsr311-api/Manifest @@ -1,2 +1 @@ -DIST jsr311-api-1.1-src.tar.bz2 84225 SHA256 c048e69dae1282e345de8cc169d3ead0a2bde9054b385b8b15f24074d4c779ef SHA512 d7d07b1587914f1b060fb780eb96aae98d4d6d78c6f40822bc5e60e1eb2d0956fe048c7dc3f21a8e40160d67ca208eb2e731ae72215e52a7c545eac79ca4ba76 WHIRLPOOL 4cc66526547dbcefa6f1a300c8d16e6ae3e95423a23d2452fc4fbb0a449af84bff6fb739d167e5f0718bfcfa43d58d379bf24e4a3ed85ead81ff0779105def4e DIST jsr311-api-1.1.1-sources.jar 70022 SHA256 99227bada18620d29406be240e7c749da68e646ce1d2a61d6f320863f05a30da SHA512 4f32eb290aa312794ae91b3b4e2baa72efbcf2036962c7223320f7f7e7cd9b5de10c4acb1c92277df946b12710e0699bc1d3ddd7459903c43107437c21cb5542 WHIRLPOOL 022dbf28ddbc7df4a4a020b710c3b64a9f639acc388e3d6370cd426eadfc7aaf1c5ee731c15cd20d75c80829e8e5423714df6007c4cd7408111c8d48c52d2e05 diff --git a/dev-java/jsr311-api/files/jsr311-api-1.0-build.xml b/dev-java/jsr311-api/files/jsr311-api-1.0-build.xml deleted file mode 100644 index 00ededecdc10..000000000000 --- a/dev-java/jsr311-api/files/jsr311-api-1.0-build.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- Ant build modified for Gentoo @ Mon, 23 Feb 2009 08:35:22 +0000 --> -<!-- Robin H. Johnson <robbat2@gentoo.org> --> - -<!-- ====================================================================== --> -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> -<!-- ====================================================================== --> - -<project name="jsr311-api" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Import maven-build.xml into the current project --> - <!-- ====================================================================== --> - - <import file="maven-build.xml"/> - - <!-- ====================================================================== --> - <!-- Help target --> - <!-- ====================================================================== --> - - <target name="help"> - <echo message="Please run: $ant -projecthelp"/> - </target> - -</project> diff --git a/dev-java/jsr311-api/files/jsr311-api-1.0-manifest b/dev-java/jsr311-api/files/jsr311-api-1.0-manifest deleted file mode 100644 index 9c4e64da9610..000000000000 --- a/dev-java/jsr311-api/files/jsr311-api-1.0-manifest +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0
-Extension-Name: javax.ws.rs
-Specification-Title: JAX-RS: Java API for RESTful Web Services
-Specification-Vendor: Sun Microsystems, Inc.
-Specification-Version: 1.0
-Bundle-DocURL: http://www.sun.com/
-Bundle-License: http://www.opensource.org/licenses/cddl1.php
-Bundle-ManifestVersion: 2
-Bundle-Name: jsr311-api
-Bundle-SymbolicName: javax.ws.rs.jsr311-api
-Bundle-Vendor: Sun Microsystems, Inc
-Bundle-Version: 1.0
-Import-Package: javax.ws.rs;version="1.0",javax.ws.rs.core;version="1.
- 0",javax.ws.rs.ext;version="1.0"
-Export-Package: javax.ws.rs;uses:="javax.ws.rs.core";version="1.0",jav
- ax.ws.rs.ext;uses:="javax.ws.rs,javax.ws.rs.core";version="1.0",javax
- .ws.rs.core;uses:="javax.ws.rs,javax.ws.rs.ext";version="1.0"
diff --git a/dev-java/jsr311-api/files/jsr311-api-1.0-maven-build.xml b/dev-java/jsr311-api/files/jsr311-api-1.0-maven-build.xml deleted file mode 100644 index d8761bdf621e..000000000000 --- a/dev-java/jsr311-api/files/jsr311-api-1.0-maven-build.xml +++ /dev/null @@ -1,183 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- Ant build modified for Gentoo @ Mon, 23 Feb 2009 08:35:22 +0000 --> -<!-- Robin H. Johnson <robbat2@gentoo.org> --> - -<!-- ====================================================================== --> -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> -<!-- ====================================================================== --> - -<project name="jsr311-api-from-maven" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <property file="maven-build.properties"/> - - <property name="maven.build.finalName" value="jsr311-api-1.0"/> - <property name="maven.build.dir" value="target"/> - <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> - <property name="maven.build.srcDir.0" value="src"/> - <property name="maven.build.resourceDir.0" value="src/main/resources"/> - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> - <property name="maven.build.testDir.0" value="test"/> - <property name="maven.build.testResourceDir.0" value="src/test/resources"/> - <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> - - <property name="maven.settings.interactiveMode" value="true"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - </path> - <path id="build.test.classpath"> - <fileset dir="."> - <include name="lib/junit.jar"/> - </fileset> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${maven.build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${maven.build.outputDir}"/> - <javac destdir="${maven.build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.5" - verbose="false" - fork="false" - source="1.5" - classpath="${gentoo.classpath}"> - <src> - <pathelement location="${maven.build.srcDir.0}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - </target> - - <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="maven.test.skip"> - <mkdir dir="${maven.build.testOutputDir}"/> - <javac destdir="${maven.build.testOutputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.5" - verbose="false" - fork="false" - source="1.5" - classpath="${gentoo.classpath}"> - <src> - <pathelement location="${maven.build.testDir.0}"/> - </src> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${maven.build.outputDir}"/> - </classpath> - </javac> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests" - description="Run the test cases"> - <mkdir dir="${maven.test.reports}"/> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="."/> - <formatter type="xml"/> - <formatter type="plain" usefile="false"/> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${maven.build.outputDir}"/> - <pathelement location="${maven.build.testOutputDir}"/> - </classpath> - <batchtest todir="${maven.test.reports}" unless="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/Test*.java"/> - <include name="**/*Test.java"/> - <include name="**/*TestCase.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - <batchtest todir="${maven.test.reports}" if="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/${test}.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - </junit> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${maven.build.srcDir.0}" - packagenames="*" - destdir="${maven.reporting.outputDirectory}/apidocs" - access="protected" - old="false" - verbose="false" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - charset="ISO-8859-1" - linksource="false" - breakiterator="false"/> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile" description="Package the application"> - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" - compress="true" - index="false" - manifest="manifest" - basedir="${maven.build.outputDir}" - excludes="**/package.html"/> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project> diff --git a/dev-java/jsr311-api/files/jsr311-api-1.1-build.xml b/dev-java/jsr311-api/files/jsr311-api-1.1-build.xml deleted file mode 100644 index 00ededecdc10..000000000000 --- a/dev-java/jsr311-api/files/jsr311-api-1.1-build.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- Ant build modified for Gentoo @ Mon, 23 Feb 2009 08:35:22 +0000 --> -<!-- Robin H. Johnson <robbat2@gentoo.org> --> - -<!-- ====================================================================== --> -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> -<!-- ====================================================================== --> - -<project name="jsr311-api" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Import maven-build.xml into the current project --> - <!-- ====================================================================== --> - - <import file="maven-build.xml"/> - - <!-- ====================================================================== --> - <!-- Help target --> - <!-- ====================================================================== --> - - <target name="help"> - <echo message="Please run: $ant -projecthelp"/> - </target> - -</project> diff --git a/dev-java/jsr311-api/files/jsr311-api-1.1-manifest b/dev-java/jsr311-api/files/jsr311-api-1.1-manifest deleted file mode 100644 index 93184153e14c..000000000000 --- a/dev-java/jsr311-api/files/jsr311-api-1.1-manifest +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0
-Extension-Name: javax.ws.rs
-Specification-Title: JAX-RS: Java API for RESTful Web Services
-Specification-Vendor: Sun Microsystems, Inc.
-Specification-Version: 1.1
-Bundle-License: http://www.opensource.org/licenses/cddl1.php
-Import-Package: javax.ws.rs;version="1.1",javax.ws.rs.core;version="1.
- 0",javax.ws.rs.ext;version="1.1"
-Export-Package: javax.ws.rs;uses:="javax.ws.rs.core";version="1.1",jav
- ax.ws.rs.ext;uses:="javax.ws.rs,javax.ws.rs.core";version="1.1",javax
- .ws.rs.core;uses:="javax.ws.rs,javax.ws.rs.ext";version="1.1"
-Bundle-Version: 1.1
-Bundle-Name: jsr311-api
-Bundle-DocURL: http://www.sun.com/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: Sun Microsystems, Inc
-Bundle-SymbolicName: javax.ws.rs.jsr311-api
diff --git a/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild b/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild index 688391e6b23e..d3f0dd294c6e 100644 --- a/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild +++ b/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://repo1.maven.org/maven2/javax/ws/rs/${PN}/${PV}/${P}-sources.jar" LICENSE="CDDL" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="" RDEPEND=">=virtual/jre-1.6" diff --git a/dev-java/jsr311-api/jsr311-api-1.1.ebuild b/dev-java/jsr311-api/jsr311-api-1.1.ebuild deleted file mode 100644 index c3b7c4edf618..000000000000 --- a/dev-java/jsr311-api/jsr311-api-1.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" -JAVA_PKG_IUSE="doc source test" -PROJ_PN="jsr311" -PROJ_PV="${PV}" -PROJ_P="${PROJ_PN}-${PROJ_PV}" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="JAX-RS: Java API for RESTful Web Services" -HOMEPAGE="https://jsr311.dev.java.net/" -SRC_FILE="${P}-src.tar.bz2" -SRC_URI="mirror://gentoo/${SRC_FILE}" - -LICENSE="CDDL" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -DEPEND=">=virtual/jdk-1.5 - test? ( dev-java/ant-junit:0 dev-java/junit:0 )" -RDEPEND=">=virtual/jre-1.5" - -S="${WORKDIR}/${P}/${PN}" - -# Helper to generate the tarball :-) -# ( PN=jsr311-api ; PV=1.1 ; P="${PN}-${PV}" ; . ${P}.ebuild ; src_tarball ) -src_tarball() { - SVN_SRC_URI="${HOMEPAGE}/svn/${PROJ_PN}/tags/${P}" - tarball="${P}" - svn export \ - --username guest --password '' --non-interactive \ - ${SVN_SRC_URI} ${tarball} \ - && \ - tar cvjf ${SRC_FILE} ${tarball} \ - && \ - echo "New tarball located at ${SRC_FILE}" -} - -java_prepare() { - for i in build.xml maven-build.xml manifest ; do - cp -f "${FILESDIR}"/"${P}-${i}" "${i}" \ - || die "Unable to find ${P}-${i}" - done -} - -src_install() { - dodoc README.txt || die - java-pkg_newjar target/${P}.jar ${PN}.jar - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/javax -} - -src_test() { - EANT_GENTOO_CLASSPATH="junit ant-core" \ - ANT_TASKS="ant-junit" \ - eant test -} diff --git a/dev-java/jsr93/Manifest b/dev-java/jsr93/Manifest index 73522cff2d41..99566e729fc2 100644 --- a/dev-java/jsr93/Manifest +++ b/dev-java/jsr93/Manifest @@ -1 +1 @@ -DIST jaxr-1_0-fr-spec.zip 1443243 SHA256 b90e753fa51c6b0ac4cbcffafe73bcdc6a139804fe562916d3604d49e5fe3c58 SHA512 a60f2da27defd5ddecfabf1fb00464c111b4e8264d3bd26f91b9c1195022eecf7e8aeaa904aa8f7cb6f0aa35a713b45d2b7e5fdaa474c2e29341ad64c04ed5e2 WHIRLPOOL 9460536353e73f88298de207e4bba3f13d88a63714ac34be397c60f8973667cd8b68626a987bb35e7594be0ea10d643e438e5aec37bea8624b6e96c340f0fe5a +DIST jaxr-api-1.0-sources.jar 45175 SHA256 c3ab05d8218c623746d21d291df8f4dbe5ef6db6ee0c062fb2cfba059d048ccf SHA512 efba6dd09cb9ff796019c6b750f44a5858cbde34b4fb93e74f3bed43178122a8591b1ae75996ed645ecde02862142b3d9f229cdc8059f9e5e95fedbdabae0d44 WHIRLPOOL 66e3185f253dc9a4c2bc86370f06351effd3c6df026845176253f9ffd3fd0ced06cc4c84e05151fd3f18da9cb2ef2a1723279b5af9f147ae2fa24bd2142c54b2 diff --git a/dev-java/jsr93/files/build.xml-1.0 b/dev-java/jsr93/files/build.xml-1.0 deleted file mode 100644 index a0c9ed7a88e6..000000000000 --- a/dev-java/jsr93/files/build.xml-1.0 +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<project name="jsr93-api" default="jar" basedir="."> - <target name="compile"> - <mkdir dir="build"/> - <javac debug="false" srcdir="src" destdir="build" encoding="UTF-8"> - <classpath> - <pathelement path="${classpath}"/> - <fileset dir="lib/" includes="**/*.jar"/> - </classpath> - </javac> - </target> - <target name="jar" depends="compile"> - <jar destfile="jsr93-api.jar"> - <fileset dir="build" includes="**/*.class"/> - </jar> - </target> -</project> diff --git a/dev-java/jsr93/jsr93-1.0-r1.ebuild b/dev-java/jsr93/jsr93-1.0-r1.ebuild deleted file mode 100644 index eb0143a23f64..000000000000 --- a/dev-java/jsr93/jsr93-1.0-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java API for XML Registries (JAXR) - API" -HOMEPAGE="http://download.oracle.com/otndocs/jcp/jaxr-1.0-fr-oth-JSpec/" -SRC_URI="jaxr-1_0-fr-spec.zip" - -LICENSE="sun-jsr93" -RESTRICT="fetch" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="" - -CDEPEND="dev-java/sun-jaf:0" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip - ${CDEPEND}" - -S="${WORKDIR}" - -JAVA_ANT_ENCODING="ISO-8859-1" - -pkg_nofetch() { - - einfo "Please go to" - einfo " ${HOMEPAGE}" - einfo "and download file:" - einfo ' "Java API for XML Registries Specification 1.0"' - einfo "Place the file ${SRC_URI} in:" - einfo " ${DISTDIR}" - -} - -java_prepare() { - cd "${WORKDIR}" || die "can't cd in ${WORKDIR}" - mkdir src || die - unzip -qq jaxr-apisrc.jar -d src || die "unzip failed" - rm -v *.jar || die - mkdir lib || die - cd lib || die "can't cd in ${WORKDIR}/lib" - - java-pkg_jar-from sun-jaf - - cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die -} - -src_install() { - java-pkg_dojar "jsr93-api.jar" - - use source && java-pkg_dosrc src/* -} diff --git a/dev-java/jsr93/jsr93-1.0-r2.ebuild b/dev-java/jsr93/jsr93-1.0-r2.ebuild new file mode 100644 index 000000000000..403064445b3e --- /dev/null +++ b/dev-java/jsr93/jsr93-1.0-r2.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +EAPI=5 +JAVA_PKG_IUSE="source doc" + +inherit java-pkg-2 java-pkg-simple + +MY_PN="jaxr-api" +MY_P="${MY_PN}-${PV}" +DESCRIPTION="Java API for XML Registries (JAXR) - API" +HOMEPAGE="https://jcp.org/ja/jsr/detail?id=93" +SRC_URI="http://repo1.maven.org/maven2/org/apache/ws/scout/${MY_PN}/${PV}/${MY_P}-sources.jar" +LICENSE="sun-jsr93" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86" +IUSE="" +RDEPEND=">=virtual/jre-1.6" +DEPEND=">=virtual/jdk-1.6" diff --git a/dev-java/jsr93/jsr93-1.0.ebuild b/dev-java/jsr93/jsr93-1.0.ebuild deleted file mode 100644 index bf773602756f..000000000000 --- a/dev-java/jsr93/jsr93-1.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java API for XML Registries (JAXR) - API" -HOMEPAGE="http://download.oracle.com/otndocs/jcp/jaxr-1.0-fr-oth-JSpec/" -SRC_URI="jaxr-1_0-fr-spec.zip" - -LICENSE="sun-jsr93" -RESTRICT="fetch" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="" - -COMMON_DEP="dev-java/sun-jaf" - -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - ${COMMON_DEP}" - -S="${WORKDIR}" - -pkg_nofetch() { - - einfo "Please go to" - einfo " ${HOMEPAGE}" - einfo "and download file:" - einfo ' "Java API for XML Registries Specification 1.0"' - einfo "Place the file ${SRC_URI} in:" - einfo " ${DISTDIR}" - -} - -src_unpack() { - - unpack ${A} - - cd "${WORKDIR}" - mkdir src || die - unzip -qq jaxr-apisrc.jar -d src || die "unzip failed" - rm -v *.jar || die - mkdir lib || die - - cd lib - java-pkg_jar-from sun-jaf - - cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die - -} - -src_install() { - - java-pkg_dojar "jsr93-api.jar" - - use source && java-pkg_dosrc src/* - -} diff --git a/dev-java/jssc/Manifest b/dev-java/jssc/Manifest new file mode 100644 index 000000000000..672d4f69bf49 --- /dev/null +++ b/dev-java/jssc/Manifest @@ -0,0 +1 @@ +DIST jssc-2.8.0-sources.jar 19489 SHA256 b5a9609b99b4543c88d20e0425a83461209d4851ef3ce312349c64b76ce1dc68 SHA512 7f3a8482d0982ed3e604b00217cbfa37ad442b5a2b562ff68805c186ee56423bd82706bbbe3b9f2705c8337009b7c71068ba7ebbb829ea3c96bc61f43b540b9d WHIRLPOOL 4c10ba9b373cb057c50c01564124a2258b15b335a059d2cb195b8d8b14b761cbe98a713020dc21118d17a3274f346357812a3dc64103eb12916052e1a1e37050 diff --git a/dev-java/jssc/jssc-2.8.0.ebuild b/dev-java/jssc/jssc-2.8.0.ebuild new file mode 100644 index 000000000000..ceed37a5e18b --- /dev/null +++ b/dev-java/jssc/jssc-2.8.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Apache MyFaces API - Core package" +HOMEPAGE="https://github.com/scream3r/java-simple-serial-connector" +SRC_URI="http://repo1.maven.org/maven2/org/scream3r/${PN}/${PV}/${P}-sources.jar" +LICENSE="GPL-1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +IUSE="" + +RDEPEND=">=virtual/jre-1.6" +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip" diff --git a/sci-chemistry/molrep/metadata.xml b/dev-java/jssc/metadata.xml index ae9ec7c5f6a4..68b30527c024 100644 --- a/sci-chemistry/molrep/metadata.xml +++ b/dev-java/jssc/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>sci-chemistry</herd> + <herd>java</herd> <maintainer> - <email>jlec@gentoo.org</email> + <email>monsieurp@gentoo.org</email> </maintainer> </pkgmetadata> diff --git a/dev-java/kxml/kxml-2.3.0.ebuild b/dev-java/kxml/kxml-2.3.0.ebuild index cc0c3278261a..ab0fc988cb66 100644 --- a/dev-java/kxml/kxml-2.3.0.ebuild +++ b/dev-java/kxml/kxml-2.3.0.ebuild @@ -6,7 +6,7 @@ EAPI="5" JAVA_PKG_IUSE="doc examples source" -inherit eutils java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 DESCRIPTION="Small XML pull parser for constrained environments such as Applets, Personal Java or MIDP devices" HOMEPAGE="http://kxml.org/" @@ -14,29 +14,28 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}2-src-${PV}.zip" LICENSE="BSD" SLOT="2" -KEYWORDS="amd64" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" CDEPEND="dev-java/xpp3:0" -DEPEND=">=virtual/jdk-1.6 +DEPEND=" ${CDEPEND} + >=virtual/jdk-1.6 app-arch/unzip" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.6" S="${WORKDIR}" java_prepare() { + java-pkg_clean cp "${FILESDIR}"/${P}-build.xml build.xml || die - - find . -name '*.class' -print -delete || die - find . -name '*.jar' -print -delete || die } -EANT_BUILD_TARGET="build_jar" - JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_BUILD_TARGET="build_jar" EANT_GENTOO_CLASSPATH="xpp3" src_install() { diff --git a/dev-java/lzmajio/lzmajio-0.95-r1.ebuild b/dev-java/lzmajio/lzmajio-0.95-r1.ebuild index 7e312efd961c..5072a7decd84 100644 --- a/dev-java/lzmajio/lzmajio-0.95-r1.ebuild +++ b/dev-java/lzmajio/lzmajio-0.95-r1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://contrapunctus.net/league/haques/lzmajio/" SRC_URI="http://comsci.liu.edu/~league/dist/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" diff --git a/dev-java/lzmajio/lzmajio-0.95.ebuild b/dev-java/lzmajio/lzmajio-0.95.ebuild deleted file mode 100644 index f7b6f1527423..000000000000 --- a/dev-java/lzmajio/lzmajio-0.95.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Implementations of LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders" -HOMEPAGE="http://contrapunctus.net/league/haques/lzmajio/" -SRC_URI="http://comsci.liu.edu/~league/dist/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="" - -COMMON_DEP=">=dev-java/lzma-4.61" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip - ${COMMON_DEP}" - -EANT_GENTOO_CLASSPATH="lzma" - -src_prepare() { - java-pkg_jar-from lzma -} - -src_install() { - java-pkg_dojar ${PN}.jar - use doc && java-pkg_dojavadoc docs - use source && java-pkg_dosrc net -} diff --git a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild new file mode 100644 index 000000000000..10196859c5b8 --- /dev/null +++ b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit java-pkg-2 + +MY_PN=apache-${PN%%-bin} +MY_PV=${PV/_alpha/-alpha-} +MY_P="${MY_PN}-${MY_PV}" +MY_MV="${PV%%.*}" + +DESCRIPTION="Project Management and Comprehension Tool for Java" +SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" +HOMEPAGE="http://maven.apache.org/" + +LICENSE="Apache-2.0" +SLOT="3.3" +KEYWORDS="~amd64 ~x86" + +# TODO: Needs further resolution: +# +# - https://bugs.gentoo.org/show_bug.cgi?id=472850 +# - https://bugs.gentoo.org/show_bug.cgi?id=477436 +# +CDEPEND=" + dev-java/juel:0 + dev-java/log4j:0 + dev-java/jsoup:0 + dev-java/jsr250:0 + dev-java/commons-io:1 + dev-java/aopalliance:1 + dev-java/commons-cli:1 + dev-java/javax-inject:0 + dev-java/osgi-core-api:0 + dev-java/commons-logging:0 + java-virtuals/interceptor-api:0 + java-virtuals/servlet-api:3.0" + +DEPEND=" + ${CDEPEND} + || ( app-eselect/eselect-java app-eselect/eselect-maven ) + || ( dev-java/commons-logging:0 dev-java/log4j:0 ) + >=virtual/jdk-1.7" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.7" + +S="${WORKDIR}/${MY_P}" + +MAVEN="${PN}-${SLOT}" +MAVEN_SHARE="/usr/share/${MAVEN}" + +MAVEN_DEPENDENCIES=( + juel + jsoup + log4j + jsr250 + javax-inject + commons-io-1 + osgi-core-api + aopalliance-1 + commons-cli-1 + commons-logging + interceptor-api + servlet-api-3.0 +) + +java_prepare() { + rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die + + chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die + + # Symlink jars. + cd lib || die + + # Link deps. + for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do + java-pkg_jar-from "${mvn_dep}" + done +} + +# TODO: We should use jars from packages, instead of what is bundled. +src_install() { + dodir "${MAVEN_SHARE}" + + cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" + + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar + + dodoc NOTICE README.txt + + dodir /usr/bin + dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} + + # See bug #342901. + echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die + doenvd "${T}/25${MAVEN}" +} + +pkg_postinst() { + eselect maven update mvn-${SLOT} +} + +pkg_postrm() { + eselect maven update +} diff --git a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild index 8b7899585f41..932096b08dac 100644 --- a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild +++ b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API" HOMEPAGE="https://javaserverfaces.dev.java.net/" diff --git a/dev-java/mx4j-core/Manifest b/dev-java/mx4j-core/Manifest deleted file mode 100644 index 9caec33bdf50..000000000000 --- a/dev-java/mx4j-core/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST mx4j-3.0.1-src.tar.gz 622504 SHA256 f6cef53b68b06d97041f77b69e091eb76f08d1bd0d92f48c9bea958e8cb5dcba SHA512 7e37b49f7b25475a8926caa74b3f2d252f106374db26063d4f9c72f2e7a32e9c90256ee763e8791ce6a1981cacf8d1848cf616c7771c734c3e05494681663465 WHIRLPOOL 333cadbdc1d166202960d9da1978ccb2c6620d86e3b5aec40101139295160615bd32a5ada4c9346513361b41b026913b5d328aad15dc2bdc858587e920521c47 -DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266 SHA512 24014ff723b0880ca5f94b28d3c698659aa04258853e259b7b4025decbf27f0022cbe9da1101b8e2d4e5fb950bfabd9556a402a9b99e6122d0fca324e479ebf8 WHIRLPOOL 31c45b785fef2596bcdd39f0c8507db8ea315de97cd78e34ae3e473b71e644d91554c6601ddcc283a325c36a2215680b8138ab89f3bd817961119edf2c935f05 diff --git a/dev-java/mx4j-core/files/mx4j-core-3.0.1-split-javadoc-build.patch b/dev-java/mx4j-core/files/mx4j-core-3.0.1-split-javadoc-build.patch deleted file mode 100644 index 35c20fe9a8a6..000000000000 --- a/dev-java/mx4j-core/files/mx4j-core-3.0.1-split-javadoc-build.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- mx4j-3.0.1.orig/build/build.xml 2006-10-27 22:11:53.000000000 -0500 -+++ mx4j-3.0.1/build/build.xml 2006-10-27 22:14:39.000000000 -0500 -@@ -417,7 +417,7 @@ - </jar>
- </target>
-
-- <target name="javadocs" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+ <target name="javadocs.core" description="Creates the MX4J javadoc documentation" depends="compile.rjmx">
- <mkdir dir="${dist.docs.api.dir}"/>
- <javadoc destdir="${dist.docs.api.dir}"
- author="true"
-@@ -431,6 +431,23 @@ - <group title="MX4J classes" packages="mx4j:mx4j.*"/>
- <sourcepath>
- <pathelement path="${core.src.dir}"/>
-+ </sourcepath>
-+ </javadoc>
-+ </target>
-+
-+ <target name="javadocs.tools" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+ <mkdir dir="${dist.docs.api.dir}"/>
-+ <javadoc destdir="${dist.docs.api.dir}"
-+ author="true"
-+ version="true"
-+ use="true"
-+ windowtitle="MX4J API"
-+ classpathref="classpath">
-+ <package name="mx4j.*"/>
-+
-+ <bottom><![CDATA[<center><small>Copyright © 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
-+ <group title="MX4J classes" packages="mx4j:mx4j.*"/>
-+ <sourcepath>
- <pathelement path="${tools.src.dir}"/>
- </sourcepath>
- </javadoc>
-@@ -478,7 +495,7 @@ -
- <target name="main" depends="tests, compile.examples"/>
-
-- <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs">
-+ <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs.core">
- <mkdir dir="${release.dist.dir}"/>
- <mkdir dir="${binary.release.dist.dir}"/>
- <mkdir dir="${source.release.dist.dir}"/>
diff --git a/dev-java/mx4j-core/files/mx4j-core-3.0.2-split-javadoc-build.patch b/dev-java/mx4j-core/files/mx4j-core-3.0.2-split-javadoc-build.patch deleted file mode 100644 index 9fba649e1f45..000000000000 --- a/dev-java/mx4j-core/files/mx4j-core-3.0.2-split-javadoc-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Nru mx4j-3.0.2.vanilla/build/build.xml mx4j-3.0.2/build/build.xml ---- mx4j-3.0.2.vanilla/build/build.xml 2008-06-17 15:32:02.000000000 +0200 -+++ mx4j-3.0.2/build/build.xml 2008-06-17 15:34:06.000000000 +0200 -@@ -407,7 +407,7 @@ - </jar> - </target> - -- <target name="javadocs" description="Creates the MX4J javadoc documentation" depends="compile.tools"> -+ <target name="javadocs.core" description="Creates the MX4J javadoc documentation" depends="compile.rjmx"> - <mkdir dir="${dist.docs.api.dir}"/> - <javadoc destdir="${dist.docs.api.dir}" - author="true" -@@ -421,6 +421,23 @@ - <group title="MX4J classes" packages="mx4j:mx4j.*"/> - <sourcepath> - <pathelement path="${core.src.dir}"/> -+ </sourcepath>
-+ </javadoc>
-+ </target>
-+
-+ <target name="javadocs.tools" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+ <mkdir dir="${dist.docs.api.dir}"/>
-+ <javadoc destdir="${dist.docs.api.dir}"
-+ author="true"
-+ version="true"
-+ use="true"
-+ windowtitle="MX4J API"
-+ classpathref="classpath">
-+ <package name="mx4j.*"/>
-+
-+ <bottom><![CDATA[<center><small>Copyright © 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
-+ <group title="MX4J classes" packages="mx4j:mx4j.*"/>
-+ <sourcepath>
- <pathelement path="${tools.src.dir}"/> - </sourcepath> - </javadoc> -@@ -468,7 +485,7 @@ - - <target name="main" depends="tests, compile.examples"/> - -- <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs"> -+ <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs.core"> - <mkdir dir="${release.dist.dir}"/> - <mkdir dir="${binary.release.dist.dir}"/> - <mkdir dir="${source.release.dist.dir}"/> diff --git a/dev-java/mx4j-core/metadata.xml b/dev-java/mx4j-core/metadata.xml deleted file mode 100644 index 5d6507f94ff6..000000000000 --- a/dev-java/mx4j-core/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>java</herd> - <longdescription> -MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX. - -JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems. - -This package has the jmx core. To get everything that upstream binary has emerge -dev-java/mx4j with the appropriate use flags. -</longdescription> - <upstream> - <remote-id type="sourceforge">mx4j</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-java/mx4j-core/mx4j-core-3.0.1.ebuild b/dev-java/mx4j-core/mx4j-core-3.0.1.ebuild deleted file mode 100644 index 955ea421a831..000000000000 --- a/dev-java/mx4j-core/mx4j-core-3.0.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils java-pkg-2 java-ant-2 - -MY_P="${P/-core/}" -DESCRIPTION="Open Source implementation of the JMX and JMX Remote API (JSR 160) specifications" -HOMEPAGE="http://mx4j.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz" - -# The ${S}/BUILD-HOWTO is a good source for dependencies -# This package could also be built with jdk-1.3; see special -# handling instructions in ${S}/BUILD-HOWTO. - -RDEPEND="dev-java/bcel - dev-java/commons-logging - dev-java/log4j" -DEPEND="${RDEPEND} - >=virtual/jdk-1.4 - >=dev-java/ant-core-1.6 - source? ( app-arch/zip )" -RDEPEND="${RDEPEND} - >=virtual/jre-1.4" - -LICENSE="Apache-1.1" -SLOT="3.0" -KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd" -IUSE="doc source" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}/${P}-split-javadoc-build.patch" - - cd "${S}/lib" - java-pkg_jar-from bcel bcel.jar - java-pkg_jar-from commons-logging commons-logging.jar - java-pkg_jar-from log4j -} - -src_compile() { - eant -f build/build.xml compile.jmx compile.rjmx $(use_doc javadocs.core) -} - -src_install() { - java-pkg_dojar dist/lib/*.jar - dodoc README.txt - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc "${S}/src/core/*" -} - -pkg_postinst() { - elog "This is a a new split ebuild for just the core jmx to reduce" - elog "dependencies for packages that only require the core. You can" - elog "find the examples in dev-java/mx4j and the tools in dev-java/mx4j-tools" -} diff --git a/dev-java/mx4j-core/mx4j-core-3.0.2-r1.ebuild b/dev-java/mx4j-core/mx4j-core-3.0.2-r1.ebuild deleted file mode 100644 index 145b245df1e4..000000000000 --- a/dev-java/mx4j-core/mx4j-core-3.0.2-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-2 java-ant-2 - -MY_PN="${PN/-core/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Open Source implementation of the JMX and JMX Remote API (JSR 160) specifications" -HOMEPAGE="http://mx4j.sourceforge.net/" -SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-src.tar.gz" - -CDEPEND="dev-java/bcel:0 - dev-java/commons-logging:0 - dev-java/log4j:0" -DEPEND=">=virtual/jdk-1.6 - >=dev-java/ant-core-1.6 - source? ( app-arch/zip ) - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -LICENSE="Apache-1.1" -SLOT="3.0" -KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc source" - -S="${WORKDIR}/${MY_P}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="bcel,commons-logging,log4j" - -java_prepare() { - epatch "${FILESDIR}/${P}-split-javadoc-build.patch" -} - -src_compile() { - eant -f build/build.xml \ - compile.jmx \ - compile.rjmx \ - $(use_doc javadocs.core) -} - -src_install() { - java-pkg_dojar dist/lib/*.jar - dodoc README.txt - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc "${S}/src/core/*" -} - -pkg_postinst() { - elog "This is a a new split ebuild for just the core jmx to reduce" - elog "dependencies for packages that only require the core. You can" - elog "find the examples in dev-java/mx4j and the tools in dev-java/mx4j-tools" -} diff --git a/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild b/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild deleted file mode 100644 index 108b89f919a0..000000000000 --- a/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils java-pkg-2 java-ant-2 - -MY_PN="${PN/-core/}" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="Open Source implementation of the JMX and JMX Remote API (JSR 160) specifications" -HOMEPAGE="http://mx4j.sourceforge.net/" -SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-src.tar.gz" - -# The ${S}/BUILD-HOWTO is a good source for dependencies -# This package could also be built with jdk-1.3; see special -# handling instructions in ${S}/BUILD-HOWTO. - -RDEPEND="dev-java/bcel - dev-java/commons-logging - dev-java/log4j" -DEPEND="${RDEPEND} - >=virtual/jdk-1.5 - >=dev-java/ant-core-1.6 - source? ( app-arch/zip )" -RDEPEND="${RDEPEND} - >=virtual/jre-1.5" - -LICENSE="Apache-1.1" -SLOT="3.0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc source" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}/${P}-split-javadoc-build.patch" - - cd "${S}/lib" - java-pkg_jar-from bcel bcel.jar - java-pkg_jar-from commons-logging commons-logging.jar - java-pkg_jar-from log4j -} - -src_compile() { - eant -f build/build.xml compile.jmx compile.rjmx $(use_doc javadocs.core) -} - -src_install() { - java-pkg_dojar dist/lib/*.jar - dodoc README.txt - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc "${S}/src/core/*" -} - -pkg_postinst() { - elog "This is a a new split ebuild for just the core jmx to reduce" - elog "dependencies for packages that only require the core. You can" - elog "find the examples in dev-java/mx4j and the tools in dev-java/mx4j-tools" -} diff --git a/dev-java/mx4j-tools/Manifest b/dev-java/mx4j-tools/Manifest deleted file mode 100644 index 4d4079a16d29..000000000000 --- a/dev-java/mx4j-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266 SHA512 24014ff723b0880ca5f94b28d3c698659aa04258853e259b7b4025decbf27f0022cbe9da1101b8e2d4e5fb950bfabd9556a402a9b99e6122d0fca324e479ebf8 WHIRLPOOL 31c45b785fef2596bcdd39f0c8507db8ea315de97cd78e34ae3e473b71e644d91554c6601ddcc283a325c36a2215680b8138ab89f3bd817961119edf2c935f05 diff --git a/dev-java/mx4j-tools/files/mx4j-tools-3.0.1-split-javadoc-build.patch b/dev-java/mx4j-tools/files/mx4j-tools-3.0.1-split-javadoc-build.patch deleted file mode 100644 index 35c20fe9a8a6..000000000000 --- a/dev-java/mx4j-tools/files/mx4j-tools-3.0.1-split-javadoc-build.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- mx4j-3.0.1.orig/build/build.xml 2006-10-27 22:11:53.000000000 -0500 -+++ mx4j-3.0.1/build/build.xml 2006-10-27 22:14:39.000000000 -0500 -@@ -417,7 +417,7 @@ - </jar>
- </target>
-
-- <target name="javadocs" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+ <target name="javadocs.core" description="Creates the MX4J javadoc documentation" depends="compile.rjmx">
- <mkdir dir="${dist.docs.api.dir}"/>
- <javadoc destdir="${dist.docs.api.dir}"
- author="true"
-@@ -431,6 +431,23 @@ - <group title="MX4J classes" packages="mx4j:mx4j.*"/>
- <sourcepath>
- <pathelement path="${core.src.dir}"/>
-+ </sourcepath>
-+ </javadoc>
-+ </target>
-+
-+ <target name="javadocs.tools" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+ <mkdir dir="${dist.docs.api.dir}"/>
-+ <javadoc destdir="${dist.docs.api.dir}"
-+ author="true"
-+ version="true"
-+ use="true"
-+ windowtitle="MX4J API"
-+ classpathref="classpath">
-+ <package name="mx4j.*"/>
-+
-+ <bottom><![CDATA[<center><small>Copyright © 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
-+ <group title="MX4J classes" packages="mx4j:mx4j.*"/>
-+ <sourcepath>
- <pathelement path="${tools.src.dir}"/>
- </sourcepath>
- </javadoc>
-@@ -478,7 +495,7 @@ -
- <target name="main" depends="tests, compile.examples"/>
-
-- <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs">
-+ <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs.core">
- <mkdir dir="${release.dist.dir}"/>
- <mkdir dir="${binary.release.dist.dir}"/>
- <mkdir dir="${source.release.dist.dir}"/>
diff --git a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch b/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch deleted file mode 100644 index 25de4b50b8f5..000000000000 --- a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java ---- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java 2010-04-03 13:09:19.815790652 +0100 -+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java 2010-04-03 13:09:29.096398617 +0100 -@@ -12,13 +12,13 @@ - import java.io.IOException; - import java.io.ObjectInputStream; - -+import com.caucho.hessian.io.AbstractDeserializer; - import com.caucho.hessian.io.AbstractHessianInput; --import com.caucho.hessian.io.Deserializer; - - /** - * @version $ - */ --class JMXDeserializer extends Deserializer -+class JMXDeserializer extends AbstractDeserializer - { - private Class type; - -diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java ---- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java 2010-04-03 13:09:19.815790652 +0100 -+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java 2010-04-03 13:11:41.543862447 +0100 -@@ -13,12 +13,12 @@ - import java.io.ObjectOutputStream; - - import com.caucho.hessian.io.AbstractHessianOutput; --import com.caucho.hessian.io.Serializer; -+import com.caucho.hessian.io.AbstractSerializer; - - /** - * @version $Revision: 1.3 $ - */ --class JMXSerializer extends Serializer -+class JMXSerializer extends AbstractSerializer - { - public void writeObject(Object obj, AbstractHessianOutput out) throws IOException - { diff --git a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-split-javadoc-build.patch b/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-split-javadoc-build.patch deleted file mode 100644 index 9fba649e1f45..000000000000 --- a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-split-javadoc-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Nru mx4j-3.0.2.vanilla/build/build.xml mx4j-3.0.2/build/build.xml ---- mx4j-3.0.2.vanilla/build/build.xml 2008-06-17 15:32:02.000000000 +0200 -+++ mx4j-3.0.2/build/build.xml 2008-06-17 15:34:06.000000000 +0200 -@@ -407,7 +407,7 @@ - </jar> - </target> - -- <target name="javadocs" description="Creates the MX4J javadoc documentation" depends="compile.tools"> -+ <target name="javadocs.core" description="Creates the MX4J javadoc documentation" depends="compile.rjmx"> - <mkdir dir="${dist.docs.api.dir}"/> - <javadoc destdir="${dist.docs.api.dir}" - author="true" -@@ -421,6 +421,23 @@ - <group title="MX4J classes" packages="mx4j:mx4j.*"/> - <sourcepath> - <pathelement path="${core.src.dir}"/> -+ </sourcepath>
-+ </javadoc>
-+ </target>
-+
-+ <target name="javadocs.tools" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+ <mkdir dir="${dist.docs.api.dir}"/>
-+ <javadoc destdir="${dist.docs.api.dir}"
-+ author="true"
-+ version="true"
-+ use="true"
-+ windowtitle="MX4J API"
-+ classpathref="classpath">
-+ <package name="mx4j.*"/>
-+
-+ <bottom><![CDATA[<center><small>Copyright © 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
-+ <group title="MX4J classes" packages="mx4j:mx4j.*"/>
-+ <sourcepath>
- <pathelement path="${tools.src.dir}"/> - </sourcepath> - </javadoc> -@@ -468,7 +485,7 @@ - - <target name="main" depends="tests, compile.examples"/> - -- <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs"> -+ <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs.core"> - <mkdir dir="${release.dist.dir}"/> - <mkdir dir="${binary.release.dist.dir}"/> - <mkdir dir="${source.release.dist.dir}"/> diff --git a/dev-java/mx4j-tools/metadata.xml b/dev-java/mx4j-tools/metadata.xml deleted file mode 100644 index b59408fa4e72..000000000000 --- a/dev-java/mx4j-tools/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>java</herd> - <longdescription> -MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX. - -JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems. - -This package has the mx4j tools. To get everything that the upstream binary has emerge -dev-java/mx4j with the appropriate use flags. -</longdescription> - <upstream> - <remote-id type="sourceforge">mx4j</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-java/mx4j-tools/mx4j-tools-3.0.2-r1.ebuild b/dev-java/mx4j-tools/mx4j-tools-3.0.2-r1.ebuild deleted file mode 100644 index 6d7f5a08a538..000000000000 --- a/dev-java/mx4j-tools/mx4j-tools-3.0.2-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-2 java-ant-2 - -MY_P=${P/-tools/} -MY_PN=${PN/-tools/} - -DESCRIPTION="Optional tool classes and utilities for MX4J" -HOMEPAGE="http://mx4j.sourceforge.net/" -SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-src.tar.gz" - -# The ${S}/BUILD-HOWTO is a good source for dependencies -# This package could also be built with jdk-1.3; see special -# handling instructions in ${S}/BUILD-HOWTO. - -# javamail and jython support is optional but because ant-core puts it in the classpath -# if it is installed we can't force disable it without modifying the build.xml -# and jikes refuses to compile mx4j with javamail support disabled - -# Optional jetty support can be enabled after jetty uses java-pkg_dojar to install jars - -CDEPEND="dev-java/bcel:0 - dev-java/ant-core:0 - dev-java/commons-logging:0 - dev-java/log4j:0 - www-servers/axis:1 - dev-java/hessian:4.0 - dev-java/jython:2.7 - java-virtuals/servlet-api:3.0 - java-virtuals/jaf:0 - java-virtuals/javamail:0" -DEPEND=">=virtual/jdk-1.6 - source? ( app-arch/zip ) - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -LICENSE="Apache-1.1" -SLOT="3.0" -KEYWORDS="amd64 x86" -IUSE="doc source" - -S="${WORKDIR}/${MY_P}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="bcel,commons-logging,log4j,axis-1,servlet-api-3.0,hessian-4.0,jython-2.7,jaf,javamail" - -java_prepare() { - epatch "${FILESDIR}/${P}-split-javadoc-build.patch" - epatch "${FILESDIR}/${P}-new-hessian.patch" -} - -src_compile() { - eant -f build/build.xml compile.tools $(use_doc javadocs.tools) -} - -src_install() { - java-pkg_dojar dist/lib/mx4j-tools.jar - java-pkg_dowar dist/lib/mx4j-soap.war - - dodoc README.txt - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc "${S}/src/tools/*" -} diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest deleted file mode 100644 index b19c903085c4..000000000000 --- a/dev-java/mx4j/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266 SHA512 24014ff723b0880ca5f94b28d3c698659aa04258853e259b7b4025decbf27f0022cbe9da1101b8e2d4e5fb950bfabd9556a402a9b99e6122d0fca324e479ebf8 WHIRLPOOL 31c45b785fef2596bcdd39f0c8507db8ea315de97cd78e34ae3e473b71e644d91554c6601ddcc283a325c36a2215680b8138ab89f3bd817961119edf2c935f05 -DIST mx4j-3.0.2.tar.gz 4555894 SHA256 282bd68e517aba3d0f5bbf76f90c3c09e446c529e7796467ab7de65398bb1115 SHA512 a4b8b62530ce41a0e3170a0c31dbaf5251096b98e50f73eeebd725f29e5b7e920d8c7f03d486d72c7643e9ce069a86a048c080f019fd0053dce5e6774809a26f WHIRLPOOL 775f2b51664e3d05687b1e3fbb7b538e45e2918b8a079d2048a75a1f5aca1c323a2d0c1e8847ca94649973fc7e6f9bb324d44f76acb551fe1270138ae126ebbb diff --git a/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch b/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch deleted file mode 100644 index 25de4b50b8f5..000000000000 --- a/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java ---- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java 2010-04-03 13:09:19.815790652 +0100 -+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java 2010-04-03 13:09:29.096398617 +0100 -@@ -12,13 +12,13 @@ - import java.io.IOException; - import java.io.ObjectInputStream; - -+import com.caucho.hessian.io.AbstractDeserializer; - import com.caucho.hessian.io.AbstractHessianInput; --import com.caucho.hessian.io.Deserializer; - - /** - * @version $ - */ --class JMXDeserializer extends Deserializer -+class JMXDeserializer extends AbstractDeserializer - { - private Class type; - -diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java ---- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java 2010-04-03 13:09:19.815790652 +0100 -+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java 2010-04-03 13:11:41.543862447 +0100 -@@ -13,12 +13,12 @@ - import java.io.ObjectOutputStream; - - import com.caucho.hessian.io.AbstractHessianOutput; --import com.caucho.hessian.io.Serializer; -+import com.caucho.hessian.io.AbstractSerializer; - - /** - * @version $Revision: 1.3 $ - */ --class JMXSerializer extends Serializer -+class JMXSerializer extends AbstractSerializer - { - public void writeObject(Object obj, AbstractHessianOutput out) throws IOException - { diff --git a/dev-java/mx4j/metadata.xml b/dev-java/mx4j/metadata.xml deleted file mode 100644 index ef5247c538ae..000000000000 --- a/dev-java/mx4j/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>java</herd> - <longdescription> -MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX. - -JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems. - -Beginning with 3.0.1-r2 mx4j was split into three packages dev-java/mxj4-core, -dev-java/mxj4-tools and dev-java/mx4j. This was done in order to reduce -dependencies in packages that only require the core. -</longdescription> - <upstream> - <remote-id type="sourceforge">mx4j</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-java/mx4j/mx4j-3.0.2-r1.ebuild b/dev-java/mx4j/mx4j-3.0.2-r1.ebuild deleted file mode 100644 index 776bb7c6c1b3..000000000000 --- a/dev-java/mx4j/mx4j-3.0.2-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -JAVA_PKG_IUSE="examples source doc" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Metapackage for mx4j" -HOMEPAGE="http://mx4j.sourceforge.net/" - -SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz - doc? ( mirror://sourceforge/${PN}/${P}.tar.gz )" - -LICENSE="GPL-2" -SLOT="3.0" - -KEYWORDS="amd64 x86" - -IUSE="" - -CDEPEND="examples? ( - dev-java/bcel:0 - dev-java/log4j:0 - dev-java/commons-logging:0 - www-servers/axis:1 - java-virtuals/servlet-api:3.0 - dev-java/hessian:4.0 - dev-java/jython:2.7 - dev-java/gnu-jaf:1 - java-virtuals/javamail:0 - ) - dev-java/mx4j-core:3.0 - dev-java/mx4j-tools:3.0 - !<dev-java/mx4j-tools-3.0.1-r1 - " - -RDEPEND=" - ${CDEPEND} - examples? ( >=virtual/jre-1.6 )" - -# We always depend on a jdk to get the package.env created -DEPEND=">=virtual/jdk-1.6 - ${CDEPEND}" - -src_prepare() { - epatch "${FILESDIR}/${P}-new-hessian.patch" - - if use doc; then - mkdir binary && cd binary - unpack "${P}.tar.gz" - fi - - if use examples; then - cd "${S}/lib" - java-pkg_jar-from bcel bcel.jar - java-pkg_jar-from log4j - java-pkg_jar-from commons-logging commons-logging.jar - java-pkg_jar-from axis-1 - java-pkg_jar-from hessian-4.0 - java-pkg_jar-from jython-2.7 jython.jar - java-pkg_jar-from gnu-jaf-1 activation.jar - java-pkg_jar-from --virtual javamail mail.jar - java-pkg_jar-from --virtual servlet-api-3.0 servlet-api.jar - fi -} - -src_compile() { - cd build - if use examples; then - eant compile.examples - fi -} - -src_install() { - dodoc README.txt RELEASE-NOTES-* || die - - if use examples; then - java-pkg_dojar dist/examples/mx4j-examples.jar - dodir /usr/share/doc/${PF}/examples - cp -r src/examples/mx4j/examples/* "${D}usr/share/doc/${PF}/examples" - fi - - use source && java-pkg_dosrc src/examples/mx4j - - if use doc; then - local docdir="${WORKDIR}/${P}/binary/${P}/docs" - java-pkg_dojavadoc "${docdir}/api" - dohtml -r "${docdir}/images" - dohtml "${docdir}"/{*.html,*.css} - fi - - # Recording jars to get the same behaviour as before - local jars="$(java-pkg_getjars mx4j-core-3.0,mx4j-tools-3.0)" - for jar in ${jars//:/ }; do - java-pkg_regjar "${jar}" - done -} - -pkg_postinst() { - elog "Although this package can be used directly with java-config," - elog "ebuild developers should use mx4j-core and mx4j-tools directly." -} diff --git a/dev-java/myfaces-api/Manifest b/dev-java/myfaces-api/Manifest new file mode 100644 index 000000000000..acff61eab15f --- /dev/null +++ b/dev-java/myfaces-api/Manifest @@ -0,0 +1 @@ +DIST myfaces-api-2.2.8-sources.jar 949466 SHA256 f06c9242146ba641282ca2493d44a22a7cfd5371bde7503e59b5733b141212cb SHA512 2c6abd6bbed3d55ff58f18e12cb97dac5232b55b320893097513fdc11c183d52082838a2bdfab035abd927179fb308502440072752cca697cb8ce084a61b3ead WHIRLPOOL aee0a37bcf3dc24c13e84fc11f4a79738a34d7234ed015c11c26ec962fa15028fd9ac2f5695e30381c6308f153f6a2fa0474bc884f6ea57db620aef5e591c1a4 diff --git a/dev-java/jax-rpc/metadata.xml b/dev-java/myfaces-api/metadata.xml index 250f2d1940ea..250f2d1940ea 100644 --- a/dev-java/jax-rpc/metadata.xml +++ b/dev-java/myfaces-api/metadata.xml diff --git a/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild b/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild new file mode 100644 index 000000000000..deb9132a83e3 --- /dev/null +++ b/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Apache MyFaces API - Core package" +HOMEPAGE="http://myfaces.apache.org/" +SRC_URI="http://repo1.maven.org/maven2/org/apache/myfaces/core/${PN}/${PV}/${P}-sources.jar" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="" + +CDEPEND=" + dev-java/cdi-api:1.2 + dev-java/javax-inject:0 + dev-java/tomcat-jstl-spec:0 + dev-java/validation-api:1.0 + dev-java/tomcat-servlet-api:3.0 + dev-java/myfaces-builder-annotations:0 + " + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.6" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-1.6 + app-arch/unzip" + +JAVA_GENTOO_CLASSPATH=" + cdi-api-1.2 + javax-inject + tomcat-jstl-spec + validation-api-1.0 + tomcat-servlet-api-3.0 + myfaces-builder-annotations +" diff --git a/dev-java/myfaces-builder-annotations/Manifest b/dev-java/myfaces-builder-annotations/Manifest new file mode 100644 index 000000000000..506f645c9253 --- /dev/null +++ b/dev-java/myfaces-builder-annotations/Manifest @@ -0,0 +1 @@ +DIST myfaces-builder-annotations-1.0.9-sources.jar 43051 SHA256 78c65366542fd91e7724aabec019e744255524b1a51db89da44386e25a76736b SHA512 09bf3f9faaaae0545544b2195c8070689431bf28497afc9e317010243617137528a61be82f47123237e114b1a7f5f174a5e2cc2190abdff8beb5188e38feec04 WHIRLPOOL f05a94714aedaf18d5bc2fdb0ca07de3464d862e0e0d70a7fb6e66b89d002857e30c68c3e0afb1938b0a2cb39e3a3c0368581938529de1a9e5e867505822ca48 diff --git a/sci-chemistry/sfcheck/metadata.xml b/dev-java/myfaces-builder-annotations/metadata.xml index 9ac9ffdb3a41..250f2d1940ea 100644 --- a/sci-chemistry/sfcheck/metadata.xml +++ b/dev-java/myfaces-builder-annotations/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>sci-chemistry</herd> + <herd>java</herd> </pkgmetadata> diff --git a/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild b/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild new file mode 100644 index 000000000000..3842b243c787 --- /dev/null +++ b/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Apache MyFaces API - Builder annotations package" +HOMEPAGE="http://myfaces.apache.org/" +SRC_URI="http://repo1.maven.org/maven2/org/apache/myfaces/buildtools/${PN}/${PV}/${P}-sources.jar" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +IUSE="" + +RDEPEND=">=virtual/jre-1.6" +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip" diff --git a/dev-java/proxool/Manifest b/dev-java/proxool/Manifest deleted file mode 100644 index f9cdc0369927..000000000000 --- a/dev-java/proxool/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST proxool-0.8.3-source.tar.gz 5782824 SHA256 2de39f0b45b71ba05f5639943a8f59a8bc49a4cc025efd7d1b16b39dfbd0ad11 SHA512 ff81c18a6c55aad245092c221f61df963b9574771218fa52c027f11ad73379429e160b481bdb2f5a335f7e4da97b7bcdff41f4c3fbec182668437fc965d6b94e WHIRLPOOL 69604c3afc3530a3ac35b250b3124cf474346cfb65c4888a8b611d66b24659869231bbb6820d450715672fb6e8777aa15d049c9ca5a6c1a78bb6bea9026ade8e diff --git a/dev-java/proxool/proxool-0.8.3-r2.ebuild b/dev-java/proxool/proxool-0.8.3-r2.ebuild deleted file mode 100644 index f5d23680f902..000000000000 --- a/dev-java/proxool/proxool-0.8.3-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -JAVA_PKG_IUSE="doc source" -WANT_ANT_TASKS="ant-nodeps" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Proxool is a Java connection pool" -HOMEPAGE="http://proxool.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="" - -# Tests disabled because they would need hibernate -# and as such creating a circular dependency -RESTRICT="test" - -COMMON_DEP=" - dev-java/avalon-framework:4.2 - dev-java/avalon-logkit:2.0 - dev-java/log4j:0 - dev-java/mx4j-core:3.0 - java-virtuals/servlet-api:3.0" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.4" -# Require jdk6 for building. #402487 -DEPEND="${COMMON_DEP} - virtual/jdk:1.6 - dev-util/checkstyle:0" - -java_prepare() { - find -name '*.jar' -exec rm {} + || die - - java-pkg_jar-from --into lib --build-only checkstyle -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_BUILD_TARGET="build-jar" -EANT_GENTOO_CLASSPATH="log4j,servlet-api-3.0,avalon-framework-4.2,avalon-logkit-2.0,mx4j-core-3.0" - -src_install() { - java-pkg_newjar build/${P}.jar ${PN}.jar - - dodoc README.txt || die - # dohtml valid as there are other docs too - use doc && java-pkg_dohtml -r doc/* - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/qdox/files/jflex-1.6.1.patch b/dev-java/qdox/files/jflex-1.6.1.patch new file mode 100644 index 000000000000..4e506246f2a2 --- /dev/null +++ b/dev-java/qdox/files/jflex-1.6.1.patch @@ -0,0 +1,27 @@ +https://github.com/jflex-de/jflex/commit/f312d563777d907bbb12d1e2ac79835ba83ca53c + +--- a/src/grammar/skeleton.inner 2012-11-04 16:16:30.000000000 +0000 ++++ b/src/grammar/skeleton.inner 2015-11-02 20:57:37.566057363 +0000 +@@ -407,15 +407,15 @@ + zzMarkedPos = zzMarkedPosL; + --- char count update + +---- actions +- default: +- if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { +- zzAtEOF = true; ++ if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { ++ zzAtEOF = true; + --- eofvalue +- } +- else { ++ } ++ else { ++--- actions ++ default: + --- no match +- } ++ } + } + } + } diff --git a/dev-java/qdox/qdox-1.12-r2.ebuild b/dev-java/qdox/qdox-1.12-r2.ebuild deleted file mode 100644 index 140ace0c440d..000000000000 --- a/dev-java/qdox/qdox-1.12-r2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Parser for extracting class/interface/method definitions" -HOMEPAGE="https://github.com/codehaus/qdox" -SRC_URI="http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz " - -LICENSE="Apache-2.0" -SLOT="1.12" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos" - -S="${WORKDIR}/${P}-SNAPSHOT" - -CDEPEND="dev-java/ant-core:0" - -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip:0 - dev-java/byaccj:0 - dev-java/jflex:0 - dev-java/jmock:1.0 - test? ( dev-java/junit:0 ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -java_prepare() { - if ! use test ; then - rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java - rm -rf src/java/com/thoughtworks/qdox/junit - rm -rf src/test - fi -} - -src_compile() { - jflex \ - src/grammar/lexer.flex \ - --skel src/grammar/skeleton.inner \ - -d src/java/com/thoughtworks/qdox/parser/impl/ || die - byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl src/grammar/parser.y || die - mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die - - # create jar - mkdir -p build/classes || die - - local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)" - - if use test ; then - cp="${cp}:$(java-pkg_getjars --build-only junit)" - fi - - ejavac -sourcepath . -d build/classes -classpath "${cp}" \ - $(find . -name "*.java") || die "Cannot compile sources" - - mkdir dist || die - cd build/classes || die - jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR" - - # generate javadoc - if use doc ; then - cd "${S}" - mkdir javadoc || die - javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}" - fi -} - -src_test() { - java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \ - com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!" -} - -src_install() { - java-pkg_dojar dist/${PN}.jar - java-pkg_register-ant-task - - use source && java-pkg_dosrc src/java/com - use doc && java-pkg_dojavadoc javadoc -} diff --git a/dev-java/qdox/qdox-1.12.1.ebuild b/dev-java/qdox/qdox-1.12.1-r1.ebuild index 7f99e232abf6..9082187a46ff 100644 --- a/dev-java/qdox/qdox-1.12.1.ebuild +++ b/dev-java/qdox/qdox-1.12.1-r1.ebuild @@ -6,7 +6,7 @@ EAPI="5" JAVA_PKG_IUSE="doc source test" -inherit java-pkg-2 java-ant-2 +inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="Parser for extracting class/interface/method definitions" HOMEPAGE="https://github.com/codehaus/qdox" @@ -14,7 +14,7 @@ SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="1.12" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos" S="${WORKDIR}/${PN}-${PN}-${PV}" @@ -23,7 +23,7 @@ CDEPEND="dev-java/ant-core:0" DEPEND=">=virtual/jdk-1.4 app-arch/unzip:0 dev-java/byaccj:0 - >=dev-java/jflex-1.4.3:0 + >=dev-java/jflex-1.6.1:0 dev-java/jmock:1.0 test? ( dev-java/junit:0 ) ${CDEPEND}" @@ -32,6 +32,8 @@ RDEPEND=">=virtual/jre-1.4 ${CDEPEND}" java_prepare() { + epatch "${FILESDIR}"/jflex-1.6.1.patch + if ! use test ; then rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java rm -rf src/java/com/thoughtworks/qdox/junit diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest index 69f4fab0e245..3fc41b1c0aff 100644 --- a/dev-java/rhino/Manifest +++ b/dev-java/rhino/Manifest @@ -1,4 +1 @@ DIST Rhino1_7_7_RELEASE.zip 6059127 SHA256 0ef505aee093c690025c4484ce108b6e735e05baa3181bb56fdec4cb6b8b0107 SHA512 ce89b6a153d62dd459a86360c67d6db4b05922d8ab49a8d45ccb0deb0f639cd819f0ad75cb4929eda6b7f0fd6ddb5879a4035de6968283317bfd0e93d2bb744e WHIRLPOOL 0f54840077e46a6ac31e23784b3c13881a774356df14274fc9ffdf93eb3d7b92e8666630d8e51494931819a609a971bb6744cf961c2c168bb94b4e42d3eb0896 -DIST rhino-swing-ex-1.0.zip 19708 SHA256 062837ddb18951ace41ba0050aec95a690c00190a6218e5c9591c381035dfa7d SHA512 f2c1f970595cb08ac301d2fc21e0a2f1090b2007c849d993094ef3215a39456a5865bcaaf9424da93a09d6f0d151be6ec77f844bde2540d725c85c4b54a5f248 WHIRLPOOL 4dd40c1c80a70cd08584ac44abd3b42a790080f93449da8e241ed568ff5b3a5ac6cef12951632eba91547845be49401102d072b05a83a3ed78705acd768b1ced -DIST rhino1_6R5.zip 1822832 SHA256 02a4f17121f148c94ac65fb6d9eb4a817ce86c378c96cc94e9fc1b087b34526f SHA512 bd10b2e687925e06a5a4da5bc0e29a65cff08fc26792e3183f2ab28efb71efcdbc2fb08142be2fd2622c0b94dfa2691ce898ba847935def780e8686a879720f0 WHIRLPOOL 5fda95c5a99a6e99322a81fda513135cece56df0c7d17efcaea0b5f9f8f63b3adccd47bf30f26521b36e33f34e642e05107d7e0f202b8d532356884954d01049 -DIST rhino1_7R2.zip 2996867 SHA256 677f7dc1b67a1587bc03974d5f0720474a56b8f29835e1d860739908df8462dc SHA512 e4472e11377e93b64df3a2a9f266956d86ba78c85ceba57ff05c983d577143351fcbbbc0b63f7034718fd74c13a9e50bac6e8813f320b86fcd09b571e919b858 WHIRLPOOL 546f9a0e565881dd6128e000ca8c8e017cf7432e40df885268c4827e2dbd28f86cde37dbc7284bd1b08b062060eca1465716f850dbd54f176ead475b4b55351d diff --git a/dev-java/rhino/files/00_dont-fetch-swing-ex.patch b/dev-java/rhino/files/00_dont-fetch-swing-ex.patch deleted file mode 100644 index 994975149dd0..000000000000 --- a/dev-java/rhino/files/00_dont-fetch-swing-ex.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- toolsrc/build.xml 2004-03-25 15:54:34.000000000 +0100 -+++ toolsrc/build-patch.xml 2004-06-19 23:48:07.225123288 +0200 -@@ -20,7 +20,6 @@ - <!-- Download source from Sun's site, unzip it, remove
- the files we don't need, and change the package
- -->
-- <get src="http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/src.zip" dest="${nest}/${build.dir}/swingExSrc.zip"/>
- <unzip src="${nest}/${build.dir}/swingExSrc.zip" dest="${src.debugger}"/>
- <delete file="${src.debugger}/FileSystemModel2.java" />
- <delete file="${src.debugger}/MergeSort.java" />
diff --git a/dev-java/rhino/files/1.5.5_jdk15.patch b/dev-java/rhino/files/1.5.5_jdk15.patch deleted file mode 100644 index 0948921b4770..000000000000 --- a/dev-java/rhino/files/1.5.5_jdk15.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -urpN rhino1_5R5.old/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java ---- rhino1_5R5.old/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2004-03-25 15:54:34.000000000 +0100 -+++ rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2005-02-01 13:58:26.521223264 +0100 -@@ -124,7 +124,7 @@ public class JavaPolicySecurity extends -
- public JavaPolicySecurity() {
- // To trigger error on jdk-1.1 with lazy load
-- new CodeSource(null, null);
-+ new CodeSource(null, (java.security.cert.Certificate[])null);
- }
-
- protected void callProcessFileSecure(final Context cx,
-@@ -167,8 +167,8 @@ public class JavaPolicySecurity extends - }
-
- private ProtectionDomain getUrlDomain(URL url) {
-- CodeSource cs = new CodeSource(url, null);
-- PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
-+ CodeSource cs = new CodeSource(url, (java.security.cert.Certificate[])null);
-+ PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
- return new ProtectionDomain(cs, pc);
- }
-
diff --git a/dev-java/rhino/files/public-NativeScript.patch b/dev-java/rhino/files/public-NativeScript.patch deleted file mode 100644 index 026bcedb0e55..000000000000 --- a/dev-java/rhino/files/public-NativeScript.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rhino1_5R5/src/org/mozilla/javascript/NativeScript.java.orig 2006-05-31 14:01:06.000000000 +0200 -+++ rhino1_5R5/src/org/mozilla/javascript/NativeScript.java 2006-05-31 14:03:37.000000000 +0200 -@@ -55,7 +55,7 @@ - * @author Norris Boyd
- */
-
--class NativeScript extends NativeFunction implements Script
-+public class NativeScript extends NativeFunction implements Script
- {
-
- static void init(Context cx, Scriptable scope, boolean sealed)
diff --git a/dev-java/rhino/files/rhino-1.6-noget.patch b/dev-java/rhino/files/rhino-1.6-noget.patch deleted file mode 100644 index 235091428392..000000000000 --- a/dev-java/rhino/files/rhino-1.6-noget.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/toolsrc/org/mozilla/javascript/tools/debugger/build.xml b/toolsrc/org/mozilla/javascript/tools/debugger/build.xml -index 7ed0236..5f7db6e 100644 ---- a/toolsrc/org/mozilla/javascript/tools/debugger/build.xml -+++ b/toolsrc/org/mozilla/javascript/tools/debugger/build.xml -@@ -47,7 +47,6 @@ - the files we don't need, and change the package - --> - <mkdir dir="downloaded"/> -- <get src="${swing-ex-url}" dest="downloaded/swingExSrc.zip"/> - <unzip src="downloaded/swingExSrc.zip" dest="downloaded/"> - <patternset> - <include name="AbstractCellEditor.java"/> diff --git a/dev-java/rhino/rhino-1.6.5.ebuild b/dev-java/rhino/rhino-1.6.5.ebuild deleted file mode 100644 index 4c59f2556129..000000000000 --- a/dev-java/rhino/rhino-1.6.5.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_PKG_IUSE="doc examples source" -inherit java-pkg-2 java-ant-2 eutils versionator - -MY_P="${PN}$(replace_version_separator 1 _ $(replace_version_separator 2 R))" - -DESCRIPTION="An open-source implementation of JavaScript written in Java" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.zip - mirror://gentoo/rhino-swing-ex-1.0.zip" -HOMEPAGE="http://www.mozilla.org/rhino/" -# dual license for rhino and BSD-2 for the swing-ex from Sun's tutorial -LICENSE="|| ( MPL-1.1 GPL-2 ) BSD-2" -SLOT="1.6" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="" - -S="${WORKDIR}/${MY_P}" - -CDEPEND="=dev-java/xml-xmlbeans-1*" -RDEPEND=">=virtual/jre-1.4 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - ${CDEPEND}" - -src_unpack() { - unpack ${MY_P}.zip - cd "${S}" - - # don't download src.zip from Sun - epatch "${FILESDIR}/rhino-1.6-noget.patch" - - rm -v *.jar || die - rm -rf docs/apidocs || die - - local dir="toolsrc/org/mozilla/javascript/tools/debugger/downloaded" - mkdir ${dir} || die - cp "${DISTDIR}/rhino-swing-ex-1.0.zip" ${dir}/swingExSrc.zip || die - - mkdir lib/ && cd lib/ || die - java-pkg_jar-from xml-xmlbeans-1 xbean.jar -} - -src_install() { - java-pkg_dojar build/${MY_P}/js.jar - - java-pkg_dolauncher jsscript-${SLOT} \ - --main org.mozilla.javascript.tools.shell.Main - - if use doc; then - local dir="build/${MY_P}/docs" - mv "${dir}"/{apidocs,api} || die - java-pkg_dohtml -r "${dir}"/* - dosym /usr/share/doc/${PF}/html/{api,apidocs} || die - fi - use examples && java-pkg_doexamples examples - use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org -} diff --git a/dev-java/rhino/rhino-1.7.2-r2.ebuild b/dev-java/rhino/rhino-1.7.2-r2.ebuild deleted file mode 100644 index b6e779c10b4f..000000000000 --- a/dev-java/rhino/rhino-1.7.2-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="1" -JAVA_PKG_IUSE="doc examples source" -inherit java-pkg-2 java-ant-2 eutils versionator - -MY_P="${PN}$(replace_version_separator 1 _ $(replace_version_separator 2 R))" - -DESCRIPTION="An open-source implementation of JavaScript written in Java" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.zip - mirror://gentoo/rhino-swing-ex-1.0.zip" -HOMEPAGE="http://www.mozilla.org/rhino/" -# dual license for rhino and BSD-2 for the swing-ex from Sun's tutorial -LICENSE="|| ( MPL-1.1 GPL-2 ) BSD-2" -SLOT="1.6" -KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -S="${WORKDIR}/${MY_P}" - -CDEPEND="=dev-java/xml-xmlbeans-1*" -RDEPEND=">=virtual/jre-1.5 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip - ${CDEPEND}" - -src_unpack() { - unpack ${MY_P}.zip - cd "${S}" - - # don't download src.zip from Sun - epatch "${FILESDIR}/rhino-1.6-noget.patch" - - rm -v *.jar || die - rm -rf docs/apidocs || die - - local dir="toolsrc/org/mozilla/javascript/tools/debugger/downloaded" - mkdir ${dir} || die - cp "${DISTDIR}/rhino-swing-ex-1.0.zip" ${dir}/swingExSrc.zip || die - - mkdir lib/ && cd lib/ || die - java-pkg_jar-from xml-xmlbeans-1 xbean.jar - - # Stop downloading of deps - cd "${S}" - mkdir -p build/tmp-xbean - touch build/tmp-xbean/xbean.zip - touch lib/jsr173_1.0_api.jar -} - -src_install() { - java-pkg_dojar build/${MY_P}/js.jar - - java-pkg_dolauncher jsscript-${SLOT} \ - --main org.mozilla.javascript.tools.shell.Main - - use doc && java-pkg_dojavadoc "build/${MY_P}/javadoc" - use examples && java-pkg_doexamples examples - use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org -} diff --git a/dev-java/rhino/rhino-1.7.7-r1.ebuild b/dev-java/rhino/rhino-1.7.7-r1.ebuild index 1d9411ca3315..753aa18d2a38 100644 --- a/dev-java/rhino/rhino-1.7.7-r1.ebuild +++ b/dev-java/rhino/rhino-1.7.7-r1.ebuild @@ -24,7 +24,7 @@ HOMEPAGE="http://www.mozilla.org/rhino/" LICENSE="MPL-1.1 GPL-2" SLOT="1.6" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ppc ppc64 x86" IUSE="" # ../rhino-Rhino1_7_7_RELEASE @@ -56,13 +56,9 @@ EANT_TEST_TARGET="junit" RESTRICT="test" java_prepare() { - find . \ - -type f \ - -name \*.jar \ - -print \ - -exec rm -v {} \; || die "Couldn't delete bundled jar files." + java-pkg_clean - epatch ${PATCHES[@]} + epatch "${PATCHES[@]}" if use test; then mkdir lib || die diff --git a/dev-java/rhino/rhino-1.7.7.ebuild b/dev-java/rhino/rhino-1.7.7.ebuild deleted file mode 100644 index 9a61bd72825e..000000000000 --- a/dev-java/rhino/rhino-1.7.7.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" -JAVA_PKG_IUSE="doc examples source test" -inherit java-pkg-2 java-ant-2 versionator - -# rhino -> Rhino -MY_PN="${PN^}" - -# 1.7.7 -> 1_7_7 -MY_PV="$(replace_all_version_separators _ ${PV})" - -# rhino1.7.7 -MY_P="${PN}${PV}" - -# Rhino1_7_7_RELEASE -MY_RELEASE="${MY_PN}${MY_PV}_RELEASE" - -DESCRIPTION="An open-source implementation of JavaScript written in Java" -SRC_URI="https://github.com/mozilla/${PN}/archive/${MY_RELEASE}.zip" -HOMEPAGE="http://www.mozilla.org/rhino/" - -LICENSE="MPL-1.1 GPL-2" -SLOT="1.7" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" - -# ../rhino-Rhino1_7_7_RELEASE -S="${WORKDIR}/${PN}-${MY_RELEASE}" - -CDEPEND="" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.6 - test? ( - dev-java/emma:0 - dev-java/junit:4 - dev-java/ant-junit:0 - dev-java/hamcrest-core:1.3 - ) - ${CDEPEND}" - -JAVA_ANT_REWRITE_CLASSPATH="yes" - -PATCHES=( - "${FILESDIR}"/${P}-testsrc-build.xml.patch -) - -EANT_TEST_TARGET="junit" - -# StackOverFlow errors arise on some tests. -# Further, the test suite takes way too much time (> 5 min). -# Maybe reduce the numbers of tests? -RESTRICT="test" - -java_prepare() { - find . \ - -type f \ - -name \*.jar \ - -print \ - -exec rm -v {} \; || die "Couldn't delete bundled jar files." - - epatch ${PATCHES[@]} - - if use test; then - mkdir lib || die - java-pkg_jar-from --build-only emma emma.jar lib/emma.jar - java-pkg_jar-from --build-only emma emma_ant.jar lib/emma_ant.jar - java-pkg_jar-from --build-only hamcrest-core-1.3 hamcrest-core.jar lib/hamcrest.jar - java-pkg_jar-from --build-only junit-4 junit.jar lib/junit.jar - fi -} - -src_compile() { - java-pkg-2_src_compile - - if use source; then - EANT_BUILD_TARGET="source-zip" \ - java-pkg-2_src_compile - fi -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar build/${MY_P}/js.jar - - java-pkg_dolauncher jsscript-${SLOT} \ - --main org.mozilla.javascript.tools.shell.Main - - use doc && java-pkg_dojavadoc "build/${MY_P}/javadoc" - use examples && java-pkg_doexamples examples - use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org -} diff --git a/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch b/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch new file mode 100644 index 000000000000..ba537f54024e --- /dev/null +++ b/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch @@ -0,0 +1,23 @@ +crash: fatal error in soup_session_feature_detach with WebKitGTK+ >= 1.11.91 +http://git.eclipse.org/c/platform/eclipse.platform.swt.git/commit/?id=b22a7d19afbe2a3811a0f8aa54c1e85d92c62a2c +https://bugs.eclipse.org/404776 +https://bugs.gentoo.org/500570 + +--- a/src/org/eclipse/swt/browser/WebKit.java ++++ b/src/org/eclipse/swt/browser/WebKit.java +@@ -597,9 +597,13 @@ public void create (Composite parent, int style) { + */ + long /*int*/ session = WebKitGTK.webkit_get_default_session (); + long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ()); +- WebKitGTK.soup_session_feature_detach (originalAuth, session); ++ if (originalAuth != 0) { ++ WebKitGTK.soup_session_feature_detach (originalAuth, session); ++ } + OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView); +- WebKitGTK.soup_session_feature_attach (originalAuth, session); ++ if (originalAuth != 0) { ++ WebKitGTK.soup_session_feature_attach (originalAuth, session); ++ } + + /* + * Check for proxy values set as documented java properties and update the diff --git a/dev-java/swt/swt-3.8.2-r1.ebuild b/dev-java/swt/swt-3.8.2-r1.ebuild new file mode 100644 index 000000000000..275a3660006d --- /dev/null +++ b/dev-java/swt/swt-3.8.2-r1.ebuild @@ -0,0 +1,184 @@ +# 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 toolchain-funcs java-osgi + +MY_PV="${PV/_rc/RC}" +MY_DMF="archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="http://www.eclipse.org/" +SRC_URI="x86? ( + http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip + ) + x86-fbsd? ( + http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip + ) + amd64? ( + http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip + ) + ppc? ( + http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip + ) + ppc64? ( + http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip + )" + +SLOT="3.8" +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +IUSE="cairo gnome opengl webkit" +COMMON=">=dev-libs/glib-2.6 + >=x11-libs/gtk+-2.6.8:2 + >=dev-libs/atk-1.10.2 + cairo? ( >=x11-libs/cairo-1.4.14 ) + gnome? ( + gnome-base/gnome-vfs:2 + gnome-base/libgnome + gnome-base/libgnomeui + ) + opengl? ( + virtual/opengl + virtual/glu + ) + webkit? ( >=net-libs/webkit-gtk-1.2:2 ) + x11-libs/libXtst" + +DEPEND=">=virtual/jdk-1.4 + app-arch/unzip + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + >=x11-libs/libXtst-1.1.0 + x11-proto/inputproto + virtual/pkgconfig + ${COMMON}" + +RDEPEND=">=virtual/jre-1.4 + ${COMMON}" + +S="${WORKDIR}" + +# JNI libraries don't need SONAME, bug #253756 +QA_SONAME="usr/$(get_libdir)/libswt-.*.so" + +src_unpack() { + local DISTFILE=${A} + unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" + unpack "./src.zip" + + # Cleanup the redirtied directory structure + rm -rf about_files/ || die +} + +java_prepare() { + # Replace the build.xml to allow compilation without Eclipse tasks + cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml" + + mkdir -p "${S}/src" + mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" + + epatch "${FILESDIR}"/${PN}-3.8-as-needed-and-flag-fixes.patch + epatch "${FILESDIR}"/${P}-gthread.patch + epatch "${FILESDIR}"/${P}-libwebkit-compat.patch +} + +src_compile() { + # Drop jikes support as it seems to be unfriendly with SWT + java-pkg_filter-compiler jikes + + local AWT_ARCH + local JAWTSO="libjawt.so" + if [[ $(tc-arch) == 'x86' ]] ; then + AWT_ARCH="i386" + elif [[ $(tc-arch) == 'ppc' ]] ; then + AWT_ARCH="ppc" + elif [[ $(tc-arch) == 'ppc64' ]] ; then + AWT_ARCH="ppc64" + else + AWT_ARCH="amd64" + fi + if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}" + elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${JAVA_HOME}/jre/bin" + elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then + export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)" + else + eerror "${JAWTSO} not found in the JDK being used for compilation!" + die "cannot build AWT library" + fi + + # Fix the pointer size for AMD64 + [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64 + + local platform="linux" + + use elibc_FreeBSD && platform="freebsd" + + local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" + + einfo "Building AWT library" + ${make} make_awt + + einfo "Building SWT library" + ${make} make_swt + + einfo "Building JAVA-AT-SPI bridge" + ${make} make_atk + + if use gnome ; then + einfo "Building GNOME VFS support" + ${make} make_gnome + fi + + if use cairo ; then + einfo "Building CAIRO support" + ${make} make_cairo + fi + + if use opengl ; then + einfo "Building OpenGL component" + ${make} make_glx + fi + + if use webkit ; then + einfo "Building the WebKitGTK+ component" + + ${make} make_webkit + fi + + einfo "Building JNI libraries" + eant compile + + einfo "Copying missing files" + cp -i "${S}/version.txt" "${S}/build/version.txt" || die + cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \ + "${S}/build/org/eclipse/swt/internal/" || die + + einfo "Packing JNI libraries" + eant jar +} + +src_install() { + swtArch=${ARCH} + use amd64 && swtArch=x86_64 + use x86-fbsd && swtArch=x86 + + sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die + use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF" + use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF" + use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF" + use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF" + java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0" + + java-pkg_sointo /usr/$(get_libdir) + java-pkg_doso *.so + + dohtml about.html +} diff --git a/dev-java/testng/files/build-tests.xml b/dev-java/testng/files/build-tests.xml deleted file mode 100644 index e94606b60cea..000000000000 --- a/dev-java/testng/files/build-tests.xml +++ /dev/null @@ -1,188 +0,0 @@ -<!-- From: https://github.com/cbeust/testng/blob/master/build-tests.xml --> - -<project name="testng" default="all" basedir="."> - - <property file="build.properties"/> - - <property name="report.dir" value="${test.output.dir}"/> - <property name="junit.report.dir" value="${report.dir}/test-tmp"/> - <property name="testng.report.dir" value="${report.dir}"/> - - <target name="all" depends="prepare,compile,run,reports,done"/> - - <!-- ==================================================================== --> - <!-- Compile --> - <!-- ==================================================================== --> - <path id="compile.cp"> - <pathelement location="${testng.jar}" /> - <fileset dir="${lib.dir}" includes="${guice2.jar}" /> - <fileset dir="${lib.dir}" includes="${junit.jar}" /> - </path> - - <target name="env:info"> - <echo> -BASEDIR =${basedir} -TEST.DIR =${test.dir} -TEST.BUILD.DIR =${test.build.dir} -REPORT.DIR =${report.dir} -JUNIT.REPORT.DIR =${junit.report.dir} -TESTNG.REPORT.DIR=${testng.report.dir} - </echo> - </target> - - <target name="compile" depends="prepare"> - <echo message=" -- Compiling tests --"/> - - <property name="build.compiler" value="modern"/> - <javac debug="true" - source="1.5" - classpathref="compile.cp" - srcdir="${test.dir}" - destdir="${test.build.dir}" - /> - - </target> - - <target name="prepare"> - <tstamp/> - <mkdir dir="${test.build.dir}"/> - <mkdir dir="${junit.report.dir}"/> - <mkdir dir="${testng.report.dir}"/> - - <taskdef name="testng" - classname="org.testng.TestNGAntTask" - classpath="${build.dir}"/> - </target> - -<!-- - <property name="cobertura.dir" value="../cobertura-1.9.4.1" /> - - <path id="cobertura.classpath"> - <fileset dir="${cobertura.dir}"> - <include name="cobertura.jar" /> - <include name="lib/**/*.jar" /> - </fileset> - </path> ---> - - <!-- ==================================================================== --> - <!-- Run --> - <!-- ==================================================================== --> - - <path id="run.cp"> -<!-- - <path location="target/instrumented-classes" /> - <path refid="cobertura.classpath" /> ---> - <path refid="compile.cp"/> - <pathelement location="${test.build.dir}"/> - </path> - - <target name="run" description="Run tests" depends="compile,copy-resources"> - <echo message=" -- Running tests --"/> - <echo message=" -- ${testng.jar} --" /> - <testng classpathref="run.cp" - outputdir="${testng.report.dir}"> - <xmlfileset dir="${test.resources.dir}" includes="testng.xml"/> - <jvmarg value="-Dtest.resources.dir=${test.resources.dir}" /> - <jvmarg value="-Dsun.io.serialization.extendedDebugInfo=true" /> - </testng> - </target> - - <target name="copy-resources" description="Copies resources."> - <copy verbose="false" - file="${src.resources.dir}/testngtasks" - todir="${build.dir}" /> - <copy todir="${build.dir}"> - <fileset dir="${src.resources.dir}"> - <exclude name="**/.*" /> - <exclude name="**/CVS/*" /> - </fileset> - </copy> - </target> - - <target name="run:single" description="Run 1 property file named with the ant property test" depends="compile"> - <echo message=" -- testng-tests-run1 --"/> - - <testng outputdir="${testng.report.dir}" - classpathref="run.cp" - useDefaultListeners="true" - outputDir="${testng.report.dir}"> - <xmlfileset dir="${test.resources.dir}" includes="testng-single.xml"/> - </testng> - - <echo>Report created in open ${testng.report.dir}/index.html</echo> - </target> - - <target name="run:antprop" description="Run a test to see if ant system propertes are passed correctly" depends="compile"> - <echo message=" -- testng-tests-run-antprop --"/> - <property name="syspropset1" value="value 1"/> - <property name="syspropset2" value="value 2"/> - <propertyset id="propset1"> - <propertyref name="syspropset1"/> - <propertyref name="syspropset2"/> - </propertyset> - - <testng outputdir="${testng.report.dir}" - classpathref="run.cp"> - <xmlfileset dir="${test.resources.dir}" includes="testng-single3.xml"/> - <propertyset refid="propset1"/> - <sysproperty key="sysprop1" value="value 3"/> - </testng> - </target> - - <!-- ==================================================================== --> - <!-- Run specific configuration --> - <!-- ==================================================================== --> - <target name="run:conf" - if="testng.conf" - depends="clean:reports,compile" - description="Run specified tests"> - <echo message=" -- testng-tests-run --"/> - <echo message="using: ${testng.conf}.xml"/> - - <testng classpathref="run.cp" - outputDir="${testng.report.dir}"> - <xmlfileset dir="${test.resources.dir}" includes="${testng.conf}.xml"/> - </testng> - - <antcall target="clean.tmp"/> - </target> - - - <!-- ==================================================================== --> - <!-- Reports --> - <!-- ==================================================================== --> - - <target name="reports"> - <junitreport todir="${junit.report.dir}"> - <fileset dir="${testng.report.dir}"> - <include name="*.xml"/> - <exclude name="testng-failed.xml"/> - <exclude name="testng-results.xml" /> - </fileset> - <report format="noframes" todir="${junit.report.dir}"/> - </junitreport> - </target> - - - <target name="clean.tmp"> - <delete dir="${test.output.dir}"/> - </target> - - <target name="clean:reports"> - <delete dir="${report.dir}"/> - <delete dir="${junit.report.dir}"/> - </target> - - <target name="clean" depends="clean.tmp,clean:reports"> - <echo message=" -- test clean --"/> - - <delete dir="${test.build.dir}"/> - </target> - - <target name="done"> - <echo>Reports can be found in: open ${testng.report.dir}/index.html</echo> - </target> - -</project> diff --git a/dev-java/testng/testng-6.8-r2.ebuild b/dev-java/testng/testng-6.8-r3.ebuild index e90b7648a71f..83f523f9ea6e 100644 --- a/dev-java/testng/testng-6.8-r2.ebuild +++ b/dev-java/testng/testng-6.8-r3.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" JAVA_PKG_IUSE="doc examples source test" -WANT_ANT_TASKS="ant-junit" inherit java-pkg-2 java-ant-2 @@ -17,23 +16,26 @@ LICENSE="Apache-2.0" KEYWORDS="~amd64 ~x86" SLOT="0" -CDEPEND="dev-java/ant-core:0 +CDEPEND=" dev-java/bsh:0 dev-java/guice:2 - dev-java/jcommander:0 dev-java/junit:4 + dev-java/ant-core:0 + dev-java/jcommander:0 dev-java/snakeyaml:1.9" -DEPEND=">=virtual/jdk-1.5 +DEPEND=">=virtual/jdk-1.6 app-arch/zip ${CDEPEND}" -RDEPEND=">=virtual/jre-1.5 +RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" +JAVA_ANT_CLASSPATH_TAGS+=" testng javadocs-current" JAVA_PKG_BSFIX_NAME="build.xml build-tests.xml" JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_ANT_CLASSPATH_TAGS+=" testng javadocs-current" +JAVA_ANT_ENCODING="ISO-8859-1" + EANT_GENTOO_CLASSPATH="ant-core,bsh,guice-2,jcommander,junit-4,snakeyaml-1.9" EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}" @@ -41,13 +43,20 @@ EANT_BUILD_TARGET="build" EANT_TEST_TARGET="tests" EANT_DOC_TARGET="javadocs" +PATCHES=( + "${FILESDIR}"/${P}-remove-ivy-retrieve.patch + "${FILESDIR}"/${P}-remove-jar-bundling.patch +) + +# Error: A JNI error has occurred, please check your installation and try again. +RESTRICT="test" + java_prepare() { - find . -name '*.jar' -print -delete || die + java-pkg_clean cp "${FILESDIR}"/${P}-build-tests.xml build-tests.xml || die - epatch "${FILESDIR}"/${P}-remove-ivy-retrieve.patch - epatch "${FILESDIR}"/${P}-remove-jar-bundling.patch + epatch "${PATCHES[@]}" # Removal of tests that break due to restrictions or environment expectations: # ServiceLoaderTest - Breaks due absolute URL load that Portage prevents; @@ -66,10 +75,10 @@ java_prepare() { } src_test() { - local tests_file="target/test-output/index.html" - java-pkg-2_src_test + local tests_file="target/test-output/index.html" + if [[ ! -f ${tests_file} ]] ; then die "Tests failed, test output does not exist; a problem with starting the tests." fi diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.ebuild index df80ff13dae6..2c36a63894bc 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="3.0" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.6" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild index 7e086a049fec..e980d1e5e5cc 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="3.1" -KEYWORDS="amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.7" diff --git a/dev-java/xmlc/Manifest b/dev-java/xmlc/Manifest deleted file mode 100644 index b3039a951a40..000000000000 --- a/dev-java/xmlc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xmlc-src-2.3.1.zip 8147268 SHA256 b95b422fc143c8bd2d61706d70ab4985431d5155b88df528951fc6f0c76b1b04 SHA512 377ec4d57373038e550b2f1902b019e413aeddc8b80f297898156a17c1fa437948b1e1f9302ca82f6b46fc8114a96f32bef9d27f68662fcf4fae1e7c3a52c16a WHIRLPOOL 819526aca87805a545237720b39fadbf3cb9f19bfab5acd38a24a084a0406ac7ece1b0d83b76cbe9fbd18286b45e846832afe58dfbc52cc6fb3c8d6c315d461e diff --git a/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch b/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch deleted file mode 100644 index 58c3db7f62ae..000000000000 --- a/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Nur xmlc-src-2.3.1/xmlc/modules/taskdef/build-default.properties xmlc-src-2.3.1_patched/xmlc/modules/taskdef/build-default.properties ---- xmlc-src-2.3.1/xmlc/modules/taskdef/build-default.properties 2007-04-22 00:40:58.000000000 +0300 -+++ xmlc-src-2.3.1_patched/xmlc/modules/taskdef/build-default.properties 2009-01-31 20:00:27.000000000 +0200 -@@ -37,7 +37,7 @@ - # Comma seperated list of libraries (or more exactly, include patterns) this
- # module depends on for building.
- # They are searched relative to ${lib.dir}
--module.depends=xmlc.jar
-+module.depends=xmlc.jar,ant.jar
-
- # Javadoc settings
- javadoc.packages=org.enhydra.*
-diff -Nur xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml ---- xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml 2007-11-04 01:07:36.000000000 +0200 -+++ xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml 2009-01-31 20:13:12.000000000 +0200 -@@ -148,15 +148,12 @@ - description="Build the module .jar file">
- <tstamp/>
- <delete file="${module.jar}"/>
-- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar.jar"/>
-- <jarjar jarfile="${module.jar}"><!-- index="true"-->
-+ <jar jarfile="${module.jar}"><!-- index="true"-->
- <fileset file="${dist.root}/../LICENSE-xmlc"/>
- <fileset dir="${build.classes}" />
- <fileset dir="${src.dir}"
- includes="${module.lib.extra.includes}"
- excludes="${module.lib.extra.excludes}" />
-- <zipfileset src="${build.lib.dir}/asm.jar"/>
-- <rule pattern="org.objectweb.asm.**" result="org.enhydra.xml.xmlc.deferredparsing.asm.@1"/>
- <manifest>
- <attribute name="Built-By" value="${user.name}"/>
- <attribute name="Built-On" value="${TODAY}"/>
-@@ -171,18 +168,13 @@ - <attribute name="Implementation-Vendor" value="OW2 Consortium"/>
- <attribute name="Implementation-Vendor-Id" value="org.ow2"/>
- <attribute name="Implementation-URL" value="http://www.enhydra.org/tech/xmlc/"/>
-- </section>
-- <section name="org/enhydra/xml/xmlc/deferredparsing/asm/">
-- <attribute name="Implementation-Title" value="ASM"/>
-- <attribute name="Implementation-Version" value="3.1"/>
-- <attribute name="Implementation-Vendor" value="France Telecom R&D"/>
-- </section>
-+ </section>
- </manifest>
- <!--indexjars>
- <fileset dir="${dist.root}/lib" includes="*.jar"/>
- <fileset dir="${dist.root}/build-lib" includes="*.jar"/>
- </indexjars-->
-- </jarjar>
-+ </jar>
- </target>
-
- <target name="lib-tests" depends="init,compile-tests" unless="lib-test.skip"
diff --git a/dev-java/xmlc/metadata.xml b/dev-java/xmlc/metadata.xml deleted file mode 100644 index 88da3839a529..000000000000 --- a/dev-java/xmlc/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>java</herd> -<longdescription> -Enhydra XMLC is the presentation technology that supports the needs of -designers, developers and architects alike, delivering what JSP cannot - strict -separation of markup and logic in a true object view of dynamic presentations. -</longdescription> -</pkgmetadata> diff --git a/dev-java/xmlc/xmlc-2.3.1-r1.ebuild b/dev-java/xmlc/xmlc-2.3.1-r1.ebuild deleted file mode 100644 index 1d93761ebfc1..000000000000 --- a/dev-java/xmlc/xmlc-2.3.1-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -JAVA_PKG_IUSE="doc" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-src-${PV}" -DESCRIPTION="Open Source Java/XML Presentation Compiler" -HOMEPAGE="http://xmlc.objectweb.org/" -SRC_URI="http://download.forge.objectweb.org/${PN}/${MY_P}.zip - http://download.us.forge.objectweb.org/${PN}/${MY_P}.zip" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -COMMON_DEP=" - dev-java/ant-core:0 - dev-java/asm:3 - dev-java/gnu-regexp:1 - dev-java/log4j:0 - dev-java/nekohtml:0 - dev-java/xerces:2 - dev-java/xml-commons-external:1.4 - dev-java/xml-commons-resolver:0 - java-virtuals/servlet-api:2.5" -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - ${COMMON_DEP}" - -S="${WORKDIR}/${MY_P}/" - -java_prepare() { - find -name '*.jar' -exec rm -v {} + || die - - # get rid of jarjar, and add ant.jar to the taskdef module's classpath - epatch "${FILESDIR}/${P}-build.xml.patch" -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" - -EANT_BUILD_TARGET="all-libs" -EANT_GENTOO_CLASSPATH="xerces-2,gnu-regexp-1,log4j,nekohtml,asm-3,xml-commons-external-1.4,xml-commons-resolver,servlet-api-2.5,ant-core" - -src_install() { - # the rest of jars are included in all-runtime - java-pkg_dojar release/lib/{xmlc-all-runtime,xmlc-taskdef}.jar - java-pkg_register-ant-task - - newdoc xmlc/modules/xmlc/README.XMLC README || die - dodoc xmlc/modules/xmlc/ChangeLog || die - dohtml release/release-notes/xmlc-${PV//./-}-release-note.html \ - xmlc/bugs/bugs.html || die - - # move the generated documentation around - if use doc; then - mv ${PN}/modules/taskdef/doc ${PN}/modules/${PN}/doc/taskdef || die - mv ${PN}/modules/wireless/doc ${PN}/modules/${PN}/doc/wireless || die - mv ${PN}/modules/xhtml/doc ${PN}/modules/${PN}/doc/xhtml || die - java-pkg_dohtml -r ${PN}/modules/xmlc/doc/* || die "Failed to install documentation" - fi -} diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest index 7b2a3d2133da..5c7dbb5722b8 100644 --- a/dev-java/xstream/Manifest +++ b/dev-java/xstream/Manifest @@ -1 +1,2 @@ +DIST xstream-1.4.8-sources.jar 395464 SHA256 5d956e4527d27420f2d417cd77ffafedad85ee795a59857bbf2be9cc630eace0 SHA512 9fb9ebc6facdc07aecbcee3fbf40ef560bdd42cd8f7c7a3a8e2401be5c4e05ed3370beec653ef06d2fd3aa1acabf8f4ada8dddea27f239d180d66aec0bd905e6 WHIRLPOOL 10f9ad97300397000085e4850baa89a2560bd13431c1668b7e144fe53b0800f546ff56cb7bd373a53ea7ab1ff88bef80260e3d8543543c8df50fc5e56fdd8aa2 DIST xstream-distribution-1.3.1-src.zip 7505723 SHA256 df645ea4e2e16c4a149fb45966ea50d48b54776ead4727837348195daad94f6b SHA512 c8c92879a26599d7444fce0638ba13d185fd3c1f42962b92fe1b984d2ea41f8e434acb6af5613ac9f44354816fb7abc60f751f864f36deb9c2413b0caec5c2ac WHIRLPOOL 13ac006402bbecbf6d3ff9fe30662cc6e3807cdf3a391255f878cea37800842adc929914f2e4aace3a7788294809afb26edd64181f85a7e5dc46f3e1f9c0e9b6 diff --git a/dev-java/xstream/xstream-1.4.8-r1.ebuild b/dev-java/xstream/xstream-1.4.8-r1.ebuild new file mode 100644 index 000000000000..d977592ce644 --- /dev/null +++ b/dev-java/xstream/xstream-1.4.8-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A text-processing Java API that serialize objects to XML and back again" +HOMEPAGE="http://x-stream.github.io" +SRC_URI="http://central.maven.org/maven2/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +CDEPEND=" + dev-java/kxml:2 + dev-java/xom:0 + dev-java/xpp3:0 + dev-java/cglib:3 + dev-java/dom4j:1 + dev-java/jdom:2 + dev-java/jdom:1.0 + dev-java/joda-time:0 + dev-java/jettison:0" + +# This package does need Java 8. See bug 564616. +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.8" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-1.8 + app-arch/unzip" + +JAVA_GENTOO_CLASSPATH=" + xpp3 + xom + kxml-2 + jdom-2 + jdom-1.0 + dom4j-1 + cglib-3 + jettison + joda-time" + +# Two drivers for two very old implementations of StAX. +# StAX has been last-rited from Gentoo as it is now part of the Java 6 JDK. +# See bug 561504. These drivers rely on ancient APIs that aren't maintained +# upstream and may contain security holes. +JAVA_RM_FILES=( + com/thoughtworks/xstream/io/xml/WstxDriver.java + com/thoughtworks/xstream/io/xml/BEAStaxDriver.java +) diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index be5008e3cd4c..a60e55e5549f 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -1,8 +1,2 @@ DIST R-20130129.bash_completion.bz2 4209 SHA256 487e969b94563fec98ec58de7e6142e9361d4219088add0fca282b482a9e01b1 SHA512 910b26e16cfebe677f438abfa5f2652e582db143d91dbf0e7d4b1ea33462c7e5c89c3a3619c63ae98bba26b11a5adb16eda9d344f8cdbe4f0feabc546993c1a5 WHIRLPOOL 2368efaed37fcb6e010f6a234864631f68549bd8e3f733561170cc5b28f5557e546d8561246fb265a481a47991a262fec3acf6abc1dc3929a9357405e0d3c6fc -DIST R-3.0.1.tar.gz 25508280 SHA256 af90488af3141103b211dc81b6f17d1f0faf4f17684c579a32dfeb25d0d87134 SHA512 470edbf4a4fccf9310add110d7fa7f338e410e412b3ec84f6ea5f1253e94a435e185a7a1b62b22aee443293147ff7bcca139015b490a9271a502b1bfbf1426a2 WHIRLPOOL f45c960280f51cba3a4f3730fa79671808b3c07fd49f97b2cdce4a1de45986e62ac9bb24c6f764386a3ef1034a266b86f041a1a1652ec7f687a4db08a074d22e -DIST R-3.0.3.tar.gz 28075821 SHA256 b97cfd9540f294ab786e846153f3dd8605610d7e27616bfb4296795bc4fde6d6 SHA512 881c9c0a8d866eb87218a5cdca72153c9ef0fa0a0f091595fc065bdcbc1ea8b0bd1a2fb3008457b12e1b5025a7e70bd7764de4286a57ad3f73226367b2fc4e83 WHIRLPOOL 076d041c0581dc211a4ee53cf5cad731dc0ece33bbb34f8c066dc660ef0c1f7dcfc1b3359c6a0cebfa2ccec9b689776965a530edcf9f81758c4e003242347225 -DIST R-3.1.0.tar.gz 28469975 SHA256 8a680390f84c58c01dcdefd682eaa0e90389f09e6d2f2e090c71af40065f5fe2 SHA512 bb21fc90c7d37a5328031ed784e7dcbd20259d1837c33db3b51c14a116939a53496683d5de142a1223e89fc12406294efc67bed3595131615e9607d5ffab5ce2 WHIRLPOOL b376180d700d18780eb344b737a3a1bfc8b40f67967032e0f34abf940d76c3ffd7694be9f2f10be985571e8f94d92a6970a3d1cba503280e3fcf6df7a5e4298e -DIST R-3.1.1.tar.gz 28606569 SHA256 ce5c4d5e34414ce8f1ec2d5642861435fa1ddc4cd89bd336172bbe25a62c7a19 SHA512 a75d8b82645bd9486873669b802924448d591013076e3d7dc958502dc6f0dac7d7fb78f3921d34a1eac1383f141b6e800f4293f7fac09651e0176cf84c431af9 WHIRLPOOL ec05c70193a229cbaf15f3432853070c6666c3963a4e2719a6d8ff188bfc2cada0d1f2fe90a9dd6b43f46913138afed0be387ba73b7f9c4d87abc362cc8a5393 -DIST R-3.1.2.tar.gz 28655941 SHA256 bcd150afcae0e02f6efb5f35a6ab72432be82e849ec52ce0bb89d8c342a8fa7a SHA512 fee20cd94d14bd46cc36fb265ed4d64f44eaa3929dd13c62d29a5883fde607aba63e28a4b0f265ede63f78788996deaee36acf6a70cc0bc90a705c9782be01a1 WHIRLPOOL f02d543c0fd7e89e63aba844b7c0f651a9a6bb5dbfcd58bdb64b49d08335c3270383eb62291b9f2f20ef6ec9f39eef5cf77ae1af3109296f8b1898227cca99d1 -DIST R-3.2.0.tar.gz 29124927 SHA256 f5ae953f18ba6f3d55b46556bbbf73441350f9fd22625402b723a2b81ff64f35 SHA512 c6041c854251d51dd936d3a3632c2958a0437c58488f93e5ba810e957fb7f2276e3fe4f615fb4705f2fc5a66aa50a828b54b5e4e7b4358c7fd465c71531b9828 WHIRLPOOL e21a65b9197a202691dbe903b441caf7d8b92efdffb86dcccdbf09d080177cfd472a54d381df1cca749937434ffb9c08ac74198457e320353207cd00837e1086 DIST R-3.2.2.tar.gz 29772864 SHA256 9c9152e74134b68b0f3a1c7083764adc1cb56fd8336bec003fd0ca550cd2461d SHA512 71ba470875262b9f00fb6970f209788df4dad30e0a28373b824b60d8bc6401afb7786e65387663c6490c7ddcd2bfd7f808a270a3e63238f3d7565d5f93607138 WHIRLPOOL fea59929ada1d67dafc6ad89409d18ad173af7990384033f490a00e0f794d9919aecf7cd37089d105fe03b9cf64d079e5d148622571cec3eb924c1c5bd00081e diff --git a/dev-lang/R/R-3.0.1.ebuild b/dev-lang/R/R-3.0.1.ebuild deleted file mode 100644 index 26fd33c2c648..000000000000 --- a/dev-lang/R/R-3.0.1.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs - -BCP=${PN}-20130129.bash_completion -DESCRIPTION="Language and environment for statistical computing and graphics" -HOMEPAGE="http://www.r-project.org/" -SRC_URI=" - mirror://cran/src/base/R-3/${P}.tar.gz - bash-completion? ( https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )" - -LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" -REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" - -CDEPEND=" - app-arch/bzip2 - app-text/ghostscript-gpl - dev-libs/libpcre - virtual/blas - cairo? ( x11-libs/cairo[X] x11-libs/pango ) - icu? ( dev-libs/icu:= ) - jpeg? ( virtual/jpeg:0 ) - lapack? ( virtual/lapack ) - perl? ( dev-lang/perl ) - png? ( media-libs/libpng:0= ) - readline? ( sys-libs/readline:0= ) - tk? ( dev-lang/tk:0= ) - X? ( x11-libs/libXmu x11-misc/xdg-utils )" - -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-fontsrecommended - )" - -RDEPEND="${CDEPEND} - ( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) ) - app-arch/xz-utils - java? ( >=virtual/jre-1.5 )" - -RESTRICT="minimal? ( test )" - -R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}" - -pkg_setup() { - if use openmp; then - FORTRAN_NEED_OPENMP=1 - tc-has-openmp || die "Please enable openmp support in your compiler" - fi - fortran-2_pkg_setup - filter-ldflags -Wl,-Bdirect -Bdirect - # avoid using existing R installation - unset R_HOME - # Temporary fix for bug #419761 - if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then - append-flags -fno-ipa-cp-clone - fi -} - -src_prepare() { - # gentoo bug #322965 (not applied upstream) - # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505 - epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch - - # respect ldflags (not applied upstream) - # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506 - epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch - - # gentoo bug #383431 - # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14951 - epatch "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch - - # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14953 - epatch "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch - - # fix packages.html for doc (gentoo bug #205103) - sed -i \ - -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \ - src/library/tools/R/Rd.R || die - - # fix Rscript path when installed (gentoo bug #221061) - sed -i \ - -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ - src/unix/Makefile.in || die "sed unix Makefile failed" - - # fix HTML links to manual (gentoo bug #273957) - sed -i \ - -e 's:\.\./manual/:manual/:g' \ - $(grep -Flr ../manual/ doc) || die "sed for HTML links failed" - - use lapack && \ - export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" - - if use X; then - export R_BROWSER="$(type -p xdg-open)" - export R_PDFVIEWER="$(type -p xdg-open)" - fi - use perl && \ - export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" - - # don't search /usr/local - sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die - # Fix for Darwin (OS X) - if use prefix; then - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i \ - -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \ - -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \ - -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \ - -e "/SHLIB_EXT/s/\.so/.dylib/" \ - configure.ac || die - # sort of "undo" 2.14.1-rmath-shared.patch - sed -i \ - -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \ - src/nmath/standalone/Makefile.in || die - else - append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib" - fi - fi - AT_M4DIR=m4 eaclocal - eautoconf -} - -src_configure() { - econf \ - --enable-byte-compiled-packages \ - --enable-R-shlib \ - --disable-R-framework \ - --with-system-zlib \ - --with-system-bzlib \ - --with-system-pcre \ - --with-system-xz \ - --without-blas \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable nls) \ - $(use_enable openmp) \ - $(use_enable profile R-profiling) \ - $(use_enable profile memory-profiling) \ - $(use_enable static-libs static) \ - $(use_enable static-libs R-static-lib) \ - $(use_with cairo) \ - $(use_with icu ICU) \ - $(use_with jpeg jpeglib) \ - $(use_with lapack) \ - $(use_with !minimal recommended-packages) \ - $(use_with png libpng) \ - $(use_with readline) \ - $(use_with tiff libtiff) \ - $(use_with tk tcltk) \ - $(use_with X x) -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - emake AR="$(tc-getAR)" - emake -C src/nmath/standalone shared $(use static-libs && echo static) AR="$(tc-getAR)" - use doc && emake info pdf -} - -src_install() { - default - emake -j1 -C src/nmath/standalone DESTDIR="${D}" install - - if use doc; then - emake DESTDIR="${D}" install-info install-pdf - dosym ../manual /usr/share/doc/${PF}/html/manual - fi - - cat > 99R <<-EOF - LDPATH=${R_DIR}/lib - R_HOME=${R_DIR} - EOF - doenvd 99R - use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN} - # The buildsystem has a different understanding of install_names than what - # we require. Since it builds modules like shared objects (wrong), many - # objects (all modules) get an incorrect install_name. Fixing the build - # system here is not really trivial. - if [[ ${CHOST} == *-darwin* ]] ; then - local mod - pushd "${ED}"/usr/lib/R > /dev/null - for mod in $(find . -name "*.dylib") ; do - mod=${mod#./} - install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \ - "${mod}" - done - popd > /dev/null - fi - docompress -x /usr/share/doc/${PF}/NEWS.rds -} - -pkg_postinst() { - if use java; then - einfo "Re-initializing java paths for ${P}" - R CMD javareconf - fi -} diff --git a/dev-lang/R/R-3.0.3.ebuild b/dev-lang/R/R-3.0.3.ebuild deleted file mode 100644 index ec69959b5f67..000000000000 --- a/dev-lang/R/R-3.0.3.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs - -BCP=${PN}-20130129.bash_completion -DESCRIPTION="Language and environment for statistical computing and graphics" -HOMEPAGE="http://www.r-project.org/" -SRC_URI=" - mirror://cran/src/base/R-3/${P}.tar.gz - bash-completion? ( https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )" - -LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" -REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" - -CDEPEND=" - app-arch/bzip2:0= - app-arch/xz-utils:0= - app-text/ghostscript-gpl - dev-libs/libpcre:3= - virtual/blas:0 - || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) - cairo? ( x11-libs/cairo[X] x11-libs/pango ) - icu? ( dev-libs/icu:= ) - jpeg? ( virtual/jpeg:0 ) - lapack? ( virtual/lapack:0 ) - perl? ( dev-lang/perl ) - png? ( media-libs/libpng:0= ) - readline? ( sys-libs/readline:0= ) - tiff? ( media-libs/tiff:0= ) - tk? ( dev-lang/tk:0= ) - X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )" - -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-fontsrecommended - )" - -RDEPEND="${CDEPEND} - ( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) ) - java? ( >=virtual/jre-1.5 )" - -RESTRICT="minimal? ( test )" - -R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}" - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - FORTRAN_NEED_OPENMP=1 - fi - fortran-2_pkg_setup - filter-ldflags -Wl,-Bdirect -Bdirect - # avoid using existing R installation - unset R_HOME - # Temporary fix for bug #419761 - if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then - append-flags -fno-ipa-cp-clone - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.11.1-parallel.patch \ - "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \ - "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch - - # fix packages.html for doc (gentoo bug #205103) - sed -i \ - -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \ - src/library/tools/R/Rd.R || die - - # fix Rscript path when installed (gentoo bug #221061) - sed -i \ - -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ - src/unix/Makefile.in || die "sed unix Makefile failed" - - # fix HTML links to manual (gentoo bug #273957) - sed -i \ - -e 's:\.\./manual/:manual/:g' \ - $(grep -Flr ../manual/ doc) || die "sed for HTML links failed" - - use lapack && \ - export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" - - if use X; then - export R_BROWSER="$(type -p xdg-open)" - export R_PDFVIEWER="$(type -p xdg-open)" - fi - use perl && \ - export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" - - # don't search /usr/local - sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die - # Fix for Darwin (OS X) - if use prefix; then - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i \ - -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \ - -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \ - -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \ - -e "/SHLIB_EXT/s/\.so/.dylib/" \ - configure.ac || die - # sort of "undo" 2.14.1-rmath-shared.patch - sed -i \ - -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \ - src/nmath/standalone/Makefile.in || die - else - append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib" - fi - fi - AT_M4DIR=m4 eaclocal - eautoconf -} - -src_configure() { - econf \ - --enable-byte-compiled-packages \ - --enable-R-shlib \ - --disable-R-framework \ - --with-system-zlib \ - --with-system-bzlib \ - --with-system-pcre \ - --with-system-xz \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable nls) \ - $(use_enable openmp) \ - $(use_enable profile R-profiling) \ - $(use_enable profile memory-profiling) \ - $(use_enable static-libs static) \ - $(use_enable static-libs R-static-lib) \ - $(use_with cairo) \ - $(use_with icu ICU) \ - $(use_with jpeg jpeglib) \ - $(use_with lapack) \ - $(use_with !minimal recommended-packages) \ - $(use_with png libpng) \ - $(use_with readline) \ - $(use_with tiff libtiff) \ - $(use_with tk tcltk) \ - $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \ - $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \ - $(use_with X x) -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - emake AR="$(tc-getAR)" - emake -C src/nmath/standalone shared $(use static-libs && echo static) AR="$(tc-getAR)" - use doc && emake info pdf -} - -src_install() { - default - emake -j1 -C src/nmath/standalone DESTDIR="${D}" install - - if use doc; then - emake DESTDIR="${D}" install-info install-pdf - dosym ../manual /usr/share/doc/${PF}/html/manual - fi - - cat > 99R <<-EOF - LDPATH=${R_DIR}/lib - R_HOME=${R_DIR} - EOF - doenvd 99R - use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN} - # The buildsystem has a different understanding of install_names than what - # we require. Since it builds modules like shared objects (wrong), many - # objects (all modules) get an incorrect install_name. Fixing the build - # system here is not really trivial. - if [[ ${CHOST} == *-darwin* ]] ; then - local mod - pushd "${ED}"/usr/lib/R > /dev/null - for mod in $(find . -name "*.dylib") ; do - mod=${mod#./} - install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \ - "${mod}" - done - popd > /dev/null - fi - docompress -x /usr/share/doc/${PF}/NEWS.rds -} - -pkg_postinst() { - if use java; then - einfo "Re-initializing java paths for ${P}" - R CMD javareconf - fi -} diff --git a/dev-lang/R/R-3.1.0.ebuild b/dev-lang/R/R-3.1.0.ebuild deleted file mode 100644 index 7d9ebb02fdad..000000000000 --- a/dev-lang/R/R-3.1.0.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs - -BCP=${PN}-20130129.bash_completion -DESCRIPTION="Language and environment for statistical computing and graphics" -HOMEPAGE="http://www.r-project.org/" -SRC_URI=" - mirror://cran/src/base/R-3/${P}.tar.gz - bash-completion? ( https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )" - -LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" -REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" - -CDEPEND=" - app-arch/bzip2:0= - app-arch/xz-utils:0= - app-text/ghostscript-gpl - dev-libs/libpcre:3= - virtual/blas:0 - || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) - cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) - icu? ( dev-libs/icu:= ) - jpeg? ( virtual/jpeg:0 ) - lapack? ( virtual/lapack:0 ) - perl? ( dev-lang/perl ) - png? ( media-libs/libpng:0= ) - readline? ( sys-libs/readline:0= ) - tiff? ( media-libs/tiff:0= ) - tk? ( dev-lang/tk:0= ) - X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )" - -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-fontsrecommended - )" - -RDEPEND="${CDEPEND} - ( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) ) - java? ( >=virtual/jre-1.5 )" - -RESTRICT="minimal? ( test )" - -R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}" - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - FORTRAN_NEED_OPENMP=1 - fi - fortran-2_pkg_setup - filter-ldflags -Wl,-Bdirect -Bdirect - # avoid using existing R installation - unset R_HOME - # Temporary fix for bug #419761 - if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then - append-flags -fno-ipa-cp-clone - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.11.1-parallel.patch \ - "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \ - "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch - - # fix packages.html for doc (gentoo bug #205103) - sed -i \ - -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \ - src/library/tools/R/Rd.R || die - - # fix Rscript path when installed (gentoo bug #221061) - sed -i \ - -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ - src/unix/Makefile.in || die "sed unix Makefile failed" - - # fix HTML links to manual (gentoo bug #273957) - sed -i \ - -e 's:\.\./manual/:manual/:g' \ - $(grep -Flr ../manual/ doc) || die "sed for HTML links failed" - - use lapack && \ - export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" - - if use X; then - export R_BROWSER="$(type -p xdg-open)" - export R_PDFVIEWER="$(type -p xdg-open)" - fi - use perl && \ - export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" - - # don't search /usr/local - sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die - # Fix for Darwin (OS X) - if use prefix; then - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i \ - -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \ - -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \ - -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \ - -e "/SHLIB_EXT/s/\.so/.dylib/" \ - configure.ac || die - # sort of "undo" 2.14.1-rmath-shared.patch - sed -i \ - -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \ - src/nmath/standalone/Makefile.in || die - else - append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib" - fi - fi - AT_M4DIR=m4 eaclocal - eautoconf -} - -src_configure() { - # --with-system-tre \ - # tre is patched from upstream - econf \ - --enable-byte-compiled-packages \ - --enable-R-shlib \ - --disable-R-framework \ - --with-system-zlib \ - --with-system-bzlib \ - --with-system-pcre \ - --with-system-xz \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable nls) \ - $(use_enable openmp) \ - $(use_enable profile R-profiling) \ - $(use_enable profile memory-profiling) \ - $(use_enable static-libs static) \ - $(use_enable static-libs R-static-lib) \ - $(use_with cairo) \ - $(use_with icu ICU) \ - $(use_with jpeg jpeglib) \ - $(use_with lapack) \ - $(use_with !minimal recommended-packages) \ - $(use_with png libpng) \ - $(use_with readline) \ - $(use_with tiff libtiff) \ - $(use_with tk tcltk) \ - $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \ - $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \ - $(use_with X x) -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - emake AR="$(tc-getAR)" - emake -C src/nmath/standalone \ - shared $(use static-libs && echo static) AR="$(tc-getAR)" - use doc && emake info pdf -} - -src_install() { - default - emake -j1 -C src/nmath/standalone DESTDIR="${D}" install - - if use doc; then - emake DESTDIR="${D}" install-info install-pdf - dosym ../manual /usr/share/doc/${PF}/html/manual - fi - - cat > 99R <<-EOF - LDPATH=${R_DIR}/lib - R_HOME=${R_DIR} - EOF - doenvd 99R - use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN} - # The buildsystem has a different understanding of install_names than - # we require. Since it builds modules like shared objects (wrong), many - # objects (all modules) get an incorrect install_name. Fixing the build - # system here is not really trivial. - if [[ ${CHOST} == *-darwin* ]] ; then - local mod - pushd "${ED}"/usr/lib/R > /dev/null - for mod in $(find . -name "*.dylib") ; do - mod=${mod#./} - install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \ - "${mod}" - done - popd > /dev/null - fi - docompress -x /usr/share/doc/${PF}/NEWS.rds -} - -pkg_postinst() { - if use java; then - einfo "Re-initializing java paths for ${P}" - R CMD javareconf - fi -} diff --git a/dev-lang/R/R-3.1.1.ebuild b/dev-lang/R/R-3.1.1.ebuild deleted file mode 100644 index 7ab8cdd7c478..000000000000 --- a/dev-lang/R/R-3.1.1.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs - -BCP=${PN}-20130129.bash_completion -DESCRIPTION="Language and environment for statistical computing and graphics" -HOMEPAGE="http://www.r-project.org/" -SRC_URI=" - mirror://cran/src/base/R-3/${P}.tar.gz - https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2" - -LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" -REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" - -CDEPEND=" - app-arch/bzip2:0= - app-arch/xz-utils:0= - app-text/ghostscript-gpl - >=dev-libs/libpcre-8.35:3= - virtual/blas:0 - || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) - cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) - icu? ( dev-libs/icu:= ) - jpeg? ( virtual/jpeg:0 ) - lapack? ( virtual/lapack:0 ) - perl? ( dev-lang/perl ) - png? ( media-libs/libpng:0= ) - readline? ( sys-libs/readline:0= ) - tiff? ( media-libs/tiff:0= ) - tk? ( dev-lang/tk:0= ) - X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )" - -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-fontsrecommended - )" - -RDEPEND="${CDEPEND} - ( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) ) - java? ( >=virtual/jre-1.5 )" - -RESTRICT="minimal? ( test )" - -R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}" - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - FORTRAN_NEED_OPENMP=1 - fi - fortran-2_pkg_setup - filter-ldflags -Wl,-Bdirect -Bdirect - # avoid using existing R installation - unset R_HOME - # Temporary fix for bug #419761 - if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then - append-flags -fno-ipa-cp-clone - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.11.1-parallel.patch \ - "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \ - "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch - - # fix packages.html for doc (gentoo bug #205103) - sed -i \ - -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \ - src/library/tools/R/Rd.R || die - - # fix Rscript path when installed (gentoo bug #221061) - sed -i \ - -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ - src/unix/Makefile.in || die "sed unix Makefile failed" - - # fix HTML links to manual (gentoo bug #273957) - sed -i \ - -e 's:\.\./manual/:manual/:g' \ - $(grep -Flr ../manual/ doc) || die "sed for HTML links failed" - - use lapack && \ - export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" - - if use X; then - export R_BROWSER="$(type -p xdg-open)" - export R_PDFVIEWER="$(type -p xdg-open)" - fi - use perl && \ - export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" - - # don't search /usr/local - sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die - # Fix for Darwin (OS X) - if use prefix; then - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i \ - -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \ - -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \ - -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \ - -e "/SHLIB_EXT/s/\.so/.dylib/" \ - configure.ac || die - # sort of "undo" 2.14.1-rmath-shared.patch - sed -i \ - -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \ - src/nmath/standalone/Makefile.in || die - else - append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib" - fi - fi - AT_M4DIR=m4 eaclocal - eautoconf -} - -src_configure() { - # --with-system-tre \ - # tre is patched from upstream - econf \ - --enable-byte-compiled-packages \ - --enable-R-shlib \ - --disable-R-framework \ - --with-system-zlib \ - --with-system-bzlib \ - --with-system-pcre \ - --with-system-xz \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable nls) \ - $(use_enable openmp) \ - $(use_enable profile R-profiling) \ - $(use_enable profile memory-profiling) \ - $(use_enable static-libs static) \ - $(use_enable static-libs R-static-lib) \ - $(use_with cairo) \ - $(use_with icu ICU) \ - $(use_with jpeg jpeglib) \ - $(use_with lapack) \ - $(use_with !minimal recommended-packages) \ - $(use_with png libpng) \ - $(use_with readline) \ - $(use_with tiff libtiff) \ - $(use_with tk tcltk) \ - $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \ - $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \ - $(use_with X x) -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - emake AR="$(tc-getAR)" - emake -C src/nmath/standalone \ - shared $(use static-libs && echo static) AR="$(tc-getAR)" - use doc && emake info pdf -} - -src_install() { - default - emake -j1 -C src/nmath/standalone DESTDIR="${D}" install - - if use doc; then - emake DESTDIR="${D}" install-info install-pdf - dosym ../manual /usr/share/doc/${PF}/html/manual - fi - - cat > 99R <<-EOF - LDPATH=${R_DIR}/lib - R_HOME=${R_DIR} - EOF - doenvd 99R - newbashcomp "${WORKDIR}"/${BCP} ${PN} - # The buildsystem has a different understanding of install_names than - # we require. Since it builds modules like shared objects (wrong), many - # objects (all modules) get an incorrect install_name. Fixing the build - # system here is not really trivial. - if [[ ${CHOST} == *-darwin* ]] ; then - local mod - pushd "${ED}"/usr/lib/R > /dev/null - for mod in $(find . -name "*.dylib") ; do - mod=${mod#./} - install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \ - "${mod}" - done - popd > /dev/null - fi - docompress -x /usr/share/doc/${PF}/NEWS.rds -} - -pkg_postinst() { - if use java; then - einfo "Re-initializing java paths for ${P}" - R CMD javareconf - fi -} diff --git a/dev-lang/R/R-3.1.2.ebuild b/dev-lang/R/R-3.1.2.ebuild deleted file mode 100644 index 7ab8cdd7c478..000000000000 --- a/dev-lang/R/R-3.1.2.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs - -BCP=${PN}-20130129.bash_completion -DESCRIPTION="Language and environment for statistical computing and graphics" -HOMEPAGE="http://www.r-project.org/" -SRC_URI=" - mirror://cran/src/base/R-3/${P}.tar.gz - https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2" - -LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" -REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" - -CDEPEND=" - app-arch/bzip2:0= - app-arch/xz-utils:0= - app-text/ghostscript-gpl - >=dev-libs/libpcre-8.35:3= - virtual/blas:0 - || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) - cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) - icu? ( dev-libs/icu:= ) - jpeg? ( virtual/jpeg:0 ) - lapack? ( virtual/lapack:0 ) - perl? ( dev-lang/perl ) - png? ( media-libs/libpng:0= ) - readline? ( sys-libs/readline:0= ) - tiff? ( media-libs/tiff:0= ) - tk? ( dev-lang/tk:0= ) - X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )" - -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-fontsrecommended - )" - -RDEPEND="${CDEPEND} - ( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) ) - java? ( >=virtual/jre-1.5 )" - -RESTRICT="minimal? ( test )" - -R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}" - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - FORTRAN_NEED_OPENMP=1 - fi - fortran-2_pkg_setup - filter-ldflags -Wl,-Bdirect -Bdirect - # avoid using existing R installation - unset R_HOME - # Temporary fix for bug #419761 - if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then - append-flags -fno-ipa-cp-clone - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.11.1-parallel.patch \ - "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \ - "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch - - # fix packages.html for doc (gentoo bug #205103) - sed -i \ - -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \ - src/library/tools/R/Rd.R || die - - # fix Rscript path when installed (gentoo bug #221061) - sed -i \ - -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ - src/unix/Makefile.in || die "sed unix Makefile failed" - - # fix HTML links to manual (gentoo bug #273957) - sed -i \ - -e 's:\.\./manual/:manual/:g' \ - $(grep -Flr ../manual/ doc) || die "sed for HTML links failed" - - use lapack && \ - export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" - - if use X; then - export R_BROWSER="$(type -p xdg-open)" - export R_PDFVIEWER="$(type -p xdg-open)" - fi - use perl && \ - export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" - - # don't search /usr/local - sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die - # Fix for Darwin (OS X) - if use prefix; then - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i \ - -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \ - -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \ - -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \ - -e "/SHLIB_EXT/s/\.so/.dylib/" \ - configure.ac || die - # sort of "undo" 2.14.1-rmath-shared.patch - sed -i \ - -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \ - src/nmath/standalone/Makefile.in || die - else - append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib" - fi - fi - AT_M4DIR=m4 eaclocal - eautoconf -} - -src_configure() { - # --with-system-tre \ - # tre is patched from upstream - econf \ - --enable-byte-compiled-packages \ - --enable-R-shlib \ - --disable-R-framework \ - --with-system-zlib \ - --with-system-bzlib \ - --with-system-pcre \ - --with-system-xz \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable nls) \ - $(use_enable openmp) \ - $(use_enable profile R-profiling) \ - $(use_enable profile memory-profiling) \ - $(use_enable static-libs static) \ - $(use_enable static-libs R-static-lib) \ - $(use_with cairo) \ - $(use_with icu ICU) \ - $(use_with jpeg jpeglib) \ - $(use_with lapack) \ - $(use_with !minimal recommended-packages) \ - $(use_with png libpng) \ - $(use_with readline) \ - $(use_with tiff libtiff) \ - $(use_with tk tcltk) \ - $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \ - $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \ - $(use_with X x) -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - emake AR="$(tc-getAR)" - emake -C src/nmath/standalone \ - shared $(use static-libs && echo static) AR="$(tc-getAR)" - use doc && emake info pdf -} - -src_install() { - default - emake -j1 -C src/nmath/standalone DESTDIR="${D}" install - - if use doc; then - emake DESTDIR="${D}" install-info install-pdf - dosym ../manual /usr/share/doc/${PF}/html/manual - fi - - cat > 99R <<-EOF - LDPATH=${R_DIR}/lib - R_HOME=${R_DIR} - EOF - doenvd 99R - newbashcomp "${WORKDIR}"/${BCP} ${PN} - # The buildsystem has a different understanding of install_names than - # we require. Since it builds modules like shared objects (wrong), many - # objects (all modules) get an incorrect install_name. Fixing the build - # system here is not really trivial. - if [[ ${CHOST} == *-darwin* ]] ; then - local mod - pushd "${ED}"/usr/lib/R > /dev/null - for mod in $(find . -name "*.dylib") ; do - mod=${mod#./} - install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \ - "${mod}" - done - popd > /dev/null - fi - docompress -x /usr/share/doc/${PF}/NEWS.rds -} - -pkg_postinst() { - if use java; then - einfo "Re-initializing java paths for ${P}" - R CMD javareconf - fi -} diff --git a/dev-lang/R/R-3.2.0-r1.ebuild b/dev-lang/R/R-3.2.0-r1.ebuild deleted file mode 100644 index 9c874f37e935..000000000000 --- a/dev-lang/R/R-3.2.0-r1.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs - -BCP=${PN}-20130129.bash_completion -DESCRIPTION="Language and environment for statistical computing and graphics" -HOMEPAGE="http://www.r-project.org/" -SRC_URI=" - mirror://cran/src/base/R-3/${P}.tar.gz - https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2" - -LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" -REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" - -CDEPEND=" - app-arch/bzip2:0= - app-arch/xz-utils:0= - app-text/ghostscript-gpl - >=dev-libs/libpcre-8.35:3= - virtual/blas:0 - || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) - cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) - icu? ( dev-libs/icu:= ) - jpeg? ( virtual/jpeg:0 ) - lapack? ( virtual/lapack:0 ) - perl? ( dev-lang/perl ) - png? ( media-libs/libpng:0= ) - readline? ( sys-libs/readline:0= ) - tiff? ( media-libs/tiff:0= ) - tk? ( dev-lang/tk:0= ) - X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )" - -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-fontsrecommended - )" - -RDEPEND="${CDEPEND} - ( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) ) - java? ( >=virtual/jre-1.5 )" - -RESTRICT="minimal? ( test )" - -R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}" - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - FORTRAN_NEED_OPENMP=1 - fi - fortran-2_pkg_setup - filter-ldflags -Wl,-Bdirect -Bdirect - # avoid using existing R installation - unset R_HOME - # Temporary fix for bug #419761 - if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then - append-flags -fno-ipa-cp-clone - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.11.1-parallel.patch \ - "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \ - "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch \ - "${FILESDIR}"/${PN}-3.2.0-omitted-extern-R_running_as_main_program.patch - - # fix packages.html for doc (gentoo bug #205103) - sed -i \ - -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \ - src/library/tools/R/Rd.R || die - - # fix Rscript path when installed (gentoo bug #221061) - sed -i \ - -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ - src/unix/Makefile.in || die "sed unix Makefile failed" - - # fix HTML links to manual (gentoo bug #273957) - sed -i \ - -e 's:\.\./manual/:manual/:g' \ - $(grep -Flr ../manual/ doc) || die "sed for HTML links failed" - - use lapack && \ - export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" - - if use X; then - export R_BROWSER="$(type -p xdg-open)" - export R_PDFVIEWER="$(type -p xdg-open)" - fi - use perl && \ - export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" - - # don't search /usr/local - sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die - # Fix for Darwin (OS X) - if use prefix; then - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i \ - -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \ - -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \ - -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \ - -e "/SHLIB_EXT/s/\.so/.dylib/" \ - configure.ac || die - # sort of "undo" 2.14.1-rmath-shared.patch - sed -i \ - -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \ - src/nmath/standalone/Makefile.in || die - else - append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib" - fi - fi - AT_M4DIR=m4 eaclocal - eautoconf -} - -src_configure() { - # --with-system-tre \ - # tre is patched from upstream - econf \ - --enable-byte-compiled-packages \ - --enable-R-shlib \ - --disable-R-framework \ - --with-system-zlib \ - --with-system-bzlib \ - --with-system-pcre \ - --with-system-xz \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable nls) \ - $(use_enable openmp) \ - $(use_enable profile R-profiling) \ - $(use_enable profile memory-profiling) \ - $(use_enable static-libs static) \ - $(use_enable static-libs R-static-lib) \ - $(use_with cairo) \ - $(use_with icu ICU) \ - $(use_with jpeg jpeglib) \ - $(use_with lapack) \ - $(use_with !minimal recommended-packages) \ - $(use_with png libpng) \ - $(use_with readline) \ - $(use_with tiff libtiff) \ - $(use_with tk tcltk) \ - $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \ - $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \ - $(use_with X x) -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - emake AR="$(tc-getAR)" - emake -C src/nmath/standalone \ - shared $(use static-libs && echo static) AR="$(tc-getAR)" - use doc && emake info pdf -} - -src_install() { - default - emake -j1 -C src/nmath/standalone DESTDIR="${D}" install - - if use doc; then - emake DESTDIR="${D}" install-info install-pdf - dosym ../manual /usr/share/doc/${PF}/html/manual - fi - - cat > 99R <<-EOF - LDPATH=${R_DIR}/lib - R_HOME=${R_DIR} - EOF - doenvd 99R - newbashcomp "${WORKDIR}"/${BCP} ${PN} - # The buildsystem has a different understanding of install_names than - # we require. Since it builds modules like shared objects (wrong), many - # objects (all modules) get an incorrect install_name. Fixing the build - # system here is not really trivial. - if [[ ${CHOST} == *-darwin* ]] ; then - local mod - pushd "${ED}"/usr/lib/R > /dev/null - for mod in $(find . -name "*.dylib") ; do - mod=${mod#./} - install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \ - "${mod}" - done - popd > /dev/null - fi - docompress -x /usr/share/doc/${PF}/NEWS.rds -} - -pkg_postinst() { - if use java; then - einfo "Re-initializing java paths for ${P}" - R CMD javareconf - fi -} diff --git a/dev-lang/R/R-3.2.2.ebuild b/dev-lang/R/R-3.2.2.ebuild index 9ad85722f96e..9229648b07e7 100644 --- a/dev-lang/R/R-3.2.2.ebuild +++ b/dev-lang/R/R-3.2.2.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" SLOT="0" -KEYWORDS="amd64 hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" @@ -45,7 +45,7 @@ DEPEND="${CDEPEND} )" RDEPEND="${CDEPEND} - ( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) ) + >=sys-libs/zlib-1.2.5.1-r2:0[minizip] java? ( >=virtual/jre-1.5 )" RESTRICT="minimal? ( test )" diff --git a/dev-lang/R/files/R-2.12.1-ldflags.patch b/dev-lang/R/files/R-2.12.1-ldflags.patch deleted file mode 100644 index 2876ac3a4164..000000000000 --- a/dev-lang/R/files/R-2.12.1-ldflags.patch +++ /dev/null @@ -1,15 +0,0 @@ -Respect ldflags on rscript -Patch by Sebastien Fabbro -https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506 - ---- src/unix/Makefile.in.orig 2010-12-22 16:58:19.000000000 +0000 -+++ src/unix/Makefile.in 2010-12-22 16:54:16.000000000 +0000 -@@ -66,7 +66,7 @@ - - ## we need to build at install time to capture the correct 'rhome' - install-Rscript: -- $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \ -+ $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(LDFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \ - $(srcdir)/Rscript.c - @$(MKINSTALLDIRS) "$(DESTDIR)$(Rexecbindir)" - @$(INSTALL_PROGRAM) Rscript "$(DESTDIR)$(Rexecbindir)/Rscript" diff --git a/dev-lang/R/files/R-2.14.1-rmath-shared.patch b/dev-lang/R/files/R-2.14.1-rmath-shared.patch deleted file mode 100644 index c16f20e756de..000000000000 --- a/dev-lang/R/files/R-2.14.1-rmath-shared.patch +++ /dev/null @@ -1,24 +0,0 @@ -Link with libm to fix unresolved symbols when linked with as-needed -and add a soname to the standalone math library -Patch by Sebastien Fabbro ---- src/nmath/standalone/Makefile.in.orig 2010-03-17 14:43:22.000000000 +0000 -+++ src/nmath/standalone/Makefile.in 2012-01-02 17:40:13.000000000 +0000 -@@ -64,7 +64,8 @@ - Rexeclibdir_LTLIBRARIES = $(libRmath_la) - libRmath_la_SOURCES = $(SOURCES) - libRmath_la_OBJECTS = $(OBJECTS:.o=.lo) --libRmath_la_LDFLAGS = -+libRmath_la_LDFLAGS = -Wl,-soname=libRmath.so -+libRmath_la_LIBADD = $(LIBM) - - CLEANFILES = Makedeps *.d *.o *.lo test $(SOURCES) - DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES) -@@ -116,7 +117,7 @@ - $(RANLIB) $@ - - $(libRmath_la): $(libRmath_la_OBJECTS) -- $(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) -+ $(DYLIB_LINK) $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(libRmath_la_LIBADD) -o $@ - - test: $(srcdir)/test.c - $(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \ diff --git a/dev-lang/R/files/R-3.2.0-omitted-extern-R_running_as_main_program.patch b/dev-lang/R/files/R-3.2.0-omitted-extern-R_running_as_main_program.patch deleted file mode 100644 index eebe5088ff98..000000000000 --- a/dev-lang/R/files/R-3.2.0-omitted-extern-R_running_as_main_program.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- R-3.2.0-orig/src/include/Rinterface.h 2015-03-19 10:02:16.000000000 +1100 -+++ R-3.2.0/src/include/Rinterface.h 2015-05-01 23:02:17.541946810 +1000 -@@ -90,7 +90,8 @@ - void fpu_setup(Rboolean); - - /* in unix/system.c */ --int R_running_as_main_program; -+/* Gentoo bug 547478 R bug https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=15899 */ -+extern int R_running_as_main_program; - - #ifdef CSTACK_DEFNS - /* duplicating Defn.h */ diff --git a/dev-lang/clojure/clojure-1.7.0.ebuild b/dev-lang/clojure/clojure-1.7.0.ebuild index 8a74bcfa43bb..41ceb9f4ab3d 100644 --- a/dev-lang/clojure/clojure-1.7.0.ebuild +++ b/dev-lang/clojure/clojure-1.7.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/clojure/clojure/tarball/${P} -> ${P}.tar.gz" LICENSE="EPL-1.0 Apache-2.0 BSD" SLOT="1.7" -KEYWORDS="amd64 ~x86 ~x86-linux" +KEYWORDS="amd64 x86 ~x86-linux" IUSE="" RESTRICT="test" # patches welcome to fix the test diff --git a/dev-lang/ekopath/Manifest b/dev-lang/ekopath/Manifest index 6018d215bb50..046151dd924c 100644 --- a/dev-lang/ekopath/Manifest +++ b/dev-lang/ekopath/Manifest @@ -1,5 +1,2 @@ -DIST ekopath-2015-08-09-installer.run 58521154 SHA256 7ecd2a03012e36851f69ab35f18905793212e2feae5c242f48d8f26722c5c1ca SHA512 f7da95fa987b262aafa434487cfb64340b2be754b8e119729de998c0ccddde3bbea4f3994ecd1643dbf5e49f3a48e6173be9d0102f7eb29e41d14f0914893a5b WHIRLPOOL d9cabf4787229ff2027569f7f73095a37b40c654ed0e201478a0e100cfa091ff82f3478c6b41c992288c4711823690bb0958cb1a9209ac595bb4930aaa99af4b -DIST ekopath-2015-08-11-installer.run 59150939 SHA256 31f491e3744257ae87b735be418287ac4530bf525cd4c61fdb0f2438f0600e4b SHA512 ada2dc774247e5ea76f35f6f9311d58d99ec599e41befc0820650affae88be6916a2dd50bf9e67e4920db2ab16fc185fb088e523c1abc75ed7bfc5ec261e0eb1 WHIRLPOOL 721deca6bb973bf64219709cd0fc95907a2c5cfb447a295e45410939f700244197fd2a382ae537a847c10368af44fcbc538ddc9529769cfa4613eab118362df7 -DIST ekopath-2015-09-10-installer.run 57138157 SHA256 fd4eca09107b9967ba01e508098c00fddbb809ba637e42aa1bb4b7518e947394 SHA512 67f99cbf74e1840de3ee4f1da810031b9e67c1ecfd7de6ff56c8303bdcdf6d9eedbb9eab975d7a6bb1ccbb3c5a65a3f60c7219f2321bd2eb4949f04979142148 WHIRLPOOL d41c1ca250b81d584d4f088ad8b03fe975bbb9fe5d6ef50c2d501904e0f187cefaf41e772c0cbd835106c1fed995a7e754a875fd621314b28bdde19a2a14fb88 -DIST ekopath-2015-09-21-installer.run 57536286 SHA256 a3aab3f1cc018222644a7d4e10d0ebe68d38626074e95638d54ae9b690721332 SHA512 3a98635f233055a81435f6dd0044f13efe7b97a7554ca5c9b50586b74a3e848076842ce0bc04c07283e8cbf92bf21fcc9b4ca36888c379ddd3190364fea9bc90 WHIRLPOOL 3bd6debddb33776ca85951a942ff87a869ca6ee0defcd493750f1682dc0f769f5c1e44820510323cd7a983b486cab07b34a955d65b890fe3d0e36171036e678d DIST ekopath-2015-10-10-installer.run 57723481 SHA256 0cd16e8c70d3e7938474e8885a721f0e50871a01a742b7a653dd1e6791e32baf SHA512 a4e33475b0fce0f3e9e0b744f1ba898983223cee15861491b6f7c3584c381b25c922fc17a7fd759f609f8c73ecbfbd53eeaaea38ddd9151d1cd7e46d0f1cf883 WHIRLPOOL 45744d16e34297ba47bc028382f1dc29cf0611cbff76a179640629ea89526818b4580c63e69d54541bbe915963c761b9abfe809ee2854be58e73ad80bc4e7143 +DIST ekopath-2015-10-29-installer.run 57559240 SHA256 eea8bba70f89ccaaf8f5eb48bdd7200d54a1af2d993ac850c5d08f39577eea50 SHA512 62cdb322def3bccfac5c4c12f9b3fb1eeaa5a8251a5a4ee59dfff8e7b30463f45fce04d482cc16abbb3b263a88bf845723f22858bae5933570fc43841f970667 WHIRLPOOL fa3a8dd365840c33dd4139bd139e902bf990b0d3ebc736c661060c4faf4e79f41c93c6961b7fd7b46e9aa20e38fbb4265480a006450f728825440392af228351 diff --git a/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild b/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild deleted file mode 100644 index c886d1352814..000000000000 --- a/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit versionator multilib pax-utils - -MY_PV=$(get_version_component_range 1-3) -DATE=$(get_version_component_range 4) -DATE=${DATE#p} -DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6} -INSTALLER=${PN}-${DATE}-installer.run - -DESCRIPTION="PathScale EKOPath Compiler Suite" -HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite" -SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="!!app-arch/rpm" -RDEPEND="" - -RESTRICT="bindist mirror" - -QA_PREBUILT=" - opt/${PN}/lib/${MY_PV}/x8664/* - opt/${PN}/bin/*" - -S="${WORKDIR}" - -src_unpack() { - cp "${DISTDIR}/${INSTALLER}" "${S}/" || die - chmod +x "${S}/${INSTALLER}" || die -} - -src_prepare() { - cat > 99${PN} <<-EOF || die - PATH=${EROOT%/}/opt/${PN}/bin - ROOTPATH=${EROOT%/}/opt/${PN}/bin - LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64 - MANPATH=${EROOT%/}/opt/${PN}/docs/man - EOF -} - -src_install() { - # EI_PAX marking is obsolete and PT_PAX breaks the binary. - # We must use XT_PAX to run the installer. - if [[ ${PAX_MARKINGS} == "XT" ]]; then - pax-mark m "${INSTALLER}" - fi - - ./"${INSTALLER}" \ - --prefix "${ED%/}/opt/${PN}" \ - --mode unattended || die - - if [[ ! -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]]; then - local guess - cd "${ED%/}/opt/${PN}/lib" && guess=( * ) - - if [[ ${guess[@]} ]]; then - die "Incorrect release version in PV, guessing it should be: ${guess[*]}" - else - die "No libdir installed" - fi - fi - [[ -x ${ED%}/opt/${PN}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely" - - rm -r "${ED}/opt/${PN}"/uninstall* || die - doenvd 99${PN} -} diff --git a/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild b/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild deleted file mode 100644 index c886d1352814..000000000000 --- a/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit versionator multilib pax-utils - -MY_PV=$(get_version_component_range 1-3) -DATE=$(get_version_component_range 4) -DATE=${DATE#p} -DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6} -INSTALLER=${PN}-${DATE}-installer.run - -DESCRIPTION="PathScale EKOPath Compiler Suite" -HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite" -SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="!!app-arch/rpm" -RDEPEND="" - -RESTRICT="bindist mirror" - -QA_PREBUILT=" - opt/${PN}/lib/${MY_PV}/x8664/* - opt/${PN}/bin/*" - -S="${WORKDIR}" - -src_unpack() { - cp "${DISTDIR}/${INSTALLER}" "${S}/" || die - chmod +x "${S}/${INSTALLER}" || die -} - -src_prepare() { - cat > 99${PN} <<-EOF || die - PATH=${EROOT%/}/opt/${PN}/bin - ROOTPATH=${EROOT%/}/opt/${PN}/bin - LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64 - MANPATH=${EROOT%/}/opt/${PN}/docs/man - EOF -} - -src_install() { - # EI_PAX marking is obsolete and PT_PAX breaks the binary. - # We must use XT_PAX to run the installer. - if [[ ${PAX_MARKINGS} == "XT" ]]; then - pax-mark m "${INSTALLER}" - fi - - ./"${INSTALLER}" \ - --prefix "${ED%/}/opt/${PN}" \ - --mode unattended || die - - if [[ ! -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]]; then - local guess - cd "${ED%/}/opt/${PN}/lib" && guess=( * ) - - if [[ ${guess[@]} ]]; then - die "Incorrect release version in PV, guessing it should be: ${guess[*]}" - else - die "No libdir installed" - fi - fi - [[ -x ${ED%}/opt/${PN}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely" - - rm -r "${ED}/opt/${PN}"/uninstall* || die - doenvd 99${PN} -} diff --git a/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild b/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild deleted file mode 100644 index c886d1352814..000000000000 --- a/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit versionator multilib pax-utils - -MY_PV=$(get_version_component_range 1-3) -DATE=$(get_version_component_range 4) -DATE=${DATE#p} -DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6} -INSTALLER=${PN}-${DATE}-installer.run - -DESCRIPTION="PathScale EKOPath Compiler Suite" -HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite" -SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="!!app-arch/rpm" -RDEPEND="" - -RESTRICT="bindist mirror" - -QA_PREBUILT=" - opt/${PN}/lib/${MY_PV}/x8664/* - opt/${PN}/bin/*" - -S="${WORKDIR}" - -src_unpack() { - cp "${DISTDIR}/${INSTALLER}" "${S}/" || die - chmod +x "${S}/${INSTALLER}" || die -} - -src_prepare() { - cat > 99${PN} <<-EOF || die - PATH=${EROOT%/}/opt/${PN}/bin - ROOTPATH=${EROOT%/}/opt/${PN}/bin - LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64 - MANPATH=${EROOT%/}/opt/${PN}/docs/man - EOF -} - -src_install() { - # EI_PAX marking is obsolete and PT_PAX breaks the binary. - # We must use XT_PAX to run the installer. - if [[ ${PAX_MARKINGS} == "XT" ]]; then - pax-mark m "${INSTALLER}" - fi - - ./"${INSTALLER}" \ - --prefix "${ED%/}/opt/${PN}" \ - --mode unattended || die - - if [[ ! -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]]; then - local guess - cd "${ED%/}/opt/${PN}/lib" && guess=( * ) - - if [[ ${guess[@]} ]]; then - die "Incorrect release version in PV, guessing it should be: ${guess[*]}" - else - die "No libdir installed" - fi - fi - [[ -x ${ED%}/opt/${PN}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely" - - rm -r "${ED}/opt/${PN}"/uninstall* || die - doenvd 99${PN} -} diff --git a/dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild b/dev-lang/ekopath/ekopath-6.0.570_p20151029.ebuild index c886d1352814..c886d1352814 100644 --- a/dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild +++ b/dev-lang/ekopath/ekopath-6.0.570_p20151029.ebuild diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest index 0466efa53081..665b714bf5b0 100644 --- a/dev-lang/elixir/Manifest +++ b/dev-lang/elixir/Manifest @@ -1 +1,2 @@ DIST elixir-1.0.5.tar.gz 1043275 SHA256 5ce5c226b3d11d751b41ad79b915b86f13f8a1b89ef3e733321d3f46ff4d81b8 SHA512 1f621e1a3939433dc91a0e2f7e62512b074ce2e8dc7190535570056875f82eda2001a333a51627e39b0f710e104409c8d17aea9635235b0963265d39b32c9f6c WHIRLPOOL eea70416f08132654e9cc4b65342971cdd7793b45d97fbe5cb1b8e6739a3befb16d72ce15b485a8c2a3204462c8b54afc9c2d934c924863e3a6342e8067644fe +DIST elixir-1.1.1.tar.gz 1094432 SHA256 3b7d6e4fdbcc82d19fa76f4e384f8a87535abcd00ef04528dc6b6706f32a106a SHA512 24b1ccf6877098cf5539607a13d4c408314c01b3bac8aaa9cfda59299113affd173cb29606f57110e44104095360ca81f084cceb561fc30e795c0d15d6140772 WHIRLPOOL 7bf3dd5ed2b95bed8eca5eddfd97666e69e024395e7f8a684f69d36249230f0775d80c3be6c587a8a884cdf94dd3ba29e94fd5f61b4c7d150e4bce39be076f98 diff --git a/dev-lang/elixir/elixir-1.1.1.ebuild b/dev-lang/elixir/elixir-1.1.1.ebuild new file mode 100644 index 000000000000..77a909a3db85 --- /dev/null +++ b/dev-lang/elixir/elixir-1.1.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Elixir programming language" +HOMEPAGE="http://elixir-lang.org" +SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 ErlPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=dev-lang/erlang-17" +RDEPEND="${DEPEND}" + +src_compile() { + emake Q="" +} + +src_install() { + emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="/usr" install + dodoc README.md CHANGELOG.md CONTRIBUTING.md +} diff --git a/dev-lang/erlang/erlang-18.0-r2.ebuild b/dev-lang/erlang/erlang-18.0-r2.ebuild new file mode 100644 index 000000000000..96ff59c06b2c --- /dev/null +++ b/dev-lang/erlang/erlang-18.0-r2.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +WX_GTK_VER="3.0" + +inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets + +# NOTE: If you need symlinks for binaries please tell maintainers or +# open up a bug to let it be created. + +DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" +HOMEPAGE="http://www.erlang.org/" +SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz + http://erlang.org/download/otp_doc_man_${PV}.tar.gz + doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )" + +LICENSE="ErlPL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets" + +RDEPEND=" + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) + libressl? ( dev-libs/libressl ) + ) + emacs? ( virtual/emacs ) + java? ( >=virtual/jdk-1.2:* ) + odbc? ( dev-db/unixODBC )" +DEPEND="${RDEPEND} + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu ) + sctp? ( net-misc/lksctp-tools ) + tk? ( dev-lang/tk )" + +S="${WORKDIR}/otp_src_${PV}" + +SITEFILE=50${PN}-gentoo.el + +pkg_setup() { + if use halfword ; then + use amd64 || die "halfword support is limited to amd64" + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-18.0-wx3.0.patch + + use odbc || sed -i 's: odbc : :' lib/Makefile + + # bug 263129, don't ignore LDFLAGS, reported upstream + sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in + + # don't ignore LDFLAGS, reported upstream + sed -e 's:LDFLAGS = \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in + + if ! use wxwidgets; then + sed -i 's: wx : :' lib/Makefile + rm -rf lib/wx + fi + + # Nasty workaround, reported upstream + cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in + + # bug 383697 + sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c + + cd erts && mv configure.in configure.ac && eautoreconf +} + +src_configure() { + use wxwidgets && need-wxwidgets unicode + use java || export JAVAC=false + + econf \ + --enable-threads \ + $(use_enable sctp) \ + $(use_enable systemd) \ + $(use_enable halfword halfword-emulator) \ + $(use_enable hipe) \ + $(use_with ssl ssl "${EPREFIX}"/usr) \ + $(use_enable ssl dynamic-ssl-lib) \ + $(use_enable kpoll kernel-poll) \ + $(use_enable smp smp-support) \ + $(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \ + $(use x64-macos && echo "--enable-darwin-64bit") +} + +src_compile() { + use java || export JAVAC=false + emake + + if use emacs ; then + pushd lib/tools/emacs + elisp-compile *.el + popd + fi +} + +extract_version() { + sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk" +} + +src_install() { + local ERL_LIBDIR=/usr/$(get_libdir)/erlang + local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN) + local ERL_ERTS_VER=$(extract_version erts VSN) + + emake INSTALL_PREFIX="${D}" install + dodoc AUTHORS README.md + + dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl + dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc + dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript + dosym \ + "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \ + /usr/bin/erl_call + dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam + use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp + + ## Remove ${D} from the following files + sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/erl" + sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/start" + grep -rle "${D}" "${ED}/${ERL_LIBDIR}/erts-${ERL_ERTS_VER}" | xargs sed -i -e "s:${D}::g" + + ## Clean up the no longer needed files + rm "${ED}/${ERL_LIBDIR}/Install" + + for i in "${WORKDIR}"/man/man* ; do + dodir "${ERL_LIBDIR}/${i##${WORKDIR}}" + done + for file in "${WORKDIR}"/man/man*/*.[1-9]; do + # doman sucks so we can't use it + cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/ + done + # extend MANPATH, so the normal man command can find it + # see bug 189639 + dodir /etc/env.d/ + echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang" + + if use doc ; then + dohtml -A README,erl,hrl,c,h,kwc,info -r \ + "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* + fi + + if use emacs ; then + pushd "${S}" + elisp-install erlang lib/tools/emacs/*.{el,elc} + sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ + "${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE} + elisp-site-file-install "${T}"/${SITEFILE} + popd + fi + + newinitd "${FILESDIR}"/epmd.init epmd + systemd_dounit "${FILESDIR}"/epmd.service +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lang/erlang/files/erlang-18.0-wx3.0.patch b/dev-lang/erlang/files/erlang-18.0-wx3.0.patch new file mode 100644 index 000000000000..0537134f305f --- /dev/null +++ b/dev-lang/erlang/files/erlang-18.0-wx3.0.patch @@ -0,0 +1,531 @@ +Description: Fix constants for wxwidgets3.0 + The values of wx constants can change between stable release series (and + some have between 2.8 and 3.0), but erlang seems to hardcode these values. +Author: Olly Betts <olly@survex.com> +Bug-Debian: https://bugs.debian.org/766790 +Forwarded: no +Last-Update: 2014-11-25 + +--- a/lib/wx/include/wx.hrl ++++ b/lib/wx/include/wx.hrl +@@ -767,7 +767,7 @@ + % From "checkbox.h" + -define(wxCHK_ALLOW_3RD_STATE_FOR_USER, 8192). + -define(wxCHK_3STATE, 4096). +--define(wxCHK_2STATE, 0). ++-define(wxCHK_2STATE, 16384). + % From "checkbox.h": wxCheckBoxState + -define(wxCHK_UNCHECKED, 0). + -define(wxCHK_CHECKED, 1). +@@ -1014,10 +1014,10 @@ + -define(wxSIZE_AUTO_WIDTH, 1). + -define(wxSETUP, 131072). + -define(wxMORE, 65536). +--define(wxHELP, 32768). +--define(wxRESET, 16384). +--define(wxBACKWARD, 8192). +--define(wxFORWARD, 4096). ++-define(wxHELP, 4096). ++-define(wxRESET, 32768). ++-define(wxBACKWARD, 16384). ++-define(wxFORWARD, 8192). + -define(wxICON_MASK, (16#00000100 bor 16#00000200 bor 16#00000400 bor 16#00000800)). + -define(wxICON_ASTERISK, ?wxICON_INFORMATION). + -define(wxICON_STOP, ?wxICON_HAND). +@@ -1049,8 +1049,8 @@ + -define(wxTC_TOP, 0). + -define(wxTC_FIXEDWIDTH, 32). + -define(wxTC_RIGHTJUSTIFY, 16). +--define(wxSP_WRAP, 8192). +--define(wxSP_ARROW_KEYS, 4096). ++-define(wxSP_WRAP, 32768). ++-define(wxSP_ARROW_KEYS, 16384). + -define(wxSP_VERTICAL, ?wxVERTICAL). + -define(wxSP_HORIZONTAL, ?wxHORIZONTAL). + -define(wxSB_VERTICAL, ?wxVERTICAL). +@@ -1071,8 +1071,8 @@ + -define(wxCB_SIMPLE, 4). + -define(wxLB_INT_HEIGHT, 2048). + -define(wxLB_HSCROLL, ?wxHSCROLL). +--define(wxLB_ALWAYS_SB, 1024). +--define(wxLB_NEEDED_SB, 512). ++-define(wxLB_ALWAYS_SB, 512). ++-define(wxLB_NEEDED_SB, 0). + -define(wxLB_OWNERDRAW, 256). + -define(wxLB_EXTENDED, 128). + -define(wxLB_MULTIPLE, 64). +@@ -1548,7 +1548,7 @@ + -define(wxUPDATE_UI_FROMIDLE, 2). + % From "dialog.h" + -define(wxDEFAULT_DIALOG_STYLE, (?wxCAPTION bor ?wxSYSTEM_MENU bor ?wxCLOSE_BOX)). +--define(wxDIALOG_NO_PARENT, 1). ++-define(wxDIALOG_NO_PARENT, 32). + % From "dirctrlg.h" + -define(wxDIRCTRL_DIR_ONLY, 16). + -define(wxDIRCTRL_SELECT_FIRST, 32). +@@ -2036,212 +2036,212 @@ + -define(wxLANGUAGE_ARABIC_YEMEN, 24). + -define(wxLANGUAGE_ARMENIAN, 25). + -define(wxLANGUAGE_ASSAMESE, 26). +--define(wxLANGUAGE_AYMARA, 27). +--define(wxLANGUAGE_AZERI, 28). +--define(wxLANGUAGE_AZERI_CYRILLIC, 29). +--define(wxLANGUAGE_AZERI_LATIN, 30). +--define(wxLANGUAGE_BASHKIR, 31). +--define(wxLANGUAGE_BASQUE, 32). +--define(wxLANGUAGE_BELARUSIAN, 33). +--define(wxLANGUAGE_BENGALI, 34). +--define(wxLANGUAGE_BHUTANI, 35). +--define(wxLANGUAGE_BIHARI, 36). +--define(wxLANGUAGE_BISLAMA, 37). +--define(wxLANGUAGE_BRETON, 38). +--define(wxLANGUAGE_BULGARIAN, 39). +--define(wxLANGUAGE_BURMESE, 40). +--define(wxLANGUAGE_CAMBODIAN, 41). +--define(wxLANGUAGE_CATALAN, 42). +--define(wxLANGUAGE_CHINESE, 43). +--define(wxLANGUAGE_CHINESE_SIMPLIFIED, 44). +--define(wxLANGUAGE_CHINESE_TRADITIONAL, 45). +--define(wxLANGUAGE_CHINESE_HONGKONG, 46). +--define(wxLANGUAGE_CHINESE_MACAU, 47). +--define(wxLANGUAGE_CHINESE_SINGAPORE, 48). +--define(wxLANGUAGE_CHINESE_TAIWAN, 49). +--define(wxLANGUAGE_CORSICAN, 50). +--define(wxLANGUAGE_CROATIAN, 51). +--define(wxLANGUAGE_CZECH, 52). +--define(wxLANGUAGE_DANISH, 53). +--define(wxLANGUAGE_DUTCH, 54). +--define(wxLANGUAGE_DUTCH_BELGIAN, 55). +--define(wxLANGUAGE_ENGLISH, 56). +--define(wxLANGUAGE_ENGLISH_UK, 57). +--define(wxLANGUAGE_ENGLISH_US, 58). +--define(wxLANGUAGE_ENGLISH_AUSTRALIA, 59). +--define(wxLANGUAGE_ENGLISH_BELIZE, 60). +--define(wxLANGUAGE_ENGLISH_BOTSWANA, 61). +--define(wxLANGUAGE_ENGLISH_CANADA, 62). +--define(wxLANGUAGE_ENGLISH_CARIBBEAN, 63). +--define(wxLANGUAGE_ENGLISH_DENMARK, 64). +--define(wxLANGUAGE_ENGLISH_EIRE, 65). +--define(wxLANGUAGE_ENGLISH_JAMAICA, 66). +--define(wxLANGUAGE_ENGLISH_NEW_ZEALAND, 67). +--define(wxLANGUAGE_ENGLISH_PHILIPPINES, 68). +--define(wxLANGUAGE_ENGLISH_SOUTH_AFRICA, 69). +--define(wxLANGUAGE_ENGLISH_TRINIDAD, 70). +--define(wxLANGUAGE_ENGLISH_ZIMBABWE, 71). +--define(wxLANGUAGE_ESPERANTO, 72). +--define(wxLANGUAGE_ESTONIAN, 73). +--define(wxLANGUAGE_FAEROESE, 74). +--define(wxLANGUAGE_FARSI, 75). +--define(wxLANGUAGE_FIJI, 76). +--define(wxLANGUAGE_FINNISH, 77). +--define(wxLANGUAGE_FRENCH, 78). +--define(wxLANGUAGE_FRENCH_BELGIAN, 79). +--define(wxLANGUAGE_FRENCH_CANADIAN, 80). +--define(wxLANGUAGE_FRENCH_LUXEMBOURG, 81). +--define(wxLANGUAGE_FRENCH_MONACO, 82). +--define(wxLANGUAGE_FRENCH_SWISS, 83). +--define(wxLANGUAGE_FRISIAN, 84). +--define(wxLANGUAGE_GALICIAN, 85). +--define(wxLANGUAGE_GEORGIAN, 86). +--define(wxLANGUAGE_GERMAN, 87). +--define(wxLANGUAGE_GERMAN_AUSTRIAN, 88). +--define(wxLANGUAGE_GERMAN_BELGIUM, 89). +--define(wxLANGUAGE_GERMAN_LIECHTENSTEIN, 90). +--define(wxLANGUAGE_GERMAN_LUXEMBOURG, 91). +--define(wxLANGUAGE_GERMAN_SWISS, 92). +--define(wxLANGUAGE_GREEK, 93). +--define(wxLANGUAGE_GREENLANDIC, 94). +--define(wxLANGUAGE_GUARANI, 95). +--define(wxLANGUAGE_GUJARATI, 96). +--define(wxLANGUAGE_HAUSA, 97). +--define(wxLANGUAGE_HEBREW, 98). +--define(wxLANGUAGE_HINDI, 99). +--define(wxLANGUAGE_HUNGARIAN, 100). +--define(wxLANGUAGE_ICELANDIC, 101). +--define(wxLANGUAGE_INDONESIAN, 102). +--define(wxLANGUAGE_INTERLINGUA, 103). +--define(wxLANGUAGE_INTERLINGUE, 104). +--define(wxLANGUAGE_INUKTITUT, 105). +--define(wxLANGUAGE_INUPIAK, 106). +--define(wxLANGUAGE_IRISH, 107). +--define(wxLANGUAGE_ITALIAN, 108). +--define(wxLANGUAGE_ITALIAN_SWISS, 109). +--define(wxLANGUAGE_JAPANESE, 110). +--define(wxLANGUAGE_JAVANESE, 111). +--define(wxLANGUAGE_KANNADA, 112). +--define(wxLANGUAGE_KASHMIRI, 113). +--define(wxLANGUAGE_KASHMIRI_INDIA, 114). +--define(wxLANGUAGE_KAZAKH, 115). +--define(wxLANGUAGE_KERNEWEK, 116). +--define(wxLANGUAGE_KINYARWANDA, 117). +--define(wxLANGUAGE_KIRGHIZ, 118). +--define(wxLANGUAGE_KIRUNDI, 119). +--define(wxLANGUAGE_KONKANI, 120). +--define(wxLANGUAGE_KOREAN, 121). +--define(wxLANGUAGE_KURDISH, 122). +--define(wxLANGUAGE_LAOTHIAN, 123). +--define(wxLANGUAGE_LATIN, 124). +--define(wxLANGUAGE_LATVIAN, 125). +--define(wxLANGUAGE_LINGALA, 126). +--define(wxLANGUAGE_LITHUANIAN, 127). +--define(wxLANGUAGE_MACEDONIAN, 128). +--define(wxLANGUAGE_MALAGASY, 129). +--define(wxLANGUAGE_MALAY, 130). +--define(wxLANGUAGE_MALAYALAM, 131). +--define(wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, 132). +--define(wxLANGUAGE_MALAY_MALAYSIA, 133). +--define(wxLANGUAGE_MALTESE, 134). +--define(wxLANGUAGE_MANIPURI, 135). +--define(wxLANGUAGE_MAORI, 136). +--define(wxLANGUAGE_MARATHI, 137). +--define(wxLANGUAGE_MOLDAVIAN, 138). +--define(wxLANGUAGE_MONGOLIAN, 139). +--define(wxLANGUAGE_NAURU, 140). +--define(wxLANGUAGE_NEPALI, 141). +--define(wxLANGUAGE_NEPALI_INDIA, 142). +--define(wxLANGUAGE_NORWEGIAN_BOKMAL, 143). +--define(wxLANGUAGE_NORWEGIAN_NYNORSK, 144). +--define(wxLANGUAGE_OCCITAN, 145). +--define(wxLANGUAGE_ORIYA, 146). +--define(wxLANGUAGE_OROMO, 147). +--define(wxLANGUAGE_PASHTO, 148). +--define(wxLANGUAGE_POLISH, 149). +--define(wxLANGUAGE_PORTUGUESE, 150). +--define(wxLANGUAGE_PORTUGUESE_BRAZILIAN, 151). +--define(wxLANGUAGE_PUNJABI, 152). +--define(wxLANGUAGE_QUECHUA, 153). +--define(wxLANGUAGE_RHAETO_ROMANCE, 154). +--define(wxLANGUAGE_ROMANIAN, 155). +--define(wxLANGUAGE_RUSSIAN, 156). +--define(wxLANGUAGE_RUSSIAN_UKRAINE, 157). +--define(wxLANGUAGE_SAMOAN, 158). +--define(wxLANGUAGE_SANGHO, 159). +--define(wxLANGUAGE_SANSKRIT, 160). +--define(wxLANGUAGE_SCOTS_GAELIC, 161). +--define(wxLANGUAGE_SERBIAN, 162). +--define(wxLANGUAGE_SERBIAN_CYRILLIC, 163). +--define(wxLANGUAGE_SERBIAN_LATIN, 164). +--define(wxLANGUAGE_SERBO_CROATIAN, 165). +--define(wxLANGUAGE_SESOTHO, 166). +--define(wxLANGUAGE_SETSWANA, 167). +--define(wxLANGUAGE_SHONA, 168). +--define(wxLANGUAGE_SINDHI, 169). +--define(wxLANGUAGE_SINHALESE, 170). +--define(wxLANGUAGE_SISWATI, 171). +--define(wxLANGUAGE_SLOVAK, 172). +--define(wxLANGUAGE_SLOVENIAN, 173). +--define(wxLANGUAGE_SOMALI, 174). +--define(wxLANGUAGE_SPANISH, 175). +--define(wxLANGUAGE_SPANISH_ARGENTINA, 176). +--define(wxLANGUAGE_SPANISH_BOLIVIA, 177). +--define(wxLANGUAGE_SPANISH_CHILE, 178). +--define(wxLANGUAGE_SPANISH_COLOMBIA, 179). +--define(wxLANGUAGE_SPANISH_COSTA_RICA, 180). +--define(wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, 181). +--define(wxLANGUAGE_SPANISH_ECUADOR, 182). +--define(wxLANGUAGE_SPANISH_EL_SALVADOR, 183). +--define(wxLANGUAGE_SPANISH_GUATEMALA, 184). +--define(wxLANGUAGE_SPANISH_HONDURAS, 185). +--define(wxLANGUAGE_SPANISH_MEXICAN, 186). +--define(wxLANGUAGE_SPANISH_MODERN, 187). +--define(wxLANGUAGE_SPANISH_NICARAGUA, 188). +--define(wxLANGUAGE_SPANISH_PANAMA, 189). +--define(wxLANGUAGE_SPANISH_PARAGUAY, 190). +--define(wxLANGUAGE_SPANISH_PERU, 191). +--define(wxLANGUAGE_SPANISH_PUERTO_RICO, 192). +--define(wxLANGUAGE_SPANISH_URUGUAY, 193). +--define(wxLANGUAGE_SPANISH_US, 194). +--define(wxLANGUAGE_SPANISH_VENEZUELA, 195). +--define(wxLANGUAGE_SUNDANESE, 196). +--define(wxLANGUAGE_SWAHILI, 197). +--define(wxLANGUAGE_SWEDISH, 198). +--define(wxLANGUAGE_SWEDISH_FINLAND, 199). +--define(wxLANGUAGE_TAGALOG, 200). +--define(wxLANGUAGE_TAJIK, 201). +--define(wxLANGUAGE_TAMIL, 202). +--define(wxLANGUAGE_TATAR, 203). +--define(wxLANGUAGE_TELUGU, 204). +--define(wxLANGUAGE_THAI, 205). +--define(wxLANGUAGE_TIBETAN, 206). +--define(wxLANGUAGE_TIGRINYA, 207). +--define(wxLANGUAGE_TONGA, 208). +--define(wxLANGUAGE_TSONGA, 209). +--define(wxLANGUAGE_TURKISH, 210). +--define(wxLANGUAGE_TURKMEN, 211). +--define(wxLANGUAGE_TWI, 212). +--define(wxLANGUAGE_UIGHUR, 213). +--define(wxLANGUAGE_UKRAINIAN, 214). +--define(wxLANGUAGE_URDU, 215). +--define(wxLANGUAGE_URDU_INDIA, 216). +--define(wxLANGUAGE_URDU_PAKISTAN, 217). +--define(wxLANGUAGE_UZBEK, 218). +--define(wxLANGUAGE_UZBEK_CYRILLIC, 219). +--define(wxLANGUAGE_UZBEK_LATIN, 220). +--define(wxLANGUAGE_VIETNAMESE, 221). +--define(wxLANGUAGE_VOLAPUK, 222). +--define(wxLANGUAGE_WELSH, 223). +--define(wxLANGUAGE_WOLOF, 224). +--define(wxLANGUAGE_XHOSA, 225). +--define(wxLANGUAGE_YIDDISH, 226). +--define(wxLANGUAGE_YORUBA, 227). +--define(wxLANGUAGE_ZHUANG, 228). +--define(wxLANGUAGE_ZULU, 229). ++-define(wxLANGUAGE_AYMARA, 28). ++-define(wxLANGUAGE_AZERI, 29). ++-define(wxLANGUAGE_AZERI_CYRILLIC, 30). ++-define(wxLANGUAGE_AZERI_LATIN, 31). ++-define(wxLANGUAGE_BASHKIR, 32). ++-define(wxLANGUAGE_BASQUE, 33). ++-define(wxLANGUAGE_BELARUSIAN, 34). ++-define(wxLANGUAGE_BENGALI, 35). ++-define(wxLANGUAGE_BHUTANI, 36). ++-define(wxLANGUAGE_BIHARI, 37). ++-define(wxLANGUAGE_BISLAMA, 38). ++-define(wxLANGUAGE_BRETON, 40). ++-define(wxLANGUAGE_BULGARIAN, 41). ++-define(wxLANGUAGE_BURMESE, 42). ++-define(wxLANGUAGE_CAMBODIAN, 43). ++-define(wxLANGUAGE_CATALAN, 44). ++-define(wxLANGUAGE_CHINESE, 45). ++-define(wxLANGUAGE_CHINESE_SIMPLIFIED, 46). ++-define(wxLANGUAGE_CHINESE_TRADITIONAL, 47). ++-define(wxLANGUAGE_CHINESE_HONGKONG, 48). ++-define(wxLANGUAGE_CHINESE_MACAU, 49). ++-define(wxLANGUAGE_CHINESE_SINGAPORE, 50). ++-define(wxLANGUAGE_CHINESE_TAIWAN, 51). ++-define(wxLANGUAGE_CORSICAN, 52). ++-define(wxLANGUAGE_CROATIAN, 53). ++-define(wxLANGUAGE_CZECH, 54). ++-define(wxLANGUAGE_DANISH, 55). ++-define(wxLANGUAGE_DUTCH, 56). ++-define(wxLANGUAGE_DUTCH_BELGIAN, 57). ++-define(wxLANGUAGE_ENGLISH, 58). ++-define(wxLANGUAGE_ENGLISH_UK, 59). ++-define(wxLANGUAGE_ENGLISH_US, 60). ++-define(wxLANGUAGE_ENGLISH_AUSTRALIA, 61). ++-define(wxLANGUAGE_ENGLISH_BELIZE, 62). ++-define(wxLANGUAGE_ENGLISH_BOTSWANA, 63). ++-define(wxLANGUAGE_ENGLISH_CANADA, 64). ++-define(wxLANGUAGE_ENGLISH_CARIBBEAN, 65). ++-define(wxLANGUAGE_ENGLISH_DENMARK, 66). ++-define(wxLANGUAGE_ENGLISH_EIRE, 67). ++-define(wxLANGUAGE_ENGLISH_JAMAICA, 68). ++-define(wxLANGUAGE_ENGLISH_NEW_ZEALAND, 69). ++-define(wxLANGUAGE_ENGLISH_PHILIPPINES, 70). ++-define(wxLANGUAGE_ENGLISH_SOUTH_AFRICA, 71). ++-define(wxLANGUAGE_ENGLISH_TRINIDAD, 72). ++-define(wxLANGUAGE_ENGLISH_ZIMBABWE, 73). ++-define(wxLANGUAGE_ESPERANTO, 74). ++-define(wxLANGUAGE_ESTONIAN, 75). ++-define(wxLANGUAGE_FAEROESE, 76). ++-define(wxLANGUAGE_FARSI, 77). ++-define(wxLANGUAGE_FIJI, 78). ++-define(wxLANGUAGE_FINNISH, 79). ++-define(wxLANGUAGE_FRENCH, 80). ++-define(wxLANGUAGE_FRENCH_BELGIAN, 81). ++-define(wxLANGUAGE_FRENCH_CANADIAN, 82). ++-define(wxLANGUAGE_FRENCH_LUXEMBOURG, 83). ++-define(wxLANGUAGE_FRENCH_MONACO, 84). ++-define(wxLANGUAGE_FRENCH_SWISS, 85). ++-define(wxLANGUAGE_FRISIAN, 86). ++-define(wxLANGUAGE_GALICIAN, 87). ++-define(wxLANGUAGE_GEORGIAN, 88). ++-define(wxLANGUAGE_GERMAN, 89). ++-define(wxLANGUAGE_GERMAN_AUSTRIAN, 90). ++-define(wxLANGUAGE_GERMAN_BELGIUM, 91). ++-define(wxLANGUAGE_GERMAN_LIECHTENSTEIN, 92). ++-define(wxLANGUAGE_GERMAN_LUXEMBOURG, 93). ++-define(wxLANGUAGE_GERMAN_SWISS, 94). ++-define(wxLANGUAGE_GREEK, 95). ++-define(wxLANGUAGE_GREENLANDIC, 96). ++-define(wxLANGUAGE_GUARANI, 97). ++-define(wxLANGUAGE_GUJARATI, 98). ++-define(wxLANGUAGE_HAUSA, 99). ++-define(wxLANGUAGE_HEBREW, 100). ++-define(wxLANGUAGE_HINDI, 101). ++-define(wxLANGUAGE_HUNGARIAN, 102). ++-define(wxLANGUAGE_ICELANDIC, 103). ++-define(wxLANGUAGE_INDONESIAN, 104). ++-define(wxLANGUAGE_INTERLINGUA, 105). ++-define(wxLANGUAGE_INTERLINGUE, 106). ++-define(wxLANGUAGE_INUKTITUT, 107). ++-define(wxLANGUAGE_INUPIAK, 108). ++-define(wxLANGUAGE_IRISH, 109). ++-define(wxLANGUAGE_ITALIAN, 110). ++-define(wxLANGUAGE_ITALIAN_SWISS, 111). ++-define(wxLANGUAGE_JAPANESE, 112). ++-define(wxLANGUAGE_JAVANESE, 113). ++-define(wxLANGUAGE_KANNADA, 114). ++-define(wxLANGUAGE_KASHMIRI, 115). ++-define(wxLANGUAGE_KASHMIRI_INDIA, 116). ++-define(wxLANGUAGE_KAZAKH, 117). ++-define(wxLANGUAGE_KERNEWEK, 118). ++-define(wxLANGUAGE_KINYARWANDA, 119). ++-define(wxLANGUAGE_KIRGHIZ, 120). ++-define(wxLANGUAGE_KIRUNDI, 121). ++-define(wxLANGUAGE_KONKANI, 122). ++-define(wxLANGUAGE_KOREAN, 123). ++-define(wxLANGUAGE_KURDISH, 124). ++-define(wxLANGUAGE_LAOTHIAN, 125). ++-define(wxLANGUAGE_LATIN, 126). ++-define(wxLANGUAGE_LATVIAN, 127). ++-define(wxLANGUAGE_LINGALA, 128). ++-define(wxLANGUAGE_LITHUANIAN, 129). ++-define(wxLANGUAGE_MACEDONIAN, 130). ++-define(wxLANGUAGE_MALAGASY, 131). ++-define(wxLANGUAGE_MALAY, 132). ++-define(wxLANGUAGE_MALAYALAM, 133). ++-define(wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, 134). ++-define(wxLANGUAGE_MALAY_MALAYSIA, 135). ++-define(wxLANGUAGE_MALTESE, 136). ++-define(wxLANGUAGE_MANIPURI, 137). ++-define(wxLANGUAGE_MAORI, 138). ++-define(wxLANGUAGE_MARATHI, 139). ++-define(wxLANGUAGE_MOLDAVIAN, 140). ++-define(wxLANGUAGE_MONGOLIAN, 141). ++-define(wxLANGUAGE_NAURU, 142). ++-define(wxLANGUAGE_NEPALI, 143). ++-define(wxLANGUAGE_NEPALI_INDIA, 144). ++-define(wxLANGUAGE_NORWEGIAN_BOKMAL, 145). ++-define(wxLANGUAGE_NORWEGIAN_NYNORSK, 146). ++-define(wxLANGUAGE_OCCITAN, 147). ++-define(wxLANGUAGE_ORIYA, 148). ++-define(wxLANGUAGE_OROMO, 149). ++-define(wxLANGUAGE_PASHTO, 150). ++-define(wxLANGUAGE_POLISH, 151). ++-define(wxLANGUAGE_PORTUGUESE, 152). ++-define(wxLANGUAGE_PORTUGUESE_BRAZILIAN, 153). ++-define(wxLANGUAGE_PUNJABI, 154). ++-define(wxLANGUAGE_QUECHUA, 155). ++-define(wxLANGUAGE_RHAETO_ROMANCE, 156). ++-define(wxLANGUAGE_ROMANIAN, 157). ++-define(wxLANGUAGE_RUSSIAN, 158). ++-define(wxLANGUAGE_RUSSIAN_UKRAINE, 159). ++-define(wxLANGUAGE_SAMOAN, 161). ++-define(wxLANGUAGE_SANGHO, 162). ++-define(wxLANGUAGE_SANSKRIT, 163). ++-define(wxLANGUAGE_SCOTS_GAELIC, 164). ++-define(wxLANGUAGE_SERBIAN, 165). ++-define(wxLANGUAGE_SERBIAN_CYRILLIC, 166). ++-define(wxLANGUAGE_SERBIAN_LATIN, 167). ++-define(wxLANGUAGE_SERBO_CROATIAN, 168). ++-define(wxLANGUAGE_SESOTHO, 169). ++-define(wxLANGUAGE_SETSWANA, 170). ++-define(wxLANGUAGE_SHONA, 171). ++-define(wxLANGUAGE_SINDHI, 172). ++-define(wxLANGUAGE_SINHALESE, 173). ++-define(wxLANGUAGE_SISWATI, 174). ++-define(wxLANGUAGE_SLOVAK, 175). ++-define(wxLANGUAGE_SLOVENIAN, 176). ++-define(wxLANGUAGE_SOMALI, 177). ++-define(wxLANGUAGE_SPANISH, 178). ++-define(wxLANGUAGE_SPANISH_ARGENTINA, 179). ++-define(wxLANGUAGE_SPANISH_BOLIVIA, 180). ++-define(wxLANGUAGE_SPANISH_CHILE, 181). ++-define(wxLANGUAGE_SPANISH_COLOMBIA, 182). ++-define(wxLANGUAGE_SPANISH_COSTA_RICA, 183). ++-define(wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, 184). ++-define(wxLANGUAGE_SPANISH_ECUADOR, 185). ++-define(wxLANGUAGE_SPANISH_EL_SALVADOR, 186). ++-define(wxLANGUAGE_SPANISH_GUATEMALA, 187). ++-define(wxLANGUAGE_SPANISH_HONDURAS, 188). ++-define(wxLANGUAGE_SPANISH_MEXICAN, 189). ++-define(wxLANGUAGE_SPANISH_MODERN, 190). ++-define(wxLANGUAGE_SPANISH_NICARAGUA, 191). ++-define(wxLANGUAGE_SPANISH_PANAMA, 192). ++-define(wxLANGUAGE_SPANISH_PARAGUAY, 193). ++-define(wxLANGUAGE_SPANISH_PERU, 194). ++-define(wxLANGUAGE_SPANISH_PUERTO_RICO, 195). ++-define(wxLANGUAGE_SPANISH_URUGUAY, 196). ++-define(wxLANGUAGE_SPANISH_US, 197). ++-define(wxLANGUAGE_SPANISH_VENEZUELA, 198). ++-define(wxLANGUAGE_SUNDANESE, 199). ++-define(wxLANGUAGE_SWAHILI, 200). ++-define(wxLANGUAGE_SWEDISH, 201). ++-define(wxLANGUAGE_SWEDISH_FINLAND, 202). ++-define(wxLANGUAGE_TAGALOG, 203). ++-define(wxLANGUAGE_TAJIK, 204). ++-define(wxLANGUAGE_TAMIL, 205). ++-define(wxLANGUAGE_TATAR, 206). ++-define(wxLANGUAGE_TELUGU, 207). ++-define(wxLANGUAGE_THAI, 208). ++-define(wxLANGUAGE_TIBETAN, 209). ++-define(wxLANGUAGE_TIGRINYA, 210). ++-define(wxLANGUAGE_TONGA, 211). ++-define(wxLANGUAGE_TSONGA, 212). ++-define(wxLANGUAGE_TURKISH, 213). ++-define(wxLANGUAGE_TURKMEN, 214). ++-define(wxLANGUAGE_TWI, 215). ++-define(wxLANGUAGE_UIGHUR, 216). ++-define(wxLANGUAGE_UKRAINIAN, 217). ++-define(wxLANGUAGE_URDU, 218). ++-define(wxLANGUAGE_URDU_INDIA, 219). ++-define(wxLANGUAGE_URDU_PAKISTAN, 220). ++-define(wxLANGUAGE_UZBEK, 221). ++-define(wxLANGUAGE_UZBEK_CYRILLIC, 222). ++-define(wxLANGUAGE_UZBEK_LATIN, 223). ++-define(wxLANGUAGE_VIETNAMESE, 225). ++-define(wxLANGUAGE_VOLAPUK, 226). ++-define(wxLANGUAGE_WELSH, 227). ++-define(wxLANGUAGE_WOLOF, 228). ++-define(wxLANGUAGE_XHOSA, 229). ++-define(wxLANGUAGE_YIDDISH, 230). ++-define(wxLANGUAGE_YORUBA, 231). ++-define(wxLANGUAGE_ZHUANG, 232). ++-define(wxLANGUAGE_ZULU, 233). + -define(wxLANGUAGE_USER_DEFINED, 230). +--define(wxLANGUAGE_VALENCIAN, 536870911). +--define(wxLANGUAGE_SAMI, 536870912). ++-define(wxLANGUAGE_VALENCIAN, 224). ++-define(wxLANGUAGE_SAMI, 160). + % From "intl.h": wxLayoutDirection + -define(wxLayout_Default, 0). + -define(wxLayout_LeftToRight, 1). +@@ -3728,7 +3728,7 @@ + -define(wxSTC_KEY_LEFT, 302). + -define(wxSTC_KEY_UP, 301). + -define(wxSTC_KEY_DOWN, 300). +--define(wxSTC_MODEVENTMASKALL, 8191). ++-define(wxSTC_MODEVENTMASKALL, 1048575). + -define(wxSTC_MULTILINEUNDOREDO, 4096). + -define(wxSTC_MOD_BEFOREDELETE, 2048). + -define(wxSTC_MOD_BEFOREINSERT, 1024). +@@ -3810,7 +3810,7 @@ + -define(wxSTC_INDIC_TT, 2). + -define(wxSTC_INDIC_SQUIGGLE, 1). + -define(wxSTC_INDIC_PLAIN, 0). +--define(wxSTC_INDIC_MAX, 7). ++-define(wxSTC_INDIC_MAX, 31). + -define(wxSTC_CASE_LOWER, 2). + -define(wxSTC_CASE_UPPER, 1). + -define(wxSTC_CASE_MIXED, 0). +@@ -3835,7 +3835,7 @@ + -define(wxSTC_CHARSET_BALTIC, 186). + -define(wxSTC_CHARSET_DEFAULT, 1). + -define(wxSTC_CHARSET_ANSI, 0). +--define(wxSTC_STYLE_MAX, 127). ++-define(wxSTC_STYLE_MAX, 255). + -define(wxSTC_STYLE_LASTPREDEFINED, 39). + -define(wxSTC_STYLE_CALLTIP, 38). + -define(wxSTC_STYLE_INDENTGUIDE, 37). +@@ -3934,9 +3934,9 @@ + -define(wxTE_PROCESS_TAB, 64). + -define(wxTE_MULTILINE, 32). + -define(wxTE_READONLY, 16). +--define(wxTE_AUTO_SCROLL, 8). ++-define(wxTE_AUTO_SCROLL, 0). + -define(wxTE_NO_VSCROLL, 2). +--define(wxHAS_TEXT_WINDOW_STREAM, 0). ++-define(wxHAS_TEXT_WINDOW_STREAM, 1). + % From "textctrl.h": wxTextAttrAlignment + -define(wxTEXT_ALIGNMENT_DEFAULT, 0). + -define(wxTEXT_ALIGNMENT_LEFT, 1). +@@ -3986,7 +3986,7 @@ + -define(wxDEFAULT_FRAME_STYLE, (?wxSYSTEM_MENU bor ?wxRESIZE_BORDER bor ?wxMINIMIZE_BOX bor ?wxMAXIMIZE_BOX bor ?wxCLOSE_BOX bor ?wxCAPTION bor ?wxCLIP_CHILDREN)). + -define(wxRESIZE_BORDER, 64). + -define(wxTINY_CAPTION_VERT, 128). +--define(wxTINY_CAPTION_HORIZ, 256). ++-define(wxTINY_CAPTION_HORIZ, 128). + -define(wxMAXIMIZE_BOX, 512). + -define(wxMINIMIZE_BOX, 1024). + -define(wxSYSTEM_MENU, 2048). diff --git a/dev-lang/fsharp/Manifest b/dev-lang/fsharp/Manifest index bd53cd440596..6d2be6eb8672 100644 --- a/dev-lang/fsharp/Manifest +++ b/dev-lang/fsharp/Manifest @@ -1,2 +1,2 @@ DIST fsharp-3.1.1.31.tar.gz 31369171 SHA256 9b39c3f4625475c2553668ddbca337ec52fa3a637a05ae14a61a41abe39568b0 SHA512 fcbdad5780a5dd6ab55c380d70b8d0a38f25088e2bb49078468a2cd723b604a14bee6ba2d1005094b1f777a894208654b3f8d3876c5f72126ddc24f96e1eb049 WHIRLPOOL e9060e1e8ccfd3b0efcfeb1148cb5182390e738e8b462746e87d52acaacf5561b53cde50c920a1e4f6929ddf9f3ad0ca6a7d1e9eb8fd3b10af37a375675df019 -DIST fsharp-4.0.0.3.tar.gz 39812344 SHA256 d8a0f2e4504900d973532e1aa28c6758e8f2648898f85ef345437632b5ed1ed2 SHA512 18fae6c20290dec5a0961173875d3b57b9ca6e26d8a4147cf38631752c6feb8202d7726c2f83c30886947388bcc98bae4961f38ae0a169098a004db75e64cd26 WHIRLPOOL e267e156a80edc7d760c3266cb6fe0d5e175e843ebd9cebfa614ecb2fa3bb10f5fe6ee191e3c7bc9e082fb21ac5ce70f8791226b32d2d02313fb8b35009ba5e9 +DIST fsharp-4.0.0.4.tar.gz 39628258 SHA256 5b85e380348cc94b3c139e8c0d541fa3e43bd6254aff3b9c9a7150d949e637d5 SHA512 75fbf0fcab9a56cae86b14247e3c78264d9c2c146d10808d2eaca27bf2caf65175eec6487fde50c2b78237342fa0bd4c6ea2034383e8ad2bc4638d46acb0309c WHIRLPOOL 3b517a61177d31fc29e7d5258c2e8d5654b6a3f9b7cbe6a8f83f8f8ac2e67e06b70c84095ff73b3be7790c956d2ea80dd6a3334ec2b81c0e8e4a40ca95af749c diff --git a/dev-lang/fsharp/fsharp-4.0.0.3.ebuild b/dev-lang/fsharp/fsharp-4.0.0.4.ebuild index 40ce3dfad5ed..40ce3dfad5ed 100644 --- a/dev-lang/fsharp/fsharp-4.0.0.3.ebuild +++ b/dev-lang/fsharp/fsharp-4.0.0.4.ebuild diff --git a/dev-lang/gdl/gdl-0.9.5-r2.ebuild b/dev-lang/gdl/gdl-0.9.5-r2.ebuild new file mode 100644 index 000000000000..76b7dfa4f1f5 --- /dev/null +++ b/dev-lang/gdl/gdl-0.9.5-r2.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" +PYTHON_COMPAT=( python2_7 ) + +inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx + +DESCRIPTION="GNU Data Language" +HOMEPAGE="http://gnudatalanguage.sourceforge.net/" +SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp +png proj postscript python static-libs udunits wxwidgets" + +RDEPEND=" + dev-cpp/antlr-cpp:2= + sci-libs/gsl:0= + sci-libs/plplot:0=[-dynamic] + sys-libs/ncurses:0= + sys-libs/readline:0= + sys-libs/zlib:0= + x11-libs/libX11:0= + fftw? ( sci-libs/fftw:3.0= ) + grib? ( sci-libs/grib_api:0= ) + gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= ) + hdf? ( sci-libs/hdf:0= ) + hdf5? ( sci-libs/hdf5:0= ) + imagemagick? ( + || ( + media-gfx/graphicsmagick[cxx] + media-gfx/imagemagick[cxx] + ) + ) + netcdf? ( sci-libs/netcdf ) + proj? ( sci-libs/proj ) + postscript? ( dev-libs/pslib ) + python? ( + ${PYTHON_DEPS} + dev-python/numpy[${PYTHON_USEDEP}] + ) + udunits? ( sci-libs/udunits ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" + +DEPEND="${RDEPEND} + dev-java/antlr:0[java(+),script(+)] + virtual/pkgconfig + eigen? ( dev-cpp/eigen:3 )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}"/0.9.5-antlr.patch + "${FILESDIR}"/0.9.2-include.patch + "${FILESDIR}"/0.9.5-plplot.patch + "${FILESDIR}"/0.9.5-png.patch +) + +pkg_setup() { + use openmp && [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp && \ + die "You have openmp enabled but your current g++ does not support it" +} + +src_prepare() { + use wxwidgets && need-wxwidgets unicode + cmake-utils_src_prepare + + use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx + + # make sure antlr includes are from system and rebuild the sources with it + # https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659 + rm -r src/antlr || die + einfo "Regenerating grammar" + pushd src > /dev/null + local i + for i in *.g; do antlr ${i} || die ; done + popd > /dev/null + + # gentoo: use proj instead of libproj4 (libproj4 last update: 2004) + sed -i \ + -e 's:proj4:proj:' \ + -e 's:lib_proj\.h:proj_api\.h:g' \ + CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die + + # gentoo: avoid install files in datadir directory + sed -i \ + -e '/AUTHORS/d' \ + CMakeLists.txt || die +} + +src_configure() { + # MPI is still very buggy + # x11=off does not compile + local mycmakeargs=( + -DMPICH=OFF + -DBUNDLED_ANTLR=OFF + -DX11=ON + $(cmake-utils_use fftw) + $(cmake-utils_use eigen EIGEN3) + $(cmake-utils_use grib) + $(cmake-utils_use gshhs) + $(cmake-utils_use hdf) + $(cmake-utils_use hdf5) + $(cmake-utils_use netcdf) + $(cmake-utils_use openmp) + $(cmake-utils_use png PNGLIB) + $(cmake-utils_use proj LIBPROJ4) + $(cmake-utils_use postscript PSLIB) + $(cmake-utils_use udunits) + $(cmake-utils_use wxwidgets) + ) + if use imagemagick; then + if has_version media-gfx/graphicsmagick[cxx]; then + mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF ) + else + mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON ) + fi + else + mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF ) + fi + configuration() { + mycmakeargs+=( $@ ) + cmake-utils_src_configure + } + configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF + use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON +} + +src_compile() { + cmake-utils_src_compile + use python && python_foreach_impl cmake-utils_src_make +} + +src_test() { + # there is check target instead of the ctest to define some LDPATH + Xemake -C "${BUILD_DIR}" check +} + +src_install() { + cmake-utils_src_install + if use python; then + installation() { + mv src/libgdl.so GDL.so || die + python_domodule GDL.so + } + python_foreach_impl run_in_build_dir installation + dodoc PYTHON.txt + fi + + echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl + doenvd 50gdl +} diff --git a/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch b/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch new file mode 100644 index 000000000000..5cec4b608286 --- /dev/null +++ b/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch @@ -0,0 +1,11 @@ +--- src/cmd/dist/util.go. ++++ src/cmd/dist/util.go +@@ -404,7 +404,7 @@ + switch gohostos { + case "darwin": + // Even on 64-bit platform, darwin uname -m prints i386. +- if strings.Contains(run("", CheckExit, "sysctl", "machdep.cpu.extfeatures"), "EM64T") { ++ if strings.Contains(run("", CheckExit, "/usr/sbin/sysctl", "machdep.cpu.extfeatures"), "EM64T") { + gohostarch = "amd64" + } + case "solaris": diff --git a/dev-lang/go/go-1.4.2.ebuild b/dev-lang/go/go-1.4.2.ebuild index 8384e081cd1b..ec8f8651c6a0 100644 --- a/dev-lang/go/go-1.4.2.ebuild +++ b/dev-lang/go/go-1.4.2.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} = 9999 ]]; then else SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz" # Upstream only supports go on amd64, arm and x86 architectures. - KEYWORDS="-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos" + KEYWORDS="-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris" fi DESCRIPTION="A concurrent garbage collected and typesafe programming language" diff --git a/dev-lang/go/go-1.5.1.ebuild b/dev-lang/go/go-1.5.1.ebuild index 8d4c7158d828..139b35042ebe 100644 --- a/dev-lang/go/go-1.5.1.ebuild +++ b/dev-lang/go/go-1.5.1.ebuild @@ -54,6 +54,7 @@ go_arch() local portage_arch=$(tc-arch $@) case "${portage_arch}" in x86) echo 386;; + x64-*) echo amd64;; *) echo "${portage_arch}";; esac } @@ -112,6 +113,7 @@ src_prepare() sed -i -e 's/"-Werror",//g' src/cmd/dist/build.go || die 'sed failed' fi + epatch "${FILESDIR}"/${P}-darwin-sysctl.patch epatch_user } diff --git a/dev-lang/ocaml/ocaml-4.02.3.ebuild b/dev-lang/ocaml/ocaml-4.02.3.ebuild index c63ec6413718..8583ffe1ece9 100644 --- a/dev-lang/ocaml/ocaml-4.02.3.ebuild +++ b/dev-lang/ocaml/ocaml-4.02.3.ebuild @@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2" # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt, # so here we go with the subslot. SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="emacs latex ncurses +ocamlopt X xemacs" RDEPEND=" diff --git a/dev-lang/orc/metadata.xml b/dev-lang/orc/metadata.xml index 9e260ceca3e3..e8002d55e057 100644 --- a/dev-lang/orc/metadata.xml +++ b/dev-lang/orc/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>gstreamer</herd> +<use> + <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag> +</use> </pkgmetadata> diff --git a/dev-lang/orc/orc-0.4.24.ebuild b/dev-lang/orc/orc-0.4.24.ebuild index de2d36ca885f..f3b470155fc8 100644 --- a/dev-lang/orc/orc-0.4.24.ebuild +++ b/dev-lang/orc/orc-0.4.24.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz" LICENSE="BSD BSD-2" SLOT="0" KEYWORDS="amd64 arm hppa ~ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples hardened static-libs" +IUSE="examples pax_kernel static-libs" RDEPEND="" DEPEND="${RDEPEND} @@ -40,7 +40,7 @@ src_configure() { src_install() { autotools-multilib_src_install - if use hardened; then + if use pax_kernel; then pax-mark m "${ED}"usr/bin/orc-bugreport pax-mark m "${ED}"usr/bin/orcc pax-mark m "${ED}"usr/$(get_libdir)/liborc*.so* @@ -48,7 +48,7 @@ src_install() { } pkg_postinst() { - if use hardened; then + if use pax_kernel; then ewarn "Please run \"revdep-pax\" after installation". ewarn "It's provided by sys-apps/elfix." fi diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 227fcb692878..cdef06773900 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -3,6 +3,8 @@ DIST php-5.5.29.tar.bz2 13698565 SHA256 fbcee579ecc77cad6960a541116aee669cf145c2 DIST php-5.5.30.tar.bz2 13699702 SHA256 e7332a713cecdd1cb44a1b1336739885c9789f633f0f51236b25e48ab03c3b29 SHA512 9458126f579ace9e2aebdfa7ad7f8d097f1fd502f443d8fd66263ba3c542d579ca9c705e227725fae57e452649a3be7cb717a0330d339b93d3c6c94fa80dbc1f WHIRLPOOL 2aa6c61a48a231d81f6c746f94e42589d87b93d0526f02d6d15f731cbbca4aecdee84b443f7ec1891f2a524939c542ac6f94e15db90a23a8b19523463025d395 DIST php-5.6.13.tar.bz2 14077633 SHA256 6358837c9cbab41b91ede59dbf0670ae0fb925a1369ecbc1a44a27212420f893 SHA512 80e89ae748255d40b466de6c61b4443432fd81ffb1510ae66f809ed0dd07eb4071ded5b7a975f997b2cb28553ac7e27c57b67734e268c894207e9efd78ae76bf WHIRLPOOL 9b0add1b05220f9ef60de2741dcd198d0b44a9813dc1a999e42700ddb1e879f3749056cdfb151a595bc7a14a65a38eca6d0f416ee36ebd013126a92878fd47db DIST php-5.6.14.tar.bz2 14073920 SHA256 36f295f11641c1839a5df00e693f685fd134c65e8a1d46e8ee0abae8662b2eb0 SHA512 af0c7fa5c7be15839b1189b2544ff725b935228030087c206f83727e7885750030b10bf2bfbd27adea6f18af90d4ecd3ced9defec88c5f98f7ed26b4e4c57981 WHIRLPOOL 8e31fc3dbeb22fa2a59112d2dcbe28f8102c8d5a14fd716d17f909399c06d27a10ea32d43ebd1a12cea78d9fd949ae7c7882628ae0c3abd7354d165107fa0c9d +DIST php-5.6.15.tar.bz2 14060562 SHA256 11a0645c4d4b749e256da1e0d6df89dd886b5b06b83c914d942653661dbd1c38 SHA512 3841b1b64bbe1b3bdbbbf2591f2ca81754f1e7391dae593f45302ea7a4157dd8032e0f525308a13769938aadbfca9e25cbe15ac9bf8eed1427263fefcbede2aa WHIRLPOOL 6d5a6b860d0db887c09d1bfb8304a39d44f1c5966bab3f881c277e3aa0331cd794f1bff02cbac2bdba23fd9bc4fe71a8e1d4b51cbb4c1dfe1ceadca15ec38665 DIST php-7.0.0RC4.tar.bz2 13973356 SHA256 5475a6856b600a7a4f31a0276339725140d64da31a8a363e0cdb45ed233f27cd SHA512 02a55ce90d66f6ee2019461658eeb7ce7fd2c78c5c32869a3882f0f6fd6a54454b26f3440266ed8e850da740633243f697086a5c0cf0d616f0029e6ba4ddd1bf WHIRLPOOL 7695a9e3b54470c456104e29082479d27c47806e86f739d9d01ffe57580d28b1130d3aaadd3d78f205b457ed4d3207a3ad52a95996cef6b70898ed948b1373a5 DIST php-7.0.0RC5.tar.bz2 13985797 SHA256 90e3f91c6781e6cdd198dd7b3f9bceff0c00be74a56ea0940b4ad9c6b312b4db SHA512 0deceb3bc33bf67076a9613cb150d5b036a4198429c46b49d92a172d0773980bd9df764e89c3f5c53f4e39069376f5cf6bca82b61851e138b30460087003b66b WHIRLPOOL a4228765601c28d88ecb5a298bb24c4b20d9f0559429c415a23dd4cb92847586223b124aecd958de718f6dfe45c314b82b63ed84d9143e94de9f967358be2d15 +DIST php-7.0.0RC6.tar.bz2 13984976 SHA256 d36b768d0ae9cc8b8c7c259949f60edca7946cfb5956d248921cb2100ea81361 SHA512 b5d2ff80c6058391f9d7285d45fdf6911601e89835d4446e851fc6884b5d403ceb453f7d24b1ad1bcaae15317e681b7d149e2c628fddc8248d5bf5965c6c7ef7 WHIRLPOOL 80895829e075106b4098bcac1cb8302c0c80f22b719cebb5922b97d98883f195b6f6212f3a8ace319a18d0e4d397f1160fe73ab2d7883ae55f0a6eb28f55ab55 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea diff --git a/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch new file mode 100644 index 000000000000..29876a9f97f6 --- /dev/null +++ b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch @@ -0,0 +1,59 @@ +From 37ed0dafe47fb1053aee7822113bacc1f213337a Mon Sep 17 00:00:00 2001 +From: Xinchen Hui <laruence@gmail.com> +Date: Mon, 2 Nov 2015 10:47:02 +0800 +Subject: [PATCH] Fixed bug #70828 (php-fpm 5.6 with opcache crashes when + referencing a non-existent constant) + +--- + NEWS | 2 ++ + Zend/tests/bug70828.phpt | 24 ++++++++++++++++++++++++ + Zend/zend_compile.c | 2 +- + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 Zend/tests/bug70828.phpt + +diff --git a/Zend/tests/bug70828.phpt b/Zend/tests/bug70828.phpt +new file mode 100644 +index 0000000..dd285b5 +--- /dev/null ++++ b/Zend/tests/bug70828.phpt +@@ -0,0 +1,24 @@ ++--TEST-- ++Bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent constant) ++--FILE-- ++<?php ++ ++namespace test { ++ use const nonexistent; ++ ++ class test { ++ static function run(){ ++ var_dump(nonexistent); ++ existent; ++ } ++ } ++} ++ ++namespace { ++ define("test\\existent", "bug!", 1); ++ test\test::run(); ++} ++?> ++--EXPECTF-- ++Notice: Use of undefined constant nonexistent - assumed 'nonexistent' in /home/huixinchen/opensource/php-5.6/Zend/tests/bug70828.php on line 8 ++string(11) "nonexistent" +diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c +index 5ff1b04..fca4e2a 100644 +--- a/Zend/zend_compile.c ++++ b/Zend/zend_compile.c +@@ -5804,7 +5804,7 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con + opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 0 TSRMLS_CC); + } else { + opline->extended_value = IS_CONSTANT_UNQUALIFIED; +- if (CG(current_namespace)) { ++ if (check_namespace && CG(current_namespace)) { + opline->extended_value |= IS_CONSTANT_IN_NAMESPACE; + opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 1 TSRMLS_CC); + } else { +-- +2.1.4 + diff --git a/dev-lang/php/php-5.5.30.ebuild b/dev-lang/php/php-5.5.30.ebuild index dcf83629d198..e0831593fc8b 100644 --- a/dev-lang/php/php-5.5.30.ebuild +++ b/dev-lang/php/php-5.5.30.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/php/php-5.6.14.ebuild b/dev-lang/php/php-5.6.14.ebuild index dcf83629d198..e0831593fc8b 100644 --- a/dev-lang/php/php-5.6.14.ebuild +++ b/dev-lang/php/php-5.6.14.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/php/php-5.6.15-r1.ebuild b/dev-lang/php/php-5.6.15-r1.ebuild new file mode 100644 index 000000000000..726c56adaee8 --- /dev/null +++ b/dev-lang/php/php-5.6.15-r1.ebuild @@ -0,0 +1,781 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +function php_get_uri () +{ + case "${1}" in + "php-pre") + echo "http://downloads.php.net/dsp/${2}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "olemarkus") + echo "https://dev.gentoo.org/~olemarkus/php/${2}" + ;; + "gentoo") + echo "mirror://gentoo/${2}" + ;; + *) + die "unhandled case in php_get_uri" + ;; + esac +} + +PHP_MV="$(get_major_version)" +SLOT="$(get_version_component_range 1-2)" + +# alias, so we can handle different types of releases (finals, rcs, alphas, +# betas, ...) w/o changing the whole ebuild +PHP_PV="${PV/_rc/RC}" +PHP_PV="${PHP_PV/_alpha/alpha}" +PHP_PV="${PHP_PV/_beta/beta}" +PHP_RELEASE="php" +[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre" +PHP_P="${PN}-${PHP_PV}" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +PHP_FPM_CONF_VER="1" + +SRC_URI="${PHP_SRC_URI}" + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs" +HOMEPAGE="http://php.net/" +LICENSE="PHP-3" + +S="${WORKDIR}/${PHP_P}" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl debug + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql libmysqlclient mysqli nls + oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + readline recode selinux +session sharedmem + +simplexml snmp soap sockets spell sqlite ssl + sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" + +DEPEND=" + >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] + >=dev-libs/libpcre-8.32[unicode] + apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] + <www-servers/apache-2.4[threads=] ) )" + +# This wacky berkdb dependency really means "any 4.x or 5.x version of +# sys-libs/db". The ./configure flag is called --with-db4, but this is a +# misnomer since db5 also works (bug #521222). We really want to say +# "any 4.x or 5.x slot", but that's not possible. The safest thing to +# do is list all 4.x and 5.x slots in order of preference. +DEPEND="${DEPEND} + berkdb? ( || ( sys-libs/db:5.3 + sys-libs/db:5.1 + sys-libs/db:4.8 + sys-libs/db:4.7 + sys-libs/db:4.6 + sys-libs/db:4.5 + sys-libs/db:4.4 + sys-libs/db:4.3 + sys-libs/db:4.2 ) ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg:0 + media-libs/libpng:0= + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg:0 + media-libs/libpng:0= + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( dev-libs/gmp:0 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu:= ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + libmysqlclient? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient-basic ) + odbc? ( >=dev-db/unixODBC-1.8.13 ) + postgres? ( dev-db/postgresql:* ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline:0 ) + recode? ( app-text/recode ) + sharedmem? ( dev-libs/mm ) + simplexml? ( >=dev-libs/libxml2-2.6.8 ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + soap? ( >=dev-libs/libxml2-2.6.8 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( dev-libs/openssl:0 ) + sybase-ct? ( dev-db/freetds ) + tidy? ( app-text/htmltidy ) + truetype? ( + =media-libs/freetype-2* + >=media-libs/t1lib-5.0.0 + !gd? ( + virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + vpx? ( media-libs/libvpx ) + wddx? ( >=dev-libs/libxml2-2.6.8 ) + xml? ( >=dev-libs/libxml2-2.6.8 ) + xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) + xmlreader? ( >=dev-libs/libxml2-2.6.8 ) + xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) + xpm? ( + x11-libs/libXpm + virtual/jpeg:0 + media-libs/libpng:0= sys-libs/zlib + ) + xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) + zip? ( sys-libs/zlib ) + zlib? ( sys-libs/zlib ) + virtual/mta +" + +php="=${CATEGORY}/${PF}" + +REQUIRED_USE=" + truetype? ( gd ) + vpx? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + mhash? ( hash ) + phar? ( hash ) + libmysqlclient? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" + +RDEPEND="${DEPEND}" + +RDEPEND="${RDEPEND} + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +DEPEND="${DEPEND} + sys-devel/flex + >=sys-devel/m4-1.4.3 + >=sys-devel/libtool-1.5.18" + +# Allow users to install production version if they want to + +case "${PHP_INI_VERSION}" in + production|development) + ;; + *) + PHP_INI_VERSION="development" + ;; +esac + +PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" +PHP_INI_FILE="php.ini" + +want_apache + +pkg_setup() { + depend.apache_pkg_setup +} + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" + cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" + + dodir "${PHP_INI_DIR#${EPREFIX}}" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" "${PHP_INI_FILE}" + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + if use_if_iuse opcache; then + elog "Adding opcache to $PHP_EXT_INI_DIR" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini + dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" + fi + + # SAPI-specific handling + + if [[ "${sapi}" == "fpm" ]] ; then + [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 + einfo "Installing FPM CGI config file php-fpm.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf + + # Remove bogus /etc/php-fpm.conf.default (bug 359906) + [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default" + fi + + # Install PHP ini files into /usr/share/php + + dodoc php.ini-development + dodoc php.ini-production + +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + # Change PHP branding + # Get the alpha/beta/rc version + sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ + -i configure.in || die "Unable to change PHP branding" + + # Patch PHP to show Gentoo as the server platform + sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ + -i configure.in || die "Failed to fix server platform name" + + # Prevent PHP from activating the Apache config, + # as we will do that ourselves + sed -i \ + -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ + -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ + configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 + + # Patch PHP to support heimdal instead of mit-krb5 + if has_version "app-crypt/heimdal" ; then + sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ + || die "Failed to fix heimdal libname" + sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ + || die "Failed to fix heimdal crypt library reference" + fi + + # Fix a const crash in php-fpm, bug #564690. + # Only applies to php-5.6.15 and should be fixed in 5.6.16. + epatch "${FILESDIR}/fix-5.6.15-fpm-const-crash.patch" + + #Add user patches #357637 + epatch_user + + #force rebuilding aclocal.m4 + rm aclocal.m4 + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # http://bugs.php.net/bug.php?id=48795, bug #343481 + sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die + fi +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # This is a global variable and should be in caps. It isn't because the + # phpconfutils eclass relies on exactly this name... + # for --with-libdir see bug #327025 + my_conf=" + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}"/man + --infodir="${PHP_DESTDIR}"/info + --libdir="${PHP_DESTDIR}"/lib + --with-libdir=$(get_libdir) + --without-pear + $(use_enable threads maintainer-zts)" + + # extension USE flag shared + my_conf+=" + $(use_enable bcmath bcmath ) + $(use_with bzip2 bz2 "${EPREFIX}"/usr) + $(use_enable calendar calendar ) + $(use_enable ctype ctype ) + $(use_with curl curl "${EPREFIX}"/usr) + $(use_enable xml dom ) + $(use_with enchant enchant "${EPREFIX}"/usr) + $(use_enable exif exif ) + $(use_enable fileinfo fileinfo ) + $(use_enable filter filter ) + $(use_enable ftp ftp ) + $(use_with nls gettext "${EPREFIX}"/usr) + $(use_with gmp gmp "${EPREFIX}"/usr) + $(use_enable hash hash ) + $(use_with mhash mhash "${EPREFIX}"/usr) + $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr)) + $(use_enable intl intl ) + $(use_enable ipv6 ipv6 ) + $(use_enable json json ) + $(use_with kerberos kerberos "${EPREFIX}"/usr) + $(use_enable xml libxml ) + $(use_with xml libxml-dir "${EPREFIX}"/usr) + $(use_enable unicode mbstring ) + $(use_with crypt mcrypt "${EPREFIX}"/usr) + $(use_with mssql mssql "${EPREFIX}"/usr) + $(use_with unicode onig "${EPREFIX}"/usr) + $(use_with ssl openssl "${EPREFIX}"/usr) + $(use_with ssl openssl-dir "${EPREFIX}"/usr) + $(use_enable pcntl pcntl ) + $(use_enable phar phar ) + $(use_enable pdo pdo ) + $(use_enable opcache opcache ) + $(use_with postgres pgsql "${EPREFIX}"/usr) + $(use_enable posix posix ) + $(use_with spell pspell "${EPREFIX}"/usr) + $(use_with recode recode "${EPREFIX}"/usr) + $(use_enable simplexml simplexml ) + $(use_enable sharedmem shmop ) + $(use_with snmp snmp "${EPREFIX}"/usr) + $(use_enable soap soap ) + $(use_enable sockets sockets ) + $(use_with sqlite sqlite3 "${EPREFIX}"/usr) + $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr) + $(use_enable sysvipc sysvmsg ) + $(use_enable sysvipc sysvsem ) + $(use_enable sysvipc sysvshm ) + $(use_with systemd fpm-systemd) + $(use_with tidy tidy "${EPREFIX}"/usr) + $(use_enable tokenizer tokenizer ) + $(use_enable wddx wddx ) + $(use_enable xml xml ) + $(use_enable xmlreader xmlreader ) + $(use_enable xmlwriter xmlwriter ) + $(use_with xmlrpc xmlrpc) + $(use_with xslt xsl "${EPREFIX}"/usr) + $(use_enable zip zip ) + $(use_with zlib zlib "${EPREFIX}"/usr) + $(use_enable debug debug )" + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm ; then + my_conf+=" --enable-dba${shared}" + fi + + # DBA drivers support + my_conf+=" + $(use_with cdb cdb) + $(use_with berkdb db4 ${EPREFIX}/usr) + $(use_enable flatfile flatfile ) + $(use_with gdbm gdbm ${EPREFIX}/usr) + $(use_enable inifile inifile ) + $(use_with qdbm qdbm ${EPREFIX}/usr)" + + # Support for the GD graphics library + my_conf+=" + $(use_with truetype freetype-dir ${EPREFIX}/usr) + $(use_with truetype t1lib ${EPREFIX}/usr) + $(use_enable cjk gd-jis-conv ) + $(use_with gd jpeg-dir ${EPREFIX}/usr) + $(use_with gd png-dir ${EPREFIX}/usr) + $(use_with xpm xpm-dir ${EPREFIX}/usr) + $(use_with vpx vpx-dir ${EPREFIX}/usr)" + # enable gd last, so configure can pick up the previous settings + my_conf+=" + $(use_with gd gd)" + + # IMAP support + if use imap ; then + my_conf+=" + $(use_with imap imap ${EPREFIX}/usr) + $(use_with ssl imap-ssl ${EPREFIX}/usr)" + fi + + # Interbase/firebird support + my_conf+=" + $(use_with firebird interbase ${EPREFIX}/usr)" + + # LDAP support + if use ldap ; then + my_conf+=" + $(use_with ldap ldap ${EPREFIX}/usr) + $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)" + fi + + # MySQL support + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + use libmysqlclient && mysqllib="${EPREFIX}/usr" + use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" + + my_conf+=" $(use_with mysql mysql $mysqllib)" + my_conf+=" $(use_with mysqli mysqli $mysqlilib)" + + local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" + if use mysql ; then + my_conf+="${mysqlsock}" + elif use mysqli ; then + my_conf+="${mysqlsock}" + fi + + # ODBC support + my_conf+=" + $(use_with odbc unixODBC ${EPREFIX}/usr) + $(use_with iodbc iodbc ${EPREFIX}/usr)" + + # Oracle support + my_conf+=" + $(use_with oci8-instant-client oci8)" + + # PDO support + if use pdo ; then + my_conf+=" + $(use_with mssql pdo-dblib ) + $(use_with mysql pdo-mysql ${mysqllib}) + $(use_with postgres pdo-pgsql ) + $(use_with sqlite pdo-sqlite ${EPREFIX}/usr) + $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr) + $(use_with oci8-instant-client pdo-oci)" + fi + + # readline/libedit support + my_conf+=" + $(use_with readline readline ${EPREFIX}/usr) + $(use_with libedit libedit ${EPREFIX}/usr)" + + # Session support + if use session ; then + my_conf+=" + $(use_with sharedmem mm ${EPREFIX}/usr)" + else + my_conf+=" + $(use_enable session session )" + fi + + # Use pic for shared modules such as apache2's mod_php + my_conf+=" --with-pic" + + # we use the system copy of pcre + # --with-pcre-regex affects ext/pcre + # --with-pcre-dir affects ext/filter and ext/zip + my_conf+=" --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Support user-passed configuration parameters + my_conf+=" ${EXTRA_ECONF:-}" + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + mkdir -p "${WORKDIR}/sapis-build" + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" + cd "${WORKDIR}/sapis-build/${one_sapi}" + + sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} + --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --enable-${sapi}" + else + sapi_conf="${sapi_conf} --disable-${sapi}" + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs" + else + sapi_conf="${sapi_conf} --without-apxs2" + fi + ;; + esac + done + + econf ${sapi_conf} + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + for sapi in ${SAPIS} ; do + if use "${sapi}"; then + cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1" + emake || die "emake failed" + fi + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index + + # grab the first SAPI that got built and install common files from there + local first_sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs \ + || die "emake install failed" + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir /usr/share/php${PHP_MV} + + local sapi="", file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp${PHP_MV}$(get_libname)" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" || die "Unable to install ${sapi} sapi" + else + dobin "${source}" || die "Unable to install ${sapi} sapi" + local name="$(basename ${source})" + dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use_if_iuse opcache ; then + dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" \ + "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + sed -e "s|php5|php${SLOT}|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" + fi + + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can choose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" + elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" + + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please see the wiki:" + elog "https://wiki.gentoo.org/wiki/PHP" + elog +} + +pkg_prerm() { + eselect php cleanup +} diff --git a/dev-lang/php/php-7.0.0_rc5.ebuild b/dev-lang/php/php-7.0.0_rc5.ebuild index c81046fe2af2..3b7ea171dbbc 100644 --- a/dev-lang/php/php-7.0.0_rc5.ebuild +++ b/dev-lang/php/php-7.0.0_rc5.ebuild @@ -99,7 +99,7 @@ DEPEND=" firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) + gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) @@ -111,9 +111,9 @@ DEPEND=" nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql ) + postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) + readline? ( sys-libs/readline:0 ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) @@ -121,7 +121,7 @@ DEPEND=" soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) + ssl? ( dev-libs/openssl:0 ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* @@ -384,7 +384,7 @@ src_configure() { # DBA support if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ || use qdbm ; then - my_conf="${my_conf} --enable-dba${shared}" + my_conf+=" --enable-dba${shared}" fi # DBA drivers support @@ -416,11 +416,8 @@ src_configure() { fi # Interbase/firebird support - - if use firebird ; then - my_conf+=" - $(use_with firebird interbase ${EPREFIX}/usr)" - fi + my_conf+=" + $(use_with firebird interbase ${EPREFIX}/usr)" # LDAP support if use ldap ; then @@ -443,21 +440,13 @@ src_configure() { fi # ODBC support - if use odbc ; then - my_conf+=" - $(use_with odbc unixODBC ${EPREFIX}/usr)" - fi - - if use iodbc ; then - my_conf+=" - $(use_with iodbc iodbc ${EPREFIX}/usr)" - fi + my_conf+=" + $(use_with odbc unixODBC ${EPREFIX}/usr) + $(use_with iodbc iodbc ${EPREFIX}/usr)" # Oracle support - if use oci8-instant-client ; then - my_conf+=" - $(use_with oci8-instant-client oci8)" - fi + my_conf+=" + $(use_with oci8-instant-client oci8)" # PDO support if use pdo ; then @@ -465,11 +454,8 @@ src_configure() { $(use_with mysql pdo-mysql ${mysqllib}) $(use_with postgres pdo-pgsql ) $(use_with sqlite pdo-sqlite ${EPREFIX}/usr) - $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" - if use oci8-instant-client ; then - my_conf+=" - $(use_with oci8-instant-client pdo-oci)" - fi + $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr) + $(use_with oci8-instant-client pdo-oci)" fi # readline/libedit support @@ -487,12 +473,12 @@ src_configure() { fi # Use pic for shared modules such as apache2's mod_php - my_conf="${my_conf} --with-pic" + my_conf+=" --with-pic" # we use the system copy of pcre # --with-pcre-regex affects ext/pcre # --with-pcre-dir affects ext/filter and ext/zip - my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" + my_conf+=" --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" # Catch CFLAGS problems # Fixes bug #14067. @@ -500,7 +486,7 @@ src_configure() { replace-cpu-flags "k6*" "i586" # Support user-passed configuration parameters - my_conf="${my_conf} ${EXTRA_ECONF:-}" + my_conf+=" ${EXTRA_ECONF:-}" # Support the Apache2 extras, they must be set globally for all # SAPIs to work correctly, especially for external PHP extensions @@ -745,13 +731,13 @@ pkg_postinst() { fi elog elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "You can choose which version of php.ini to install by default by setting PHP_INI_VERSION to either" elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog "For more details on how minor version slotting works (PHP_TARGETS) please see the wiki:" + elog "https://wiki.gentoo.org/wiki/PHP" elog } diff --git a/dev-lang/php/php-7.0.0_rc6.ebuild b/dev-lang/php/php-7.0.0_rc6.ebuild new file mode 100644 index 000000000000..933cebed567d --- /dev/null +++ b/dev-lang/php/php-7.0.0_rc6.ebuild @@ -0,0 +1,753 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +function php_get_uri () +{ + case "${1}" in + "php-pre") + echo "http://downloads.php.net/ab/${2}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "olemarkus") + echo "https://dev.gentoo.org/~olemarkus/php/${2}" + ;; + "gentoo") + echo "mirror://gentoo/${2}" + ;; + *) + die "unhandled case in php_get_uri" + ;; + esac +} + +PHP_MV="$(get_major_version)" +SLOT="$(get_version_component_range 1-2)" + +# alias, so we can handle different types of releases (finals, rcs, alphas, +# betas, ...) w/o changing the whole ebuild +PHP_PV="${PV/_rc/RC}" +PHP_PV="${PHP_PV/_alpha/alpha}" +PHP_PV="${PHP_PV/_beta/beta}" +PHP_RELEASE="php" +[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre" +PHP_P="${PN}-${PHP_PV}" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +PHP_FPM_CONF_VER="1" + +SRC_URI="${PHP_SRC_URI}" + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs" +HOMEPAGE="http://php.net/" +LICENSE="PHP-3" + +S="${WORKDIR}/${PHP_P}" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl debug + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mysql mysqli nls + oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + readline recode selinux +session sharedmem + +simplexml snmp soap sockets spell sqlite ssl + sysvipc systemd tidy +tokenizer truetype unicode vpx wddx + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" + +DEPEND=" + >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] + >=dev-libs/libpcre-8.32[unicode] + apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] + <www-servers/apache-2.4[threads=] ) )" + +# This wacky berkdb dependency really means "any 4.x or 5.x version of +# sys-libs/db". The ./configure flag is called --with-db4, but this is a +# misnomer since db5 also works (bug #521222). We really want to say +# "any 4.x or 5.x slot", but that's not possible. The safest thing to +# do is list all 4.x and 5.x slots in order of preference. +DEPEND="${DEPEND} + berkdb? ( || ( sys-libs/db:5.3 + sys-libs/db:5.1 + sys-libs/db:4.8 + sys-libs/db:4.7 + sys-libs/db:4.6 + sys-libs/db:4.5 + sys-libs/db:4.4 + sys-libs/db:4.3 + sys-libs/db:4.2 ) ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg:0 + media-libs/libpng:0= + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg:0 + media-libs/libpng:0= + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( dev-libs/gmp:0 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu:= ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient-basic ) + odbc? ( >=dev-db/unixODBC-1.8.13 ) + postgres? ( dev-db/postgresql:* ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline:0 ) + recode? ( app-text/recode ) + sharedmem? ( dev-libs/mm ) + simplexml? ( >=dev-libs/libxml2-2.6.8 ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + soap? ( >=dev-libs/libxml2-2.6.8 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( dev-libs/openssl:0 ) + tidy? ( app-text/htmltidy ) + truetype? ( + =media-libs/freetype-2* + !gd? ( + virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + vpx? ( media-libs/libvpx ) + wddx? ( >=dev-libs/libxml2-2.6.8 ) + xml? ( >=dev-libs/libxml2-2.6.8 ) + xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) + xmlreader? ( >=dev-libs/libxml2-2.6.8 ) + xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) + xpm? ( + x11-libs/libXpm + virtual/jpeg:0 + media-libs/libpng:0= sys-libs/zlib + ) + xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) + zip? ( sys-libs/zlib ) + zlib? ( sys-libs/zlib ) + virtual/mta +" + +php="=${CATEGORY}/${PF}" + +REQUIRED_USE=" + truetype? ( gd ) + vpx? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + mhash? ( hash ) + phar? ( hash ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysqli ) + sharedmem? ( !threads ) + + mysql? ( || ( mysqli pdo ) ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" + +RDEPEND="${DEPEND}" + +RDEPEND="${RDEPEND} + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +DEPEND="${DEPEND} + sys-devel/flex + >=sys-devel/m4-1.4.3 + >=sys-devel/libtool-1.5.18" + +# Allow users to install production version if they want to + +case "${PHP_INI_VERSION}" in + production|development) + ;; + *) + PHP_INI_VERSION="development" + ;; +esac + +PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" +PHP_INI_FILE="php.ini" + +want_apache + +pkg_setup() { + depend.apache_pkg_setup +} + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" + cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" + + dodir "${PHP_INI_DIR#${EPREFIX}}" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" "${PHP_INI_FILE}" + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + if use_if_iuse opcache; then + elog "Adding opcache to $PHP_EXT_INI_DIR" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini + dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" + fi + + # SAPI-specific handling + + if [[ "${sapi}" == "fpm" ]] ; then + [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 + einfo "Installing FPM CGI config file php-fpm.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf + + # Remove bogus /etc/php-fpm.conf.default (bug 359906) + [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default" + fi + + # Install PHP ini files into /usr/share/php + + dodoc php.ini-development + dodoc php.ini-production + +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + # Change PHP branding + # Get the alpha/beta/rc version + sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ + -i configure.in || die "Unable to change PHP branding" + + # Patch PHP to show Gentoo as the server platform + sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ + -i configure.in || die "Failed to fix server platform name" + + # Patch PHP to support heimdal instead of mit-krb5 + if has_version "app-crypt/heimdal" ; then + sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ + || die "Failed to fix heimdal libname" + sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ + || die "Failed to fix heimdal crypt library reference" + fi + + #Add user patches #357637 + epatch_user + + #force rebuilding aclocal.m4 + rm aclocal.m4 + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # http://bugs.php.net/bug.php?id=48795, bug #343481 + sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die + fi +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # This is a global variable and should be in caps. It isn't because the + # phpconfutils eclass relies on exactly this name... + # for --with-libdir see bug #327025 + my_conf=" + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}"/man + --infodir="${PHP_DESTDIR}"/info + --libdir="${PHP_DESTDIR}"/lib + --with-libdir=$(get_libdir) + --without-pear + $(use_enable threads maintainer-zts)" + + # extension USE flag shared + my_conf+=" + $(use_enable bcmath bcmath ) + $(use_with bzip2 bz2 "${EPREFIX}"/usr) + $(use_enable calendar calendar ) + $(use_enable ctype ctype ) + $(use_with curl curl "${EPREFIX}"/usr) + $(use_enable xml dom ) + $(use_with enchant enchant "${EPREFIX}"/usr) + $(use_enable exif exif ) + $(use_enable fileinfo fileinfo ) + $(use_enable filter filter ) + $(use_enable ftp ftp ) + $(use_with nls gettext "${EPREFIX}"/usr) + $(use_with gmp gmp "${EPREFIX}"/usr) + $(use_enable hash hash ) + $(use_with mhash mhash "${EPREFIX}"/usr) + $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr)) + $(use_enable intl intl ) + $(use_enable ipv6 ipv6 ) + $(use_enable json json ) + $(use_with kerberos kerberos "${EPREFIX}"/usr) + $(use_enable xml libxml ) + $(use_with xml libxml-dir "${EPREFIX}"/usr) + $(use_enable unicode mbstring ) + $(use_with crypt mcrypt "${EPREFIX}"/usr) + $(use_with unicode onig "${EPREFIX}"/usr) + $(use_with ssl openssl "${EPREFIX}"/usr) + $(use_with ssl openssl-dir "${EPREFIX}"/usr) + $(use_enable pcntl pcntl ) + $(use_enable phar phar ) + $(use_enable pdo pdo ) + $(use_enable opcache opcache ) + $(use_with postgres pgsql "${EPREFIX}"/usr) + $(use_enable posix posix ) + $(use_with spell pspell "${EPREFIX}"/usr) + $(use_with recode recode "${EPREFIX}"/usr) + $(use_enable simplexml simplexml ) + $(use_enable sharedmem shmop ) + $(use_with snmp snmp "${EPREFIX}"/usr) + $(use_enable soap soap ) + $(use_enable sockets sockets ) + $(use_with sqlite sqlite3 "${EPREFIX}"/usr) + $(use_enable sysvipc sysvmsg ) + $(use_enable sysvipc sysvsem ) + $(use_enable sysvipc sysvshm ) + $(use_with systemd fpm-systemd) + $(use_with tidy tidy "${EPREFIX}"/usr) + $(use_enable tokenizer tokenizer ) + $(use_enable wddx wddx ) + $(use_enable xml xml ) + $(use_enable xmlreader xmlreader ) + $(use_enable xmlwriter xmlwriter ) + $(use_with xmlrpc xmlrpc) + $(use_with xslt xsl "${EPREFIX}"/usr) + $(use_enable zip zip ) + $(use_with zlib zlib "${EPREFIX}"/usr) + $(use_enable debug debug )" + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm ; then + my_conf+=" --enable-dba${shared}" + fi + + # DBA drivers support + my_conf+=" + $(use_with cdb cdb) + $(use_with berkdb db4 ${EPREFIX}/usr) + $(use_enable flatfile flatfile ) + $(use_with gdbm gdbm ${EPREFIX}/usr) + $(use_enable inifile inifile ) + $(use_with qdbm qdbm ${EPREFIX}/usr)" + + # Support for the GD graphics library + my_conf+=" + $(use_with truetype freetype-dir ${EPREFIX}/usr) + $(use_enable cjk gd-jis-conv ) + $(use_with gd jpeg-dir ${EPREFIX}/usr) + $(use_with gd png-dir ${EPREFIX}/usr) + $(use_with xpm xpm-dir ${EPREFIX}/usr) + $(use_with vpx vpx-dir ${EPREFIX}/usr)" + # enable gd last, so configure can pick up the previous settings + my_conf+=" + $(use_with gd gd)" + + # IMAP support + if use imap ; then + my_conf+=" + $(use_with imap imap ${EPREFIX}/usr) + $(use_with ssl imap-ssl ${EPREFIX}/usr)" + fi + + # Interbase/firebird support + my_conf+=" + $(use_with firebird interbase ${EPREFIX}/usr)" + + # LDAP support + if use ldap ; then + my_conf+=" + $(use_with ldap ldap ${EPREFIX}/usr) + $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)" + fi + + # MySQL support + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + + my_conf+=" $(use_with mysqli mysqli $mysqlilib)" + + local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" + if use mysql ; then + my_conf+="${mysqlsock}" + elif use mysqli ; then + my_conf+="${mysqlsock}" + fi + + # ODBC support + my_conf+=" + $(use_with odbc unixODBC ${EPREFIX}/usr) + $(use_with iodbc iodbc ${EPREFIX}/usr)" + + # Oracle support + my_conf+=" + $(use_with oci8-instant-client oci8)" + + # PDO support + if use pdo ; then + my_conf+=" + $(use_with mysql pdo-mysql ${mysqllib}) + $(use_with postgres pdo-pgsql ) + $(use_with sqlite pdo-sqlite ${EPREFIX}/usr) + $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr) + $(use_with oci8-instant-client pdo-oci)" + fi + + # readline/libedit support + my_conf+=" + $(use_with readline readline ${EPREFIX}/usr) + $(use_with libedit libedit ${EPREFIX}/usr)" + + # Session support + if use session ; then + my_conf+=" + $(use_with sharedmem mm ${EPREFIX}/usr)" + else + my_conf+=" + $(use_enable session session )" + fi + + # Use pic for shared modules such as apache2's mod_php + my_conf+=" --with-pic" + + # we use the system copy of pcre + # --with-pcre-regex affects ext/pcre + # --with-pcre-dir affects ext/filter and ext/zip + my_conf+=" --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Support user-passed configuration parameters + my_conf+=" ${EXTRA_ECONF:-}" + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + mkdir -p "${WORKDIR}/sapis-build" + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" + cd "${WORKDIR}/sapis-build/${one_sapi}" + + sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} + --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --enable-${sapi}" + else + sapi_conf="${sapi_conf} --disable-${sapi}" + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs" + else + sapi_conf="${sapi_conf} --without-apxs2" + fi + ;; + esac + done + + econf ${sapi_conf} + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + for sapi in ${SAPIS} ; do + if use "${sapi}"; then + cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1" + emake || die "emake failed" + fi + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index + + # grab the first SAPI that got built and install common files from there + local first_sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs \ + || die "emake install failed" + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir /usr/share/php${PHP_MV} + + local sapi="", file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp${PHP_MV}$(get_libname)" "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp${PHP_MV}$(get_libname)" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" || die "Unable to install ${sapi} sapi" + else + dobin "${source}" || die "Unable to install ${sapi} sapi" + local name="$(basename ${source})" + dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use_if_iuse opcache ; then + dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" \ + "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + sed -e "s|php5|php${SLOT}|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" + fi + + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can choose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" + elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" + + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please see the wiki:" + elog "https://wiki.gentoo.org/wiki/PHP" + elog +} + +pkg_prerm() { + eselect php cleanup +} diff --git a/dev-lang/python/python-2.7.10.ebuild b/dev-lang/python/python-2.7.10.ebuild index f1dd1b5bb0ce..1efdd258c3ea 100644 --- a/dev-lang/python/python-2.7.10.ebuild +++ b/dev-lang/python/python-2.7.10.ebuild @@ -17,7 +17,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz LICENSE="PSF-2" SLOT="2.7" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" # Do not add a dependency on dev-lang/python to this ebuild. diff --git a/dev-lang/python/python-3.4.3.ebuild b/dev-lang/python/python-3.4.3.ebuild index 69fc0be10890..e82805238b15 100644 --- a/dev-lang/python/python-3.4.3.ebuild +++ b/dev-lang/python/python-3.4.3.ebuild @@ -17,7 +17,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz LICENSE="PSF-2" SLOT="3.4" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml" # Do not add a dependency on dev-lang/python to this ebuild. diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest index 71be1c6442a8..a1b7bde1876e 100644 --- a/dev-libs/angelscript/Manifest +++ b/dev-libs/angelscript/Manifest @@ -1,3 +1 @@ -DIST angelscript_2.29.2.zip 1583192 SHA256 c5d549bcd2d04e0dbdfdeea1e1446a34bc9dc449efe0d6fb7fabfb98ee269a8b SHA512 76537a35bfa8f5f90d48a601f4cf1ff6cf8cd648c93b2ea17d3f0fbc7ccaa3d915bbe49d758916d0626a026ece8ecd1646bbb99db41d5a4c9f7c87d915c0d4ff WHIRLPOOL 1f24f56c7601b5f731a4e631f995668f268c26d57dce93944a758c5efd86ed651fd842b16419dad73eb8e7df641ccc5b4a226ccfc99fe1cc9a4c736e5d3076eb -DIST angelscript_2.30.1.zip 1859238 SHA256 a492331d3ede33f96a3b882bb09fff0f71e6e9479f9b5d78fdcf08585038d583 SHA512 7669e6b9814e3fc913e84018786d5c142b5a60c5e3d5f4d01bfc2e794cf97e1fc347cb7258d7266a3b1d1f813fc6c1a2781680fbe1c1d2275e3fa1ed2a416e52 WHIRLPOOL fff8df92f53f18789d36f3023cdaeb91bbe804dd3e4f6e3ebb54f602a35b6421d0d400850d9bc4bb079cb2e1c25578e1443ecab524ba68b22af4c1f29f0a6429 DIST angelscript_2.30.2.zip 1640151 SHA256 8c08774bc1ca683124b4996ab4459f4b2b10bdacd860e76f28fb5b504332d7d7 SHA512 a95d1d0050cc18d71ecb20655e74c196654c69b34ae3d1ade6d3a90b952b20851a6255c7285f019046e22d4c3fd1a6100c917a66a7c0d4e00636e4a2c6003bd5 WHIRLPOOL 157f724736bfea7dc31549cb76e88107108eccf046016e848a282cfe70b3bb8968e60424df192c8235eae8b663b0bc6dfea572a68b0404d7e61ea3eaa56d30e2 diff --git a/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild b/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild index 14ec9e9b085c..1b57bb869e1f 100644 --- a/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild +++ b/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://www.angelcode.com/angelscript/" SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip" LICENSE="ZLIB" -SLOT="0" +SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="doc static-libs" diff --git a/dev-libs/angelscript/metadata.xml b/dev-libs/angelscript/metadata.xml index e96e35b1a37c..e0a94082f952 100644 --- a/dev-libs/angelscript/metadata.xml +++ b/dev-libs/angelscript/metadata.xml @@ -2,7 +2,14 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>maintainer-needed@gentoo.org</email> + <email>hasufell@gentoo.org</email> + <name>Julian Ospald</name> </maintainer> + <slots> + <subslots> + Reflects ABI compatibility of libangelscript.so. + Since there is practically no compatibility, this is $PV. + </subslots> + </slots> </pkgmetadata> diff --git a/dev-libs/cxxtools/cxxtools-1.4.8.ebuild b/dev-libs/cxxtools/cxxtools-1.4.8.ebuild index d1217cf3b29e..a3fb2b390e74 100644 --- a/dev-libs/cxxtools/cxxtools-1.4.8.ebuild +++ b/dev-libs/cxxtools/cxxtools-1.4.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=2 inherit eutils DESCRIPTION="Collection of general purpose C++-classes" -HOMEPAGE="http://www.tntnet.org/cxxtools.hms" +HOMEPAGE="http://www.tntnet.org/cxxtools.html" SRC_URI="http://www.tntnet.org/download/${P}.tar.gz" LICENSE="GPL-2" diff --git a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild b/dev-libs/cxxtools/cxxtools-2.2.1.ebuild index 40de822fce7c..4e3d7ef2424c 100644 --- a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild +++ b/dev-libs/cxxtools/cxxtools-2.2.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 DESCRIPTION="Collection of general purpose C++-classes" -HOMEPAGE="http://www.tntnet.org/cxxtools.hms" +HOMEPAGE="http://www.tntnet.org/cxxtools.html" SRC_URI="http://www.tntnet.org/download/${P}.tar.gz" LICENSE="GPL-2" diff --git a/dev-libs/elfutils/elfutils-0.163.ebuild b/dev-libs/elfutils/elfutils-0.163.ebuild index 27eb91f44727..c426c9e0cf18 100644 --- a/dev-libs/elfutils/elfutils-0.163.ebuild +++ b/dev-libs/elfutils/elfutils-0.163.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2 LICENSE="GPL-2-with-exceptions" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="bzip2 lzma nls static-libs test +threads +utils zlib" # This pkg does not actually seem to compile currently in a uClibc diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest index da938fb0d891..193a955784fa 100644 --- a/dev-libs/geoip/Manifest +++ b/dev-libs/geoip/Manifest @@ -1,2 +1,3 @@ DIST geoip-1.6.5.tar.gz 156441 SHA256 4a151b35e9d9db976b82645c758662a6cb778c669b2c65635d5834e4f885942e SHA512 1ed223a51d238b6bd8d247e1dcb20f6eb9e3f19d39bd262f7cbefb587ea029ed0abac540208916f3ca06bb86f9ea1e99614484fd1c32535892029e945471e702 WHIRLPOOL ca8cd55e16c9981b443fad9f788dc8f28a64dba86980740efeffaa9c4a9d5da84df8a23fb3710ef13741bb40bec0704ca80991e25d3b11fe10acd5a360c02d77 DIST geoip-1.6.6.tar.gz 156796 SHA256 db8ed5d07292c75cb3018738e6411037f15cc2a517f38ee04c1232cbe3d30b46 SHA512 4cdd308500bcb827b3dd1c6d981299ea746251758b6a5df97bf2cf098b62b0a736394d5853a06c62437eb0808cb54efb14d0579f5212284f29016e3c8cdd9846 WHIRLPOOL 518749339b094c4166ab53d8ec38020c72f1550923e8c0084f438391dfe7965a9b2f7b3e27ef5ecac85a3f62aa14299e11fbd740ea103c320eef5fad357994b2 +DIST geoip-1.6.7.tar.gz 158276 SHA256 6f0ee5cd63660a2ab3a8f30df8e7246ee87b0eb33c719843d691c8d010cbabb5 SHA512 dde9ef65328297604892533ef5d5b568184eb4a29ff95839cb5e39b6652bcfbc53bf64fbcc3b55dad43cf0fca16f5611dbd96ba50f3001d8e212392304bce0b5 WHIRLPOOL 2d7e3b94317aa820c55c08be1808b9cc6d8cc38e87733cb1da3c9b3a5bf51212933e266ca105aabd765a08fe87f79f22eae5d8c6e3015a43fc923637273d6795 diff --git a/dev-libs/geoip/geoip-1.6.6.ebuild b/dev-libs/geoip/geoip-1.6.6.ebuild index 6e8d7aa252cb..6f9eb6010b29 100644 --- a/dev-libs/geoip/geoip-1.6.6.ebuild +++ b/dev-libs/geoip/geoip-1.6.6.ebuild @@ -14,7 +14,7 @@ SRC_URI=" # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db LICENSE="LGPL-2.1 GPL-2 MaxMind2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" IUSE="static-libs" RESTRICT="test" diff --git a/dev-libs/geoip/geoip-1.6.7.ebuild b/dev-libs/geoip/geoip-1.6.7.ebuild new file mode 100644 index 000000000000..f177d8da83fb --- /dev/null +++ b/dev-libs/geoip/geoip-1.6.7.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils + +DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist" +HOMEPAGE="https://github.com/maxmind/geoip-api-c" +SRC_URI=" + https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz +" + +# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db +LICENSE="LGPL-2.1 GPL-2 MaxMind2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +IUSE="static-libs" +RESTRICT="test" + +DEPEND="net-misc/wget" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}-api-c-${PV}" + +src_prepare() { + eautoreconf +} + +src_configure() { + econf $(use_enable static-libs static) + sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r5.sh > geoipupdate.sh || die +} + +src_install() { + default + + dodoc AUTHORS ChangeLog NEWS.md README* + + prune_libtool_files + + keepdir /usr/share/GeoIP + + dosbin geoipupdate.sh +} + +pkg_postinst() { + ewarn "WARNING: Databases are no longer installed by this ebuild." + elog "Don't forget to run 'geoipupdate.sh -f' (or geoipupdate from" + elog "net-misc/geoipupdate) to populate ${ROOT}/usr/share/GeoIP/" + elog "with geo-located IP address databases." +} diff --git a/dev-libs/gmp/gmp-5.1.3-r1.ebuild b/dev-libs/gmp/gmp-5.1.3-r1.ebuild index 23b138d08062..fdd9e56b2ae7 100644 --- a/dev-libs/gmp/gmp-5.1.3-r1.ebuild +++ b/dev-libs/gmp/gmp-5.1.3-r1.ebuild @@ -4,7 +4,7 @@ EAPI="4" -inherit flag-o-matic eutils libtool toolchain-funcs multilib-minimal +inherit eutils libtool toolchain-funcs multilib-minimal MY_PV=${PV/_p*} MY_P=${PN}-${MY_PV} diff --git a/dev-libs/gmp/gmp-6.0.0a.ebuild b/dev-libs/gmp/gmp-6.0.0a.ebuild index 74162230ef01..62f3477c389b 100644 --- a/dev-libs/gmp/gmp-6.0.0a.ebuild +++ b/dev-libs/gmp/gmp-6.0.0a.ebuild @@ -4,7 +4,7 @@ EAPI="4" -inherit flag-o-matic eutils libtool toolchain-funcs multilib-minimal +inherit eutils libtool toolchain-funcs multilib-minimal MY_PV=${PV/_p*} MY_P=${PN}-${MY_PV} diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 2374fdc0f371..f600c9f200bd 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,2 +1 @@ -DIST icu4c-54_1-src.tgz 25485678 SHA256 d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3 SHA512 d54d4cd826e1aef62a574595a04f9fec0a42c4445ed0a166a6bb5c5f3c9f692bf3273756f350233f50b2a1ad32c437dedfeeac96d6dc814d27bfd9159b7a651c WHIRLPOOL 1ae01eb26824ca591ff76ea040f703023f24975ad4177d49b1dd60f7e7f96f60884745d6c6e5e2bdf17fc8e104e97ed814f6c0ca051d1807814e324eb24e94dd DIST icu4c-55_1-src.tgz 25600847 SHA256 e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b SHA512 21a3eb2c3678cd27b659eed073f8f1bd99c9751291d077820e9a370fd90b7d9b3bf414cc03dec4acb7fa61087e02d04f9f40e91a32c5180c718e2102fbd0cd35 WHIRLPOOL 8c5221c82ee2c8a02beafd0fdf91e0038e49912cc8b05fb7437dd4d0a0204b97ea62c45c2dd9dde0f658620b772d706e795821865c567d2e1eb91f8b83a12c4a diff --git a/dev-libs/icu/files/icu-54.1-CVE-2014-9654.patch b/dev-libs/icu/files/icu-54.1-CVE-2014-9654.patch deleted file mode 100644 index db86c921bc8c..000000000000 --- a/dev-libs/icu/files/icu-54.1-CVE-2014-9654.patch +++ /dev/null @@ -1,1105 +0,0 @@ -Index: /icu/trunk/source/common/unicode/utypes.h
-===================================================================
---- /icu/trunk/source/common/unicode/utypes.h (revision 36800)
-+++ /icu/trunk/source/common/unicode/utypes.h (revision 36801)
-@@ -648,4 +648,5 @@
- U_REGEX_TIME_OUT, /**< Maximum allowed match time exceeded */
- U_REGEX_STOPPED_BY_CALLER, /**< Matching operation aborted by user callback fn. */
-+ U_REGEX_PATTERN_TOO_BIG, /**< Pattern exceeds limits on size or complexity. @draft ICU 55 */
- U_REGEX_ERROR_LIMIT, /**< This must always be the last value to indicate the limit for regexp errors */
-
-Index: /icu/trunk/source/common/utypes.c
-===================================================================
---- /icu/trunk/source/common/utypes.c (revision 36800)
-+++ /icu/trunk/source/common/utypes.c (revision 36801)
-@@ -2,5 +2,5 @@
- ******************************************************************************
- *
--* Copyright (C) 1997-2011, International Business Machines
-+* Copyright (C) 1997-2014, International Business Machines
- * Corporation and others. All Rights Reserved.
- *
-@@ -166,5 +166,6 @@
- "U_REGEX_STACK_OVERFLOW",
- "U_REGEX_TIME_OUT",
-- "U_REGEX_STOPPED_BY_CALLER"
-+ "U_REGEX_STOPPED_BY_CALLER",
-+ "U_REGEX_PATTERN_TOO_BIG"
- };
-
-Index: /icu/trunk/source/i18n/regexcmp.cpp
-===================================================================
---- /icu/trunk/source/i18n/regexcmp.cpp (revision 36800)
-+++ /icu/trunk/source/i18n/regexcmp.cpp (revision 36801)
-@@ -305,5 +305,5 @@
- // the position in the compiled pattern.
- //
-- fRXPat->fFrameSize+=RESTACKFRAME_HDRCOUNT;
-+ allocateStackData(RESTACKFRAME_HDRCOUNT);
-
- //
-@@ -371,7 +371,7 @@
- //4 NOP Resreved, will be replaced by a save if there are
- // OR | operators at the top level
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_STATE_SAVE, 2), *fStatus);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_JMP, 3), *fStatus);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_FAIL, 0), *fStatus);
-+ appendOp(URX_STATE_SAVE, 2);
-+ appendOp(URX_JMP, 3);
-+ appendOp(URX_FAIL, 0);
-
- // Standard open nonCapture paren action emits the two NOPs and
-@@ -396,5 +396,5 @@
-
- // add the END operation to the compiled pattern.
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_END, 0), *fStatus);
-+ appendOp(URX_END, 0);
-
- // Terminate the pattern compilation state machine.
-@@ -418,5 +418,5 @@
- int32_t op = (int32_t)fRXPat->fCompiledPat->elementAti(savePosition);
- U_ASSERT(URX_TYPE(op) == URX_NOP); // original contents of reserved location
-- op = URX_BUILD(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+1);
-+ op = buildOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+1);
- fRXPat->fCompiledPat->setElementAt(op, savePosition);
-
-@@ -424,6 +424,5 @@
- // the JMP will eventually be the location following the ')' for the
- // group. This will be patched in later, when the ')' is encountered.
-- op = URX_BUILD(URX_JMP, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_JMP, 0);
-
- // Push the position of the newly added JMP op onto the parentheses stack.
-@@ -434,5 +433,5 @@
- // for a SAVE in the event that there is yet another '|' following
- // this one.
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+ appendOp(URX_NOP, 0);
- fParenStack.push(fRXPat->fCompiledPat->size()-1, *fStatus);
- }
-@@ -460,10 +459,8 @@
- {
- fixLiterals();
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-- int32_t varsLoc = fRXPat->fFrameSize; // Reserve three slots in match stack frame.
-- fRXPat->fFrameSize += 3;
-- int32_t cop = URX_BUILD(URX_START_CAPTURE, varsLoc);
-- fRXPat->fCompiledPat->addElement(cop, *fStatus);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+ appendOp(URX_NOP, 0);
-+ int32_t varsLoc = allocateStackData(3); // Reserve three slots in match stack frame.
-+ appendOp(URX_START_CAPTURE, varsLoc);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -490,6 +487,6 @@
- {
- fixLiterals();
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+ appendOp(URX_NOP, 0);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -513,10 +510,8 @@
- {
- fixLiterals();
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-- int32_t varLoc = fRXPat->fDataSize; // Reserve a data location for saving the
-- fRXPat->fDataSize += 1; // state stack ptr.
-- int32_t stoOp = URX_BUILD(URX_STO_SP, varLoc);
-- fRXPat->fCompiledPat->addElement(stoOp, *fStatus);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+ appendOp(URX_NOP, 0);
-+ int32_t varLoc = allocateData(1); // Reserve a data location for saving the state stack ptr.
-+ appendOp(URX_STO_SP, varLoc);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -561,24 +556,12 @@
- {
- fixLiterals();
-- int32_t dataLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize += 2;
-- int32_t op = URX_BUILD(URX_LA_START, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+ 2);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_JMP, fRXPat->fCompiledPat->size()+ 3);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_LA_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_BACKTRACK, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_NOP, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ int32_t dataLoc = allocateData(2);
-+ appendOp(URX_LA_START, dataLoc);
-+ appendOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+ 2);
-+ appendOp(URX_JMP, fRXPat->fCompiledPat->size()+ 3);
-+ appendOp(URX_LA_END, dataLoc);
-+ appendOp(URX_BACKTRACK, 0);
-+ appendOp(URX_NOP, 0);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -605,14 +588,8 @@
- {
- fixLiterals();
-- int32_t dataLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize += 2;
-- int32_t op = URX_BUILD(URX_LA_START, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_STATE_SAVE, 0); // dest address will be patched later.
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_NOP, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ int32_t dataLoc = allocateData(2);
-+ appendOp(URX_LA_START, dataLoc);
-+ appendOp(URX_STATE_SAVE, 0); // dest address will be patched later.
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -652,21 +629,17 @@
-
- // Allocate data space
-- int32_t dataLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize += 4;
-+ int32_t dataLoc = allocateData(4);
-
- // Emit URX_LB_START
-- int32_t op = URX_BUILD(URX_LB_START, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LB_START, dataLoc);
-
- // Emit URX_LB_CONT
-- op = URX_BUILD(URX_LB_CONT, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- fRXPat->fCompiledPat->addElement(0, *fStatus); // MinMatchLength. To be filled later.
-- fRXPat->fCompiledPat->addElement(0, *fStatus); // MaxMatchLength. To be filled later.
--
-- // Emit the NOP
-- op = URX_BUILD(URX_NOP, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LB_CONT, dataLoc);
-+ appendOp(URX_RESERVED_OP, 0); // MinMatchLength. To be filled later.
-+ appendOp(URX_RESERVED_OP, 0); // MaxMatchLength. To be filled later.
-+
-+ // Emit the NOPs
-+ appendOp(URX_NOP, 0);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -708,22 +681,18 @@
-
- // Allocate data space
-- int32_t dataLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize += 4;
-+ int32_t dataLoc = allocateData(4);
-
- // Emit URX_LB_START
-- int32_t op = URX_BUILD(URX_LB_START, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LB_START, dataLoc);
-
- // Emit URX_LBN_CONT
-- op = URX_BUILD(URX_LBN_CONT, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- fRXPat->fCompiledPat->addElement(0, *fStatus); // MinMatchLength. To be filled later.
-- fRXPat->fCompiledPat->addElement(0, *fStatus); // MaxMatchLength. To be filled later.
-- fRXPat->fCompiledPat->addElement(0, *fStatus); // Continue Loc. To be filled later.
--
-- // Emit the NOP
-- op = URX_BUILD(URX_NOP, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LBN_CONT, dataLoc);
-+ appendOp(URX_RESERVED_OP, 0); // MinMatchLength. To be filled later.
-+ appendOp(URX_RESERVED_OP, 0); // MaxMatchLength. To be filled later.
-+ appendOp(URX_RESERVED_OP, 0); // Continue Loc. To be filled later.
-+
-+ // Emit the NOPs
-+ appendOp(URX_NOP, 0);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -795,10 +764,7 @@
- if (URX_TYPE(repeatedOp) == URX_SETREF) {
- // Emit optimized code for [char set]+
-- int32_t loopOpI = URX_BUILD(URX_LOOP_SR_I, URX_VAL(repeatedOp));
-- fRXPat->fCompiledPat->addElement(loopOpI, *fStatus);
-- frameLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
-- int32_t loopOpC = URX_BUILD(URX_LOOP_C, frameLoc);
-- fRXPat->fCompiledPat->addElement(loopOpC, *fStatus);
-+ appendOp(URX_LOOP_SR_I, URX_VAL(repeatedOp));
-+ frameLoc = allocateStackData(1);
-+ appendOp(URX_LOOP_C, frameLoc);
- break;
- }
-@@ -808,5 +774,5 @@
- URX_TYPE(repeatedOp) == URX_DOTANY_UNIX) {
- // Emit Optimized code for .+ operations.
-- int32_t loopOpI = URX_BUILD(URX_LOOP_DOT_I, 0);
-+ int32_t loopOpI = buildOp(URX_LOOP_DOT_I, 0);
- if (URX_TYPE(repeatedOp) == URX_DOTANY_ALL) {
- // URX_LOOP_DOT_I operand is a flag indicating ". matches any" mode.
-@@ -816,9 +782,7 @@
- loopOpI |= 2;
- }
-- fRXPat->fCompiledPat->addElement(loopOpI, *fStatus);
-- frameLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
-- int32_t loopOpC = URX_BUILD(URX_LOOP_C, frameLoc);
-- fRXPat->fCompiledPat->addElement(loopOpC, *fStatus);
-+ appendOp(loopOpI);
-+ frameLoc = allocateStackData(1);
-+ appendOp(URX_LOOP_C, frameLoc);
- break;
- }
-@@ -834,16 +798,13 @@
- // Emit the code sequence that can handle it.
- insertOp(topLoc);
-- frameLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
--
-- int32_t op = URX_BUILD(URX_STO_INP_LOC, frameLoc);
-+ frameLoc = allocateStackData(1);
-+
-+ int32_t op = buildOp(URX_STO_INP_LOC, frameLoc);
- fRXPat->fCompiledPat->setElementAt(op, topLoc);
-
-- op = URX_BUILD(URX_JMP_SAV_X, topLoc+1);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_JMP_SAV_X, topLoc+1);
- } else {
- // Simpler code when the repeated body must match something non-empty
-- int32_t jmpOp = URX_BUILD(URX_JMP_SAV, topLoc);
-- fRXPat->fCompiledPat->addElement(jmpOp, *fStatus);
-+ appendOp(URX_JMP_SAV, topLoc);
- }
- }
-@@ -857,6 +818,5 @@
- {
- int32_t topLoc = blockTopLoc(FALSE);
-- int32_t saveStateOp = URX_BUILD(URX_STATE_SAVE, topLoc);
-- fRXPat->fCompiledPat->addElement(saveStateOp, *fStatus);
-+ appendOp(URX_STATE_SAVE, topLoc);
- }
- break;
-@@ -872,5 +832,5 @@
- {
- int32_t saveStateLoc = blockTopLoc(TRUE);
-- int32_t saveStateOp = URX_BUILD(URX_STATE_SAVE, fRXPat->fCompiledPat->size());
-+ int32_t saveStateOp = buildOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size());
- fRXPat->fCompiledPat->setElementAt(saveStateOp, saveStateLoc);
- }
-@@ -891,12 +851,10 @@
- int32_t jmp2_loc = fRXPat->fCompiledPat->size();
-
-- int32_t jmp1_op = URX_BUILD(URX_JMP, jmp2_loc+1);
-+ int32_t jmp1_op = buildOp(URX_JMP, jmp2_loc+1);
- fRXPat->fCompiledPat->setElementAt(jmp1_op, jmp1_loc);
-
-- int32_t jmp2_op = URX_BUILD(URX_JMP, jmp2_loc+2);
-- fRXPat->fCompiledPat->addElement(jmp2_op, *fStatus);
--
-- int32_t save_op = URX_BUILD(URX_STATE_SAVE, jmp1_loc+1);
-- fRXPat->fCompiledPat->addElement(save_op, *fStatus);
-+ appendOp(URX_JMP, jmp2_loc+2);
-+
-+ appendOp(URX_STATE_SAVE, jmp1_loc+1);
- }
- break;
-@@ -938,10 +896,8 @@
- if (URX_TYPE(repeatedOp) == URX_SETREF) {
- // Emit optimized code for a [char set]*
-- int32_t loopOpI = URX_BUILD(URX_LOOP_SR_I, URX_VAL(repeatedOp));
-+ int32_t loopOpI = buildOp(URX_LOOP_SR_I, URX_VAL(repeatedOp));
- fRXPat->fCompiledPat->setElementAt(loopOpI, topLoc);
-- dataLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
-- int32_t loopOpC = URX_BUILD(URX_LOOP_C, dataLoc);
-- fRXPat->fCompiledPat->addElement(loopOpC, *fStatus);
-+ dataLoc = allocateStackData(1);
-+ appendOp(URX_LOOP_C, dataLoc);
- break;
- }
-@@ -951,5 +907,5 @@
- URX_TYPE(repeatedOp) == URX_DOTANY_UNIX) {
- // Emit Optimized code for .* operations.
-- int32_t loopOpI = URX_BUILD(URX_LOOP_DOT_I, 0);
-+ int32_t loopOpI = buildOp(URX_LOOP_DOT_I, 0);
- if (URX_TYPE(repeatedOp) == URX_DOTANY_ALL) {
- // URX_LOOP_DOT_I operand is a flag indicating . matches any mode.
-@@ -960,8 +916,6 @@
- }
- fRXPat->fCompiledPat->setElementAt(loopOpI, topLoc);
-- dataLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
-- int32_t loopOpC = URX_BUILD(URX_LOOP_C, dataLoc);
-- fRXPat->fCompiledPat->addElement(loopOpC, *fStatus);
-+ dataLoc = allocateStackData(1);
-+ appendOp(URX_LOOP_C, dataLoc);
- break;
- }
-@@ -972,5 +926,5 @@
-
- int32_t saveStateLoc = blockTopLoc(TRUE);
-- int32_t jmpOp = URX_BUILD(URX_JMP_SAV, saveStateLoc+1);
-+ int32_t jmpOp = buildOp(URX_JMP_SAV, saveStateLoc+1);
-
- // Check for minimum match length of zero, which requires
-@@ -978,10 +932,9 @@
- if (minMatchLength(saveStateLoc, fRXPat->fCompiledPat->size()-1) == 0) {
- insertOp(saveStateLoc);
-- dataLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
--
-- int32_t op = URX_BUILD(URX_STO_INP_LOC, dataLoc);
-+ dataLoc = allocateStackData(1);
-+
-+ int32_t op = buildOp(URX_STO_INP_LOC, dataLoc);
- fRXPat->fCompiledPat->setElementAt(op, saveStateLoc+1);
-- jmpOp = URX_BUILD(URX_JMP_SAV_X, saveStateLoc+2);
-+ jmpOp = buildOp(URX_JMP_SAV_X, saveStateLoc+2);
- }
-
-@@ -990,10 +943,10 @@
- int32_t continueLoc = fRXPat->fCompiledPat->size()+1;
-
-- // Put together the save state op store it into the compiled code.
-- int32_t saveStateOp = URX_BUILD(URX_STATE_SAVE, continueLoc);
-+ // Put together the save state op and store it into the compiled code.
-+ int32_t saveStateOp = buildOp(URX_STATE_SAVE, continueLoc);
- fRXPat->fCompiledPat->setElementAt(saveStateOp, saveStateLoc);
-
- // Append the URX_JMP_SAV or URX_JMPX operation to the compiled pattern.
-- fRXPat->fCompiledPat->addElement(jmpOp, *fStatus);
-+ appendOp(jmpOp);
- }
- break;
-@@ -1009,8 +962,7 @@
- int32_t jmpLoc = blockTopLoc(TRUE); // loc 1.
- int32_t saveLoc = fRXPat->fCompiledPat->size(); // loc 3.
-- int32_t jmpOp = URX_BUILD(URX_JMP, saveLoc);
-- int32_t stateSaveOp = URX_BUILD(URX_STATE_SAVE, jmpLoc+1);
-+ int32_t jmpOp = buildOp(URX_JMP, saveLoc);
- fRXPat->fCompiledPat->setElementAt(jmpOp, jmpLoc);
-- fRXPat->fCompiledPat->addElement(stateSaveOp, *fStatus);
-+ appendOp(URX_STATE_SAVE, jmpLoc+1);
- }
- break;
-@@ -1085,7 +1037,7 @@
- // First the STO_SP before the start of the loop
- insertOp(topLoc);
-- int32_t varLoc = fRXPat->fDataSize; // Reserve a data location for saving the
-- fRXPat->fDataSize += 1; // state stack ptr.
-- int32_t op = URX_BUILD(URX_STO_SP, varLoc);
-+
-+ int32_t varLoc = allocateData(1); // Reserve a data location for saving the
-+ int32_t op = buildOp(URX_STO_SP, varLoc);
- fRXPat->fCompiledPat->setElementAt(op, topLoc);
-
-@@ -1096,6 +1048,5 @@
-
- // Then the LD_SP after the end of the loop
-- op = URX_BUILD(URX_LD_SP, varLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LD_SP, varLoc);
- }
-
-@@ -1133,13 +1084,11 @@
- {
- fixLiterals(FALSE);
-- int32_t op;
- if (fModeFlags & UREGEX_DOTALL) {
-- op = URX_BUILD(URX_DOTANY_ALL, 0);
-+ appendOp(URX_DOTANY_ALL, 0);
- } else if (fModeFlags & UREGEX_UNIX_LINES) {
-- op = URX_BUILD(URX_DOTANY_UNIX, 0);
-+ appendOp(URX_DOTANY_UNIX, 0);
- } else {
-- op = URX_BUILD(URX_DOTANY, 0);
-- }
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_DOTANY, 0);
-+ }
- }
- break;
-@@ -1148,15 +1097,13 @@
- {
- fixLiterals(FALSE);
-- int32_t op = 0;
- if ( (fModeFlags & UREGEX_MULTILINE) == 0 && (fModeFlags & UREGEX_UNIX_LINES) == 0) {
-- op = URX_CARET;
-+ appendOp(URX_CARET, 0);
- } else if ((fModeFlags & UREGEX_MULTILINE) != 0 && (fModeFlags & UREGEX_UNIX_LINES) == 0) {
-- op = URX_CARET_M;
-+ appendOp(URX_CARET_M, 0);
- } else if ((fModeFlags & UREGEX_MULTILINE) == 0 && (fModeFlags & UREGEX_UNIX_LINES) != 0) {
-- op = URX_CARET; // Only testing true start of input.
-+ appendOp(URX_CARET, 0); // Only testing true start of input.
- } else if ((fModeFlags & UREGEX_MULTILINE) != 0 && (fModeFlags & UREGEX_UNIX_LINES) != 0) {
-- op = URX_CARET_M_UNIX;
-- }
-- fRXPat->fCompiledPat->addElement(URX_BUILD(op, 0), *fStatus);
-+ appendOp(URX_CARET_M_UNIX, 0);
-+ }
- }
- break;
-@@ -1165,15 +1112,13 @@
- {
- fixLiterals(FALSE);
-- int32_t op = 0;
- if ( (fModeFlags & UREGEX_MULTILINE) == 0 && (fModeFlags & UREGEX_UNIX_LINES) == 0) {
-- op = URX_DOLLAR;
-+ appendOp(URX_DOLLAR, 0);
- } else if ((fModeFlags & UREGEX_MULTILINE) != 0 && (fModeFlags & UREGEX_UNIX_LINES) == 0) {
-- op = URX_DOLLAR_M;
-+ appendOp(URX_DOLLAR_M, 0);
- } else if ((fModeFlags & UREGEX_MULTILINE) == 0 && (fModeFlags & UREGEX_UNIX_LINES) != 0) {
-- op = URX_DOLLAR_D;
-+ appendOp(URX_DOLLAR_D, 0);
- } else if ((fModeFlags & UREGEX_MULTILINE) != 0 && (fModeFlags & UREGEX_UNIX_LINES) != 0) {
-- op = URX_DOLLAR_MD;
-- }
-- fRXPat->fCompiledPat->addElement(URX_BUILD(op, 0), *fStatus);
-+ appendOp(URX_DOLLAR_MD, 0);
-+ }
- }
- break;
-@@ -1181,5 +1126,5 @@
- case doBackslashA:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_CARET, 0), *fStatus);
-+ appendOp(URX_CARET, 0);
- break;
-
-@@ -1193,5 +1138,5 @@
- fixLiterals(FALSE);
- int32_t op = (fModeFlags & UREGEX_UWORD)? URX_BACKSLASH_BU : URX_BACKSLASH_B;
-- fRXPat->fCompiledPat->addElement(URX_BUILD(op, 1), *fStatus);
-+ appendOp(op, 1);
- }
- break;
-@@ -1206,5 +1151,5 @@
- fixLiterals(FALSE);
- int32_t op = (fModeFlags & UREGEX_UWORD)? URX_BACKSLASH_BU : URX_BACKSLASH_B;
-- fRXPat->fCompiledPat->addElement(URX_BUILD(op, 0), *fStatus);
-+ appendOp(op, 0);
- }
- break;
-@@ -1212,44 +1157,40 @@
- case doBackslashD:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_D, 1), *fStatus);
-+ appendOp(URX_BACKSLASH_D, 1);
- break;
-
- case doBackslashd:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_D, 0), *fStatus);
-+ appendOp(URX_BACKSLASH_D, 0);
- break;
-
- case doBackslashG:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_G, 0), *fStatus);
-+ appendOp(URX_BACKSLASH_G, 0);
- break;
-
- case doBackslashS:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(
-- URX_BUILD(URX_STAT_SETREF_N, URX_ISSPACE_SET), *fStatus);
-+ appendOp(URX_STAT_SETREF_N, URX_ISSPACE_SET);
- break;
-
- case doBackslashs:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(
-- URX_BUILD(URX_STATIC_SETREF, URX_ISSPACE_SET), *fStatus);
-+ appendOp(URX_STATIC_SETREF, URX_ISSPACE_SET);
- break;
-
- case doBackslashW:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(
-- URX_BUILD(URX_STAT_SETREF_N, URX_ISWORD_SET), *fStatus);
-+ appendOp(URX_STAT_SETREF_N, URX_ISWORD_SET);
- break;
-
- case doBackslashw:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(
-- URX_BUILD(URX_STATIC_SETREF, URX_ISWORD_SET), *fStatus);
-+ appendOp(URX_STATIC_SETREF, URX_ISWORD_SET);
- break;
-
- case doBackslashX:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_X, 0), *fStatus);
-+ appendOp(URX_BACKSLASH_X, 0);
- break;
-
-@@ -1257,10 +1198,10 @@
- case doBackslashZ:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_DOLLAR, 0), *fStatus);
-+ appendOp(URX_DOLLAR, 0);
- break;
-
- case doBackslashz:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_Z, 0), *fStatus);
-+ appendOp(URX_BACKSLASH_Z, 0);
- break;
-
-@@ -1322,11 +1263,9 @@
- // and shouldn't enter this code path at all.
- fixLiterals(FALSE);
-- int32_t op;
- if (fModeFlags & UREGEX_CASE_INSENSITIVE) {
-- op = URX_BUILD(URX_BACKREF_I, groupNum);
-+ appendOp(URX_BACKREF_I, groupNum);
- } else {
-- op = URX_BUILD(URX_BACKREF, groupNum);
-- }
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_BACKREF, groupNum);
-+ }
- }
- break;
-@@ -1349,20 +1288,16 @@
- // Emit the STO_SP
- int32_t topLoc = blockTopLoc(TRUE);
-- int32_t stoLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize++; // Reserve the data location for storing save stack ptr.
-- int32_t op = URX_BUILD(URX_STO_SP, stoLoc);
-+ int32_t stoLoc = allocateData(1); // Reserve the data location for storing save stack ptr.
-+ int32_t op = buildOp(URX_STO_SP, stoLoc);
- fRXPat->fCompiledPat->setElementAt(op, topLoc);
-
- // Emit the STATE_SAVE
-- op = URX_BUILD(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+2);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+2);
-
- // Emit the JMP
-- op = URX_BUILD(URX_JMP, topLoc+1);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_JMP, topLoc+1);
-
- // Emit the LD_SP
-- op = URX_BUILD(URX_LD_SP, stoLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LD_SP, stoLoc);
- }
- break;
-@@ -1384,21 +1319,18 @@
-
- // emit STO_SP loc
-- int32_t stoLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize++; // Reserve the data location for storing save stack ptr.
-- int32_t op = URX_BUILD(URX_STO_SP, stoLoc);
-+ int32_t stoLoc = allocateData(1); // Reserve the data location for storing save stack ptr.
-+ int32_t op = buildOp(URX_STO_SP, stoLoc);
- fRXPat->fCompiledPat->setElementAt(op, topLoc);
-
- // Emit the SAVE_STATE 5
- int32_t L7 = fRXPat->fCompiledPat->size()+1;
-- op = URX_BUILD(URX_STATE_SAVE, L7);
-+ op = buildOp(URX_STATE_SAVE, L7);
- fRXPat->fCompiledPat->setElementAt(op, topLoc+1);
-
- // Append the JMP operation.
-- op = URX_BUILD(URX_JMP, topLoc+1);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_JMP, topLoc+1);
-
- // Emit the LD_SP loc
-- op = URX_BUILD(URX_LD_SP, stoLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LD_SP, stoLoc);
- }
- break;
-@@ -1419,17 +1351,15 @@
-
- // Emit the STO_SP
-- int32_t stoLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize++; // Reserve the data location for storing save stack ptr.
-- int32_t op = URX_BUILD(URX_STO_SP, stoLoc);
-+ int32_t stoLoc = allocateData(1); // Reserve the data location for storing save stack ptr.
-+ int32_t op = buildOp(URX_STO_SP, stoLoc);
- fRXPat->fCompiledPat->setElementAt(op, topLoc);
-
- // Emit the SAVE_STATE
- int32_t continueLoc = fRXPat->fCompiledPat->size()+1;
-- op = URX_BUILD(URX_STATE_SAVE, continueLoc);
-+ op = buildOp(URX_STATE_SAVE, continueLoc);
- fRXPat->fCompiledPat->setElementAt(op, topLoc+1);
-
- // Emit the LD_SP
-- op = URX_BUILD(URX_LD_SP, stoLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LD_SP, stoLoc);
- }
- break;
-@@ -1488,6 +1418,6 @@
- {
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+ appendOp(URX_NOP, 0);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -1826,5 +1756,4 @@
- //------------------------------------------------------------------------------
- void RegexCompile::fixLiterals(UBool split) {
-- int32_t op = 0; // An op from/for the compiled pattern.
-
- // If no literal characters have been scanned but not yet had code generated
-@@ -1865,21 +1794,21 @@
- if ((fModeFlags & UREGEX_CASE_INSENSITIVE) &&
- u_hasBinaryProperty(lastCodePoint, UCHAR_CASE_SENSITIVE)) {
-- op = URX_BUILD(URX_ONECHAR_I, lastCodePoint);
-+ appendOp(URX_ONECHAR_I, lastCodePoint);
- } else {
-- op = URX_BUILD(URX_ONECHAR, lastCodePoint);
-- }
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_ONECHAR, lastCodePoint);
-+ }
- } else {
- // Two or more chars, emit a URX_STRING to match them.
-+ if (fLiteralChars.length() > 0x00ffffff || fRXPat->fLiteralText.length() > 0x00ffffff) {
-+ error(U_REGEX_PATTERN_TOO_BIG);
-+ }
- if (fModeFlags & UREGEX_CASE_INSENSITIVE) {
-- op = URX_BUILD(URX_STRING_I, fRXPat->fLiteralText.length());
-+ appendOp(URX_STRING_I, fRXPat->fLiteralText.length());
- } else {
- // TODO here: add optimization to split case sensitive strings of length two
- // into two single char ops, for efficiency.
-- op = URX_BUILD(URX_STRING, fRXPat->fLiteralText.length());
-- }
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- op = URX_BUILD(URX_STRING_LEN, fLiteralChars.length());
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_STRING, fRXPat->fLiteralText.length());
-+ }
-+ appendOp(URX_STRING_LEN, fLiteralChars.length());
-
- // Add this string into the accumulated strings of the compiled pattern.
-@@ -1891,6 +1820,56 @@
-
-
--
--
-+int32_t RegexCompile::buildOp(int32_t type, int32_t val) {
-+ if (U_FAILURE(*fStatus)) {
-+ return 0;
-+ }
-+ if (type < 0 || type > 255) {
-+ U_ASSERT(FALSE);
-+ error(U_REGEX_INTERNAL_ERROR);
-+ type = URX_RESERVED_OP;
-+ }
-+ if (val > 0x00ffffff) {
-+ U_ASSERT(FALSE);
-+ error(U_REGEX_INTERNAL_ERROR);
-+ val = 0;
-+ }
-+ if (val < 0) {
-+ if (!(type == URX_RESERVED_OP_N || type == URX_RESERVED_OP)) {
-+ U_ASSERT(FALSE);
-+ error(U_REGEX_INTERNAL_ERROR);
-+ return -1;
-+ }
-+ if (URX_TYPE(val) != 0xff) {
-+ U_ASSERT(FALSE);
-+ error(U_REGEX_INTERNAL_ERROR);
-+ return -1;
-+ }
-+ type = URX_RESERVED_OP_N;
-+ }
-+ return (type << 24) | val;
-+}
-+
-+
-+//------------------------------------------------------------------------------
-+//
-+// appendOp() Append a new instruction onto the compiled pattern
-+// Includes error checking, limiting the size of the
-+// pattern to lengths that can be represented in the
-+// 24 bit operand field of an instruction.
-+//
-+//------------------------------------------------------------------------------
-+void RegexCompile::appendOp(int32_t op) {
-+ if (U_FAILURE(*fStatus)) {
-+ return;
-+ }
-+ fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ if ((fRXPat->fCompiledPat->size() > 0x00fffff0) && U_SUCCESS(*fStatus)) {
-+ error(U_REGEX_PATTERN_TOO_BIG);
-+ }
-+}
-+
-+void RegexCompile::appendOp(int32_t type, int32_t val) {
-+ appendOp(buildOp(type, val));
-+}
-
-
-@@ -1908,5 +1887,5 @@
- U_ASSERT(where>0 && where < code->size());
-
-- int32_t nop = URX_BUILD(URX_NOP, 0);
-+ int32_t nop = buildOp(URX_NOP, 0);
- code->insertElementAt(nop, where, *fStatus);
-
-@@ -1929,5 +1908,5 @@
- // needs to be incremented to adjust for the insertion.
- opValue++;
-- op = URX_BUILD(opType, opValue);
-+ op = buildOp(opType, opValue);
- code->setElementAt(op, loc);
- }
-@@ -1953,4 +1932,56 @@
- }
-
-+
-+//------------------------------------------------------------------------------
-+//
-+// allocateData() Allocate storage in the matcher's static data area.
-+// Return the index for the newly allocated data.
-+// The storage won't actually exist until we are running a match
-+// operation, but the storage indexes are inserted into various
-+// opcodes while compiling the pattern.
-+//
-+//------------------------------------------------------------------------------
-+int32_t RegexCompile::allocateData(int32_t size) {
-+ if (U_FAILURE(*fStatus)) {
-+ return 0;
-+ }
-+ if (size <= 0 || size > 0x100 || fRXPat->fDataSize < 0) {
-+ error(U_REGEX_INTERNAL_ERROR);
-+ return 0;
-+ }
-+ int32_t dataIndex = fRXPat->fDataSize;
-+ fRXPat->fDataSize += size;
-+ if (fRXPat->fDataSize >= 0x00fffff0) {
-+ error(U_REGEX_INTERNAL_ERROR);
-+ }
-+ return dataIndex;
-+}
-+
-+
-+//------------------------------------------------------------------------------
-+//
-+// allocateStackData() Allocate space in the back-tracking stack frame.
-+// Return the index for the newly allocated data.
-+// The frame indexes are inserted into various
-+// opcodes while compiling the pattern, meaning that frame
-+// size must be restricted to the size that will fit
-+// as an operand (24 bits).
-+//
-+//------------------------------------------------------------------------------
-+int32_t RegexCompile::allocateStackData(int32_t size) {
-+ if (U_FAILURE(*fStatus)) {
-+ return 0;
-+ }
-+ if (size <= 0 || size > 0x100 || fRXPat->fFrameSize < 0) {
-+ error(U_REGEX_INTERNAL_ERROR);
-+ return 0;
-+ }
-+ int32_t dataIndex = fRXPat->fFrameSize;
-+ fRXPat->fFrameSize += size;
-+ if (fRXPat->fFrameSize >= 0x00fffff0) {
-+ error(U_REGEX_PATTERN_TOO_BIG);
-+ }
-+ return dataIndex;
-+}
-
-
-@@ -1996,5 +2027,5 @@
- }
- if (reserveLoc) {
-- int32_t nop = URX_BUILD(URX_NOP, 0);
-+ int32_t nop = buildOp(URX_NOP, 0);
- fRXPat->fCompiledPat->insertElementAt(nop, theLoc, *fStatus);
- }
-@@ -2071,6 +2102,5 @@
-
- int32_t frameVarLocation = URX_VAL(captureOp);
-- int32_t endCaptureOp = URX_BUILD(URX_END_CAPTURE, frameVarLocation);
-- fRXPat->fCompiledPat->addElement(endCaptureOp, *fStatus);
-+ appendOp(URX_END_CAPTURE, frameVarLocation);
- }
- break;
-@@ -2083,6 +2113,5 @@
- U_ASSERT(URX_TYPE(stoOp) == URX_STO_SP);
- int32_t stoLoc = URX_VAL(stoOp);
-- int32_t ldOp = URX_BUILD(URX_LD_SP, stoLoc);
-- fRXPat->fCompiledPat->addElement(ldOp, *fStatus);
-+ appendOp(URX_LD_SP, stoLoc);
- }
- break;
-@@ -2093,6 +2122,5 @@
- U_ASSERT(URX_TYPE(startOp) == URX_LA_START);
- int32_t dataLoc = URX_VAL(startOp);
-- int32_t op = URX_BUILD(URX_LA_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LA_END, dataLoc);
- }
- break;
-@@ -2104,10 +2132,7 @@
- U_ASSERT(URX_TYPE(startOp) == URX_LA_START);
- int32_t dataLoc = URX_VAL(startOp);
-- int32_t op = URX_BUILD(URX_LA_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- op = URX_BUILD(URX_BACKTRACK, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- op = URX_BUILD(URX_LA_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LA_END, dataLoc);
-+ appendOp(URX_BACKTRACK, 0);
-+ appendOp(URX_LA_END, dataLoc);
-
- // Patch the URX_SAVE near the top of the block.
-@@ -2116,5 +2141,5 @@
- U_ASSERT(URX_TYPE(saveOp) == URX_STATE_SAVE);
- int32_t dest = fRXPat->fCompiledPat->size()-1;
-- saveOp = URX_BUILD(URX_STATE_SAVE, dest);
-+ saveOp = buildOp(URX_STATE_SAVE, dest);
- fRXPat->fCompiledPat->setElementAt(saveOp, fMatchOpenParen);
- }
-@@ -2129,8 +2154,6 @@
- U_ASSERT(URX_TYPE(startOp) == URX_LB_START);
- int32_t dataLoc = URX_VAL(startOp);
-- int32_t op = URX_BUILD(URX_LB_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- op = URX_BUILD(URX_LA_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LB_END, dataLoc);
-+ appendOp(URX_LA_END, dataLoc);
-
- // Determine the min and max bounds for the length of the
-@@ -2168,6 +2191,5 @@
- U_ASSERT(URX_TYPE(startOp) == URX_LB_START);
- int32_t dataLoc = URX_VAL(startOp);
-- int32_t op = URX_BUILD(URX_LBN_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LBN_END, dataLoc);
-
- // Determine the min and max bounds for the length of the
-@@ -2194,5 +2216,5 @@
- // Insert the pattern location to continue at after a successful match
- // as the last operand of the URX_LBN_CONT
-- op = URX_BUILD(URX_RELOC_OPRND, fRXPat->fCompiledPat->size());
-+ int32_t op = buildOp(URX_RELOC_OPRND, fRXPat->fCompiledPat->size());
- fRXPat->fCompiledPat->setElementAt(op, fMatchOpenParen-1);
- }
-@@ -2235,5 +2257,5 @@
- {
- // Set of no elements. Always fails to match.
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKTRACK, 0), *fStatus);
-+ appendOp(URX_BACKTRACK, 0);
- delete theSet;
- }
-@@ -2256,6 +2278,5 @@
- int32_t setNumber = fRXPat->fSets->size();
- fRXPat->fSets->addElement(theSet, *fStatus);
-- int32_t setOp = URX_BUILD(URX_SETREF, setNumber);
-- fRXPat->fCompiledPat->addElement(setOp, *fStatus);
-+ appendOp(URX_SETREF, setNumber);
- }
- }
-@@ -2296,11 +2317,8 @@
- // +1 --> Input index (for breaking non-progressing loops)
- // (Only present if unbounded upper limit on loop)
-- int32_t counterLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
-- if (fIntervalUpper < 0) {
-- fRXPat->fFrameSize++;
-- }
--
-- int32_t op = URX_BUILD(InitOp, counterLoc);
-+ int32_t dataSize = fIntervalUpper < 0 ? 2 : 1;
-+ int32_t counterLoc = allocateStackData(dataSize);
-+
-+ int32_t op = buildOp(InitOp, counterLoc);
- fRXPat->fCompiledPat->setElementAt(op, topOfBlock);
-
-@@ -2310,5 +2328,5 @@
- // position to move.
- int32_t loopEnd = fRXPat->fCompiledPat->size();
-- op = URX_BUILD(URX_RELOC_OPRND, loopEnd);
-+ op = buildOp(URX_RELOC_OPRND, loopEnd);
- fRXPat->fCompiledPat->setElementAt(op, topOfBlock+1);
-
-@@ -2319,6 +2337,5 @@
- // Apend the CTR_LOOP op. The operand is the location of the CTR_INIT op.
- // Goes at end of the block being looped over, so just append to the code so far.
-- op = URX_BUILD(LoopOp, topOfBlock);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(LoopOp, topOfBlock);
-
- if ((fIntervalLow & 0xff000000) != 0 ||
-@@ -2373,5 +2390,5 @@
- int32_t endOfSequenceLoc = fRXPat->fCompiledPat->size()-1
- + fIntervalUpper + (fIntervalUpper-fIntervalLow);
-- int32_t saveOp = URX_BUILD(URX_STATE_SAVE, endOfSequenceLoc);
-+ int32_t saveOp = buildOp(URX_STATE_SAVE, endOfSequenceLoc);
- if (fIntervalLow == 0) {
- insertOp(topOfBlock);
-@@ -2386,11 +2403,8 @@
- int32_t i;
- for (i=1; i<fIntervalUpper; i++ ) {
-- if (i == fIntervalLow) {
-- fRXPat->fCompiledPat->addElement(saveOp, *fStatus);
-- }
-- if (i > fIntervalLow) {
-- fRXPat->fCompiledPat->addElement(saveOp, *fStatus);
-- }
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ if (i >= fIntervalLow) {
-+ appendOp(saveOp);
-+ }
-+ appendOp(op);
- }
- return TRUE;
-@@ -3612,5 +3626,5 @@
- U_ASSERT(operandAddress>=0 && operandAddress<deltas.size());
- int32_t fixedOperandAddress = operandAddress - deltas.elementAti(operandAddress);
-- op = URX_BUILD(opType, fixedOperandAddress);
-+ op = buildOp(opType, fixedOperandAddress);
- fRXPat->fCompiledPat->setElementAt(op, dst);
- dst++;
-@@ -3627,5 +3641,5 @@
- }
- where = fRXPat->fGroupMap->elementAti(where-1);
-- op = URX_BUILD(opType, where);
-+ op = buildOp(opType, where);
- fRXPat->fCompiledPat->setElementAt(op, dst);
- dst++;
-@@ -3979,5 +3993,5 @@
- //
- // scanNamedChar
-- // Get a UChar32 from a \N{UNICODE CHARACTER NAME} in the pattern.
-+// Get a UChar32 from a \N{UNICODE CHARACTER NAME} in the pattern.
- //
- // The scan position will be at the 'N'. On return
-Index: /icu/trunk/source/i18n/regexcmp.h
-===================================================================
---- /icu/trunk/source/i18n/regexcmp.h (revision 36800)
-+++ /icu/trunk/source/i18n/regexcmp.h (revision 36801)
-@@ -105,4 +105,11 @@
- void insertOp(int32_t where); // Open up a slot for a new op in the
- // generated code at the specified location.
-+ void appendOp(int32_t op); // Append a new op to the compiled pattern.
-+ void appendOp(int32_t type, int32_t val); // Build & append a new op to the compiled pattern.
-+ int32_t buildOp(int32_t type, int32_t val); // Construct a new pcode instruction.
-+ int32_t allocateData(int32_t size); // Allocate space in the matcher data area.
-+ // Return index of the newly allocated data.
-+ int32_t allocateStackData(int32_t size); // Allocate space in the match back-track stack frame.
-+ // Return offset index in the frame.
- int32_t minMatchLength(int32_t start,
- int32_t end);
-Index: /icu/trunk/source/i18n/regeximp.h
-===================================================================
---- /icu/trunk/source/i18n/regeximp.h (revision 36800)
-+++ /icu/trunk/source/i18n/regeximp.h (revision 36801)
-@@ -1,4 +1,4 @@
- //
--// Copyright (C) 2002-2013 International Business Machines Corporation
-+// Copyright (C) 2002-2014 International Business Machines Corporation
- // and others. All rights reserved.
- //
-@@ -242,5 +242,4 @@
- // Convenience macros for assembling and disassembling a compiled operation.
- //
--#define URX_BUILD(type, val) (int32_t)((type << 24) | (val))
- #define URX_TYPE(x) ((uint32_t)(x) >> 24)
- #define URX_VAL(x) ((x) & 0xffffff)
-Index: /icu/trunk/source/test/intltest/regextst.cpp
-===================================================================
---- /icu/trunk/source/test/intltest/regextst.cpp (revision 36800)
-+++ /icu/trunk/source/test/intltest/regextst.cpp (revision 36801)
-@@ -145,4 +145,7 @@
- if (exec) TestBug11049();
- break;
-+ case 25: name = "TestBug11371";
-+ if (exec) TestBug11371();
-+ break;
- default: name = "";
- break; //needed to end loop
-@@ -5368,4 +5371,47 @@
-
-
-+void RegexTest::TestBug11371() {
-+ if (quick) {
-+ logln("Skipping test. Runs in exhuastive mode only.");
-+ return;
-+ }
-+ UErrorCode status = U_ZERO_ERROR;
-+ UnicodeString patternString;
-+
-+ for (int i=0; i<8000000; i++) {
-+ patternString.append(UnicodeString("()"));
-+ }
-+ LocalPointer<RegexPattern> compiledPat(RegexPattern::compile(patternString, 0, status));
-+ if (status != U_REGEX_PATTERN_TOO_BIG) {
-+ errln("File %s, line %d expected status=U_REGEX_PATTERN_TOO_BIG; got %s.",
-+ __FILE__, __LINE__, u_errorName(status));
-+ }
-+
-+ status = U_ZERO_ERROR;
-+ patternString = "(";
-+ for (int i=0; i<20000000; i++) {
-+ patternString.append(UnicodeString("A++"));
-+ }
-+ patternString.append(UnicodeString("){0}B++"));
-+ LocalPointer<RegexPattern> compiledPat2(RegexPattern::compile(patternString, 0, status));
-+ if (status != U_REGEX_PATTERN_TOO_BIG) {
-+ errln("File %s, line %d expected status=U_REGEX_PATTERN_TOO_BIG; got %s.",
-+ __FILE__, __LINE__, u_errorName(status));
-+ }
-+
-+ // Pattern with too much string data, such that string indexes overflow operand data field size
-+ // in compiled instruction.
-+ status = U_ZERO_ERROR;
-+ patternString = "";
-+ while (patternString.length() < 0x00ffffff) {
-+ patternString.append(UnicodeString("stuff and things dont you know, these are a few of my favorite strings\n"));
-+ }
-+ patternString.append(UnicodeString("X? trailing string"));
-+ LocalPointer<RegexPattern> compiledPat3(RegexPattern::compile(patternString, 0, status));
-+ if (status != U_REGEX_PATTERN_TOO_BIG) {
-+ errln("File %s, line %d expected status=U_REGEX_PATTERN_TOO_BIG; got %s.",
-+ __FILE__, __LINE__, u_errorName(status));
-+ }
-+}
-
- #endif /* !UCONFIG_NO_REGULAR_EXPRESSIONS */
-Index: /icu/trunk/source/test/intltest/regextst.h
-===================================================================
---- /icu/trunk/source/test/intltest/regextst.h (revision 36800)
-+++ /icu/trunk/source/test/intltest/regextst.h (revision 36801)
-@@ -51,4 +51,5 @@
- virtual void TestCaseInsensitiveStarters();
- virtual void TestBug11049();
-+ virtual void TestBug11371();
-
- // The following functions are internal to the regexp tests.
diff --git a/dev-libs/icu/icu-54.1-r1.ebuild b/dev-libs/icu/icu-54.1-r1.ebuild deleted file mode 100644 index 3cf83effa2de..000000000000 --- a/dev-libs/icu/icu-54.1-r1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal - -DESCRIPTION="International Components for Unicode" -HOMEPAGE="http://www.icu-project.org/" -SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz" - -LICENSE="BSD" - -SLOT="0/54a" - -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="debug doc examples static-libs" - -DEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - ) -" - -S="${WORKDIR}/${PN}/source" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/icu-config -) - -src_prepare() { - local variable - - epatch "${FILESDIR}/${PN}-remove-bashisms.patch" - epatch "${FILESDIR}/${P}-CVE-2014-9654.patch" - epatch_user - - # Disable renaming as it is stupind thing to do - sed -i \ - -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ - common/unicode/uconfig.h || die - - # Fix linking of icudata - sed -i \ - -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ - config/mh-linux || die - - # Append doxygen configuration to configure - sed -i \ - -e 's:icudefs.mk:icudefs.mk Doxyfile:' \ - configure.ac || die - - eautoreconf -} - -src_configure() { - # Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard. - append-cxxflags -std=gnu++98 - - if tc-is-cross-compiler; then - mkdir "${WORKDIR}"/host || die - pushd "${WORKDIR}"/host >/dev/null || die - - CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ - CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ - RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ - "${S}"/configure --disable-renaming --disable-debug \ - --disable-samples --enable-static || die - emake - - popd >/dev/null || die - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - --disable-renaming - --disable-samples - $(use_enable debug) - $(use_enable static-libs static) - ) - - multilib_is_native_abi && myeconfargs+=( - $(use_enable examples samples) - ) - tc-is-cross-compiler && myeconfargs+=( - --with-cross-build="${WORKDIR}"/host - ) - - # icu tries to use clang by default - tc-export CC CXX - - ECONF_SOURCE=${S} \ - econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc; then - doxygen -u Doxyfile || die - doxygen Doxyfile || die - fi -} - -multilib_src_test() { - # INTLTEST_OPTS: intltest options - # -e: Exhaustive testing - # -l: Reporting of memory leaks - # -v: Increased verbosity - # IOTEST_OPTS: iotest options - # -e: Exhaustive testing - # -v: Increased verbosity - # CINTLTST_OPTS: cintltst options - # -e: Exhaustive testing - # -v: Increased verbosity - emake -j1 VERBOSE="1" check -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use doc; then - dohtml -p api -r doc/html/ - fi -} - -multilib_src_install_all() { - einstalldocs - dohtml ../readme.html -} diff --git a/dev-libs/libconfig/Manifest b/dev-libs/libconfig/Manifest index dc45cf7cc4db..e753ae70afa3 100644 --- a/dev-libs/libconfig/Manifest +++ b/dev-libs/libconfig/Manifest @@ -1,2 +1 @@ -DIST libconfig-1.4.9.tar.gz 688158 SHA256 09c8979252e60193e2969e9b0e1cd597f7820087867989b2f0939ad164473041 SHA512 49a4318c1b8a5f15dc0cefaf25c481f95008e413696420d5e8cacb7a6ce7e600b84c4b7e7365373cee62e392e14556ff31d65c1e084a9b7ab2153a55cbf787a7 WHIRLPOOL 3d64dfb7cfd21c769738791236d6f6f4b01d296d060c21767f441f644b0d0bba62b5782bd7129dcc2657377200e59a345a5f197a67b5579e2193447fdefc1d25 DIST libconfig-1.5.tar.gz 644432 SHA256 e31daa390d8e4461c8830512fe2e13ba1a3d6a02a2305a02429eec61e68703f6 SHA512 16bead52ee8c880b25fd1ee6fa83c115dc51830f2f7954389bd8b72cc0e6fc05fc63fe415bd929851894a9f3a1127d51cfc4223149514246e9566305556b7bcd WHIRLPOOL ef3718b1ec4485202d1fd03db035419b6c0179e4c4eb47e74ff93b467677c4f53cf9d70d5eb7aa6230dab7a4115e5fae0fc4ed191f1bfc6d0c3c252ee5d90944 diff --git a/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch b/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch deleted file mode 100644 index fe7c2cc42bec..000000000000 --- a/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/libconfig-1.4.9/tests/Makefile.am -+++ b/libconfig-1.4.9/tests/Makefile.am -@@ -3,10 +3,10 @@ - - libconfig_tests_SOURCES = tests.c - --libconfig_tests_CPPFLAGS = -I../tinytest -I../lib -+libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I$(top_srcdir)/lib - --libconfig_tests_LDADD = -L../tinytest -ltinytest \ -- -L../lib/.libs -lconfig -+libconfig_tests_LDADD = -L$(top_builddir)/tinytest -ltinytest \ -+ -L$(top_builddir)/lib/.libs -lconfig - - - EXTRA_DIST = \ diff --git a/dev-libs/libconfig/libconfig-1.4.9-r1.ebuild b/dev-libs/libconfig/libconfig-1.4.9-r1.ebuild deleted file mode 100644 index 45b0e656906d..000000000000 --- a/dev-libs/libconfig/libconfig-1.4.9-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_AUTORECONF="1" -inherit eutils autotools-multilib - -DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files" -HOMEPAGE="http://www.hyperrealm.com/libconfig/libconfig.html" -SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc x86 ~x86-linux" -IUSE="+cxx examples static-libs" - -DEPEND=" - sys-devel/libtool - sys-devel/bison" - -PATCHES=( "${FILESDIR}/${P}-out-of-source-build.patch" ) - -src_prepare() { - sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die - autotools-multilib_src_prepare -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable cxx) - --disable-examples - ) - autotools-utils_src_configure -} - -multilib_src_test() { - # It responds to check but that does not work as intended - emake test -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files - - if use examples; then - find examples/ -name "Makefile.*" -delete || die - local dir - for dir in examples/c examples/c++; do - insinto /usr/share/doc/${PF}/${dir} - doins ${dir}/* - done - fi -} diff --git a/dev-libs/libconfig/libconfig-1.5.ebuild b/dev-libs/libconfig/libconfig-1.5.ebuild index 375104354e2a..881dc0c0b565 100644 --- a/dev-libs/libconfig/libconfig-1.5.ebuild +++ b/dev-libs/libconfig/libconfig-1.5.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 sparc x86 ~x86-linux" +KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc x86 ~x86-linux" IUSE="+cxx examples static-libs" DEPEND=" diff --git a/dev-libs/libdivecomputer/metadata.xml b/dev-libs/libdivecomputer/metadata.xml index 567d2b150e41..b740f6f22383 100644 --- a/dev-libs/libdivecomputer/metadata.xml +++ b/dev-libs/libdivecomputer/metadata.xml @@ -7,11 +7,6 @@ <name>Martin Gysel</name> <description>Proxied maintainer. Assign bugs to him.</description> </maintainer> - <maintainer> - <email>aaron@flappyport.com</email> - <name>Aaron Bauman</name> - <description>Proxied maintainer. CC him on bugs.</description> - </maintainer> <longdescription lang="en"> Library for communication with dive computers from various manufacturers. </longdescription> diff --git a/dev-libs/libebml/libebml-1.3.3.ebuild b/dev-libs/libebml/libebml-1.3.3.ebuild index 01e7fa662a75..bf90ec446a2d 100644 --- a/dev-libs/libebml/libebml-1.3.3.ebuild +++ b/dev-libs/libebml/libebml-1.3.3.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0/4" # subslot = soname major version -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug static-libs" src_prepare() { diff --git a/dev-libs/libevdev/libevdev-1.4.4.ebuild b/dev-libs/libevdev/libevdev-1.4.4.ebuild index 8873d701d997..8554fcc1e0d3 100644 --- a/dev-libs/libevdev/libevdev-1.4.4.ebuild +++ b/dev-libs/libevdev/libevdev-1.4.4.ebuild @@ -4,7 +4,7 @@ EAPI=5 XORG_MULTILIB=yes -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) inherit python-any-r1 xorg-2 diff --git a/dev-libs/libevent/libevent-2.1.5-r3.ebuild b/dev-libs/libevent/libevent-2.1.5-r3.ebuild index 95610a9f1b84..527449648865 100644 --- a/dev-libs/libevent/libevent-2.1.5-r3.ebuild +++ b/dev-libs/libevent/libevent-2.1.5-r3.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz" LICENSE="BSD" # libevent-2.1.so.5 SLOT="0/2.1-5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="debug libressl +ssl static-libs test +threads" DEPEND=" diff --git a/dev-libs/libevent/libevent-2.1.5-r4.ebuild b/dev-libs/libevent/libevent-2.1.5-r4.ebuild index 16300fc49e95..3f1ea4ae495e 100644 --- a/dev-libs/libevent/libevent-2.1.5-r4.ebuild +++ b/dev-libs/libevent/libevent-2.1.5-r4.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz" LICENSE="BSD" # libevent-2.1.so.5 SLOT="0/2.1-5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="debug libressl +ssl static-libs test +threads" DEPEND=" @@ -37,9 +37,6 @@ S=${WORKDIR}/${MY_P} src_prepare() { elibtoolize epatch "${FILESDIR}/${PN}-2.1.5-event_signals_ordering.patch" - # don't waste time building tests - # https://github.com/libevent/libevent/pull/144 - sed -i -e '/^all:/s|tests||g' Makefile.nmake || die } multilib_src_configure() { @@ -48,10 +45,12 @@ multilib_src_configure() { ECONF_SOURCE="${S}" \ econf \ + --disable-samples \ $(use_enable debug debug-mode) \ $(use_enable debug malloc-replacement) \ $(use_enable ssl openssl) \ $(use_enable static-libs static) \ + $(use_enable test libevent-regress) \ $(use_enable threads thread-support) } diff --git a/dev-libs/libevent/libevent-2.1.5.ebuild b/dev-libs/libevent/libevent-2.1.5.ebuild index 182be4feb273..b4f0ea89adff 100644 --- a/dev-libs/libevent/libevent-2.1.5.ebuild +++ b/dev-libs/libevent/libevent-2.1.5.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="debug +ssl static-libs test +threads" DEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )" diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild index 179af26b421f..c807cd329fc7 100644 --- a/dev-libs/libevent/libevent-9999.ebuild +++ b/dev-libs/libevent/libevent-9999.ebuild @@ -30,9 +30,6 @@ MULTILIB_WRAPPED_HEADERS=( src_prepare() { eautoreconf - # don't waste time building tests - # https://github.com/libevent/libevent/pull/144 - sed -i -e '/^all:/s|tests||g' Makefile.nmake || die } multilib_src_configure() { @@ -41,10 +38,12 @@ multilib_src_configure() { ECONF_SOURCE="${S}" \ econf \ + --disable-samples \ $(use_enable debug debug-mode) \ $(use_enable debug malloc-replacement) \ $(use_enable ssl openssl) \ $(use_enable static-libs static) \ + $(use_enable test libevent-regress) \ $(use_enable threads thread-support) } diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest index 056aea1989ef..2b5d34bc79fb 100644 --- a/dev-libs/libinput/Manifest +++ b/dev-libs/libinput/Manifest @@ -2,3 +2,4 @@ DIST libinput-0.7.0.tar.xz 440228 SHA256 129f485afe5e4a9394641293991c97cb99f5f33 DIST libinput-0.9.0.tar.xz 510512 SHA256 309043976f41f5451c2a4b1c25bc2993b18aecb22524d797f21eb6b6c968ff0d SHA512 a6f718215428eda45ac00c25d0b62ada84bf924822cb66e0a9b28f4cfc36e7d1678f2dfb47afae16ce4c277d589adcf97aefe8e2e5a154873b649fe4a84527a1 WHIRLPOOL 23da6dbcd7b17000cea641e0931db8a9b2ad34b0655e4e31b0419ff4799adc59d2646b10316e073ad49695ebd652c150abf05c39d15c735ecb1d97f6f8c1d8de DIST libinput-1.0.0.tar.xz 785056 SHA256 afbd2751c000a4e5833624b6177a6919ad259f0bca44093947421c885fd42c0f SHA512 b6fc7973982cb2826fc5beb514e954d7673023628739a86d18b2522b1ad0ecf55f9d6c83e6307c10c633c57d6b61227898aded6a22a2de536c0f14f27d23b903 WHIRLPOOL 13304875b753127ada76bf18ba56ea9828d6532db5eefce56439ede83eeeb43b6da6aa59f763d2c912de838221ee53fd7d02bf865e80316a24c412ea001d3043 DIST libinput-1.0.1.tar.xz 800244 SHA256 482fb35119b457ba65a8bebaa47e4f6b4dbd77e59c320014a22296847b7ff99e SHA512 17efc6ddd58aadcd30aecb4d1b8b6ad32f6f61c592f29b0a99aac7d49e5cb814038874d9e8996cd6726f15c58bf4239169564c650a3250a87a9ec6fd3110c5bb WHIRLPOOL 0bba6b4a58ca0020ebcbffe5675d75832b4ed67a350ca141d990f9db522a2eee942543f475d76c1f2b816b849074f4a50e30bcb3adc99bd4abdea1a43800a2d5 +DIST libinput-1.1.0.tar.xz 802348 SHA256 673186ea2a0d2b695afaa9758834f9217b175774d9ae222e1b43ff63c663f582 SHA512 7f014eabed120c00fcd2d8748aed44a8ca31fd30bdda8b289ca63f7d1bebb9c49f1d508707fb0c4a5c7c4a37b58548efdff0e9b7761475f18e1cf787a80520e6 WHIRLPOOL 028518c20cfc6daa442dd92d04183a6575b95b1f4792a646ce42c09a7bc75e5bb469ca88b8cad89919c0814e00aa65178cc49c9dca6e9aad4ce997a94f9ba645 diff --git a/dev-libs/libinput/libinput-1.1.0.ebuild b/dev-libs/libinput/libinput-1.1.0.ebuild new file mode 100644 index 000000000000..26877357fe85 --- /dev/null +++ b/dev-libs/libinput/libinput-1.1.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils udev + +DESCRIPTION="Library to handle input devices in Wayland" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/" +SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0/10" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="test" +# Tests require write access to udev rules directory which is a no-no for live system. +# Other tests are just about logs, exported symbols and autotest of the test library. +RESTRICT="test" + +RDEPEND=" + >=dev-libs/libevdev-0.4 + >=sys-libs/mtdev-1.1 + virtual/libudev +" +DEPEND="${RDEPEND} + virtual/pkgconfig" +# test? ( +# >=dev-libs/check-0.9.10 +# dev-util/valgrind +# sys-libs/libunwind ) + +src_configure() { + # Doc handling in kinda strange but everything + # is available in the tarball already. + sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \ + -i Makefile.am Makefile.in || die +} + +src_configure() { + # gui can be built but will not be installed + # building documentation silently fails with graphviz syntax errors + econf \ + --disable-documentation \ + --disable-event-gui \ + $(use_enable test tests) \ + --with-udev-dir="$(get_udevdir)" +} + +src_install() { + emake install DESTDIR="${D}" + dodoc -r doc/html + prune_libtool_files +} diff --git a/dev-libs/libjwc_c/Manifest b/dev-libs/libjwc_c/Manifest deleted file mode 100644 index 91e153d94c90..000000000000 --- a/dev-libs/libjwc_c/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libjwc_c-1.1.tar.gz 253637 SHA256 4e3c5406347356ac4549b2b977c8011391926470cc3556e54148070b929d9ea9 SHA512 5a095fdbf4f70d012f718d2bcd2a9689bf788801df3f3f97bead70861d08d5f6b5a9ac879e02c260974b755906d35de168646947900bcb18dad40839846d87ad WHIRLPOOL bca0bb19e2898c18f29a275c1997bf55058f5efbbc1147cb7e7a967f2eafb346c0d74975208dc6dd749ba60b256dca3c1548d9a58bd938fb19d77946a1aaa85a diff --git a/dev-libs/libjwc_c/files/612-gentoo.patch b/dev-libs/libjwc_c/files/612-gentoo.patch deleted file mode 100644 index af4a691febb9..000000000000 --- a/dev-libs/libjwc_c/files/612-gentoo.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nu libjwc_c-1.1/imglib.c libjwc_c/imglib.c ---- libjwc_c-1.1/imglib.c 1999-08-17 15:58:11.000000000 +0200 -+++ libjwc_c/imglib.c 2004-06-03 14:24:05.000000000 +0200 -@@ -4259,7 +4259,7 @@ - { - - /* Note: In this routine the first local axis is called 'x' and the -- second logal axi is called 'y' */ -+ second local axis is called 'y' */ - - int mxcent; /* Current max no. of elements in active - spots array */ -@@ -4469,6 +4469,7 @@ - - /* skipping condition */ - -+ iymid = (actspots[j].iyend+actspots[j].iybeg)/2; - itmp = abs(iymid-actspots[j].iycent); - if (abs((actspots[j].iyend+actspots[j].iybeg) -(iel+ibl))> - abs((actspots[j].iyend-actspots[j].iybeg) +(iel-ibl))&& diff --git a/dev-libs/libjwc_c/libjwc_c-1.1-r2.ebuild b/dev-libs/libjwc_c/libjwc_c-1.1-r2.ebuild deleted file mode 100644 index cc9feb0c8f9f..000000000000 --- a/dev-libs/libjwc_c/libjwc_c-1.1-r2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -AUTOTOOLS_AUTORECONF=yes - -inherit autotools-utils - -PATCH="612" - -DESCRIPTION="additional c library for ccp4" -HOMEPAGE="http://www.ccp4.ac.uk/main.html" -SRC_URI="ftp://ftp.ccp4.ac.uk/jwc/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="static-libs" - -DEPEND="sci-libs/ccp4-libs" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PATCH}-gentoo.patch ) - -src_prepare() { - rm missing || die - echo "libjwc_c_la_LIBADD = -lm -lccp4f" >> Makefile.am || die - autotools-utils_src_prepare -} diff --git a/dev-libs/libjwc_f/Manifest b/dev-libs/libjwc_f/Manifest deleted file mode 100644 index 65e6fb796fb7..000000000000 --- a/dev-libs/libjwc_f/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libjwc_f-1.1.tar.gz 170973 SHA256 9c05d5bac2a2e75d5fd490665c795ae31280da886e30f66cf39b3a32f2981199 SHA512 6d947e1513c137a23a4b6c2525e2a2f71c31a41f37455b9b3c97bd4c82128d5b3f4a7bfdd14aba57fbc258dcdcb8fa55e420a8573576992d0ae164bfe394f8d1 WHIRLPOOL 2652f3f43451cfb378d931ccff22a20131f2f44c40c2fe4c51ea45ef08f2e08306c1362f256c0c13014b9db3418ccbce437e4ccea41faae066c800a2ece02551 diff --git a/dev-libs/libjwc_f/files/612-gentoo.patch b/dev-libs/libjwc_f/files/612-gentoo.patch deleted file mode 100644 index e687d8bec6ea..000000000000 --- a/dev-libs/libjwc_f/files/612-gentoo.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -Nu libjwc_f-1.1/configure.in ccp4-6.1.2/x-windows/libjwc/libjwc_f/configure.in ---- libjwc_f-1.1/configure.in 1999-10-21 16:07:14.000000000 +0200 -+++ ccp4-6.1.2/x-windows/libjwc/libjwc_f/configure.in 2004-03-11 17:31:45.000000000 +0100 -@@ -8,6 +8,7 @@ - AC_CANONICAL_SYSTEM - - AM_INIT_AUTOMAKE(libjwc_f, 1.1) -+AM_MAINTAINER_MODE - - case ${with_g77} in - "yes" ) CC="gcc" GCC=yes F77=g77 ;; -@@ -17,7 +18,7 @@ - AC_PROG_F77 - - AC_PROG_INSTALL --AC_PROG_RANLIB -+AC_PROG_LIBTOOL - - case "$target" in - *irix6* ) -@@ -26,8 +27,9 @@ - case "$FFLAGS" in - *-64* ) ;; # assume they meant it - *-o32* | *-32* ) ;; # presumably OK -- * ) FFLAGS="$FFLAGS -o32 -O -g3" -- CFLAGS=-32 -+ *-n32* ) ;; -+ * ) FFLAGS="$FFLAGS -n32 -O -g3" -+ CFLAGS=-n32 - AC_MSG_WARN([ - - *** Using compiler flag -o32 for probable compatibility with -@@ -47,8 +49,33 @@ - *** See the INSTALL file for more info. - ]) - fi ;; -+ *linux* ) -+ case $F77 in -+ g77*) -+ case "$FFLAGS" in -+ *no-second-underscore* ) ;; # presumably OK -+ * ) FFLAGS="$FFLAGS -fno-second-underscore -fno-globals" ;; -+ esac -+ esac ;; -+ *darwin* ) -+ case $F77 in -+ g77*) -+ case "$FFLAGS" in -+ *no-second-underscore* ) ;; # presumably OK -+ * ) FFLAGS="$FFLAGS -fno-second-underscore -fno-globals" ;; -+ esac -+#mac g77 currently goes not handle -fno-common -+ enable_shared=no; -+ esac ;; - * ) - esac -+# efc, version 7.1 at least does not support soname, so use CC -+case "$F77" in -+ *efc ) F77LD=${F77LD:-'${CC}'} ;; -+ * ) F77LD=${F77LD:-'${F77}'} -+esac -+ -+AC_SUBST(F77LD) - - AM_PROG_LIBTOOL - -Common subdirectories: libjwc_f-1.1/doc and ccp4-6.1.2/x-windows/libjwc/libjwc_f/doc -diff -Nu libjwc_f-1.1/opn_scr.f ccp4-6.1.2/x-windows/libjwc/libjwc_f/opn_scr.f ---- libjwc_f-1.1/opn_scr.f 1999-09-07 12:50:13.000000000 +0200 -+++ ccp4-6.1.2/x-windows/libjwc/libjwc_f/opn_scr.f 2000-10-25 13:03:09.000000000 +0200 -@@ -16,6 +16,6 @@ - C - C====== Open the file - C -- OPEN (IUN_SCR, STATUS='SCRATCH') -- RETURN -+C OPEN (IUN_SCR, STATUS='SCRATCH') -+ CALL CCPDPN(IUN_SCR,'JWCSCR','SCRATCH','U',0, IFAIL) - END -diff -Nu libjwc_f-1.1/rpf_dstar.f ccp4-6.1.2/x-windows/libjwc/libjwc_f/rpf_dstar.f ---- libjwc_f-1.1/rpf_dstar.f 1999-07-09 13:39:38.000000000 +0200 -+++ ccp4-6.1.2/x-windows/libjwc/libjwc_f/rpf_dstar.f 2004-06-04 12:10:59.000000000 +0200 -@@ -376,7 +376,8 @@ - INR_FLAG = 2 - PHIW = 0.0 - END IF -- ELSE -+ RETURN -+ ENDIF - C - C---- Calculate distance of edge of spot from sphere at end of rotation - Crotgen.for -@@ -418,7 +419,6 @@ - INR_FLAG = 4 - 40 RETURN - END IF -- END IF - END IF - RETURN - END diff --git a/dev-libs/libjwc_f/libjwc_f-1.1-r2.ebuild b/dev-libs/libjwc_f/libjwc_f-1.1-r2.ebuild deleted file mode 100644 index 69a97bf28d98..000000000000 --- a/dev-libs/libjwc_f/libjwc_f-1.1-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -AUTOTOOLS_AUTORECONF=yes - -inherit autotools-utils fortran-2 - -PATCH="612" - -DESCRIPTION="Additional fortran library for ccp4" -HOMEPAGE="http://www.ccp4.ac.uk/main.html" -SRC_URI="ftp://ftp.ccp4.ac.uk/jwc/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="static-libs" - -RDEPEND=" - dev-libs/libjwc_c - sci-libs/ccp4-libs" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${PATCH}-gentoo.patch ) - -src_prepare() { - rm missing || die - echo "libjwc_f_la_LIBADD = -ljwc_c -lccp4f" >> Makefile.am || die - autotools-utils_src_prepare -} - -src_install() { - autotools-utils_src_install - dohtml doc/* -} diff --git a/dev-libs/libjwc_f/metadata.xml b/dev-libs/libjwc_f/metadata.xml deleted file mode 100644 index d747d72a25b4..000000000000 --- a/dev-libs/libjwc_f/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci</herd> - <maintainer> - <email>sci@gentoo.org</email> - </maintainer> -</pkgmetadata> diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest new file mode 100644 index 000000000000..8d08229f7225 --- /dev/null +++ b/dev-libs/libmaxminddb/Manifest @@ -0,0 +1 @@ +DIST libmaxminddb-1.1.1.tar.gz 649467 SHA256 60060bc081573220d4633e4cbb26f999521c0f197304bc7f5ea700fc26ef2276 SHA512 0dffb0b4b43eb70b6c4e4899c5875658fb031f7f8d859c43ffc27df89f3aebe0e0291caa721efaab3d664fb1c919c7432e1e0df3140c4877ddfa3e61a288d132 WHIRLPOOL 7942cef1be122869f34742b8bae15114e183436829de2334f2bd1b7693b3422e571b58928e64c04f82e138365d10005640f3eb94ec784aa375cdfb5ce2790484 diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.1.1.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.1.1.ebuild new file mode 100644 index 000000000000..aa9336835833 --- /dev/null +++ b/dev-libs/libmaxminddb/libmaxminddb-1.1.1.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="C library for the MaxMind DB file format" +HOMEPAGE="https://github.com/maxmind/libmaxminddb" +SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="static-libs" + +DOCS=( Changes.md ) + +src_configure() { + econf $(use_enable static-libs static) +} diff --git a/sci-chemistry/xia2/metadata.xml b/dev-libs/libmaxminddb/metadata.xml index 9ac9ffdb3a41..03aa50bab7e3 100644 --- a/sci-chemistry/xia2/metadata.xml +++ b/dev-libs/libmaxminddb/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>sci-chemistry</herd> +<herd>netmon</herd> </pkgmetadata> diff --git a/dev-libs/libressl/libressl-2.2.4.ebuild b/dev-libs/libressl/libressl-2.2.4.ebuild index e3b97b5b90c2..68141da895b7 100644 --- a/dev-libs/libressl/libressl-2.2.4.ebuild +++ b/dev-libs/libressl/libressl-2.2.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz" LICENSE="ISC openssl" SLOT="0/35" # reflects ABI of libcrypto.so and libssl.so -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86" IUSE="+asm static-libs" RDEPEND="!dev-libs/openssl:0" diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest index a28f005cbda0..b48395e8dec9 100644 --- a/dev-libs/libsodium/Manifest +++ b/dev-libs/libsodium/Manifest @@ -1,3 +1,2 @@ DIST libsodium-1.0.2.tar.gz 1673394 SHA256 961d8f10047f545ae658bcc73b8ab0bf2c312ac945968dd579d87c768e5baa19 SHA512 15fc47516f0e35906c1c304205fa991e74a273e4e6fc2186b6c16f0e41523de24493e149262b97ef03e4adc221232372ef1f283c4c23f96e4c5d99023d361e14 WHIRLPOOL 18509d9911c1d0ec6e8b9a8735abfeb2c1623669d31045abc6d9dd1289571fbe3a055f960f42a86779e7c03967532d71d7b9d0597ecfe457672e69b27b577e48 -DIST libsodium-1.0.3.tar.gz 1679664 SHA256 cbcfc63cc90c05d18a20f229a62c7e7054a73731d0aa858c0517152c549b1288 SHA512 7d58ddf973bfc456c2d196129d2c3a9ddec6e40b977797251385cd42bdd1234987779566903b7c2251cae02aab7e1c5246967af4c887be8a3451ae3f745c1ae5 WHIRLPOOL 1722d2c9f8bb18fe5d74b1ffe3600fe0a17779569315558324fd3262d63c0db5c9368d3bf9a6bb421802882dd1fd2c701ad062938a5f414190670f8c7f244231 -DIST libsodium-1.0.4.tar.gz 1787241 SHA256 e4f75d4b2bd860068e0401163207415c9d41048d7601409897ff2951839fd310 SHA512 9fe83a06a85fca2bf6ab869acf3acc7d0c5f74fce924c794f1e84a3f0ea98b3b8030ff2a1bc9b5c4675b4749edd12e2ac4c1dad3130168865bad323f6222c9c3 WHIRLPOOL 687fa836ece3bbb845de3c894576e1b6cac07157636b386765a67731ab11bb3b709fdc9730af9b4e385d33b5b6e026ac609262ffe2dbcfd2f1cbc2a5b34fb234 +DIST libsodium-1.0.5.tar.gz 1787478 SHA256 bfcafc678c7dac87866c50f9b99aa821750762edcf8e56fc6d13ba0ffbef8bab SHA512 978867f7499ec07817a95213baea79fd45d3cdd48c343723490471f79a1b0df2fa0638a91c46a08717fe03a1d8b68789445cb34be969d91023ba7edc8750835c WHIRLPOOL a46f6ca3eb98151cbc230aa1fd344b4038415f717382fa912f1750c83ed73bcc778fd634cdb7ae9c81b79c94b2d3e949a63d10adaf1ec822ba4be4e4b6fd7620 diff --git a/dev-libs/libsodium/libsodium-1.0.4.ebuild b/dev-libs/libsodium/libsodium-1.0.4.ebuild deleted file mode 100644 index a87bde865f6b..000000000000 --- a/dev-libs/libsodium/libsodium-1.0.4.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 - -inherit eutils - -DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library" -HOMEPAGE="https://github.com/jedisct1/libsodium" -SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/13" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+asm minimal static-libs +urandom" - -src_configure() { - local myconf - - # --disable-pie needed on x86, bug #512734 - use x86 && myconf="${myconf} --disable-pie" - - econf \ - $(use_enable asm) \ - $(use_enable minimal) \ - $(use_enable !urandom blocking-random) \ - $(use_enable static-libs static) \ - ${myconf} -} - -src_install() { - default - prune_libtool_files -} diff --git a/dev-libs/libsodium/libsodium-1.0.3.ebuild b/dev-libs/libsodium/libsodium-1.0.5.ebuild index a87bde865f6b..a87bde865f6b 100644 --- a/dev-libs/libsodium/libsodium-1.0.3.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.5.ebuild diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest index 9879d1bf354e..5631aadf5d63 100644 --- a/dev-libs/libuv/Manifest +++ b/dev-libs/libuv/Manifest @@ -1,7 +1,5 @@ -DIST libuv-0.11.25.tar.gz 393814 SHA256 b95a3e5eca9554998b7423ee786205e52731e82e2d24cbbd4f65af763de542fb SHA512 7e2b5befb76ee7b0c86e6a459ef276386fe60b511b64c33d01e656cbcf8ff833244c8601b7b83963bf00d64a999a5a186f14937308eed35b1496e0c829b37380 WHIRLPOOL 23d844d92100b49b598790a98cbac132c453f683fedf9c089cabf3bcafe1b9c064fab579fe5e7d95459de0046ac8f9d8b133ff79bd71efa5294e203a1c7afc6b -DIST libuv-0.11.29.tar.gz 486768 SHA256 fac45e72c2df30ddc9cbdf5002fc1363281d0e433831e3d43acb1036c2cabfc6 SHA512 91439c47b3af90a71c15ffcaf296b515c2723b2a4cd329b529b6d37a4d05d12bdf6ad6bca87079d17c9b79aab02634afddbcf53c70afcc1765dcaf49b9dd28b2 WHIRLPOOL d010c5f6e3c1a4262195b50087bc3408c6df726adbcd23abc27cf64ec1da6b159049a6d4f9d46c3cebaaa333b667cefe339d4fec6b1379a38940ee7f4376ec40 -DIST libuv-1.1.0.tar.gz 1010640 SHA256 e4ff513c18a6322898972b0b6ce986445bcd2c13710f4a46b10baf80b28599cf SHA512 2d801b8b12e6f9b179f62084d1c260b6443ae34523c12dbea8317ff34aa0a76f3df2ee38fb161aa6fd4092b6280a53c7ed599d04eb7ed0d250c1e60b4e584dea WHIRLPOOL 6d6b3eea2ddb54322d20125f1a0a61b8a00b1771ccb8bc0d7829229cabb3e363adc6f85b2d1ae2f506410a543c92404df9f545a57805ac278fab560d5a24de5e DIST libuv-1.4.2.tar.gz 1017992 SHA256 b9e424f69db0d1c3035c5f871cd9d7a3f4bace0a4db3e974bdbfa0cf95f6b741 SHA512 a2ee23d957b4b2c486c01a8ca0814cb42853d3496edcf2c39228fe9259317699954bd222abbcc4e7fda81b936ecfd64be3472230b319e8caab8e4bba0c835ced WHIRLPOOL 53727ec56b274523e445b23160a6a42d8b7fdf5b298480f0819a0cd4a19d811b59d00756eec2c9d69a34d8add96ff6103b44752df06d1346a13f2c979f52cc4a DIST libuv-1.5.0.tar.gz 1023438 SHA256 f9c6ad4b7a2c90d93c8e09d2e739bb46d199639c4d884ba30323359521b09367 SHA512 b6f6e685e66b72a0439eda35297fe5f98db598abd83deff0e9f614ef1f52ffc36717ded5e28aa2c32054c52f396ae826651c04e958f13e409a701558d777cee6 WHIRLPOOL aea128f28d336160cb2b616cd5a6dd479504be612d7b805c6bdcee529530dfb49b9bace254df9bbfceccdaed1086589defc94888b99657709c79299a13aa47e4 DIST libuv-1.6.1.tar.gz 1027771 SHA256 f558ede285878d6a69f6a6d43b5df0241f3c35d62ac989477bdbd418badd83d7 SHA512 3fe53352de312666c02ee6523bd0da3e8a8fb1704eb8c5016490ad3a2275aa1a529123e00173ea626afc284d9863cf5cb5ef4a114655c55925f46632ca5ad0d3 WHIRLPOOL 0ea59068acdc9c9a86521a5ae61148f182d14f39643b1c6df523e79faa249d5a6ab2bbb964bef6a0aff9bbf67d4119a801848421d0029a8f11d1a698213619a4 DIST libuv-1.7.0.tar.gz 1035932 SHA256 27a66f944c8cf1baf0fb53f5cfe11f01035cc80622d8ecc8e18bd1b2ae35ef5f SHA512 01ad2f7aedea5f7076a183fdb0a59f7d091cb7125466e3e243e646f4a88729790a63823d8892e7121cd3a7a293cc9e2b35a6c3e3e89960d4ddfc4bdcd44a0ede WHIRLPOOL 6f6abf004fab3a10b76f16aedd2f73c07a47505e8b850975b315a91c41fed6f5ed58072fe43e1479bf8185d56115ebae93342722fe0c938e86c82a09046b853a +DIST libuv-1.7.5.tar.gz 1041054 SHA256 11d10f12d68fa655fff18c6021e8e45bc610e7baee006f17247b1830ee316093 SHA512 fb79ba02d09460d3f269fb171ea9abe7a32d9ec765672cd7a2e3b93073df3ead2e88742730325adbb83a541c93ffe22574a7bfc92a3c1b7b43f3dfe7f8812c77 WHIRLPOOL 3421214df56d227ab88f1e16d212ef6a38507ed35db743e82f1667ce5817d1ec1b49555ddd78f96678385491e482408bdcd879219e1ccaa802ee978d710aee36 diff --git a/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch b/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch deleted file mode 100644 index 12eabc213f57..000000000000 --- a/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch +++ /dev/null @@ -1,84 +0,0 @@ -From f58b02f2cf068e1bed10bf9f632bad396d907de9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@gmail.com> -Date: Fri, 23 May 2014 09:25:23 +0200 -Subject: [PATCH] unix, windows: fix parsing scoped IPv6 addresses - ---- - src/inet.c | 37 +++++++++++++++++++++---------------- - 1 file changed, 21 insertions(+), 16 deletions(-) - -diff --git a/src/inet.c b/src/inet.c -index 0eb9438..36457f4 100644 ---- a/src/inet.c -+++ b/src/inet.c -@@ -17,6 +17,7 @@ - - #include <stdio.h> - #include <string.h> -+#include <stdlib.h> - - #if defined(_MSC_VER) && _MSC_VER < 1600 - # include "stdint-msvc2008.h" -@@ -159,11 +160,27 @@ static int inet_ntop6(const unsigned char *src, char *dst, size_t size) { - - - int uv_inet_pton(int af, const char* src, void* dst) { -+ if (src == NULL || dst == NULL) -+ return UV_EINVAL; -+ - switch (af) { - case AF_INET: - return (inet_pton4(src, dst)); -- case AF_INET6: -- return (inet_pton6(src, dst)); -+ case AF_INET6: { -+ int len; -+ char tmp[UV__INET6_ADDRSTRLEN], *s, *p; -+ s = (char*) src; -+ p = strchr(src, '%'); -+ if (p != NULL) { -+ s = tmp; -+ len = p - src; -+ if (len > UV__INET6_ADDRSTRLEN-1) -+ len = UV__INET6_ADDRSTRLEN-1; -+ memcpy(s, src, len); -+ s[len] = '\0'; -+ } -+ return inet_pton6(s, dst); -+ } - default: - return UV_EAFNOSUPPORT; - } -@@ -228,7 +245,7 @@ static int inet_pton6(const char *src, unsigned char *dst) { - curtok = src; - seen_xdigits = 0; - val = 0; -- while ((ch = *src++) != '\0' && ch != '%') { -+ while ((ch = *src++) != '\0') { - const char *pch; - - if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL) -@@ -259,19 +276,7 @@ static int inet_pton6(const char *src, unsigned char *dst) { - continue; - } - if (ch == '.' && ((tp + sizeof(struct in_addr)) <= endp)) { -- int err; -- -- /* Scope id present, parse ipv4 addr without it */ -- pch = strchr(curtok, '%'); -- if (pch != NULL) { -- char tmp[sizeof "255.255.255.255"]; -- -- memcpy(tmp, curtok, pch - curtok); -- curtok = tmp; -- src = pch; -- } -- -- err = inet_pton4(curtok, tp); -+ int err = inet_pton4(curtok, tp); - if (err == 0) { - tp += sizeof(struct in_addr); - seen_xdigits = 0; --- -1.9.3 - diff --git a/dev-libs/libuv/files/02-libuv-0.11.25-tests.patch b/dev-libs/libuv/files/02-libuv-0.11.25-tests.patch deleted file mode 100644 index d05783c439a2..000000000000 --- a/dev-libs/libuv/files/02-libuv-0.11.25-tests.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 02c2595fdc259fa15b9a927779cbe65f381f4b26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@gmail.com> -Date: Fri, 23 May 2014 16:36:57 +0200 -Subject: [PATCH] unix, windows: define UV__INET/6_ADDRSTRLEN constants - ---- - src/inet.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/inet.c b/src/inet.c -index 9220de6..0eb9438 100644 ---- a/src/inet.c -+++ b/src/inet.c -@@ -27,6 +27,9 @@ - #include "uv.h" - #include "uv-common.h" - -+#define UV__INET_ADDRSTRLEN 16 -+#define UV__INET6_ADDRSTRLEN 46 -+ - - static int inet_ntop4(const unsigned char *src, char *dst, size_t size); - static int inet_ntop6(const unsigned char *src, char *dst, size_t size); -@@ -49,7 +52,7 @@ int uv_inet_ntop(int af, const void* src, char* dst, size_t size) { - - static int inet_ntop4(const unsigned char *src, char *dst, size_t size) { - static const char fmt[] = "%u.%u.%u.%u"; -- char tmp[sizeof "255.255.255.255"]; -+ char tmp[UV__INET_ADDRSTRLEN]; - int l; - - #ifndef _WIN32 -@@ -74,7 +77,7 @@ static int inet_ntop6(const unsigned char *src, char *dst, size_t size) { - * Keep this in mind if you think this function should have been coded - * to use pointer overlays. All the world's not a VAX. - */ -- char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; -+ char tmp[UV__INET6_ADDRSTRLEN], *tp; - struct { int base, len; } best, cur; - unsigned int words[sizeof(struct in6_addr) / sizeof(uint16_t)]; - int i; --- -1.9.3 - diff --git a/dev-libs/libuv/libuv-0.11.25-r1.ebuild b/dev-libs/libuv/libuv-0.11.25-r1.ebuild deleted file mode 100644 index e9531fabad57..000000000000 --- a/dev-libs/libuv/libuv-0.11.25-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools multilib-minimal - -DESCRIPTION="A new platform layer for Node" -HOMEPAGE="https://github.com/libuv/libuv" -SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD BSD-2 ISC MIT" -SLOT="0/11" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -DEPEND="virtual/pkgconfig" - -src_prepare() { - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ - > m4/libuv-extra-automake-flags.m4 || die - - epatch "${FILESDIR}"/0{1,2}-${P}-tests.patch - - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable static-libs static) -} - -multilib_src_test() { - mkdir "${BUILD_DIR}"/test || die - cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die - default -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/dev-libs/libuv/libuv-1.1.0.ebuild b/dev-libs/libuv/libuv-1.1.0.ebuild deleted file mode 100644 index 6bbe6f6370f2..000000000000 --- a/dev-libs/libuv/libuv-1.1.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools multilib-minimal - -DESCRIPTION="A new platform layer for Node" -HOMEPAGE="https://github.com/joyent/libuv" -SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD BSD-2 ISC MIT" -SLOT="0/1" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -DEPEND="virtual/pkgconfig" - -src_prepare() { - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ - > m4/libuv-extra-automake-flags.m4 || die - - sed -i \ - -e '/libuv_la_CFLAGS/s#-g##' \ - Makefile.am || die "fixing CFLAGS failed!" - - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable static-libs static) -} - -multilib_src_test() { - mkdir "${BUILD_DIR}"/test || die - cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die - default -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/dev-libs/libuv/libuv-1.4.2.ebuild b/dev-libs/libuv/libuv-1.4.2.ebuild index c4d4c0924d57..4e45c02e6879 100644 --- a/dev-libs/libuv/libuv-1.4.2.ebuild +++ b/dev-libs/libuv/libuv-1.4.2.ebuild @@ -14,6 +14,7 @@ LICENSE="BSD BSD-2 ISC MIT" SLOT="0/1" KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs" +RESTRICT="test" DEPEND=" sys-devel/libtool diff --git a/dev-libs/libuv/libuv-1.5.0.ebuild b/dev-libs/libuv/libuv-1.5.0.ebuild index f1f71e4527eb..b96636df8526 100644 --- a/dev-libs/libuv/libuv-1.5.0.ebuild +++ b/dev-libs/libuv/libuv-1.5.0.ebuild @@ -14,6 +14,7 @@ LICENSE="BSD BSD-2 ISC MIT" SLOT="0/1" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" +RESTRICT="test" DEPEND="sys-devel/libtool virtual/pkgconfig[${MULTILIB_USEDEP}]" diff --git a/dev-libs/libuv/libuv-1.6.1.ebuild b/dev-libs/libuv/libuv-1.6.1.ebuild index 33f5eaab572e..0e9fd95f8535 100644 --- a/dev-libs/libuv/libuv-1.6.1.ebuild +++ b/dev-libs/libuv/libuv-1.6.1.ebuild @@ -14,6 +14,7 @@ LICENSE="BSD BSD-2 ISC MIT" SLOT="0/1" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" +RESTRICT="test" DEPEND="sys-devel/libtool virtual/pkgconfig[${MULTILIB_USEDEP}]" diff --git a/dev-libs/libuv/libuv-1.7.0.ebuild b/dev-libs/libuv/libuv-1.7.0.ebuild index 33f5eaab572e..0e9fd95f8535 100644 --- a/dev-libs/libuv/libuv-1.7.0.ebuild +++ b/dev-libs/libuv/libuv-1.7.0.ebuild @@ -14,6 +14,7 @@ LICENSE="BSD BSD-2 ISC MIT" SLOT="0/1" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" +RESTRICT="test" DEPEND="sys-devel/libtool virtual/pkgconfig[${MULTILIB_USEDEP}]" diff --git a/dev-libs/libuv/libuv-0.11.29.ebuild b/dev-libs/libuv/libuv-1.7.5.ebuild index 7481d39de6e5..2e3f46d63504 100644 --- a/dev-libs/libuv/libuv-0.11.29.ebuild +++ b/dev-libs/libuv/libuv-1.7.5.ebuild @@ -4,18 +4,20 @@ EAPI=5 -inherit eutils autotools multilib-minimal +inherit autotools eutils multilib-minimal -DESCRIPTION="A new platform layer for Node" +DESCRIPTION="Cross-platform asychronous I/O" HOMEPAGE="https://github.com/libuv/libuv" SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD BSD-2 ISC MIT" -SLOT="0/11" +SLOT="0/1" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" +RESTRICT="test" -DEPEND="virtual/pkgconfig" +DEPEND="sys-devel/libtool + virtual/pkgconfig[${MULTILIB_USEDEP}]" src_prepare() { echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ @@ -26,6 +28,7 @@ src_prepare() { multilib_src_configure() { ECONF_SOURCE="${S}" econf \ + cc_cv_cflags__g=no \ $(use_enable static-libs static) } diff --git a/dev-libs/libuv/metadata.xml b/dev-libs/libuv/metadata.xml index fc03810a4dcf..e1eed6d5c055 100644 --- a/dev-libs/libuv/metadata.xml +++ b/dev-libs/libuv/metadata.xml @@ -31,4 +31,7 @@ <bugs-to>https://github.com/libuv/libuv/issues</bugs-to> <remote-id type="github">libuv/libuv</remote-id> </upstream> + <slots> + <subslots>Reflect ABI compatibility of libuv.so.</subslots> + </slots> </pkgmetadata> diff --git a/dev-libs/libvterm/libvterm-0.0_pre20151022.ebuild b/dev-libs/libvterm/libvterm-0.0_pre20151022.ebuild index 7152fb4bf2b5..b89307926ccd 100644 --- a/dev-libs/libvterm/libvterm-0.0_pre20151022.ebuild +++ b/dev-libs/libvterm/libvterm-0.0_pre20151022.ebuild @@ -17,6 +17,8 @@ IUSE="" DEPEND="sys-devel/libtool virtual/pkgconfig" +RDEPEND="!dev-libs/libvterm-neovim" + src_compile() { append-cflags -fPIC emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch b/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch new file mode 100644 index 000000000000..86d5995138a1 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch @@ -0,0 +1,59 @@ +do not build test programs as we don't install them + +--- a/Makefile.am ++++ b/Makefile.am +@@ -10,7 +10,7 @@ + + AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) $(LZMA_CFLAGS) + +-noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \ ++check_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \ + testThreads testC14N testAutomata testRegexp \ + testReader testapi testModule runtest runsuite testchar \ + testdict runxmlconf testrecurse testlimits +@@ -170,7 +170,7 @@ + testModule_DEPENDENCIES = $(DEPS) + testModule_LDADD= $(LDADDS) + +-noinst_LTLIBRARIES = testdso.la ++check_LTLIBRARIES = testdso.la + testdso_la_SOURCES = testdso.c + testdso_la_LDFLAGS = -module -no-undefined -avoid-version -rpath $(libdir) + +--- a/doc/examples/Makefile.am ++++ b/doc/examples/Makefile.am +@@ -13,7 +13,7 @@ + rebuild: examples.xml index.html + .PHONY: rebuild + +-examples.xml: index.py $(noinst_PROGRAMS:=.c) ++examples.xml: index.py $(check_PROGRAMS:=.c) + cd $(srcdir) && $(PYTHON) index.py + $(MAKE) Makefile + +@@ -49,7 +49,7 @@ + xpath1.res \ + xpath2.res + +-noinst_PROGRAMS = \ ++check_PROGRAMS = \ + io1 \ + io2 \ + parse1 \ +@@ -99,7 +99,7 @@ + valgrind: + $(MAKE) CHECKER='valgrind' tests + +-tests: $(noinst_PROGRAMS) ++tests: $(check_PROGRAMS) + test -f Makefile.am || test -f test1.xml || $(LN_S) $(srcdir)/test?.xml . + @(echo '## examples regression tests') + @(echo > .memdump) +--- a/example/Makefile.am ++++ b/example/Makefile.am +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = gjobread ++check_PROGRAMS = gjobread + + AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include + AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) diff --git a/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild index a03df2448aaf..99c6b6c2e4c2 100644 --- a/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild @@ -75,6 +75,9 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch + # Disable programs that we don't actually install. + epatch "${FILESDIR}"/${PN}-2.9.2-disable-tests.patch + eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c # epunt_cxx # if we don't eautoreconf diff --git a/dev-libs/ppl/ppl-1.1.ebuild b/dev-libs/ppl/ppl-1.1.ebuild index 63a8d2297588..8793f9d6b9f1 100644 --- a/dev-libs/ppl/ppl-1.1.ebuild +++ b/dev-libs/ppl/ppl-1.1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz LICENSE="GPL-3" SLOT="0/4.13" # SONAMEs -KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris" IUSE="+cxx doc lpsol pch static-libs test" RDEPEND=">=dev-libs/gmp-6[cxx] diff --git a/dev-libs/sord/sord-0.12.2.ebuild b/dev-libs/sord/sord-0.12.2.ebuild index 132001a05b7a..64277e457f14 100644 --- a/dev-libs/sord/sord-0.12.2.ebuild +++ b/dev-libs/sord/sord-0.12.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2" LICENSE="ISC" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="doc static-libs test" RDEPEND=">=dev-libs/serd-0.14.0" diff --git a/dev-libs/wayland/wayland-1.9.0.ebuild b/dev-libs/wayland/wayland-1.9.0.ebuild index ae7ec6702a98..0ae8950bf7db 100644 --- a/dev-libs/wayland/wayland-1.9.0.ebuild +++ b/dev-libs/wayland/wayland-1.9.0.ebuild @@ -45,7 +45,7 @@ src_configure() { $(use_enable doc documentation) ) if tc-is-cross-compiler ; then - myeconfargs+=( --disable-scanner ) + myeconfargs+=( --with-host-scanner ) fi if ! multilib_is_native_abi; then myeconfargs+=( --disable-documentation ) diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild index ae7ec6702a98..0ae8950bf7db 100644 --- a/dev-libs/wayland/wayland-9999.ebuild +++ b/dev-libs/wayland/wayland-9999.ebuild @@ -45,7 +45,7 @@ src_configure() { $(use_enable doc documentation) ) if tc-is-cross-compiler ; then - myeconfargs+=( --disable-scanner ) + myeconfargs+=( --with-host-scanner ) fi if ! multilib_is_native_abi; then myeconfargs+=( --disable-documentation ) diff --git a/dev-lisp/sbcl/sbcl-1.2.16.ebuild b/dev-lisp/sbcl/sbcl-1.2.16.ebuild index 3ff88d6ebc17..ff5148f63e13 100644 --- a/dev-lisp/sbcl/sbcl-1.2.16.ebuild +++ b/dev-lisp/sbcl/sbcl-1.2.16.ebuild @@ -43,7 +43,7 @@ IUSE="debug doc source +threads +unicode pax_kernel zlib" CDEPEND=">=dev-lisp/asdf-3.1:=" DEPEND="${CDEPEND} doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/paxctl sys-apps/elfix )" + pax_kernel? ( sys-apps/elfix )" RDEPEND="${CDEPEND} !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" @@ -148,7 +148,7 @@ src_compile() { strip-unsupported-flags ; filter-flags -fomit-frame-pointer - if host-is-pax ; then + if use pax_kernel ; then # To disable PaX on hardened systems pax-mark -mr "${bindir}"/src/runtime/sbcl diff --git a/dev-lua/lua-zlib/lua-zlib-0.4-r1.ebuild b/dev-lua/lua-zlib/lua-zlib-0.4-r1.ebuild new file mode 100644 index 000000000000..3a9bc3778d1a --- /dev/null +++ b/dev-lua/lua-zlib/lua-zlib-0.4-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="Lua bindings to zlib" +HOMEPAGE="https://github.com/brimworks/lua-zlib" +SRC_URI="https://github.com/brimworks/${PN}/tarball/v${PV} -> ${P}.tgz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND="dev-lang/lua:0 + sys-libs/zlib" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_unpack() { + unpack ${A} + mv *-${PN}-* "${S}" || die +} + +src_configure() { + local mycmakeargs="-DINSTALL_CMOD='$(pkg-config --variable INSTALL_CMOD lua)'" + cmake-utils_src_configure +} diff --git a/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild b/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild index f48edb7141c0..1d6e162b5965 100644 --- a/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild +++ b/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="+ocamlopt" DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]" diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest index d393c5488520..c3a93c670a77 100644 --- a/dev-ml/findlib/Manifest +++ b/dev-ml/findlib/Manifest @@ -1,2 +1,3 @@ DIST findlib-1.4.tar.gz 231526 SHA256 6e4065e5d79d31176ec213ff94599c4eae17c3904c2896e845d0379a99f1bdf8 SHA512 7ee5bee74f6fc14c8d85496e673d42b63e056d35a724fe4f78fd1010a5af4506a9a962c0403fd96d5bf51f2278bfbe98a60aad65a171803cbde935cc3889157b WHIRLPOOL 31f1d0b9f1605a9a536ae996fb4abe5e1d5c47012759cb7bb45185d58a81e827d80285628b113f79d51b8b260cdff181c3eb05596adeea9a87070994058fce17 DIST findlib-1.5.5.tar.gz 240247 SHA256 aafaba4f7453c38347ff5269c6fd4f4c243ae2bceeeb5e10b9dab89329905946 SHA512 051817ae897a53b705ad641ae7e9010474f2320d3cc7cfd15edc9345f50566932cb44bf6f45772260706b5f9e9e91194802600c770c9c96f772985678db7209d WHIRLPOOL f1ad9b77c1f38f6d733f2a17c14649d4ca9f05215b5fa8124e71dc3e05b229c34af10415471d56964384c1fe0b0b0db453638d7e1238af916e5ff854b931cd76 +DIST findlib-1.5.6.tar.gz 250865 SHA256 7743b3dcaf8a344c882e89f61601f7f086d46c0f2ea4fcc3e54069236825e3f8 SHA512 18d23861a25b1508cb419af4cdd6e3cd83d51bef259f162c86b91460cf3dad75d6c2fc11173f60fe36b61ce3f81b78e69344f093adb9a82c36256d95180e93d8 WHIRLPOOL eb374e60c3f2fcc6172ec08803fbc5b0e83ea0d38644b4c13cb3d27b3dc13c7240a4f49a9ee51f9465ac6ff6075140c3e98b3eb0ea48690f260f139f37dfb63c diff --git a/dev-ml/findlib/files/externalmeta.patch b/dev-ml/findlib/files/externalmeta.patch index e391bf0fb1ec..6699692f231c 100644 --- a/dev-ml/findlib/files/externalmeta.patch +++ b/dev-ml/findlib/files/externalmeta.patch @@ -1,3 +1,6 @@ +Avoid installing META files for labltk and camlp4: Those are provided by their +respective packages now. + Index: findlib-1.5.5/configure =================================================================== --- findlib-1.5.5.orig/configure diff --git a/dev-ml/findlib/findlib-1.5.6.ebuild b/dev-ml/findlib/findlib-1.5.6.ebuild new file mode 100644 index 000000000000..0de266bf85d8 --- /dev/null +++ b/dev-ml/findlib/findlib-1.5.6.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit multilib eutils + +DESCRIPTION="OCaml tool to find/use non-standard packages" +HOMEPAGE="http://projects.camlcity.org/projects/findlib.html" +SRC_URI="http://download.camlcity.org/download/${P}.tar.gz" +IUSE="doc +ocamlopt tk" + +LICENSE="MIT" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" + +DEPEND=">=dev-lang/ocaml-4.02.1:=[ocamlopt?] + tk? ( dev-ml/labltk:= )" +RDEPEND="${DEPEND}" + +ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml" +stublibs="${ocamlfind_destdir}/stublibs" + +src_prepare() { + epatch "${FILESDIR}/externalmeta.patch" +} + +src_configure() { + local myconf + use tk && myconf="-with-toolbox" + ./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \ + -sitelib ${ocamlfind_destdir} \ + -config ${ocamlfind_destdir}/findlib/findlib.conf \ + -no-custom \ + ${myconf} || die "configure failed" +} + +src_compile() { + emake -j1 all + if use ocamlopt; then + emake -j1 opt # optimized code + fi +} + +src_install() { + emake prefix="${D}" install + + dodir "${stublibs#${EPREFIX}}" + + cd "${S}/doc" + dodoc QUICKSTART README DOCINFO + use doc && dohtml -r ref-html guide-html +} + +check_stublibs() { + local ocaml_stdlib=`ocamlc -where` + local ldconf="${ocaml_stdlib}/ld.conf" + + if [ ! -e ${ldconf} ] + then + echo "${ocaml_stdlib}" > ${ldconf} + echo "${ocaml_stdlib}/stublibs" >> ${ldconf} + fi + + if [ -z `grep -e ${stublibs} ${ldconf}` ] + then + echo ${stublibs} >> ${ldconf} + fi +} + +pkg_postinst() { + check_stublibs +} diff --git a/dev-ml/labltk/labltk-8.06.0.ebuild b/dev-ml/labltk/labltk-8.06.0.ebuild index a066cdab69a1..72386d87a1a8 100644 --- a/dev-ml/labltk/labltk-8.06.0.ebuild +++ b/dev-ml/labltk/labltk-8.06.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://forge.ocamlcore.org/frs/download.php/1455/${P}.tar.gz" LICENSE="QPL-1.0 LGPL-2" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="+ocamlopt X" RDEPEND=">=dev-lang/tk-8.0.3 diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest index c96de25010f3..75a863db16f3 100644 --- a/dev-ml/menhir/Manifest +++ b/dev-ml/menhir/Manifest @@ -1 +1,4 @@ DIST menhir-20151012.tar.gz 627290 SHA256 c7d4e8cf8e3b009577794c5c01f590379201c77fdc61a832e714beffe7cf22be SHA512 04c10a171fdc24078b6340484314c771b97967a91f506a882bdae741bcc2464ccf3e7f5982339f8cc836abdb0066dc7bcd58a38edbc730a89daf935979fee79c WHIRLPOOL 49b8b0ff0e094e6a5429d747d4ced5ee5515a2f77812f508bd9da872653539ff5540639f6a5a812e4999a7a815bb62b9a6534a71f476dc495a0297ef8f89d737 +DIST menhir-20151023.tar.gz 671810 SHA256 2dfb642ba08f95afbb75f71b9bbdcf6733c0e8f81d69406373f1420c5cfeca8a SHA512 0e53365400e88e39d0d595beb594d53bf5614061dc9b0149ec20c00cd3188dd1568ddcca15e1a08dddce20244bebd6263871ab83f761c68c2c62fbedb0d6c980 WHIRLPOOL 1e4b9a32959f2c9e98c92bb75436650c26430f1664d2b663fd572a369c0ce6d5225caa3ea28faa9cee18162fead6481a9777eabf99d6694b999179046b98c7a7 +DIST menhir-20151026.tar.gz 672165 SHA256 a735ebdfc3bc4ac132ea4f7c06814915576516915a80ae1c33c45a9368327355 SHA512 86fde7e955164861823dd5fac510235b0bb13f771528435495b3ff3a44bcd4837d2cd8085ba6c53e6e5eaf12f935749951cff09056cbb03a93cef062072fcf2a WHIRLPOOL 4327788dde765a4ea2c06637769626022a64352d36bee29fc615a07485efce2adeacb65267cb44f726203405ee23eea23affdde88e76109f1eb76bd3160dfcdc +DIST menhir-20151030.tar.gz 689132 SHA256 4f0a3e3afbc1488865c014dff81024775762c7bbc3ec080a07ee634fe00ba889 SHA512 f2f663a939974d73c42dd0e472bce75f3089013e29a795c54beec9c169a500f2fd038766d28230f08b556b5b64a5704f6dc4fcdfe824210d570ec6d2280cccdc WHIRLPOOL 99a7c5630645ce32a5c7368f8587d1d2812361424f176f849ec43e2fcecd3cd927fd5a715bb94b5e80ebdb5c2352d48ade6accd18059a6c1ff9696d19a4db4a4 diff --git a/dev-ml/menhir/menhir-20151023.ebuild b/dev-ml/menhir/menhir-20151023.ebuild new file mode 100644 index 000000000000..a8d4107fe611 --- /dev/null +++ b/dev-ml/menhir/menhir-20151023.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit findlib + +DESCRIPTION="LR(1) parser generator for the OCaml language" +HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/" +SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz" + +LICENSE="QPL-1.0 LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="examples +ocamlopt" + +DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]" +RDEPEND="${DEPEND}" + +src_configure() { + if ! use ocamlopt ; then + export TARGET=byte + fi +} + +src_compile() { + emake PREFIX="${EPREFIX}"/usr -j1 +} + +src_install() { + findlib_src_preinst + emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install + use examples && docompress -x /usr/share/doc/${PF}/demos + dodoc AUTHORS CHANGES +} diff --git a/dev-ml/menhir/menhir-20151026.ebuild b/dev-ml/menhir/menhir-20151026.ebuild new file mode 100644 index 000000000000..a8d4107fe611 --- /dev/null +++ b/dev-ml/menhir/menhir-20151026.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit findlib + +DESCRIPTION="LR(1) parser generator for the OCaml language" +HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/" +SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz" + +LICENSE="QPL-1.0 LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="examples +ocamlopt" + +DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]" +RDEPEND="${DEPEND}" + +src_configure() { + if ! use ocamlopt ; then + export TARGET=byte + fi +} + +src_compile() { + emake PREFIX="${EPREFIX}"/usr -j1 +} + +src_install() { + findlib_src_preinst + emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install + use examples && docompress -x /usr/share/doc/${PF}/demos + dodoc AUTHORS CHANGES +} diff --git a/dev-ml/menhir/menhir-20151030.ebuild b/dev-ml/menhir/menhir-20151030.ebuild new file mode 100644 index 000000000000..a8d4107fe611 --- /dev/null +++ b/dev-ml/menhir/menhir-20151030.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit findlib + +DESCRIPTION="LR(1) parser generator for the OCaml language" +HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/" +SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz" + +LICENSE="QPL-1.0 LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="examples +ocamlopt" + +DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]" +RDEPEND="${DEPEND}" + +src_configure() { + if ! use ocamlopt ; then + export TARGET=byte + fi +} + +src_compile() { + emake PREFIX="${EPREFIX}"/usr -j1 +} + +src_install() { + findlib_src_preinst + emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install + use examples && docompress -x /usr/share/doc/${PF}/demos + dodoc AUTHORS CHANGES +} diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1-r1.ebuild index ee694821688b..8ebc7be8e1da 100644 --- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1.ebuild +++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1-r1.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~x86" IUSE="test" RDEPEND=" - >=dev-lang/ocaml-4:=[ocamlopt] + >=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi " DEPEND="${RDEPEND} diff --git a/dev-ml/ocurl/Manifest b/dev-ml/ocurl/Manifest index 8bf38d6461f8..8efc60789763 100644 --- a/dev-ml/ocurl/Manifest +++ b/dev-ml/ocurl/Manifest @@ -1,3 +1,4 @@ DIST ocurl-0.6.1.tgz 101147 SHA256 c671d605d36a8051867f7483a9f7ec93b3985f5e4824073f1ceb85d19e09bad3 SHA512 2c82c9b8e8d6ee26a85add7a2698ab1f61478777f9c7b0b217cacb6491067b619f508b41c22eaa54cf249147d287a77c62a00aef3b19ee6c135426c4559ab7f3 WHIRLPOOL 921939801a1a8d73052954b3d6699c41d2e7f360fe7e1af41f8681f1179aef3d831f1f556cdc0f0c1cee2c9ef1f2bf4caa38923ddfdd57642b6791cb40089289 DIST ocurl-0.7.4.tar.gz 104716 SHA256 51af1d4fc38a7be15cac38a1367f4e2dcd8c2014d8d2e545d96d25c8d2f0135e SHA512 1d3a92d89c55434028862dd97c6eb5d3d8d579e2dd44117be82b09658543c90a0800e9203892eb204ab18e6c8c6bfd18cfc355e32c7393daa1c7beb2c39e97da WHIRLPOOL eab3ff62c77181bb2a8e6906bd3de828cee3569cdfa952b930c8e7b704382ef071061727d4a8709438f2ff71aa40e5187e4473e3fa03f74f83da2470e7b05708 DIST ocurl-0.7.5.tar.gz 103981 SHA256 a6432a2f0109525b4128337ac9708b0192a97ee8f958a5f65b6c8f25435f6cff SHA512 8deb2e353fae6667555d48f5694c0dec86f82f2702536a50842baae3d6bb0d37a24e4b8e39ff11d3d42feebdd412c92a3e43f27c9f551cd54994527fdcf71778 WHIRLPOOL 77a9866d97c07a8cb2bdd69743d0bf5f80a9cdbd5e20bd0b200ab59d03dd286ef712988bf098aba01d337448ee47e9f95b69872e0e377948c99810826c7cf833 +DIST ocurl-0.7.6.tar.gz 104088 SHA256 8eba235b74733f69d836e9b3167e90ea0a87f7ec4cb3fbd7c289a21109ab9743 SHA512 98c46ec4d1fd52c47f696b46a7252967038e6e04607526fae78a8538c57980134567d1ac71bd6c8beaa95f71f6e643dd092cfb787b58a8ff6c0dba5b15110b67 WHIRLPOOL 90af94e5893e86d264a429c44523dba798e8a703913345b5f16e23ee3deeac3ec2344cf9e25d608f41192a401d6efc35c9d1273e1282213552f61f4b9f19362c diff --git a/dev-ml/ocurl/ocurl-0.7.6.ebuild b/dev-ml/ocurl/ocurl-0.7.6.ebuild new file mode 100644 index 000000000000..8998a8200b03 --- /dev/null +++ b/dev-ml/ocurl/ocurl-0.7.6.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit findlib + +DESCRIPTION="OCaml interface to the libcurl library" +HOMEPAGE="http://forge.ocamlcore.org/projects/ocurl/" +LICENSE="MIT" +SRC_URI="http://forge.ocamlcore.org/frs/download.php/1563/${P}.tar.gz" + +SLOT="0/${PV}" +IUSE="examples" + +RDEPEND=">=net-misc/curl-7.9.8 + dev-ml/lwt:= + >=dev-lang/ocaml-3.12:=[ocamlopt]" +DEPEND="${RDEPEND} + virtual/pkgconfig" +KEYWORDS="~amd64 ~x86" + +src_compile() +{ + emake -j1 all +} + +src_install() +{ + findlib_src_install + dodoc CHANGES.txt README + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/dev-perl/Devel-NYTProf/Devel-NYTProf-6.20.0.ebuild b/dev-perl/Devel-NYTProf/Devel-NYTProf-6.20.0.ebuild new file mode 100644 index 000000000000..0418a74c09aa --- /dev/null +++ b/dev-perl/Devel-NYTProf/Devel-NYTProf-6.20.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MODULE_AUTHOR=TIMB +MODULE_VERSION=6.02 +inherit perl-module + +DESCRIPTION="Powerful feature-rich perl source code profiler" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + >=dev-perl/File-Which-1.90.0 + virtual/perl-Getopt-Long + dev-perl/JSON-Any + dev-perl/JSON-MaybeXS + virtual/perl-Scalar-List-Utils + virtual/perl-XSLoader + sys-libs/zlib +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + virtual/perl-Scalar-List-Utils + >=virtual/perl-Test-Simple-0.840.0 + >=dev-perl/Test-Differences-0.60.0 + ) +" + +SRC_TEST="do" diff --git a/dev-perl/Devel-NYTProf/Manifest b/dev-perl/Devel-NYTProf/Manifest index 7e614ed89090..cd9643530e17 100644 --- a/dev-perl/Devel-NYTProf/Manifest +++ b/dev-perl/Devel-NYTProf/Manifest @@ -1,2 +1,3 @@ DIST Devel-NYTProf-5.06.tar.gz 427853 SHA256 c6733e8676773b1e15e98725e5f817e4354ae2e2c8472fdfc2a7d327380b35e0 SHA512 add2c4272243f2d729370354c43715217b1bba3c00b9eeeef006adc2f9ec2e88c0b9568a0b5c5296b5118d15957918b1e2a9ce4943fbc197089b80b208abeceb WHIRLPOOL 3856887532fa0f8d1e1500847cc0b3a928e011d94fad281cf831c6abc152034dc5564e9dda01d1433c1162aaad06f46aee0318211fd626e4ee9de5ab92d24f5a DIST Devel-NYTProf-6.01.tar.gz 432670 SHA256 d7decf4131ab8fe58fcb8ef6c8f8140220bbde091ae16fdc8185324ee66157e9 SHA512 a3978dbf18b1768c0b8fded2d684c3ae511df85ebe3507cc7bb4d34a17afb95a0128cbb31ed33b181258257d409af44f5a0773eebb35a7a71f08cda66377b509 WHIRLPOOL d159373da98d31d6b2b1caa5927a14c5c18baa8c1c6303d300470eaae8dbe449c69eb38f847891fa44430edba97e3af91177318a8795fad9aa0ff7fdc5b6eb82 +DIST Devel-NYTProf-6.02.tar.gz 437762 SHA256 788bb97d9b983cab15e947ef1932d547c50635a6f48b08cb275391179691f08f SHA512 f2e3a65d7351e982c6cb00a2cbd446d1aebd3438e89452b910169072ded0a21aac8a27a4fa99efe5f941f22e62b20881b40a17cbd2bb1cada6e5418d39b133bc WHIRLPOOL 3cb6b5e066fe1bb32437dd0ad4978b979903c5899e1071e720432dfb808c6e9787a4fc5f3225ddbb96be9f8a9a87b9d45678e319a9b0689d2e27c883fb9c58c8 diff --git a/dev-perl/File-Copy-Link/metadata.xml b/dev-perl/File-Copy-Link/metadata.xml index 98656dc155ea..2e20cc30a4b2 100644 --- a/dev-perl/File-Copy-Link/metadata.xml +++ b/dev-perl/File-Copy-Link/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>christian.affolter@stepping-stone.ch</email> + <email>c.affolter@stepping-stone.ch</email> <description>Maintainer</description> </maintainer> <maintainer> diff --git a/dev-perl/Pango/Pango-1.224.0-r1.ebuild b/dev-perl/Pango/Pango-1.224.0-r1.ebuild new file mode 100644 index 000000000000..60b8bba4b2ff --- /dev/null +++ b/dev-perl/Pango/Pango-1.224.0-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MODULE_AUTHOR=XAOC +MODULE_VERSION=1.224 +inherit perl-module + +DESCRIPTION="Layout and render international text" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + >=dev-perl/glib-perl-1.220.0 + >=dev-perl/Cairo-1.0.0 + >=x11-libs/pango-1.0.0 +" +DEPEND=" + ${RDEPEND} + >=dev-perl/ExtUtils-Depends-0.300.0 + >=dev-perl/extutils-pkgconfig-1.30.0 +" + +PATCHES=( + "${FILESDIR}"/"${P}-linking.patch" +) + +src_prepare() { + perl-module_src_prepare + sed -i -e "s:exit 0:exit 1:g" "${S}"/Makefile.PL || die "sed failed" +} diff --git a/dev-perl/Pango/files/Pango-1.224.0-linking.patch b/dev-perl/Pango/files/Pango-1.224.0-linking.patch new file mode 100644 index 000000000000..e93069ba200e --- /dev/null +++ b/dev-perl/Pango/files/Pango-1.224.0-linking.patch @@ -0,0 +1,10 @@ +--- Makefile.PL ++++ Makefile.PL +@@ -161,6 +161,7 @@ + if ($have_cairo) { + push @deps, qw/Cairo/; + $inc .= $pangocairo_pkgcfg{cflags}; ++ $libs .= ' '; + $libs .= $pangocairo_pkgcfg{libs}; + } + diff --git a/dev-perl/Quota/metadata.xml b/dev-perl/Quota/metadata.xml index 83d1dd42a4d4..fd3d3c617268 100644 --- a/dev-perl/Quota/metadata.xml +++ b/dev-perl/Quota/metadata.xml @@ -3,7 +3,8 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>christian.affolter@stepping-stone.ch</email> + <email>c.affolter@stepping-stone.ch</email> + <name>Christian Affolter</name> <description>Maintainer</description> </maintainer> <maintainer> diff --git a/dev-perl/SDL/Manifest b/dev-perl/SDL/Manifest index b8dda29daf66..9eda14849dee 100644 --- a/dev-perl/SDL/Manifest +++ b/dev-perl/SDL/Manifest @@ -1,2 +1,3 @@ DIST SDL-2.540.tar.gz 2490785 SHA256 031866be84e6bbd7bb082aed26265ad64f84dc867db5239476921746a41e6a1f SHA512 6c85ea179174415da40fe20f27086626b56570d8dbb6416957fb3236550d27ad893f171c7aedf7c6cda2ca6f2078dfad5d8813e428b49c920c1f8487416193b3 WHIRLPOOL 1cf79640cf56237f7ed439cd2c13ef60e4978762867495d50ad7db06f75685022fb4409265ef4243bdb688c467eb66acbeab40e18ee5f688511f1e60a52894f9 DIST SDL-2.544.tar.gz 2487263 SHA256 3878d7171c7fb34b5d35f9ef3883e532fb44188c666f7492ce2bf14f5acad096 SHA512 df8a6cc1f395e143bfa59f08a0c91c640b83463742250f5ea545dcde1d7b3f819dcae03535e62f572ae2d7ad3bbc988b034a1c83a451926f6ec2d5e11ae90ddc WHIRLPOOL 667675bb12a3b6957848de0616f158f36b9f6a14b5ea0af68e3f14839dc8b24a810b51b3f06fc2f3695a060991ae58fdb9f75ba7d221e42c51032752b0592b71 +DIST SDL-2.546.tar.gz 2487053 SHA256 e08aa73550b3f8d32ced0941c3c629f01c4ba4d480fc269e57f3fa6f8df86631 SHA512 7f7015c90a277b91951a2357bcdf7c3f2f930270d211657c903240ed4529f408c200337ca79e4971eb3912da28ebf1e950053ce4d763c2599c701444c618c71a WHIRLPOOL f5afa1710321c08f57da105ed20953bffc9b534f3ab7c5fc6d729285b4e28f2ee58763f82ed88d9e0c2167ce7d8d182c0fc3259c4cb798ce17ffa79e306df54c diff --git a/dev-perl/SDL/SDL-2.546.ebuild b/dev-perl/SDL/SDL-2.546.ebuild new file mode 100644 index 000000000000..8d36ad96d962 --- /dev/null +++ b/dev-perl/SDL/SDL-2.546.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +MODULE_AUTHOR=FROGGS +inherit perl-module + +DESCRIPTION="Simple DirectMedia Layer (SDL) bindings for perl" +HOMEPAGE="http://sdl.perl.org/ http://search.cpan.org/dist/SDL/ https://github.com/PerlGameDev/SDL" + +LICENSE="GPL-2 OFL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~x86" +IUSE="" + +RDEPEND=">=dev-perl/Alien-SDL-1.434 + dev-perl/Capture-Tiny + dev-perl/File-ShareDir + dev-perl/Test-Most + dev-perl/Tie-Simple + media-libs/libpng:0 + media-libs/libsdl + media-libs/sdl-gfx + media-libs/sdl-image + media-libs/sdl-mixer + media-libs/sdl-pango + media-libs/sdl-ttf + media-libs/smpeg + media-libs/tiff:0 + virtual/glu + virtual/jpeg:0 + virtual/opengl + virtual/perl-ExtUtils-CBuilder + >=dev-perl/Module-Build-0.400.0 + virtual/perl-Scalar-List-Utils + virtual/perl-Test-Simple" +DEPEND=${RDEPEND} + +SRC_TEST=parallel +mydoc='CHANGELOG README TODO' +PATCHES=( "${FILESDIR}"/${P}-pointer.patch ) diff --git a/dev-perl/SDL/files/SDL-2.546-pointer.patch b/dev-perl/SDL/files/SDL-2.546-pointer.patch new file mode 100644 index 000000000000..b3721ac805e2 --- /dev/null +++ b/dev-perl/SDL/files/SDL-2.546-pointer.patch @@ -0,0 +1,29 @@ +--- ./src/Core/objects/Event.xs.orig 2015-11-02 17:32:54.831820664 -0500 ++++ ./src/Core/objects/Event.xs 2015-11-02 17:33:35.802090936 -0500 +@@ -611,7 +611,7 @@ + char *CLASS = "SDL::JoyHatEvent"; + CODE: + RETVAL = NULL; +- if ( &event != NULL ) ++ if ( event ) + RETVAL = &(event->jhat); + OUTPUT: + RETVAL +@@ -683,7 +683,7 @@ + char *CLASS = "SDL::JoyButtonEvent"; + CODE: + RETVAL = NULL; +- if ( &event != NULL ) ++ if ( event ) + RETVAL = &(event->jbutton); + OUTPUT: + RETVAL +@@ -755,7 +755,7 @@ + char *CLASS = "SDL::ResizeEvent"; + CODE: + RETVAL = NULL; +- if ( &event != NULL ) ++ if ( event ) + RETVAL = &(event->resize); + OUTPUT: + RETVAL diff --git a/dev-perl/UUID-Tiny/metadata.xml b/dev-perl/UUID-Tiny/metadata.xml index fbaa533ad6a8..4194b797226e 100644 --- a/dev-perl/UUID-Tiny/metadata.xml +++ b/dev-perl/UUID-Tiny/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>christian.affolter@stepping-stone.ch</email> + <email>c.affolter@stepping-stone.ch</email> <description>Maintainer</description> </maintainer> <maintainer> diff --git a/dev-perl/Wx-Perl-ProcessStream/Wx-Perl-ProcessStream-0.320.0-r2.ebuild b/dev-perl/Wx-Perl-ProcessStream/Wx-Perl-ProcessStream-0.320.0-r2.ebuild new file mode 100644 index 000000000000..2f1fd1b91e7f --- /dev/null +++ b/dev-perl/Wx-Perl-ProcessStream/Wx-Perl-ProcessStream-0.320.0-r2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" +MODULE_AUTHOR=MDOOTSON +MODULE_VERSION=0.32 +inherit wxwidgets perl-module + +DESCRIPTION="access IO of external processes via events" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + x11-libs/wxGTK:${WX_GTK_VER} + >=dev-perl/wxperl-0.97.01" +DEPEND="${RDEPEND}" + +#SRC_TEST=do + +src_prepare() { + need-wxwidgets unicode + perl-module_src_prepare +} diff --git a/dev-php/pecl-mongo/Manifest b/dev-php/pecl-mongo/Manifest index be474332f3cc..cc75cbf3bdd0 100644 --- a/dev-php/pecl-mongo/Manifest +++ b/dev-php/pecl-mongo/Manifest @@ -1,5 +1,6 @@ DIST mongo-1.5.4.tgz 191364 SHA256 19d01417f0c96c10fb9149fc6cb5cc9c1f096e9c6fa31ee4c454f229e33dbd30 SHA512 509eb4f9dc0fd7617ec2f7616b1511266b91b804c0ec04ef5dcfbb9b1a77ec6e9acc3108dfe6b2607f4e97f6091dc2f94456900dcd7e64c85e2f754aafb65c05 WHIRLPOOL 4807844725f6221d130ec30c3ab47fc9da25286ce039568c58332d63412a73a663cb713dd346095acc5d6c539ac0e6c0cdbae80ad6582ef1473a5dc23fa24edf DIST mongo-1.5.6.tgz 193219 SHA256 939231c5129176f5f00ba6275dd34b261e173675b1e81a5fa536a14d05b12b11 SHA512 588915079ea08631ef60fce26bd86a0596003900b75c11af7935e57aa418220e21197aff4617f79808a5ee2bc0d74aba031f54f05be4604c6fc94ce146823c10 WHIRLPOOL c1c922750fa272cc2565d2377b65f5e25b2cb9e55f19abe94c34661e93d62b4162a8a18ef53b71b4c8e653778cc0d837930819b8ed79c6bbfd9690b35801f550 +DIST mongo-1.6.11.tgz 209141 SHA256 cd180ae35f537a199d374a3105106ee5a2b0cab618b12f6221e4c985c28955ac SHA512 82c668e25fd68c6a7982f15fced06c72d87deab5b587ebd66f3d78f59d9fc9c94467a37e355adffd98a347786effd9eda3e1104fc89c85c31947fd6786cbb1e8 WHIRLPOOL 3a4e181c3cd505d25fa18251d5d866e3f22535caa8213f90bb08adc803b527fc7ae0e0f9557a110dbfcea0717d5550cf2e1592be9e745f337675f35aaba08176 DIST mongo-1.6.2.tgz 204061 SHA256 b9a1319910a3d91af94aec46b9dd0021e5b2504b199c60cc8b6075f8d3d78e7b SHA512 01118fd8f227c220c9c29749687cc33a6a56af1b8ed03f72e966d2ce4fd4e23048c6d0576d3c619b4e9e7c690892a05c665970bf8592170a8cb569a84094dd9d WHIRLPOOL cbef6dd822ef59301c4e534e4fe8a07bebdfbdf02f24b279ddf1c72c9ed27a5fafa81e9c20beb6687d049663ce2cf65777715d2e4c28aee65e848254ae0857c1 DIST mongo-1.6.3.tgz 204130 SHA256 53620808eaf0c3dc7537162984354b45b3c90cbaaa36b7b23e0bf650051e77c3 SHA512 e15cdcbfcaef4793b78011435b94bd7de7ef38441b7ef55dc73214e0f29ce6d5312b7881f15d3514143c848c8894c3dd7473b608665ec87a8c6c5a89e5f6f556 WHIRLPOOL bc03929df2490ad72b7eeaa30889537c5f07fac2620ff8bc24795dad55b915d7f90102a4c4d55d300d862e95fb37f17d29d6b887f721f5f9084f074e4b2fd9f0 DIST mongo-1.6.9.tgz 208955 SHA256 b8213e0f08873f1455b2c7e8bfb5f33405afbcd5ce598d81b5f5c49556114581 SHA512 0a649ef67450a795a2fd8fc34d927e640bc7ecde5a1885b581c967f8adb61429d864cd993939fa7299dc35edd58d13a28562e71a0287a754f9fd04f2ac1643de WHIRLPOOL b2c1d6adc08979520ad5d9b6ae1110c2bb4a5209be0074558290d1abfa27906ea0c446d8c0eaa784c3c77a2432ef58bfd7843a863ab541e385ee0959877ed06b diff --git a/dev-php/pecl-mongo/pecl-mongo-1.6.11.ebuild b/dev-php/pecl-mongo/pecl-mongo-1.6.11.ebuild new file mode 100644 index 000000000000..c0b16c41deba --- /dev/null +++ b/dev-php/pecl-mongo/pecl-mongo-1.6.11.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PHP_EXT_NAME="mongo" +USE_PHP="php5-4 php5-5 php5-6" +DOCS="README.md" + +inherit php-ext-pecl-r2 + +DESCRIPTION="Legacy MongoDB database driver for PHP" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" diff --git a/dev-php/smarty-docs/Manifest b/dev-php/smarty-docs/Manifest deleted file mode 100644 index a547591db2e4..000000000000 --- a/dev-php/smarty-docs/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST Smarty-2.6.14-docs.tar.gz 136235 SHA256 50d92a5fe2ff2a77668de36de5d9bff7a021892aa66e31ff660a89240edb6dc3 SHA512 2389db876bd419bbf7c96e37a818108106364a94e82fb1286265829c4444038eae01de5642f7c1d29d4faed9209e184fe8abdc8ed3de7a32a3b3717e80f02b69 WHIRLPOOL b4d478df28ab17e641a1348540572bc5f750ce42f556f2c0f6f13878e1a989610f9bbde18b356e502aebacc29ee9632122bb287ba1b2eccc00e71c56d3bbc950 -DIST smarty-docs-3.0-en.pdf 1167021 SHA256 13dbe6e3eb052e6bf1ce3f2b1b014c54977cbd51df7b8c0ddd7c5a554537d0d2 SHA512 2bdf77e088d6e2e2fabf84449b2ca5c70e706cf433751da0b1fd130ad74512d82fd66d9395140969b69d9e9f924cfd635919f51ea798f561d4994f02d6139683 WHIRLPOOL 7113f9bba2ccb2b0f5c96666caa774b1d4bf8eb33e0f3125602bdc3a69f9af5b995bd17f8f8cc87cca848c7e2af743a781beece2348c127908c631303eba647a -DIST smarty-docs-3.0-en.zip 344408 SHA256 1bdf02a6fcb02aa4faca4b42b6a32efa76361e659c2c1cd7357e03a25cc47af4 SHA512 22f54e3fc895b5abe7c08d28be19f1dabe050d0afbcec0d5b86b72173bc44994d62e4d589b7103acb66d79a8a7a7e3ab7d391106b8655b9b1334403690c053b5 WHIRLPOOL 8548cf10ee6913c4aea65e8a91fd70764cfbf05a17256740cf8724c9a54ba321d7a59a3a8e1fdfc0dc4a3cd0213789ebde63e54260646de9a53399d9e889a76b diff --git a/dev-php/smarty-docs/metadata.xml b/dev-php/smarty-docs/metadata.xml deleted file mode 100644 index b821fbacd809..000000000000 --- a/dev-php/smarty-docs/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>php</herd> - <use> - <flag name="html">Install the documentation in HTML format</flag> - <flag name="pdf">Install the documentation in PDF format</flag> - </use> -</pkgmetadata> diff --git a/dev-php/smarty-docs/smarty-docs-2.6.14.ebuild b/dev-php/smarty-docs/smarty-docs-2.6.14.ebuild deleted file mode 100644 index d13a72f7dd5d..000000000000 --- a/dev-php/smarty-docs/smarty-docs-2.6.14.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" - -MY_P="Smarty-${PV}-docs" - -DESCRIPTION="Documentation for Smarty, a template engine for PHP" -HOMEPAGE="http://smarty.php.net/docs.php" -SRC_URI="http://smarty.php.net/distributions/manual/en/${MY_P}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}/manual" - -src_install() { - dohtml -r . -} diff --git a/dev-php/smarty-docs/smarty-docs-3.0.ebuild b/dev-php/smarty-docs/smarty-docs-3.0.ebuild deleted file mode 100644 index 9ed7df437cac..000000000000 --- a/dev-php/smarty-docs/smarty-docs-3.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="pdf html" -DESCRIPTION="Documentation for Smarty, a template engine for PHP" -HOMEPAGE="http://www.smarty.net/documentation" -SRC_URI="html? ( http://www.smarty.net/files/docs/manual-en-${PV}.zip -> ${P}-en.zip ) - pdf? ( http://www.smarty.net/files/docs/manual-en-${PV}.pdf -> ${P}-en.pdf )" - -LANGS="en" - -for X in ${LANGS}; do - [[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? ( - html? ( http://www.smarty.net/files/docs/manual-${X}-${PV}.zip -> ${P}-${X}.zip ) - pdf? ( http://www.smarty.net/files/docs/manual-${X}-${PV}.pdf -> ${P}-${X}.pdf ) )" - IUSE="${IUSE} linguas_${X}" -done - -LICENSE="LGPL-2.1" -SLOT="0" - -DEPEND="html? ( app-arch/unzip )" -RDEPEND="${DEPEND}" - -REQUIRED_USE="|| ( html pdf )" - -src_unpack() { - mkdir -p "${S}" - - if use html; then - mkdir "${S}"/html - pushd "${S}"/html > /dev/null - - unpack ${P}-en.zip - - for X in ${LANGS}; do - if [[ ${X} != "en" ]] && use linguas_${X}; then - unpack ${P}-${X}.zip - fi - done - - popd > /dev/null - fi -} - -src_install() { - if use html; then - dohtml -r html/* - fi - - if use pdf; then - docinto pdf - dodoc "${DISTDIR}"/${P}-*.pdf - fi -} diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild index f415ff9239ff..6e84b2090268 100644 --- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild +++ b/dev-python/CacheControl/CacheControl-0.11.5.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="test" RDEPEND=" @@ -25,8 +25,11 @@ DEPENDS="${RDEPEND} test? ( dev-python/pytest[${PYTHON_USEDEP}] ) " +# Not included +RESTRICT=test + python_test() { - py.test -v || die + py.test -v -v || die } pkg_postinst() { diff --git a/dev-python/Numdifftools/Manifest b/dev-python/Numdifftools/Manifest index bf94cc8fa8ab..463c6cedc1bd 100644 --- a/dev-python/Numdifftools/Manifest +++ b/dev-python/Numdifftools/Manifest @@ -1,3 +1,2 @@ -DIST Numdifftools-0.6.0.zip 184293 SHA256 56bee55a361c263dd250fcd009923ee9289dbc9bde635fe10b41d84e6a404549 SHA512 57c3a63e9fc2738478534cd81542d1398667824c80ad5263610be29bec38209f4f9963ad61f2b02327724946567d61fe310a9e82b1b301d1b36fe229f33445bd WHIRLPOOL 9780391abf8774137b3aaa03c88bed521ff6367c7bdefdb23c7e412e162ec8c81a6724a7af525ccddb69673b0afa1c862dbf7285f0faa659af46f758ad48ae9b -DIST numdifftools-0.7.7.zip 181520 SHA256 c5a309a7a0b58f6177dc7e3d55c2830c07ca2715c9c706644d500fc4eca97c4d SHA512 ccb5f8a06bf21dfb803004fa104d36e07cdbebb72682d84577506cca6fc63abd2e4b1c13cbc960ad691ee70bef616c282b8dbb682f78d1ff8d230213afd58428 WHIRLPOOL b6579d64f1e6beded914189b392952988eb1396ee9ad06d4ba4b3edfbe4666c1e7de35cf1405c38422aa459e9a631a94d8f821a9fe22309a681043883ec56ae2 DIST numdifftools-0.9.12.zip 236823 SHA256 eee07f03eaa9531c34949bfbb27b0fade7b1e927dd9daf18342d13fc1ee88eaa SHA512 00c78abac0c08beb72ec11bcddd74165db773a0fa9b4eee10290a27c4c143f1593254e058898dc12aee1afc6bad5bb2849451e6018129aa32e808eee1b97420c WHIRLPOOL aef074b9aaf4caecfad8bff75ccb8bd95e36373e2dd4e1dfc4b700fa1925b9b8652d6c483f81133c82e857abae6f2628e9166c77d6b102db3f9bb58c72e682a7 +DIST numdifftools-0.9.13.zip 225820 SHA256 1aad0d9eba96846f5c3b82e6a8df0b1eaf4cd13e0b665cba64646756a0f2add6 SHA512 e16fe167cbcc7995e5f7b1784822b94bc82261821ebf35f8b9f774ef1fd601ef13a23a72670f28b54b5f288b509a9ffccbde09033bdec6a88e8a4ef78ed74b25 WHIRLPOOL f32e93f54a883a751f0efb987b81fc7f187c8b6e4c327de2166f4c30afb7f3cb1b076047036deced7b98b551cb9085483c2e22a08881a7730689a5bbbfae5926 diff --git a/dev-python/Numdifftools/Numdifftools-0.6.0.ebuild b/dev-python/Numdifftools/Numdifftools-0.6.0.ebuild deleted file mode 100644 index 3fb5b1ee3d26..000000000000 --- a/dev-python/Numdifftools/Numdifftools-0.6.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2014 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} ) - -inherit distutils-r1 - -DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables" -HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://code.google.com/p/numdifftools/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - " -DEPEND="test? ( ${RDEPEND} )" - -# Seems to be broken -RESTRICT="test" - -python_test() { - ${PYTHON} \ - -c 'import numdifftools as nd; nd.test(coverage=False, doctests=False)' \ - || die -} diff --git a/dev-python/Numdifftools/Numdifftools-0.7.7.ebuild b/dev-python/Numdifftools/Numdifftools-0.7.7.ebuild deleted file mode 100644 index c14975083b39..000000000000 --- a/dev-python/Numdifftools/Numdifftools-0.7.7.ebuild +++ /dev/null @@ -1,42 +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 python3_{3,4} ) - -inherit distutils-r1 - -MY_PN=numdifftools -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables" -HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://code.google.com/p/numdifftools/ https://github.com/pbrod/numdifftools" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND=" - dev-python/algopy[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - " -DEPEND="test? ( - ${RDEPEND} - dev-python/pytest[${PYTHON_USEDEP}] - )" - -# Seems to be broken -RESTRICT="test" - -S="${WORKDIR}"/${MY_P} - -python_test() { - esetup.py test -} diff --git a/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild new file mode 100644 index 000000000000..1e1d2c8cf9df --- /dev/null +++ b/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) + +inherit distutils-r1 + +MY_PN=numdifftools +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables" +HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND=" + >=dev-python/algopy-0.4[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + >=dev-python/numpy-1.9.0[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + >=sci-libs/scipy-0.8[${PYTHON_USEDEP}] + " +DEPEND=" + >=dev-python/setuptools-0.9[${PYTHON_USEDEP}] + dev-python/setuptools_scm[${PYTHON_USEDEP}] + dev-python/pyscaffold[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-runner[${PYTHON_USEDEP}] + )" + +S="${WORKDIR}"/${MY_P} + +python_prepare_all() { + sed \ + -e "/numpydoc/d" \ + -e "/wheel/d" \ + -i requirements.txt *egg*/requires.txt || die + distutils-r1_python_prepare_all +} + +python_test() { + esetup.py test +} diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest index f0df1af0adf9..15db42a3eee1 100644 --- a/dev-python/alabaster/Manifest +++ b/dev-python/alabaster/Manifest @@ -1,6 +1 @@ -DIST alabaster-0.6.0.tar.gz 11086 SHA256 86423a9d10cff61524df31cba430e9beff4829d49d1334fa836f319eea1f8fdf SHA512 89946c37e069860791a0429ea183619d8052e661d2f5ded906456ca6b7fabe66a9f222b18f3f089d1a34929c0001bd2dd255b8c593d2acf733c4e409771372e0 WHIRLPOOL 712e39761cae5ec2e76ccce90a58b61880159991cf7663456dcf1c10208df6aef8e35a1a478b0a12219f7333a8ac96bb543509bf14fe029fda93b0a36cc2667b -DIST alabaster-0.6.3.tar.gz 11749 SHA256 30d72e732d61f3ac74bb8bd6a2b063ec7b0522b00bfef979dce4435f7982439e SHA512 c9d102884eca20063da8929dbbd030faa3e86c7f8aeb4e72f9f7dcccbf94334efe2de0143939d8fcb8e79afbbfe6922cedc9621332242d0a482ab4f61b365c0f WHIRLPOOL 15eee45a1e868f765257c6655e33adb1c4da807875b704a76f08d760c4b688ffc26567fd8e00315f6cabbf45e7d82d7d968ccdef83d21e1b1339ed8f5e0ac4e7 -DIST alabaster-0.7.2.tar.gz 15024 SHA256 f8f436a350e37607a3a3d333b6c2d9baf3320cd661e72e95ee0e3037ac7a3157 SHA512 1a1b2c7f76b2c93042044c869e376512bda975765497186908520cba314129bb3ad34d39ab365105331d696b54eeae3094e320c2cb6429ebbd30a2019157b5e3 WHIRLPOOL 532da1cee88e9eedbb53acc263031ecbc796d90ea11075fc02108329b416c6a516ae7681b5ce7970d6e094dc836ed40f050bc75c8966b4e611b50f9af015d1b1 -DIST alabaster-0.7.4.tar.gz 15183 SHA256 ce77e2fdbaabaae393ffce2a6252a0a666e3977c6c2fa1c48c4ded0569785951 SHA512 42d7939b49b843611f6fe8be8b8c5f02cda9a3bb81b27a60c7764ff894d40a4a74deeadf183b3a23631100e925c76ce2cb3f8b479ce9c17ae279d5f720cf26af WHIRLPOOL e07b8cb114421463c105f9ec8eb4a6ffe6cdd1bd27eccdb36348e22f61fafb18d9b00eb5db1e4238897e8aec328840ec8a4ca259dce9f3fe2a1bb5ea2a9fb4fd -DIST alabaster-0.7.5.tar.gz 16204 SHA256 8022f269eba3aefd390b927ac740ab1da7af15838e1c90caed0e66370eef8fd3 SHA512 abe51a04224163cd834609dd3a07710f12ec7c52e0859f25327e8067db27a460d723d340c25f8f2440f92c9ba2a968e021993a07bb8faef093d6af0a6209a4c8 WHIRLPOOL 1838aa91704b5c533847127052170731c2aad786c791c31a53d675fe95bc80fa764c595b272d9e4a3a01e646f533752320d2029057f794b3368ac1242e9aac89 DIST alabaster-0.7.6.tar.gz 16598 SHA256 309d33e0282c8209f792f3527f41ec04e508ff837c61fc1906dde988a256deeb SHA512 90058e56365c59a4eed6034273ea83132fcf77ee26e3dfd2d9aa0233657192e1f32d8f40cd6477e307d063d0136ea5e18b94c6c0874a378d6386874dceccfdc8 WHIRLPOOL 2249f055772ce7a389df88a4a659a9a2b0b7c45992d9e225f93ecc79c9038c89474554fdf3557c78ff645242cffa0f1c4822f1b08831f1943140244931b7c812 diff --git a/dev-python/alabaster/alabaster-0.6.0.ebuild b/dev-python/alabaster/alabaster-0.6.0.ebuild deleted file mode 100644 index 42b190a34df6..000000000000 --- a/dev-python/alabaster/alabaster-0.6.0.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="A configurable sidebar-enabled Sphinx theme" -HOMEPAGE="https://github.com/bitprophet/alabaster" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -SLOT="0" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/alabaster/alabaster-0.6.3.ebuild b/dev-python/alabaster/alabaster-0.6.3.ebuild deleted file mode 100644 index af905cf4f0e6..000000000000 --- a/dev-python/alabaster/alabaster-0.6.3.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="A configurable sidebar-enabled Sphinx theme" -HOMEPAGE="https://github.com/bitprophet/alabaster" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="amd64 x86" -SLOT="0" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/alabaster/alabaster-0.7.2.ebuild b/dev-python/alabaster/alabaster-0.7.2.ebuild deleted file mode 100644 index fe40f4500105..000000000000 --- a/dev-python/alabaster/alabaster-0.7.2.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="A configurable sidebar-enabled Sphinx theme" -HOMEPAGE="https://github.com/bitprophet/alabaster" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" -SLOT="0" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/alabaster/alabaster-0.7.4.ebuild b/dev-python/alabaster/alabaster-0.7.4.ebuild deleted file mode 100644 index 9aa52bdf086a..000000000000 --- a/dev-python/alabaster/alabaster-0.7.4.ebuild +++ /dev/null @@ -1,19 +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 python3_{3,4} pypy pypy3 ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="A configurable sidebar-enabled Sphinx theme" -HOMEPAGE="https://github.com/bitprophet/alabaster" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" -SLOT="0" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/alabaster/alabaster-0.7.5.ebuild b/dev-python/alabaster/alabaster-0.7.5.ebuild deleted file mode 100644 index 9aa52bdf086a..000000000000 --- a/dev-python/alabaster/alabaster-0.7.5.ebuild +++ /dev/null @@ -1,19 +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 python3_{3,4} pypy pypy3 ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="A configurable sidebar-enabled Sphinx theme" -HOMEPAGE="https://github.com/bitprophet/alabaster" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" -SLOT="0" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/alabaster/alabaster-0.7.6.ebuild b/dev-python/alabaster/alabaster-0.7.6.ebuild index d548dc01de5c..c6467fd0053e 100644 --- a/dev-python/alabaster/alabaster-0.7.6.ebuild +++ b/dev-python/alabaster/alabaster-0.7.6.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/bitprophet/alabaster" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" SLOT="0" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/appdirs/appdirs-1.4.0.ebuild b/dev-python/appdirs/appdirs-1.4.0.ebuild index 3460ca2d489d..630aa3f32298 100644 --- a/dev-python/appdirs/appdirs-1.4.0.ebuild +++ b/dev-python/appdirs/appdirs-1.4.0.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit distutils-r1 @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="" RDEPEND="" diff --git a/dev-python/autopep8/autopep8-1.2.1.ebuild b/dev-python/autopep8/autopep8-1.2.1.ebuild index 60c3f6c37b88..1d3477565279 100644 --- a/dev-python/autopep8/autopep8-1.2.1.ebuild +++ b/dev-python/autopep8/autopep8-1.2.1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit distutils-r1 vcs-snapshot @@ -23,9 +23,6 @@ RDEPEND=" DEPEND="${DEPEND} test? ( >=dev-python/pydiff-0.1.2[${PYTHON_USEDEP}] )" -# https://github.com/hhatto/autopep8/issues/217 -RESTRICT=test - python_prepare_all() { # Prevent UnicodeDecodeError with LANG=C sed -e "/é/d" -i MANIFEST.in || die @@ -34,22 +31,4 @@ python_prepare_all() { python_test() { esetup.py test - # from the travis.yml - "${PYTHON}" test/test_autopep8.py || die - "${PYTHON}" test/acid.py -aaa --experimental test/example.py || die - "${PYTHON}" test/acid.py -aaa --experimental test/example_with_reduce.py || die - "${PYTHON}" test/acid.py -aaa --compare-bytecode --experimental test/example.py die - "${PYTHON}" test/acid.py --aggressive --line-range 550 610 test/inspect_example.py || die - "${PYTHON}" test/acid.py --line-range 289 925 test/vectors_example.py || die - "${PYTHON}" test/test_suite.py || die -} - -pkg_postinst() { - ewarn "Since this version of autopep depends on >=dev-python/pep8-1.3" - ewarn "it is affected by https://github.com/jcrocholl/pep8/issues/45" - ewarn "(indentation checks inside triple-quotes)." - ewarn "If you do not want to be affected by this, then add the" - ewarn "following lines to your local package.mask:" - ewarn " >=dev-python/pep8-1.3" - ewarn " >=dev-python/autopep8-0.6" } diff --git a/dev-python/billiard/Manifest b/dev-python/billiard/Manifest index e490208675ea..9e7b8da13b21 100644 --- a/dev-python/billiard/Manifest +++ b/dev-python/billiard/Manifest @@ -1,3 +1,4 @@ DIST billiard-3.3.0.18.tar.gz 150594 SHA256 59c04036f314c11632a49c15c57735ffb9e111983ee8d15e4d3e188be31583c1 SHA512 8d62c1b5d3e979926cb416f6a85597cf2a959559e4f07f76f189e70cf585ef55ddbba9506bc50c2f9a88d8aa00684b7468668748edbd0530a72970334b8e2617 WHIRLPOOL 34ce61559529ca95fb9aed44917541546ce9955212954aa16b783f5ed22e36a3b7700edd46eb4961bf49b1653f9020aaf760ba67b1123b69e78e04af8e9c93fb DIST billiard-3.3.0.19.tar.gz 150943 SHA256 6e6b8ec6e45b89389051737c7e6215d8e55a83896eb6212fa726ca76e80c7a19 SHA512 492bbf38a7924394dd89f0528598e37ca1a93fc21bdccded396e036b2457c14a06e44de2c9b80d81e5f55bfd1559a6c5fbf1969d108089dc2b697aeaecea60ad WHIRLPOOL cb6e96a1b0c19c62ea07854e7520acb04fa716f79f499e00c24b46f0403ac80d1416fe9669d7e9e1c4955341b29d9215b2e9429d482a4ab34c710397c0fc5e2d DIST billiard-3.3.0.20.tar.gz 150990 SHA256 688f9466b1c3ae14106381e6dbd328115e75c5260c542eb48e6c46931f6928cc SHA512 e068be5e0bc8bc68a38dd1cec2574da25494cfac2d9b4b951af3fd9f019080a4fe402d4b407162bcc0edbd0ac4fa406a964913e4bf1dd98dbf8a937294a34321 WHIRLPOOL 41a2ae0648d7f960c569491d0dea519787e3ba779fa27e71c2dcf12e7955175cf3b9697ca750f4e164e263abd880af287f5645c0864115ef88bb0088d31b74c2 +DIST billiard-3.3.0.21.tar.gz 151141 SHA256 9705f78f0a971b91a70b3b19aa7862401b6eb3b0bffc2a2e0702ed5eeaccdae9 SHA512 29c3e0b78858dc4693a122360a23b8a0f4a40f542ef5451b1c26e8606623a40a586f2f5a99d04ff91dd2dcc34f084fa35d6ee80ca6efd98690517dd46c6ead8b WHIRLPOOL cf4e9476e0b7b18f62f945408f98d96820ee8837dd4838e9fd7c080784e66c5688fe1c05bc91927aeb57365f036ef60b200220958b1bcf14c57dc8723434b7e5 diff --git a/dev-python/billiard/billiard-3.3.0.21.ebuild b/dev-python/billiard/billiard-3.3.0.21.ebuild new file mode 100644 index 000000000000..7ad800d7c2be --- /dev/null +++ b/dev-python/billiard/billiard-3.3.0.21.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 ) + +inherit distutils-r1 flag-o-matic + +DESCRIPTION="Python multiprocessing fork" +HOMEPAGE="https://pypi.python.org/pypi/billiard https://github.com/celery/billiard" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +RDEPEND="" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + >=dev-python/unittest2-0.4.0[${PYTHON_USEDEP}] + >=dev-python/nose-1.3.4[${PYTHON_USEDEP}] + dev-python/nose-cover3[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy pypy3 ) + )" +# The usual req'd for tests +DISTUTILS_IN_SOURCE_BUILD=1 + +python_compile() { + if ! python_is_python3; then + local CFLAGS=${CFLAGS} + append-cflags -fno-strict-aliasing + fi + distutils-r1_python_compile +} + +python_compile_all() { + use doc && esetup.py build_sphinx --builder="html" --source-dir=Doc/ +} + +python_test() { + cd "${BUILD_DIR}" || die + # The teardown in __init__.py breaks pypy's installed nose + if [[ "${EPYTHON}" == pypy ]]; then + rm lib/billiard/tests/__init__.py || die + echo "from __future__ import absolute_import" >> ./lib/billiard/tests/__init__.py || die + fi + nosetests billiard.tests || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( build/sphinx/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest index 701749907954..5857914073dc 100644 --- a/dev-python/boto3/Manifest +++ b/dev-python/boto3/Manifest @@ -1,3 +1,3 @@ -DIST boto3-1.1.1.tar.gz 137778 SHA256 02a99f270f58386dad6e260692b52f7038d52a9a84df29878528a573afecd88a SHA512 34019c8a3744775a952ae151b56747fc011fd4f28853e3d206f95bb8dd03746ad3d4086cd187d332930d543ca757d81bb732ccfd7cfd818aa8e75d73b1880be5 WHIRLPOOL 0032f5751df61bd71d60ea87ece0ce1be873a6fcd561d7600fcf62f1dd7b701963629368b46010b7a90719395adc652ca5059646af42510d72c05b7e3c5cf49e DIST boto3-1.1.2.tar.gz 141981 SHA256 6249add14f96b5e4cda0ac03798ab29f505c001332d2fb31ccb276e0ddcc5a15 SHA512 89b0abdab69dcd0c8ed612ecd70e5bdb88cc5242a3846fbdc5f708118d3f0db8c7eb5683422030eb630427dba53a5ea1780f5abbab58a021bf0bcacdeca07aef WHIRLPOOL c7c27d8c3c99ea992b2235beb60221c2899ea94557115b76366ce5922cef3606d9a2f907b0fdcce18e2eee1b19675849a354b50d429aa83ec1c364bf91a7ca5d DIST boto3-1.1.3.tar.gz 145381 SHA256 c158da65712807de421b66d3b81b1da6a449bc631045b2312855086991e7318e SHA512 a049b8d73f45cf552705764c3ae4a3e8ec19920983bd5587a0563501868920d5237f4e37081ab09a0cda1f48725c6117cd0367633ec027180152bcaa3364383d WHIRLPOOL 0c9f92f16cb5a0210d331ca5bf7199e0c0a0d8051fbe41922f9dee45221a4697816b7d42e323916cf806973abf455c7b6f866a6931cdbfe9d61151cb4eb192c0 +DIST boto3-1.2.1.tar.gz 152790 SHA256 de4ad91f21bee47adffe5923d1aef0f3620e80f433f839e52f52848db7490cae SHA512 b3b47dc69523a737f6d5d2a2311da999427bae1c608a34ef5909a83fc4306f6a2799300e6d8907d2d83eccf503b9b75a6f43417d9ed24882e57eb42410a6c56f WHIRLPOOL c707638307bb5a327e58d137f3b8eeb7bace25c422d98f7aca2e160dda89378ebce8723840e05184799ea56cba0e78588c7f74f44816b0519cf0820e5cb39027 diff --git a/dev-python/boto3/boto3-1.1.3.ebuild b/dev-python/boto3/boto3-1.1.3.ebuild index f67bcade54ca..2b890fbd311d 100644 --- a/dev-python/boto3/boto3-1.1.3.ebuild +++ b/dev-python/boto3/boto3-1.1.3.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_4 ) inherit distutils-r1 vcs-snapshot diff --git a/dev-python/boto3/boto3-1.1.1.ebuild b/dev-python/boto3/boto3-1.2.1.ebuild index 2b98eeb21f6b..17d67c2b1c93 100644 --- a/dev-python/boto3/boto3-1.1.1.ebuild +++ b/dev-python/boto3/boto3-1.2.1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_4 ) inherit distutils-r1 vcs-snapshot @@ -17,9 +17,9 @@ KEYWORDS="~amd64" IUSE="doc test" CDEPEND=" - >=dev-python/botocore-1.1.0[${PYTHON_USEDEP}] - <dev-python/botocore-1.2.0[${PYTHON_USEDEP}] - >=dev-python/jmespath-0.6.2[${PYTHON_USEDEP}] + >=dev-python/botocore-1.3.0[${PYTHON_USEDEP}] + <dev-python/botocore-1.4.0[${PYTHON_USEDEP}] + >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] <dev-python/jmespath-1.0.0[${PYTHON_USEDEP}] $(python_gen_cond_dep '=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7') " diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index 825e611efa8e..3ce19ec2bfcd 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -1,3 +1,4 @@ DIST 1.1.11.tar.gz 1975224 SHA256 b4e6edc12177dd4f720259aa7027bab00fb9db2029e40e77e67c552ef9f41132 SHA512 b0b10299d93314de582cfd21511987fe210df1618c49f6c706c4341a3a635a85cd48d8848a69f83391a227ab5dc3881509a02b4cc47b1e27d18cf353d4de850b WHIRLPOOL 21e662fe7f713a98e5e16225e3860585f0abb8e4a47b5f0ae52262a929a32ce563e1108c80602c9c2136180957c1b8bb4b89d8b9fc84415c155212d326f08b90 DIST botocore-1.2.10.tar.gz 2202147 SHA256 8541895aa2abe2183fa15efe33794db7428fec3302e0c9bf1db13fa1668e2b66 SHA512 5395776f50c5302d2fa75af702ced17da66a4c0435d62aed907f1ceaa93d38acc2d91a250d2153d852239a08d9f7f0bf361523cc89168a6cb81ef6f8a6ec5124 WHIRLPOOL aa4ff7a2aa1a900642782783b85479943bcce85c7df0c056d989d329c0693424110859a1d9d358e0cc5af94be174c96786c2f339e78934c114011606dfce11ec -DIST botocore-1.2.4.tar.gz 2007943 SHA256 6330dec53831e4f961e2503a4d9bfe9e790e1e7ac716f8edc07f1b37ff2765da SHA512 c2d0ee934a0b0a25a617a100528daa2951e6cb5139bd7dc5d550bcffcb777119f141b96e0a60dda1277dc8199acfd33e80d002bd3cc730c011e5dadfc52c6f33 WHIRLPOOL f2ff39099b08808e4684abf0d800c05593d66ae68a68f112abab97a715a4c6248ef6f193816faf481e8bc5a3814b22978c0e06a29e5a4cdfb39e24d112b5ef21 +DIST botocore-1.3.0.tar.gz 2224783 SHA256 b93f113b40b048a1f636f96797c14d2f5b3e5d112e8a030f2b9fa8b15a16d38c SHA512 8aae8d1e3b162969135778c91dedf672e934dce39fffc364c259f1695d28c2910e6e29dc11c264c287328c9d0ba71455ec7e31894fca03a237cb40464b7e47ba WHIRLPOOL 0f0e311223553b70201fad6a0d6f77865bfb7d1800b39ceffbcd8b0463540bbd4380bbc24e83dbdec1e605e94867ecb6bfdddef432a7455297e3f1b4be2d3592 +DIST botocore-1.3.2.tar.gz 2243332 SHA256 af8176c95244bd9195afb4cf2a2c21a605e884cf6886889c6d983d2adda844ad SHA512 e68288c0f9aae3e30814df3a5562e503d6affc238d74f2a2c8c7e1796f3a1d49bf3408befd9aeb8753d81944118cff7af61ba7db57881f51ca07378fd0d1ec4d WHIRLPOOL adfdef5696e2f3d95626f2b474fe616db5a3874bbfdacb33ed69260dc66c9c62c86016fe9f102272ef012d1b0ec64a1ebe9f0502830c6648be959cf1b8fd7739 diff --git a/dev-python/botocore/botocore-1.3.0.ebuild b/dev-python/botocore/botocore-1.3.0.ebuild new file mode 100644 index 000000000000..6927baa78bfe --- /dev/null +++ b/dev-python/botocore/botocore-1.3.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_4 ) + +inherit distutils-r1 vcs-snapshot + +DESCRIPTION="Low-level, data-driven core of boto 3." +HOMEPAGE="https://github.com/boto/botocore" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc test" + +CDEPEND=" + >=dev-python/docutils-0.10[${PYTHON_USEDEP}] + >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] + <dev-python/jmespath-1.0.0[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}] + <dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}] +" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( + >=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}] + <dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}] + <dev-python/sphinx-1.3[${PYTHON_USEDEP}] + ) + test? ( + ${CDEPEND} + dev-python/mock[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + ) +" +RDEPEND="${CDEPEND}" + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + nosetests tests/unit || die "tests failed under ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/build/html/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/botocore/botocore-1.2.4.ebuild b/dev-python/botocore/botocore-1.3.2.ebuild index 5908e96eca5c..74e695890019 100644 --- a/dev-python/botocore/botocore-1.2.4.ebuild +++ b/dev-python/botocore/botocore-1.3.2.ebuild @@ -18,7 +18,8 @@ IUSE="doc test" CDEPEND=" >=dev-python/docutils-0.10[${PYTHON_USEDEP}] - ~dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] + >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] + <dev-python/jmespath-1.0.0[${PYTHON_USEDEP}] >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}] <dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}] " diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest index 37edbbdea794..58c0ff381950 100644 --- a/dev-python/bottle/Manifest +++ b/dev-python/bottle/Manifest @@ -1,2 +1,3 @@ DIST bottle-0.12.7.tar.gz 69375 SHA256 e3ea2191f06ca51af45bf6ca41ed2d1b2d809ceda0876466879fe205be7b2073 SHA512 ef58c0ec3b09b237914a170aae59a577a59e579478cd5f1bcef9fe73a9d3a4776794263d6f7b60dd426629aec2987ee4c3f6b8fa0486a99879792c70e373fcbc WHIRLPOOL dc6a34f9819ed77b0b05c01c13efe553af37fc9c32cfe955d6199277a8e38992a0e4982b8e67b0aab12349f15434d094ec7674a7970c71e264e72f3b74c617f0 DIST bottle-0.12.8.tar.gz 69414 SHA256 cd5d1755a85e533205ed8a2465badf38602227c5f171c3852e07724b28c050ac SHA512 85fbdac6f7ae804a74bc527bb47bcdb5cf653a0227efe36e81e25513b687dd4abc1f772ff7232bd914cb392dea07297154d80aa05b1216c1f796dbed0d5a9510 WHIRLPOOL 833f434683f18511560973a9b0defeaa048ec21d0c60d30c69b11fc12f0ea4511a693a532d227b4ef419c99e664ba26384a95111950bf2ec1128a5509d8a0259 +DIST bottle-0.12.9.tar.gz 69516 SHA256 fe0a24b59385596d02df7ae7845fe7d7135eea73799d03348aeb9f3771500051 SHA512 c11d3cb916a0912dcda953a25b9e3a4c6f8e68e31bbaba653f1cae0e12f6b6d827fcbc9d1dfbdb9af2e28276b0056a31fa863d3723a709911406f426d528840b WHIRLPOOL 03f2a43002110b7e2aaf3d477d249b804db20cc68a0c534a059e1c0937ed574c1b6f00fd5ffe43acd027425e9e40815269af617a769cce74e5ca5f25b25dc0e7 diff --git a/dev-python/bottle/bottle-0.12.9.ebuild b/dev-python/bottle/bottle-0.12.9.ebuild new file mode 100644 index 000000000000..a6eab3716a17 --- /dev/null +++ b/dev-python/bottle/bottle-0.12.9.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 eutils + +DESCRIPTION="A fast and simple micro-framework for small web-applications" +HOMEPAGE="https://pypi.python.org/pypi/bottle http://bottlepy.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="test" + +DEPEND="test? ( dev-python/mako[$(python_gen_usedep 'python*')] )" +RDEPEND="" + +PATCHES=( + "${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch +) + +python_prepare_all() { + sed -i -e '/scripts/d' setup.py || die + + # Remove test file requring connection to network + rm ./test/test_server.py || die + distutils-r1_python_prepare_all +} + +python_test() { + # A few odd fails in the suite under pypy + # https://github.com/bottlepy/bottle/issues/714 + "${PYTHON}" test/testall.py || die "tests failed under ${EPYTHON}" +} + +pkg_postinst() { + optfeature "Templating support" dev-python/mako + elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)" + elog "we do as most other distros and do not install the script anymore." + elog "If you do want/have to call it directly rather than through your app," + elog "please use the following instead:" + elog ' `python -m bottle`' +} diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest index 1b667a3c21df..c864b9ec1e4b 100644 --- a/dev-python/cachetools/Manifest +++ b/dev-python/cachetools/Manifest @@ -1 +1,2 @@ DIST cachetools-1.1.0.tar.gz 12901 SHA256 089aca268864a5d1fd77ad96f51ef6afe011d7df55df21ca586968e2a24d68dd SHA512 271b5ba5a373165cfccb47b50c3ffa384577e53a85eb58327e9ef716036a6129e0ad0f1ef16603817666eb7ab4cd781b7731ce8ea88dce47965b4e8e61fc3dab WHIRLPOOL 1ce4c23bd974ed43ae0df6179a9bb8b3fd62705e63392a0f53ea054524afd6e93f753ba4ae6cccbb1fa44d7e7ffaf94493ef902dc81f3edaf7d6fb4ca4b5e9d3 +DIST cachetools-1.1.5.tar.gz 13378 SHA256 9810dd6afaec9e9eaae5ec33f2aa7117214a7a3f8427e70ab23939fe4d1bf279 SHA512 2565fa8666dffe5cbc349f80e719e0ae0df3ec36de3843f368fa67777b4e957c81f8c32f7d6eb704ea1fda5c2851bf57d68e563afa63ed0f7664d3615671f998 WHIRLPOOL 6118a940e3eea2b13a8c0544da87089cdb548b85de5c176f1449bb17e335b7fd975be66e6a33c2b5eb8cd04ad0f15f8e84810c3431dcfeab61627d28158780a7 diff --git a/dev-python/unicodecsv/unicodecsv-0.11.1.ebuild b/dev-python/cachetools/cachetools-1.1.5.ebuild index 01eaab810e38..69dfd7ed2684 100644 --- a/dev-python/unicodecsv/unicodecsv-0.11.1.ebuild +++ b/dev-python/cachetools/cachetools-1.1.5.ebuild @@ -3,18 +3,19 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 ) + +PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) inherit distutils-r1 -DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode" -HOMEPAGE="https://pypi.python.org/pypi/unicodecsv" +DESCRIPTION="Extensible memoizing collections and decorators" +HOMEPAGE="https://pypi.python.org/pypi/cachetools" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -LICENSE="BSD" +LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="" -DEPEND="${RDEPEND}" +DEPEND="" +RDEPEND="${DEPEND}" diff --git a/dev-python/cassandra-driver/Manifest b/dev-python/cassandra-driver/Manifest new file mode 100644 index 000000000000..9592b7c5666c --- /dev/null +++ b/dev-python/cassandra-driver/Manifest @@ -0,0 +1 @@ +DIST cassandra-driver-2.7.2.tar.gz 413805 SHA256 dcff93964334902c5707a3024b500c063ec254da61adae9ab8b3824d56088cd5 SHA512 7548764f2a315dc6f6d4a00138767e6ba6b453a7d7ff19c0913f8c931ae6cb163092644c2d24b87e9efefcdf8568d7e84dccf9f990ab498f187a1bb0c498f415 WHIRLPOOL 219a4017d0e129d14aa2cf87ac5f4875c671777e8064cbaf240f84b22df171b3be902fabeec8327e4064b6417c8b44d12b4d9d462bc491d71ae6ec3149612898 diff --git a/dev-python/cassandra-driver/cassandra-driver-2.7.2.ebuild b/dev-python/cassandra-driver/cassandra-driver-2.7.2.ebuild new file mode 100644 index 000000000000..679696c37874 --- /dev/null +++ b/dev-python/cassandra-driver/cassandra-driver-2.7.2.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_4 ) + +inherit distutils-r1 eutils vcs-snapshot + +DESCRIPTION="DataStax python driver for Apache Cassandra" +HOMEPAGE="https://github.com/datastax/python-driver https://pypi.python.org/pypi/cassandra-driver/${PV}" +SRC_URI="https://github.com/datastax/python-driver/archive/${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Apache-2.0" + +SLOT="0" +KEYWORDS="~amd64" +IUSE="+cython doc +libev +murmur test" + +RDEPEND=" + $(python_gen_cond_dep '=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' python2_7) + >=dev-python/six-1.6[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + cython? ( + >=dev-python/cython-0.20[${PYTHON_USEDEP}] + ) + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + ) + libev? ( + dev-libs/libev + ) + test? ( + dev-python/nose[${PYTHON_USEDEP}] + ~dev-python/mock-1.0.1[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/sure[${PYTHON_USEDEP}] + ) +" + +python_configure_all() { + mydistutilsargs=( $(usex cython "" --no-cython) + $(usex libev "" --no-libev) + $(usex murmur "" --no-murmur3) ) +} + +python_compile_all() { + use doc && esetup.py doc +} + +python_test() { + nosetests -v tests.unit || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + distutils-r1_python_install_all "${@}" + use doc && dohtml -r docs/_build/${PV}/. +} + +pkg_postinst() { + einfo + einfo "Some behaviors of this driver are enabled at run-time" + einfo "when certain libs are detected. Compression support is" + einfo "enabled if dev-python/lz4 or dev-python/snappy are" + einfo "installed. Also scales (for metrics) and blist (for" + einfo "sorted sets) provide additional features, though there" + einfo "are not packages in the tree yet (install with pip)." + einfo +} + +# TODO +# - dev-python/eventlet and dev-python/gevent appear to be +# optional runtime deps but the docs never explicitly mention them. +# Is it maybe the case that one of the two is required, but only +# if libev is built? diff --git a/dev-python/cassandra-driver/metadata.xml b/dev-python/cassandra-driver/metadata.xml new file mode 100644 index 000000000000..f615e39e47fc --- /dev/null +++ b/dev-python/cassandra-driver/metadata.xml @@ -0,0 +1,30 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>python</herd> + <maintainer> + <email>stasibear@gentoo.org</email> + <name>Erik Mackdanz</name> + </maintainer> + <longdescription> + A modern, feature-rich and highly-tunable Python + client library for Apache Cassandra (1.2+) and + DataStax Enterprise (3.1+) using exclusively + Cassandra's binary protocol and Cassandra Query + Language v3. + </longdescription> + <use> + <flag name="cython"> + Optimize core modules and build custom extensions + </flag> + <flag name="libev"> + libev event loop integration + </flag> + <flag name="murmur"> + Faster hashing for token-aware routing + </flag> + </use> + <upstream> + <remote-id type="github">datastax/python-driver</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest index bf6365d1456b..d144acdb5d5d 100644 --- a/dev-python/celery/Manifest +++ b/dev-python/celery/Manifest @@ -1,2 +1,3 @@ DIST celery-3.1.17.tar.gz 1297008 SHA256 cfe2b653268bd586e2d08a75e886f7be3be55ba372f72e2f5747aeb76c470362 SHA512 f45f92161c134f528719768ad863df6b49fa69e022b47ea801e590de8579c24c6a5ec9dd88f712e180ed7d23f4510cecf4f17a959c3338d4bad79f8d7d202453 WHIRLPOOL c0f4ddab40eab2afe579c88bc9e47d46a650a73212abb7cb1d343d7ba72c1d96913c1c04a6e9920789bd6f9bf6907c09e6326aa08e6ba3cf68545e44432b95de DIST celery-3.1.18.tar.gz 1298756 SHA256 0924f94070c6fc57d408b169848c5b38832668fffe060e48b4803fb23e0e3eaf SHA512 219291a64c72a0c95a2b184903e491d5b6b1396b4b519d54503bb059af305c2f118865b71510d5685b8f5946135596c9d80d6ca10162a938ed90baaf4c3c48c3 WHIRLPOOL 0d27eda95fea5b6235afd7d5f90de249eec6d7c58a7563afb0cc73d29b84cb6903eced4b9515fe574206111fc4a304c5f24d3c476b4315416b441f324f2ebfa5 +DIST celery-3.1.19.tar.gz 1302241 SHA256 bd6a21290c822ecf78947a7dbc8b2270d88a5fa08a7a2bfcd908bb3d5ed66b71 SHA512 47aef118fb4178a4874608a8e9370d6f81d5594aba6d25e679a78bd530b57f0566a27db4fdb50786a237b1747dfc2b662462f107230d0653da28ac1d4b64b703 WHIRLPOOL 37076e3d414cdd74e4b2d2145189a11380da58f77fe1acd44d190f8de1744b909512d895c00ec2c0252c23d9300b7b011f06b388a45526d9573fa00bc71986d7 diff --git a/dev-python/celery/celery-3.1.19.ebuild b/dev-python/celery/celery-3.1.19.ebuild new file mode 100644 index 000000000000..e746f2b1cb88 --- /dev/null +++ b/dev-python/celery/celery-3.1.19.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) + +inherit distutils-r1 bash-completion-r1 + +DESCRIPTION="Open source asynchronous task queue/job queue based on distributed message passing" +HOMEPAGE="http://celeryproject.org/ https://pypi.python.org/pypi/celery" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# There are a number of other optional 'extras' which overlap with those of kombu, however +# there has been no apparent expression of interest or demand by users for them. See requires.txt +IUSE="doc examples redis sqs test yaml zeromq" + +RDEPEND=" + <dev-python/kombu-3.1[${PYTHON_USEDEP}] + >=dev-python/kombu-3.0.29[${PYTHON_USEDEP}] + >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] + >=dev-python/billiard-3.3.0.21[${PYTHON_USEDEP}] + <dev-python/billiard-3.4[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/greenlet[${PYTHON_USEDEP}] +" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( ${RDEPEND} + dev-python/gevent[$(python_gen_usedep python2_7)] + >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] + dev-python/nose-cover3[${PYTHON_USEDEP}] + >=dev-python/pymongo-2.6.2[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] + dev-python/redis-py[${PYTHON_USEDEP}] + >=dev-db/redis-2.8.0 + >=dev-python/boto-2.13.3[${PYTHON_USEDEP}] + >=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] + ) + doc? ( + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}"/celery-docs.patch + "${FILESDIR}"/${P}-test.patch +) + +# testsuite needs it own source +DISTUTILS_IN_SOURCE_BUILD=1 + +python_compile_all() { + if use doc; then + mkdir docs/.build || die + emake -C docs html + fi +} + +python_test() { + nosetests --verbose || die "Tests failed with ${EPYTHON}" +} + +python_install_all() { + # Main celeryd init.d and conf.d + newinitd "${FILESDIR}/celery.initd-r2" celery + newconfd "${FILESDIR}/celery.confd-r2" celery + + use examples && local EXAMPLES=( examples/. ) + + use doc && local HTML_DOCS=( docs/.build/html/. ) + + newbashcomp extra/bash-completion/celery.bash ${PN} + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "zookeper support" dev-python/kazoo + optfeature "msgpack support" dev-python/msgpack + #optfeature "rabbitmq support" dev-python/librabbitmq + #optfeature "slmq support" dev-python/softlayer_messaging + optfeature "eventlet support" dev-python/eventlet + #optfeature "couchbase support" dev-python/couchbase + optfeature "redis support" dev-db/redis dev-python/redis-py + optfeature "couchdb support" dev-db/couchdb dev-python/couchdb-python + optfeature "gevent support" dev-python/gevent + optfeature "auth support" dev-python/pyopenssl + optfeature "pyro support" dev-python/pyro:4 + optfeature "yaml support" dev-python/pyyaml + optfeature "beanstalk support" dev-python/beanstalkc + optfeature "memcache support" dev-python/pylibmc + #optfeature "threads support" dev-python/threadpool + optfeature "mongodb support" dev-python/pymongo + optfeature "zeromq support" dev-python/pyzmq + optfeature "sqlalchemy support" dev-python/sqlalchemy + optfeature "sqs support" dev-python/boto + #optfeature "cassandra support" dev-python/pycassa +} diff --git a/dev-python/celery/files/celery-3.1.19-test.patch b/dev-python/celery/files/celery-3.1.19-test.patch new file mode 100644 index 000000000000..25b41456a0ce --- /dev/null +++ b/dev-python/celery/files/celery-3.1.19-test.patch @@ -0,0 +1,16 @@ +https://github.com/celery/celery/commit/fb48b1f357f7a416d1413d0056158a74191185af.diff +diff --git a/celery/tests/backends/test_mongodb.py b/celery/tests/backends/test_mongodb.py +index f7546d3..a32d9ed 100644 +--- a/celery/tests/backends/test_mongodb.py ++++ b/celery/tests/backends/test_mongodb.py +@@ -253,8 +253,8 @@ def test_restore_group(self, mock_get_database): + mock_collection.find_one.assert_called_once_with( + {'_id': sentinel.taskset_id}) + self.assertItemsEqual( +- ['date_done', 'result', 'task_id'], +- list(ret_val.keys()), ++ list(sorted(['date_done', 'result', 'task_id'])), ++ list(sorted(ret_val.keys())), + ) + + @patch('celery.backends.mongodb.MongoBackend._get_database') diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest index 0c7a81b02920..0c9ea25a1720 100644 --- a/dev-python/certifi/Manifest +++ b/dev-python/certifi/Manifest @@ -1,3 +1 @@ -DIST certifi-14.05.14.tar.gz 168608 SHA256 1e1bcbacd6357c151ae37cf0290dcc809721d32ce21fd6b7339568f3ddef1b69 SHA512 5edba0cc432c27212e31085fb3c2f2ded6fa177d716116111517c25b980d9fc206a9a6d47e2c001762e951ff50203b269d0eb245a039df20188b1136f3b700b2 WHIRLPOOL 54c3f7a8da25693f5df890c5bc348242350a7a63bc0094d5fbb08a4f89c79fcc3ce0bbf0cdeac7d2dfca5ebe5601a7ae5ec4fef492a6cf9afe6ecf5119d47f8b -DIST certifi-2015.04.28.tar.gz 370682 SHA256 99785e6cf715cdcde59dee05a676e99f04835a71e7ced201ca317401c322ba96 SHA512 c63287d9e0814226a1eb6ea0f6d1a53f0fd88995c0c2541e404efd0c70471fae01cb56ecca5425c6754342c28c96948ba912bd860bf2d336bba95a0b751f8f99 WHIRLPOOL e235b016ca30332359f9172cf907f9372714371efcccf5bc2b82e08538ca1620f6854697201a6a3d1de5d25e74f5b3fede68e3c46255a9cd28b1f87b8dfa97b2 DIST certifi-2015.9.6.2.tar.gz 368588 SHA256 dc3a2b2d9d1033dbf27586366ae61b9d7c44d8c3a6f29694ffcbb0618ea7aea6 SHA512 78166fa708e7f5162bc36c5b552b1c19e316f4f540db5733167730e9d3a7610b90622546b9e49bc539d9d4de543a169046d24fbbcded98b74f68351a91d15f31 WHIRLPOOL 4c1f075ea41d00819325bd49213c39f0af3f7e0393a2ea8b4c6efbfc38e828ee8e6b807da4a43974182a65565c6eed76d491d09f03841c9f96251d15bf19f9b7 diff --git a/dev-python/certifi/certifi-14.05.14.ebuild b/dev-python/certifi/certifi-14.05.14.ebuild deleted file mode 100644 index e0d711a7f31c..000000000000 --- a/dev-python/certifi/certifi-14.05.14.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) - -inherit distutils-r1 - -DESCRIPTION="Python package for providing Mozilla's CA Bundle" -HOMEPAGE="http://python-requests.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm hppa ppc ppc64 x86" -IUSE="" - -RDEPEND="" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/certifi/certifi-2015.04.28.ebuild b/dev-python/certifi/certifi-2015.04.28.ebuild deleted file mode 100644 index 1e8ccc5746e8..000000000000 --- a/dev-python/certifi/certifi-2015.04.28.ebuild +++ /dev/null @@ -1,21 +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 python3_{3,4} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Python package for providing Mozilla's CA Bundle" -HOMEPAGE="http://certifi.io/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/certifi/certifi-2015.9.6.2.ebuild b/dev-python/certifi/certifi-2015.9.6.2.ebuild index a9182ffb380a..68f2b27de9eb 100644 --- a/dev-python/certifi/certifi-2015.9.6.2.ebuild +++ b/dev-python/certifi/certifi-2015.9.6.2.ebuild @@ -14,7 +14,7 @@ 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 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="" diff --git a/dev-python/click/click-5.1.ebuild b/dev-python/click/click-5.1.ebuild index b0aa96c7e1c2..b7e064631bc5 100644 --- a/dev-python/click/click-5.1.ebuild +++ b/dev-python/click/click-5.1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="doc examples test" DEPEND=" diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild index 7536aa84c6a6..9e6fa0ed217e 100644 --- a/dev-python/colorama/colorama-0.3.3.ebuild +++ b/dev-python/colorama/colorama-0.3.3.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="examples" python_install_all() { diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest index e447da84f2e2..fba6d8031638 100644 --- a/dev-python/coloredlogs/Manifest +++ b/dev-python/coloredlogs/Manifest @@ -1,3 +1,6 @@ DIST coloredlogs-1.0.1.tar.gz 13926 SHA256 11067ca91532ba4a316fa53b005152a08b3e015dcb1234d393cfc25af88ebc3e SHA512 098aa22b371ffdb6400fac7d2f000aa73f8956eae71f48ceed2110eb35a4b4d11f814f8cacca643c4deccd82da058a750c700264e7c71c2351514a6f887101a5 WHIRLPOOL 71b447498d5e91a0cda131046f7545230bc0c13aa814f0d79cf8888bd60934dee7c5cc54a729dd36b0a937451f80302384fb0733fd94e43e09c2ce9258c950fd DIST coloredlogs-2.0.tar.gz 15486 SHA256 532198042eac7560f5292961bfb6f844343132fda805575684f67deeb780b2c2 SHA512 b42e18b563caef4506377fba754e976fed31b7402d418ca79d1875504986572b36fe90b602afcb952dc8b06b9f7bc7ed6861abc2239ae5b5340e006377f9a14d WHIRLPOOL 6cbec16a204f91a218428c8056e2c39d94aeaedbf3356b2548fa288a386b8583bf639a40f0c40dc596096bf44ccb28acb7c2d66403d19cf72143599ba88a82b5 +DIST coloredlogs-3.1.2.tar.gz 22914 SHA256 ad559e2f2e08eadfb63a210344acf0d00855ba0896fc5662e8d57e1a488e3209 SHA512 872d041f732bb30a0cc3decd5dc677cf58aad300d6cd37fc0a38dcdb24bad2e6640f332ab58e469b07e2a37d6b7fdbfdf6e804431df175c48add00d86a3b5624 WHIRLPOOL 6d9593d8db8eac3ec558581a0772e7264e74e3c4e084c76af58402b2627b3b97689f947ee6eb871bd1fc65c3a2855d66f9f64434b8f612d55b7cefbf3670edf2 +DIST coloredlogs-3.1.3.tar.gz 22911 SHA256 d2195daa0e310bfaaf3dae47e22feaa3ee3631885e2ffc19aa765ad02196bf03 SHA512 81ff3476ee44dae3b08b1849189cfd03f7eb0e3c97414b463aeba1f7c6b3a3539f234dd058a0b05a503c5e5f4490236e8145fcb8bc019abb1888d8f10f542ca9 WHIRLPOOL 78f668fbac2ac9c61aa82a831c1ca2fd36bbb52557677f565b495dc9ce3206f048fd6e3d6493166559f9a7111f97f9466782d7a643675cea9615303d6a9dbc53 +DIST coloredlogs-3.1.4.tar.gz 23038 SHA256 c906ef520d55b94ace4f0aad8625a89fc1d324f24ed2892cc1ac5d479183a14c SHA512 0ee97d0b0e12351c006686418b09a951c3f4c04b6533437e41ffd54f9c427c2b9e5a35c486a37c54565d7cb0c4150b1656a87fed5a86f3ed08b3cd2595d59bd5 WHIRLPOOL caeb81a34e2c832a0d75e8123bb0d9d7e9071269b44e103031ab31657225f43a578f4eb10c6f5aaccce24feba08460fceb8bce9e0bba8eb873df2daa65338fa0 DIST coloredlogs-3.1.tar.gz 22876 SHA256 d3efaaaa1ae85c3a1af335f116f634832691873dd87e5872b94bee1dd0a1e43a SHA512 01ed7841a79278b21fc0588b527803f8092b371c866785949d57f8c04649457fbe34c98ec77d3921f05f224b6d21e1a8fc8f835e4ea542886b948124d9d02bb1 WHIRLPOOL c59cbbd0e773763dcc95c45986385ca518ed9f0c59030d2421af0a4f62c9e3a08586f894e5910000058dc5e3cfb3a2c39c7886ec0673d59c40d1d811755bd109 diff --git a/dev-python/coloredlogs/coloredlogs-3.1.2.ebuild b/dev-python/coloredlogs/coloredlogs-3.1.2.ebuild new file mode 100644 index 000000000000..5145699bf294 --- /dev/null +++ b/dev-python/coloredlogs/coloredlogs-3.1.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit distutils-r1 + +DESCRIPTION="Colored stream handler for the logging module" +HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=">=dev-python/humanfriendly-1.42[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/capturer[${PYTHON_USEDEP}] + dev-python/verboselogs[${PYTHON_USEDEP}] + )" + +DOCS=( README.rst ) + +PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch ) + +python_test() { + esetup.py test +} diff --git a/dev-python/coloredlogs/coloredlogs-3.1.3.ebuild b/dev-python/coloredlogs/coloredlogs-3.1.3.ebuild new file mode 100644 index 000000000000..5145699bf294 --- /dev/null +++ b/dev-python/coloredlogs/coloredlogs-3.1.3.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit distutils-r1 + +DESCRIPTION="Colored stream handler for the logging module" +HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=">=dev-python/humanfriendly-1.42[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/capturer[${PYTHON_USEDEP}] + dev-python/verboselogs[${PYTHON_USEDEP}] + )" + +DOCS=( README.rst ) + +PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch ) + +python_test() { + esetup.py test +} diff --git a/dev-python/coloredlogs/coloredlogs-3.1.4.ebuild b/dev-python/coloredlogs/coloredlogs-3.1.4.ebuild new file mode 100644 index 000000000000..5145699bf294 --- /dev/null +++ b/dev-python/coloredlogs/coloredlogs-3.1.4.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit distutils-r1 + +DESCRIPTION="Colored stream handler for the logging module" +HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=">=dev-python/humanfriendly-1.42[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/capturer[${PYTHON_USEDEP}] + dev-python/verboselogs[${PYTHON_USEDEP}] + )" + +DOCS=( README.rst ) + +PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch ) + +python_test() { + esetup.py test +} diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest index 3031210c894f..c220ee235b56 100644 --- a/dev-python/cryptography-vectors/Manifest +++ b/dev-python/cryptography-vectors/Manifest @@ -13,3 +13,4 @@ DIST cryptography_vectors-0.9.tar.gz 24983458 SHA256 d4accc8f5fb763cb65021c0e792 DIST cryptography_vectors-1.0.1.tar.gz 25005401 SHA256 e4ea240cb991a493bf2172056398b50f7c9e3cfbd809149b4887740a3d854cc4 SHA512 d77e5132f12111bed6cfa9c52cc3dd55f592980c76b9b370f1013d9d91a72c17b5bed49b9e2982b1e2aef7efccc02c0fc11f9706f7628affc94920cbc37c44a4 WHIRLPOOL c7b3a9f601997c6e0966402e08828c56ac5ee03017f1663394e69ae2cd6d4dc907b2c49d9c9a7b7893ef4f2d6fb283fd308987264c027baf21d5756be3f14508 DIST cryptography_vectors-1.0.2.tar.gz 25005614 SHA256 b849aa26a596b4ad8193d5b06a9414dab798c1f05c661321e759d5ebd944a937 SHA512 c87a915d83b8b57c8028edc3cfbd8efbf1f51b36508db4ef489481479cfc14a296fd1d76c5e013c60cdcf5458824fb16496aeabe2bb80004cf721286800d4751 WHIRLPOOL 90542095b97bf257ef871cf8b1224f5a2060cf80c4c34e44fbfaacf163020d4108c8a36aed90062ab6bb4cd65bfbc2149992eee1efd987955f1a86df551b4418 DIST cryptography_vectors-1.0.tar.gz 25003925 SHA256 e7277818b7bd99b502ee79d37cf5b9405577c39171919014756181b947ea0234 SHA512 e426e06d03b2e720cf7177a2d746dc45a2bc04455379d3231952543f3621e4829b43cedc09f7a96b7eba695b5424f8189916d4a7acafc08ca4cacb1965e672af WHIRLPOOL 397840e9c76cf8d50f85cf664d1dcab9cc9eb495c0d29830eb34d62d11c5b9f36f4e466d176d290c22febfecba85ca19358616cd3c8c967a060743175be7f852 +DIST cryptography_vectors-1.1.tar.gz 25026549 SHA256 a929fbb0eac391c93c5745451a4d4157a8bc18eb2e69faf3af1d825ceacbf32c SHA512 e4d595f61bcf406a9b5422b1d6321ed18ef6c433b5557340b60d168b378a40cc7e068072a041b1190c6be00b83876b99e2bf441e154fc5a1b5ccfa51f485f731 WHIRLPOOL 5d0e82c2c07410c7e8848f6aaafbce274b4ac3ec65c7e6f73ea1e220d8433d8eae2151e0a9c28eb7d0245337f06fb7ca204a77a8febf0e60e019127a060af2ee diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.1.ebuild new file mode 100644 index 000000000000..91cc43726a8b --- /dev/null +++ b/dev-python/cryptography-vectors/cryptography-vectors-1.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +MY_PN=${PN/-/_} +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Test vectors for the cryptography package" +HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" + +LICENSE="|| ( Apache-2.0 BSD )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="" + +S=${WORKDIR}/${MY_P} diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest index bf00855e8182..17aebd234d97 100644 --- a/dev-python/cryptography/Manifest +++ b/dev-python/cryptography/Manifest @@ -10,3 +10,4 @@ DIST cryptography-0.9.3.tar.gz 303075 SHA256 aed022f738dd9adb840d92960b0464ea1fb DIST cryptography-1.0.1.tar.gz 332242 SHA256 cfe3092a6a929bc3a97c3b752044b79d09c9b210860c7b4eb5061aea29dcbfd3 SHA512 a813084f09113baf17ea344dc2bc71fc09a164908661e8a469997c5212a30c09f65b87f84df0f2c70a38b3529faeb78e08430054d065bd46fc625a1bd62d1ddb WHIRLPOOL f7039799f11da6f95826936e5279d8e9be8971af33601058a910a34d62e1f53879ce93fb69dbd3909d3a2890680c1dabc3a5ce812b34c6882764aafd9ab0ce94 DIST cryptography-1.0.2.tar.gz 332870 SHA256 d64cd491e91ddf642c643bea16532c2a2da2da054cca6df756edadd55a8bacca SHA512 f266fbee6ab06ed6a552599dffe6d3e959dd858e6be7b81c0d4489c384fbb2b5de5ecf4f1e43e1dacbaa6ddefd1562f10961caec73cb3ed256faa03a5d4eff85 WHIRLPOOL ba8c13df5c58ab551f43ddf51cde8e85835a06eda83e5a5039e32308431b6f365692b01ea343adba6fcafe80d045a04b8ef37324e5bf1ada0adef10752f1e321 DIST cryptography-1.0.tar.gz 331438 SHA256 211c02fe77d791d7fc437227ba1c046268d5da665e05d8a53fc19f4f74c21001 SHA512 a4e4f8b054a357e0856a67b246ba770f38222f45f0d8c3185bdfe20593f4d5a20d2082a0c7b9986d5b557dc2b43a0903bcb37eba10e4ca1d83f903fea6c39753 WHIRLPOOL c36bead358e8d30785f3d565366a0a8ec7b356cd31274aac7d0fe0286d36af52916fb3840000d22c53e487d26adb6d42b6dd69d1d7d5aed2fe20dc8cbef86e77 +DIST cryptography-1.1.tar.gz 348676 SHA256 059bc6428b1d0e2317f505698602642f1d8dda5b120ec573a59a430d8cb7a32d SHA512 8d5b5ac7cc2dcf7271dcd85c65c42cd815b95ec8502864da1b7c32c4a5905ecc6ae45f54d11e7b539d9ddf10d8bd3de9f40233c0b3cbdd1132b2ffbd4ebb318f WHIRLPOOL 0f154e624a51ebbc342ea082fc00a66b21024c81f3265e7d0e22e089afc5e83dcfe2857113d911db3a8e253d6fe93413ff94b91a83e97fd9405c3f08becc8a03 diff --git a/dev-python/cryptography/cryptography-1.1.ebuild b/dev-python/cryptography/cryptography-1.1.ebuild new file mode 100644 index 000000000000..805a5ab8ba6b --- /dev/null +++ b/dev-python/cryptography/cryptography-1.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Library providing cryptographic recipes and primitives" +HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="|| ( Apache-2.0 BSD )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="libressl test" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + $(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*') + $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy) + >=dev-python/idna-2.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy) + >=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/six-1.4.1[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy ) + " +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] + dev-python/hypothesis[${PYTHON_USEDEP}] + dev-python/iso8601[${PYTHON_USEDEP}] + dev-python/pretend[${PYTHON_USEDEP}] + dev-python/pyasn1-modules[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + )" + +DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) + +python_test() { + py.test -v -v -x || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/d2to1/metadata.xml b/dev-python/d2to1/metadata.xml index a328208040ef..bc3f41cff4e4 100644 --- a/dev-python/d2to1/metadata.xml +++ b/dev-python/d2to1/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> @@ -9,5 +9,6 @@ which will slurp its arguments from the setup.cfg.</longdescription> <upstream> <remote-id type="pypi">d2to1</remote-id> + <remote-id type="github">embray/d2to1</remote-id> </upstream> </pkgmetadata> diff --git a/dev-python/distlib/distlib-0.2.1-r1.ebuild b/dev-python/distlib/distlib-0.2.1-r1.ebuild new file mode 100644 index 000000000000..5f843295eb78 --- /dev/null +++ b/dev-python/distlib/distlib-0.2.1-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Distribution utilities" +HOMEPAGE="https://pypi.python.org/pypi/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +PATCHES=( + "${FILESDIR}"/${P}-unbundle.patch +) + +python_prepare_all() { + rm -r \ + distlib/*.exe \ + distlib/_backport \ + tests/test_shutil.py* \ + tests/test_sysconfig.py* || die + + # Broken tests + # 1 fails due to it being sensitive to dictionary ordering + # inconsistency between code and test + sed \ + -e 's:test_dependency_finder:_&:g' \ + -e 's:test_abi:_&:g' \ + -i tests/*py || die + + distutils-r1_python_prepare_all +} + +python_test() { + sed \ + -e '/PIP_AVAILABLE/s:True:False:g' \ + -i tests/*py || die + PYTHONHASHSEED=0 esetup.py test +} diff --git a/dev-python/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild index 5bf9fdf746ed..94201d077b7e 100644 --- a/dev-python/distlib/distlib-0.2.1.ebuild +++ b/dev-python/distlib/distlib-0.2.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" SLOT="0" LICENSE="BSD" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="" python_test() { diff --git a/dev-python/distlib/files/distlib-0.2.1-unbundle.patch b/dev-python/distlib/files/distlib-0.2.1-unbundle.patch new file mode 100644 index 000000000000..5ee912905602 --- /dev/null +++ b/dev-python/distlib/files/distlib-0.2.1-unbundle.patch @@ -0,0 +1,35 @@ +--- distlib-0.1.9/distlib/compat.py.orig 2014-06-06 09:58:21.317560756 +0200 ++++ distlib-0.1.9/distlib/compat.py 2014-06-06 09:58:29.955611427 +0200 +@@ -17,7 +17,7 @@ if sys.version_info[0] < 3: + from types import FileType as file_type + import __builtin__ as builtins + import ConfigParser as configparser +- from ._backport import shutil ++ import shutil + from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit + from urllib import (urlretrieve, quote as _quote, unquote, url2pathname, + pathname2url, ContentTooShortError, splittype) +@@ -267,7 +267,7 @@ except ImportError: # pragma: no cover + try: + import sysconfig + except ImportError: # pragma: no cover +- from ._backport import sysconfig ++ import sysconfig + + try: + callable = callable +--- distlib-0.1.9/setup.py.orig 2014-06-06 10:19:13.971997156 +0200 ++++ distlib-0.1.9/setup.py 2014-06-06 10:19:20.012034150 +0200 +@@ -62,12 +62,7 @@ distutils.core.setup( + platforms='any', + packages=[ + 'distlib', +- 'distlib._backport', + ], +- package_data={ +- 'distlib._backport': ['sysconfig.cfg'], +- 'distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe'], +- }, + cmdclass={ + 'test': TestCommand, + }, diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest new file mode 100644 index 000000000000..f3db6803fd41 --- /dev/null +++ b/dev-python/dj-database-url/Manifest @@ -0,0 +1 @@ +DIST dj-database-url-0.3.0.tar.gz 2747 SHA256 f2e273ed34acbb560962d5cf12917936d8df02297df09bd3089b8546d4584138 SHA512 a27fa974edcc0fcfb99f8b74b25324a7afbf70ae4161576ec72733a3b305e170b23677106b85dbc075c5888330d6187ad9e95fbecc41cf7455c26ebf6f3f86e3 WHIRLPOOL 60e0c50f353ea314c6562a05d5a39042e3db15aca4018e8b35646c991a15fda59ed72b213fcbdef303d3eb47a2cff856b1c1d3d80c3e7868bc619794cf0330f3 diff --git a/dev-python/dj-database-url/dj-database-url-0.3.0.ebuild b/dev-python/dj-database-url/dj-database-url-0.3.0.ebuild new file mode 100644 index 000000000000..e9320c52bb5c --- /dev/null +++ b/dev-python/dj-database-url/dj-database-url-0.3.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Use Database URLs in your Django Application" +HOMEPAGE="https://pypi.python.org/pypi/dj-database-url https://github.com/kennethreitz/dj-database-url" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] +" + +# Not contained in the tarball +RESTRICT=test + +python_test() { + "${PYTHON}" test_dj_database_url.py || die +} diff --git a/dev-python/dj-database-url/metadata.xml b/dev-python/dj-database-url/metadata.xml new file mode 100644 index 000000000000..83de50444b44 --- /dev/null +++ b/dev-python/dj-database-url/metadata.xml @@ -0,0 +1,9 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>python</herd> + <upstream> + <remote-id type="github">kennethreitz/dj-database-url</remote-id> + <remote-id type="pypi">dj-database-url</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/django-celery/django-celery-3.1.16.ebuild b/dev-python/django-celery/django-celery-3.1.16.ebuild index 44b6fe2c148d..872f74f4432c 100644 --- a/dev-python/django-celery/django-celery-3.1.16.ebuild +++ b/dev-python/django-celery/django-celery-3.1.16.ebuild @@ -3,9 +3,10 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_COMPAT=( python{2_7,3_4} ) +PYTHON_REQ_USE="sqlite(+)" -inherit distutils-r1 +inherit distutils-r1 eutils DESCRIPTION="Celery Integration for Django" HOMEPAGE="http://celeryproject.org/" @@ -16,9 +17,14 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="doc examples test" +# Python testsuite fails when built against dev-python/django-1.8.5 +# with ValueError: save() prohibited to prevent data loss due to +# unsaved related object 'interval'. + PY2_USEDEP=$(python_gen_usedep python2_7) RDEPEND=">=dev-python/celery-3.1.15[${PYTHON_USEDEP}] - dev-python/django[${PYTHON_USEDEP}] + >dev-python/django-1.4[${PYTHON_USEDEP}] + <=dev-python/django-1.7.10[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] @@ -37,6 +43,8 @@ PY27_REQUSE="$(python_gen_useflags 'python2.7')" REQUIRED_USE=" doc? ( ${PY27_REQUSE} )" +PATCHES=( "${FILESDIR}/${P}-py3-test-failures.patch" ) + python_compile_all() { use doc && emake -C docs html } diff --git a/dev-python/django-celery/files/django-celery-3.1.16-py3-test-failures.patch b/dev-python/django-celery/files/django-celery-3.1.16-py3-test-failures.patch new file mode 100644 index 000000000000..4b44b664c02e --- /dev/null +++ b/dev-python/django-celery/files/django-celery-3.1.16-py3-test-failures.patch @@ -0,0 +1,39 @@ +https://github.com/brianmay/django-celery/commit/8c4449f2a1b65f16eb405ecb3a2ef98ea7a8bf4f +diff --git a/djcelery/loaders.py b/djcelery/loaders.py +index c86455a..61c6d04 100644 +--- a/djcelery/loaders.py ++++ b/djcelery/loaders.py +# Patch to fix failing tests test_list_registered_tasks and +# test_apply with python3. Patch sourced from upstream +# https://github.com/celery/django-celery/issues/342 +@@ -201,7 +201,8 @@ def find_related_module(app, related_name): + return + + try: +- imp.find_module(related_name, app_path) ++ file, _, _ = imp.find_module(related_name, app_path) ++ file.close() + except ImportError: + return + +diff --git a/djcelery/views.py b/djcelery/views.py +index 34cb307..4d07e0a 100644 +--- a/djcelery/views.py ++++ b/djcelery/views.py +@@ -34,7 +34,7 @@ def task_view(task): + kwargs = kwdict(request.method == 'POST' and + request.POST or request.GET) + # no multivalue +- kwargs = dict(((k, v) for k, v in kwargs.iteritems()), **options) ++ kwargs = dict(((k, v) for k, v in kwargs.items()), **options) + result = task.apply_async(kwargs=kwargs) + return JsonResponse({'ok': 'true', 'task_id': result.task_id}) + +@@ -78,8 +78,8 @@ def task_status(request, task_id): + + def registered_tasks(request): + """View returning all defined tasks as a JSON object.""" +- return JsonResponse({'regular': tasks.regular().keys(), +- 'periodic': tasks.periodic().keys()}) ++ return JsonResponse({'regular': list(tasks.regular().keys()), ++ 'periodic': list(tasks.periodic().keys())}) diff --git a/dev-python/django-nose/Manifest b/dev-python/django-nose/Manifest index 76cc2b5b2ad3..6ad897c61809 100644 --- a/dev-python/django-nose/Manifest +++ b/dev-python/django-nose/Manifest @@ -1,3 +1,4 @@ DIST django-nose-1.3.tar.gz 25149 SHA256 3667d26a41fec30364a0ef72580832ca5328802d553f6d6e72af5ac21cb36365 SHA512 0e7f18d32340f912fcde96c3ed4ff63caec71ad178f9bd01e61087a228d7e93ecfd87c5d320a66093bce438561638daacd586a4ecb3198573b28607d33eb853f WHIRLPOOL 0acbbe147c0e434ef641843d10f9781ef26f3dc428ba8e613165ed43d6f5d1dea27bf513d9efcbd551c38c7a1945ae3b06aafb0a6d01c8714479f0c4836f1863 DIST django-nose-1.4.1.tar.gz 26792 SHA256 224dd1bfd8fcdb9f67256c5430147b4c0105d72f6ac8ce3bca6b486449ec6062 SHA512 9ba42767bdfb0c359d9c693c5a7775767ba1a56c54531e75ff2b97e2e12d2a9f535c771c5b076b9024f3662a4143f115aa4bd84b9844ce8cb71f99c47722dcef WHIRLPOOL 49c285867adcbf0b17a388bfd6c8cd2603d8c7b50ec162b088409c1a049e43718f9bc37167d914327d474f6177fb38e01797a80f0c47bc02fd7db31cbe7e8761 +DIST django-nose-1.4.2.tar.gz 44842 SHA256 736ae53e3ec47dbbb3049999c18ce54585af299ef88172d9a27cb5fda29daa00 SHA512 b29ac1e9b10b8316c851857498c4cea7e76f91da87583d83591d28348622be9aba19cde6067185a4870274c349857654ef4debde29fdd91974eb539cd5c7a281 WHIRLPOOL 03b6bbd16b079a1f9042d4b57af7f59f669798403927a619ab658f7c16001cf586dd3d661eb4efbff94ae7870007fcadfc852fb93fc09e3bd400f29acd5f6cb9 DIST django-nose-1.4.tar.gz 26477 SHA256 26cef3c6f62df2eee955a25195de6f793881317c0f5fd1a1c6f9e22f351a9313 SHA512 2df1377146304bc0356e24a212bee8ee55c05ccaafcd6fceca4afe5ae528335192c4a89c842f4c2df6965965c9536f0862903aff2141139cfc83695b41d56e32 WHIRLPOOL 7da21678b2b955972f14dc806aac7c5615048b5edae96bdcc17ee4d1302d714519a223356398f89b0d512aa3aa6979567682dd81b8bb6c99cd7cdd340fa66293 diff --git a/dev-python/django-nose/django-nose-1.4.2.ebuild b/dev-python/django-nose/django-nose-1.4.2.ebuild new file mode 100644 index 000000000000..e63592d3bc08 --- /dev/null +++ b/dev-python/django-nose/django-nose-1.4.2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Django test runner that uses nose" +HOMEPAGE="https://github.com/jbalogh/django-nose" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +#RESTRICT="test" # The testsuite currently broken See notes below + +RDEPEND=" + >=dev-python/nose-1.2.1[${PYTHON_USEDEP}] + dev-python/django[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( ${RDEPEND} + >=dev-python/dj-database-url-0.3.0[${PYTHON_USEDEP}] + )" + +python_test() { + ./runtests.sh --verbose || die +} diff --git a/dev-python/django-openstack-auth/Manifest b/dev-python/django-openstack-auth/Manifest index b120c6251721..33e719f161ee 100644 --- a/dev-python/django-openstack-auth/Manifest +++ b/dev-python/django-openstack-auth/Manifest @@ -1,3 +1,2 @@ -DIST django_openstack_auth-1.1.5.tar.gz 40893 SHA256 ad63e85575caae1107bd05afd8d27b45d4590cc1f6d3b63905959a7c457b1aef SHA512 43a95a1a5b9c24e15d4ff76660a52204c03d6679400632e870ee364c9f7de7b39128cc6acd883cd12abc80cbdfab44a3e3f2a803193eeac7d3e838be39a93ea2 WHIRLPOOL 2515c77ce6aa2c9f3e2860506ae0d5656f3dfda9bf17eb1fba5c307bf477de5aa22a3834b94c053a5f6fc439c9cf2a5b9bbeb7e87bef3bcf3e7739f55b80dd77 DIST django_openstack_auth-1.2.0.tar.gz 75577 SHA256 5ad78e5c92502f1abfb10fd101c023adf74a3e728bd42ed19ffea2185680f9a6 SHA512 793f0763b47574574864c16c9d79787d44c84259304587b5d2b3375de04291c5d200699297960b3b3904b959ceee31f696fef2233659db9b846c6af06fd8c251 WHIRLPOOL 37632e35beb810979ffb7878c9ffed0258a64caf4a80f61050bb054d70b56e09c9f0f13dac2ce339b87ccdcbeba779893c2ce81912b95f50d52a88b947872092 DIST django_openstack_auth-1.3.1.tar.gz 75165 SHA256 99c6e92170656eade430d31f79ddf60e66355ff7b84caf038ab1ecc879cff9ba SHA512 cf9b4a1c526f237a23dadab4a7e6a2bd1f80a8d6d89d9b83f4d0fb6fc4df80aba68ad344662fbeaddeca2ca8ec36856af1074da383368d85d56460ed199609aa WHIRLPOOL b99b9381ce9eb1357939b750a40f86373fcbbe411d90a23e15f2d1e77dcfab45e58ac69e4e774228dc1b0dc3d3a0649e451efc0f271e904a4241b06c80b4d8bd diff --git a/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild deleted file mode 100644 index 48457ec18278..000000000000 --- a/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="A Django authentication backend for use with the OpenStack Keystone -Identity backend." -HOMEPAGE="http://django_openstack_auth.readthedocs.org/" -SRC_URI="mirror://pypi/${PN:0:1}/django_openstack_auth/django_openstack_auth-${PV}.tar.gz" -S="${WORKDIR}/django_openstack_auth-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/pbr-0.6.0[${PYTHON_USEDEP}] - <dev-python/pbr-1.0[${PYTHON_USEDEP}] - test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}] - <dev-python/hacking-0.9[${PYTHON_USEDEP}] - >=dev-python/Babel-1.3[${PYTHON_USEDEP}] - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/mox-0.5.3[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - <dev-python/sphinx-1.2[${PYTHON_USEDEP}] - dev-python/oslo-sphinx[${PYTHON_USEDEP}] )" -RDEPEND=">=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}] - >=dev-python/django-1.4[${PYTHON_USEDEP}] - <dev-python/django-1.7[${PYTHON_USEDEP}] - >=dev-python/six-1.5.2[${PYTHON_USEDEP}]" - -python_test() { - "${PYTHON}" -m openstack_auth.tests.run_tests || die "Testsuite failed" -} diff --git a/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild index 23635efaa7eb..48e1247e1587 100644 --- a/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild +++ b/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild @@ -7,15 +7,14 @@ PYTHON_COMPAT=( python2_7 python3_3 ) inherit distutils-r1 -DESCRIPTION="A Django authentication backend for use with the OpenStack Keystone -Identity backend." +DESCRIPTION="Django authentication backend for use with OpenStack Keystone Identity backend" HOMEPAGE="http://django_openstack_auth.readthedocs.org/" SRC_URI="mirror://pypi/${PN:0:1}/django_openstack_auth/django_openstack_auth-${PV}.tar.gz" S="${WORKDIR}/django_openstack_auth-${PV}" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-python/django-pipeline/Manifest b/dev-python/django-pipeline/Manifest index 1886b93e2b9d..6c2941d1e4db 100644 --- a/dev-python/django-pipeline/Manifest +++ b/dev-python/django-pipeline/Manifest @@ -1,2 +1,2 @@ -DIST django-pipeline-1.3.25.tar.gz 41008 SHA256 92c4ba5543d3ad980cd3a65a121ced62a6ad6449a773269a693f54e0ca5c565f SHA512 2c66b8b60076a8d19049947a9465d96fd80098c6e560f6cb6ffa26fd17d267830d87913041f9876da1276b0224ef3e8b0183c56367741e11c0f010a236b87169 WHIRLPOOL 15ac71f71988b2c7f5bb2d7c322843c35f6e34532af526b72bc90c15458b512948b97af333aaa5d52f71fd785f70d9b04018f8337eefc037be2dd24f04c77d7f DIST django-pipeline-1.3.26.tar.gz 41054 SHA256 58433fc07cc81f213686b892caeb8d17d6ed4e00444ef95b35f21a5a3cc6357e SHA512 106c89e6a5509305548f6169f9b38d3a288bdf260c4b933ac1372c8471e897b8f6109cdecf70a4f77dff670e2b97abe4ed990903abfc188a59600189d0473284 WHIRLPOOL 7ead1f6dbc6df1a5c4b26869e6b4ae73cd416ed52f22ba1ff16b57a295f476c7973a56af9c05d1b50097e82dcd286207f648920b3acadd88fc40ad26aae10285 +DIST django-pipeline-1.5.4.tar.gz 41115 SHA256 5e387e2a92880f67c299ade766577c8c66485ffb867fbcffb73f696ddb9b245d SHA512 2393d1b44ca38416589b5b0e731b66e4e95be0b1adcba89fd76905975df0f35857bcbe019fc239127c578ab3a1b77cec5892298068de3634b2020d79e74aa1ad WHIRLPOOL 79e63b07751fb4c216004ca8aa695690b2006346f6b65e075d59484c6411c2f29c7b138f9e12f2e523e8c68e68f11398e183ed4a6816b5a47ef833dbb22b2b02 diff --git a/dev-python/django-pipeline/django-pipeline-1.3.25.ebuild b/dev-python/django-pipeline/django-pipeline-1.5.4.ebuild index f9ddebd95f42..9f9095a446d4 100644 --- a/dev-python/django-pipeline/django-pipeline-1.3.25.ebuild +++ b/dev-python/django-pipeline/django-pipeline-1.5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,15 +19,17 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc test" -RDEPEND=">=dev-python/django-1.5.8[${PYTHON_USEDEP}] +RDEPEND=" + >=dev-python/django-1.7[${PYTHON_USEDEP}] dev-python/jsmin[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] virtual/python-futures[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} +DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - dev-python/jinja[${PYTHON_USEDEP}] + test? ( ${RDEPEND} dev-python/mock[${PYTHON_USEDEP}] )" + # As usual for test phase DISTUTILS_IN_SOURCE_BUILD=1 @@ -36,6 +38,7 @@ python_compile_all() { } python_test() { + # https://github.com/cyberdelia/django-pipeline/issues/381 PYTHONPATH=. django-admin.py test --settings=tests.settings tests \ || die "Tests failed under ${EPYTHON}" } diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest index da9a215c5a9e..cf99be6425fa 100644 --- a/dev-python/django/Manifest +++ b/dev-python/django/Manifest @@ -2,5 +2,4 @@ DIST Django-1.4.22.tar.gz 7802249 SHA256 d0e2c9d772fcab2cf9c09e1c05e711cf5fe5eb9 DIST Django-1.5.12.tar.gz 8202839 SHA256 b3de77beb6e59b72071ca66f20c2ad34e1b90d39b0241e62c1f03c668ddd6ced SHA512 37736827618737c54e7b63f2376b915d8dc0cdaf1900a2f6c3c9e0edd69e50379f95e3b6a31c930efdca88793b6330e7226175af91951d8637e5db780bc9fd8d WHIRLPOOL a3d17e364b0f90ff3a059afbfb57fdb9988ad777048f3caa30244d7ae6b0c87f42e1e5af5bdcda8f09c713518e0fb2471e1e4da3a988f37e45e6bca7678ecafa DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695aba17fd0ff024307454dc3a56 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 WHIRLPOOL 5de086952bda9449f85798e8fe3bac82f11e1b856c1d39e340399e71ca6bf183318eebf1f536714567036485637166a929082a1ba9d6c1816f07c53dcc12c72a DIST Django-1.7.10.tar.gz 7584312 SHA256 b9357d2cebe61997055d417d607f9c650e817cd1a383b9a1b88bf1edad797c75 SHA512 ef9c8f3f5db17474970805bd5a3956c65766362d883013c19d32cb0fcc795de74a831758d66d18103255e5c510b2ee384099f08e12d75c567caad2d80404cc20 WHIRLPOOL 380f05ff7f51dfc50f578f946b5b83ae36ab8a96a10ccce9c62642f5b2434c2ba9de2d1d9bc57859db003e4569fa0c3e118cf51cd80a9fe40c04c49fdf213999 -DIST Django-1.8.4.tar.gz 7265101 SHA256 826996c81e1cc773500124d5c19212e4a7681a55ee169fab9085f2b3015a70d8 SHA512 34dee1d004f4b149bd8b0405bcad66c0b4ad68b3c0069b1631af2c457cbcc165d6a730d221777110525be74cf9369b695d4fc8d752317d0819fd338250222351 WHIRLPOOL 504f0271b74b9e93b74255922360fddcff3f6875297fcbd464e27212679b2275c98773088feab97fe8d0c0de664789653c72d614ed2d5fb9c648655685f895aa DIST Django-1.8.5.tar.gz 7270297 SHA256 2d174e4a3f54708d0d5b6ff1bf54ae71652e83bb06d7576b3b20d916b29c3653 SHA512 91a8788ec6a9f3592615da55948d080719425a2135e241e7b5014c6b9c354daa53c2caeadd9ac3d991730c8ef8fba579a0aa4f3094a1e83b0600811e9a3bd20b WHIRLPOOL af7037d853f6d9ea67df412589aab22113a8f4fb41c79d9f42e9b8fa0184b273a75815a558dddfeb8650f14532f77fc9585fc3c72912beaa152a932e667fcb06 diff --git a/dev-python/django/django-1.8.4.ebuild b/dev-python/django/django-1.8.4.ebuild deleted file mode 100644 index 915004919505..000000000000 --- a/dev-python/django/django-1.8.4.ebuild +++ /dev/null @@ -1,107 +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 python3_{3,4} pypy ) -PYTHON_REQ_USE='sqlite?' -WEBAPP_NO_AUTO_INSTALL="yes" - -inherit bash-completion-r1 distutils-r1 eutils versionator webapp - -MY_PN="Django" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="High-level Python web framework" -HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django" -SRC_URI=" - https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz - mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz - " - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc sqlite test" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] ) - test? ( - ${PYTHON_DEPS//sqlite?/sqlite} - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/numpy[$(python_gen_usedep 'python*')] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/${MY_P}" - -WEBAPP_MANUAL_SLOT="yes" - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.6-bashcomp.patch -) - -pkg_setup() { - webapp_pkg_setup -} - -python_prepare_all() { - # Prevent d'loading in the doc build - sed -e '/^ "sphinx.ext.intersphinx",/d' -i docs/conf.py || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - # Tests have non-standard assumptions about PYTHONPATH, - # and don't work with ${BUILD_DIR}/lib. - PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - newbashcomp extras/django_bash_completion ${PN}-admin - bashcomp_alias ${PN}-admin django-admin.py - - if use doc; then - rm -fr docs/_build/html/_sources || die - local HTML_DOCS=( docs/_build/html/. ) - fi - - insinto "${MY_HTDOCSDIR#${EPREFIX}}" - doins -r django/contrib/admin/static/admin/. - distutils-r1_python_install_all -} - -src_install() { - distutils-r1_src_install - webapp_src_install -} - -pkg_postinst() { - elog "Additional Backend support can be enabled via" - optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python - optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient - optfeature "PostgreSQL backend support" dev-python/psycopg:2 - echo "" - elog "Other features can be enhanced by" - optfeature "GEO Django" sci-libs/gdal[geos] - optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached - optfeature "ImageField Support" virtual/python-imaging - optfeature "Password encryption" dev-python/bcrypt - optfeature "High-level abstractions for Django forms" dev-python/django-formtools - echo "" - elog "A copy of the admin media is available to webapp-config for installation in a" - elog "webroot, as well as the traditional location in python's site-packages dir" - elog "for easy development." - webapp_pkg_postinst -} diff --git a/dev-python/dnspython/dnspython-1.11.1.ebuild b/dev-python/dnspython/dnspython-1.11.1.ebuild index ea07615a4886..3969929b281c 100644 --- a/dev-python/dnspython/dnspython-1.11.1.ebuild +++ b/dev-python/dnspython/dnspython-1.11.1.ebuild @@ -17,7 +17,10 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd IUSE="examples test" DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !dev-python/dnspython:py2 + !dev-python/dnspython:py3 +" DOCS=( ChangeLog README ) diff --git a/dev-python/dnspython/dnspython-1.12.0-r1.ebuild b/dev-python/dnspython/dnspython-1.12.0-r1.ebuild deleted file mode 100644 index 450cb0340943..000000000000 --- a/dev-python/dnspython/dnspython-1.12.0-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit distutils-r1 multilib - -PN3="${PN}3" -P3="${PN3}-${PV}" - -DESCRIPTION="DNS toolkit for Python" -HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython" -SRC_URI=" - http://www.dnspython.org/kits/${PV}/${P}.tar.gz - http://www.dnspython.org/kits3/${PV}/${P3}.zip" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="examples test" - -DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}] - app-arch/unzip" -RDEPEND="${DEPEND}" - -S2="${S}" -S3="${WORKDIR}/${P3}" - -# For testsuite -DISTUTILS_IN_SOURCE_BUILD=1 - -s_locator() { - if python_is_python3; then - einfo "Setting \${S} to ${S3}" - S="${S3}" $@ - else - einfo "Setting \${S} to ${S2}" - S="${S2}" $@ - fi -} - -python_prepare() { - s_locator distutils-r1_python_prepare -} - -python_compile() { - s_locator distutils-r1_python_compile -} - -python_install(){ - s_locator distutils-r1_python_install -} - -my_test() { - pushd tests &> /dev/null - "${PYTHON}" utest.py || die "tests failed under ${EPYTHON}" - einfo "Testsuite passed under ${EPYTHON}" -} - -python_test() { - s_locator my_test -} - -python_install() { - s_locator distutils-r1_python_install -} - -python_install_all() { - use examples && local EXAMPLES=( examples/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/dnspython/dnspython-1.12.0.ebuild b/dev-python/dnspython/dnspython-1.12.0-r200.ebuild index 9edf38a91b37..6bb0c4b92558 100644 --- a/dev-python/dnspython/dnspython-1.12.0.ebuild +++ b/dev-python/dnspython/dnspython-1.12.0-r200.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 + PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 @@ -12,21 +13,23 @@ HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython" SRC_URI="http://www.dnspython.org/kits/${PV}/${P}.tar.gz" LICENSE="ISC" -SLOT="0" +SLOT="py2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="examples test" -DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" +RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}] + !dev-python/dnspython:0" +DEPEND="${RDEPEND} + !dev-python/dnspython:0 + app-arch/unzip" -# For tests +# For testsuite DISTUTILS_IN_SOURCE_BUILD=1 python_test() { - pushd "${BUILD_DIR}"/../tests &> /dev/null + cd tests || die "${PYTHON}" utest.py || die "tests failed under ${EPYTHON}" einfo "Testsuite passed under ${EPYTHON}" - popd &> /dev/null } python_install_all() { diff --git a/dev-python/dnspython/dnspython-1.12.0-r300.ebuild b/dev-python/dnspython/dnspython-1.12.0-r300.ebuild new file mode 100644 index 000000000000..a32c94ace073 --- /dev/null +++ b/dev-python/dnspython/dnspython-1.12.0-r300.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python3_{3,4} ) + +inherit distutils-r1 + +MY_PN="${PN}3" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="DNS toolkit for Python" +HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython" +SRC_URI="http://www.dnspython.org/kits3/${PV}/${MY_P}.zip" + +LICENSE="ISC" +SLOT="py3" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +IUSE="examples test" + +RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}] + !dev-python/dnspython:0" +DEPEND="${RDEPEND} + !dev-python/dnspython:0 + app-arch/unzip" + +S="${WORKDIR}/${MY_P}" + +# For testsuite +DISTUTILS_IN_SOURCE_BUILD=1 + +python_test() { + cd tests || die + "${PYTHON}" utest.py || die "tests failed under ${EPYTHON}" + einfo "Testsuite passed under ${EPYTHON}" +} + +python_install_all() { + use examples && local EXAMPLES=( examples/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest index 4441af5f1dbe..748d464e2cdc 100644 --- a/dev-python/docker-py/Manifest +++ b/dev-python/docker-py/Manifest @@ -2,3 +2,4 @@ DIST docker-py-1.1.0-r1.tar.gz 60926 SHA256 c3373d120a83a80468c5340e2e36b20e6350 DIST docker-py-1.2.2.tar.gz 69685 SHA256 85284a5b1a965e01a5d0a91f9f639ad5069143a276c123198fdafc3659280b38 SHA512 bf00b19e0ab56e5c0e8459234d09722ca504ecd933bfba61cb4ab4805410f53f6ad6083f2e964ef5a6eded2ea05aa01a89c27621064386bae145c7258ed996ad WHIRLPOOL bd7ff4579f924e02d18581b1aca00790dcb84afda03e4cde70b349bfdb4ad43aa2e06da2bcbe780f6074d98f9af9b14fb9d2ab4da9265e56b73288902c9ede7a DIST docker-py-1.3.1.tar.gz 71456 SHA256 4a980c55f22b97573b68f720ebc0b6f2a01cd9ec454d305bd13d2b83109a0bfa SHA512 f027a44cd15aa0a9d47a748c6f593e940ee4b6db0d8a933591e148bc9b0e6801c9ece3f81fc3a21eba762eff838ef40bf04fda299f28ba508e029b67658ee228 WHIRLPOOL 57d7429d58610bbef4473d5aabfe7f1771b2e3d4f083d44d6aba8f144bf44afeff9a0bcf458754f2787b54e1a1e07fddb9e66a42c16a6b1f20a8e1f9be3aa558 DIST docker-py-1.4.0.tar.gz 75336 SHA256 81e2a7cd59b25c3df63ec47458c8a019ed7e11355ea0cfeec1f38df8c93f3179 SHA512 c4ea0a4a43063c90aa212952b3aeaa1a7c574dfcf7e8223c3fdb24216d0939c80258fe4ad2b6bba24d9d5fcde27332106860baf463482119b382670ed57c0da2 WHIRLPOOL f085dc4c59ce5b4b8c22695c90e054f3875dfa7553a600e025f089b3f5da34f91b5de3fb4106e737150b3e558319a5ae4bd1a6448f4bcafc9f9d45fa1a826d3a +DIST docker-py-1.5.0.tar.gz 84712 SHA256 a7b437aa9bfd2ad1e9b3eeed57e376d28a93acb852bac2aaf01dd70a304d439b SHA512 948f63f48a1994f90041c7d2e2982a313ccc0c9aea0dc1cec03bcd9afd855459088b36d052ab061ada270c8fe06c0c18115910b40740c78f58258782791180ab WHIRLPOOL a34f3f896e5e3722fb9fed520e0f776875fd869f4dbd10ee922a73332dcd46b00c608c1a65f28eb9e53ba4a343b430a83ccacf7fd211113ee4dabde6dbf7963b diff --git a/dev-python/docker-py/docker-py-1.5.0.ebuild b/dev-python/docker-py/docker-py-1.5.0.ebuild new file mode 100644 index 000000000000..15edc127ef9e --- /dev/null +++ b/dev-python/docker-py/docker-py-1.5.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_4 ) + +inherit distutils-r1 vcs-snapshot + +DESCRIPTION="Python client for Docker" +HOMEPAGE="https://github.com/docker/docker-py" +SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc test" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] ) + test? ( + >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] + >=dev-python/pytest-2.7.2[${PYTHON_USEDEP}] + >=dev-python/pytest-cov-2.1.0[${PYTHON_USEDEP}] + ) +" +RDEPEND=" + >=dev-python/requests-2.5.2[${PYTHON_USEDEP}] + >=dev-python/six-1.4.0[${PYTHON_USEDEP}] + >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] +" + +python_compile_all() { + if use doc; then + mkdocs build || die "docs failed to build" + fi +} + +python_test() { + py.test tests/test.py tests/utils_test.py || die "tests failed under ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( site/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/doublex-expects/Manifest b/dev-python/doublex-expects/Manifest index 7cfeb5b818b7..9f349413d605 100644 --- a/dev-python/doublex-expects/Manifest +++ b/dev-python/doublex-expects/Manifest @@ -1,2 +1,3 @@ DIST doublex-expects-0.4.0.tar.gz 4633 SHA256 59693e28bf9c15b9c2cb85bb2d7af53c48ea9ce4cd094746be375672eef45f1e SHA512 be8eabaf73684a2368d527838a18b3e8c516c4fe63aad3d87765e347b7a84450cb9b76d86ba26c2b684440ecb5d5ff77c82cc7f432ffa7f0ab28a2e01599dd10 WHIRLPOOL 5f2e271e7f50c4b6d74fb359f774074b80ea6fb830d3e2c706d046c199e2fbc2c0125ea72e755d245494a9e3d1b6109c420bf6398314cbce09cf85784e672297 DIST doublex-expects-0.7.0_rc1.tar.gz 6087 SHA256 a83447e4a6ea1305c8971e3d8935f242c4f8813332b26db576064e75fbfe1088 SHA512 fa97080af78aa29c3efa70b89f3afeb4a5537393d3dbd3e94df01d590c046623fc70c25b147b761d1047cd0f154dcb46a3c07674b39fb591d0adcbccce491abd WHIRLPOOL b6732c0cdaffadca718da74e9ac8d1acc6d2742624c5e34306d0df01fe15e3ad2c315e13f0dceab2256fe8f2b13121d55894df19306b99970c9715bca1bc7745 +DIST doublex-expects-0.7.0_rc2.tar.gz 6151 SHA256 b98548b71cbfd0bf0b84b21094714d56f76896b69ca7824208ce3a6aa94538d9 SHA512 94e499f01fbdc73f3f97bbfb64f299d43e3b767f8eb00eecb7c05e062cedd8fa84569cc97ef48aeca24df5ff94b1bfbb330a786500641c857039c2e7d287e952 WHIRLPOOL 1f3c70b94b74d2ea85c70129b6519e67cf257d0c48b84b5191ef84efaeb066f45c8803921ccf9c3a03c5ed50ddd844ab26449dbc6c4498cd3aae663720531f49 diff --git a/dev-python/doublex-expects/doublex-expects-0.7.0_rc1.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.0_rc1.ebuild index d0ec5e614b1b..db728154578a 100644 --- a/dev-python/doublex-expects/doublex-expects-0.7.0_rc1.ebuild +++ b/dev-python/doublex-expects/doublex-expects-0.7.0_rc1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_4 ) inherit distutils-r1 vcs-snapshot diff --git a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild new file mode 100644 index 000000000000..d0ec5e614b1b --- /dev/null +++ b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) + +inherit distutils-r1 vcs-snapshot + +MY_PV=${PV/_/} + +DESCRIPTION="Expects matchers for Doublex test doubles assertions" +HOMEPAGE="https://github.com/jaimegildesagredo/doublex-expects" +SRC_URI="https://github.com/jaimegildesagredo/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/mamba[${PYTHON_USEDEP}] ) +" +RDEPEND=" + dev-python/doublex[${PYTHON_USEDEP}] + >=dev-python/expects-0.8.0_rc1[${PYTHON_USEDEP}] +" + +python_test() { + mamba || die "Tests failed under ${EPYTHON}" +} diff --git a/dev-python/ecdsa/ecdsa-0.13.ebuild b/dev-python/ecdsa/ecdsa-0.13.ebuild index 1e51d6d2af0b..a43916a62d7c 100644 --- a/dev-python/ecdsa/ecdsa-0.13.ebuild +++ b/dev-python/ecdsa/ecdsa-0.13.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit distutils-r1 diff --git a/dev-python/edpwd/metadata.xml b/dev-python/edpwd/metadata.xml index b445c930e02c..73198ca55646 100644 --- a/dev-python/edpwd/metadata.xml +++ b/dev-python/edpwd/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>tampakrap@gmail.com</email> + <email>tampakrap@gentoo.org</email> <name>Theo Chatzimichos</name> </maintainer> <upstream> diff --git a/dev-python/elasticsearch-py/elasticsearch-py-1.8.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-1.8.0.ebuild index 73ae13bfff6a..79517ee46178 100644 --- a/dev-python/elasticsearch-py/elasticsearch-py-1.8.0.ebuild +++ b/dev-python/elasticsearch-py/elasticsearch-py-1.8.0.ebuild @@ -24,9 +24,7 @@ RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}] <dev-python/urllib3-2.0[${PYTHON_USEDEP}]" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] ) test? ( ${RDEPEND} >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] <dev-python/requests-3.0.0[${PYTHON_USEDEP}] @@ -37,6 +35,15 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-python/nosexcover[${PYTHON_USEDEP}] || ( virtual/jre:1.8 virtual/jre:1.7 ) )" +python_prepare_all() { + # rename manpage to elasticsearch-py + sed \ + -e "s@('index', 'elasticsearch'@('index', 'elasticsearch-py'@g" \ + -i docs/conf.py || die + + distutils-r1_python_prepare_all +} + python_test() { ES="${WORKDIR}/elasticsearch-${ES_VERSION}" ES_PORT="25124" diff --git a/dev-python/enable/enable-4.5.1.ebuild b/dev-python/enable/enable-4.5.1.ebuild index 300c03c337aa..2865b6796245 100644 --- a/dev-python/enable/enable-4.5.1.ebuild +++ b/dev-python/enable/enable-4.5.1.ebuild @@ -44,6 +44,8 @@ DISTUTILS_IN_SOURCE_BUILD=1 PATCHES=( "${FILESDIR}"/${PN}-4.4.1-swig.patch "${FILESDIR}"/${P}-gcc-5.patch + "${FILESDIR}"/${P}-doc.patch + "${FILESDIR}"/${P}-version.patch ) python_prepare_all() { diff --git a/dev-python/enable/files/enable-4.5.1-doc.patch b/dev-python/enable/files/enable-4.5.1-doc.patch new file mode 100644 index 000000000000..c9cc1ff2e3cc --- /dev/null +++ b/dev-python/enable/files/enable-4.5.1-doc.patch @@ -0,0 +1,24 @@ +From 41134b03b96b741d95554846841c189313052265 Mon Sep 17 00:00:00 2001 +From: John Wiggins <jwiggins@enthought.com> +Date: Thu, 1 Oct 2015 20:40:07 +0200 +Subject: [PATCH] Read the docs version directly from enable._version + +--- + docs/source/conf.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/source/conf.py b/docs/source/conf.py +index 10b7552..995e315 100644 +--- a/docs/source/conf.py ++++ b/docs/source/conf.py +@@ -41,8 +41,8 @@ + # The default replacements for |version| and |release|, also used in various + # other places throughout the built documents. + d = {} +-execfile(os.path.join('..', '..', 'enable', '__init__.py'), d) +-version = release = d['__version__'] ++execfile(os.path.join('..', '..', 'enable', '_version.py'), d) ++version = release = d['full_version'] + + # There are two options for replacing |today|: either, you set today to some + # non-false value, then it is used: diff --git a/dev-python/enable/files/enable-4.5.1-version.patch b/dev-python/enable/files/enable-4.5.1-version.patch new file mode 100644 index 000000000000..1dd3fe42775e --- /dev/null +++ b/dev-python/enable/files/enable-4.5.1-version.patch @@ -0,0 +1,31 @@ +From f91c824ebad74e8c23e62fe3390842c5fe322aee Mon Sep 17 00:00:00 2001 +From: itziakos <ioannist@enthought.com> +Date: Wed, 20 May 2015 22:52:42 +0100 +Subject: [PATCH] check the enable._version.py when installing from source + +--- + setup.py | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index f765f51..3328b93 100644 +--- a/setup.py ++++ b/setup.py +@@ -92,13 +92,14 @@ def write_version_py(filename): + fullversion = VERSION + if os.path.exists('.git'): + git_revision, dev_num = git_version() +- elif os.path.exists('kiva/_version.py'): ++ # All packages are synced with the enable version ++ elif os.path.exists('enable/_version.py'): + # must be a source distribution, use existing version file + try: +- from kiva._version import git_revision, full_version ++ from enable._version import git_revision, full_version + except ImportError: + raise ImportError("Unable to import git_revision. Try removing " +- "kiva/_version.py and the build directory " ++ "enable/_version.py and the build directory " + "before building.") + + match = re.match(r'.*?\.dev(?P<dev_num>\d+)', full_version) diff --git a/dev-python/epydoc/metadata.xml b/dev-python/epydoc/metadata.xml index eec5b980b54c..b30848a4457e 100644 --- a/dev-python/epydoc/metadata.xml +++ b/dev-python/epydoc/metadata.xml @@ -12,7 +12,7 @@ <longdescription lang="ja"> Epydocは、Javadocに似た出力をする以外はPython言語のための ドキュメンテーションシステムです。Epydocはdoc-stringsを使い、 - モジュールをインポートし、それらが自己>分析したものを使います。 + モジュールをインポートし、それらが自己分析したものを使います。 -- もしあなたが指定したモジュールがインポートするには安 全でないのだとしたら、他のツールを使うべきです。ドキュメンテーション の書式は再構造的文章(reST)です。 diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest index 221fdfc6fb23..2c97381336b8 100644 --- a/dev-python/et_xmlfile/Manifest +++ b/dev-python/et_xmlfile/Manifest @@ -1 +1,2 @@ DIST et_xmlfile-1.0.0.tar.gz 7682 SHA256 727fd43a5fe7af1087c4fe6d610c24f87dc6283b914ea0f3f2d05c82de0dda96 SHA512 498b5de336cb8b0f538def60c22f565560f6cb800a5caab84ca1f51c558b79503abb1b3dc8be7419595867e549da5dd9f0f725aff873dc04c0749b9344ac021c WHIRLPOOL c4f798cd3adcd41376f1befae53a42db915bc1a8d1040eaa4776123d6d31fef7939d09644c03290b8dde07725e1177eea053697b09d675c1c4a4bdca097c9b48 +DIST et_xmlfile-1.0.1.tar.gz 8427 SHA256 614d9722d572f6246302c4491846d2c393c199cfa4edc9af593437691683335b SHA512 551fd87efd961b9c3202154dea9468aa97814ab8f6e5efc00962a651b17400866f2ad4fc85484a04c183c85a06375fd1c576c425e2e01bee4395ccfb680ce39b WHIRLPOOL 717822dc554150f8231e86df81eba8683d5d46dd477a464fe4555f9f83fe0d29f404a4ed9d7c1f179ae2b0c80a24ee1b0e82fd9199b564baa9a2c03b90bfb07d diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild new file mode 100644 index 000000000000..4f2e466a682e --- /dev/null +++ b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit distutils-r1 + +DESCRIPTION="An implementation of lxml.xmlfile for the standard library" +HOMEPAGE="https://pypi.python.org/pypi/et_xmlfile https://bitbucket.org/openpyxl/et_xmlfile" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pytest[${PYTHON_USEDEP}] ) +" + +python_test() { + py.test -vv || die +} diff --git a/dev-python/et_xmlfile/metadata.xml b/dev-python/et_xmlfile/metadata.xml index ee7e8b2450a8..4c1907fa3f7b 100644 --- a/dev-python/et_xmlfile/metadata.xml +++ b/dev-python/et_xmlfile/metadata.xml @@ -1,5 +1,9 @@ -<?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> + <upstream> + <remote-id type="bitbucket">openpyxl/et_xmlfile</remote-id> + <remote-id type="pypi">et_xmlfile</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-python/expects/Manifest b/dev-python/expects/Manifest index c03a3e32f3a2..98b3e6145fca 100644 --- a/dev-python/expects/Manifest +++ b/dev-python/expects/Manifest @@ -1,3 +1,4 @@ DIST expects-0.4.2.tar.gz 23813 SHA256 b1e0b27141f784fe81a143153f23d3c8220fe8ec1003eb580b3eeb38eb778007 SHA512 6701a1a3099073c70d8f729b7ca72e4b9b3eb6d6f9e7d6d2d654a3b684c5ab101c343b4c3556f45d763ab1479dbc3eb3db209c4d9f5d2254cc4111e74a4a3c1a WHIRLPOOL 44ef85ca96225c22f91468e8b8b6368a26138f0fb9ee22dc89c282fb91adf4425d177ba62891239515affc639053165c6080f972c9435619c50a47fd81a27894 DIST expects-0.8.0_rc2.tar.gz 27307 SHA256 c7959a0b0f76a186b1d3687fbdedaf551f8bbbddbd66e5307c3a52c787a779de SHA512 6ae4553838ce4d27993772cec33f1e1a18d539af4a9b0f62f66ef1fb78464a46f5b76a420096d2d36881f4dc581b69e8f6c8783b89d794df753fdffab275cc33 WHIRLPOOL 04a04534571e8a15bcc2e1d7a9fc2b63bb772a8adaaf0b6239d375f1e5f750be7d7fa9fd10f5d84f017c4e3ad6274a7955e5b70928ee6eec7c199181169e5741 DIST expects-0.8.0_rc3.tar.gz 27478 SHA256 a2809c6c51cf18b3316102f21e9d14d195edfd34526cfcad7d959d592deacbd4 SHA512 2566ddfcb83bb3d58dbddcc881f2b743cca061057f77a52da49d3eb6c16dc1fafaca900734d7023550c85dfd0b86d433a9328daf5a989ab91757d83e9eaa4d81 WHIRLPOOL 7e6c81a27c2dd01d261731db6deefe0830515731dc485278bbf2d5de84a726cef7cea2a5ecd514ccda169167f7cb0ca32f7b02de95c6bdcbd23f26faf502b87d +DIST expects-0.8.0_rc4.tar.gz 27586 SHA256 3a4f4a5ae2ebd15b387eda0a841a3d61c9ac7c4171263a247776a7bd5f3135e1 SHA512 5c9fa6c9b296aba2a3a907e6e7b49bbb371a3deb0e8eca34a9df51f909dbb5e5700ec9c26a78205e6131c8154b75bb2381cab1b7fcb227edbb103b4c3f5784a5 WHIRLPOOL c9d78385c67ec7cb441159fc223ffc6eb3df14ed4330f17e064eb14ce17fb1201952581007a8f8da31dd1e4c8bb18baccb501345b8dca12eb914c198c1184861 diff --git a/dev-python/expects/expects-0.8.0_rc4.ebuild b/dev-python/expects/expects-0.8.0_rc4.ebuild new file mode 100644 index 000000000000..db3f4ddd2b01 --- /dev/null +++ b/dev-python/expects/expects-0.8.0_rc4.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_4 ) + +inherit distutils-r1 vcs-snapshot + +MY_PV=${PV/_/} + +DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python" +HOMEPAGE="https://github.com/jaimegildesagredo/expects" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc test" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( dev-python/mamba[${PYTHON_USEDEP}] ) +" +RDEPEND="" + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + mamba || die "tests failed under ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest index 666cbb2fbb27..48f03ab8f768 100644 --- a/dev-python/feedparser/Manifest +++ b/dev-python/feedparser/Manifest @@ -1 +1,2 @@ DIST feedparser-5.1.3.tar.bz2 202373 SHA256 7f6507d400d07edfd1ea8205da36808009b0c539f5b8a6e0ab54337b955e6dc3 SHA512 6a0374e001295566316ad86a581c875cd367fc6200e30296bf917cdff7fa2a83c05565b747c37079f38755ce94565d56890a995be7ee020d0f9466ee1b7c079b WHIRLPOOL bacb6cf0563ee7feb476ea4b767586cb6fbd649d036f72f18b60330e4b4120ccb1e65a923e121108eecf64ea2343fd7a40dd56d7bf71384ff3f52ad20a59a54b +DIST feedparser-5.2.1.tar.gz 252956 SHA256 bd030652c2d08532c034c27fcd7c85868e7fa3cb2b17f230a44a6bbc92519bf9 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81 WHIRLPOOL 7214fbafa15351d9d759b6d281e5edd4cf38f6285e0a2d788933c1336ab0e66c2587ea341773ed956d7a006e9b09f2f769876690eec9374c9f96b464f2c71ba3 diff --git a/dev-python/feedparser/feedparser-5.1.3-r2.ebuild b/dev-python/feedparser/feedparser-5.1.3-r2.ebuild index 00be3c719602..825382655862 100644 --- a/dev-python/feedparser/feedparser-5.1.3-r2.ebuild +++ b/dev-python/feedparser/feedparser-5.1.3-r2.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy ) inherit distutils-r1 eutils DESCRIPTION="Parse RSS and Atom feeds in Python" -HOMEPAGE="https://code.google.com/p/feedparser/ https://pypi.python.org/pypi/feedparser" +HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.python.org/pypi/feedparser" SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2" # sgmllib is licensed under PSF-2. diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild new file mode 100644 index 000000000000..a985e7e9e6b9 --- /dev/null +++ b/dev-python/feedparser/feedparser-5.2.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) + +inherit distutils-r1 eutils + +DESCRIPTION="Parse RSS and Atom feeds in Python" +HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.python.org/pypi/feedparser" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +# sgmllib is licensed under PSF-2. +LICENSE="BSD-2 PSF-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="" + +# Tests have issues with chardet installed, and are just kind of buggy. +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${P}-sgmllib.patch" +) + +python_prepare_all() { + mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die + distutils-r1_python_prepare_all +} + +python_test() { + cp feedparser/feedparsertest.py "${BUILD_DIR}" || die + ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die + cd "${BUILD_DIR}" || die + if [[ ${EPYTHON} == python3* ]]; then + 2to3 --no-diffs -w -n feedparsertest.py || die + fi + "${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}" +} diff --git a/dev-python/feedparser/files/feedparser-5.0.1-sgmllib.patch b/dev-python/feedparser/files/feedparser-5.0.1-sgmllib.patch deleted file mode 100644 index 426290370d49..000000000000 --- a/dev-python/feedparser/files/feedparser-5.0.1-sgmllib.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- feedparser/feedparser.py -+++ feedparser/feedparser.py -@@ -135,7 +135,11 @@ - #ACCEPTABLE_URI_SCHEMES = () - - # ---------- required modules (should come with any Python distribution) ---------- --import sgmllib, re, sys, copy, urlparse, time, types, cgi, urllib, urllib2, datetime -+import re, sys, copy, urlparse, time, types, cgi, urllib, urllib2, datetime -+try: -+ import sgmllib -+except ImportError: -+ import _feedparser_sgmllib as sgmllib - try: - from io import BytesIO as _StringIO - except ImportError: ---- setup.py -+++ setup.py -@@ -17,7 +17,7 @@ - download_url = 'http://code.google.com/p/feedparser/', - platforms = ['POSIX', 'Windows'], - package_dir = {'': 'feedparser'}, -- py_modules = ['feedparser'], -+ py_modules = ['feedparser', '_feedparser_sgmllib'], - keywords = ['atom', 'cdf', 'feed', 'parser', 'rdf', 'rss'], - classifiers = [ - 'Development Status :: 5 - Production/Stable', diff --git a/dev-python/feedparser/files/feedparser-5.2.1-sgmllib.patch b/dev-python/feedparser/files/feedparser-5.2.1-sgmllib.patch new file mode 100644 index 000000000000..714480560e52 --- /dev/null +++ b/dev-python/feedparser/files/feedparser-5.2.1-sgmllib.patch @@ -0,0 +1,78 @@ +From 812793c07d3202d3f5bc39091aec2e7071d000c8 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Sun, 1 Jan 2012 19:30:57 +0100 +Subject: [PATCH] Use shipped sgmllib for Python 3.x + +--- + feedparser/feedparser.py | 19 +++---------------- + setup.py | 2 +- + 2 files changed, 4 insertions(+), 17 deletions(-) + +diff --git a/feedparser/feedparser.py b/feedparser/feedparser.py +index 8275c29..9a8a053 100644 +--- a/feedparser/feedparser.py ++++ b/feedparser/feedparser.py +@@ -204,17 +204,9 @@ else: + try: + import sgmllib + except ImportError: +- # This is probably Python 3, which doesn't include sgmllib anymore +- _SGML_AVAILABLE = 0 ++ import _feedparser_sgmllib as sgmllib + +- # Mock sgmllib enough to allow subclassing later on +- class sgmllib(object): +- class SGMLParser(object): +- def goahead(self, i): +- pass +- def parse_starttag(self, i): +- pass +-else: ++if True: + _SGML_AVAILABLE = 1 + + # sgmllib defines a number of module-level regular expressions that are +@@ -2520,9 +2512,6 @@ class _RelativeURIResolver(_BaseHTMLProcessor): + _BaseHTMLProcessor.unknown_starttag(self, tag, attrs) + + def _resolveRelativeURIs(htmlSource, baseURI, encoding, _type): +- if not _SGML_AVAILABLE: +- return htmlSource +- + p = _RelativeURIResolver(baseURI, encoding, _type) + p.feed(htmlSource) + return p.output() +@@ -2803,8 +2792,6 @@ class _HTMLSanitizer(_BaseHTMLProcessor): + + + def _sanitizeHTML(htmlSource, encoding, _type): +- if not _SGML_AVAILABLE: +- return htmlSource + p = _HTMLSanitizer(encoding, _type) + htmlSource = htmlSource.replace('<![CDATA[', '<![CDATA[') + p.feed(htmlSource) +@@ -3890,7 +3877,7 @@ def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, refer + result['bozo'] = 1 + result['bozo_exception'] = feedparser.exc or e + use_strict_parser = 0 +- if not use_strict_parser and _SGML_AVAILABLE: ++ if not use_strict_parser: + feedparser = _LooseFeedParser(baseuri, baselang, 'utf-8', entities) + feedparser.feed(data.decode('utf-8', 'replace')) + result['feed'] = feedparser.feeddata +diff --git a/setup.py b/setup.py +index a4a60fe..8c15451 100644 +--- a/setup.py ++++ b/setup.py +@@ -16,7 +16,7 @@ setup( + download_url = 'https://pypi.python.org/pypi/feedparser', + platforms = ['POSIX', 'Windows'], + package_dir = {'': 'feedparser'}, +- py_modules = ['feedparser'], ++ py_modules = ['feedparser', '_feedparser_sgmllib'], + keywords = ['atom', 'cdf', 'feed', 'parser', 'rdf', 'rss'], + classifiers = [ + 'Development Status :: 5 - Production/Stable', +-- +1.7.8.1 + diff --git a/dev-python/fixtures/fixtures-1.4.0.ebuild b/dev-python/fixtures/fixtures-1.4.0.ebuild index af97575a95c0..51cef468516d 100644 --- a/dev-python/fixtures/fixtures-1.4.0.ebuild +++ b/dev-python/fixtures/fixtures-1.4.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="|| ( Apache-2.0 BSD )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="test" # nose not listed but provides coverage output of tests diff --git a/dev-python/formencode/formencode-1.3.0-r1.ebuild b/dev-python/formencode/formencode-1.3.0-r2.ebuild index c65e3a69b983..a81fffa4a0e4 100644 --- a/dev-python/formencode/formencode-1.3.0-r1.ebuild +++ b/dev-python/formencode/formencode-1.3.0-r2.ebuild @@ -20,9 +20,10 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86- IUSE="doc test" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] dev-python/pycountry[${PYTHON_USEDEP}] - >=dev-python/dnspython-1.12.0-r1[${PYTHON_USEDEP}] )" + virtual/dnspython[${PYTHON_USEDEP}] )" RDEPEND="" RESTRICT="test" diff --git a/dev-python/funcsigs/funcsigs-0.4.ebuild b/dev-python/funcsigs/funcsigs-0.4.ebuild index 7fe7deeec924..c406e19b0405 100644 --- a/dev-python/funcsigs/funcsigs-0.4.ebuild +++ b/dev-python/funcsigs/funcsigs-0.4.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python2_7 pypy pypy3 ) +PYTHON_COMPAT=( python2_7 pypy ) inherit distutils-r1 diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest index 94e920c089f3..f1ebb6b396a0 100644 --- a/dev-python/gst-python/Manifest +++ b/dev-python/gst-python/Manifest @@ -1,3 +1,4 @@ DIST gst-python-0.10.22.tar.bz2 632651 SHA256 8f26f519a5bccd770864317e098e5e307fc5ad1201eb96329634b6508b253178 SHA512 bbbd6b661778cca990da0e216294d86da31a6e472049905989a3311459dd1227bf8f2ae3699a3cdbb66a16288569764352f1e1b93e696d3db4b0728bc38e5b12 WHIRLPOOL c6902554bc8f390b5d295d05598ee60fd6b2637d290125d83a48fc40bbd4e6e261a711430259831c96a30fee4c5ec5c89aea444424b117fb5d62c946b0263454 DIST gst-python-1.2.1.tar.bz2 410887 SHA256 8823e5a9ffc51212df412652da44dc3f2a0e23295da769de2d111c770280efd4 SHA512 ed318d94831d34687224d82b84735984b946c6f33704e6bda56847b633af06212f394b709257007cec5d3a3597b200fbe6b19eade6b76e7855e8668c5ebc270e WHIRLPOOL 959e976c5a481367eb298d24eed4b3bf125d173662ff30cf02506906c88cd369259e0f5cb2bbd31bae31c39934b4a894d2eae13a5e411301f055aef030dcebbb DIST gst-python-1.4.0.tar.xz 350316 SHA256 b1e40c29ceb41b03f08d38aca6056054f0341d0706276326dceeec6ac8d53d3e SHA512 b970fd16a3b9d82f343fbf20642d165bff25fb815cfe20cc51db8c04c298a8fbd9b96f41811c2d26982eadf1f9a84495c70fbdad553778c68604f828e4773a94 WHIRLPOOL 248d91fc0aac1314c4f7b40866579601a8024c947a29a90b5b6c3585358984f1a50eb6d56aec26609d37fc9144fdf38d5edd7ad61364481d25b7cebfaeff1a96 +DIST gst-python-1.6.0.tar.xz 368100 SHA256 60dbc7f5ac2b6655ed4a7ed2cee63ee5a525d37cb16eaa6b9df7d7dfe4e9605f SHA512 6ca7e274d6aac580aec52d2bc635ffcd1361de73324a2818632d5304d59b71111433f888d89864ee2053ddd71cddec93a1f8dfe511414bd6e3ab2f26e87bfece WHIRLPOOL ef2c990a7949fc9e39b93761f817bba195fc53f314017a7223504930913fe883a6953aa1a3bdb7f1ebd2fef110b3bc2ec6e6e53108ae96125ea8f74a0cfa23e7 diff --git a/dev-python/gst-python/gst-python-1.6.0.ebuild b/dev-python/gst-python/gst-python-1.6.0.ebuild new file mode 100644 index 000000000000..53128bc120af --- /dev/null +++ b/dev-python/gst-python/gst-python-1.6.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +PYTHON_COMPAT=( python2_7 python{3_3,3_4,3_5} ) + +inherit python-r1 + +DESCRIPTION="A Python Interface to GStreamer" +HOMEPAGE="http://gstreamer.freedesktop.org/" +SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz" + +LICENSE="LGPL-2" +SLOT="1.0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="test" + +RDEPEND=" + dev-libs/libxml2 + >=dev-python/pygobject-3:3[${PYTHON_USEDEP}] + >=media-libs/gstreamer-1.6:1.0 + >=media-libs/gst-plugins-base-1.6:1.0 +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" +# XXX: unittests are not ported to 1.0 yet. + +src_prepare() { + prepare_gst() { + mkdir -p "${BUILD_DIR}" || die + } + python_foreach_impl prepare_gst +} + +src_configure() { + ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir econf +} + +src_compile() { + python_foreach_impl run_in_build_dir default +} + +src_install() { + python_foreach_impl run_in_build_dir default + prune_libtool_files --modules + einstalldocs +} diff --git a/dev-python/html5lib/html5lib-0.9999999.ebuild b/dev-python/html5lib/html5lib-0.9999999.ebuild index 9d0148740a9a..a76b5bbf96c5 100644 --- a/dev-python/html5lib/html5lib-0.9999999.ebuild +++ b/dev-python/html5lib/html5lib-0.9999999.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="test" RDEPEND="dev-python/six[${PYTHON_USEDEP}]" diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest index 740c02b916eb..2e6a546156fc 100644 --- a/dev-python/hypothesis/Manifest +++ b/dev-python/hypothesis/Manifest @@ -1,2 +1,2 @@ -DIST hypothesis-1.7.1.tar.gz 58959 SHA256 25ac0cb59bb2a707687f7eafb2fe12077852ccaeb8344ed678da61431e86d4c0 SHA512 7a30e325449b01c56cd2a13aecbd51374748b7f6aea6ad2ec75cccda33e911c7495820dc0b7e140e34aff9b30b3ddda8cb4a80964dd99bffc9e1d75dff30784e WHIRLPOOL 3c06dd1da1ad888d15cb5aadf0744577e1af81a4b37fda9540b02057dfd4e7926385816b6d8d13ad36d5fdf528699ef5c5bac5f3448a3e2f5667129e5e7166de -DIST hypothesis-1.9.0.tar.gz 70605 SHA256 774fff913da11446fa5522b4f20661ddf81cfdf2865d48ec5d160f9491f3f19a SHA512 898f2a0d410cc367def992025b7191f148752acfa86413626eff3c58be7242fa19ea81af2dcfdeef307fd0da61ddd633f34a65b3ce43f37a891b0cd5fddca7d2 WHIRLPOOL db4fa35b1b183a13d90d040ff070e8777402139d8504aab252c370477bb514a21806b97aaf3c632b4a6c9ce4f6f92a74cae1f2a3669d06364183cb61eee1e3d6 +DIST hypothesis-1.12.0.tar.gz 76679 SHA256 5e90a8fa249de9c492b4fa573f6f2dc489de9dd3ed3e2a59754b393c42624362 SHA512 107747d835dbe27fe25a429a8be66166005d3f0514d56d585505e99a4e4427afc210b7b6a7459858988f37182e6e4797ffcd1fa0511f8ae985725a1c2bbe73d4 WHIRLPOOL 0539637b819e9d3e4e96d5997299366d68a4e16f9ad5fcbf576048a761172e8568f2538de77b787f36c60ed09758ec5b8a962ae936f8f22d90ffb9551f63d008 +DIST hypothesis-1.14.0.tar.gz 77977 SHA256 be2bffac70569cb21d6007b0e0d4b013008e16fb66e6bc8090022310eccebd89 SHA512 427f45517ab63505ffe5c10c205f49140325cc3d7479232119bd9dd21b96c86fae563fa875e8882221a58194034bceafa884a2ba47db101b160f70cfe4dfd1a2 WHIRLPOOL ac003596fef4f33db2925102736e694754a573b2d840584f968e1034ceb6e132a97001987df3c1a958564df37db812e517243e7f1cbf1f61dccb9feb9d9b6b25 diff --git a/dev-python/hypothesis/hypothesis-1.12.0.ebuild b/dev-python/hypothesis/hypothesis-1.12.0.ebuild new file mode 100644 index 000000000000..593db2e85e4f --- /dev/null +++ b/dev-python/hypothesis/hypothesis-1.12.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="A library for property based testing" +HOMEPAGE="https://github.com/DRMacIver/hypothesis" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" +IUSE="" + +RDEPEND="" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +pkg_postinst() { + optfeature "datetime support" dev-python/pytz + optfeature "numpy support" dev-python/numpy + optfeature "django support" dev-python/django dev-python/pytz + optfeature "pytest support" dev-python/pytest +# optfeature "fake-factory support" dev-python/fake-factory +} diff --git a/dev-python/hypothesis/hypothesis-1.9.0.ebuild b/dev-python/hypothesis/hypothesis-1.14.0.ebuild index eb0b2a531e3e..f65d7fd3072e 100644 --- a/dev-python/hypothesis/hypothesis-1.9.0.ebuild +++ b/dev-python/hypothesis/hypothesis-1.14.0.ebuild @@ -19,3 +19,11 @@ IUSE="" RDEPEND="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +pkg_postinst() { + optfeature "datetime support" dev-python/pytz + optfeature "numpy support" dev-python/numpy + optfeature "django support" dev-python/django dev-python/pytz + optfeature "pytest support" dev-python/pytest +# optfeature "fake-factory support" dev-python/fake-factory +} diff --git a/dev-python/hypothesis/hypothesis-1.7.1.ebuild b/dev-python/hypothesis/hypothesis-1.7.1.ebuild deleted file mode 100644 index 7e106ee01a14..000000000000 --- a/dev-python/hypothesis/hypothesis-1.7.1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) - -inherit distutils-r1 - -DESCRIPTION="A library for property based testing" -HOMEPAGE="https://github.com/DRMacIver/hypothesis" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/ipaddress/ipaddress-1.0.14.ebuild b/dev-python/ipaddress/ipaddress-1.0.14.ebuild index 779e9abaec70..5d183f5a5b9e 100644 --- a/dev-python/ipaddress/ipaddress-1.0.14.ebuild +++ b/dev-python/ipaddress/ipaddress-1.0.14.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="PSF-2" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="" diff --git a/dev-python/ipython/metadata.xml b/dev-python/ipython/metadata.xml index e8cfb386059f..a337833e53ea 100644 --- a/dev-python/ipython/metadata.xml +++ b/dev-python/ipython/metadata.xml @@ -21,7 +21,7 @@ * Integrated access to the pdb debugger and the Python profiler. </longdescription> <longdescription lang="ja"> -対話的に利用する場合にPythonインタープリタから、より機能が豊富なIPythonへ置き換>える事ができます。 +対話的に利用する場合にPythonインタープリタから、より機能が豊富なIPythonへ置き換える事ができます。 主機能： * 内包的オブジェクトの分析。 diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest index fc4332f02f09..225e668c86f3 100644 --- a/dev-python/joblib/Manifest +++ b/dev-python/joblib/Manifest @@ -1,2 +1,3 @@ DIST joblib-0.8.4.tar.gz 314213 SHA256 f185b87199525e0805281960f9f91c4f2e382e5834f05678cfcfa8ec666a4d2b SHA512 37d9a107c0f8f80c30cbcf7e4520a571eb925efdfb8729ca681fb12b3ec79cfd63c4b53660e560bbb3bc162664f79ab1d9fa7207f3dac00b5d5cddcdc12169c9 WHIRLPOOL f887c0153b4fa691e2289a9d3237a1b9ee51fabd7f6f3a54c7914f4296e23d50010ba822846723566fac5bcfd40c7b23c458121b6eff18d8ce15d6317ae5e638 DIST joblib-0.9.2.tar.gz 480557 SHA256 aa20324c09428e35a93517156b5355aa69e070661cdcb3c983249c814d5f7b84 SHA512 8fb5362a6816cb9fb04611c7e2b0b9abdcee216932c966f960f490380d00a4931ddb2abbf3b30e73dca75d05056bcb4863ac92fe0d2a3e6d3842d1f116c1a3f9 WHIRLPOOL 0a04c3045979b23ddfd9554d748d42a7cbc7bed1cd02a7e68ceddc26273fe1c4aeb2c1b51597b5a3a4785aa180cabaa4f90ddd23988ef70cc66edcd8105e0120 +DIST joblib-0.9.3.tar.gz 445258 SHA256 ac68f659cd4cfdb102423e9d87f9d94fe1d76f1e02dcbf8c99aea7fcb223be4d SHA512 dada1e628c6f875c663cbb5e7c3339e4a56482f89bcc323f95f996821111c4d5fdc1e66511bd6158dd4b255e5d3d0de9321b7fee42c3e51ec9dcc01695a8235d WHIRLPOOL ef60a41e5939b758ec049a2739b9a0c980e6cb401c4e5f45e2036bf329660cca6b02fb65879bffdbde4aef0f45229529ac6fb769244bb0790ec35bd0dc283f84 diff --git a/dev-python/joblib/joblib-0.9.3.ebuild b/dev-python/joblib/joblib-0.9.3.ebuild new file mode 100644 index 000000000000..991fe2f50cdd --- /dev/null +++ b/dev-python/joblib/joblib-0.9.3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Tools to provide lightweight pipelining in Python" +HOMEPAGE="http://pythonhosted.org/joblib/ https://github.com/joblib/joblib" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc test" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( dev-python/nose[${PYTHON_USEDEP}] )" +RDEPEND="" +# Usual; req'd for testsuite +DISTUTILS_IN_SOURCE_BUILD=1 + +python_compile_all() { + if use doc; then + sphinx-build -b html -c doc/ doc/ doc/html || die "docs failed installation" + fi +} + +python_test() { + # https://github.com/joblib/joblib/issues/143 + if [[ "${EPYTHON}" == pypy ]]; then + sed -e 's:test_func_inspect_errors:_&:' -i ${PN}/test/test_func_inspect.py || die + sed -e 's:test_parallel_pickling:_&:' -i ${PN}/test/test_parallel.py || die + fi + + nosetests -w ${PN}/test || die +} + +python_install_all() { + use doc && local HTML_DOCS=( doc/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/joblib/metadata.xml b/dev-python/joblib/metadata.xml index 59cc2bd80c22..35b86bedc8c3 100644 --- a/dev-python/joblib/metadata.xml +++ b/dev-python/joblib/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/jsmin/Manifest b/dev-python/jsmin/Manifest index f81a73bc7825..b809778efd75 100644 --- a/dev-python/jsmin/Manifest +++ b/dev-python/jsmin/Manifest @@ -1,2 +1,3 @@ DIST jsmin-2.1.1.tar.gz 9783 SHA256 582f70f5fef561c8d561271206f45258d0c420eec31a8628914e87c73a2192e1 SHA512 1f889bb6a2916da21c315b5aff468cb8c479cbaedb99dfb4bb9298de6414615f274a4f37eeaee108a5f136ceea6893bddc5f564375bb2b2e7f14836a7f1d3dc1 WHIRLPOOL 941453d4765e983ca1b6d65a7f3afc390f967070fa8962a62ac783428071f2af70b42f5e80a4aea60dc8b0e724f490281a502cb13c58653035b34715dfe2f701 DIST jsmin-2.1.2.tar.gz 9995 SHA256 5e710e9db14f210dfd55ebec43bca5c812d34c5b6179dbcba2e61d9f965bf4e1 SHA512 9723e2ff2feb243b84d3b8d1869a6591bbf1f3224d6f706eb7264293ed083508560586ee4466a4da370bcb4a611a48e9c78d1c25ede363312cafe9189ff97e5d WHIRLPOOL 41896e65703f45bacd0793b2ffb16c12eef4d4f012aa9c12d7282566efeafd49b3c26668c9ba2157a6112bc17d35f66f9f60430618f99dddc69e2be04be45809 +DIST jsmin-2.1.6.tar.gz 11858 SHA256 c20e7f58a68207b8efdffae8d4c885e823615da3b605905fb0794a56e6aac4a3 SHA512 df0ac0b02df54411ca0cb20adb8eabc2bbfbd35f28b3cb1b6a5184ea3ffa8bdb6d091ff42a8531449a739c5d1ffc872840108bfd4e4c2d2ac98fbb59e8c4e820 WHIRLPOOL 5e0409230aad1c69d044e96ceb7333903a8859752661f6fdac8facc4618b70e5cff289e97c4c3cf09242e2194ca84a780f9444b1a1c593b4b712e7cf9ebb31f1 diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild b/dev-python/jsmin/jsmin-2.1.6.ebuild index 0971b04c9b49..c86327c6564b 100644 --- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild +++ b/dev-python/jsmin/jsmin-2.1.6.ebuild @@ -8,13 +8,17 @@ PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) inherit distutils-r1 -DESCRIPTION="ReadTheDocs.org theme for Sphinx" -HOMEPAGE="https://github.com/snide/sphinx_rtd_theme/" +DESCRIPTION="JavaScript minifier" +HOMEPAGE="https://bitbucket.org/dcs/jsmin/" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +KEYWORDS="~amd64 ~x86" +IUSE="" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +python_test() { + "${PYTHON}" -m ${PN}.test || die +} diff --git a/dev-python/kiwisolver/metadata.xml b/dev-python/kiwisolver/metadata.xml index cca89313e8b0..db07505b0175 100644 --- a/dev-python/kiwisolver/metadata.xml +++ b/dev-python/kiwisolver/metadata.xml @@ -2,12 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>idella4@gentoo.org</email> - </maintainer> - <maintainer> - <email>aaron@flappyport.com</email> - <name>Arron Bauman</name> - <description>proxy maintainer</description> + <email>bman@gentoo.org</email> + <name>Aaron Bauman</name> </maintainer> <upstream> <remote-id type="pypi">kiwisolver</remote-id> diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest index 389ed100fc75..7eeef3918196 100644 --- a/dev-python/kombu/Manifest +++ b/dev-python/kombu/Manifest @@ -3,3 +3,4 @@ DIST kombu-3.0.23.tar.gz 343923 SHA256 448c3e3ce671a10f00ee03979ba3c7866b4bfce49 DIST kombu-3.0.24.tar.gz 374539 SHA256 b9ff0437607113aea701fd5122c2afa40c05dff6f1da4f58b2f1ea18d9f2bf8d SHA512 fdc42073d37c0888f564ae3feec517212e3cadd534cae2a0893f799c6fea7c217aa979617ec73b63466a7b5a3dbb836b57422ce514087d4e4821e88eec5e4ffa WHIRLPOOL 8513cbe9df4337fe3545cc2a2ff3cec3c9f28b60f200aff5395b2acb484c6b75fe710b5227df6eb3fd41a6faeb49a0aaf968618e66594e9e87c20c448475d27c DIST kombu-3.0.26.tar.gz 375553 SHA256 1f565abd44c4b7dfaa4dd543d52f982d2f006aba0a2b3830542b4d25a801fe09 SHA512 71656cc8f44101700c5489e0b0a66918a00cf8ff39e65feab1090865e3c8d50b6dd2458f95d48fb58cc4387de954530fe27a5713838509d51123bac7009631a2 WHIRLPOOL d706dcd752e24eebc3a1091a8a2ba91a0b6adf30fa9be4d9d1a95b5c008f8036eb518f03ccb1d3393502488120c9ad2ad2f2e01c41b59beb3576389b3f9c000f DIST kombu-3.0.28.tar.gz 377706 SHA256 c22af35c4e7bbb7441b789b9b8c1baf73a8c481eaa93d00a63fa85bddc6b1ab1 SHA512 1409966edef345565f371cfa705fc643ca9b0e5ef46426f4b41859461f1c326e2c6c754ff51c337f42c42039af678d3dda0b333a2d70bbbcaa5e6c050a4d1ce9 WHIRLPOOL 780233337a574fafc187f9b4d68f17c9e68ee6e9fa7276ece859081573ace3b981dcbed2ff89b885bd7e0f8995dab42e0c34d6f47b6c0fb7dd053505a6f78d31 +DIST kombu-3.0.29.tar.gz 378270 SHA256 970a55ec65e668403c3e6ef4aa2213362568387885f5cc0ff8429abd44a6dca8 SHA512 1093826ec4ba8234f8f8a1082252df20e600f0b58fc46c5c5b3ee6ef3b2582e2c986f997edfa13d4c85b9473236f3cca902375109266a809d33fd76c6eb45c35 WHIRLPOOL 9e4909c02ed2be14235861d2838278d71ab90da20f59c4b02123d9ce84212c0e93cc8b162e2ef8df45d224ed0166c022fca849a6cb39143fd6554e6a00b71893 diff --git a/dev-python/kombu/kombu-3.0.29.ebuild b/dev-python/kombu/kombu-3.0.29.ebuild new file mode 100644 index 000000000000..373244c2322a --- /dev/null +++ b/dev-python/kombu/kombu-3.0.29.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit distutils-r1 + +DESCRIPTION="AMQP Messaging Framework for Python" +HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="amqplib doc examples msgpack sqs test" + +# couchdb backend support possible via dev-python/couchdb-python +# ditto dev-python/kazoo(>=1.3.1) and dev-python/beanstalkc +PY27_GEN_USEDEP=$(python_gen_usedep python2_7) +PYPY_GEN_USEDEP=$(python_gen_usedep python2_7 pypy) +RDEPEND=" + >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] + >=dev-python/py-amqp-1.4.7[${PYTHON_USEDEP}] + <dev-python/py-amqp-2.0[${PYTHON_USEDEP}] + dev-python/pyro:4[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4}) + amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] ) + sqs? ( >=dev-python/boto-2.13.3[${PY27_GEN_USEDEP}] ) + msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )" +# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2 +DEPEND="${RDEPEND} + >=dev-python/setuptools-0.7[${PYTHON_USEDEP}] + test? ( + >=dev-python/unittest2-0.5.0[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + dev-python/nose-cover3[${PYTHON_USEDEP}] + >=dev-python/coverage-3.0[${PYTHON_USEDEP}] + >=dev-python/mock-0.7.0[${PYPY_GEN_USEDEP}] + dev-python/django[${PYTHON_USEDEP}] + >=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}] + >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] ) + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/django[${PYTHON_USEDEP}] + dev-python/beanstalkc[${PY27_GEN_USEDEP}] + dev-python/couchdb-python[${PYTHON_USEDEP}] + >=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )" + +# kazoo and sqlalchemy are optional packages for tests. +# Refrain for now, no established demand for it from users + +# Req'd for test phase +DISTUTILS_IN_SOURCE_BUILD=1 + +PY27_REQUSE="$(python_gen_useflags 'python2.7')" +REQUIRED_USE=" + sqs? ( ${PY27_REQUSE} ) + doc? ( ${PY27_REQUSE} amqplib sqs )" # 2 deps in doc build are py2 capable only + +PATCHES=( + "${FILESDIR}"/${PN}-NA-tests-fix.patch + ) + +python_prepare_all() { + https://github.com/celery/kombu/issues/246 + sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py + distutils-r1_python_prepare_all +} + +python_compile_all() { + # Doc build must be done by py2.7 + # Doc build misses and skips only content re librabbitmq which is not in portage + if use doc; then + emake -C docs html || die "kombu docs failed installation" + fi +} + +python_test() { + export DJANGO_SETTINGS_MODULE="django.conf" + # https://github.com/celery/kombu/issues/474 + # tests need </pymongo-3.0; known to cause some breakage + if python_is_python3; then + 2to3 --no-diffs -w build/lib/kombu/transport/ + nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}" + else + nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}" + # funtests appears to be coded only for py2, a kind of 2nd tier. pypy fails 6. + # https://github.com/celery/kombu/issues/411 + # Fix to https://github.com/celery/kombu/issues/474 breaks the + # funtests under >=dev-python/pymongo-3.0.2 +# if [[ "${EPYTHON}" == python2.7 ]]; then +# pushd funtests > /dev/null +# esetup.py test +# popd > /dev/null +# fi + fi +} + +python_install_all() { + use examples && local EXAMPLES=( examples/. ) + use doc && local HTML_DOCS=( docs/.build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/ldap3/Manifest b/dev-python/ldap3/Manifest index f84176012fb7..79c56da68e6c 100644 --- a/dev-python/ldap3/Manifest +++ b/dev-python/ldap3/Manifest @@ -1,2 +1,3 @@ DIST ldap3-0.9.9.1.tar.gz 286623 SHA256 55812eff14919ddc9e53273c09846a0fd3e0d27a2c4b8a110427e58beeadd03d SHA512 f289e86fbc6bb36e7260592cb7f3423c593dcdb75ba43fa418f1367e48967ab175a27073b7c2b3cbee6ef8526f35c96c7fb90e1768e2da27829087abf9104d9c WHIRLPOOL 2325af48ead118577c6d5137d95fca5eec39e119b6ae2759f1a571f78a040bc7ccbd17c5e4760c2d232520a5252129f032c26d814c3c84d1f390222561253692 +DIST ldap3-0.9.9.2.tar.gz 290242 SHA256 867e448822d91f8ef351bf3dcf8dce43a36312d454db1cb114a3298e3aac6ba4 SHA512 6533bb0e3b958622ac8207ccc12d0817a3b9562ccb5cc911751d73e7b3419f9ae6cf87ffebc5df7b27cd82fc43b9570260a04cb15a5caa97e75f98aa6359f7e5 WHIRLPOOL 6998ddf71445aa5183a9cdf5e523f515dc99f6d4f0bdf562c0537431dffe4f073bf224b4b37a096a06b1a8d0d967cd8af7e81e097a430c036db5110a77ccd2b8 DIST ldap3-0.9.9.tar.gz 285775 SHA256 4555b78ecf3ef8ce7fb854c1e863d8f8ffce5f49fa599d04c161749a8fdd16e6 SHA512 ce149629e49add9704fa853c6e7b644e1b4192bee378be757ff6911c5dce89b8532e22d208248475f1531d433d168b806151082179b45c5ea9f57df90203333e WHIRLPOOL 917095ad6f4f477bf2834c4e7da8c6909561c705f36df5598e48269dd2505c66720369a6846e9614feeda5c9b2a6d4317489da2143d6c87584df13ae02ba3fc6 diff --git a/dev-python/ldap3/ldap3-0.9.9.2.ebuild b/dev-python/ldap3/ldap3-0.9.9.2.ebuild new file mode 100644 index 000000000000..700d8ef8deaf --- /dev/null +++ b/dev-python/ldap3/ldap3-0.9.9.2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client" +HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/nose[${PYTHON_USEDEP}] ) + " + +python_test() { + cd "${BUILD_DIR}" || die + nosetests -v -s test || die +} diff --git a/dev-python/linecache2/linecache2-1.0.0.ebuild b/dev-python/linecache2/linecache2-1.0.0.ebuild index a4bd220b0cb5..193684a50261 100644 --- a/dev-python/linecache2/linecache2-1.0.0.ebuild +++ b/dev-python/linecache2/linecache2-1.0.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="PSF-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="test" DEPEND=" diff --git a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild index 1979687a3a4e..07c87a83a7f9 100644 --- a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild +++ b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="doc test" DEPEND=" diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest index 5fb58e0a7352..67526762541a 100644 --- a/dev-python/mako/Manifest +++ b/dev-python/mako/Manifest @@ -1,2 +1,3 @@ DIST Mako-1.0.0.tar.gz 470006 SHA256 a3cd72cfef507204b50f74ffcbfcfde7e856437891d3f6cfe780866986d006fe SHA512 81a6b7637e26d561350a591e3490e7140db218ae7f6b43fec8fca5b767fc6e57d0e8cc901d28fecb9863b2170c824a35c578a94579f991359fa0873f62ec578a WHIRLPOOL aa27b63e3832f03120312fbfec939b05606081e67a5cb4c9a056c27259631c2e159cf7506292d44e2c17c5950d7e4255d19f4beba78502bdbb52fbf11e1a872c DIST Mako-1.0.2.tar.gz 564592 SHA256 2550c2e4528820db68cbcbe668add5c71ab7fa332b7eada7919044bf8697679e SHA512 d297f9050049ac37612b10d61d3f1bb2cb7f6e238e7afdce092ba95d6117e064b4dfebaa3219093d88f75c6ef691fe3a0aaebd4188a5ba571867d3a3dfe986bc WHIRLPOOL 63f1b0a094dcbd5ab9fb86ba56764ad517b60c24d58b7e51b5220d2df4426e47d0c65d0409f9f7c499c7eaa0747b5bac06326718574038c2276b4b52147274fe +DIST Mako-1.0.3.tar.gz 565224 SHA256 7644bc0ee35965d2e146dde31827b8982ed70a58281085fac42869a09764d38c SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d WHIRLPOOL 4ac07778b58d8b4c95853a07dcb8755e560cb7225f68b606582ef9883fe632caead44d4a56ae1662b42f0ecdee2117942b3c500385558aa8f9763a3ce755b583 diff --git a/dev-python/mako/mako-1.0.3.ebuild b/dev-python/mako/mako-1.0.3.ebuild new file mode 100644 index 000000000000..1bdcc80c8b31 --- /dev/null +++ b/dev-python/mako/mako-1.0.3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit distutils-r1 eutils versionator + +MY_PN="Mako" +MY_P=${MY_PN}-${PV} + +DESCRIPTION="A Python templating language" +HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +IUSE="doc test" + +RDEPEND=" + >=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) + )" + +S="${WORKDIR}/${MY_P}" + +python_test() { + nosetests "${S}"/test || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + rm -rf doc/build || die + + use doc && local HTML_DOCS=( doc/. ) + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "Caching support" dev-python/beaker + for v in ${REPLACING_VERSIONS}; do + if ! version_is_at_least 0.7.3-r2 $v; then + ewarn "dev-python/beaker is no longer hard dependency of ${P}" + ewarn "If you rely on it, you should add beaker to your world" + ewarn "file:" + ewarn "# emerge --noreplace beaker" + break + fi + done +} diff --git a/dev-python/mamba/mamba-0.8.5.ebuild b/dev-python/mamba/mamba-0.8.5.ebuild index fde264bf71f6..2e35749ababd 100644 --- a/dev-python/mamba/mamba-0.8.5.ebuild +++ b/dev-python/mamba/mamba-0.8.5.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_4 ) inherit distutils-r1 diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest index 43a78c806205..8286fb7d0665 100644 --- a/dev-python/markdown/Manifest +++ b/dev-python/markdown/Manifest @@ -1,3 +1,2 @@ -DIST Markdown-2.5.1.tar.gz 288970 SHA256 8f81ed12c18608a502828acb7d318f362c42f4eca97d01e93cadfc52c1e40b73 SHA512 27f0d3909d6aa1e0ae15403da1cdfafcbfd463d7a236e0ea0cf02c55efa8f863c2554d54e20b0d9f58d80502dbf333120431474f16c64883001e5a318866eeb0 WHIRLPOOL 88f76fcb744ad6b8429442de409275c655a85039475d6dab11031a141e148286cc56d7865f590b432bfcf91af4965963989dae9a68a01e6931f367f425f83420 DIST Markdown-2.6.1.tar.gz 298074 SHA256 b5879b87e8e5c125c92ab8c8f3babce78ad4e840446eed73c5b6e2984648d2b1 SHA512 53e11c5d4feacdb8210427da65b6b09453e8c904e86b42095a80132a4b67e926ba974458769e5227bfeaddd3bba5f6bd7ca7e3385951982ec982f63989119d78 WHIRLPOOL 58b6d87354ee19aac7ad1567e10f2cdc99c1aa980d3bee2fee81a5ccb5e70f43d13750dfaf1df9a42c00f3d35664731b52bfa1246271907f5a3422281ede1cc6 -DIST Markdown-2.6.2.tar.gz 298231 SHA256 ee17d0d7dc091e645dd48302a2e21301cc68f188505c2069d8635f94554170bf SHA512 a69dabf65187f54d200f59191a149bfe2109f94ffc5d003e15c2e6333c0b5fdeebfc4136842d7be5a15bc903b7a22120a4ccba2722858194c43fd09cd8fbea16 WHIRLPOOL a3c74f150e6e140b0b0500d0694b89b8e6836adef66cd2c14a1ad5ff8d4dc202b35fae8a0c9683e53030fc80792885cd4b22c46729963a683ebbbb5101963dd7 +DIST Markdown-2.6.3.tar.gz 301441 SHA256 ad75fc03c45492eba3bc63645e1e6465f65523a05fff0abf36910f810465a9af SHA512 29917d7112d84bc175cdab39fe1c57cc7c7efcef60cddde41905c8314caf86500eab50a1c93c5cde2cfcd82ce1214ab65367fc7d2111c9487596b9cae16882ee WHIRLPOOL 8d50fa6895a117c081f1ccb5cfc456a297a8ff36e1597add78fbd8acfd4b72f79c617c5bffc790bc7c6d76f7aefef5706b8d8083f4104500f4b5c035aa14546d diff --git a/dev-python/markdown/markdown-2.5.1.ebuild b/dev-python/markdown/markdown-2.5.1.ebuild deleted file mode 100644 index 51866a3c35e0..000000000000 --- a/dev-python/markdown/markdown-2.5.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) - -inherit distutils-r1 - -MY_PN="Markdown" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python implementation of the markdown markup language" -HOMEPAGE="http://www.freewisdom.org/projects/python-markdown https://pypi.python.org/pypi/Markdown" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test pygments" - -DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] )" -# source cites pytidylib however from testruns it appears optional -RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_P}" - -python_compile_all() { - use doc && esetup.py build_docs -} - -python_test() { - cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die - pushd "${BUILD_DIR}" > /dev/null - "${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}" - popd > /dev/null -} - -python_install_all() { - # make use doc do a doc build - use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/markdown/markdown-2.6.2.ebuild b/dev-python/markdown/markdown-2.6.3.ebuild index 644d6cf16ddd..27f86b1f9435 100644 --- a/dev-python/markdown/markdown-2.6.2.ebuild +++ b/dev-python/markdown/markdown-2.6.3.ebuild @@ -12,7 +12,11 @@ MY_PN="Markdown" MY_P=${MY_PN}-${PV} DESCRIPTION="Python implementation of the markdown markup language" -HOMEPAGE="http://www.freewisdom.org/projects/python-markdown https://pypi.python.org/pypi/Markdown" +HOMEPAGE=" + http://www.freewisdom.org/projects/python-markdown + https://pypi.python.org/pypi/Markdown + https://pythonhosted.org/Markdown/ + https://github.com/waylan/Python-Markdown" SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="|| ( BSD GPL-2 )" @@ -24,6 +28,8 @@ DEPEND=" test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/pytidylib[${PYTHON_USEDEP}] )" # source cites pytidylib however from testruns it appears optional RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )" diff --git a/dev-python/markdown/metadata.xml b/dev-python/markdown/metadata.xml index 46571022df6a..50c3f9d83463 100644 --- a/dev-python/markdown/metadata.xml +++ b/dev-python/markdown/metadata.xml @@ -7,5 +7,6 @@ </use> <upstream> <remote-id type="pypi">Markdown</remote-id> + <remote-id type="github">waylan/Python-Markdown</remote-id> </upstream> </pkgmetadata> diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index a73396a88671..ccfe5f433144 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -1,2 +1,3 @@ DIST matplotlib-1.4.2.tar.gz 50139344 SHA256 17a3c7154f152d8dfed1f37517c0a8c5db6ade4f6334f684989c36dab84ddb54 SHA512 3525f4e6414042fabf8d18ce9041d61197465dc07c766730c187a512277907ba33f56d49d5a468d82f65bce57217e8eb48ecfa143e55152a15607b79a7b25adc WHIRLPOOL ce6e5a15676b939bda7ad1be0f27766314f60ed44ebfba1e73d2c3d00a31d5492722cde73f943de72da038772519068602e60c830af9ffdf52710a24ce98fe7a DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad +DIST matplotlib-1.5.0.tar.gz 53962448 SHA256 67b08b1650a00a6317d94b76a30a47320087e5244920604c5462188cba0c2646 SHA512 559a3ef031ca65b431157f0dd50f7d81f2d854f92150ee2b9de5e44b31d49615bfdc049a682667bc2e1399b8cd724dfcefec8f4de7e92848fe5756f93ddef5fa WHIRLPOOL b30a7299dd0690cd0355883cbe7d335d76314bab85f5b67b326b0e600b479db3cd5e7f48e9e68d3604832e9605f5025c70ff0006b1980b945aeaf22f78e3469f diff --git a/dev-python/matplotlib/matplotlib-1.4.2.ebuild b/dev-python/matplotlib/matplotlib-1.4.2.ebuild index defc79b79f4b..adc42560851d 100644 --- a/dev-python/matplotlib/matplotlib-1.4.2.ebuild +++ b/dev-python/matplotlib/matplotlib-1.4.2.ebuild @@ -100,8 +100,6 @@ REQUIRED_USE=" || ( gtk gtk3 ) )" -RESTRICT="mirror" - # A few C++ source files are written to srcdir. # Other than that, the ebuild shall be fit for out-of-source build. DISTUTILS_IN_SOURCE_BUILD=1 @@ -202,6 +200,7 @@ python_configure() { wrap_setup() { local MPLSETUPCFG=${BUILD_DIR}/setup.cfg export MPLSETUPCFG + unset DISPLAY # Note: remove build... if switching to out-of-source build "${@}" build --build-lib="${BUILD_DIR}"/build/lib diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild index bf6eb50ae12d..a92bbbc7fd38 100644 --- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild +++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild @@ -20,7 +20,7 @@ SLOT="0" # matplotlib/backends/qt4_editor: MIT # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets" PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" @@ -105,8 +105,6 @@ RDEPEND="${COMMON_DEPEND} qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) " -RESTRICT="mirror" - # A few C++ source files are written to srcdir. # Other than that, the ebuild shall be fit for out-of-source build. DISTUTILS_IN_SOURCE_BUILD=1 @@ -219,6 +217,7 @@ python_configure() { wrap_setup() { local MPLSETUPCFG=${BUILD_DIR}/setup.cfg export MPLSETUPCFG + unset DISPLAY # Note: remove build... if switching to out-of-source build "${@}" build --build-lib="${BUILD_DIR}"/build/lib diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild new file mode 100644 index 000000000000..ba3180e0597f --- /dev/null +++ b/dev-python/matplotlib/matplotlib-1.5.0.ebuild @@ -0,0 +1,272 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +PYTHON_REQ_USE='tk?' + +inherit distutils-r1 eutils flag-o-matic virtualx toolchain-funcs + +DESCRIPTION="Pure python plotting library with matlab like syntax" +HOMEPAGE="http://matplotlib.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +SLOT="0" +# Main license: matplotlib +# Some modules: BSD +# matplotlib/backends/qt4_editor: MIT +# Fonts: BitstreamVera, OFL-1.1 +LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets" + +PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" +REQUIRED_USE=" + doc? ( ${PY2_FLAGS} ) + excel? ( ${PY2_FLAGS} ) + fltk? ( ${PY2_FLAGS} ) + gtk? ( ${PY2_FLAGS} ) + wxwidgets? ( ${PY2_FLAGS} ) + test? ( + cairo fltk latex pyside qt5 qt4 tk wxwidgets + || ( gtk gtk3 ) + )" + +# #456704 -- a lot of py2-only deps +PY2_USEDEP=$(python_gen_usedep python2_7) +COMMON_DEPEND=" + dev-python/cycler[${PYTHON_USEDEP}] + >=dev-python/numpy-1.6[${PYTHON_USEDEP}] + dev-python/python-dateutil:0[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + >=dev-python/six-1.4[${PYTHON_USEDEP}] + media-fonts/stix-fonts + media-libs/freetype:2 + media-libs/libpng:0 + media-libs/qhull + gtk? ( + dev-libs/glib:2= + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + dev-python/pygtk[${PY2_USEDEP}] ) + wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )" + +# internal copy of pycxx highly patched +# dev-python/pycxx + +DEPEND="${COMMON_DEPEND} + dev-python/versioneer[${PYTHON_USEDEP}] + virtual/pkgconfig + doc? ( + app-text/dvipng + virtual/python-imaging[${PYTHON_USEDEP}] + dev-python/ipython[${PYTHON_USEDEP}] + dev-python/mock[${PY2_USEDEP}] + dev-python/numpydoc[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/xlwt[${PYTHON_USEDEP}] + dev-texlive/texlive-latexextra + dev-texlive/texlive-fontsrecommended + dev-texlive/texlive-latexrecommended + media-gfx/graphviz[cairo] + ) + test? ( + dev-python/mock[${PYTHON_USEDEP}] + >=dev-python/nose-0.11.1[${PYTHON_USEDEP}] + )" + +RDEPEND="${COMMON_DEPEND} + >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}] + cairo? ( + || ( + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/cairocffi[${PYTHON_USEDEP}] + ) + ) + excel? ( dev-python/xlwt[${PYTHON_USEDEP}] ) + fltk? ( + $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' python2_7) + $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' 'python3*') + ) + gtk3? ( + dev-python/pygobject:3[${PYTHON_USEDEP}] + x11-libs/gtk+:3[introspection] ) + latex? ( + virtual/latex-base + app-text/ghostscript-gpl + app-text/dvipng + app-text/poppler[utils] + dev-texlive/texlive-fontsrecommended + dev-texlive/texlive-latexextra + dev-texlive/texlive-xetex + ) + pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] ) + qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] ) + qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) + " + +# A few C++ source files are written to srcdir. +# Other than that, the ebuild shall be fit for out-of-source build. +DISTUTILS_IN_SOURCE_BUILD=1 + +pkg_setup() { + unset DISPLAY # bug #278524 +} + +use_setup() { + local uword="${2:-${1}}" + if use ${1}; then + echo "${uword} = True" + echo "${uword}agg = True" + else + echo "${uword} = False" + echo "${uword}agg = False" + fi +} + +_PATCHES=( + "${FILESDIR}"/${P}-backport-GH5291-2462.patch +) + +python_prepare_all() { +# Generates test failures, but fedora does it +# local PATCHES=( +# "${FILESDIR}"/${P}-unbundle-pycxx.patch +# "${FILESDIR}"/${P}-unbundle-agg.patch +# ) +# rm -r agg24 CXX || die +# rm -r agg24 || die + +# cat > lib/${PN}/externals/six.py <<-EOF +# from __future__ import absolute_import +# from six import * +# EOF + + sed \ + -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ + -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ + || die "sed pyparsing failed" + + # suggested by upstream +# sed \ +# -e '/tol/s:32:35:g' \ +# -i lib/matplotlib/tests/test_mathtext.py || die + + sed \ + -e "s:/usr/:${EPREFIX}/usr/:g" \ + -i setupext.py || die + + export XDG_RUNTIME_DIR="${T}/runtime-dir" + mkdir "${XDG_RUNTIME_DIR}" || die + chmod 0700 "${XDG_RUNTIME_DIR}" || die + + distutils-r1_python_prepare_all +} + +python_configure_all() { + append-flags -fno-strict-aliasing + append-cppflags -DNDEBUG # or get old trying to do triangulation + tc-export PKG_CONFIG +} + +python_configure() { + mkdir -p "${BUILD_DIR}" || die + + # create setup.cfg (see setup.cfg.template for any changes). + + # common switches. + cat > "${BUILD_DIR}"/setup.cfg <<- EOF + [directories] + basedirlist = "${EPREFIX}/usr" + [provide_packages] + pytz = False + dateutil = False + [gui_support] + agg = True + $(use_setup cairo) + $(use_setup pyside) + $(use_setup qt4) + $(use_setup qt5) + $(use_setup tk) + EOF + + if use gtk3 && use cairo; then + echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die + else + echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die + fi + + if $(python_is_python3); then + cat >> "${BUILD_DIR}"/setup.cfg <<- EOF + six = True + fltk = False + fltkagg = False + gtk = False + gtkagg = False + wx = False + wxagg = False + EOF + else + cat >> "${BUILD_DIR}"/setup.cfg <<-EOF + six = False + $(use_setup fltk) + $(use_setup gtk) + $(use_setup gtk3) + $(use_setup wxwidgets wx) + EOF + fi +} + +wrap_setup() { + local MPLSETUPCFG=${BUILD_DIR}/setup.cfg + export MPLSETUPCFG + unset DISPLAY + + # Note: remove build... if switching to out-of-source build + "${@}" build --build-lib="${BUILD_DIR}"/build/lib +} + +python_compile() { + wrap_setup distutils-r1_python_compile +} + +python_compile_all() { + if use doc; then + cd doc || die + + # necessary for in-source build + local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH} + + VARTEXFONTS="${T}"/fonts \ + "${PYTHON}" ./make.py --small html || die + fi +} + +python_test() { + wrap_setup distutils_install_for_testing + + #cd "${TMPDIR}" || die + VIRTUALX_COMMAND="${PYTHON}" + virtualmake -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" || \ + die "Tests fail with ${EPYTHON}" +# VIRTUALX_COMMAND=esetup.py +# virtualmake test +} + +python_install() { + wrap_setup distutils-r1_python_install +} + +python_install_all() { + use doc && local HTML_DOCS=( doc/build/html/. ) + + distutils-r1_python_install_all + + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild index 64665e727b18..03462537f63d 100644 --- a/dev-python/matplotlib/matplotlib-9999.ebuild +++ b/dev-python/matplotlib/matplotlib-9999.ebuild @@ -107,8 +107,6 @@ RDEPEND="${COMMON_DEPEND} qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) " -RESTRICT="mirror" - # A few C++ source files are written to srcdir. # Other than that, the ebuild shall be fit for out-of-source build. DISTUTILS_IN_SOURCE_BUILD=1 @@ -215,6 +213,7 @@ python_configure() { wrap_setup() { local MPLSETUPCFG=${BUILD_DIR}/setup.cfg export MPLSETUPCFG + unset DISPLAY # Note: remove build... if switching to out-of-source build "${@}" build --build-lib="${BUILD_DIR}"/build/lib diff --git a/dev-python/mock/mock-1.3.0-r1.ebuild b/dev-python/mock/mock-1.3.0-r1.ebuild index 0ac8f25a6861..b1d0f6501ff3 100644 --- a/dev-python/mock/mock-1.3.0-r1.ebuild +++ b/dev-python/mock/mock-1.3.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" IUSE="doc test" CDEPEND="$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' 'python2_7') diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild index bc3755153129..462db3981964 100644 --- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild +++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="" RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]" diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest index 844f2826257b..4d5137c05b48 100644 --- a/dev-python/neovim-python-client/Manifest +++ b/dev-python/neovim-python-client/Manifest @@ -1 +1,2 @@ DIST neovim-python-client-0.0.37.tar.xz 38008 SHA256 615120048e0bac403fe85dd9bc74a5b2fe92cc9d1dc7c65f92f8a2bf361e0ec9 SHA512 23c3557564a16f9d1c4561d6ebb6d546d52c1cdc0216f36e77edf4567f7143f30e6832296324a3897a1eb38992973c63f99c373d88e330650cd8de6e4ba665cd WHIRLPOOL d0099e8f149eea2b115129b226253d848aa1b5be2685bab5eff6cd2fa5c5c5d0de6f070ed2fca860d9bc8105a139bbb6bb9d7a4f02baef1bf337d13046803463 +DIST neovim-python-client-0.0.38.tar.xz 38524 SHA256 40599735f14dc6f715fbdc3b8e91ec4e1dd7e4a184ee0b4c7f4d69e768b557dd SHA512 b6f912802a1807eef4353fb6c8f15f9f43b9a1cde449e2c23a031b099de448dd6a2856dc4545ee33094e7f9e8842fd1101008fe4272d21e3fcf6eb38a3c144df WHIRLPOOL 218d46cc61b8e8a7e386c61fe68958888f46cf0e8da96edcd926e67ad236371d80b2a58ed385cb20526440910488265e6661537f579a2fc37dd8d63d81e98096 diff --git a/dev-python/neovim-python-client/neovim-python-client-0.0.38.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.0.38.ebuild new file mode 100644 index 000000000000..7578d349ebb5 --- /dev/null +++ b/dev-python/neovim-python-client/neovim-python-client-0.0.38.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +inherit distutils-r1 + +DESCRIPTION="Python client for Neovim" +HOMEPAGE="https://github.com/neovim/python-client" +SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.xz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk" +REQUIRED_USE="gtk? ( python_targets_python2_7 )" # experimental gui only works with py2 + +DEPEND=">=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/greenlet[${PYTHON_USEDEP}]' 'python*') + $(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3}) + gtk? ( >=dev-python/click-3.0[${PYTHON_USEDEP}] + dev-python/pygobject:2 + dev-python/pygtk:2 + x11-libs/gtk+:2[introspection] )" +RDEPEND="${DEPEND}" diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest index 205b8dd93144..33dff3aa48fc 100644 --- a/dev-python/numexpr/Manifest +++ b/dev-python/numexpr/Manifest @@ -1,2 +1,3 @@ DIST numexpr-2.4.3.tar.gz 85171 SHA256 3ae7191c89df40db6b0a8637a4dace7c5956bc910793a53225f985f3b443c722 SHA512 b33984072fddd4303980be8533e1348b48ff27de5e150029147e3666ce6bb9e1147dbc45eb0ef22506aebaea6fb366d65ff01221235f9b9935d78ea70ba9aa53 WHIRLPOOL ac5981bac643b825d6ab2fbd6c46b6d73ad62374490e5f05a71fc0b9c4269ab401617da98079e1604b11f454863e64e009a2acc00b7b30499b20eff73efe033f DIST numexpr-2.4.4.tar.gz 87133 SHA256 dfa2fad1af040e93a8022fbe4437f2183bf80e5f64d466381ad589308a73565b SHA512 abc53f8aafb39e55b6b811c1f08c01eefca23c36fb9d20a82484ef658c8062ffe51d8841d6651f43fb7f8cea6420270623df6ba9f98a95a0f7a09e6ceef91b35 WHIRLPOOL 9ab19609189e866a11c03b0aeaa3b93124d8018d53e8dec641721eff39eb73c969c34c457209d63988361ffadef13a205ba5b71d19ad120e9f44313f42c7cd1b +DIST numexpr-2.4.6.tar.gz 87481 SHA256 052397670dc56d7845ff894cd7d858e4f115491ecd93bcc0eda5cb83990c5da3 SHA512 fb68e0e782fd9e9e3cef9288addc0dfc3b79dbf01f0e72422cda6d5effd0f1629a49f9e5b89dcd16fa904423e0e9c776f3f276b4817e83cc58029c90a8627096 WHIRLPOOL 485eb98636f1ee5e1efbc843b404a23f3495d1b6682de15b67275a9c4082c87a1550d1bb91a19a7942f10f2f137af4a6294aaed95d7fd746f2db45d7319b70ec diff --git a/dev-python/numexpr/numexpr-2.4.6.ebuild b/dev-python/numexpr/numexpr-2.4.6.ebuild new file mode 100644 index 000000000000..d264e55baa75 --- /dev/null +++ b/dev-python/numexpr/numexpr-2.4.6.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit distutils-r1 + +DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy" +HOMEPAGE="https://github.com/pydata/numexpr" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="mkl" + +RDEPEND=" + >=dev-python/numpy-1.6[${PYTHON_USEDEP}] + mkl? ( sci-libs/mkl )" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +python_prepare_all() { + # TODO: mkl can be used but it fails for me + # only works with mkl in tree. newer mkl will use pkgconfig + if use mkl; then + local ext + use amd64 && ext=_lp64 + cat <<- EOF > "${S}"/site.cfg + [mkl] + library_dirs = ${MKLROOT}/lib/em64t + include_dirs = ${MKLROOT}/include + mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \ + mkl_intel_thread, mkl_core, iomp5 + EOF + fi + distutils-r1_python_prepare_all +} + +python_compile() { + python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" + distutils-r1_python_compile +} + +python_test() { + pushd "${BUILD_DIR}"/lib > /dev/null + "${PYTHON}" -c "import numexpr; numexpr.test()" || die + pushd > /dev/null +} diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index 6ce4c2583077..6baec64d2f08 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -1,17 +1,10 @@ DIST numpy-1.10.1.tar.gz 4048478 SHA256 8b9f453f29ce96a14e625100d3dcf8926301d36c5f622623bf8820e748510858 SHA512 ea717bac913a8e63bf93822bddbfe7701a3de00051bf3c7020f5e22756987becb5a2f96a6a52a36fc7c2b856815a782e450099688ce86b21fa94b0076b9ef376 WHIRLPOOL 7671368bec55c7f53ffa78a509946acc998e6f4223da4f3429b82a5a38b5e0277a0f89773ec2335f8e46b5c695620a4119af5ab59734184054c31b11841de44b -DIST numpy-1.8.0.tar.gz 3779617 SHA256 2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253 SHA512 ec3d002ed786335e8748983261c96f88a9f1520fc345ad5b810dc02a5e126e15fe5afb02bed1f4b43d580a1da39583d86b84f57dc456b0702653e34e5357c857 WHIRLPOOL 8796d90795ddec62e6d72be433ea00917a63ef39cf3fe81e094f653e1863b69ecdce812995877f78e4324434141b03e2ceb3f872ed4e023b19c6bd9bcc294ac2 -DIST numpy-1.8.1.tar.gz 3794076 SHA256 3d722fc3ac922a34c50183683e828052cd9bb7e9134a95098441297d7ea1c7a9 SHA512 39ef9e13f8681a2c2ba3d74ab96fd28c5669e653308fd1549f262921814fa7c276ce6d9fb65ef135006584c608bdf3db198d43f66c9286fc7b3c79803dbc1f57 WHIRLPOOL 10615c0c70c153156034447e9c3f2b70b0259173a44af3b5cc641dd31c0af71ef1053a9cc7938deff5edb899ae2666b2b3109491d7394f03d1a81cb19722d398 DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311 -DIST numpy-1.9.0.tar.gz 3962108 SHA256 2745b1d64445da3c29a34450320025c11897ae4af77475f861966e98b2cb1a0f SHA512 dc9fb453367bd429336ed7391c0923d0d3af5f8ab26ef8681bc1a9e934ac28e2c9bc30e11f1026c2ea5710a3c4e27188007ee14b194bfca6a03228fad8f3d2fd WHIRLPOOL 5111f5cbb43bd279587f858196fbe86103abde7e8d6536337af51fe4a8371d39057d9ea75ac73ab501ff5c07c5c6e7e4e62f660ca263181e2fee3e6e61718ba9 -DIST numpy-1.9.1.tar.gz 3978007 SHA256 0075bbe07e30b659ae4415446f45812dc1b96121a493a4a1f8b1ba77b75b1e1c SHA512 8286a55f4bd5f9c16b1252ee64a644fe4a03758d31ef2e16714c2f5c61d96f766fb6ffc98986c58e1db1c2b812a2d10e89eae3442263615e46472418c2d4edd4 WHIRLPOOL 9025fee798b2e0b23af4c5870fd12606de65c91a176e2900ca93ed853767165dfbe7344125aba19a58d031f82880d6347095070ed3585deb8866819c32422751 DIST numpy-1.9.2.tar.gz 3986067 SHA256 325e5f2b0b434ecb6e6882c7e1034cc6cdde3eeeea87dbc482575199a6aeef2a SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9 WHIRLPOOL 59f5dc52cb95c7ce80fec3a7feac6cfda1d149596bf6d95c18bd8314e31a8df494b2b470c4cc3d8c296c9fc11c718d70d5b9b5344337175ca75496504c0fd201 DIST numpy-1.9.3.tar.gz 3984430 SHA256 c3b74d3b9da4ceb11f66abd21e117da8cf584b63a0efbd01a9b7e91b693fbbd6 SHA512 32531cd8d1480a50812454ef8e3b68c0f84b2a4bc5de0df1457070db7f6fd94cdb50e6479a85fa4d1dc569a10d28f6864d5069fcf2a32fa20fa8803476a3df8c WHIRLPOOL a0235594e793625d5e3cef57956f4710587158885f39d7d1267c9845b12fb1d39fb9987ec095720c2d285c7c726383a15471f3629b739b77186470e2c40ba093 -DIST numpy-html-1.8.0.zip 9779825 SHA256 39e853c1aaa711976333782f465f2579ca66e6698393f6ba79f5cc78317b1203 SHA512 33333c48a3f4d27ccddf6696dce4e346f8729d1f398128b3bfebb8a9d53ded7bb62b63a766319f6e49ba7cf8ca4e1ce252996acd263976ad2990bf9650d71043 WHIRLPOOL 7eea0ad3418c55d6104a4a115fcdcd5eeb291b9fc1237724e10dcbbf95bc7a4a23b519c64976ac405fb4c5abbaae87a6c747f9ad695d08b6326b459ba1fb8a15 DIST numpy-html-1.8.1.zip 9703711 SHA256 f7fc3af4dba7b40deabd1828a86ea2e2eb5b9fa17c7ebddd73ee4cb8625105b1 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071 WHIRLPOOL e502b1416bad4b189773ba98035dfbeed0dc251d8f9b76e336450f14e8425caf92d55d2b1c2cc5ef9eb2d33eb2bf7cd55e720c1b265e45539b195fea1d7f046c DIST numpy-html-1.9.1.zip 9839137 SHA256 12a24937f8273fcf79090c99b6c4154a0ecfc378386498cf2afe727ea171407c SHA512 647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4 WHIRLPOOL 68c367fd0416d27b1cf43edf7ca48bc8845c02856bbbacdf63c88fe8bbffd5dd86fb3e5cdea8f669dd78adf7bcc4d184953048783802df323126c1b22baf8e92 -DIST numpy-ref-1.8.0.pdf 5324229 SHA256 49ecb1d768eb48598439cc63058f830ca3522fe1cfeba1a321086e9820ae8911 SHA512 d89314215c4adefa487b3e46b2babeda7739ee193fef821846d4df0089fabf2167b47dd2990b6bd423432f75238547548924622c6f3b9a90a36d578450001eb2 WHIRLPOOL 3bb12c719cbe4734014774f1bfc3f98af544ee2c407adb2e3ee988e2b1035ad0ef711eaa68168656be7b034df2db76c8789daa2940a048b4a6cb3af0bb0eca68 DIST numpy-ref-1.8.1.pdf 5348248 SHA256 973851e66d0d5ab095f444f8aeb966fefe2dd544226395abbb110fc1b60f351d SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5 WHIRLPOOL be13f88bb68944186c564a5c3789daededade240a26e7fb61c980a090249ab3a5b1f40805e97214168fbf0c099fb6b12d981ff313bace572f130023b29e7aaa7 DIST numpy-ref-1.9.1.pdf 5318122 SHA256 3c8e5881a3460e1cc9da95fe2167044e8f832ab8e980c3606d1f353e7ac6dcee SHA512 5171bb22588117a53e0eac355520581f7817a7e7a099ae83bb73f2ac8248a60e139ae9719dc543b44f25ccf8319c9f149fec1bf5aa55d943fad06a8e6da0d9ba WHIRLPOOL 5c99daf3ae2e6bf235aed287682f1b96d5b6afc9d290f544a8baab892b39c9f6dd9f649abe3e103cc90c990d87e4d653d8157d774a8bd35eccc9cc6ac7a870f9 -DIST numpy-user-1.8.0.pdf 408447 SHA256 a8c30360f9e46c63cfdf48fa594971d94d68ce59ece08c13d4acde8b14032cfe SHA512 10293dba45377c6f1024125a49810b01e388eb33a3e8ed75b8ec39c2b93e53878cbe62e6b7adbf1e957dc47ef253e20304afa7d86d798fb5198887cbe618131f WHIRLPOOL 70cc5a5e97a919bb027f92ac87127fb1bc08d06e2a131c4b413837e76d8feab9b65d7dc9e95b6e797d057efb6abf0d2b3e7562ee3cd140b1ff1418bad5475335 DIST numpy-user-1.8.1.pdf 408305 SHA256 be827f2d92ef86c3af7f59c623017e7bc23ee95c64f88e8c9871f3ad1f99b262 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c WHIRLPOOL bf4105093b208b35b1914e842821b8d289b46eb28f1fda110643f5970bbfafe801e9d148c5f535b43eba9a23e09d333e3aecd9a55b33e64827883d253477d19a DIST numpy-user-1.9.1.pdf 418111 SHA256 e1f6baed0b73f3d4b106c88924c083f9a519e860c1beb718830bf1aee1892232 SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45 WHIRLPOOL f93ed20c5da7b379e3afcafab97c7eb60231ed4f73cebf18184e00b9a8a5a531fa32992f7f28f16d2714b3056c61153c29267c8c6b93cb100e06f53bced1bd6a diff --git a/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch b/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch deleted file mode 100644 index 5a68e8e2aa99..000000000000 --- a/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch +++ /dev/null @@ -1,214 +0,0 @@ - numpy/core/tests/test_memmap.py | 34 ++++++++++++++++------------------ - numpy/core/tests/test_multiarray.py | 9 +++------ - numpy/f2py/__init__.py | 22 +++++++++++----------- - numpy/f2py/f2py2e.py | 4 ++-- - numpy/lib/tests/test_io.py | 24 ++++++++++++++++-------- - 5 files changed, 48 insertions(+), 45 deletions(-) - -diff --git a/numpy/core/tests/test_memmap.py b/numpy/core/tests/test_memmap.py -index 6de6319..10e7a08 100644 ---- a/numpy/core/tests/test_memmap.py -+++ b/numpy/core/tests/test_memmap.py -@@ -1,7 +1,7 @@ - from __future__ import division, absolute_import, print_function - - import sys --from tempfile import NamedTemporaryFile, TemporaryFile, mktemp -+from tempfile import NamedTemporaryFile, TemporaryFile - import os - - from numpy import memmap -@@ -33,12 +33,11 @@ class TestMemmap(TestCase): - assert_array_equal(self.data, newfp) - - def test_open_with_filename(self): -- tmpname = mktemp('', 'mmap') -- fp = memmap(tmpname, dtype=self.dtype, mode='w+', -- shape=self.shape) -- fp[:] = self.data[:] -- del fp -- os.unlink(tmpname) -+ with NamedTemporaryFile() as tmp: -+ fp = memmap(tmp.name, dtype=self.dtype, mode='w+', -+ shape=self.shape) -+ fp[:] = self.data[:] -+ del fp - - def test_unnamed_file(self): - with TemporaryFile() as f: -@@ -55,17 +54,16 @@ class TestMemmap(TestCase): - del fp - - def test_filename(self): -- tmpname = mktemp('', 'mmap') -- fp = memmap(tmpname, dtype=self.dtype, mode='w+', -- shape=self.shape) -- abspath = os.path.abspath(tmpname) -- fp[:] = self.data[:] -- self.assertEqual(abspath, fp.filename) -- b = fp[:1] -- self.assertEqual(abspath, b.filename) -- del b -- del fp -- os.unlink(tmpname) -+ with NamedTemporaryFile() as tmp: -+ fp = memmap(tmp.name, dtype=self.dtype, mode='w+', -+ shape=self.shape) -+ abspath = os.path.abspath(tmp.name) -+ fp[:] = self.data[:] -+ self.assertEqual(abspath, fp.filename) -+ b = fp[:1] -+ self.assertEqual(abspath, b.filename) -+ del b -+ del fp - - def test_filename_fileobj(self): - fp = memmap(self.tmpfp, dtype=self.dtype, mode="w+", -diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py -index a0c4bcf..37b9931 100644 ---- a/numpy/core/tests/test_multiarray.py -+++ b/numpy/core/tests/test_multiarray.py -@@ -2051,12 +2051,11 @@ class TestIO(object): - self.x = rand(shape) + rand(shape).astype(np.complex)*1j - self.x[0,:, 1] = [nan, inf, -inf, nan] - self.dtype = self.x.dtype -- self.filename = tempfile.mktemp() -+ self.file = tempfile.NamedTemporaryFile() -+ self.filename = self.file.name - - def tearDown(self): -- if os.path.isfile(self.filename): -- os.unlink(self.filename) -- #tmp_file.close() -+ self.file.close() - - def test_bool_fromstring(self): - v = np.array([True, False, True, False], dtype=np.bool_) -@@ -2084,7 +2083,6 @@ class TestIO(object): - y = np.fromfile(f, dtype=self.dtype) - f.close() - assert_array_equal(y, self.x.flat) -- os.unlink(self.filename) - - def test_roundtrip_filename(self): - self.x.tofile(self.filename) -@@ -2217,7 +2215,6 @@ class TestIO(object): - s = f.read() - f.close() - assert_equal(s, '1.51,2.0,3.51,4.0') -- os.unlink(self.filename) - - def test_tofile_format(self): - x = np.array([1.51, 2, 3.51, 4], dtype=float) -diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py -index ccdbd4e..fcfd185 100644 ---- a/numpy/f2py/__init__.py -+++ b/numpy/f2py/__init__.py -@@ -28,20 +28,20 @@ def compile(source, - from numpy.distutils.exec_command import exec_command - import tempfile - if source_fn is None: -- fname = os.path.join(tempfile.mktemp()+'.f') -+ f = tempfile.NamedTemporaryFile(suffix='.f') - else: -- fname = source_fn -- -- f = open(fname, 'w') -- f.write(source) -- f.close() -- -- args = ' -c -m %s %s %s'%(modulename, fname, extra_args) -- c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' %(sys.executable, args) -- s, o = exec_command(c) -- if source_fn is None: -- try: os.remove(fname) -- except OSError: pass -+ f = open(source_fn, 'w') -+ -+ try: -+ f.write(source) -+ f.flush() -+ -+ args = ' -c -m %s %s %s'%(modulename, f.name, extra_args) -+ c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' % \ -+ (sys.executable, args) -+ s, o = exec_command(c) -+ finally: -+ f.close() - return s - - from numpy.testing import Tester -diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py -old mode 100755 -new mode 100644 -index 011b430..b264ea3 ---- a/numpy/f2py/f2py2e.py -+++ b/numpy/f2py/f2py2e.py -@@ -91,7 +91,7 @@ Options: - --lower is assumed with -h key, and --no-lower without -h key. - - --build-dir <dirname> All f2py generated files are created in <dirname>. -- Default is tempfile.mktemp(). -+ Default is tempfile.mkdtemp(). - - --overwrite-signature Overwrite existing signature file. - -@@ -428,7 +428,7 @@ def run_compile(): - del sys.argv[i] - else: - remove_build_dir = 1 -- build_dir = os.path.join(tempfile.mktemp()) -+ build_dir = tempfile.mkdtemp() - - _reg1 = re.compile(r'[-][-]link[-]') - sysinfo_flags = [_m for _m in sys.argv[1:] if _reg1.match(_m)] -diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py -index fdd78b2..caffada 100644 ---- a/numpy/lib/tests/test_io.py -+++ b/numpy/lib/tests/test_io.py -@@ -4,7 +4,9 @@ import sys - import gzip - import os - import threading --from tempfile import mkstemp, mktemp, NamedTemporaryFile -+import shutil -+import contextlib -+from tempfile import mkstemp, mkdtemp, NamedTemporaryFile - import time - import warnings - import gc -@@ -21,6 +23,12 @@ from numpy.ma.testutils import (TestCase, assert_equal, assert_array_equal, - assert_raises, run_module_suite) - from numpy.testing import assert_warns, assert_, build_err_msg - -+@contextlib.contextmanager -+def tempdir(change_dir=False): -+ tmpdir = mkdtemp() -+ yield tmpdir -+ shutil.rmtree(tmpdir) -+ - - class TextIO(BytesIO): - """Helper IO class. -@@ -145,14 +153,14 @@ class TestSavezLoad(RoundtripTest, TestCase): - @np.testing.dec.slow - def test_big_arrays(self): - L = (1 << 31) + 100000 -- tmp = mktemp(suffix='.npz') - a = np.empty(L, dtype=np.uint8) -- np.savez(tmp, a=a) -- del a -- npfile = np.load(tmp) -- a = npfile['a'] -- npfile.close() -- os.remove(tmp) -+ with tempdir() as tmpdir: -+ tmp = os.path.join(tmpdir, "file.npz") -+ np.savez(tmp, a=a) -+ del a -+ npfile = np.load(tmp) -+ a = npfile['a'] -+ npfile.close() - - def test_multiple_arrays(self): - a = np.array([[1, 2], [3, 4]], float) diff --git a/dev-python/numpy/files/numpy-1.9.0-OO.patch b/dev-python/numpy/files/numpy-1.9.0-OO.patch deleted file mode 100644 index f1ebc23e1577..000000000000 --- a/dev-python/numpy/files/numpy-1.9.0-OO.patch +++ /dev/null @@ -1,91 +0,0 @@ -From dc453917978e98dcdf3bbc106b080c80f0a1301e Mon Sep 17 00:00:00 2001 -From: Charles Harris <charlesr.harris@gmail.com> -Date: Fri, 3 Oct 2014 20:03:31 -0600 -Subject: [PATCH] BUG: Make numpy import when run with Python flag '-OO'. - -This consists of checking for a docstring equal to None and skipping two -tests that require docstrings. - -Closes #5148. ---- - numpy/lib/tests/test_function_base.py | 6 +++++- - numpy/lib/tests/test_utils.py | 3 ++- - numpy/ma/extras.py | 8 +++++--- - 3 files changed, 12 insertions(+), 5 deletions(-) - -diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py -index ee38b35..a3f8056 100644 ---- a/numpy/lib/tests/test_function_base.py -+++ b/numpy/lib/tests/test_function_base.py -@@ -1,12 +1,14 @@ - from __future__ import division, absolute_import, print_function - - import warnings -+import sys - - import numpy as np - from numpy.testing import ( - run_module_suite, TestCase, assert_, assert_equal, assert_array_equal, - assert_almost_equal, assert_array_almost_equal, assert_raises, -- assert_allclose, assert_array_max_ulp, assert_warns, assert_raises_regex -+ assert_allclose, assert_array_max_ulp, assert_warns, -+ assert_raises_regex, dec - ) - from numpy.random import rand - from numpy.lib import * -@@ -2094,6 +2096,8 @@ def test_string_arg(self): - - - class TestAdd_newdoc(TestCase): -+ -+ @dec.skipif(sys.flags.optimize == 2) - def test_add_doc(self): - # test np.add_newdoc - tgt = "Current flat index into the array." -diff --git a/numpy/lib/tests/test_utils.py b/numpy/lib/tests/test_utils.py -index fcb37f9..8fbd1c4 100644 ---- a/numpy/lib/tests/test_utils.py -+++ b/numpy/lib/tests/test_utils.py -@@ -3,7 +3,7 @@ - import sys - from numpy.core import arange - from numpy.testing import ( -- run_module_suite, assert_, assert_equal -+ run_module_suite, assert_, assert_equal, dec - ) - from numpy.lib import deprecate - import numpy.lib.utils as utils -@@ -14,6 +14,7 @@ - from StringIO import StringIO - - -+@dec.skipif(sys.flags.optimize == 2) - def test_lookfor(): - out = StringIO() - utils.lookfor('eigenvalue', module='numpy', output=out, -diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py -index 82a61a6..a993fd0 100644 ---- a/numpy/ma/extras.py -+++ b/numpy/ma/extras.py -@@ -434,8 +434,10 @@ def apply_over_axes(func, a, axes): - raise ValueError("function is not returning " - "an array of the correct shape") - return val --apply_over_axes.__doc__ = np.apply_over_axes.__doc__[ -- :np.apply_over_axes.__doc__.find('Notes')].rstrip() + \ -+ -+if apply_over_axes.__doc__ is not None: -+ apply_over_axes.__doc__ = np.apply_over_axes.__doc__[ -+ :np.apply_over_axes.__doc__.find('Notes')].rstrip() + \ - """ - - Examples -@@ -462,7 +464,7 @@ def apply_over_axes(func, a, axes): - [[[46] - [--] - [124]]] --""" -+ """ - - - def average(a, axis=None, weights=None, returned=False): diff --git a/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch deleted file mode 100644 index 128ea1391dda..000000000000 --- a/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- numpy/distutils/system_info.py 2014-09-07 08:57:47.000000000 +0000 -+++ numpy/distutils/system_info.py 2014-10-19 17:57:12.099448481 +0000 -@@ -296,20 +296,7 @@ - 1 - display warning message - 2 - raise error - """ -- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead -- 'atlas_threads': atlas_threads_info, # ditto -- 'atlas_blas': atlas_blas_info, -- 'atlas_blas_threads': atlas_blas_threads_info, -- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead -- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto -- 'mkl': mkl_info, -- # openblas which may or may not have embedded lapack -- 'openblas': openblas_info, # use blas_opt instead -- # openblas with embedded lapack -- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead -- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead -- 'blas_mkl': blas_mkl_info, # use blas_opt instead -- 'x11': x11_info, -+ cl = {'x11': x11_info, - 'fft_opt': fft_opt_info, - 'fftw': fftw_info, - 'fftw2': fftw2_info, - diff --git a/dev-python/numpy/numpy-1.10.1.ebuild b/dev-python/numpy/numpy-1.10.1.ebuild deleted file mode 100644 index 02d74c2f4e14..000000000000 --- a/dev-python/numpy/numpy-1.10.1.ebuild +++ /dev/null @@ -1,152 +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 python3_{3,4,5} ) - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator - -DOC_PV="1.9.1" -DOC_P="${PN}-${DOC_PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://www.numpy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf - )" -# It appears the docs haven't been upgraded, still @ 1.8.1 -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )" - -# Uses distutils.command.config. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - # make sure _dotblas.so gets built - sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die - cat >> site.cfg <<-EOF - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(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 - - # we don't have f2py-3.3 - sed \ - -e "/f2py_cmd/s:'f2py'.*:'f2py':g" \ - -i numpy/tests/test_scripts.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt - - if use doc; then - dohtml -r "${WORKDIR}"/html/* - dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf - fi - - # absent in 1.9 - #docinto f2py - #dodoc numpy/f2py/docs/*.txt - #doman numpy/f2py/f2py.1 -} diff --git a/dev-python/numpy/numpy-1.8.0-r1.ebuild b/dev-python/numpy/numpy-1.8.0-r1.ebuild deleted file mode 100644 index e01e6de8052c..000000000000 --- a/dev-python/numpy/numpy-1.8.0-r1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator - -DOC_PV="${PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://numpy.scipy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - http://docs.scipy.org/doc/${P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${P}/${PN}-user-${DOC_PV}.pdf - )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( >=dev-python/nose-0.10[${PYTHON_USEDEP}] )" - -# Uses distutils.command.config. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${P}-no-hardcode-blas.patch - "${FILESDIR}"/${P}-f2py-insecure-temporary.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - # make sure _dotblas.so gets built - sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die - cat >> site.cfg <<-EOF - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(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 - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt - - docinto f2py - dodoc numpy/f2py/docs/*.txt - doman numpy/f2py/f2py.1 - - if use doc; then - dohtml -r "${WORKDIR}"/html/* - insinto /usr/share/doc/${PF} - doins "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf - fi -} diff --git a/dev-python/numpy/numpy-1.8.1.ebuild b/dev-python/numpy/numpy-1.8.1.ebuild deleted file mode 100644 index 7769eb5f1a4c..000000000000 --- a/dev-python/numpy/numpy-1.8.1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator - -DOC_PV="${PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://numpy.scipy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - http://docs.scipy.org/doc/${P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${P}/${PN}-user-${DOC_PV}.pdf - )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -# Uses distutils.command.config. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.0-no-hardcode-blas.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - # make sure _dotblas.so gets built - sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die - cat >> site.cfg <<-EOF - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(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 - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt - - if use doc; then - dohtml -r "${WORKDIR}"/html/* - dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf - fi - - docinto f2py - dodoc numpy/f2py/docs/*.txt - doman numpy/f2py/f2py.1 -} diff --git a/dev-python/numpy/numpy-1.9.0-r1.ebuild b/dev-python/numpy/numpy-1.9.0-r1.ebuild deleted file mode 100644 index fa61e78e11e7..000000000000 --- a/dev-python/numpy/numpy-1.9.0-r1.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator - -DOC_PV="1.8.1" -DOC_P="${PN}-${DOC_PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://numpy.scipy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf - )" -# It appears the docs haven't been upgraded, still @ 1.8.1 -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -# Uses distutils.command.config. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-no-hardcode-blas.patch - # https://github.com/numpy/numpy/commit/dc453917978e98dcdf3bbc106b080c80f0a1301e.patch - "${FILESDIR}"/${PN}-1.9.0-OO.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - # make sure _dotblas.so gets built - sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die - cat >> site.cfg <<-EOF - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(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 - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt - - if use doc; then - dohtml -r "${WORKDIR}"/html/* - dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf - fi - - # absent in 1.9 - #docinto f2py - #dodoc numpy/f2py/docs/*.txt - #doman numpy/f2py/f2py.1 -} diff --git a/dev-python/numpy/numpy-1.9.0.ebuild b/dev-python/numpy/numpy-1.9.0.ebuild deleted file mode 100644 index 12415c46b073..000000000000 --- a/dev-python/numpy/numpy-1.9.0.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator - -DOC_PV="1.8.1" -DOC_P="${PN}-${DOC_PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://numpy.scipy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf - )" -# It appears the docs haven't been upgraded, still @ 1.8.1 -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -# Uses distutils.command.config. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-no-hardcode-blas.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - # make sure _dotblas.so gets built - sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die - cat >> site.cfg <<-EOF - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(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 - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt - - if use doc; then - dohtml -r "${WORKDIR}"/html/* - dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf - fi - - # absent in 1.9 - #docinto f2py - #dodoc numpy/f2py/docs/*.txt - #doman numpy/f2py/f2py.1 -} diff --git a/dev-python/numpy/numpy-1.9.1.ebuild b/dev-python/numpy/numpy-1.9.1.ebuild deleted file mode 100644 index 12415c46b073..000000000000 --- a/dev-python/numpy/numpy-1.9.1.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator - -DOC_PV="1.8.1" -DOC_P="${PN}-${DOC_PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://numpy.scipy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf - )" -# It appears the docs haven't been upgraded, still @ 1.8.1 -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -# Uses distutils.command.config. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-no-hardcode-blas.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - # make sure _dotblas.so gets built - sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die - cat >> site.cfg <<-EOF - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(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 - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt - - if use doc; then - dohtml -r "${WORKDIR}"/html/* - dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf - fi - - # absent in 1.9 - #docinto f2py - #dodoc numpy/f2py/docs/*.txt - #doman numpy/f2py/f2py.1 -} diff --git a/dev-python/packaging/packaging-15.3-r2.ebuild b/dev-python/packaging/packaging-15.3-r2.ebuild index ae34a310764b..fd8e855c4769 100644 --- a/dev-python/packaging/packaging-15.3-r2.ebuild +++ b/dev-python/packaging/packaging-15.3-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="Apache-2.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" IUSE="test" RDEPEND="" diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest index 2b56f3753931..17fb747b468d 100644 --- a/dev-python/paramiko/Manifest +++ b/dev-python/paramiko/Manifest @@ -1,3 +1,4 @@ DIST paramiko-1.15.1.tar.gz 1219256 SHA256 6ed97e2281bb48728692cdc621f6b86a65fdc1d46b178ce250cfec10b977a04c SHA512 146076792e42965aaca08e74630c18422ed767a3da64c63fa63da9a464e1dade5a3f77635a5aae569e5a382d9a31eb4ee738399cd93895e355b4a57119c99f1c WHIRLPOOL 4f4bb6276363130d14c80e55d5c6858712a25404735e9671969d79ff1d1b1399918e24b6c80b275bbf76373a95cb407ca34fba5da8bc92bcd1322e4651ad1354 DIST paramiko-1.15.2.tar.gz 1220578 SHA256 4f56a671a3eecbb76e6143e6e4ca007d503a39aa79aa9e14ade667fa53fd6e55 SHA512 c8fe6c5e4c99ac0922c08f3c006b55852f54c3043eb3ddae5b6e5fba0592bf08b10ec399ec6865bbe84c759c8a15a00722247409b666f42e93b18bfd658158cd WHIRLPOOL 477e9e3d93f4faa9471c2a3e87ac96e7fe0ecdbdfb838b348ba2873e4bc408e78a5840f02002db6bbea18de8b9e2c83240db5a3c16543e4949ea62250de7a26a DIST paramiko-1.15.3.tar.gz 1212786 SHA256 7e17ec363c73acb0e77a5fcc6e44a0dd494339a9067e99a997a7d32b4272fef1 SHA512 60e9b55985bf575a2a0f37c63ee183a247652b51b23573ea0ae3a8304418cdb7f91cf661a577cc04d06ea9ef644a24ea0e985a80ee6f7c137e5eee6bd172b332 WHIRLPOOL 329748854b4a97c3f52daa5619a7eee7f33217b524d9baa6f761ee25abc9e578c457599a8385b9813dfb973bcc6ef83c3d10d9527002ac88f4477e384115f860 +DIST paramiko-1.15.4.tar.gz 1326163 SHA256 fc32e2709ab955ea23636587e05e276e7db7275a7ec00e09425372fbb932fa36 SHA512 045c944c1ef5ca1b95a4150cf371a5ef6b620416edc8ae4f923158bd8b2630cd89cdd0cfbc078eb18c46b48eecc26710d696e2f884d8a3e7f7309fe2956b50d4 WHIRLPOOL 5c9a8b9b86f3837e99ad798fa5e1444ff5b97dc8c80718ec3b4e320fef839bd851f255bbd0e2f94600e8bfb57827d87401fe6eaab7e9e999c3709b1b3939db44 diff --git a/dev-python/paramiko/paramiko-1.15.4.ebuild b/dev-python/paramiko/paramiko-1.15.4.ebuild new file mode 100644 index 000000000000..e4706c214ed7 --- /dev/null +++ b/dev-python/paramiko/paramiko-1.15.4.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit distutils-r1 + +DESCRIPTION="SSH2 protocol library" +HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris" +IUSE="doc examples" + +RDEPEND=" + >=dev-python/pycrypto-2.1[${PYTHON_USEDEP}] + !=dev-python/pycrypto-2.4[${PYTHON_USEDEP}] + >=dev-python/ecdsa-0.11[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +# Required for testsuite +DISTUTILS_IN_SOURCE_BUILD=1 + +python_test() { + "${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/. ) + use examples && local EXAMPLES=( demos/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/path-py/path-py-8.1.2.ebuild b/dev-python/path-py/path-py-8.1.2.ebuild index c2fee53152eb..80fc7b5b3602 100644 --- a/dev-python/path-py/path-py-8.1.2.ebuild +++ b/dev-python/path-py/path-py-8.1.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz" SLOT="0" LICENSE="MIT" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="test" DEPEND=" diff --git a/dev-python/pbr/pbr-1.8.1.ebuild b/dev-python/pbr/pbr-1.8.1.ebuild index 83455bd61922..5f2e3b7ed141 100644 --- a/dev-python/pbr/pbr-1.8.1.ebuild +++ b/dev-python/pbr/pbr-1.8.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="test" # git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038 @@ -52,6 +52,9 @@ python_prepare_all() { sed -e s':test_command_hooks:_&:' \ -e s':test_global_setup_hooks:_&:' \ -i pbr/tests/test_hooks.py || die + sed \ + -e "s:test_wsgi_script_install:_&:" \ + -i pbr/tests/test_wsgi.py || die einfo "rogue tests disabled" sed -i '/^hacking/d' test-requirements.txt || die diff --git a/dev-python/pep8/pep8-1.6.2-r1.ebuild b/dev-python/pep8/pep8-1.6.2-r1.ebuild index c9ac898b9889..320ece55c0b8 100644 --- a/dev-python/pep8/pep8-1.6.2-r1.ebuild +++ b/dev-python/pep8/pep8-1.6.2-r1.ebuild @@ -3,7 +3,8 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit distutils-r1 @@ -16,9 +17,9 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] +RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" -RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-restore-flake8-compatibility.patch" ) diff --git a/dev-python/piddle/metadata.xml b/dev-python/piddle/metadata.xml index 974f176f52ac..fa6e0500f8c7 100644 --- a/dev-python/piddle/metadata.xml +++ b/dev-python/piddle/metadata.xml @@ -15,9 +15,9 @@ automatically select an appropriate backend for the user's environment. </longdescription> <longdescription lang="ja"> PIDDLEはクロスプラットフォームとクロスメディアの両方のマナーに沿った二次元画像を -作成するためのPython言語モジュールです。つまり、これはファイル出力(Postscript, PDF, GIFなど)と同じ様にスクリーン・グラフィック(例えばQuickDraw, TK)をサポートし>ます。最大限の効果と品質のため、ネイティブ2D描画を各バックエンドの呼出しのように +作成するためのPython言語モジュールです。つまり、これはファイル出力(Postscript, PDF, GIFなど)と同じ様にスクリーン・グラフィック(例えばQuickDraw, TK)をサポートします。最大限の効果と品質のため、ネイティブ2D描画を各バックエンドの呼出しのように します。これは原始的なサポートされた描画方法を指すメソッドを持ったベース・クラス -(Paddle.Canvas)を明確にする事で働きます。特別のドロー・コンテキストは派生元クラ>スのフォームで提供されます。PIDDLEアプリケーションはユーザー環境に適切なバックエ +(Paddle.Canvas)を明確にする事で働きます。特別のドロー・コンテキストは派生元クラスのフォームで提供されます。PIDDLEアプリケーションはユーザー環境に適切なバックエ ンドを自動的に選択するでしょう。 </longdescription> <upstream> diff --git a/dev-python/pillow/files/pillow-3.0.0-backport-tiff-color-fix.patch b/dev-python/pillow/files/pillow-3.0.0-backport-tiff-color-fix.patch new file mode 100644 index 000000000000..b5b5201c2796 --- /dev/null +++ b/dev-python/pillow/files/pillow-3.0.0-backport-tiff-color-fix.patch @@ -0,0 +1,39 @@ +From e0cb8f945e22d4f714f1c1de3aa04b3db39c5679 Mon Sep 17 00:00:00 2001 +From: wiredfool <eric-github@soroos.net> +Date: Sat, 3 Oct 2015 22:46:01 +0100 +Subject: [PATCH] Flatten sampleformat to initial value, fixes #1466 + +--- + PIL/TiffImagePlugin.py | 9 +++++++-- + Tests/images/copyleft.tiff | Bin 0 -> 7926 bytes + Tests/test_file_tiff.py | 5 +++++ + 3 files changed, 12 insertions(+), 2 deletions(-) + create mode 100644 Tests/images/copyleft.tiff + +diff --git a/PIL/TiffImagePlugin.py b/PIL/TiffImagePlugin.py +index 1f97422..a84d017 100644 +--- a/PIL/TiffImagePlugin.py ++++ b/PIL/TiffImagePlugin.py +@@ -180,8 +180,6 @@ + (MM, 2, (1,), 1, (8, 8, 8, 8), (2,)): ("RGBA", "RGBA"), + (II, 2, (1,), 1, (8, 8, 8, 8), (999,)): ("RGBA", "RGBA"), # Corel Draw 10 + (MM, 2, (1,), 1, (8, 8, 8, 8), (999,)): ("RGBA", "RGBA"), # Corel Draw 10 +- (II, 2, (1, 1, 1, 1), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBA"), # OSX Grab +- (MM, 2, (1, 1, 1, 1), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBA"), # OSX Grab + (II, 3, (1,), 1, (1,), ()): ("P", "P;1"), + (MM, 3, (1,), 1, (1,), ()): ("P", "P;1"), + (II, 3, (1,), 2, (1,), ()): ("P", "P;1R"), +@@ -967,6 +965,13 @@ def _setup(self): + print("- size:", self.size) + + format = self.tag_v2.get(SAMPLEFORMAT, (1,)) ++ if len(format) > 1 and max(format) == min(format) == 1: ++ # SAMPLEFORMAT is properly per band, so an RGB image will ++ # be (1,1,1). But, we don't support per band pixel types, ++ # and anything more than one band is a uint8. So, just ++ # take the first element. Revisit this if adding support ++ # for more exotic images. ++ format = (1,) + + # mode: check photometric interpretation and bits per pixel + key = ( diff --git a/dev-python/pillow/pillow-3.0.0-r1.ebuild b/dev-python/pillow/pillow-3.0.0-r1.ebuild new file mode 100644 index 000000000000..4d53a597f7ef --- /dev/null +++ b/dev-python/pillow/pillow-3.0.0-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) +PYTHON_REQ_USE='tk?' + +inherit distutils-r1 eutils virtualx + +MY_PN=Pillow +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Python Imaging Library (fork)" +HOMEPAGE="https://github.com/python-imaging/Pillow https://pypi.python.org/pypi/Pillow" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib" + +REQUIRED_USE="test? ( jpeg tiff )" + +RDEPEND=" + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( media-libs/openjpeg:2= ) + lcms? ( media-libs/lcms:2= ) + tiff? ( media-libs/tiff:0= ) + truetype? ( media-libs/freetype:2= ) + webp? ( media-libs/libwebp:0= ) + zlib? ( sys-libs/zlib:0= )" +DEPEND="${RDEPEND} + app-arch/unzip + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-better-theme[${PYTHON_USEDEP}] + >=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}] + <dev-python/sphinx_rtd_theme-0.2[${PYTHON_USEDEP}] + ) + test? ( dev-python/nose[${PYTHON_USEDEP}] ) + " +RDEPEND+=" !dev-python/imaging" + +S="${WORKDIR}/${MY_P}" + +# See _render and _clean in Tests/test_imagefont.py +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${P}-tests.patch + "${FILESDIR}"/${P}-backport-tiff-color-fix.patch + ) + +python_prepare_all() { + # Disable all the stuff we don't want. + local f + for f in jpeg lcms tiff tk webp zlib; do + if ! use ${f}; then + sed -i -e "s:feature.${f} =:& None #:" setup.py || die + fi + done + if ! use truetype; then + sed -i -e 's:feature.freetype =:& None #:' setup.py || die + fi + if ! use jpeg2k; then + sed -i -e 's:feature.jpeg2000 =:& None #:' setup.py || die + fi + + sed \ + -e "/required/s:=.*:= set():g" \ + -e "/if feature in/s:'jpeg', 'libz'::g" \ + -i setup.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" + VIRTUALX_COMMAND=nosetests + virtualmake -vx Tests/test_*.py || die "Testing failed with ${EPYTHON}" +} + +python_install() { + python_doheader libImaging/{Imaging.h,ImPlatform.h} + + distutils-r1_python_install +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + use examples && local EXAMPLES=( Scripts/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/pillowfight/Manifest b/dev-python/pillowfight/Manifest new file mode 100644 index 000000000000..5678da7124f3 --- /dev/null +++ b/dev-python/pillowfight/Manifest @@ -0,0 +1 @@ +DIST pillowfight-0.2.tar.gz 2628 SHA256 15bce1925a3d66940ceb9a33c3c55de8d95462ce136c4d46e8673f2919b401d6 SHA512 2eff2fd0bdf5c02513ddb4838675e7b9f392135ff08a784ca2fedf06c5b96a56af75460559066cc6cded65f3d4da087ac679492b7b1dba23fb557e6ac3565e6e WHIRLPOOL 691e985dd6e8da23d117f1a826a99c1cf80fbe01e4e82be10b1cac1277be292ffb4be233e31c7ea4daf98c1c28af1be7d28a5f43e8535c176b15c7cb180f0e10 diff --git a/sci-chemistry/pdb-extract/metadata.xml b/dev-python/pillowfight/metadata.xml index e42d0af60f42..ee7e8b2450a8 100644 --- a/sci-chemistry/pdb-extract/metadata.xml +++ b/dev-python/pillowfight/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>sci-chemistry</herd> + <herd>python</herd> </pkgmetadata> diff --git a/dev-python/pillowfight/pillowfight-0.2.ebuild b/dev-python/pillowfight/pillowfight-0.2.ebuild new file mode 100644 index 000000000000..7ffeb1c10f1b --- /dev/null +++ b/dev-python/pillowfight/pillowfight-0.2.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Eases the transition from PIL to Pillow" +HOMEPAGE="https://pypi.python.org/pypi/pillowfight/ https://github.com/beanbaginc/pillowfight" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] +" diff --git a/dev-python/pip/pip-7.1.2.ebuild b/dev-python/pip/pip-7.1.2.ebuild index fcc23707a9b6..9eac501716dc 100644 --- a/dev-python/pip/pip-7.1.2.ebuild +++ b/dev-python/pip/pip-7.1.2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github. SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" # Check pip/_vendor/vendor.txt for this diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest index 938952673fb7..78477263ebae 100644 --- a/dev-python/pkginfo/Manifest +++ b/dev-python/pkginfo/Manifest @@ -1,2 +1 @@ -DIST pkginfo-1.0.tar.gz 24802 SHA256 27b171632c6894ae5d0d5677678dfc4e9b86f3b422eb3db1cc62960b1c9886f0 SHA512 1b0f9ed60b53202deb729fa9261059b7fe1b3e4561f27ad51152e5077c45dd4f47fcb81da45cd2e509b046e9bb05652533ae90de31f93831743a9d35c938b14d WHIRLPOOL 312e3bac0a8e4740a40484f9e77a137479e339b6c472409e890d3ba13059a6637c8c2bb0d8bd4496364d98ff3ac1fe7272d4750560c4cdc1d9735187ede0cd5c DIST pkginfo-1.2.1.tar.gz 31072 SHA256 ad3f6dfe8a831f96a7b56a588ca874137ca102cc6b79fc9b0a1c3b7ab7320f3c SHA512 8a530a164befdcbc6f1f550e106880e14e9d2c762a5e1055f926ccf0228d9e2312f11598454ef015e97dccb78ac7aeb7309f34279590cd318c19c2bd9a29ed2a WHIRLPOOL 1ab43db82665e0abed88bf59115df726475ba7c611b077803721cd6bfcfcc81120c7a996e8945e74ad18c1ec7f6c9e5a1396df37d4f2c0eca24924f4c22e9ee3 diff --git a/dev-python/pkginfo/pkginfo-1.0.ebuild b/dev-python/pkginfo/pkginfo-1.0.ebuild deleted file mode 100644 index 511e86c64b5a..000000000000 --- a/dev-python/pkginfo/pkginfo-1.0.ebuild +++ /dev/null @@ -1,48 +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 pypy ) - -inherit distutils-r1 - -DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file" -HOMEPAGE="https://pypi.python.org/pypi/pkginfo" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -KEYWORDS="amd64 x86" -IUSE="doc examples" - -LICENSE="MIT" -SLOT="0" -DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -python_prepare_all() { - sed -e 's:SPHINXBUILD = sphinx-build:SPHINXBUILD = /usr/bin/sphinx-build:' \ - -i docs/Makefile || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - pushd pkginfo/tests/ > /dev/null - for test in test_*.py; do - ${PYTHON} ${test} || die "${test} failed with Python ${PYTHON_ABI}" - if [[ $? ]]; then - einfo "Test ${test} successful" - else - die "Test ${test} failed under ${EPYTHON}" - fi - done -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/.build/html/. ) - use examples && local EXAMPLES=( docs/examples/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/pkginfo/pkginfo-1.2.1.ebuild b/dev-python/pkginfo/pkginfo-1.2.1.ebuild index af885c4c8fb3..de1efe153ece 100644 --- a/dev-python/pkginfo/pkginfo-1.2.1.ebuild +++ b/dev-python/pkginfo/pkginfo-1.2.1.ebuild @@ -11,7 +11,7 @@ inherit distutils-r1 DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file" HOMEPAGE="https://pypi.python.org/pypi/pkginfo" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 arm ppc ppc64 x86" IUSE="doc examples" LICENSE="MIT" diff --git a/dev-python/ply/metadata.xml b/dev-python/ply/metadata.xml index 0decdfd8aca4..b05d6efbd121 100644 --- a/dev-python/ply/metadata.xml +++ b/dev-python/ply/metadata.xml @@ -13,7 +13,7 @@ more so than other Python parsing tools. </longdescription> <longdescription lang="ja"> PLYはLexとYaccの有名なコンパイラ・コンストラクション・ツールのPython言語実装です -。この実装は以前の試みから幾つものアイディアを借りています。そのほとんどがJohn AycockのSPARKツールキットからです。しかしながら、実装の全体像はC言語によるLexとYaccにより近いモデルです。PLYの他の重要点は幅広い入力バリデーションとエラー報告を>提供する点です。 -- その二点は他のPython言語パーサーより優れています。 +。この実装は以前の試みから幾つものアイディアを借りています。そのほとんどがJohn AycockのSPARKツールキットからです。しかしながら、実装の全体像はC言語によるLexとYaccにより近いモデルです。PLYの他の重要点は幅広い入力バリデーションとエラー報告を提供する点です。 -- その二点は他のPython言語パーサーより優れています。 </longdescription> <upstream> <remote-id type="pypi">ply</remote-id> diff --git a/dev-python/plyr/metadata.xml b/dev-python/plyr/metadata.xml index 27cb2ccc4b7b..0605aa6c4353 100644 --- a/dev-python/plyr/metadata.xml +++ b/dev-python/plyr/metadata.xml @@ -8,7 +8,7 @@ </maintainer> <maintainer> <email>wtold.pilat@gmail.com</email> - <name>Witold Pilat</name> + <name>Witold Piłat</name> <description>Proxy maintainer</description> </maintainer> <upstream> diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild index c1c0cade68a2..fbdc74d35688 100644 --- a/dev-python/progress/progress-1.2.ebuild +++ b/dev-python/progress/progress-1.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="ISC" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="" diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest index 52e4392916dd..ca7b6a442455 100644 --- a/dev-python/prompt_toolkit/Manifest +++ b/dev-python/prompt_toolkit/Manifest @@ -5,3 +5,4 @@ DIST prompt_toolkit-0.48.tar.gz 131543 SHA256 054a8f710d585ff994cf92f648bcb78abb DIST prompt_toolkit-0.50.tar.gz 149902 SHA256 6acd7c7d158b1dfb5907659abfae0cee2e5354fabc943aed411843d7fb2bd4aa SHA512 afe708baf8a06823e417c3b9444123e315b32526d49e918f9fde20eaa042989134f511f8dfd8e7ed99c0514d714585b3f82fa72cdf39c70ee85a7e1a27305b23 WHIRLPOOL bcdeafbc4a202588f117b3c245399be6d9bfa75277a7e042ba4c0ad2aa7d11ba2fc0fe80edf64fe4762738596b5937df6d192eedc3f9927bb5aac60c55479be5 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 diff --git a/dev-python/prompt_toolkit/prompt_toolkit-0.54.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-0.54.ebuild new file mode 100644 index 000000000000..d3cd17779255 --- /dev/null +++ b/dev-python/prompt_toolkit/prompt_toolkit-0.54.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=(python2_7 python3_{3,4} ) + +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}] +" + +# not contained in tarball +RESTRICT="test" + +python_test() { + "${PYTHON}" "${S}"/tests/run_tests.py || die +} diff --git a/dev-python/ptpython/Manifest b/dev-python/ptpython/Manifest index 9bcdda160ae3..f59b7fd969cc 100644 --- a/dev-python/ptpython/Manifest +++ b/dev-python/ptpython/Manifest @@ -2,3 +2,4 @@ DIST ptpython-0.20.tar.gz 29618 SHA256 a6ebe6f6e496693c69f460e46296492832b47997a DIST ptpython-0.21.tar.gz 27410 SHA256 37aad517cf9d55e567697fe001bc2d07e7013753218537f78425c2bac1181a0b SHA512 d85c7167932cfc033324bf62e96b27ee9296eab92fc1f3ce9e4afac5af6f4e5bfaee1950fcdc76121acd7176efe79c61d6cb2b06a59e7a9a5c5c34a1b41a64d1 WHIRLPOOL 5290c0389893c13c8f4a69a4726faea984be62748ce0beff400e7b7eb8ef5fe1a352f0e37a2afc991d869d69c9afeaaee3c76a00c1157037bd35227d1837285f DIST ptpython-0.22.tar.gz 40261 SHA256 b5f23bbf59e134f222c3eef0c60163fe0c212628d23f3756b7923ebb57603536 SHA512 76fbd2ce2db41f4918a2583cd1a5b2518b747fd09483e541a80df617f003cd9fc3d1c9d9699f50479b00f43ba651af49fb5cf44ddc0ba863d92949de0f182594 WHIRLPOOL 770f6544c10bad1632e7b58ec9af97baf611a1b15f40df1ab76a4a81ec080730716cf129f86c54767b0da3b4dfc1fb510f3479fd9953f3831bf77e8b78de7748 DIST ptpython-0.24.tar.gz 41967 SHA256 6dfb728183e92447de5b4de4ac1f6caa07c2ae29e10402166c9ec9921e3bf661 SHA512 38d0f34e8b9747bbab2d24d50fa06093b0b0e0431357ad00204af5f4d0707930b36d7ee22cb72accb34557832510cc9996fd525e64cb5959819a2ccc8fabbdeb WHIRLPOOL fee4beed23ab8e362281e1a88674abb22e31aeb341b5144c5bc10dbfaccd1b186f69dc42b6153d9d5c88dda9b937e6594f9e74c6a2e8a90f1bd587b69e53b37f +DIST ptpython-0.25.tar.gz 42214 SHA256 6df30f3cde8db140daaf0243b54030e9d9acece8c2c424215edd90d437c257ae SHA512 200ad3bfc709b7c2f6ee3d00d4e42f7484b9f13f84b9ce94ea49e52d866acaf5e44bdd057732df296c907ce2686e08a1be85385a1ffd05a4f35d50a9248498f2 WHIRLPOOL c1dc0cbb4e5fa3ea11714e4b1016d076573c15734c49bb013e2bff4b23802a79e7cebb84c81a4762cd68dc4fbb0a5e98f8eea7e8a4a955b3744dcc027226f210 diff --git a/dev-python/ptpython/ptpython-0.25.ebuild b/dev-python/ptpython/ptpython-0.25.ebuild new file mode 100644 index 000000000000..b1e975317b99 --- /dev/null +++ b/dev-python/ptpython/ptpython-0.25.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) + +inherit distutils-r1 eutils + +DESCRIPTION="Python REPL build on top of prompt_toolkit" +HOMEPAGE="https://pypi.python.org/pypi/ptpython/ https://github.com/jonathanslenders/ptpython" +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/prompt_toolkit-0.54[${PYTHON_USEDEP}] + >=dev-python/jedi-0.9.0[${PYTHON_USEDEP}] + dev-python/docopt[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] +" + +RESTRICT=test + +python_test() { + "${PYTHON}" tests/run_tests.py || die +} diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest index 8d8e59c8aacf..b71db4c751b9 100644 --- a/dev-python/py/Manifest +++ b/dev-python/py/Manifest @@ -1,6 +1 @@ -DIST py-1.4.25.tar.gz 190298 SHA256 da6ea727748e00f79fef987adb6970e8b081f829de8ea39f5405718fa9e50c85 SHA512 7e24a9d57298cf98fc246fbda7db81f6cd9d16b78425266c24d00ab1db77146ffab38820630b2dddb49bca7d864c2366d45fdb3e81bb284e509a309d4c1b5b98 WHIRLPOOL 2eab3004febb8e0e0bb42c0fd6d6dd33e46c7a1fe9cdbe2864e55fc075393cf043c0697a508696d0f5bdee8322cef30f03765f676349d02353f3448a339a9432 -DIST py-1.4.26.tar.gz 190617 SHA256 28dd0b90d29b386afb552efc4e355c889f4639ce93658a7872a2150ece28bb89 SHA512 5772893d754e4f3fee5de9fdb0eca2c654ac5288eba5c89dac88fd4d9acb2c0795bae61e0c43b37a14471536a1649c9138ac1c4374cd5697307e74062e9813f3 WHIRLPOOL 9f845477bec75c083c7148d8008df9992a5309a89ee0ec68a9de5d99c236dd7f1e8cedf39a220c53a6b46570d1cba715623ac5eb6563874f7901694bdd0fb594 -DIST py-1.4.27.tar.gz 191447 SHA256 55c648870ba47375c52001d05a1adeedaa930937749ad66eb3327e8dea28ac79 SHA512 29d4c003f9382d5ae19ced0d1d759841b08ed8eb0e9d07e6105e974f4181c3cbb6b59908434eaf4f1164deac438258ccb25b89c0fec0f5a11e1d6487127af4a1 WHIRLPOOL bd3067bf8bbae2ab8ff51720132864701dbb347ecfca023c7dc0f85f6a94d73f77538e17bc8113cbf4946340be8e3f3faad04f92c2d8cee10a7ac3a497d48636 -DIST py-1.4.28.tar.gz 191592 SHA256 664dbb9fd86c26d26e90aa93d15b8a19c859128bb66b3905bef954eba737eeb5 SHA512 0f65ec7114d5d634cf8b0be0c91dee9c7ce7b4795143d1394f1e625586d852c3c0941b7e9490a1eb6a1d3ad5db7c64ab72b6532793f22fdda705a347d4945814 WHIRLPOOL 077f14d7e8a3e1ed1dbc3dd1a51ce55d0263f74b726ec66847c069ff91e81b9aab5581e031a5acbfdbbaaff22ced89efa7a362c2220db1964622342e6a02cd9f -DIST py-1.4.29.tar.gz 192088 SHA256 279e117233f205de1e46ec36eb7ffa5999f1bc53ae6bcf06889477ff28e45d83 SHA512 c172b598c3b7c8d7e0cc9b3123e80443355a0422e5e19b052f02d4261610fd832431cb50df35a3ee4913a29f87e53da2b12c17234189a3faabfab0c9899c1469 WHIRLPOOL 5924f8d0a9ef6428edc5fecc7d59de277b3cf30f93ff437a9067b7d16150a9b5ac9b4389343ed53f4a504ab083a220d2c0eee0936ea3e5ae5909d4944c89e545 DIST py-1.4.30.tar.gz 191796 SHA256 b703e57685ed7c280b1a51c496a4984d83d89def2a930b5e9e5da5a6ca151514 SHA512 dd9d92f8eaf8e5fc61bfb7feb4b07df5ae1745ebf88bcbe9d62589caa9e1f7d8beae5b2d20b407520919e47391cd50cf2d5323556fa5bd90a37e120b1d394d7a WHIRLPOOL 890cd2dbb957c291e80c73a69fad89846e761f745500ab2a99bfb4f725a7e567104fa4a2a957b8c674ebc9498fdbb25373ff0d15ab8da7f8c45138844235c79f diff --git a/dev-python/py/py-1.4.25.ebuild b/dev-python/py/py-1.4.25.ebuild deleted file mode 100644 index bdd33014aea7..000000000000 --- a/dev-python/py/py-1.4.25.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) -inherit distutils-r1 - -DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities" -HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -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" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )" -RDEPEND="" - -python_prepare_all() { - sed -e 's:intersphinx_mapping:_&:' -i doc/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - py.test || die "testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/py/py-1.4.26.ebuild b/dev-python/py/py-1.4.26.ebuild deleted file mode 100644 index bcc515eb9c60..000000000000 --- a/dev-python/py/py-1.4.26.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) -inherit distutils-r1 - -DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities" -HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -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" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" -RDEPEND="" - -python_prepare_all() { - sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - py.test || die "testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/py/py-1.4.27.ebuild b/dev-python/py/py-1.4.27.ebuild deleted file mode 100644 index 4d184df25266..000000000000 --- a/dev-python/py/py-1.4.27.ebuild +++ /dev/null @@ -1,44 +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 python3_{3,4} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities" -HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -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="" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -python_prepare_all() { - sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - # 1 failure, test_comments, under both pypy only. - # Also appears the home repo has no issue tracker. - py.test || die "testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/py/py-1.4.28.ebuild b/dev-python/py/py-1.4.28.ebuild deleted file mode 100644 index 4d184df25266..000000000000 --- a/dev-python/py/py-1.4.28.ebuild +++ /dev/null @@ -1,44 +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 python3_{3,4} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities" -HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -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="" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -python_prepare_all() { - sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - # 1 failure, test_comments, under both pypy only. - # Also appears the home repo has no issue tracker. - py.test || die "testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/py/py-1.4.29.ebuild b/dev-python/py/py-1.4.29.ebuild deleted file mode 100644 index 4d184df25266..000000000000 --- a/dev-python/py/py-1.4.29.ebuild +++ /dev/null @@ -1,44 +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 python3_{3,4} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities" -HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -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="" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -python_prepare_all() { - sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - # 1 failure, test_comments, under both pypy only. - # Also appears the home repo has no issue tracker. - py.test || die "testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild index 1ea51d06536b..2c701149cce4 100644 --- a/dev-python/py/py-1.4.30.ebuild +++ b/dev-python/py/py-1.4.30.ebuild @@ -36,7 +36,7 @@ python_test() { # 1 failure, test_comments, under both pypy only. # Also appears the home repo has no issue tracker. [[ "${EPYTHON}" == pypy ]] && return - py.test || die "testing failed with ${EPYTHON}" + py.test -v -v || die "testing failed with ${EPYTHON}" } python_install_all() { diff --git a/dev-python/pyclimate/metadata.xml b/dev-python/pyclimate/metadata.xml index 056e23c1e4fc..4f43dbf23fe8 100644 --- a/dev-python/pyclimate/metadata.xml +++ b/dev-python/pyclimate/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>sci</herd> <herd>python</herd> -<longdescription> + <longdescription> A package designed to accomplish some usual tasks during the analysis of climate variability using Python. It provides functions to perform some simple IO operations, operations with COARDS-compliant netCDF files, EOF @@ -11,10 +11,10 @@ filters, kernel based probability density function estimation and access to DCDFLIB.C library. </longdescription> -<longdescription lang="ja"> + <longdescription lang="ja"> このパッケージはPython言語を使った気候の変化を分析する必要なタスクを終えるために デザインされました。幾つかの単純なI/O操作、COARDS-compliant netCDFファイルの操作 -、EOF解析、カップル・データのSVDとCCA解析、幾つかのリニア・デジタル・フィルター>、カーネル・ベースのプロバビリティ・デンシティ・ファンクション・エスティメーショ +、EOF解析、カップル・データのSVDとCCA解析、幾つかのリニア・デジタル・フィルター、カーネル・ベースのプロバビリティ・デンシティ・ファンクション・エスティメーショ ンとDCDFLIB.Cライブラリへのアクセス等の機能を提供します。 </longdescription> </pkgmetadata> diff --git a/dev-python/pyclimate/pyclimate-1.2.2-r1.ebuild b/dev-python/pyclimate/pyclimate-1.2.2-r1.ebuild index d2efe9cfda9b..0f9dfa211dca 100644 --- a/dev-python/pyclimate/pyclimate-1.2.2-r1.ebuild +++ b/dev-python/pyclimate/pyclimate-1.2.2-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://fisica.ehu.es/jsaenz/pyclimate_files/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="examples" DEPEND="" diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild index 6facd378531b..ca145a85e4a2 100644 --- a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild +++ b/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) inherit distutils-r1 @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" IUSE="doc +gmp test" -RDEPEND="gmp? ( dev-libs/gmp )" +RDEPEND="gmp? ( dev-libs/gmp:0= )" DEPEND="${RDEPEND} doc? ( dev-python/docutils[${PYTHON_USEDEP}] @@ -27,7 +27,7 @@ DEPEND="${RDEPEND} REQUIRED_USE="test? ( gmp )" python_prepare_all() { - epatch "${FILESDIR}"/${P}-cross-compile.patch + local PATCHES=( "${FILESDIR}"/${P}-cross-compile.patch ) # Fix Crypto.PublicKey.RSA._RSAobj.exportKey(format="OpenSSH") with Python 3 # https://github.com/dlitz/pycrypto/commit/ab25c6fe95ee92fac3187dcd90e0560ccacb084a sed \ @@ -48,7 +48,7 @@ python_configure_all() { python_compile_all() { if use doc; then - rst2html.py Doc/pycrypt.rst > Doc/index.html + rst2html.py Doc/pycrypt.rst > Doc/index.html || die epydoc --config=Doc/epydoc-config --exclude-introspect="^Crypto\.(Random\.OSRNG\.nt|Util\.winrandom)$" || die fi } diff --git a/dev-python/pycrypto/pycrypto-2.6.1.ebuild b/dev-python/pycrypto/pycrypto-2.6.1.ebuild index 9e69e40f764e..5e7504e20ac7 100644 --- a/dev-python/pycrypto/pycrypto-2.6.1.ebuild +++ b/dev-python/pycrypto/pycrypto-2.6.1.ebuild @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" IUSE="doc +gmp" -RDEPEND="gmp? ( dev-libs/gmp )" +RDEPEND="gmp? ( dev-libs/gmp:0= )" DEPEND="${RDEPEND} doc? ( dev-python/docutils >=dev-python/epydoc-3 )" diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest index 28e772b26e45..a83c1e0f0849 100644 --- a/dev-python/pycurl/Manifest +++ b/dev-python/pycurl/Manifest @@ -1,2 +1,3 @@ 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.2.tar.gz 153347 SHA256 98cc821555d152977fac99b6e5cb0f759275aabdf14e4928890c6fcc944ab736 SHA512 4f7b8fe59ce9a5597def6356c6af3b23c2fed52e2de022c048d70cd6d3f6e384b0cce8007c656703416284c20d159a0fcb953817e2780ef324ce521349e7041a WHIRLPOOL a42851c36c807349df6c9e33f6e6f0ef8924878d58e9209bfc8d0bdea16c41f81445ac4bc2c75efaea0c77af297149850120ac4d5413fc2622703ef4c3c351c1 diff --git a/dev-python/pycurl/metadata.xml b/dev-python/pycurl/metadata.xml index ec31c8c83ad9..b24fff651e68 100644 --- a/dev-python/pycurl/metadata.xml +++ b/dev-python/pycurl/metadata.xml @@ -9,7 +9,7 @@ Python module. All the functionality provided by libcurl can used through the pycurl interface. </longdescription> <longdescription lang="ja"> -PycURLはLibcurlへのパイソン・インターフェイスです。PycURLはPython言語モジュール>の様に、Python言語プログラムからURLで指定されたオブジェクトをダウンロードするに>も使えます。Libcurlで利用できる機能全てはPycURLインターフェイスを通して利用でき>ます。 +PycURLはLibcurlへのパイソン・インターフェイスです。PycURLはPython言語モジュールの様に、Python言語プログラムからURLで指定されたオブジェクトをダウンロードするにも使えます。Libcurlで利用できる機能全てはPycURLインターフェイスを通して利用できます。 </longdescription> <upstream> <remote-id type="github">pycurl/pycurl</remote-id> diff --git a/dev-python/pycurl/pycurl-7.19.5.2.ebuild b/dev-python/pycurl/pycurl-7.19.5.2.ebuild new file mode 100644 index 000000000000..9bc9ff802485 --- /dev/null +++ b/dev-python/pycurl/pycurl-7.19.5.2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2015 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="http://pycurl.sourceforge.net/download/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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/nose[${PYTHON_USEDEP}] + >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}] + )" +# Needed for individual runs of testsuite by python impls. +DISTUTILS_IN_SOURCE_BUILD=1 + +# https://github.com/pycurl/pycurl/issues/299 +RESTRICT=test + +python_prepare_all() { + sed -e "/setup_args\['data_files'\] = /d" -i setup.py || 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/pydb/pydb-1.26-r2.ebuild b/dev-python/pydb/pydb-1.26-r2.ebuild new file mode 100644 index 000000000000..0c3bd07d29a2 --- /dev/null +++ b/dev-python/pydb/pydb-1.26-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit elisp-common python-single-r1 + +DESCRIPTION="Extended python debugger" +HOMEPAGE="http://bashdb.sourceforge.net/pydb/" +SRC_URI="mirror://sourceforge/bashdb/${P}.tar.bz2" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="emacs" + +DEPEND=" + emacs? ( virtual/emacs )" +RDEPEND="${DEPEND}" + +src_prepare() { + # Fix pydb symlinks. + sed -e '/$(LN_S) "$(DESTDIR)$(pkgpythondir)\/$(python_debugger_script)" "$(DESTDIR)$(bindir)\/$(bin_SCRIPTS)"/s/$(DESTDIR)$(pkgpythondir)/$(pkgpythondir)/' -i Makefile.in +} + +src_configure() { + econf --with-lispdir="${SITELISP}/${PN}" \ + EMACS="$(usex emacs "${EMACS}" no)" \ + --with-python="${PYTHON}" +# --with-site-packages=$(python_get_sitedir) \ +} diff --git a/dev-python/pydiff/pydiff-0.2.ebuild b/dev-python/pydiff/pydiff-0.2.ebuild index 74586d73b75e..4927a858a21b 100644 --- a/dev-python/pydiff/pydiff-0.2.ebuild +++ b/dev-python/pydiff/pydiff-0.2.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit distutils-r1 diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild b/dev-python/pyfltk/pyfltk-1.3.3.ebuild index 3638bc79e294..270c81173d00 100644 --- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild +++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild @@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> ${MY_PN}.tar.gz" LICENSE="LGPL-2" SLOT="1" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ppc ppc64 ~x86" IUSE="doc" DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]" diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest index 53ea331bf5c3..35a8030e589c 100644 --- a/dev-python/pygments/Manifest +++ b/dev-python/pygments/Manifest @@ -1,5 +1 @@ -DIST Pygments-1.6.tar.gz 1423161 SHA256 799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0 SHA512 552d0c2a1296773a5482122bd5cbec0ce91a497cd86ee105e1c5ddf2bfa9c206fcc7de504c6da480344c6e1bee30d7b26012fd061dcb2091d8b2b21bcd163bf0 WHIRLPOOL babf6e638529a902fab37c17fb1215aca3c04c3e2a00d00bdff7e8049ca6a46c238282c088e79816f7c6879fc9b13e3de9824ae93d3f184f4d9aae58af0c9c8d -DIST Pygments-2.0.1.tar.gz 2739480 SHA256 5e039e1d40d232981ed58914b6d1ac2e453a7e83ddea22ef9f3eeadd01de45cb SHA512 7c11c7dc09f6a5d964a512eb4c31f34fc0422b29e3124bd4ed0f4ab594c750d39f990e86f65287f499ea1051a27c1087e445332f6b23ad021d6e2d41c6092f3e WHIRLPOOL 7f5d31f86183b230f54d1f08b5e4cb942d38f28d8868ed94b4d129601aa845864cd0f45d5edb2102f655c2800b2e54335d6f4f61975b2f3a8ceeb0b7e5e13217 DIST Pygments-2.0.2.tar.gz 3462280 SHA256 7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51 SHA512 b58e2cc535ba3f1fda7cb147e12af128bc2755de56cf465f8f1d642730eaef50c06551cc4cc44f25f726b00f3f1c9c2078977233b11c0b6a7e1add6a4069c27e WHIRLPOOL 4c98134f27dd29c89e4d6157284bdeecaa81c53d823e089292be21a6c418ba4ccfd458ced50326d5a356a7b6cb761a1990440096f5f3d820f776bb19fc0da09d -DIST pygments-1.6_p20140324.tar.gz 1641814 SHA256 f762d1104ab38a4e870824113e3be3fedc918900622f1e73b9c34386ee7be14a SHA512 de84977f346b41a60a849e681581b36787712d39010e0e23624cc2d9741cb5afbbb0a4e860b5120e3cb77eb5fc68ddf11d0f6c1d15e0bb4d7c56d800017b19bf WHIRLPOOL 7531e7a2483f3c043967d32848694324007c5a1a7e206472a17f5515eb6960dc1bec774851d75bc4ccc4615594db0c5218713da22da6c2d1cbfdf995827746be -DIST pygments-2.0.1.tar.gz 1641814 SHA256 f762d1104ab38a4e870824113e3be3fedc918900622f1e73b9c34386ee7be14a SHA512 de84977f346b41a60a849e681581b36787712d39010e0e23624cc2d9741cb5afbbb0a4e860b5120e3cb77eb5fc68ddf11d0f6c1d15e0bb4d7c56d800017b19bf WHIRLPOOL 7531e7a2483f3c043967d32848694324007c5a1a7e206472a17f5515eb6960dc1bec774851d75bc4ccc4615594db0c5218713da22da6c2d1cbfdf995827746be diff --git a/dev-python/pygments/files/2.0.2-shell-injection-backport.patch b/dev-python/pygments/files/2.0.2-shell-injection-backport.patch new file mode 100644 index 000000000000..0a23adce330d --- /dev/null +++ b/dev-python/pygments/files/2.0.2-shell-injection-backport.patch @@ -0,0 +1,29 @@ +# HG changeset patch +# User Javantea <jvoss@altsci.com> +# Date 1443460403 25200 +# Node ID 6b4baae517b6aaff7142e66f1dbadf7b9b871f61 +# Parent 655dbebddc23943b8047b3c139c51c22ef18fd91 +Fix Shell Injection in FontManager._get_nix_font_path + +diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py +--- a/pygments/formatters/img.py ++++ b/pygments/formatters/img.py +@@ -10,6 +10,7 @@ + """ + + import sys ++import shlex + + from pygments.formatter import Formatter + from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \ +@@ -79,8 +80,8 @@ + from commands import getstatusoutput + except ImportError: + from subprocess import getstatusoutput +- exit, out = getstatusoutput('fc-list "%s:style=%s" file' % +- (name, style)) ++ exit, out = getstatusoutput('fc-list %s file' % ++ shlex.quote("%s:style=%s" % (name, style))) + if not exit: + lines = out.splitlines() + if lines: diff --git a/dev-python/pygments/files/2.0.2-shell-injection-backport2.patch b/dev-python/pygments/files/2.0.2-shell-injection-backport2.patch new file mode 100644 index 000000000000..78bf4478ecd7 --- /dev/null +++ b/dev-python/pygments/files/2.0.2-shell-injection-backport2.patch @@ -0,0 +1,56 @@ +# HG changeset patch +# User Tim Hatch <tim@timhatch.com> +# Date 1445007300 25200 +# Node ID 0036ab1c99e256298094505e5e92fdacdfc5b0a8 +# Parent c0c0d4049a7c325cd69b764c6ceb7747d319212d +Avoid the shell entirely when finding fonts. + +Manually tested on OS X. + +diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py +--- a/pygments/formatters/img.py ++++ b/pygments/formatters/img.py +@@ -10,12 +10,13 @@ + """ + + import sys +-import shlex + + from pygments.formatter import Formatter + from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \ + get_choice_opt, xrange + ++import subprocess ++ + # Import this carefully + try: + from PIL import Image, ImageDraw, ImageFont +@@ -76,14 +77,11 @@ + self._create_nix() + + def _get_nix_font_path(self, name, style): +- try: +- from commands import getstatusoutput +- except ImportError: +- from subprocess import getstatusoutput +- exit, out = getstatusoutput('fc-list %s file' % +- shlex.quote("%s:style=%s" % (name, style))) +- if not exit: +- lines = out.splitlines() ++ proc = subprocess.Popen(['fc-list', "%s:style=%s" % (name, style), 'file'], ++ stdout=subprocess.PIPE, stderr=None) ++ stdout, _ = proc.communicate() ++ if proc.returncode == 0: ++ lines = stdout.splitlines() + if lines: + path = lines[0].strip().strip(':') + return path +@@ -198,7 +196,7 @@ + bold and italic fonts will be generated. This really should be a + monospace font to look sane. + +- Default: "Bitstream Vera Sans Mono" ++ Default: "Bitstream Vera Sans Mono" on Windows, Courier New on *nix + + `font_size` + The font size in points to be used. diff --git a/dev-python/pygments/metadata.xml b/dev-python/pygments/metadata.xml index 10b24d26e8c2..f91efd2fd030 100644 --- a/dev-python/pygments/metadata.xml +++ b/dev-python/pygments/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/pygments/pygments-1.6.ebuild b/dev-python/pygments/pygments-1.6.ebuild deleted file mode 100644 index ae7b8a272a1c..000000000000 --- a/dev-python/pygments/pygments-1.6.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3} pypy ) - -inherit distutils-r1 - -MY_PN="Pygments" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Pygments is a syntax highlighting package written in Python" -HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( - dev-python/nose[${PYTHON_USEDEP}] - virtual/ttf-fonts - dev-texlive/texlive-latexrecommended - )" - -S="${WORKDIR}/${MY_P}" - -python_test() { - cp -r -l tests "${BUILD_DIR}"/ || die - - if [[ ${EPYTHON} == python3.* ]]; then - # Notes: - # -W is not supported by python3.1 - # -n causes Python to write into hardlinked files - 2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die - fi - - nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/build/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild b/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild deleted file mode 100644 index d781b67e6676..000000000000 --- a/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) - -inherit distutils-r1 bash-completion-r1 vcs-snapshot - -MY_PN="Pygments" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Pygments is a syntax highlighting package written in Python" -HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments" -#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -SRC_URI="https://bitbucket.org/birkenfeld/pygments-main/get/b839f47dbb3a10830db7dc3114f0ad4f470bcfa5.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - dev-python/nose[${PYTHON_USEDEP}] - virtual/ttf-fonts - dev-texlive/texlive-latexrecommended - )" - -#S="${WORKDIR}/${MY_P}" - -python_compile() { - distutils-r1_python_compile - if [[ ${EPYTHON} == python3.2 ]]; then - # python3.2 does not like u"" literals - 2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die - fi -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - cp -r -l tests "${BUILD_DIR}"/ || die - - if python_is_python3; then - # Notes: - # -W is not supported by python3.1 - # -n causes Python to write into hardlinked files - 2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die - fi - - nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - - distutils-r1_python_install_all - newbashcomp external/pygments.bashcomp pygmentize -} diff --git a/dev-python/pygments/pygments-2.0.1-r1.ebuild b/dev-python/pygments/pygments-2.0.1-r1.ebuild deleted file mode 100644 index a232e446d36c..000000000000 --- a/dev-python/pygments/pygments-2.0.1-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) - -inherit distutils-r1 bash-completion-r1 vcs-snapshot - -MY_PN="Pygments" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Pygments is a syntax highlighting package written in Python" -HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - dev-python/nose[${PYTHON_USEDEP}] - virtual/ttf-fonts )" -# dev-texlive/texlive-latexrecommended -# Removing / commenting out this dep. I can find no mention of it in tests other than -# importing pygment's own tex module. If it's there and I missed it just uncomment and re-add -# Tests pass without it - -S="${WORKDIR}/${MY_P}" - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - cp -r -l tests "${BUILD_DIR}"/ || die - # With pypy3 there is 1 error out of 1556 tests when run as is and - # (SKIP=8, errors=1, failures=1) when run with 2to3; meh - nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - - distutils-r1_python_install_all - newbashcomp external/pygments.bashcomp pygmentize -} diff --git a/dev-python/pygments/pygments-2.0.1.ebuild b/dev-python/pygments/pygments-2.0.1.ebuild deleted file mode 100644 index 6a0b47515165..000000000000 --- a/dev-python/pygments/pygments-2.0.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) - -inherit distutils-r1 bash-completion-r1 vcs-snapshot - -MY_PN="Pygments" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Pygments is a syntax highlighting package written in Python" -HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments" -#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -SRC_URI="https://bitbucket.org/birkenfeld/pygments-main/get/b839f47dbb3a10830db7dc3114f0ad4f470bcfa5.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - dev-python/nose[${PYTHON_USEDEP}] - virtual/ttf-fonts - dev-texlive/texlive-latexrecommended - )" - -python_compile() { - distutils-r1_python_compile - if [[ ${EPYTHON} == python3.2 ]]; then - # python3.2 does not like u"" literals - 2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die - fi -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - cp -r -l tests "${BUILD_DIR}"/ || die - - if python_is_python3; then - # Notes: - # -W is not supported by python3.1 - # -n causes Python to write into hardlinked files - 2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die - fi - - nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - - distutils-r1_python_install_all - newbashcomp external/pygments.bashcomp pygmentize -} diff --git a/dev-python/pygments/pygments-2.0.2.ebuild b/dev-python/pygments/pygments-2.0.2-r1.ebuild index cbb8a41571d6..b2de0150b71c 100644 --- a/dev-python/pygments/pygments-2.0.2.ebuild +++ b/dev-python/pygments/pygments-2.0.2-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc test" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" @@ -33,6 +33,11 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PV}-shell-injection-backport.patch + "${FILESDIR}"/${PV}-shell-injection-backport2.patch +) + python_compile_all() { use doc && emake -C doc html } diff --git a/dev-python/pylast/metadata.xml b/dev-python/pylast/metadata.xml index 1ef6ae53cee8..bf0534930eac 100644 --- a/dev-python/pylast/metadata.xml +++ b/dev-python/pylast/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>idella4gentoo.org</email> + <email>idella4@gentoo.org</email> <name>Ian Delaney</name> </maintainer> <longdescription lang="en"> diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest index d15c92401e62..92d8ecadb2ea 100644 --- a/dev-python/pymongo/Manifest +++ b/dev-python/pymongo/Manifest @@ -3,3 +3,4 @@ DIST pymongo-2.7.2.tar.gz 381455 SHA256 8fb45e3edec006f4b11580fc579bec7781a8b320 DIST pymongo-2.8.1.tar.gz 399521 SHA256 300ea5762d059c07d1bb2578f35bd0e55bc31753951e2de3d6fe2ed54438e374 SHA512 8d02829eb8683572ffe8c1be5ee50a4c778e1a0b938820859be215b583e719d079183b1a26bc074fad7e31e8944756b82b146657ad528123514b59c725f6d7aa WHIRLPOOL b0c8c373771d3a4525ddf30db5903a6b1241aa1e160e688c215bef21395d598faa65f12e57ea8fe0f16d1c0eaa0abad02ebf3e0b9df2acb8e1c8e6ff9c20a214 DIST pymongo-2.9.tar.gz 430741 SHA256 90e994cfe5928841960dabdca709e75ab4d0f44b288fd59742113982d96290c4 SHA512 c12701797643b41503829b6c7e573cfff7d8c63c56d9eb195f1a67dc3204cd7ed2a28ee2bd2ce34d0c68bade3f44c8bd5c069b15082bf3388c3a401a35424b1e WHIRLPOOL 699a7f658734837f40fe4190251f8e8bb69dba80bbc6dba60207bb18d5dfb43ec5d1c6aca8810b45e7914705305416d0f76face88fd0c43aa20c6d0765eff01c DIST pymongo-3.0.3.tar.gz 419692 SHA256 3c6b2317f8031bc1e200fd1ea35f00a96f4569e3f3f220a5e66ab6227d96ccaf SHA512 7a20fdcae5b3f852bded19c95b36ef6a8141bce0179440a2c5966cbb9f18f3985b7b6b4584c5253c34d0f846d809d72ec0ae076c88472a3de6f090466e9132b4 WHIRLPOOL ae610909b610c7d116dd3aa7c04ab9ce357b25208b07c025924c53bb36183a6d344ecff214def6a01b929dc50d698464c8dd33b6eafd2d88d6666d8534858a38 +DIST pymongo-3.1.tar.gz 462030 SHA256 fe7033007100f825a67640e77abdafee28713f255da88fcfc8d6abad0bb34285 SHA512 886cfbffd4514741e92ad1c79e97ee443d5c9874c823b64c3c2f2566e3005d588d7dd4ae813c320c94f3e6e12b1dd8c7ad56f0e6d2ee419f0d66f4c38321c9ab WHIRLPOOL ec39a42738b751875b92ca8501ccc1711f8e474efef8cf2817525dc47e420e03b7a581d9e35e4f94f529e07a7d81499f7d6e9402c085d9e47861c8a691d1e37e diff --git a/dev-python/pymongo/pymongo-3.1.ebuild b/dev-python/pymongo/pymongo-3.1.ebuild new file mode 100644 index 000000000000..de75b074f333 --- /dev/null +++ b/dev-python/pymongo/pymongo-3.1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit check-reqs distutils-r1 + +DESCRIPTION="Python driver for MongoDB" +HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~x86" +IUSE="doc kerberos test" + +RDEPEND=" + kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] ) +" +DEPEND=" + ${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( + dev-python/nose[${PYTHON_USEDEP}] + >=dev-db/mongodb-2.6.0 + ) +" +DISTUTILS_IN_SOURCE_BUILD=1 + +reqcheck() { + if use test; then + # During the tests, database size reaches 1.5G. + local CHECKREQS_DISK_BUILD=1536M + + check-reqs_${1} + fi +} + +pkg_pretend() { + reqcheck pkg_pretend +} + +pkg_setup() { + reqcheck pkg_setup +} + +python_compile_all() { + if use doc; then + mkdir html || die + sphinx-build doc html || die + fi +} + +python_test() { + # Yes, we need TCP/IP for that... + local DB_IP=127.0.0.1 + local DB_PORT=27000 + + export DB_IP DB_PORT + + local dbpath=${TMPDIR}/mongo.db + local logpath=${TMPDIR}/mongod.log + + # Now, the hard part: we need to find a free port for mongod. + # We're just trying to run it random port numbers and check the log + # for bind errors. It shall be noted that 'mongod --fork' does not + # return failure when it fails to bind. + + mkdir -p "${dbpath}" || die + while true; do + ebegin "Trying to start mongod on port ${DB_PORT}" + + LC_ALL=C \ + mongod --dbpath "${dbpath}" --smallfiles --nojournal \ + --bind_ip ${DB_IP} --port ${DB_PORT} \ + --unixSocketPrefix "${TMPDIR}" \ + --logpath "${logpath}" --fork \ + && sleep 2 + + # Now we need to check if the server actually started... + if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then + # yay! + eend 0 + break + elif grep -q 'Address already in use' "${logpath}"; then + # ay, someone took our port! + eend 1 + : $(( DB_PORT += 1 )) + continue + else + eend 1 + eerror "Unable to start mongod for tests. See the server log:" + eerror " ${logpath}" + die "Unable to start mongod for tests." + fi + done + + local failed + #https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent + pushd "${BUILD_DIR}"/../ > /dev/null + if [[ "${EPYTHON}" == python3* ]]; then + 2to3 --no-diffs -w test + fi + DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1 + + mongod --dbpath "${dbpath}" --shutdown || die + + [[ ${failed} ]] && die "Tests fail with ${EPYTHON}" + + rm -rf "${dbpath}" || die +} + +python_install_all() { + use doc && local HTML_DOCS=( html/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest index 9cb18a43461d..bcb24dac94b7 100644 --- a/dev-python/pyparsing/Manifest +++ b/dev-python/pyparsing/Manifest @@ -1,3 +1,4 @@ DIST pyparsing-1.5.6.tar.gz 1418892 SHA256 5c84aa4500e82d5aa2c0842d5628c5da985e68ac1fb33554e0e5547eb3c85a75 SHA512 614c1a016d121b7c4ecf90a164bbe323affd6cf72319c8494e9a583078ffa233c351627fc3e793307e407e043570f8301f112c4d86645dcd130220ed976289c8 WHIRLPOOL 278d37581a950a570ac3cca2a5f8b674c909220fddc47072d9d52c38b8dfc30b335530dffd3c522cd18e58e9bddcc5e48d9184cdaf4b09203bbba308607e24a4 -DIST pyparsing-2.0.1.tar.gz 1129563 SHA256 0007cd3f008eba4a203f1f6b4b133ddc352552c8808b694c88c23db56416e4e4 SHA512 e9c9307c59c7020f4a454458703bd1eb4ef0ac513b2a6a07706b5d676c010f33a72d03d78a61bf3daa96d6598b966a3e4921a88c50f71939a697fa00377ac67a WHIRLPOOL c95815cc6d8471e1ea730daf19ea954fbbddbc67b771700100b04c7103e1ec5e7226e3881a037476f898a3874c072baed7ed159ca32566bd8ed825ab8f4f3cbe DIST pyparsing-2.0.3.tar.gz 1462653 SHA256 06e729e1cbf5274703b1f47b6135ed8335999d547f9d8cf048b210fb8ebf844f SHA512 9771851f4b0191c7d3f8d2a2a6d2a9198b173120d3f133d08284b71e792fc59a906d571edea8f44ba04ab00c1d906e1974d1e8a2d6155d492de1358ba99c575a WHIRLPOOL 42b9c7aa0b8d4d91436a01a60cbca64a9c8f7798b7aeb60bd2c4af085f9e13167a5ac5132d55bd890b4890c00428e908dfae32ed78ec153c868ee02ed3cdaa3f +DIST pyparsing-2.0.4.tar.gz 1140009 SHA256 c43c9f1395975bf2b032c20e6b149d6b698cdabf9291079bcaf0131709e95f59 SHA512 021d3610ead6b864b1e0227b6cad2393aae0c1f38a44c09dd7ac33d05be30cb4c75176a33ebd8c44e87ed9d54b58aaf27fab7ac8f3cdcb3ce4418b5b0d586b01 WHIRLPOOL 0fa3fe631c5c6fc79fb13f029fe8a32bd9651fd663e915c5be394225bcb1ea1f199d3edc2294e7a4b0732590e7a0cc3053effca9aa20155ca69d4c3908019e6d +DIST pyparsing-2.0.5.tar.gz 1140072 SHA256 58756bf33e989d84ac72142e4ca558cf10c778a3233edb0a86632f271409ba9e SHA512 203c4520378302434078b49467369ee0ae70ef4807ca16b8e0ca361dbc3f555806e5e07f9e5005eec34452144b528ed0480f8892b1c61bae83512baa4e74b56e WHIRLPOOL 0da95e0d61a877669ff0f586e3688b0f8444baa5b857fdea8bb758b52af1ea8d6709effe2d1df031bf7d5940fb3b65582f44ca750adedaae12a36d5af105b6a6 diff --git a/dev-python/pyparsing/files/pyparsing-2.0.4-print.patch b/dev-python/pyparsing/files/pyparsing-2.0.4-print.patch new file mode 100644 index 000000000000..6262a18ea03d --- /dev/null +++ b/dev-python/pyparsing/files/pyparsing-2.0.4-print.patch @@ -0,0 +1,51 @@ + pyparsing.py | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/pyparsing.py b/pyparsing.py +index 81c82ce..55c72a3 100644 +--- a/pyparsing.py ++++ b/pyparsing.py +@@ -22,6 +22,8 @@ + # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #
+
++from __future__ import print_function
++
+ __doc__ = \
+ """
+ pyparsing module - Classes and methods to define and execute parsing grammars
+@@ -1554,19 +1556,19 @@ class ParserElement(object): + run a parse expression against a list of sample strings.
+ """
+ for t in tests:
+- print t
++ print(t)
+ try:
+- print self.parseString(t).dump()
++ print(self.parseString(t).dump())
+ except ParseException as pe:
+ if '\n' in t:
+- print line(pe.loc, t)
+- print ' '*(col(pe.loc,t)-1) + '^'
++ print(line(pe.loc, t))
++ print(' '*(col(pe.loc,t)-1) + '^')
+ else:
+- print ' '*pe.loc + '^'
+- print pe
+- print
++ print(' '*pe.loc + '^')
++ print(pe)
++ print()
++
+
+-
+ class Token(ParserElement):
+ """Abstract C{ParserElement} subclass, for defining atomic matching patterns."""
+ def __init__( self ):
+@@ -3803,4 +3805,4 @@ if __name__ == "__main__": + """
+ CHANGES
+ UnitTests.py
+-""" +\ No newline at end of file ++"""
diff --git a/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild b/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild index f6c1d102d70d..be56c49bbb11 100644 --- a/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild +++ b/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild @@ -7,13 +7,13 @@ PYTHON_COMPAT=( python{2_7,3_3} ) inherit distutils-r1 -DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing" +DESCRIPTION="Easy-to-use Python module for text parsing" HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~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" +KEYWORDS="alpha amd64 arm 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" DEPEND="" diff --git a/dev-python/pyparsing/pyparsing-1.5.6.ebuild b/dev-python/pyparsing/pyparsing-1.5.6.ebuild deleted file mode 100644 index ea5f501b1f75..000000000000 --- a/dev-python/pyparsing/pyparsing-1.5.6.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils eutils - -DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing" -HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm 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" - -DEPEND="" -RDEPEND="" - -DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1" -PYTHON_MODNAME="pyparsing.py" - -src_install() { - distutils_src_install - - dohtml HowToUsePyparsing.html - dodoc CHANGES - - if use doc; then - dohtml -r htmldoc/* - insinto /usr/share/doc/${PF} - doins docs/*.pdf - fi - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/dev-python/pyparsing/pyparsing-2.0.1.ebuild b/dev-python/pyparsing/pyparsing-2.0.1.ebuild deleted file mode 100644 index 048f4cfc77d2..000000000000 --- a/dev-python/pyparsing/pyparsing-2.0.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) - -inherit distutils-r1 - -DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing" -HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm 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" - -RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3" - -python_install_all() { - local HTML_DOCS=( HowToUsePyparsing.html ) - use doc && HTML_DOCS+=( htmldoc/ ) - - distutils-r1_python_install_all - - use doc && dodoc docs/*.pdf - use examples && dodoc -r examples -} diff --git a/dev-python/pyparsing/pyparsing-2.0.3.ebuild b/dev-python/pyparsing/pyparsing-2.0.3.ebuild index a2390d4a50b7..9603007e280d 100644 --- a/dev-python/pyparsing/pyparsing-2.0.3.ebuild +++ b/dev-python/pyparsing/pyparsing-2.0.3.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit distutils-r1 -DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing" +DESCRIPTION="Easy-to-use Python module for text parsing" HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" diff --git a/dev-python/pyparsing/pyparsing-2.0.4.ebuild b/dev-python/pyparsing/pyparsing-2.0.4.ebuild new file mode 100644 index 000000000000..c2a2abb45252 --- /dev/null +++ b/dev-python/pyparsing/pyparsing-2.0.4.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Easy-to-use Python module for text parsing" +HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +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" + +RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +# no contained in the tarball +RESTRICT=test + +PATCHES=( "${FILESDIR}"/${P}-print.patch ) + +python_install_all() { + local HTML_DOCS=( HowToUsePyparsing.html ) + if use doc; then + HTML_DOCS+=( htmldoc/. ) + dodoc docs/*.pdf + fi + use examples && local EXAMPLES=( examples/. ) + distutils-r1_python_install_all +} + +python_test() { + ${PYTHON} unitTests.py || die +} diff --git a/dev-python/pyparsing/pyparsing-2.0.5.ebuild b/dev-python/pyparsing/pyparsing-2.0.5.ebuild new file mode 100644 index 000000000000..ef7c5b117177 --- /dev/null +++ b/dev-python/pyparsing/pyparsing-2.0.5.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Easy-to-use Python module for text parsing" +HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +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" + +RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +# no contained in the tarball +RESTRICT=test + +python_install_all() { + local HTML_DOCS=( HowToUsePyparsing.html ) + if use doc; then + HTML_DOCS+=( htmldoc/. ) + dodoc docs/*.pdf + fi + use examples && local EXAMPLES=( examples/. ) + distutils-r1_python_install_all +} + +python_test() { + ${PYTHON} unitTests.py || die +} diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest index 66009d68e445..8c996664b90a 100644 --- a/dev-python/pypax/Manifest +++ b/dev-python/pypax/Manifest @@ -1,3 +1,3 @@ DIST elfix-0.8.4.tar.gz 374742 SHA256 374be66da3dddef485bbb5e95bfcab6fd0c2db478255bddd10079730ada5260b SHA512 10aacc3fff33c934e2d4487d174a2b0cec10ffb7a35fc72b160c786f82f0355f3a2dea716bc7fb929d2919cc32a26844f37f9d73064b755098bdaa72e8075bda WHIRLPOOL b04e099f188c0b76d8c07abd76559c1313854aa83a03ad69afb72674d93cde6ce538ae10d0fea3be5495937e72a4b98fdd36efbb2e3aa8ff23c1d9f7f943c1ae DIST elfix-0.9.0.tar.gz 372014 SHA256 8b547d987edb2f7dc23ddf30f959d7d051a9ed49810f983b8fe6c489fe731cf0 SHA512 fd9bab90d745f77429c902acd2a14f615132731b3c38929dce764f1e5f7ee8f6478a6fef7ce0cb38e7ebd9181ba57965ff0c97da5e01d0fbf2cfb940ed691ebf WHIRLPOOL c09fa2193b990a506cae17f370ec10fa6302e17d2a165e42eceb88644f8a92e297c839ad788204e213d8205695b65557a7dcef5f6417177c434c8d0a34bd5eb7 -DIST elfix-0.9.1.tar.gz 398588 SHA256 0368d07bfdad4a14f039929a30d85a612dcd9d22ac87211f8e59d452bac23625 SHA512 28fdde7841263cee766434b5eda1a4151999526aa3a1acaacd2e6355502df4b56db9faf64ce81bdc89606d366d0a6dd28c5c135290fe7f0285cee480f6002527 WHIRLPOOL cd7dc6e191d97836f4b8859b73777e3b4b6fce5d290087400327f87a621e9879f5c233eef51bef981398d0d00ecc753f222655108994d25a4e0503799569ec82 +DIST elfix-0.9.2.tar.gz 398758 SHA256 1a50ec57d6f5d1b25dcaaaf15f82849774e9e4e7e263cee3aa4936c5e3d6f071 SHA512 a7be30722abe7249ec42024d33b2bda00524cfb85da66b4511c5056efbdbfae1d3c2b42048bcf4d5cb7c0ae675f763b74a834d93a25b541ebac42fddcd2c6cf9 WHIRLPOOL aead1a63612ea187dc00aa52ee2c18431036176aae2e0e08d3138ced751f28947ee8045dd63dae67f89946d5b64e705a6b6d45b884d3d9da1d7e6e03b37ed700 diff --git a/dev-python/pypax/pypax-0.9.1.ebuild b/dev-python/pypax/pypax-0.9.2.ebuild index 2b2ef718c083..97d32b4786af 100644 --- a/dev-python/pypax/pypax-0.9.1.ebuild +++ b/dev-python/pypax/pypax-0.9.2.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-2 else SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86" S="${WORKDIR}/elfix-${PV}" fi diff --git a/dev-python/pyscaffold/Manifest b/dev-python/pyscaffold/Manifest new file mode 100644 index 000000000000..a69c5128b458 --- /dev/null +++ b/dev-python/pyscaffold/Manifest @@ -0,0 +1 @@ +DIST pyscaffold-2.4.1.tar.gz 108670 SHA256 bb91c4682c712b6a446d2b3b53dd27d0b8f2fb2050995e1b7f16aa8d6ec391c2 SHA512 ec5b5cf842b62f1989741bde84bf5ef5940583379e2b93672e95444a40685ae020286f40d47c31a4382f2c892dd17270349942f1544207036ff4e99a29e9e76d WHIRLPOOL d0ae0d1d69beaa21902f9f69ac1432734c11e15ff3c5d428602793f0ce4b2a53376a00c4f52004fb3f49da06bbd112f6ed72100fee7bdcfee26e7e23c54ec8af diff --git a/dev-python/pyscaffold/files/pyscaffold-2.4.1-loose-dep-restrictions-backport.patch b/dev-python/pyscaffold/files/pyscaffold-2.4.1-loose-dep-restrictions-backport.patch new file mode 100644 index 000000000000..ed7c8bd5ea33 --- /dev/null +++ b/dev-python/pyscaffold/files/pyscaffold-2.4.1-loose-dep-restrictions-backport.patch @@ -0,0 +1,36 @@ +From 513393e20f20cf62c09bd445057194ee378dda57 Mon Sep 17 00:00:00 2001 +From: Florian Wilhelm <Florian.Wilhelm@gmail.com> +Date: Wed, 16 Sep 2015 12:59:49 +0200 +Subject: [PATCH] Fix issue 69 + +--- + CHANGES.rst | 5 +++++ + requirements.txt | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/CHANGES.rst b/CHANGES.rst +index 922d41b..0478701 100644 +--- a/CHANGES.rst ++++ b/CHANGES.rst +@@ -2,6 +2,11 @@ + Release Notes + ============= + ++Version 2.4.2, 2015-09-16 ++========================= ++ ++- Fix version conflicts due to too tight pinning, issue #69 ++ + Version 2.4.1, 2015-09-09 + ========================= + +diff --git a/requirements.txt b/requirements.txt +index f9695f8..a620a77 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,3 +1,3 @@ + six +-setuptools_scm>=1.7,<1.8a0 +-pbr>=1.7,<1.8a0 ++setuptools_scm>=1.7 ++pbr>=1.6 diff --git a/sci-chemistry/mrbump/metadata.xml b/dev-python/pyscaffold/metadata.xml index 4aaae064be71..c1661663322e 100644 --- a/sci-chemistry/mrbump/metadata.xml +++ b/dev-python/pyscaffold/metadata.xml @@ -1,10 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>sci-chemistry</herd> <maintainer> <email>jlec@gentoo.org</email> - <name>Justin Lecher (jlec)</name> + <name>Justin Lecher</name> </maintainer> </pkgmetadata> - diff --git a/dev-python/pyscaffold/pyscaffold-2.4.1.ebuild b/dev-python/pyscaffold/pyscaffold-2.4.1.ebuild new file mode 100644 index 000000000000..993b10447463 --- /dev/null +++ b/dev-python/pyscaffold/pyscaffold-2.4.1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) + +inherit distutils-r1 + +MY_PN="PyScaffold" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Tool for easily putting up the scaffold of a Python project" +HOMEPAGE="https://pypi.python.org/pypi/PyScaffold http://pyscaffold.readthedocs.org/" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + >=dev-python/pbr-1.6[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/setuptools_scm-1.7[${PYTHON_USEDEP}] + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-runner[${PYTHON_USEDEP}] + ) +" + +PATCHES=( "${FILESDIR}"/${P}-loose-dep-restrictions-backport.patch ) + +python_prepare_all() { + sed \ + -e 's: + pytest_runner::g' \ + -i setup.py || die + + # Creates all sort of mem problem due to fetch restrictions + rm tests/test_install.py || die + + # Online tests + sed \ + -e 's:test_api_with_cookiecutter:_&:g' \ + -e 's:test_pyscaffold_keyword:_&:g' \ + -i tests/*py || die + + distutils-r1_python_prepare_all +} + +python_test() { + git config --global user.email "you@example.com" + git config --global user.name "Your Name" + + esetup.py test +} diff --git a/dev-python/pytest-raisesregexp/Manifest b/dev-python/pytest-raisesregexp/Manifest new file mode 100644 index 000000000000..fabbe5359a62 --- /dev/null +++ b/dev-python/pytest-raisesregexp/Manifest @@ -0,0 +1 @@ +DIST pytest-raisesregexp-2.0.tar.gz 2474 SHA256 0fde8aac1a54f9b56e5f9c61fda76727542ed24968c27c6e3688c6f1885f1e61 SHA512 790de1dd7d8c11455829a1c5b19b93bd1108626b539cb539466f262702ebc3e0cdd954f47c6a3210f3b127870ea86ce47ab2c25814d62d503508f3ac96b1bbc0 WHIRLPOOL 0f7eca4584bc9a61fae8324635ee4be2575530c97ad7413ee090e76658ba358a6c44461f66afc905e29c1f52cad9169d4cdb15e78f7a3d19a978f97d157b9d1a diff --git a/dev-libs/libjwc_c/metadata.xml b/dev-python/pytest-raisesregexp/metadata.xml index d747d72a25b4..02be8c5eb78f 100644 --- a/dev-libs/libjwc_c/metadata.xml +++ b/dev-python/pytest-raisesregexp/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>sci</herd> <maintainer> - <email>sci@gentoo.org</email> + <email>alunduil@gentoo.org</email> + <name>Alex Brandt</name> </maintainer> + <longdescription lang="en"> + </longdescription> </pkgmetadata> diff --git a/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild b/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild new file mode 100644 index 000000000000..95d8396250d5 --- /dev/null +++ b/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python3_4 ) + +inherit distutils-r1 + +DESCRIPTION="Simple pytest plugin to look for regex in Exceptions" +HOMEPAGE="https://github.com/Walkman/pytest_raisesregexp" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +CDEPEND="dev-python/pytest[${PYTHON_USEDEP}]" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( ${CDEPEND} ) +" +RDEPEND=" + ${CDEPEND} + dev-python/py[${PYTHON_USEDEP}] +" + +python_test() { + ${PYTHON} -m pytest || die "Tests failed under ${EPYTHON}" +} diff --git a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild index 503564a63636..a92283bc02c5 100644 --- a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild +++ b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.python.org/pypi/pytest-runner https://bitbucket.org/pytes SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz" LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" SLOT="0" IUSE="doc" diff --git a/dev-python/pytest/pytest-2.8.2.ebuild b/dev-python/pytest/pytest-2.8.2.ebuild index 7a1d5acf0bd6..59d251c455fe 100644 --- a/dev-python/pytest/pytest-2.8.2.ebuild +++ b/dev-python/pytest/pytest-2.8.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" 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" +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" # When bumping, please check setup.py for the proper py version @@ -45,6 +45,13 @@ python_prepare_all() { # Prevent un-needed d'loading sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die + + # https://github.com/pytest-dev/pytest/issues/1162 + # https://github.com/pytest-dev/pytest/issues/1163 + sed \ + -e 's:test_logging_initialized_in_test:_&:g' \ + -i testing/test_capture.py || die + distutils-r1_python_prepare_all } diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest index b3b061140ebb..aa4860213680 100644 --- a/dev-python/python-nbxmpp/Manifest +++ b/dev-python/python-nbxmpp/Manifest @@ -1,3 +1 @@ -DIST python-nbxmpp-0.5.1.tar.gz 1514899 SHA256 2988dd2ae4e0dca76c1c7d75b1cac5bc31517a05959eba652ecad6e66604f929 SHA512 2bdcd89004202880b69728e0f5f23506016ce21a10960ff4c23d2d45037563f32441964688c6328d3f8e10cda2f39aeac647aff9fde0676ca27a4c8dde72405e WHIRLPOOL f994f172ba0b50e154ec2d4bda26d574b21639b412b1eb73d3b781bd5f897577a32eb47fc3b276f66bc2ac48b66442a0185bbd9a74f896446838e471ec082a1e -DIST python-nbxmpp-0.5.2.tar.gz 1508734 SHA256 16d7d2114d9d2c7267d0d8fc5a5c868939fa37031b8d4ca1b11c2a7500bc5160 SHA512 0b8a063c421349c24f822f3da68e6627675731793eee8dad14ae298ed67a981ddaad54fa63a88de6d28f2755da259ee5768a587ed3242e3cb38b4886a069f102 WHIRLPOOL 376e9044a508183f586a5a11e5b5cb41f3065db185b4d89392b1613288f9ede874af1a8f5eafdf64552af8f2d6a2120a931833d5fea4aad5cffcaad380ca9a68 DIST python-nbxmpp-0.5.3.tar.gz 1514066 SHA256 b79a6b25a2ed7ac792600544778238b27cf6eef6c8eab79b0bfa46df0c3a9935 SHA512 a55ce4c05683d46c12cf085c5436ba544044f0ab71ad7c87dbb25cba02c28109089131b617ff51191d294efe50e80171dd2305ead4052bec921b0ad5ad920e20 WHIRLPOOL 96d078df5972dde5704dac9fcac31c9ae734c06583c381f5d18d43fca26ae790cebc114991e07b916be35a5dcb24d9ccaad9fe69f22b9bd16099d5d248aea487 diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild deleted file mode 100644 index f6374a173ac0..000000000000 --- a/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit distutils-r1 - -TAG=6 - -DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way" -HOMEPAGE="http://python-nbxmpp.gajim.org/" -SRC_URI="http://python-nbxmpp.gajim.org/downloads/${TAG} -> ${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -S="${WORKDIR}"/nbxmpp-${PV} diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.2.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.2.ebuild deleted file mode 100644 index b95facbadffd..000000000000 --- a/dev-python/python-nbxmpp/python-nbxmpp-0.5.2.ebuild +++ /dev/null @@ -1,22 +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 python3_{3,4} ) - -inherit distutils-r1 - -TAG=7 - -DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way" -HOMEPAGE="http://python-nbxmpp.gajim.org/" -SRC_URI="http://python-nbxmpp.gajim.org/downloads/${TAG} -> ${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -S="${WORKDIR}"/nbxmpp-${PV} diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild index db141c28b75b..9fc77862239f 100644 --- a/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild +++ b/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://python-nbxmpp.gajim.org/downloads/${TAG} -> ${P}.tar.gz" SLOT="0" LICENSE="BSD" -KEYWORDS="~alpha amd64 arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="" S="${WORKDIR}"/nbxmpp-${PV} diff --git a/dev-python/python-sipsimple/python-sipsimple-2.5.1-r2.ebuild b/dev-python/python-sipsimple/python-sipsimple-2.5.1-r3.ebuild index 855904f594f1..e6c2594f70e0 100644 --- a/dev-python/python-sipsimple/python-sipsimple-2.5.1-r2.ebuild +++ b/dev-python/python-sipsimple/python-sipsimple-2.5.1-r3.ebuild @@ -30,7 +30,7 @@ CDEPEND=" virtual/ffmpeg " RDEPEND="${CDEPEND} - dev-python/dnspython[${PYTHON_USEDEP}] + virtual/dnspython[${PYTHON_USEDEP}] dev-python/python-cjson[${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/python-eventlib[${PYTHON_USEDEP}] diff --git a/dev-python/python-sipsimple/python-sipsimple-2.5.1.ebuild b/dev-python/python-sipsimple/python-sipsimple-2.5.1.ebuild deleted file mode 100644 index 10e1c459f788..000000000000 --- a/dev-python/python-sipsimple/python-sipsimple-2.5.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="SIP SIMPLE client SDK is a Software Development Kit" -HOMEPAGE="http://sipsimpleclient.org" -SRC_URI="http://download.ag-projects.com/SipClient/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -IUSE="" - -KEYWORDS="~amd64 ~x86" - -CDEPEND=" - dev-db/sqlite:3 - dev-libs/openssl:0 - dev-python/python-application[${PYTHON_USEDEP}] - media-libs/alsa-lib - media-libs/libv4l - media-libs/libvpx - sys-apps/util-linux - virtual/ffmpeg -" -RDEPEND="${CDEPEND} - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/python-cjson[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/python-eventlib[${PYTHON_USEDEP}] - dev-python/greenlet[${PYTHON_USEDEP}] - dev-python/python-gnutls[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/python-msrplib[${PYTHON_USEDEP}] - dev-python/python-xcaplib[${PYTHON_USEDEP}] - dev-python/twisted-core[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] -" -DEPEND="${CDEPEND} - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig -" diff --git a/dev-python/python-sqlparse/Manifest b/dev-python/python-sqlparse/Manifest index 8dd5f14a2bed..54b89f59ce8a 100644 --- a/dev-python/python-sqlparse/Manifest +++ b/dev-python/python-sqlparse/Manifest @@ -3,3 +3,4 @@ DIST python-sqlparse-0.1.13.tar.gz 153184 SHA256 d827ac617c159ec60ddd7d4db05bb1c DIST sqlparse-0.1.14.tar.gz 55307 SHA256 e561e31853ab9f3634a1a2bd53035f9e47dfb203d56b33cc6569047ba087daf0 SHA512 212f0dc1f05057f44cb441c2b0d29a597a826c3170ec87276a74c79f5d445cf736cfcbf8ff7cfe40c252416bba9851ce4a4739418627172ac41d98e6835668c6 WHIRLPOOL 93a226fe3df6d6d078c447e311d10114a9fb31801d848456ab9ba21d4087a373a6d2f20d1bc4e55474dae28411dcb4112e85ceaf373dec51275aa9ce38102aff DIST sqlparse-0.1.15.tar.gz 57863 SHA256 ce92c9f134b1cd461a27c502197464b5f245261ad0fbb26d7bf659f28a5c11b2 SHA512 9d7ef4b22465b0b0438195f304fa138f286f5976ba64880616ef46da4df76dd9c6bb34d56c8daa66e522e68b3e7f284d442e513e3cc97a5300c38597d2c4afc1 WHIRLPOOL 968250ad9f2945ab6d61d94a673493cc6c6e42fea5566f6a7b25f4cde57dbbcf8216e8e1003f50b1f5bd1be58b00838fecdc6c729c8ba3a2365309ddede66ba5 DIST sqlparse-0.1.16.tar.gz 58418 SHA256 678c6c36ca4b01405177da8b84eecf92ec92c9f6c762396c965bb5d305f20f81 SHA512 2561ed970340eb99b575626fd8bb7253f522507628ed86256a32e7bd7dd438b7f4bec0adf1d7298a2903411d2623cb5a4ba6f53c794bcc38b695e2ddf26c488c WHIRLPOOL 8c2f01c4bda48e190668bb34cbabc1bc775a224432ca9ea638f4c350fe493c8705d171f4f6c40063e8c7546502249cec3bfa73d5f6f6e47b918cdba8a5cdcafc +DIST sqlparse-0.1.18.tar.gz 58594 SHA256 39b196c4a06f76d6ac82f029457ca961f662a8bbbb2694eb1dfe4f2b68a2d7cf SHA512 78d20af3945140ff82d9ac9411eed57e0515a755ecafa407fbd7cdcca27b06a72b4e67f1fa22ccadcaa59827814f0ef58db68f236ca142b5663236d31c80820e WHIRLPOOL 129176182f532886cfeebce6a9512bfba6068e4728372761d97ac7214202577df1b1464f188be302827f2b7264c9596027475282bc81f9d8cee4506405627890 diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.18.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.18.ebuild new file mode 100644 index 000000000000..df6e142f81f8 --- /dev/null +++ b/dev-python/python-sqlparse/python-sqlparse-0.1.18.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) + +inherit distutils-r1 + +MY_PN="${PN##python-}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="A non-validating SQL parser module for Python" +HOMEPAGE="https://code.google.com/p/python-sqlparse/ https://github.com/andialbrecht/sqlparse" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +LICENSE="BSD-2" +IUSE="doc test" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-cov[${PYTHON_USEDEP}] + )" +# Required for running tests +DISTUTILS_IN_SOURCE_BUILD=1 + +S="${WORKDIR}"/${P#python-} + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + if python_is_python3; then + 2to3 -w --no-diffs -n tests/ sqlparse/ + py.test ./tests || die "testsuite failed ${EPYTHON}" + else + py.test tests || die "testsuite failed under ${EPYTHON}" + fi +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest new file mode 100644 index 000000000000..049365aacfdf --- /dev/null +++ b/dev-python/pytidylib/Manifest @@ -0,0 +1 @@ +DIST pytidylib-0.2.4.tar.gz 86650 SHA256 0af07bd8ebd256af70ca925ada9337faf16d85b3072624f975136a5134150ab6 SHA512 443e9af0fd458d4f041e3b72415839838a4edc83f8a978e5cc0bdf53202584e269f1ad5df10967d8ae4b98b24dcffcf9f5a54e0e3f6cd620a8a6a20171da0811 WHIRLPOOL c2b4665982333001a44592e7b80ae69926c6e9e1ad0c5f78eb89a1fb3d0f6e80dc1687b34f8f643ce93dc32c521886e0a010b9d63f71e3b98c65b61c5dad7328 diff --git a/dev-python/pytidylib/metadata.xml b/dev-python/pytidylib/metadata.xml new file mode 100644 index 000000000000..e05a647f81dd --- /dev/null +++ b/dev-python/pytidylib/metadata.xml @@ -0,0 +1,9 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>python</herd> + <upstream> + <remote-id type="github">countergram/pytidylib</remote-id> + <remote-id type="pypi">pytidylib</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/pytidylib/pytidylib-0.2.4.ebuild b/dev-python/pytidylib/pytidylib-0.2.4.ebuild new file mode 100644 index 000000000000..a9575c092a69 --- /dev/null +++ b/dev-python/pytidylib/pytidylib-0.2.4.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Python wrapper for HTML Tidy (tidylib)" +HOMEPAGE="http://countergram.com/open-source/pytidylib https://github.com/countergram/pytidylib" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="test" + +RDEPEND="app-text/htmltidy" +DEPEND="${RDEPEND} + test? ( dev-python/pytest )" + +python_test() { + py.test -vv || die +} diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest index 5d623ce01204..f38e08060e24 100644 --- a/dev-python/pytz/Manifest +++ b/dev-python/pytz/Manifest @@ -1,2 +1,3 @@ DIST pytz-2015.4.tar.bz2 157361 SHA256 a78b484d5472dd8c688f8b3eee18646a25c66ce45b2c26652850f6af9ce52b17 SHA512 ade31780d5d91cb519e69b38f8828e1cf94b5b388a3efd80db42b7a5e5603f43f5726f7aecfd08c78d3637a3017910f3ed1a7727ec291f6579a41882c6289ca4 WHIRLPOOL 7804617d21de5e6212ccc1f17651c8e76a94374af22f542cd6eb54fc6951d0b6ec42cd7623162074994573b6bba492d92397a584277b423742c15b68cb930ae7 DIST pytz-2015.6.tar.bz2 156925 SHA256 01eed1b2226dc386d8e467a2ff8c4f1aa08c65d5d7e7c43aa094bd45d5bd68ba SHA512 e6e117d85c0a0310b115cfaae2b9d5957641f8367a7890f4e1afed8129e77c6a08b733b985c06d5f3fe5bbfa565387826883864b79dd4946065561a60ad24f35 WHIRLPOOL 255684e9f24353aeda2f26fc89216aef3b34a87a74df4dc758f87da31cedce6d372d405d37e8c538b786324c6ce03da177d3429438999ecfd744009fd7bbbbe9 +DIST pytz-2015.7.tar.bz2 156812 SHA256 fbd26746772c24cb93c8b97cbdad5cb9e46c86bbdb1b9d8a743ee00e2fb1fc5d SHA512 ffdea72f36b286ea63a3dbc022626ab01d2348ebd29c3532e9e1a289c3112f0ff01e9f3fcf2ad389b609d14393b68c9652f61d1589551f4979a010185da0609c WHIRLPOOL 3ed0deee15f831ae735a9d4f317fe1eaca91e10f450343b0a1e24998846785fd5b02c71caa4ee4e40e426fdc780e2ac9ccaf54abc1f7a66c662bef84feacd691 diff --git a/dev-python/pytz/pytz-2015.6.ebuild b/dev-python/pytz/pytz-2015.6.ebuild index 2f135a1b57cb..8cb53a7b9c8e 100644 --- a/dev-python/pytz/pytz-2015.6.ebuild +++ b/dev-python/pytz/pytz-2015.6.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2" LICENSE="MIT" 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" +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="" DEPEND=" diff --git a/dev-python/pytz/pytz-2015.7.ebuild b/dev-python/pytz/pytz-2015.7.ebuild new file mode 100644 index 000000000000..33cf03a3fd83 --- /dev/null +++ b/dev-python/pytz/pytz-2015.7.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="World timezone definitions for Python" +HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2" + +LICENSE="MIT" +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="" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + >=sys-libs/timezone-data-2015g" +RDEPEND="${DEPEND}" + +PATCHES=( + # Use timezone-data zoneinfo. + "${FILESDIR}"/${PN}-2009j-zoneinfo.patch + # ...and do not install a copy of it. + "${FILESDIR}"/${PN}-2009h-zoneinfo-noinstall.patch +) + +python_test() { + "${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/pyuv/Manifest b/dev-python/pyuv/Manifest new file mode 100644 index 000000000000..33e2d1b2530a --- /dev/null +++ b/dev-python/pyuv/Manifest @@ -0,0 +1 @@ +DIST pyuv-1.2.0.tar.gz 98578 SHA256 9df91c86519574f65e4465884db20565d4ad4287cd6cd651ee0137430b0dd4a7 SHA512 10a8448700c609b6e9844c6bc9bd6428920a455c94bee79569006f783c7f5d2683abe46c4692d0f0016a621d0c6d0ef2decc42a9f0418e1242b79ab0f06ee9f2 WHIRLPOOL 11989f713ba205ff0fa5b76dd742a7c3eb66b00fb6c97e0a0a5aa2e2b3c041a1d35b2bfd950a54fb0a7adb9ae1c5753c97ee4c6278518e46a345a462827835eb diff --git a/dev-python/pyuv/metadata.xml b/dev-python/pyuv/metadata.xml new file mode 100644 index 000000000000..bd1f47aa9d38 --- /dev/null +++ b/dev-python/pyuv/metadata.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>hasufell@gentoo.org</email> + <name>Julian Ospald</name> + </maintainer> + <longdescription lang="en"> + pyuv is a Python module which provides an interface to + <pkg>dev-libs/libuv</pkg>. + libuv is a high performance asynchronous networking and platform + abstraction library. + + libuv is built on top of epoll/kequeue/event ports/etc on Unix and + IOCP on Windows systems providing a consistent API on top of them. + + pyuv's features: + * Non-blocking TCP sockets + * Non-blocking named pipes + * UDP support (including multicast) + * Timers + * Child process spawning + * Asynchronous DNS resolution (getaddrinfo) + * Asynchronous file system APIs + * High resolution time + * System memory information + * System CPUs information + * Network interfaces information + * Thread pool scheduling + * ANSI escape code controlled TTY + * File system events (inotify style and stat based) + * IPC and TCP socket sharing between processes + * Arbitrary file descriptor polling + * Thread synchronization primitives + </longdescription> + <upstream> + <maintainer status="active"> + <email>saghul@gmail.com</email> + <name>Saúl Ibarra Corretgé</name> + </maintainer> + <remote-id type="github">saghul/pyuv</remote-id> + <remote-id type="pypi">pyuv</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/pyuv/pyuv-1.2.0.ebuild b/dev-python/pyuv/pyuv-1.2.0.ebuild new file mode 100644 index 000000000000..ab665cacadd1 --- /dev/null +++ b/dev-python/pyuv/pyuv-1.2.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit distutils-r1 + +DESCRIPTION="Python interface for libuv" +HOMEPAGE="https://pyuv.readthedocs.org/en" +SRC_URI="https://github.com/saghul/pyuv/archive/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# https://github.com/saghul/pyuv/blob/v1.x/setup_libuv.py#L117 +RDEPEND=">=dev-libs/libuv-1.7.3:0/1" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/pyuv-pyuv-${PV}" + +src_configure() { + mydistutilsargs=( build_ext --use-system-libuv ) + distutils-r1_src_configure +} diff --git a/dev-python/pywebkitgtk/metadata.xml b/dev-python/pywebkitgtk/metadata.xml index ee6dda9ab4b3..eabb6d236cdd 100644 --- a/dev-python/pywebkitgtk/metadata.xml +++ b/dev-python/pywebkitgtk/metadata.xml @@ -4,7 +4,7 @@ <herd>python</herd> <herd>proxy-maintainers</herd> <maintainer> - <email>srinclan@gmail.com</email> + <email>sergio.rodriguez.inclan@gmail.com</email> <name>Sergio Rodriguez</name> </maintainer> <maintainer> diff --git a/dev-python/pyxdg/files/pyxdg-subprocess.patch b/dev-python/pyxdg/files/pyxdg-subprocess.patch deleted file mode 100644 index 7b9a1ba7d644..000000000000 --- a/dev-python/pyxdg/files/pyxdg-subprocess.patch +++ /dev/null @@ -1,38 +0,0 @@ -#Patch sent to upstream on March 1st, 2009 -#Jesus Rivero (Neurogeek) -#Replaced deprecated os.popen3 for subprocess - -diff -uNr xdg.orig/Menu.py xdg/Menu.py ---- xdg.orig/Menu.py 2009-03-01 04:34:38.000000000 -0430 -+++ xdg/Menu.py 2009-03-01 04:41:27.000000000 -0430 -@@ -12,6 +12,7 @@ - - import xdg.Locale - import xdg.Config -+from subprocess import Popen, PIPE - - ELEMENT_NODE = xml.dom.Node.ELEMENT_NODE - -@@ -841,13 +842,16 @@ - return m - - def __parseKDELegacyDirs(filename, parent): -- f=os.popen3("kde-config --path apps") -- output = f[1].readlines() - try: -- for dir in output[0].split(":"): -- __parseLegacyDir(dir,"kde", filename, parent) -- except IndexError: -- pass -+ f=Popen("kde-config --path apps", shell=True, stdout=PIPE).stdout -+ output = f.readlines() -+ try: -+ for dir in output[0].split(":"): -+ __parseLegacyDir(dir,"kde", filename, parent) -+ except IndexError: -+ pass -+ except: -+ raise Exception, "kde-config failed" - - # remove duplicate entries from a list - def __removeDuplicates(list): diff --git a/dev-python/pyxdg/metadata.xml b/dev-python/pyxdg/metadata.xml index de483c53568f..182ba5b16151 100644 --- a/dev-python/pyxdg/metadata.xml +++ b/dev-python/pyxdg/metadata.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>python</herd> + <herd>python</herd> + <upstream> + <doc lang="en">https://pyxdg.readthedocs.org/en/latest/</doc> + <bugs-to>https://bugs.freedesktop.org/</bugs-to> + <remote-id type="pypi">pyxdg</remote-id> + <remote-id type="launchpad">pyxdg</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest index 30cc386d5501..c30dc91d36cb 100644 --- a/dev-python/redis-py/Manifest +++ b/dev-python/redis-py/Manifest @@ -1,4 +1,5 @@ DIST redis-py-2.10.1.tar.gz 84143 SHA256 644aaf429e666d2254143a6a02f3b1cca2806d0cd52bb130c8f879d3c8259d62 SHA512 694a687e22654631fcf7b0b5884c2f3b3f804befe8080a1a27f08e212afe2f64c36921e025801d67bac1786b105f23565f52768f5b62ed1d18038be8dba9542c WHIRLPOOL e1b76cf47043d3d5317fc4352c9b52598af119a1501e4d6af1615181006afa658417002fdd8e206e6d5d5556df6dcbdd34a74b89918c513802793bd6ced4cccd DIST redis-py-2.10.3.tar.gz 86532 SHA256 a4fb37b02860f6b1617f6469487471fd086dd2d38bbce640c2055862b9c4019c SHA512 a6dcb1160f91c444a6fd107761b2701e7d8ab2eed7b9fcc00e8f0bdcefe46c2a626611f36fe6bf520fe3cceeb509562609e6dba263e1508abe285a6eab73963c WHIRLPOOL 2b2fc577ff752f71675cade7c591442526dfbac07495d1cf61b14ac21371e76aec2d008531bb8729eb5e3f3ffd372d6c9bf9f7554e51f8076d2d79c07377d33e +DIST redis-py-2.10.5.tar.gz 88610 SHA256 5dfbae6acfc54edf0a7a415b99e0b21c0a3c27a7f787b292eea727b1facc5533 SHA512 b2e6cb85c274c8f1c63e27256bbab816d016a68c324bf7092cf53feae819a34fa94f45565b0f209ee981919d793b2963462eb1a6f841e9dde9885802e0ebbe8f WHIRLPOOL af0b92b5ddb69346ff285d959a5052df5d65638e70d8d1b3d4b00adb80755eef41b492bfea432507443883f206a4537faf10e82d4253d7612e74ab7a52df47f1 DIST redis-py-2.7.4.tar.gz 79715 SHA256 623c8d437401314f8ec92f03848638c79c757098b316f0ed40ec2deaad57e082 SHA512 9b8db28c77e9df7a243e510a4f66a021179ab8ff52cfed2cc1b18b20f167eeee138d59a868fc105a32993681551c53e98d45680c16313680e8b4f36b6defa3b9 WHIRLPOOL fa5c754dc83f7d8baea68e21e283435994380e3e7243fa9bdb74ce934f7adacc75a11c6312d4b642606aa817010abc23f8f2a7b9eac1e2c73e50e897085124ad DIST redis-py-2.9.1.tar.gz 62204 SHA256 af9747ec2727425b1b09252975e21502ee5a3d8d235c7f49869eb13e09ccf4e4 SHA512 6b4912acafb31c87a5bc47b0420834aa9d1eba57feb0bbacdea943b746fe2f24aee4c9f13e7b03ae4edc562043b22c370cc7f53e45be07c5408cfa9852f8ea38 WHIRLPOOL ae38ea63d605f8dd667d9fc548de972bf38d661ae6ef357070ebe7cba3b484febc45d6b7611916d8a1e262e6bbf4754257e727f41af8caa30597954a1fc20cf5 diff --git a/dev-python/redis-py/files/redis-py-2.10.5-test-backport.patch b/dev-python/redis-py/files/redis-py-2.10.5-test-backport.patch new file mode 100644 index 000000000000..74d2d14134d5 --- /dev/null +++ b/dev-python/redis-py/files/redis-py-2.10.5-test-backport.patch @@ -0,0 +1,24 @@ +From 550eee8106ca5984f104b3a2a79299d9ae0821af Mon Sep 17 00:00:00 2001 +From: Chris Lamb <chris@chris-lamb.co.uk> +Date: Tue, 18 Aug 2015 13:28:40 +0200 +Subject: [PATCH] Fix tests under Redis 3.x; we can be of an "embedded string" + format now. + +Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk> +--- + tests/test_commands.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test_commands.py b/tests/test_commands.py +index 2e104ed..c0e56b0 100644 +--- a/tests/test_commands.py ++++ b/tests/test_commands.py +@@ -112,7 +112,7 @@ def test_object(self, r): + r['a'] = 'foo' + assert isinstance(r.object('refcount', 'a'), int) + assert isinstance(r.object('idletime', 'a'), int) +- assert r.object('encoding', 'a') == b('raw') ++ assert r.object('encoding', 'a') in (b('raw'), b('embstr')) + assert r.object('idletime', 'invalid-key') is None + + def test_ping(self, r): diff --git a/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch b/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch new file mode 100644 index 000000000000..1a807480dfb0 --- /dev/null +++ b/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch @@ -0,0 +1,19 @@ + setup.py | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/setup.py b/setup.py +index ed8fd5f..ab648a3 100644 +--- a/setup.py ++++ b/setup.py +@@ -9,11 +9,6 @@ try: + from setuptools.command.test import test as TestCommand + + class PyTest(TestCommand): +- def finalize_options(self): +- TestCommand.finalize_options(self) +- self.test_args = [] +- self.test_suite = True +- + def run_tests(self): + # import here, because outside the eggs aren't loaded + import pytest diff --git a/dev-python/redis-py/redis-py-2.10.5.ebuild b/dev-python/redis-py/redis-py-2.10.5.ebuild new file mode 100644 index 000000000000..cfc6a77ff507 --- /dev/null +++ b/dev-python/redis-py/redis-py-2.10.5.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +MY_PN="redis" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Python client for Redis key-value store" +HOMEPAGE="https://github.com/andymccurdy/redis-py" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND="" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-db/redis + >=dev-python/pytest-2.5.0[${PYTHON_USEDEP}] )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${P}-test-finalize.patch +) + +python_prepare_all() { + distutils-r1_python_prepare_all + + # Make sure that tests will be used from BUILD_DIR rather than cwd. + mv tests tests-hidden || die + + # Correct local import patch syntax + sed -e 's:from .conftest:from conftest:' \ + -i tests-hidden/{test_connection_pool.py,test_commands.py,test_encoding.py,test_pubsub.py} \ + || die +} + +python_compile() { + distutils-r1_python_compile + + if use test; then + cp -r tests-hidden "${BUILD_DIR}"/tests || die + fi +} + +python_test() { + local sock="${T}/redis.sock" + + "${EPREFIX}/usr/sbin/redis-server" - <<- EOF + daemonize yes + pidfile "${T}/redis.pid" + unixsocket ${sock} + EOF + + PYTHONPATH="${S}:${S}/tests-hidden" + esetup.py test --verbose + kill $(<"${T}/redis.pid") +} diff --git a/dev-python/regendoc/regendoc-0.5.ebuild b/dev-python/regendoc/regendoc-0.5.ebuild index 4120852391d6..d0517ffbca2a 100644 --- a/dev-python/regendoc/regendoc-0.5.ebuild +++ b/dev-python/regendoc/regendoc-0.5.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://pypi.python.org/pypi/RegenDoc http://bitbucket.org/pytest-dev/ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz" LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" RDEPEND="dev-python/click[${PYTHON_USEDEP}]" diff --git a/dev-python/requests/requests-2.8.1.ebuild b/dev-python/requests/requests-2.8.1.ebuild index 85fa541b884d..a1c67484ce7a 100644 --- a/dev-python/requests/requests-2.8.1.ebuild +++ b/dev-python/requests/requests-2.8.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="test" # bundles dev-python/urllib3 snapshot diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild index e4ab14d3e66b..d5c4809be41b 100644 --- a/dev-python/retrying/retrying-1.3.3.ebuild +++ b/dev-python/retrying/retrying-1.3.3.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="" DEPEND=" diff --git a/dev-python/rply/rply-0.7.3.ebuild b/dev-python/rply/rply-0.7.3.ebuild index a7262a51d92c..91bd3bbcb47b 100644 --- a/dev-python/rply/rply-0.7.3.ebuild +++ b/dev-python/rply/rply-0.7.3.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest index 53c74fc6c326..9235ac0acc95 100644 --- a/dev-python/rpy/Manifest +++ b/dev-python/rpy/Manifest @@ -1,2 +1,3 @@ DIST rpy2-2.6.2.tar.gz 171655 SHA256 2e28886b2a6a138cfc057f9b7cddade253e61c9abb43f0eae20dace58b6dfced SHA512 7a060ccc26a03dc93d75edb85d92f1ab31af96ba140932ff8e699cd5855e6078b1e0ffceed135d32deb6c8f273ebcc8b02be38e9b8fc66778cc2adab5745f542 WHIRLPOOL 26d9a9c13e4efa22a232507cfff0b13d650e0528f635dfa9fe464cde50462d2d94a668d1566b537bafaa5462eb66e96005296c6295308b1e3d1c5639da2879b6 DIST rpy2-2.7.2.tar.gz 176481 SHA256 b8c376c2bb78a602effa44c654633f7a11b9bcc582aa3d4828a11302bc290e21 SHA512 d282e81cdd4c69ac4655d019151e2c7ce0aaeeb55479f7f7405ed16ac4124d2f3eedccb37a7d563deb0d8beb69e5ede4d6702a3872b554965442a38ec545f1f4 WHIRLPOOL f19182a1ef392d1b4029ebd984d8828d92ea3bf14c9375490fa099d7a2f82e99c75eb6475dba1d11270bf76dc94eee490157e22ab2c083c51a90b3c1d1a56b7a +DIST rpy2-2.7.3.tar.gz 176854 SHA256 fc66a4efa113b48ac32cd4578d5fce551722cd64c5eadafdcab36f074e9e785c SHA512 dd0e5eb896bf809d4d342f7927c5bc014b78352df87219d9d0839622647c35f256a256593d526be2faf369ccd98d74868e1b6b3c99ebc830d08fa4cfb8c35121 WHIRLPOOL 735eb08c1528c27f2362d42e08cf9ff5c31cbcdf706eefb873921ed9eaeab4d9004b80335d36672b3711dd8a8515d51d451a1f66bebe4a4d4c9ef1f32e758685 diff --git a/dev-python/rpy/rpy-2.7.3.ebuild b/dev-python/rpy/rpy-2.7.3.ebuild new file mode 100644 index 000000000000..da88f145ec91 --- /dev/null +++ b/dev-python/rpy/rpy-2.7.3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) +PYTHON_REQ_USE="sqlite" + +inherit distutils-r1 flag-o-matic + +MYSLOT=2 +MY_PN=${PN}${MYSLOT} +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Python interface to the R Programming Language" +HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND=" + >=dev-lang/R-3.1 + dev-python/numpy[${PYTHON_USEDEP}] + >=dev-python/pandas-0.13.1[${PYTHON_USEDEP}] + virtual/python-singledispatch[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( $(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' python2_7 python3_3) )" +PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]" + +# ggplot2 is an optional test dep but not in portage +S="${WORKDIR}/${MY_P}" + +# Tarball absent of doc files in doc folder +# https://bitbucket.org/rpy2/rpy2/issues/229 + +python_compile() { + if ! python_is_python3; then + local CFLAGS=${CFLAGS} + append-cflags -fno-strict-aliasing + fi + distutils-r1_python_compile +} + +python_test() { + cd "${BUILD_DIR}"/lib || die + ${PYTHON} -m 'rpy2.tests' || die +} diff --git a/dev-python/scientificpython/scientificpython-2.9.1.ebuild b/dev-python/scientificpython/scientificpython-2.9.1.ebuild index b8619890c09f..90b402ad7ff1 100644 --- a/dev-python/scientificpython/scientificpython-2.9.1.ebuild +++ b/dev-python/scientificpython/scientificpython-2.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,7 +18,7 @@ HOMEPAGE="http://sourcesup.cru.fr/projects/scientific-py/" LICENSE="CeCILL-2" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="doc mpi test" RDEPEND=" diff --git a/dev-python/scientificpython/scientificpython-2.9.4.ebuild b/dev-python/scientificpython/scientificpython-2.9.4.ebuild index 93af0d21a04a..357c2ffdb03f 100644 --- a/dev-python/scientificpython/scientificpython-2.9.4.ebuild +++ b/dev-python/scientificpython/scientificpython-2.9.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -51,7 +51,7 @@ python_compile() { python_test() { cd "${S}"/Tests || die - python_foreach_impl nosetests + nosetests -v -v || die } python_install() { diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 128a22cf66bf..130a687df378 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -11,6 +11,7 @@ DIST setuptools-18.1.tar.gz 630700 SHA256 ad52a9d5b3a6f39c2a1c2deb96cc4f6aff29d6 DIST setuptools-18.2.tar.gz 630990 SHA256 0994a58df27ea5dc523782a601357a2198b7493dcc99a30d51827a23585b5b1d SHA512 964449faecce8b039343ea4364e73e035b7a99ba425939c07ee86c2db75b3b34ddbfc5d03b468ee11266eed74208b2038b3785332ff90d74087ee1d45620912e WHIRLPOOL d05c8a6f06e33efbe007a9ab1bdc9fa867f9b761510134b3580b1cedde16ae17b01ef43942d5c7e0a86e1deb605fb0f6cb08eafa43f853b0cfcb3482365bae1e DIST setuptools-18.3.2.tar.gz 626607 SHA256 8c4ab0c4f227730519dc1e020f875b3ef97e643c8f43a98a4fa0c46fbad12450 SHA512 0af522af1dc783e4d6b84c44d3cf4205aed75815bfc050ea89c4976434f08edd662501c4063b1618c0ce7a7120bcbd5331818d3f06912aa9136736018ec4b6a1 WHIRLPOOL 0b5275bbe6b595ebc88ba33bd0a344d3b7a9a63a81677449f862b51f10e16a1be4d4c97ff8f287299f1e0573e058c3f8fb5a0fc6e5643ac7137c2aa401397492 DIST setuptools-18.4.tar.gz 626632 SHA256 cdea5098e60b4ad83453d58723a61dc481ca8e2df251fe4ccbea9afa5a7d111f SHA512 f45f0bdec365642d1648c502a964bafeb518e8f0ed63091a50b278629cf1e17df7f66769b0ddaab1e7c5ae2574673435ccab72886a2d5eb311eaac451c485854 WHIRLPOOL e0c5d69f57ce234b0e002a50c882df0bf1e908224c045baa8b5a62e91148d654f048cfbb64375b59f61f0845a5e850ec03594606933fdfaa9cce9b357bb45aa7 +DIST setuptools-18.5.tar.gz 626892 SHA256 4846755f18c0528d87583342d5e1221052858ce9922c5c38acbadd5015bd683d SHA512 d902b7e35c99d21e243168072bc96c07f88a7463e50035ba72d7e10818777e83ce534e4dab2ae0425620791f95f3d8cb2f9d9142be1ea24f05100d85d0d44835 WHIRLPOOL f3cabbc4bda9964bc00eba392e04605c99c1927fa96482ac55e21b1af7271b8a1c102017dea0b615ab02ca0f7219d9a8eab3b83eef6895d8b35f6bcbe4ed7747 DIST setuptools-2.2.tar.gz 786831 SHA256 6fb1f21dea64e323e7ad2531a6795eeb6f5e17a85189dee61a86baca60b18984 SHA512 b5472e20f13c62ddc06513a964d8d85230a6cb8f4b0a6bc05c57d42aa3e682a850418246b5c1d769dba0cea18d7b262817f743b49a73383157a6b76d5637c296 WHIRLPOOL 6377efcf56082fdbea79cba7ae7c7d125d2368ea2309c9d655e4a568d40c8a6c9673dc1db63a2cb1f143436da411e664281ba239a058b5dff91b99cd2b5b332d DIST setuptools-7.0.tar.gz 793737 SHA256 dd9c1a2a0fdf37a7b142626700e0a0b7a3a0657b735c50d367fca932803be061 SHA512 0c52bf2d22f7bbd7560e8bb3184406426cf759980add0e60a864f15d9bcf10f01a2bfe0eb598c8c965b2e89df8c4159c2b43028b560f04192bba47e67d9cda18 WHIRLPOOL 70c0076960af3c00d49f79d5a0c3e3ec47a0b5009a20377cb7eca1e0747d6249d433ae14a0b86e5ac1f3bcc1efd99b68e48bd741458389c27ea05406af64e55f DIST setuptools-8.0.1.tar.gz 801353 SHA256 ab8eb279ca9062efc7e70f74a35f3dd9315835139ecaf3ae5bfdf4a7dc768e30 SHA512 c86a2c6ae5ed8205b9b37911002a8f551f2607ecab8b74b9eae6a7b92713c0d0a3d6aa54c4428df48765c1a2c9e21f53128bb1f138f7753e1f45188b0e357ff2 WHIRLPOOL 0ee70ee0a00118cb41005f77614bade6d5198a9164718bd7bb595b5cea0456ff829ac48cc8113c91d2f7830c4b4e9f4bd73245393621ae87e581b1e9b497f95d diff --git a/dev-python/setuptools/setuptools-18.4.ebuild b/dev-python/setuptools/setuptools-18.4.ebuild index d57da6bd7d2a..bdf35e056bd8 100644 --- a/dev-python/setuptools/setuptools-18.4.ebuild +++ b/dev-python/setuptools/setuptools-18.4.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="PSF-2" 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" IUSE="test" RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]" diff --git a/dev-python/setuptools/setuptools-18.5.ebuild b/dev-python/setuptools/setuptools-18.5.ebuild new file mode 100644 index 000000000000..d57da6bd7d2a --- /dev/null +++ b/dev-python/setuptools/setuptools-18.5.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Collection of extensions to Distutils" +HOMEPAGE="https://pypi.python.org/pypi/setuptools" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="PSF-2" +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" +IUSE="test" + +RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ) +" +PDEPEND=">=dev-python/certifi-2015.04.28[${PYTHON_USEDEP}]" + +# Force in-source build because build system modifies sources. +DISTUTILS_IN_SOURCE_BUILD=1 + +DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) + +python_prepare_all() { + rm -r ./pkg_resources/_vendor || die + # disable tests requiring a network connection + rm setuptools/tests/test_packageindex.py || die + + # don't run integration tests + rm setuptools/tests/test_integration.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg + # It tries to sandbox the test in a tempdir + HOME="${PWD}" py.test ${PN} || die "Tests failed under ${EPYTHON}" +} + +python_install() { + export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 + distutils-r1_python_install +} diff --git a/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild index 784a6dfc876c..aa5ba815a261 100644 --- a/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild +++ b/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="test" DEPEND=" diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest index a88198225085..1fbe8389a424 100644 --- a/dev-python/simplejson/Manifest +++ b/dev-python/simplejson/Manifest @@ -1,2 +1,3 @@ DIST simplejson-3.7.2.tar.gz 74877 SHA256 8358ecc05541be4068109acf26a4ae89ba14450d20e92e0973d0d67bea3d7431 SHA512 5e2874c4d627035b3e205b5208b46beb172ac934742b0cb68f43f70aa2f401ec568c2b69fccdb1d870bf5196df0f6e37b790332a6e4d7969a296c8c104bdfe0b WHIRLPOOL 26f5e23250031d9b20b121a7110a1b623f32128721281b2554f2727f815b03b39b0680d21b41bb8729288f2774d38e92301bcf72188d054aa03497818edefdca DIST simplejson-3.8.0.tar.gz 75875 SHA256 217e4797da3a9a4a9fbe6722e0db98070b8443a88212d7acdbd241a7668141d9 SHA512 c985a0f56170f78b6c6e8f0e4b4bf50f258c8f2639524f5b14d8e07b547e336acf96ac55cf562243fff06752ceba4a05f1e6dd43f6c918159a7b3640af0f0c1d WHIRLPOOL 368779f57bc1186d3b30ae80f74d0eca50709dfe6063d52c359d665eaacc9caa751fbbb9f4437e8bf8908f3569f85424632208d8f7c6146ebc8e8cc9c77b723d +DIST simplejson-3.8.1.tar.gz 76033 SHA256 428ac8f3219c78fb04ce05895d5dff9bd813c05a9a7922c53dc879cd32a12493 SHA512 9c135347a015f5fbb4373da61282230430320c89bc1114f7487eb632bccbe29a4b2c396d724c6c72af5c7df78f1676869a037be9d137b4f29f18e82a9eb2b1f5 WHIRLPOOL 8441ccaff4e4115d58461f528179c4fc25139b5f7f86cc85826798e392e664154468f1fa2471f18fc7bd518adf06a75b493218765ca4df022d92e6ee24552e38 diff --git a/dev-python/simplejson/simplejson-3.8.1.ebuild b/dev-python/simplejson/simplejson-3.8.1.ebuild new file mode 100644 index 000000000000..2a26c77f94e8 --- /dev/null +++ b/dev-python/simplejson/simplejson-3.8.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 ) + +inherit distutils-r1 flag-o-matic + +DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python" +HOMEPAGE="http://undefined.org/python/#simplejson https://pypi.python.org/pypi/simplejson" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="|| ( MIT AFL-2.1 )" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +DOCS=( README.rst CHANGES.txt ) + +python_compile() { + if ! python_is_python3; then + local CFLAGS=${CFLAGS} + append-cflags -fno-strict-aliasing + fi + distutils-r1_python_compile +} + +python_test() { + esetup.py test +} diff --git a/dev-python/simplekv/Manifest b/dev-python/simplekv/Manifest index 2503d42448bf..ff5ece66bbc4 100644 --- a/dev-python/simplekv/Manifest +++ b/dev-python/simplekv/Manifest @@ -1,2 +1,3 @@ +DIST simplekv-0.10.0.tar.gz 16142 SHA256 61ea1b6deba90c459b2b886598a86af324f7182f90f9f9b85a02f6a017618915 SHA512 58cf95e963631d11f55fa654e3a536ea5ce3deb8f9abefc05c2eb192fd87cd7cc5ff54d17da3651289d4fe1b7e827f82a27ee77e62df87e7f0b5a39f4067389d WHIRLPOOL bb5f2dc027ca363f1501c5c25c04281d4001807aa5dcda359410e147a387650c06e416b58b008f6ffaf4f176086026a5ed93b1764753a5b5ff26a79c9e8ac4b2 DIST simplekv-0.9.2.tar.gz 13750 SHA256 448608199a9f76a25529005b5a28a4e548afd623e2b7109563b9ebe6ef4f3aac SHA512 cfa17cc0920d4a0513c56443c30ed07a77130f689d71130a058e2a46a5b9dbfc22b1fd21d6fee973fc00242c6b9391143a4db91f9c1937ea7f64daa898a8f045 WHIRLPOOL 40f62efaba344aed99b3e6bae80eb22021a93958654a2fe2d881ece808a93f830923fbd2f00d96adb46442d6bcf3c66a71fc805a49f46e331db10df24c1b2621 DIST simplekv-0.9.3.tar.gz 14585 SHA256 f82e11b42222c13201ff7bc97b4684953287150e8c51c28b0028be489bb214d1 SHA512 1d83c485b4e3d28ce2e0080b6ef424393ea26ae9fcce75a0852b07d66bcf134815e292b590f1a1ff4083b5202633d2cf837a5ebd7b577353ae94a0be5491436b WHIRLPOOL 3793ba874530087854a57613504c6344bcb69c41bb49268f7e92edd02c54979ee5b08308bc9651c4983b756d7057398d837cf8366cef8d37114528630c971340 diff --git a/dev-python/simplekv/simplekv-0.10.0.ebuild b/dev-python/simplekv/simplekv-0.10.0.ebuild new file mode 100644 index 000000000000..b8f7adc27a9b --- /dev/null +++ b/dev-python/simplekv/simplekv-0.10.0.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +PYTHON_COMPAT=( python{2_7,3_4} ) + +inherit distutils-r1 + +DESCRIPTION="A key-value storage for binary data, support many backends." +HOMEPAGE="https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="" +RDEPEND="" diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild index 465102afe7fe..13c3c8af2599 100644 --- a/dev-python/six/six-1.10.0.ebuild +++ b/dev-python/six/six-1.10.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc test" DEPEND=" @@ -26,6 +26,16 @@ PATCHES=( "${FILESDIR}"/1.9.0-mapping.patch ) +python_prepare_all() { + # https://bitbucket.org/gutworth/six/issues/139/ + sed \ + -e 's:test_assertCountEqual:_&:g' \ + -e 's:test_assertRegex:_&:g' \ + -e 's:test_assertRaisesRegex:_&:g' \ + -i test_six.py || die + distutils-r1_python_prepare_all +} + python_compile_all() { use doc && emake -C documentation html } diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild index 052d121f9dd0..c65527da7486 100644 --- a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild +++ b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild @@ -14,5 +14,5 @@ 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" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" IUSE="" diff --git a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild index b241fddc8f64..69407e0780a6 100644 --- a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild +++ b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_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" +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 latex test" RDEPEND=" diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest index 3b26909a8096..195bdd9dfbb1 100644 --- a/dev-python/sphinx_rtd_theme/Manifest +++ b/dev-python/sphinx_rtd_theme/Manifest @@ -1,2 +1 @@ -DIST sphinx_rtd_theme-0.1.6.tar.gz 217067 SHA256 0f29f544f6d037989fa0c7729a9eab7e4d8ea50d6f0ef37363f472756c1edca6 SHA512 f79e8192264ef01675240853e9be8a5bd0c86808f0e918e60c7c6e0c078caeef87c76421db795149214ef4edc1389e7c2001a98436611292ff826e7b9b9d0f15 WHIRLPOOL 110494f3c9bb6e838557fa4bcb1ac8f33e91b30d2da780720e897cfc4f635c0a14f502d5aac50115495bcc591de79eae83a2e359b81b917e524c9459194420f6 DIST sphinx_rtd_theme-0.1.9.tar.gz 698461 SHA256 273846f8aacac32bf9542365a593b495b68d8035c2e382c9ccedcac387c9a0a1 SHA512 e793a4da6209c26acb261efd03e6591561d7fbad97b3d7ab0a105e125a15a035d2066a1b1572a95954304d361abec39d9e1e401cd7200c6206cc8c89ad134d0f WHIRLPOOL 77edc637b20b86a0273c9365fabdec7712dc40e6dae8533085c6c1f6261df9b0ada32f8b0d0d818f2c20902ce1c6619d9fe534da9c524f034638fb729a204052 diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild index a4080a486060..5e8f6764036b 100644 --- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild +++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/stormpath/Manifest b/dev-python/stormpath/Manifest index 25c04ea78742..7fd05427d38f 100644 --- a/dev-python/stormpath/Manifest +++ b/dev-python/stormpath/Manifest @@ -1,3 +1,3 @@ -DIST stormpath-2.0.8.tar.gz 4326469 SHA256 9f6ad7e7b210024915e2139b2ed395a7c0fff6ca49ad3cdf58dc8f214d080c70 SHA512 661714fac02528111bb01e30f8c16b1d8701fe894b21d803958331819ce145a9ec03864111b861286224b33aaf56ca68ddcef2b67cd0003c498cd007ce375a03 WHIRLPOOL 12e6f7ec559a654ab59d34106d85d98ada4c7e3dee6fcec6cad0a2500608e962289d73a50e6ce6d81122c43f0f53b30d861203c8a976ac7bdbdab1cd8f5db6be DIST stormpath-2.0.9.tar.gz 4325976 SHA256 ba93f1f9f6b98db2eb2671d2b3285fdd15f8b2e6d3bce899f240576018f216ae SHA512 b50fa11e8fecf4909a8a1014963c80e7e2dde4db37e1f4681c2a116933d59f5b5ea32901cfde97b24398d8074db8b04121b2a7715d86b6b2eb78eb288465114c WHIRLPOOL 6290d5844d35158cc46f1810b6f83e41c443164cff4512caeeb38e562b04f448c1ac1b608b2cda4abd348f91319e4e8fbb3b195ba31a8fb415ba80f0ed7c5937 DIST stormpath-2.1.1.tar.gz 4326557 SHA256 94600e8368f2fbe06adea5fddc8f4b7a479f7a89a0a35a46f58f7c796286e5f4 SHA512 7548aff63e5f04718d4d4887a1177f6f0cf3cc8cb9588e17f7563bae9c6dc5897a968ee2c4e189b6d9100ef16ec7e34e524c4cd3c5112845c0619876ca6d5505 WHIRLPOOL 33db1d8e52d24581a1fe7220b4329479142772939d1df76d52a46d47db6219890fde3204655dd65851d43b38e2427cd32df894392948482d85554772b9f12bbf +DIST stormpath-2.1.2.tar.gz 4337164 SHA256 10f46c7ebb27274f61c4b550eb6fc58e54260fa0fb1f96a4b7fce530d789d11c SHA512 c3b3e93f4d5515df8e5ab94770c995a5e7912a53f58f05ca3a1f630c41fc0f76e39cf213dbfad8858d7bfe5f964f6d9cbfad9013de33e9a02e0484bd92a7957d WHIRLPOOL adfbf1cf071167a93989cd4d80039a4eb8c42a908075207a4db4db3a38c87e3b9470b9c1c02946e9481e52d875e836d0c77a72050de2a1f79fc78b5ed037dfe2 diff --git a/dev-python/stormpath/stormpath-2.0.8.ebuild b/dev-python/stormpath/stormpath-2.1.2.ebuild index ba2db58621b8..e6bdfe5b1541 100644 --- a/dev-python/stormpath/stormpath-2.0.8.ebuild +++ b/dev-python/stormpath/stormpath-2.1.2.ebuild @@ -19,9 +19,7 @@ IUSE="doc test" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - ) + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/pytest-cov[${PYTHON_USEDEP}] @@ -29,6 +27,7 @@ DEPEND=" ) " RDEPEND=" + >=dev-python/isodate-0.5.4[${PYTHON_USEDEP}] >=dev-python/oauthlib-0.6.3[${PYTHON_USEDEP}] >=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}] >=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}] @@ -37,14 +36,6 @@ RDEPEND=" >=dev-python/six-1.6.1[${PYTHON_USEDEP}] " -python_prepare_all() { - local PATCHES=( - "${FILESDIR}"/drop-test-module.patch - ) - - distutils-r1_python_prepare_all -} - python_compile_all() { use doc && emake -C docs html } diff --git a/dev-python/subunit/subunit-1.2.0.ebuild b/dev-python/subunit/subunit-1.2.0.ebuild index 66e8ef9128a5..65218341fc6a 100644 --- a/dev-python/subunit/subunit-1.2.0.ebuild +++ b/dev-python/subunit/subunit-1.2.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/$(get_version_component_range 1-2)/+d LICENSE="Apache-2.0 BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" IUSE="static-libs test" RDEPEND=" diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest index c43948ed69c9..982cbf508ef7 100644 --- a/dev-python/testrepository/Manifest +++ b/dev-python/testrepository/Manifest @@ -1,3 +1,2 @@ -DIST testrepository-0.0.17.tar.gz 84255 SHA256 70b70e0ba6aacb44036ed5dcbdbe36008816fc7098c2e3e4891734fc09ecd36e SHA512 c5b7a0a0b6494166f85be86a85821d36922e754e02a487605b5e6cf2ae52ff1f9c37b48bd07f7acc1d9dc9450fcf17311f5ffb6bb8bd31d7a26f5c53de88f94d WHIRLPOOL 0fe9a003af396462d9aa73a73da2f0253fd247e4025ae9dc0047e3fdf02d872189eaf96416750206612419d048eeeb49699a54c6cf1b95fa66cc444b5fbd05fe DIST testrepository-0.0.18.tar.gz 84886 SHA256 ba15301c6ec6bf1b8e0dad10ac7313b11e17ceb8d28ec4a3625c9aaa766727fd SHA512 4e90db6364f77f464ae063020b016367529588f581af001c2564bf4babb264fc37bb7231413725211c6d483a269360d86201f81d2b24d7eb162dca2463d13c92 WHIRLPOOL c6ced39884ea731173b59a0cbd283d474b3a658e94e2f94a87b5b5e8461d82790cfda2d3e834d51e90b6e57299163cf2dc9ef2cb62440104ac6a046039196abb DIST testrepository-0.0.20.tar.gz 84956 SHA256 752449bc98c20253ec4611c40564aea93d435a5bf3ff672208e01cc10e5858eb SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6 WHIRLPOOL 12be50a78a79b0c1aa43d4a2c97055a3956f85653e36ab56a9eedc0c2f80bf0860b702e62627055a72e9ddfe9812bd916e4c4adbe50df02bd94b911b9c0b7d0c diff --git a/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch b/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch new file mode 100644 index 000000000000..112b0299df54 --- /dev/null +++ b/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch @@ -0,0 +1,41 @@ +diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py +index e2e5e05..4a8667b 100644 +--- a/testrepository/tests/test_repository.py ++++ b/testrepository/tests/test_repository.py +@@ -28,6 +28,7 @@ + from testresources import TestResource + from testtools import ( + clone_test_with_new_id, ++ content, + PlaceHolder, + ) + import testtools +@@ -103,19 +104,24 @@ class Case(ResourcedTestCase): + def passing(self): + pass + +- def failing(self): +- self.fail("oops") +- + def unexpected_success(self): + self.expectFailure("unexpected success", self.assertTrue, True) + + ++class FailingCase: ++ ++ def run(self, result): ++ result.startTest(self) ++ result.addError( ++ self, None, details={'traceback': content.text_content("")}) ++ result.stopTest(self) ++ + def make_test(id, should_pass): + """Make a test.""" + if should_pass: + case = Case("passing") + else: +- case = Case("failing") ++ case = FailingCase() + return clone_test_with_new_id(case, id) + + diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch new file mode 100644 index 000000000000..7622c0abfa43 --- /dev/null +++ b/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch @@ -0,0 +1,71 @@ +From 8f8ab15fafdad6db850c84772323b32375b09285 Mon Sep 17 00:00:00 2001 +From: Robert Collins <robertc@robertcollins.net> +Date: Tue, 10 Mar 2015 15:21:49 +1300 +Subject: [PATCH] Fixup tests with latest testtools. + +Testtools has started chunking exceptions (which is perhaps good, +perhaps bad) - but we shouldn't depend on the exact behaviour in it +for our tests. +--- + NEWS | 6 ++++++ + testrepository/tests/test_repository.py | 14 ++++++++++---- + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/NEWS b/NEWS +index e258b11..536308c 100644 +--- a/NEWS ++++ b/NEWS +@@ -5,6 +5,12 @@ testrepository release notes + NEXT (In development) + +++++++++++++++++++++ + ++CHANGES ++------- ++ ++* Isolate the testrepository test suite from the chunking (or otherwise) ++ behaviour of testtools' exception handlers. (Robert Collins) ++ + 0.0.20 + ++++++ + +diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py +index e2e5e05..4a8667b 100644 +--- a/testrepository/tests/test_repository.py ++++ b/testrepository/tests/test_repository.py +@@ -28,6 +28,7 @@ + from testresources import TestResource + from testtools import ( + clone_test_with_new_id, ++ content, + PlaceHolder, + ) + import testtools +@@ -103,19 +104,24 @@ class Case(ResourcedTestCase): + def passing(self): + pass + +- def failing(self): +- self.fail("oops") +- + def unexpected_success(self): + self.expectFailure("unexpected success", self.assertTrue, True) + + ++class FailingCase: ++ ++ def run(self, result): ++ result.startTest(self) ++ result.addError( ++ self, None, details={'traceback': content.text_content("")}) ++ result.stopTest(self) ++ + def make_test(id, should_pass): + """Make a test.""" + if should_pass: + case = Case("passing") + else: +- case = Case("failing") ++ case = FailingCase() + return clone_test_with_new_id(case, id) + + diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch new file mode 100644 index 000000000000..193b91e1cd3d --- /dev/null +++ b/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch @@ -0,0 +1,22 @@ +From d3d6cac4fd42f2067c0dd81be748853f81c348fc Mon Sep 17 00:00:00 2001 +From: Robert Collins <robertc@robertcollins.net> +Date: Sun, 12 Jul 2015 21:37:34 +1200 +Subject: [PATCH] Fix 3.3+ tests with nested classnames. + +--- + testrepository/tests/ui/test_cli.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testrepository/tests/ui/test_cli.py b/testrepository/tests/ui/test_cli.py +index 9ba11ad..e1f9b44 100644 +--- a/testrepository/tests/ui/test_cli.py ++++ b/testrepository/tests/ui/test_cli.py +@@ -157,7 +157,7 @@ def method(self): + self.assertThat(ui._stdout.buffer.getvalue().decode('utf8'), + DocTestMatches("""\ + ====================================================================== +-FAIL: testrepository.tests.ui.test_cli.Case.method ++FAIL: testrepository.tests.ui.test_cli...Case.method + ---------------------------------------------------------------------- + ...Traceback (most recent call last):... + File "...test_cli.py", line ..., in method diff --git a/dev-python/testrepository/testrepository-0.0.17-r1.ebuild b/dev-python/testrepository/testrepository-0.0.17-r1.ebuild deleted file mode 100644 index 7f8d670c3816..000000000000 --- a/dev-python/testrepository/testrepository-0.0.17-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# Although package supports alt. py impls, only works fully under py2.7 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="A repository of test results" -HOMEPAGE="https://launchpad.net/testscenarios" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/subunit[${PYTHON_USEDEP}] - >=dev-python/testtools-0.9.30[${PYTHON_USEDEP}] - dev-python/fixtures[${PYTHON_USEDEP}] - dev-python/testresources[${PYTHON_USEDEP}] - dev-python/testscenarios[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - )" -#bzr is listed but presumably req'd for a live repo test run -RDEPEND=" - dev-python/subunit[${PYTHON_USEDEP}] - >=dev-python/testtools-0.9.30[${PYTHON_USEDEP}] - dev-python/fixtures[${PYTHON_USEDEP}]" - -python_test() { - "${PYTHON}" ./testr init || die - "${PYTHON}" ./testr run || die "tests failed under python2.7" -} diff --git a/dev-python/testrepository/testrepository-0.0.17-r2.ebuild b/dev-python/testrepository/testrepository-0.0.17-r2.ebuild deleted file mode 100644 index d66490e91c63..000000000000 --- a/dev-python/testrepository/testrepository-0.0.17-r2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3} ) - -inherit distutils-r1 - -DESCRIPTION="A repository of test results" -HOMEPAGE="https://launchpad.net/testscenarios" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="test" - -#>=dev-python/subunit-0.0.10[${PYTHON_USEDEP}] -#>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}] -#dev-python/fixtures[${PYTHON_USEDEP}] -#bzr is listed but presumably req'd for a live repo test run -RDEPEND=" - >=dev-python/subunit-0.0.10[${PYTHON_USEDEP}] - >=dev-python/testtools-0.9.30[${PYTHON_USEDEP}] - dev-python/fixtures[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( ${RDEPEND} - dev-python/testresources[${PYTHON_USEDEP}] - dev-python/testscenarios[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - )" - -# Required for test phase -DISTUTILS_IN_SOURCE_BUILD=1 - -python_test() { - "${PYTHON}" ./testr init || die - esetup.py testr --coverage -} diff --git a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild index 3771a4137fae..0b287e877a49 100644 --- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild +++ b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild @@ -34,9 +34,15 @@ DEPEND=" # Required for test phase DISTUTILS_IN_SOURCE_BUILD=1 +PATCHES=( + "${FILESDIR}"/${P}-test-backport.patch + "${FILESDIR}"/${PN}-0.0.20-test-backport1.patch +) + python_test() { # some errors appear to have crept in the suite undert py3 since addition. # Python2.7 now passes all. - esetup.py testr --coverage + ${PYTHON} testr init || die + ${PYTHON} testr run || die } diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild index ae10b32407ea..f9e97746ada3 100644 --- a/dev-python/testrepository/testrepository-0.0.20.ebuild +++ b/dev-python/testrepository/testrepository-0.0.20.ebuild @@ -34,9 +34,15 @@ DEPEND=" # Required for test phase DISTUTILS_IN_SOURCE_BUILD=1 +PATCHES=( + "${FILESDIR}"/${P}-test-backport.patch + "${FILESDIR}"/${P}-test-backport1.patch +) + python_test() { # some errors appear to have crept in the suite undert py3 since addition. # Python2.7 now passes all. - esetup.py testr + ${PYTHON} testr init || die + ${PYTHON} testr run || die } diff --git a/dev-python/testresources/testresources-0.2.7-r2.ebuild b/dev-python/testresources/testresources-0.2.7-r2.ebuild index d727cc791501..5a0dcc4b04a6 100644 --- a/dev-python/testresources/testresources-0.2.7-r2.ebuild +++ b/dev-python/testresources/testresources-0.2.7-r2.ebuild @@ -26,6 +26,13 @@ DEPEND=" )" RDEPEND="" +python_prepare_all() { + sed \ + -e 's:testBasicSortTests:_&:g' \ + -i lib/testresources/tests/test_optimising_test_suite.py || die + distutils-r1_python_prepare_all +} + python_test() { - nosetests || die "Tests failed under ${EPYTHON}" + nosetests --verbose || die "Tests failed under ${EPYTHON}" } diff --git a/dev-python/testscenarios/testscenarios-0.5.0.ebuild b/dev-python/testscenarios/testscenarios-0.5.0.ebuild index bbf5cf829f85..baa2f9af1693 100644 --- a/dev-python/testscenarios/testscenarios-0.5.0.ebuild +++ b/dev-python/testscenarios/testscenarios-0.5.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} diff --git a/dev-python/testtools/testtools-1.8.0.ebuild b/dev-python/testtools/testtools-1.8.0.ebuild index 33679b9901e0..543a4b9ee4e3 100644 --- a/dev-python/testtools/testtools-1.8.0.ebuild +++ b/dev-python/testtools/testtools-1.8.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="doc test" CDEPEND=" @@ -37,6 +37,9 @@ PATCHES=( "${FILESDIR}"/${P}-twisted-backport2.patch ) +# https://github.com/testing-cabal/testtools/issues/156 +RESTRICT=test + python_compile_all() { use doc && emake -C doc html } diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild index c784cd5a9c54..80fed6be1a74 100644 --- a/dev-python/traceback2/traceback2-1.4.0.ebuild +++ b/dev-python/traceback2/traceback2-1.4.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="PSF-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="" DEPEND=" diff --git a/dev-python/twill/metadata.xml b/dev-python/twill/metadata.xml index 9d2a9281f413..a67d0418f87b 100644 --- a/dev-python/twill/metadata.xml +++ b/dev-python/twill/metadata.xml @@ -6,4 +6,3 @@ twill is a simple language that allows users to browse the Web from a command-line interface. With twill, you can navigate through Web sites that use forms, cookies, and most standard Web features. twill supports automated Web testing and has a simple Python interface. Check out the examples! twill is open source and written in Python. </longdescription> </pkgmetadata> - diff --git a/dev-python/twill/twill-0.9-r1.ebuild b/dev-python/twill/twill-0.9-r1.ebuild index 1d397df7a63c..d69c8f747792 100644 --- a/dev-python/twill/twill-0.9-r1.ebuild +++ b/dev-python/twill/twill-0.9-r1.ebuild @@ -3,6 +3,7 @@ # $Id$ EAPI="5" + PYTHON_COMPAT=( python2_7 pypy ) inherit distutils-r1 @@ -19,18 +20,24 @@ SLOT="0" KEYWORDS="amd64 ~arm ppc ~ppc64 x86" IUSE="doc examples" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7) - $(python_gen_cond_dep 'dev-python/dnspython[${PYTHON_USEDEP}]' python2_7) )" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( + $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7) + || ( + dev-python/dnspython:0[${PYTHON_USEDEP}] + virtual/dnspython:0[${PYTHON_USEDEP}] + ) + )" S="${WORKDIR}/${MY_P}" python_compile_all() { if use doc; then - pushd doc > /dev/null - chmod +x make-epydoc.sh - ./make-epydoc.sh - popd> /dev/null + pushd doc > /dev/null || die + chmod +x make-epydoc.sh || die + ./make-epydoc.sh || die + popd> /dev/null || die fi } diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest index 95aa894eba0a..76c7f4dea3a0 100644 --- a/dev-python/unicodecsv/Manifest +++ b/dev-python/unicodecsv/Manifest @@ -1,5 +1,2 @@ -DIST unicodecsv-0.11.0.tar.gz 9196 SHA256 d7bbbed2a99c2b20db048c8a9c5291b8f6e863280d5e465ecd7a216c6282e37f SHA512 5f82c434a3092a2c4266591e9a0cee9d382c709835c5fbe04576a795024e07e7ac241ccdc09c8319d940b22eed800051a935d3a7e8d92c986c7c4825a641853a WHIRLPOOL 8412dc2e967816e034391bceca97fbccddb7c8d8a8d1e9072ad9a698af3cb13dd9aae6d7f6833cc5310720fba41b99c8957932c3aebbbbada6db7b5a63aa82de -DIST unicodecsv-0.11.1.tar.gz 9251 SHA256 cc1f5af069588b65a05b8ef03b82f6c1b3bd7ced29f7a60c5aced42e1ea84f9c SHA512 4a1f0e0fd1f963df4719e7df7c90357faa55399fbede94e9c1858f6862e4d45266adba81e09faeae0589ddd25be873fecbec6fae305e0b2cc950b5646691368b WHIRLPOOL b4d8a70a850d92624a4065facbc2e45d0b6ae69a135cf9a072a87bf8c1d3710f49d8b8a501f87edccc21c19a2d416e3c746042001f1a7e4c3049140e78ef3aad -DIST unicodecsv-0.12.0.tar.gz 9372 SHA256 b0b7513c33e658cf8e96a55ae18b7be0cf756ca7bfa39b3e4178a1a13edf5e04 SHA512 54a930ecfcec0ef6b91f855fae7e409618a541863953493921ec28f15e26f545c44dab779ee88acb247c28e8e981e958759716337a2ffee63df866f65e4dbd36 WHIRLPOOL 7bacf19554f12931d0f624a53787aa8d9cc394fb7b6cc115b908487419449f06e4b2789dcfd2c451f81ad1a23334e6185deffdf3876ece4c4cb53e8752854379 DIST unicodecsv-0.13.0.tar.gz 9445 SHA256 a913fa13a26b4b25058950f8d6231abee855e8a03a0f265274b3ed30a91034a3 SHA512 c794baac1b165482733faf94bab9284f6f71a1ae999dbd802afc9c906e82e396e98c5f3291f0796c39acec9dc924ad746a94269ac535046fc671351a2db33583 WHIRLPOOL 76b22ad354e004bb970a161d4dcce37fb5373369917a881d9a01d37ac93623e948609cb12270d94f433812cd42eb3f9602c108cf5c09cd471b312ab5a1ecdaa9 -DIST unicodecsv-0.9.4.tar.gz 9070 SHA256 0272570bc2b302093d9ac6e1171fc07862f7ac938146bb6152d8dfe20eeafd9b SHA512 2b0f4a602d68bd8bcbbeb9c7cbd2c9f3b43ca87e73816c40912b75a5c265739902e67b67f9946f1ef572ee99376cecdd7ce5a343216a32a86f25e0860251d828 WHIRLPOOL d3f47eb88ee1dac3fcafc2b9cb22619d310bae9dc6ba467526e7630cea7d57e02ad1139d1e4f6152f9cefc7030aed3d9f61ffec9052f59c44dd5a0108348f638 +DIST unicodecsv-0.14.1.tar.gz 10267 SHA256 018c08037d48649a0412063ff4eda26eaa81eff1546dbffa51fa5293276ff7fc SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9 WHIRLPOOL 2f1927af9c2f1818d88f6e4fd3894e58d920f7d549f151db4281ace879fb4a27cb3bb34388d7bc15e6105639ed8a74ea4274aca4bcca45bdb178d29d2b8311cc diff --git a/dev-python/unicodecsv/metadata.xml b/dev-python/unicodecsv/metadata.xml index 45698f311e27..37731a4e8e11 100644 --- a/dev-python/unicodecsv/metadata.xml +++ b/dev-python/unicodecsv/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/unicodecsv/unicodecsv-0.12.0.ebuild b/dev-python/unicodecsv/unicodecsv-0.12.0.ebuild deleted file mode 100644 index 520eac5b3f04..000000000000 --- a/dev-python/unicodecsv/unicodecsv-0.12.0.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit distutils-r1 - -DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode" -HOMEPAGE="https://pypi.python.org/pypi/unicodecsv" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" diff --git a/dev-python/unicodecsv/unicodecsv-0.13.0.ebuild b/dev-python/unicodecsv/unicodecsv-0.13.0.ebuild index a54770d511fd..0be05aa25db2 100644 --- a/dev-python/unicodecsv/unicodecsv-0.13.0.ebuild +++ b/dev-python/unicodecsv/unicodecsv-0.13.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" # not contained in the release tarball diff --git a/dev-python/unicodecsv/unicodecsv-0.11.0.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild index 01eaab810e38..788e74a7c3ec 100644 --- a/dev-python/unicodecsv/unicodecsv-0.11.0.ebuild +++ b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild @@ -3,18 +3,20 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 ) + +PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy ) inherit distutils-r1 DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode" -HOMEPAGE="https://pypi.python.org/pypi/unicodecsv" +HOMEPAGE="https://pypi.python.org/pypi/unicodecsv https://github.com/jdunck/python-unicodecsv" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~ppc" IUSE="" -RDEPEND="" -DEPEND="${RDEPEND}" +python_test() { + python -m unittest discover +} diff --git a/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild b/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild deleted file mode 100644 index 6f2290f9ed97..000000000000 --- a/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode" -HOMEPAGE="https://pypi.python.org/pypi/unicodecsv" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch b/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch new file mode 100644 index 000000000000..78d71c9dc6eb --- /dev/null +++ b/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch @@ -0,0 +1,28 @@ +diff --git a/unittest2/test/test_loader.py b/unittest2/test/test_loader.py +index 683f662..347eea5 100644 +--- a/unittest2/test/test_loader.py ++++ b/unittest2/test/test_loader.py +@@ -509,6 +509,7 @@ class Test_TestLoader(unittest2.TestCase): + # + # What happens when an impossible name is given, relative to the provided + # `module`? ++ @unittest.skipIf(sys.version_info[:2] == (3, 5), "python 3.5 has problems here") + def test_loadTestsFromName__relative_malformed_name(self): + loader = unittest.TestLoader() + +@@ -811,6 +812,7 @@ class Test_TestLoader(unittest2.TestCase): + # TestCase or TestSuite instance." + # + # What happens when presented with an impossible module name? ++ @unittest.skipIf(sys.version_info[:2] == (3, 5), "python 3.5 has problems here") + def test_loadTestsFromNames__malformed_name(self): + loader = unittest2.TestLoader() + +@@ -918,6 +920,7 @@ class Test_TestLoader(unittest2.TestCase): + # "The method optionally resolves name relative to the given module" + # + # What happens when presented with an impossible attribute name? ++ @unittest.skipIf(sys.version_info[:2] == (3, 5), "python 3.5 has problems here") + def test_loadTestsFromNames__relative_malformed_name(self): + loader = unittest.TestLoader() + diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild index 7c7f4e382366..3e7d5fe9eab9 100644 --- a/dev-python/unittest2/unittest2-1.1.0.ebuild +++ b/dev-python/unittest2/unittest2-1.1.0.ebuild @@ -9,12 +9,12 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit distutils-r1 DESCRIPTION="The new features in unittest backported to Python 2.4+" -HOMEPAGE="https://pypi.python.org/pypi/unittest2" +HOMEPAGE="https://pypi.python.org/pypi/unittest2 https://github.com/testing-cabal/unittest-ext" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +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="" CDEPEND=" @@ -26,8 +26,11 @@ CDEPEND=" DEPEND="${CDEPEND}" RDEPEND="${CDEPEND}" -PATCHES=( "${FILESDIR}"/remove-argparse-dependence.patch ) +PATCHES=( + "${FILESDIR}"/remove-argparse-dependence.patch + "${FILESDIR}"/${P}-python3.5-test.patch +) python_test() { - "${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}" + "${PYTHON}" -m unittest2 discover --verbose || die "tests failed under ${EPYTHON}" } diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest index 925335d72db3..4f45224912df 100644 --- a/dev-python/urwid/Manifest +++ b/dev-python/urwid/Manifest @@ -1,2 +1,3 @@ DIST urwid-1.2.2.tar.gz 585025 SHA256 e122e2dee122314f5626945af4dbe15bf3de9f318c552a4c0b68c1c480852d92 SHA512 10d0271e52b28aff3350d3342cd9b1c8fab819f3619cce77286b2545b74dd967f0466e98dfbfef1189b3ab6b38392168367d75c768b0f5b8058666b0211706a5 WHIRLPOOL 69556a721d89f6a6b82664bf5eaa10a21c49d15f9b8e6e6be4ba31ce5e2317fd0ecebfa3d93b008f9bd93f10504161d93e1827d696a6c1baa09939ac628f027d DIST urwid-1.3.0.tar.gz 580922 SHA256 29f04fad3bf0a79c5491f7ebec2d50fa086e9d16359896c9204c6a92bc07aba2 SHA512 2743488f2815e6abff8bf2450b2a3d5756fa026587512cf29a3850be0e585d7c2dd4d50fda7bf1589de32eed93637ac0ee88f002de4b9bee0a72dc6574ef6103 WHIRLPOOL c276c26deb557b1c4b8f9f49f7f6c10e0e5a169bc3a1b9c3933a948c313897da4ebdb0520b7fc3d0a301cbc5743a1d79a20e112d852e74b50910db6ea1a4e99e +DIST urwid-1.3.1.tar.gz 588549 SHA256 cfcec03e36de25a1073e2e35c2c7b0cc6969b85745715c3a025a31d9786896a1 SHA512 8b505d38f3a0c04bbf527b324dc36212f2580213dd55eca61c66705d3beaac4f074c39aaa0f4f71add1fe5f3fce4c4c6dc88dd1e981b04bac6d52195d7a3f0ed WHIRLPOOL ff908dfad8e893fd51510168433a6bd63fe1edc38dde65664994f5eb3343e8fe818c4c1b9d5c296d3f3fdc93e2df7a3809f661e52322e6e69e163484b0e38944 diff --git a/dev-python/urwid/urwid-1.3.1.ebuild b/dev-python/urwid/urwid-1.3.1.ebuild new file mode 100644 index 000000000000..9c50621984a0 --- /dev/null +++ b/dev-python/urwid/urwid-1.3.1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) +PYTHON_REQ_USE="ncurses" + +inherit distutils-r1 + +DESCRIPTION="Curses-based user interface library for Python" +HOMEPAGE="http://urwid.org/ https://pypi.python.org/pypi/urwid/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" +IUSE="doc examples" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) +" + +PATCHES=( "${FILESDIR}"/${PN}-1.1.0-sphinx.patch ) + +python_compile_all() { + if use doc ; then + if [[ ${EPYTHON} == python3* ]] ; then + 2to3 -nw --no-diffs docs/conf.py || die + fi + cd docs + sphinx-build . _build/html || die + fi +} + +python_compile() { + if [[ ${EPYTHON} == python2* ]] ; then + local CFLAGS="${CFLAGS} -fno-strict-aliasing" + export CFLAGS + fi + + distutils-r1_python_compile +} + +python_test() { + esetup.py test +} + +python_install_all() { + use examples && local EXAMPLES=( examples/. ) + use doc && local HTML_DOCS=( docs/_build/html/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest new file mode 100644 index 000000000000..68bf08c54db3 --- /dev/null +++ b/dev-python/versioneer/Manifest @@ -0,0 +1 @@ +DIST versioneer-0.15.tar.gz 35408 SHA256 1252b9b9420fc3bc01036640da7928fe5d04519f463c5e960eb774c3ea80cd09 SHA512 b9d2f282f5dc681b0dafb0ae34352eb995e16b3184047bc29301b52acde9fc29b49e129c49c767827808a1e524315ece8c8fe02edf18a9d9cd20c34f345336e5 WHIRLPOOL fcc80ffe73bb3733733785587e84b0ab7de39a0916e5070c6cbdf499115e6da51a078f9d8176f4a15305c1b623cd59469385eaeeba33bbcb0116203f7c1704c7 diff --git a/sci-chemistry/arp-warp-bin/metadata.xml b/dev-python/versioneer/metadata.xml index 51fdedab1b38..ee7e8b2450a8 100644 --- a/sci-chemistry/arp-warp-bin/metadata.xml +++ b/dev-python/versioneer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>sci-chemistry</herd> + <herd>python</herd> </pkgmetadata> diff --git a/dev-python/versioneer/versioneer-0.15.ebuild b/dev-python/versioneer/versioneer-0.15.ebuild new file mode 100644 index 000000000000..2eab386cfc6b --- /dev/null +++ b/dev-python/versioneer/versioneer-0.15.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Easy VCS-based management of project version strings" +HOMEPAGE="https://pypi.python.org/pypi/versioneer https://github.com/warner/python-versioneer" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="public-domain" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +python_test() { + esetup.py make_versioneer + git config --global user.email "you@example.com" + git config --global user.name "Your Name" + + ${PYTHON} test/git/test_git.py -v || die +} diff --git a/dev-python/virtualenv/virtualenv-13.1.2.ebuild b/dev-python/virtualenv/virtualenv-13.1.2.ebuild index b32c0d9bb498..c11671be2714 100644 --- a/dev-python/virtualenv/virtualenv-13.1.2.ebuild +++ b/dev-python/virtualenv/virtualenv-13.1.2.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" SLOT="0" IUSE="doc test" diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest index ca1958f2e277..53cdb8d3be7b 100644 --- a/dev-python/webob/Manifest +++ b/dev-python/webob/Manifest @@ -1,3 +1,4 @@ DIST WebOb-1.4.1.tar.gz 671495 SHA256 12f8b98390befc47336d2c0e5bad9cc48609d808eabb3f8675dc1027a3a9e9db SHA512 71be0389018289884158c5f3b99d1e1185bd29ab975ea59008fd71bf1188d25130e1852422dcedf7ffe3303d87caf02d62a143229b9ae196dd62f64deb7f7328 WHIRLPOOL d2803552592813c4b5ea4291e9a3aac6aa26397b903a8372f8e1fd601d46fb5f7105dcfd42e14de974a352e75945bf61945e0f36928d6a3fd8afa8bdd195d35b DIST WebOb-1.4.tar.gz 633302 SHA256 0819838204e2a6823e42bf2227898fdf3f306f7619bf328e25855a0d1ca20399 SHA512 0cf1a21b7d863c355e445f0e9f898ffb1c4c39099532a86d830c1be5d84efc0c6f3e8151a283cfd1cb5bebcb1fe78a2b6b269cbc130863679a017565a2539a37 WHIRLPOOL abfc696b7f50a74edd3d84099365f802f5be0eddf56a1c128f6e026c30bdeddc1b58c6bb45d4281ee4fb3d7937888d8065b01f93a363c82cd9cd1834eb2378da DIST WebOb-1.5.0.tar.gz 186394 SHA256 8e90cca008c0189fe64d06281d50d9510c1dde4147bdf4bc81b666020ce31350 SHA512 4d5a4f58eb3f96d4b563c0a8d8387f30ad323d11c3a913ba69504685e7baa870f232d55e6d8b403e3f6b2153c3c7f37a694618bf0e85d04115c240c5fa2b93b6 WHIRLPOOL f3f6975f84bc64fe941fd3d3c5cd065cfea8e59b2f0481e31c7bf5145934d038420ccb93df918e5e729607ee75bb77d3a8142c4ff4ac60b2be14212061a1fa3a +DIST WebOb-1.5.1.tar.gz 202821 SHA256 d8a9a153577f74b275dfd441ee2de4910eb2c1228d94186285684327e3877009 SHA512 aba45ff622a572a3bda7cf33ce5988745b3831aea2ed7f0502688055f96c16cf5de828039439218611034ad49dea4e4a9c2ec43b8dbc97be61b7abc33a15589c WHIRLPOOL 814e11b257f82a48f9ed8ff1e1ecb37ab0648c7f67446aa57094da671f0265fadd7b04e9e69ed1ecbfbbc1925804ef7f563f8079b82bea04d8a06853482960b7 diff --git a/dev-python/webob/webob-1.5.1.ebuild b/dev-python/webob/webob-1.5.1.ebuild new file mode 100644 index 000000000000..6951a17c5a70 --- /dev/null +++ b/dev-python/webob/webob-1.5.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) + +inherit distutils-r1 + +MY_PN=WebOb +MY_P=${MY_PN}-${PV} + +DESCRIPTION="WSGI request and response object" +HOMEPAGE="http://webob.org/ https://pypi.python.org/pypi/WebOb" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="doc test" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( dev-python/nose[${PYTHON_USEDEP}] + dev-python/coverage[${PYTHON_USEDEP}] )" +RDEPEND="" + +S=${WORKDIR}/${MY_P} + +python_compile_all() { + if use doc; then + "${PYTHON}" setup.py build_sphinx || die + fi +} + +python_test() { + nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest index 99d29e31bba3..af501f123312 100644 --- a/dev-python/websocket-client/Manifest +++ b/dev-python/websocket-client/Manifest @@ -1,4 +1,4 @@ DIST websocket-client-0.21.0.tar.gz 190523 SHA256 0e279c371df0bc1b3a890a31e90631e03c11ea596e00fd53524f03a5fb972d3d SHA512 cd6ae58226890dd94e03d3d348a5ec83c1b7a5a0e8b353cf28db9b5a78131ecbc84755ba9925fe9c90a90388f03d6e9a535960a13c53536f6b4fe4effbbc736c WHIRLPOOL 4732ad6e839e14f68a0a2070171f724a912f00d2d76003cb23a6253560a2aab51a34525e0cf98ebd7e045e326052b8aa4c7497d384e807f493f99a125e323dd0 -DIST websocket-client-0.29.0.tar.gz 190908 SHA256 abfcb1a8dff4df1b12db4c227d3f4f38a68b42c35a8bca9d2bee10f8eae2b434 SHA512 012cb3eed454a86aa3ded2beede283600df4db0dcd4e2ce4fd25b10e1127c39e7ff7bb916f11f0349a0473eaa742a931fae0e5c86fcda23418827e29a4069dca WHIRLPOOL 0b48022bfd4718c2a033e818c82b4122644564e1c88d8cd6633ebb5e220858997e9851be48ad50f4a0a55ba7c2247e5ef07a957b85921e727c162245bdfa3bbc 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 diff --git a/dev-python/websocket-client/websocket-client-0.29.0.ebuild b/dev-python/websocket-client/websocket-client-0.34.0.ebuild index de7e12040324..de7e12040324 100644 --- a/dev-python/websocket-client/websocket-client-0.29.0.ebuild +++ b/dev-python/websocket-client/websocket-client-0.34.0.ebuild diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild index 5715e71140de..62bb0de4b682 100644 --- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild +++ b/dev-python/wxpython/wxpython-3.0.2.0.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="wxWinLL-3" SLOT="3.0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd" IUSE="cairo examples libnotify opengl" RDEPEND=" diff --git a/dev-python/xlwt/xlwt-1.0.0.ebuild b/dev-python/xlwt/xlwt-1.0.0.ebuild index aec09cfecb3b..5c9c8770b6f6 100644 --- a/dev-python/xlwt/xlwt-1.0.0.ebuild +++ b/dev-python/xlwt/xlwt-1.0.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples test" DEPEND=" diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild index 22a0bfba010f..c9cc7fab7fdd 100644 --- a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild +++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,8 +19,9 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" IUSE="doc" -RDEPEND="|| ( - dev-python/dnspython[${PYTHON_USEDEP}] +RDEPEND=" + || ( + virtual/dnspython[${PYTHON_USEDEP}] dev-python/pydns[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} @@ -33,6 +34,6 @@ PATCHES=( ) python_install_all() { + use doc && HTML_DOCS=( doc/. ) distutils-r1_python_install_all - use doc && dohtml -A py -r doc/. } diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild index 49104c845a0e..92fe198f5c4a 100644 --- a/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild +++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86" IUSE="doc" RDEPEND="|| ( - dev-python/dnspython + dev-python/dnspython:0 dev-python/pydns )" DEPEND="${RDEPEND} diff --git a/dev-qt/assistant/assistant-4.8.5.ebuild b/dev-qt/assistant/assistant-4.8.5.ebuild deleted file mode 100644 index d08564ee00cd..000000000000 --- a/dev-qt/assistant/assistant-4.8.5.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils qt4-build - -DESCRIPTION="Tool for viewing on-line documentation in Qt help file format" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -fi - -IUSE="webkit" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] - ~dev-qt/qtgui-${PV}[aqua=,debug=] - ~dev-qt/qthelp-${PV}[aqua=,debug=] - ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite] - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant" - QT4_EXTRACT_DIRECTORIES=" - include - src - tools" - - qt4-build_pkg_setup -} - -src_prepare() { - # bug 401173 - use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch") - - qt4-build_src_prepare -} - -src_configure() { - myconf+=" - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns - $(qt_use webkit)" - - qt4-build_src_configure -} - -src_install() { - qt4-build_src_install - - doicon tools/assistant/tools/assistant/images/assistant.png - make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation' -} diff --git a/dev-qt/designer/designer-4.8.5.ebuild b/dev-qt/designer/designer-4.8.5.ebuild deleted file mode 100644 index da1ffbdd5e17..000000000000 --- a/dev-qt/designer/designer-4.8.5.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils qt4-build - -DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi - -DESIGNER_PLUGINS="declarative phonon qt3support webkit" -IUSE="${DESIGNER_PLUGINS} kde" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] - ~dev-qt/qtgui-${PV}[aqua=,debug=] - ~dev-qt/qtscript-${PV}[aqua=,debug=] - declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=] ) - phonon? ( !kde? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] ) ) - qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] ) - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] ) -" -RDEPEND="${DEPEND}" -PDEPEND="phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )" - -pkg_setup() { - QT4_TARGET_DIRECTORIES="tools/designer" - QT4_EXTRACT_DIRECTORIES=" - include - src - tools" - - qt4-build_pkg_setup -} - -src_prepare() { - qt4-build_src_prepare - - local plugin - for plugin in ${DESIGNER_PLUGINS}; do - if ! use ${plugin} || ( [[ ${plugin} == phonon ]] && use kde ); then - sed -i -e "/\<${plugin}\>/d" \ - tools/designer/src/plugins/plugins.pro || die - fi - done -} - -src_configure() { - myconf+=" - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" - - qt4-build_src_configure -} - -src_install() { - qt4-build_src_install - - # qt-creator - # some qt-creator headers are located - # under /usr/include/qt4/QtDesigner/private. - # those headers are just includes of the headers - # which are located under tools/designer/src/lib/* - # So instead of installing both, we create the private folder - # and drop tools/designer/src/lib/* headers in it. - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then - insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/ - else - insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/ - fi - doins "${S}"/tools/designer/src/lib/shared/* - doins "${S}"/tools/designer/src/lib/sdk/* - - doicon tools/designer/src/designer/images/designer.png - make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner' -} diff --git a/dev-qt/linguist/linguist-4.8.5.ebuild b/dev-qt/linguist/linguist-4.8.5.ebuild deleted file mode 100644 index 89e537dbe366..000000000000 --- a/dev-qt/linguist/linguist-4.8.5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils qt4-build - -DESCRIPTION="Graphical tool for translating Qt applications" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/designer-${PV}[aqua=,debug=] - ~dev-qt/qtcore-${PV}[aqua=,debug=] - ~dev-qt/qtgui-${PV}[aqua=,debug=] -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES="tools/linguist/linguist" - QT4_EXTRACT_DIRECTORIES=" - include - src - tools" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" - - qt4-build_src_configure -} - -src_install() { - qt4-build_src_install - - newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png - make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation' -} diff --git a/dev-qt/pixeltool/pixeltool-4.8.5.ebuild b/dev-qt/pixeltool/pixeltool-4.8.5.ebuild deleted file mode 100644 index 0f74e18c8964..000000000000 --- a/dev-qt/pixeltool/pixeltool-4.8.5.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit qt4-build - -DESCRIPTION="Qt screen magnifier" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] - ~dev-qt/qtgui-${PV}[aqua=,debug=] - !<dev-qt/qthelp-4.8.5:4 -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES="tools/pixeltool" - QT4_EXTRACT_DIRECTORIES=" - include - src/corelib - src/gui - tools/pixeltool" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" - - qt4-build_src_configure -} diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild deleted file mode 100644 index 233cfeb40892..000000000000 --- a/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils qt4-build - -DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] - ~dev-qt/qtdbus-${PV}[aqua=,debug=] - ~dev-qt/qtgui-${PV}[aqua=,debug=] -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer" - QT4_EXTRACT_DIRECTORIES=" - include - src - tools/qdbus" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" - - qt4-build_src_configure -} - -src_install() { - qt4-build_src_install - - newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png - make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development' -} diff --git a/dev-qt/qt-meta/qt-meta-4.8.5.ebuild b/dev-qt/qt-meta/qt-meta-4.8.6.ebuild index b812f55f6c24..b812f55f6c24 100644 --- a/dev-qt/qt-meta/qt-meta-4.8.5.ebuild +++ b/dev-qt/qt-meta/qt-meta-4.8.6.ebuild diff --git a/dev-qt/qt3support/qt3support-4.8.5.ebuild b/dev-qt/qt3support/qt3support-4.8.5.ebuild deleted file mode 100644 index 62467da75478..000000000000 --- a/dev-qt/qt3support/qt3support-4.8.5.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Qt3Support module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+accessibility" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support] - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support] - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support] -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/qt3support - src/tools/uic3 - tools/porting" - - QT4_EXTRACT_DIRECTORIES=" - src - include - tools" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -qt3support - $(qt_use accessibility)" - - qt4-build_src_configure -} diff --git a/dev-qt/qtbearer/qtbearer-4.8.5.ebuild b/dev-qt/qtbearer/qtbearer-4.8.5.ebuild deleted file mode 100644 index 12788696a2f2..000000000000 --- a/dev-qt/qtbearer/qtbearer-4.8.5.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The network bearer plugins for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi -IUSE="connman networkmanager" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] - connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) - networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -pkg_setup() { - QT4_EXTRACT_DIRECTORIES=" - include/QtCore - include/QtDBus - include/QtNetwork - src/corelib - src/dbus - src/network - src/plugins/bearer - src/plugins/qpluginbase.pri" - - QT4_TARGET_DIRECTORIES=" - src/plugins/bearer/generic - $(use connman && echo src/plugins/bearer/connman) - $(use networkmanager && echo src/plugins/bearer/networkmanager)" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - $(use connman || use networkmanager || echo -no-dbus) - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb" - - qt4-build_src_configure -} diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest index da8277d8904b..a406fbc32cc2 100644 --- a/dev-qt/qtchooser/Manifest +++ b/dev-qt/qtchooser/Manifest @@ -1 +1,2 @@ DIST qtchooser-0_p20150102.tar.xz 30936 SHA256 7b6d622d3a57a1467c57b4ca368220540085698cb7ad226ed782931599e85757 SHA512 15e08f1aaa22ba45d41adda57b9da76f3667d15ab92448b6a95b44287e5043fcae368ddcea1e2b84565d3a96edacbcd68bc515054ffaa81dde4064c9a992dbae WHIRLPOOL 4617444cf9764a82f10f3ff8fdf1102d9c5fdd76c77966c661a5256a98221117696ffccf83ed5b961a53d7b5ff5e0a7f6454627a6ab43427583edf9e3660a1bb +DIST qtchooser-0_p20151008.tar.xz 31308 SHA256 121e90dd70054701c52b0d555ffa2a55192439afded88197f17d7b2ca28fa2e8 SHA512 d6fd56e839b7ce7abbd42300d76d06d67fabb5ca36a6f6a39493b7770599372c4795a90cafeea8cceff8da7ea7f6639d74f76a8241a808364a41905fa3d084c6 WHIRLPOOL 8e5fc7d1b30d06990af87737e7d5a4b210f0f30ef2d8d7a17b7ef91e02afdb9bce7240c7f291d557855a277c4d5c4c3f452c416ea29a9f1f9a23c9aeface4ae3 diff --git a/dev-qt/qtchooser/qtchooser-0_p20150102.ebuild b/dev-qt/qtchooser/qtchooser-0_p20150102.ebuild index eb37b0ab9e57..338f3e30cdc6 100644 --- a/dev-qt/qtchooser/qtchooser-0_p20150102.ebuild +++ b/dev-qt/qtchooser/qtchooser-0_p20150102.ebuild @@ -7,7 +7,7 @@ EAPI=5 inherit qmake-utils toolchain-funcs DESCRIPTION="Qt4/Qt5 version chooser" -HOMEPAGE="https://qt.gitorious.org/qt/qtchooser" +HOMEPAGE="https://code.qt.io/cgit/qt/qtchooser.git/" SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz" LICENSE="|| ( LGPL-2.1 GPL-3 )" diff --git a/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild b/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild new file mode 100644 index 000000000000..287a1682c63c --- /dev/null +++ b/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit qmake-utils toolchain-funcs + +DESCRIPTION="Qt4/Qt5 version chooser" +HOMEPAGE="https://code.qt.io/cgit/qt/qtchooser.git/" +SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz" + +LICENSE="|| ( LGPL-2.1 GPL-3 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="test" + +DEPEND="test? ( + dev-qt/qtcore:5 + dev-qt/qttest:5 + )" +RDEPEND=" + !<dev-qt/assistant-4.8.6:4 + !<dev-qt/designer-4.8.6:4 + !<dev-qt/linguist-4.8.6:4 + !<dev-qt/pixeltool-4.8.6:4 + !<dev-qt/qdbusviewer-4.8.6:4 + !<dev-qt/qt3support-4.8.6:4 + !<dev-qt/qtbearer-4.8.6:4 + !<dev-qt/qtcore-4.8.6:4 + !<dev-qt/qtdbus-4.8.6:4 + !<dev-qt/qtdeclarative-4.8.6:4 + !<dev-qt/qtdemo-4.8.6:4 + !<dev-qt/qtgui-4.8.6:4 + !<dev-qt/qthelp-4.8.6:4 + !<dev-qt/qtmultimedia-4.8.6:4 + !<dev-qt/qtopengl-4.8.6:4 + !<dev-qt/qtopenvg-4.8.6:4 + !<dev-qt/qtphonon-4.8.6:4 + !<dev-qt/qtscript-4.8.6:4 + !<dev-qt/qtsql-4.8.6:4 + !<dev-qt/qtsvg-4.8.6:4 + !<dev-qt/qttest-4.8.6:4 + !<dev-qt/qtwebkit-4.8.6:4 + !<dev-qt/qtxmlpatterns-4.8.6:4 +" + +qtchooser_make() { + emake \ + CXX="$(tc-getCXX)" \ + LFLAGS="${LDFLAGS}" \ + prefix="${EPREFIX}/usr" \ + "$@" +} + +src_compile() { + qtchooser_make +} + +src_test() { + pushd tests/auto >/dev/null || die + eqmake5 + popd >/dev/null || die + + qtchooser_make check +} + +src_install() { + qtchooser_make INSTALL_ROOT="${D}" install + + keepdir /etc/xdg/qtchooser + + # TODO: bash and zsh completion + # newbashcomp scripts/${PN}.bash ${PN} +} diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild index 834a1392b8b6..42350b7fb5c0 100644 --- a/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild +++ b/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild @@ -9,7 +9,7 @@ inherit qt5-build DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ~arm64 hppa ~ppc64 ~x86" + KEYWORDS="amd64 arm ~arm64 hppa ppc64 ~x86" fi IUSE="" diff --git a/dev-qt/qtcore/files/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch b/dev-qt/qtcore/files/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch deleted file mode 100644 index c472d4212ffa..000000000000 --- a/dev-qt/qtcore/files/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 512a1ce0698d370c313bb561bbf078935fa0342e Mon Sep 17 00:00:00 2001 -From: Mitch Curtis <mitch.curtis@digia.com> -Date: Thu, 7 Nov 2013 09:36:29 +0100 -Subject: Disallow deep or widely nested entity references. - -Nested references with a depth of 2 or greater will fail. References -that partially expand to greater than 1024 characters will also fail. - -This is a backport of 46a8885ae486e238a39efa5119c2714f328b08e4. - -Change-Id: I0c2e1fa13d6ccb5f88641dae2ed3f28bfdeaf609 -Reviewed-by: Richard J. Moore <rich@kde.org> -Reviewed-by: Lars Knoll <lars.knoll@digia.com> - -diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp -index a1777c5..3904632 100644 ---- a/src/xml/sax/qxml.cpp -+++ b/src/xml/sax/qxml.cpp -@@ -424,6 +424,10 @@ private: - int stringValueLen; - QString emptyStr; - -+ // The limit to the amount of times the DTD parsing functions can be called -+ // for the DTD currently being parsed. -+ int dtdRecursionLimit; -+ - const QString &string(); - void stringClear(); - void stringAddC(QChar); -@@ -492,6 +496,7 @@ private: - void unexpectedEof(ParseFunction where, int state); - void parseFailed(ParseFunction where, int state); - void pushParseState(ParseFunction function, int state); -+ bool isPartiallyExpandedEntityValueTooLarge(QString *errorMessage); - - Q_DECLARE_PUBLIC(QXmlSimpleReader) - QXmlSimpleReader *q_ptr; -@@ -2759,6 +2764,7 @@ QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader) - useNamespacePrefixes = false; - reportWhitespaceCharData = true; - reportEntities = false; -+ dtdRecursionLimit = 2; - } - - QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate() -@@ -5018,6 +5024,11 @@ bool QXmlSimpleReaderPrivate::parseDoctype() - } - break; - case Mup: -+ if (dtdRecursionLimit > 0 && parameterEntities.size() > dtdRecursionLimit) { -+ reportParseError(QString::fromLatin1( -+ "DTD parsing exceeded recursion limit of %1.").arg(dtdRecursionLimit)); -+ return false; -+ } - if (!parseMarkupdecl()) { - parseFailed(&QXmlSimpleReaderPrivate::parseDoctype, state); - return false; -@@ -6627,6 +6638,37 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq() - return false; - } - -+bool QXmlSimpleReaderPrivate::isPartiallyExpandedEntityValueTooLarge(QString *errorMessage) -+{ -+ const QString value = string(); -+ QMap<QString, int> referencedEntityCounts; -+ foreach (QString entityName, entities.keys()) { -+ for (int i = 0; i < value.size() && i != -1; ) { -+ i = value.indexOf(entityName, i); -+ if (i != -1) { -+ // The entityName we're currently trying to find -+ // was matched in this string; increase our count. -+ ++referencedEntityCounts[entityName]; -+ i += entityName.size(); -+ } -+ } -+ } -+ -+ foreach (QString entityName, referencedEntityCounts.keys()) { -+ const int timesReferenced = referencedEntityCounts[entityName]; -+ const QString entityValue = entities[entityName]; -+ if (entityValue.size() * timesReferenced > 1024) { -+ if (errorMessage) { -+ *errorMessage = QString::fromLatin1("The XML entity \"%1\"" -+ "expands too a string that is too large to process when " -+ "referencing \"%2\" %3 times.").arg(entityName).arg(entityName).arg(timesReferenced); -+ } -+ return true; -+ } -+ } -+ return false; -+} -+ - /* - Parse a EntityDecl [70]. - -@@ -6721,6 +6763,15 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl() - switch (state) { - case EValue: - if ( !entityExist(name())) { -+ QString errorMessage; -+ if (isPartiallyExpandedEntityValueTooLarge(&errorMessage)) { -+ // The entity at entityName is entityValue.size() characters -+ // long in its unexpanded form, and was mentioned timesReferenced times, -+ // resulting in a string that would be greater than 1024 characters. -+ reportParseError(errorMessage); -+ return false; -+ } -+ - entities.insert(name(), string()); - if (declHnd) { - if (!declHnd->internalEntityDecl(name(), string())) { --- -1.8.5.2 - diff --git a/dev-qt/qtcore/files/CVE-2013-4549-02-fully-expand-entities.patch b/dev-qt/qtcore/files/CVE-2013-4549-02-fully-expand-entities.patch deleted file mode 100644 index 03ef64f22d86..000000000000 --- a/dev-qt/qtcore/files/CVE-2013-4549-02-fully-expand-entities.patch +++ /dev/null @@ -1,124 +0,0 @@ -From cecceb0cdd87482124a73ecf537f3445d68be13e Mon Sep 17 00:00:00 2001 -From: Mitch Curtis <mitch.curtis@digia.com> -Date: Tue, 12 Nov 2013 13:44:56 +0100 -Subject: Fully expand entities to ensure deep or widely nested ones fail - parsing - -With 512a1ce0698d370c313bb561bbf078935fa0342e, we failed when parsing -entities whose partially expanded size was greater than 1024 -characters. That was not enough, so now we fully expand all entities. - -This is a backport of f1053d94f59f053ce4acad9320df14f1fbe4faac. - -Change-Id: I41dd6f4525c63e82fd320a22d19248169627f7e0 -Reviewed-by: Richard J. Moore <rich@kde.org> - -diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp -index 3904632..befa801 100644 ---- a/src/xml/sax/qxml.cpp -+++ b/src/xml/sax/qxml.cpp -@@ -426,7 +426,9 @@ private: - - // The limit to the amount of times the DTD parsing functions can be called - // for the DTD currently being parsed. -- int dtdRecursionLimit; -+ static const int dtdRecursionLimit = 2; -+ // The maximum amount of characters an entity value may contain, after expansion. -+ static const int entityCharacterLimit = 1024; - - const QString &string(); - void stringClear(); -@@ -496,7 +498,7 @@ private: - void unexpectedEof(ParseFunction where, int state); - void parseFailed(ParseFunction where, int state); - void pushParseState(ParseFunction function, int state); -- bool isPartiallyExpandedEntityValueTooLarge(QString *errorMessage); -+ bool isExpandedEntityValueTooLarge(QString *errorMessage); - - Q_DECLARE_PUBLIC(QXmlSimpleReader) - QXmlSimpleReader *q_ptr; -@@ -2764,7 +2766,6 @@ QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader) - useNamespacePrefixes = false; - reportWhitespaceCharData = true; - reportEntities = false; -- dtdRecursionLimit = 2; - } - - QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate() -@@ -6638,30 +6639,43 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq() - return false; - } - --bool QXmlSimpleReaderPrivate::isPartiallyExpandedEntityValueTooLarge(QString *errorMessage) -+bool QXmlSimpleReaderPrivate::isExpandedEntityValueTooLarge(QString *errorMessage) - { -- const QString value = string(); -- QMap<QString, int> referencedEntityCounts; -- foreach (QString entityName, entities.keys()) { -- for (int i = 0; i < value.size() && i != -1; ) { -- i = value.indexOf(entityName, i); -- if (i != -1) { -- // The entityName we're currently trying to find -- // was matched in this string; increase our count. -- ++referencedEntityCounts[entityName]; -- i += entityName.size(); -+ QMap<QString, int> literalEntitySizes; -+ // The entity at (QMap<QString,) referenced the entities at (QMap<QString,) (int>) times. -+ QMap<QString, QMap<QString, int> > referencesToOtherEntities; -+ QMap<QString, int> expandedSizes; -+ -+ // For every entity, check how many times all entity names were referenced in its value. -+ foreach (QString toSearch, entities.keys()) { -+ // The amount of characters that weren't entity names, but literals, like 'X'. -+ QString leftOvers = entities.value(toSearch); -+ // How many times was entityName referenced by toSearch? -+ foreach (QString entityName, entities.keys()) { -+ for (int i = 0; i < leftOvers.size() && i != -1; ) { -+ i = leftOvers.indexOf(QString::fromLatin1("&%1;").arg(entityName), i); -+ if (i != -1) { -+ leftOvers.remove(i, entityName.size() + 2); -+ // The entityName we're currently trying to find was matched in this string; increase our count. -+ ++referencesToOtherEntities[toSearch][entityName]; -+ } - } - } -+ literalEntitySizes[toSearch] = leftOvers.size(); - } - -- foreach (QString entityName, referencedEntityCounts.keys()) { -- const int timesReferenced = referencedEntityCounts[entityName]; -- const QString entityValue = entities[entityName]; -- if (entityValue.size() * timesReferenced > 1024) { -+ foreach (QString entity, referencesToOtherEntities.keys()) { -+ expandedSizes[entity] = literalEntitySizes[entity]; -+ foreach (QString referenceTo, referencesToOtherEntities.value(entity).keys()) { -+ const int references = referencesToOtherEntities.value(entity).value(referenceTo); -+ // The total size of an entity's value is the expanded size of all of its referenced entities, plus its literal size. -+ expandedSizes[entity] += expandedSizes[referenceTo] * references + literalEntitySizes[referenceTo] * references; -+ } -+ -+ if (expandedSizes[entity] > entityCharacterLimit) { - if (errorMessage) { -- *errorMessage = QString::fromLatin1("The XML entity \"%1\"" -- "expands too a string that is too large to process when " -- "referencing \"%2\" %3 times.").arg(entityName).arg(entityName).arg(timesReferenced); -+ *errorMessage = QString::fromLatin1("The XML entity \"%1\" expands too a string that is too large to process (%2 characters > %3)."); -+ *errorMessage = (*errorMessage).arg(entity).arg(expandedSizes[entity]).arg(entityCharacterLimit); - } - return true; - } -@@ -6764,10 +6778,7 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl() - case EValue: - if ( !entityExist(name())) { - QString errorMessage; -- if (isPartiallyExpandedEntityValueTooLarge(&errorMessage)) { -- // The entity at entityName is entityValue.size() characters -- // long in its unexpanded form, and was mentioned timesReferenced times, -- // resulting in a string that would be greater than 1024 characters. -+ if (isExpandedEntityValueTooLarge(&errorMessage)) { - reportParseError(errorMessage); - return false; - } --- -1.8.5.2 - diff --git a/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild deleted file mode 100644 index d1dacc5bb497..000000000000 --- a/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit qt4-build - -DESCRIPTION="Cross-platform application development framework" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+glib iconv icu qt3support ssl" - -DEPEND=" - sys-libs/zlib - glib? ( dev-libs/glib:2 ) - icu? ( >=dev-libs/icu-49:= ) - ssl? ( dev-libs/openssl:0 ) - !dev-qt/qttranslations:4 - !<x11-libs/cairo-1.10.2-r2 -" -RDEPEND="${DEPEND}" -PDEPEND=" - qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) -" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch" - "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968 - "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968 - "${FILESDIR}/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch" - "${FILESDIR}/CVE-2013-4549-02-fully-expand-entities.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/tools/uic - src/corelib - src/xml - src/network - src/plugins/codecs - tools/linguist/lconvert - tools/linguist/lrelease - tools/linguist/lupdate" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include - src/plugins/plugins.pro - src/plugins/qpluginbase.pri - src/src.pro - src/3rdparty/des - src/3rdparty/harfbuzz - src/3rdparty/md4 - src/3rdparty/md5 - src/3rdparty/sha1 - src/3rdparty/easing - src/3rdparty/zlib_dependency.pri - src/declarative - src/gui - src/script - tools/shared - tools/linguist/shared - translations" - - qt4-build_pkg_setup -} - -src_prepare() { - # Don't pre-strip, bug 235026 - for i in kr jp cn tw; do - echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro - done - - qt4-build_src_prepare - - # bug 172219 - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" - sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" - - # bug 427782 - sed -i -e "/^CPPFLAGS/s/-g//" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" - sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ - -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ - "${S}/configure" || die "sed configure setBootstrapVariable failed" -} - -src_configure() { - myconf+=" - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use icu) - $(use ssl && echo -openssl-linked || echo -no-openssl) - $(qt_use qt3support)" - - qt4-build_src_configure -} - -src_install() { - dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} - - install_directories src/{corelib,xml,network,plugins/codecs} - - emake INSTALL_ROOT="${D}" install_mkspecs - - # install private headers - insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private - find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + - - # use freshly built libraries - local DYLD_FPATH= - [[ -d "${S}"/lib/QtCore.framework ]] \ - && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done) - DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ - LD_LIBRARY_PATH="${S}/lib" \ - "${S}"/bin/lrelease translations/*.ts \ - || die "generating translations failed" - insinto "${QTTRANSDIR#${EPREFIX}}" - doins translations/*.qm - - setqtenv - fix_library_files - - # List all the multilib libdirs - local libdirs= - for libdir in $(get_all_libdirs); do - libdirs+=":${EPREFIX}/usr/${libdir}/qt4" - done - - cat <<-EOF > "${T}"/44qt4 - LDPATH="${libdirs:1}" - EOF - doenvd "${T}"/44qt4 - - dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo - mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ - || die "failed to move qconfig.pri" - - # Framework hacking - if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then - # TODO: do this better - sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ - || die "sed for qconfig.h failed." - dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo - else - sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ - "${D}${QTHEADERDIR}"/Qt/qconfig.h \ - || die "sed for qconfig.h failed" - fi - - QCONFIG_DEFINE="QT_ZLIB" - install_qconfigs - - # remove .la files - prune_libtool_files - - keepdir "${QTSYSCONFDIR#${EPREFIX}}" - - # Framework magic - fix_includes -} diff --git a/dev-qt/qtdbus/qtdbus-4.8.5.ebuild b/dev-qt/qtdbus/qtdbus-4.8.5.ebuild deleted file mode 100644 index d37d32d954bf..000000000000 --- a/dev-qt/qtdbus/qtdbus-4.8.5.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The DBus module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] - >=sys-apps/dbus-1.2 -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch" - "${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/dbus - tools/qdbus/qdbus - tools/qdbus/qdbusxml2cpp - tools/qdbus/qdbuscpp2xml" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/QtCore - include/QtDBus - include/QtXml - src/corelib - src/xml" - - QCONFIG_ADD="dbus dbus-linked" - QCONFIG_DEFINE="QT_DBUS" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" -dbus-linked" - - qt4-build_src_configure -} diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild deleted file mode 100644 index cba6eb61d1a2..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Declarative module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -fi -IUSE="+accessibility qt3support webkit" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=] - ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=] - ~dev-qt/qtscript-${PV}[aqua=,debug=] - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=] - ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=] - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] - qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=] ) - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] ) -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/declarative - src/imports - src/plugins/qmltooling - tools/qml - tools/qmlplugindump" - - if use webkit; then - QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative" - fi - - QT4_EXTRACT_DIRECTORIES=" - include - src - tools - translations" - - QCONFIG_ADD="declarative" - QCONFIG_DEFINE="QT_DECLARATIVE" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -declarative -no-gtkstyle - $(qt_use accessibility) - $(qt_use qt3support) - $(qt_use webkit)" - qt4-build_src_configure -} - -src_install() { - qt4-build_src_install - - # install private headers - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then - insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private - # ran for the 2nd time, need it for the updated headers - fix_includes - else - insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private - fi - find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} + -} diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest index ac4ca6af0d23..1bd4b07babd8 100644 --- a/dev-qt/qtdemo/Manifest +++ b/dev-qt/qtdemo/Manifest @@ -1,3 +1,2 @@ -DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2 diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml index 17de06fe1199..669d73962d56 100644 --- a/dev-qt/qtdemo/metadata.xml +++ b/dev-qt/qtdemo/metadata.xml @@ -11,7 +11,6 @@ <flag name="opengl">Build QtOpenGL examples and demos</flag> <flag name="openvg">Build QtOpenVG examples and demos</flag> <flag name="phonon">Build Phonon examples and demos</flag> - <flag name="qt3support">Build Qt3Support examples and demos</flag> <flag name="webkit">Build QtWebKit examples and demos</flag> <flag name="xmlpatterns">Build QtXmlPatterns examples and demos</flag> </use> diff --git a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild deleted file mode 100644 index 2607b79b9ac4..000000000000 --- a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="Demonstration module and examples for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-macos" -fi -IUSE="dbus declarative kde multimedia opengl openvg phonon qt3support webkit xmlpatterns" - -DEPEND=" - ~dev-qt/designer-${PV}[aqua=,debug=] - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support?] - ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support?] - ~dev-qt/qthelp-${PV}[aqua=,debug=] - ~dev-qt/qtscript-${PV}[aqua=,debug=] - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support?] - ~dev-qt/qtsvg-${PV}[aqua=,debug=] - ~dev-qt/qttest-${PV}[aqua=,debug=] - dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) - declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?] ) - multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=] ) - opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support?] ) - openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,qt3support?] ) - phonon? ( - kde? ( media-libs/phonon[aqua=,qt4] ) - !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=,qt4] ) ) - ) - qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] ) - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] ) - xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.6-plugandpaint.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - demos - examples" - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - doc/src/images - include - src - tools" - - qt4-build_pkg_setup -} - -src_prepare() { - qt4-build_src_prepare - - # Array mapping USE flags to subdirs - local flags_subdirs_map=( - 'dbus' - 'declarative:declarative' - 'multimedia:spectrum' - 'opengl:boxes|glhypnotizer' - 'openvg' - 'phonon:mediaplayer' - 'webkit:browser' - 'xmlpatterns' - ) - - # Disable unwanted examples/demos - for flag in "${flags_subdirs_map[@]}"; do - if ! use ${flag%:*}; then - einfo "Disabling ${flag%:*} examples" - sed -i -e "/SUBDIRS += ${flag%:*}/d" \ - examples/examples.pro || die - - if [[ ${flag} == *:* ]]; then - einfo "Disabling ${flag%:*} demos" - sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \ - demos/demos.pro || die - fi - fi - done - - if ! use qt3support; then - einfo "Disabling qt3support examples" - sed -i -e '/QT_CONFIG, qt3support/d' \ - examples/graphicsview/graphicsview.pro || die - fi -} - -src_configure() { - myconf+=" - $(qt_use dbus) - $(qt_use declarative) - $(qt_use multimedia) -no-audio-backend - $(qt_use opengl) - $(qt_use openvg) - $(qt_use phonon) -no-phonon-backend - $(qt_use qt3support) - $(qt_use webkit) - $(qt_use xmlpatterns)" - - qt4-build_src_configure -} - -src_install() { - insinto "${QTDOCDIR#${EPREFIX}}"/src - doins -r doc/src/images - - qt4-build_src_install -} diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch b/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch deleted file mode 100644 index c975ebfaca2d..000000000000 --- a/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001 -From: Gatis Paeglis <gatis.paeglis@digia.com> -Date: Sat, 31 Aug 2013 21:22:47 +0200 -Subject: [PATCH] Revert "QTBUG-15319: fix shortcuts with secondary Xkb - layout." - -The change which attempted to fix QTBUG-15319 broke keyboard -shortcuts for non latin keyboard layouts. - -This patch reverts QTBUG-15319 (f45cdeda8) since it caused a -regression. - -Task-number: QTBUG-32908 - -Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7 -Reviewed-by: David Faure <david.faure@kdab.com> ---- - src/gui/kernel/qkeymapper_x11.cpp | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp -index 005ff3f..7daa41d 100644 ---- a/src/gui/kernel/qkeymapper_x11.cpp -+++ b/src/gui/kernel/qkeymapper_x11.cpp -@@ -282,12 +282,9 @@ QList<int> QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event) - - // first, translate key only using lock modifiers (there are no Qt equivalents for these, so we must - // always use them when determining the baseKeySym) -- // Note: the Xkb group to be used for the conversion keycode->keysym has to be given to -- // XkbLookupKeySym(). This information is contained in the bits 8 to 15 of xmodifiers. -- // See https://bugreports.qt-project.org/browse/QTBUG-15319 . - KeySym baseKeySym; - uint consumedModifiers; -- if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 | LockMask | qt_num_lock_mask)), -+ if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask | qt_num_lock_mask)), - &consumedModifiers, &baseKeySym)) - return QList<int>(); - --- -1.8.3.2 - diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch b/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch deleted file mode 100644 index 47d35e232499..000000000000 --- a/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 2a9ea11f4dea51f9e75036aab8e7a23f0eb4bd1f Mon Sep 17 00:00:00 2001 -From: aavit <eirik.aavitsland@digia.com> -Date: Tue, 10 Sep 2013 11:46:51 +0200 -Subject: Compilation fix for libjpeg release 9 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In the latest libjpeg version, the "boolean" type is changed so that -true and false no longer can be used instead of TRUE and FALSE. - -Also, purge some ancient code remains meant to support a now defunct -OS´s idea about the boolean type. - -Task-number: QTBUG-33166 -Change-Id: Iebbdf300cfdc22775954de65f985358424ed2b49 -Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> -(cherry picked from qtbase/fad6aa619bf6eb048821a58065433f6b598c10e4) ---- - src/gui/image/qjpeghandler.cpp | 27 +++++---------------------- - 1 file changed, 5 insertions(+), 22 deletions(-) - -diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp -index a8700b7..ba5c469 100644 ---- a/src/gui/image/qjpeghandler.cpp -+++ b/src/gui/image/qjpeghandler.cpp -@@ -157,11 +157,7 @@ static boolean qt_fill_input_buffer(j_decompress_ptr cinfo) - } else { - src->bytes_in_buffer = num_read; - } --#if defined(Q_OS_UNIXWARE) -- return B_TRUE; --#else -- return true; --#endif -+ return TRUE; - } - - static void qt_skip_input_data(j_decompress_ptr cinfo, long num_bytes) -@@ -489,11 +485,7 @@ static boolean qt_empty_output_buffer(j_compress_ptr cinfo) - dest->next_output_byte = dest->buffer; - dest->free_in_buffer = max_buf; - --#if defined(Q_OS_UNIXWARE) -- return B_TRUE; --#else -- return true; --#endif -+ return TRUE; - } - - static void qt_term_destination(j_compress_ptr cinfo) -@@ -584,13 +576,8 @@ static bool write_jpeg_image(const QImage &image, QIODevice *device, int sourceQ - - - int quality = sourceQuality >= 0 ? qMin(sourceQuality,100) : 75; --#if defined(Q_OS_UNIXWARE) -- jpeg_set_quality(&cinfo, quality, B_TRUE /* limit to baseline-JPEG values */); -- jpeg_start_compress(&cinfo, B_TRUE); --#else -- jpeg_set_quality(&cinfo, quality, true /* limit to baseline-JPEG values */); -- jpeg_start_compress(&cinfo, true); --#endif -+ jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */); -+ jpeg_start_compress(&cinfo, TRUE); - - row_pointer[0] = new uchar[cinfo.image_width*cinfo.input_components]; - int w = cinfo.image_width; -@@ -751,11 +738,7 @@ bool QJpegHandlerPrivate::readJpegHeader(QIODevice *device) - err.error_exit = my_error_exit; - - if (!setjmp(err.setjmp_buffer)) { -- #if defined(Q_OS_UNIXWARE) -- (void) jpeg_read_header(&info, B_TRUE); -- #else -- (void) jpeg_read_header(&info, true); -- #endif -+ (void) jpeg_read_header(&info, TRUE); - - int width = 0; - int height = 0; --- -2.0.0 - diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index 81af19f0a5d1..0cdbb9c9fb06 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -10,7 +10,6 @@ inside the event loop (recommended by upstream)</flag> <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> <flag name="glib">Enable integration with the <pkg>dev-libs/glib</pkg> event loop</flag> - <flag name="gtk">Build the GTK platform theme plugin</flag> <flag name="gtkstyle">Build a widgets style that mimics the active GTK+ theme</flag> <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for text shaping</flag> <flag name="ibus">Build the IBus input method plugin</flag> diff --git a/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild deleted file mode 100644 index 4a61205cd3a8..000000000000 --- a/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils qt4-build - -DESCRIPTION="The GUI module for the Qt toolkit" -SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch" - -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi - -IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv" - -REQUIRED_USE=" - gtkstyle? ( glib ) -" - -# cairo[-qt4] is needed because of bug 454066 -RDEPEND=" - app-eselect/eselect-qtgraphicssystem - ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=] - ~dev-qt/qtscript-${PV}[aqua=,debug=] - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0= - sys-libs/zlib - virtual/jpeg:0 - !aqua? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - cups? ( net-print/cups ) - egl? ( media-libs/mesa[egl] ) - glib? ( dev-libs/glib:2 ) - gtkstyle? ( - x11-libs/cairo[-qt4(-)] - x11-libs/gtk+:2[aqua=] - ) - mng? ( >=media-libs/libmng-1.0.9:= ) - nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff:0 ) - !<dev-qt/qthelp-4.8.5:4 -" -DEPEND="${RDEPEND} - !aqua? ( - x11-proto/inputproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto ) - xv? ( x11-proto/videoproto ) - ) -" -PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )" - -PATCHES=( - "${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880 - "${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257 - "${FILESDIR}/${PN}-4.8.5-cleanlooks-floating-point-exception.patch" # bug 507124 - "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226 - "${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984 - "${FILESDIR}/${PN}-4.8.5-keyboard-shortcuts.patch" # bug 477796 - "${FILESDIR}/${PN}-4.8.5-libjpeg-9.patch" # bug 480182 - "${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968 - "${FILESDIR}/${PN}-4.8.5-CVE-2015-0295.patch" # bug 541972 -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/gui - src/scripttools - src/plugins/imageformats/gif - src/plugins/imageformats/ico - src/plugins/imageformats/jpeg - src/plugins/imageformats/tga - src/plugins/inputmethods" - - QT4_EXTRACT_DIRECTORIES=" - examples/desktop/systray - include - src" - - use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets" - use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng" - use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff" - use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay" - - # mac version does not contain qtconfig? - [[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" - - qt4-build_pkg_setup -} - -src_prepare() { - qt4-build_src_prepare - - # Add -xvideo to the list of accepted configure options - sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die -} - -src_configure() { - myconf="$(qt_use accessibility) - $(qt_use cups) - $(qt_use glib) - $(qt_use mng libmng system) - $(qt_use nas nas-sound system) - $(qt_use nis) - $(qt_use tiff libtiff system) - $(qt_use egl) - $(qt_use qt3support) - $(qt_use gtkstyle) - $(qt_use xinerama) - $(qt_use xv xvideo)" - - myconf+=" - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" - - # bug 367045 - [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" - - qt4-build_src_configure - - if use gtkstyle; then - sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed" - fi - - sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed" -} - -src_install() { - QCONFIG_ADD=" - mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync - fontconfig system-freetype gif png system-png jpeg system-jpeg - $(usev accessibility) - $(usev cups) - $(use mng && echo system-mng) - $(usev nas) - $(usev nis) - $(use tiff && echo system-tiff) - $(usev xinerama) - $(use xv && echo xvideo)" - QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui" - QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) - $(use cups && echo QT_CUPS) - $(use egl && echo QT_EGL) - QT_FONTCONFIG QT_FREETYPE - $(use gtkstyle && echo QT_STYLE_GTK) - QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG - $(use mng && echo QT_IMAGEFORMAT_MNG) - $(use nas && echo QT_NAS) - $(use nis && echo QT_NIS) - $(use tiff && echo QT_IMAGEFORMAT_TIFF) - QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES - $(use xinerama && echo QT_XINERAMA) - QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC - $(use xv && echo QT_XVIDEO)" - - qt4-build_src_install - - # install private headers - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then - insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/ - else - insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private - fi - find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} + - - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then - # rerun to get links to headers right - fix_includes - fi - - # touch the available graphics systems - dodir /usr/share/qt4/graphicssystems - echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die - echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die - - newicon tools/qtconfig/images/appicon.png qtconfig.png - make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' - - # bug 388551 - if use gtkstyle; then - local tempfile=${T}/${PN}${SLOT}.sh - cat <<-EOF > "${tempfile}" - export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0 - EOF - insinto /etc/profile.d - doins "${tempfile}" - fi -} - -pkg_postinst() { - qt4-build_pkg_postinst - - # raster is the default graphicssystem, set it on first install - eselect qtgraphicssystem set raster --use-old -} diff --git a/dev-qt/qtgui/qtgui-5.5.1.ebuild b/dev-qt/qtgui/qtgui-5.5.1.ebuild index 507b6d34cc73..c40699381bc2 100644 --- a/dev-qt/qtgui/qtgui-5.5.1.ebuild +++ b/dev-qt/qtgui/qtgui-5.5.1.ebuild @@ -22,6 +22,7 @@ REQUIRED_USE=" eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) + xcb? ( gles2? ( egl ) ) " RDEPEND=" diff --git a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch deleted file mode 100644 index cc7621969991..000000000000 --- a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- tools/assistant/compat/compat.pro 2010-10-08 16:54:09.804000000 +0300 -+++ tools/assistant/compat/compat.pro 2010-10-08 16:54:37.884000000 +0300 -@@ -14,6 +14,8 @@ - - PROJECTNAME = Assistant - -+DESTDIR = ../../../bin -+ - FORMS += helpdialog.ui \ - mainwindow.ui \ - tabbedbrowser.ui \ -@@ -59,6 +61,9 @@ - TARGET = Assistant_adp - } - -+target.path=$$[QT_INSTALL_BINS] -+INSTALLS += target -+ - TRANSLATIONS = translations/assistant_adp_de.ts \ - translations/assistant_adp_ja.ts \ - translations/assistant_adp_pl.ts \ diff --git a/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild b/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild deleted file mode 100644 index 6aff23ce120b..000000000000 --- a/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils qt4-build - -DESCRIPTION="The Help module for the Qt toolkit" -SRC_URI+=" - compat? ( - http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz - https://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz - )" - -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -fi - -IUSE="compat doc" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] - ~dev-qt/qtgui-${PV}[aqua=,debug=] - ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite] - compat? ( - ~dev-qt/qtdbus-${PV}[aqua=,debug=] - sys-libs/zlib - ) -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - tools/assistant/lib/fulltextsearch - tools/assistant/lib - tools/assistant/tools/qhelpgenerator - tools/assistant/tools/qcollectiongenerator - tools/assistant/tools/qhelpconverter - tools/qdoc3" - QT4_EXTRACT_DIRECTORIES=" - demos - doc - examples - include - src - tools" - - use compat && QT4_TARGET_DIRECTORIES+=" - tools/assistant/compat - tools/assistant/compat/lib" - - qt4-build_pkg_setup -} - -src_unpack() { - qt4-build_src_unpack - - # compat version - # http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ - if use compat; then - unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \ - qt-assistant-compat-headers-4.7.tar.gz - mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \ - "${S}"/tools/assistant/compat || die - mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die - fi -} - -src_prepare() { - qt4-build_src_prepare - - use compat && epatch "${FILESDIR}"/${PN}-4.8.5-fix-compat.patch - - # bug 348034 - sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die -} - -src_configure() { - myconf+=" - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns - -no-nas-sound -no-cups -no-nis -fontconfig" - - qt4-build_src_configure -} - -src_compile() { - # help libQtHelp find freshly built libQtCLucene (bug #289811) - export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}" - export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework" - - qt4-build_src_compile - - # ugly hack to build docs - "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die - - if use doc; then - emake docs - elif [[ ${QT4_BUILD_TYPE} == release ]]; then - # live ebuild cannot build qch_docs, it will build them through emake docs - emake qch_docs - fi -} - -src_install() { - qt4-build_src_install - - emake INSTALL_ROOT="${D}" install_qchdocs - - # do not compress .qch files - docompress -x "${QTDOCDIR}"/qch - - if use doc; then - emake INSTALL_ROOT="${D}" install_htmldocs - fi - - if use compat; then - insinto "${QTDATADIR#${EPREFIX}}"/mkspecs/features - doins tools/assistant/compat/features/assistant.prf - fi -} diff --git a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild index 854c9eb18d8b..e72281c05be8 100644 --- a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild +++ b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz" LICENSE="|| ( LGPL-2.1 GPL-3 )" SLOT="0" -KEYWORDS="amd64 arm ~hppa ppc ~ppc64 x86" +KEYWORDS="amd64 arm ~hppa ppc ppc64 x86" IUSE="doc +qt4 qt5" REQUIRED_USE="|| ( qt4 qt5 )" diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild deleted file mode 100644 index b1e129f7e69d..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Multimedia module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -fi -IUSE="alsa" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] - ~dev-qt/qtgui-${PV}[aqua=,debug=] - alsa? ( media-libs/alsa-lib ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.0-alsa.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/multimedia" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtGui - include/QtMultimedia - src/src.pro - src/corelib - src/gui" - - QCONFIG_ADD="multimedia" - QCONFIG_DEFINE="QT_MULTIMEDIA" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -multimedia -audio-backend - $(qt_use alsa) - -no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend - -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb" - - qt4-build_src_configure -} diff --git a/dev-qt/qtopengl/qtopengl-4.8.5.ebuild b/dev-qt/qtopengl/qtopengl-4.8.5.ebuild deleted file mode 100644 index 683afb554ba6..000000000000 --- a/dev-qt/qtopengl/qtopengl-4.8.5.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The OpenGL module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="egl qt3support" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] - ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=] - virtual/opengl -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/opengl - src/plugins/graphicssystems/opengl" - - QT4_EXTRACT_DIRECTORIES=" - include/QtCore - include/QtGui - include/QtOpenGL - src/corelib - src/gui - src/opengl - src/plugins - src/3rdparty" - - QCONFIG_ADD="opengl" - QCONFIG_DEFINE="QT_OPENGL" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -opengl - $(qt_use qt3support) - $(qt_use egl)" - - qt4-build_src_configure - - # Not building tools/designer/src/plugins/tools/view3d as it's - # commented out of the build in the source -} - -src_install() { - qt4-build_src_install - - # touch the available graphics systems - dodir /usr/share/qt4/graphicssystems - echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die -} diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild deleted file mode 100644 index db2fdd76efc6..000000000000 --- a/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The OpenVG module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="qt3support" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] - ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=] - media-libs/mesa[egl,openvg] -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/openvg - src/plugins/graphicssystems/openvg" - - QT4_EXTRACT_DIRECTORIES=" - include/QtCore - include/QtGui - include/QtOpenVG - src/corelib - src/gui - src/openvg - src/plugins - src/3rdparty" - - QCONFIG_ADD="openvg" - QCONFIG_DEFINE="QT_OPENVG" - - qt4-build_pkg_setup -} - -src_configure() { - gltype="desktop" - - myconf+=" - -openvg -egl - $(qt_use qt3support)" - - qt4-build_src_configure -} - -src_install() { - qt4-build_src_install - - # touch the available graphics systems - dodir /usr/share/qt4/graphicssystems - echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die -} diff --git a/dev-qt/qtphonon/qtphonon-4.8.5.ebuild b/dev-qt/qtphonon/qtphonon-4.8.5.ebuild deleted file mode 100644 index b70091fdfdf9..000000000000 --- a/dev-qt/qtphonon/qtphonon-4.8.5.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Phonon module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="dbus qt3support" - -DEPEND=" - ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=] - !kde-apps/phonon-kde - !kde-base/phonon-xine - !media-libs/phonon - !media-sound/phonon - !aqua? ( media-libs/gstreamer:0.10 - media-plugins/gst-plugins-meta:0.10 ) - aqua? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=] ) - dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/phonon - src/plugins/phonon" - - QT4_EXTRACT_DIRECTORIES=" - include - src" - - QCONFIG_ADD="phonon" - QCONFIG_DEFINE="QT_PHONON - $(use !aqua && echo QT_GSTREAMER)" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -phonon -phonon-backend -no-opengl -no-svg - $(qt_use dbus qdbus) - $(qt_use qt3support)" - - qt4-build_src_configure -} diff --git a/dev-qt/qtquick1/qtquick1-5.4.2.ebuild b/dev-qt/qtquick1/qtquick1-5.4.2.ebuild index eaad8b0f2522..99bc3c80b22b 100644 --- a/dev-qt/qtquick1/qtquick1-5.4.2.ebuild +++ b/dev-qt/qtquick1/qtquick1-5.4.2.ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="Legacy declarative UI module for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc64 ~x86" + KEYWORDS="amd64 arm ~arm64 ~hppa ppc64 ~x86" fi IUSE="designer opengl webkit xml" diff --git a/dev-qt/qtscript/files/4.8.2-javascriptcore-x32.patch b/dev-qt/qtscript/files/4.8.2-javascriptcore-x32.patch deleted file mode 100644 index 35a157337cf9..000000000000 --- a/dev-qt/qtscript/files/4.8.2-javascriptcore-x32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ---- qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2012-06-14 16:17:21.328043461 +0200 -+++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2012-06-14 16:42:13.699386250 +0200 -@@ -884,7 +884,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) -+#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) - #define WTF_USE_JSVALUE64 1 - #elif CPU(ARM) || CPU(PPC64) - #define WTF_USE_JSVALUE32 1 diff --git a/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch new file mode 100644 index 000000000000..cde4cfb93f51 --- /dev/null +++ b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch @@ -0,0 +1,53 @@ +From 4e7126ea1488f3e1df0b76cacf83cb73f9d4b54c Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@digia.com> +Date: Tue, 4 Mar 2014 10:46:18 +0100 +Subject: Fix build on x32 + +Recognize x32 and disable JIT in this configuration. + +Task-number: QTBUG-35463 +Change-Id: Ie5bf64f22f3e58a9b3f12190cf790ad6c39f415e +--- + src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +index 0b95639..85ed8a7 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -202,6 +202,11 @@ + #if defined(__x86_64__) \ + || defined(_M_X64) + #define WTF_CPU_X86_64 1 ++ ++#if defined(__ILP32__) ++#define WTF_CPU_X32 1 ++#endif ++ + #endif + + /* 64-bit mode on AIX */ +@@ -906,7 +911,7 @@ + #endif + + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) +-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) ++#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) + #define WTF_USE_JSVALUE64 1 + #elif CPU(ARM) || CPU(PPC64) + #define WTF_USE_JSVALUE32 1 +@@ -923,6 +928,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ + #define ENABLE_REPAINT_THROTTLING 0 + #endif + ++/* Disable JIT on x32 */ ++#if CPU(X32) ++#define ENABLE_JIT 0 ++#endif ++ + #if !defined(ENABLE_JIT) + + /* The JIT is tested & working on x86_64 Mac */ +-- +cgit v0.11.0 + diff --git a/dev-qt/qtscript/qtscript-4.8.5.ebuild b/dev-qt/qtscript/qtscript-4.8.5.ebuild deleted file mode 100644 index af795b186498..000000000000 --- a/dev-qt/qtscript/qtscript-4.8.5.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The QtScript module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="iconv +jit" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/4.8.2-javascriptcore-x32.patch" ) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/script" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtScript - src/3rdparty/javascriptcore - src/corelib" - - QCONFIG_ADD="script" - QCONFIG_DEFINE="QT_SCRIPT" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - $(qt_use iconv) - $(qt_use jit javascript-jit) - -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama - -no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif - -no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff - -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg - -no-gtkstyle" - - qt4-build_src_configure -} - -src_install() { - qt4-build_src_install - - # install private headers - insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private - find "${S}"/src/script -type f -name "*_p.h" -exec doins {} + -} diff --git a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild b/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild index 14d3497298c8..db626e8332b9 100644 --- a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild +++ b/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild @@ -26,6 +26,8 @@ QT4_TARGET_DIRECTORIES="src/script" QCONFIG_ADD="script" QCONFIG_DEFINE="QT_SCRIPT" +PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" ) + multilib_src_configure() { local myconf=( $(qt_use jit javascript-jit) diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild index fdb078711d2a..e8addd703872 100644 --- a/dev-qt/qtscript/qtscript-4.8.7.ebuild +++ b/dev-qt/qtscript/qtscript-4.8.7.ebuild @@ -23,6 +23,8 @@ QT4_TARGET_DIRECTORIES="src/script" QCONFIG_ADD="script" QCONFIG_DEFINE="QT_SCRIPT" +PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" ) + multilib_src_configure() { local myconf=( $(qt_use jit javascript-jit) diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild index 9be4cc1bce96..643015c77c3d 100644 --- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild +++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz" LICENSE="|| ( LGPL-2.1 GPL-3 )" SLOT="0" -KEYWORDS="amd64 arm ~hppa ppc ~ppc64 x86" +KEYWORDS="amd64 arm ~hppa ppc ppc64 x86" IUSE="doc +qt4 qt5 X" REQUIRED_USE="|| ( qt4 qt5 )" diff --git a/dev-qt/qtsql/qtsql-4.8.5.ebuild b/dev-qt/qtsql/qtsql-4.8.5.ebuild deleted file mode 100644 index 6bc8acc2fefd..000000000000 --- a/dev-qt/qtsql/qtsql-4.8.5.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit multilib qt4-build - -DESCRIPTION="The SQL module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite" - -REQUIRED_USE=" - || ( firebird freetds mysql oci8 odbc postgres sqlite ) -" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] - firebird? ( dev-db/firebird ) - freetds? ( dev-db/freetds ) - mysql? ( virtual/mysql ) - oci8? ( dev-db/oracle-instantclient-basic ) - odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) - postgres? ( dev-db/postgresql ) - sqlite? ( dev-db/sqlite:3 ) -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/sql - src/plugins/sqldrivers" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtSql - src/src.pro - src/corelib - src/plugins - src/tools/tools.pro" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - $(qt_use firebird sql-ibase plugin) - $(qt_use freetds sql-tds plugin) - $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql") - $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)") - $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc") - $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql") - $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite) - -no-sql-db2 - -no-sql-sqlite2 - -no-sql-symsql - $(qt_use qt3support) - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - -no-glib" - - qt4-build_src_configure -} diff --git a/dev-qt/qtsvg/qtsvg-4.8.5.ebuild b/dev-qt/qtsvg/qtsvg-4.8.5.ebuild deleted file mode 100644 index 23b3df6cce58..000000000000 --- a/dev-qt/qtsvg/qtsvg-4.8.5.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The SVG module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+accessibility" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=] - sys-libs/zlib -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/svg - src/plugins/imageformats/svg - src/plugins/iconengines/svgiconengine" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/QtSvg - include/Qt - include/QtGui - include/QtCore - include/QtXml - src/corelib - src/gui - src/plugins - src/xml - src/3rdparty" - - QCONFIG_ADD="svg" - QCONFIG_DEFINE="QT_SVG" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -svg - $(qt_use accessibility) - -no-xkb -no-xrender - -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm - -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff - -no-fontconfig -no-glib -no-gtkstyle" - - qt4-build_src_configure -} diff --git a/dev-qt/qttest/qttest-4.8.5.ebuild b/dev-qt/qttest/qttest-4.8.5.ebuild deleted file mode 100644 index c712f12fd602..000000000000 --- a/dev-qt/qttest/qttest-4.8.5.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The QtTest module for unit testing Qt applications and libraries" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/testlib" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/QtTest - include/QtCore - src/corelib" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor - -no-xinerama -no-xshape -no-sm -no-opengl - -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff - -no-accessibility -no-fontconfig -no-glib -no-svg" - - qt4-build_src_configure -} diff --git a/dev-qt/qtwebchannel/files/qtwebchannel-5.5.1-optional-qtdeclarative.patch b/dev-qt/qtwebchannel/files/qtwebchannel-5.5.1-optional-qtdeclarative.patch new file mode 100644 index 000000000000..e7011ad90a1c --- /dev/null +++ b/dev-qt/qtwebchannel/files/qtwebchannel-5.5.1-optional-qtdeclarative.patch @@ -0,0 +1,62 @@ +From 906d910415454d64ff0b021b06f0df422a8c82bd Mon Sep 17 00:00:00 2001 +From: Andy Shaw <andy.shaw@theqtcompany.com> +Date: Wed, 23 Sep 2015 06:52:01 +0000 +Subject: [PATCH] Compile when QML is disabled + +Since QJSValue is part of the QML module then it should check if that is +available before using it so we add a QT_NO_JSVALUE define to help with +this. + +Task-number: QTBUG-46850 +Change-Id: I1974518a5c134dbb8508a46505b43c820a7a700a +Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> +--- + src/webchannel/qmetaobjectpublisher.cpp | 4 ++++ + src/webchannel/webchannel.pro | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp +index 0cad569..22df02b 100644 +--- a/src/webchannel/qmetaobjectpublisher.cpp ++++ b/src/webchannel/qmetaobjectpublisher.cpp +@@ -41,7 +41,9 @@ + #include <QDebug> + #include <QJsonObject> + #include <QJsonArray> ++#ifndef QT_NO_JSVALUE + #include <QJSValue> ++#endif + #include <QUuid> + + QT_BEGIN_NAMESPACE +@@ -486,12 +488,14 @@ QJsonValue QMetaObjectPublisher::wrapResult(const QVariant &result, QWebChannelA + if (!classInfo.isEmpty()) + objectInfo[KEY_DATA] = classInfo; + return objectInfo; ++#ifndef QT_NO_JSVALUE + } else if (result.canConvert<QJSValue>()) { + // Workaround for keeping QJSValues from QVariant. + // Calling QJSValue::toVariant() converts JS-objects/arrays to QVariantMap/List + // instead of stashing a QJSValue itself into a variant. + // TODO: Improve QJSValue-QJsonValue conversion in Qt. + return wrapResult(result.value<QJSValue>().toVariant(), transport, parentObjectId); ++#endif + } else if (result.canConvert<QVariantList>()) { + // recurse and potentially wrap contents of the array + return wrapList(result.toList(), transport); +diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro +index eba8123..931ee03 100644 +--- a/src/webchannel/webchannel.pro ++++ b/src/webchannel/webchannel.pro +@@ -39,6 +39,8 @@ qtHaveModule(qml) { + + PRIVATE_HEADERS += \ + qqmlwebchannelattached_p.h ++} else { ++ DEFINES += QT_NO_JSVALUE + } + + HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS +-- +2.4.10 + diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.5.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.5.1.ebuild index b3c9b854605b..ac67dce120be 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-5.5.1.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-5.5.1.ebuild @@ -19,6 +19,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-optional-qtdeclarative.patch" ) + src_prepare() { qt_use_disable_mod qml quick src/src.pro qt_use_disable_mod qml qml src/webchannel/webchannel.pro diff --git a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch b/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch deleted file mode 100644 index d29d5da7f04c..000000000000 --- a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri ---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:39:16.884473572 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:41:14.245006363 +0200 -@@ -3,13 +3,6 @@ - contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 - contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 - --linux-g++ { --isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -- message(Using gold linker) -- QMAKE_LFLAGS+=-fuse-ld=gold --} --} -- - # We use this flag on production branches - # See https://bugs.webkit.org/show_bug.cgi?id=60824 - CONFIG += production diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild deleted file mode 100644 index d7de5b417345..000000000000 --- a/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit qt4-build flag-o-matic - -DESCRIPTION="The WebKit module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+gstreamer icu +jit" - -# libxml2[!icu?] is needed for bugs 407315 and 411091 -DEPEND=" - dev-db/sqlite:3 - ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl] - ~dev-qt/qtgui-${PV}[aqua=,debug=] - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] - x11-libs/libX11 - x11-libs/libXrender - gstreamer? ( - dev-libs/glib:2 - dev-libs/libxml2:2[!icu?] - >=media-libs/gstreamer-0.10.36:0.10 - >=media-libs/gst-plugins-base-0.10.36:0.10 - ) - icu? ( dev-libs/icu:= ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch" - "${FILESDIR}/4.8.2-javascriptcore-x32.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/3rdparty/webkit/Source/JavaScriptCore - src/3rdparty/webkit/Source/WebCore - src/3rdparty/webkit/Source/WebKit/qt" - - QT4_EXTRACT_DIRECTORIES=" - include - src" - - QCONFIG_ADD="webkit" - QCONFIG_DEFINE="QT_WEBKIT" - - qt4-build_pkg_setup -} - -src_prepare() { - # Fix version number in generated pkgconfig file, bug 406443 - sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ - src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die - - # Remove -Werror from CXXFLAGS - sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ - src/3rdparty/webkit/Source/WebKit.pri || die - - if use icu; then - sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ - src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die - fi - - qt4-build_src_prepare -} - -src_configure() { - myconf+=" - -webkit - -system-sqlite - $(qt_use icu) - $(qt_use jit javascript-jit) - $(use gstreamer || echo -DENABLE_VIDEO=0)" - - qt4-build_src_configure -} diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild deleted file mode 100644 index 5a446e92a778..000000000000 --- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The XmlPatterns module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/xmlpatterns - tools/xmlpatterns - tools/xmlpatternsvalidator" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/QtCore - include/QtNetwork - include/QtXml - include/QtXmlPatterns - src/network - src/xml - src/corelib" - - QCONFIG_ADD="xmlpatterns" - QCONFIG_DEFINE="QT_XMLPATTERNS" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" -xmlpatterns" - - qt4-build_src_configure -} diff --git a/dev-ros/amcl/Manifest b/dev-ros/amcl/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/amcl/Manifest +++ b/dev-ros/amcl/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/amcl/amcl-1.13.1.ebuild b/dev-ros/amcl/amcl-1.13.1.ebuild new file mode 100644 index 000000000000..8d1136f4ad68 --- /dev/null +++ b/dev-ros/amcl/amcl-1.13.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Probabilistic localization system for a robot moving in 2D" +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/tf + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-libs/boost:= + dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND} + test? ( dev-ros/rostest[${PYTHON_USEDEP}] ) +" diff --git a/dev-ros/base_local_planner/Manifest b/dev-ros/base_local_planner/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/base_local_planner/Manifest +++ b/dev-ros/base_local_planner/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/base_local_planner/base_local_planner-1.13.1.ebuild b/dev-ros/base_local_planner/base_local_planner-1.13.1.ebuild new file mode 100644 index 000000000000..a6369ac09c2f --- /dev/null +++ b/dev-ros/base_local_planner/base_local_planner-1.13.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +CATKIN_HAS_MESSAGES=yes +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/tf + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/nav_core + dev-ros/pcl_conversions + dev-ros/rostest + dev-ros/costmap_2d + dev-ros/pluginlib + dev-ros/angles + dev-libs/boost:=[threads] + dev-cpp/eigen:3 + sci-libs/pcl +" +DEPEND="${RDEPEND} + dev-ros/cmake_modules + test? ( dev-cpp/gtest ) +" diff --git a/dev-ros/carrot_planner/Manifest b/dev-ros/carrot_planner/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/carrot_planner/Manifest +++ b/dev-ros/carrot_planner/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/carrot_planner/carrot_planner-1.13.1.ebuild b/dev-ros/carrot_planner/carrot_planner-1.13.1.ebuild new file mode 100644 index 000000000000..adf49edf5b94 --- /dev/null +++ b/dev-ros/carrot_planner/carrot_planner-1.13.1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Attempts to find a legal place to put a carrot for the robot to follow" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/tf + dev-ros/nav_core + dev-ros/costmap_2d + dev-ros/base_local_planner + dev-ros/pluginlib +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/clear_costmap_recovery/Manifest b/dev-ros/clear_costmap_recovery/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/clear_costmap_recovery/Manifest +++ b/dev-ros/clear_costmap_recovery/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.1.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.1.ebuild new file mode 100644 index 000000000000..5e3fc2c93e9c --- /dev/null +++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Recovery behavior that attempts to clear space by reverting the costmaps to the static map" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + >=dev-ros/costmap_2d-1.13.1 + dev-ros/nav_core + dev-ros/pluginlib + dev-ros/roscpp + dev-ros/tf + dev-cpp/eigen:3 + sci-libs/pcl +" +DEPEND="${RDEPEND} + dev-ros/cmake_modules + test? ( dev-ros/rostest dev-cpp/gtest ) +" diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild index 2a32da63e50d..5e3fc2c93e9c 100644 --- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild +++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild @@ -15,7 +15,7 @@ SLOT="0" IUSE="" RDEPEND=" - dev-ros/costmap_2d + >=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp diff --git a/dev-ros/costmap_2d/Manifest b/dev-ros/costmap_2d/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/costmap_2d/Manifest +++ b/dev-ros/costmap_2d/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/costmap_2d/costmap_2d-1.13.1.ebuild b/dev-ros/costmap_2d/costmap_2d-1.13.1.ebuild new file mode 100644 index 000000000000..fa91c4177ea8 --- /dev/null +++ b/dev-ros/costmap_2d/costmap_2d-1.13.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python2_7 ) +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs" + +inherit ros-catkin + +DESCRIPTION="Creates a 2D costmap from sensor data" +LICENSE="BSD" +SLOT="0" +IUSE="" +REQUIRED_USE="ros_messages_cxx" + +RDEPEND=" + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/laser_geometry + dev-ros/message_filters + dev-ros/nav_msgs + dev-ros/pcl_conversions + dev-ros/pcl_ros + dev-ros/pluginlib + dev-ros/roscpp + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/tf + dev-ros/voxel_grid + dev-cpp/eigen:3 + sci-libs/pcl + dev-libs/boost:=[threads] +" +DEPEND="${RDEPEND} + dev-ros/cmake_modules + test? ( dev-ros/rostest[${PYTHON_USEDEP}] )" diff --git a/dev-ros/depthimage_to_laserscan/Manifest b/dev-ros/depthimage_to_laserscan/Manifest new file mode 100644 index 000000000000..0b93ebbab68d --- /dev/null +++ b/dev-ros/depthimage_to_laserscan/Manifest @@ -0,0 +1 @@ +DIST depthimage_to_laserscan-1.0.7.tar.gz 12121 SHA256 3aa236f81cfd26e55718edfb50ef837a59b57169cb20a5b24f9a4e99602a09e8 SHA512 4da5fa446d574dbb44c2924dd760f160e527e68d7df119e5d9e74d85efd3473ee31845e8565b0d023d2cf22c945b3b5c56b12a04facd4e38dc3dd1235dad73e9 WHIRLPOOL a6c848acefa9ce95612167911d2f67afa0ae3e208559648939d4bcd7813a6ebd79e287dae46140c6b080a6b036cfff3bf2e70c494f248fd23d3f61d60fe825cd diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7.ebuild new file mode 100644 index 000000000000..98afcc8f62b6 --- /dev/null +++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/depthimage_to_laserscan" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Converts a depth image to a laser scan for use with navigation and localization" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/image_geometry + dev-ros/nodelet + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild new file mode 100644 index 000000000000..98afcc8f62b6 --- /dev/null +++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/depthimage_to_laserscan" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Converts a depth image to a laser scan for use with navigation and localization" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/image_geometry + dev-ros/nodelet + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/depthimage_to_laserscan/metadata.xml b/dev-ros/depthimage_to_laserscan/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/depthimage_to_laserscan/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/dwa_local_planner/Manifest b/dev-ros/dwa_local_planner/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/dwa_local_planner/Manifest +++ b/dev-ros/dwa_local_planner/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.13.1.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.13.1.ebuild new file mode 100644 index 000000000000..aff9dd2e526e --- /dev/null +++ b/dev-ros/dwa_local_planner/dwa_local_planner-1.13.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/base_local_planner + dev-ros/costmap_2d + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/nav_core + dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/pluginlib + dev-ros/pcl_conversions + dev-ros/roscpp + dev-ros/tf + dev-cpp/eigen:3 + sci-libs/pcl +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/fake_localization/Manifest b/dev-ros/fake_localization/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/fake_localization/Manifest +++ b/dev-ros/fake_localization/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/fake_localization/fake_localization-1.13.1.ebuild b/dev-ros/fake_localization/fake_localization-1.13.1.ebuild new file mode 100644 index 000000000000..cbb7e405717d --- /dev/null +++ b/dev-ros/fake_localization/fake_localization-1.13.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="A ROS node that simply forwards odometry information" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/angles + dev-ros/roscpp + dev-ros/rospy[${PYTHON_USEDEP}] + dev-ros/rosconsole + dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/tf[${PYTHON_USEDEP}] + dev-ros/message_filters +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/global_planner/Manifest b/dev-ros/global_planner/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/global_planner/Manifest +++ b/dev-ros/global_planner/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/global_planner/global_planner-1.13.1.ebuild b/dev-ros/global_planner/global_planner-1.13.1.ebuild new file mode 100644 index 000000000000..d0b9a167fc7f --- /dev/null +++ b/dev-ros/global_planner/global_planner-1.13.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Path planner library and node" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/costmap_2d + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/nav_core + dev-ros/navfn + dev-ros/pluginlib + dev-ros/roscpp + dev-ros/tf + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/image_view/image_view-1.12.14.ebuild b/dev-ros/image_view/image_view-1.12.14-r1.ebuild index c2b859bfd9c6..c46214b1fba4 100644 --- a/dev-ros/image_view/image_view-1.12.14.ebuild +++ b/dev-ros/image_view/image_view-1.12.14-r1.ebuild @@ -26,5 +26,7 @@ RDEPEND=" dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp + dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] " DEPEND="${RDEPEND}" diff --git a/dev-ros/image_view/image_view-9999.ebuild b/dev-ros/image_view/image_view-9999.ebuild index c2b859bfd9c6..c46214b1fba4 100644 --- a/dev-ros/image_view/image_view-9999.ebuild +++ b/dev-ros/image_view/image_view-9999.ebuild @@ -26,5 +26,7 @@ RDEPEND=" dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp + dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] " DEPEND="${RDEPEND}" diff --git a/dev-ros/imu_transformer/files/tests.patch b/dev-ros/imu_transformer/files/tests.patch new file mode 100644 index 000000000000..84a30fd5d458 --- /dev/null +++ b/dev-ros/imu_transformer/files/tests.patch @@ -0,0 +1,23 @@ +commit 5524d5687803f720ed8532f103e804c82cbdadb4 +Author: Alexis Ballier <aballier@gentoo.org> +Date: Sun Nov 1 23:50:20 2015 +0100 + + imu_transformer: Fix build with CATKIN_ENABLE_TESTIING=OFF + + https://bugs.gentoo.org/show_bug.cgi?id=564654 + +diff --git a/imu_transformer/CMakeLists.txt b/imu_transformer/CMakeLists.txt +index 9a498dc..1148f19 100644 +--- a/imu_transformer/CMakeLists.txt ++++ b/imu_transformer/CMakeLists.txt +@@ -31,7 +31,9 @@ target_link_libraries(imu_transformer_nodelet ${catkin_LIBRARIES}) + add_executable(imu_transformer_node src/imu_transformer_node.cpp) + target_link_libraries(imu_transformer_node ${catkin_LIBRARIES}) + +-roslaunch_add_file_check(launch) ++if(CATKIN_ENABLE_TESTING) ++ roslaunch_add_file_check(launch) ++endif() + + install(TARGETS imu_transformer_node imu_transformer_nodelet + RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} diff --git a/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild b/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild index bfb09b7fac11..48b5f06a7fb9 100644 --- a/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild +++ b/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild @@ -27,3 +27,4 @@ RDEPEND=" dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/tests.patch" ) diff --git a/dev-ros/laser_proc/Manifest b/dev-ros/laser_proc/Manifest new file mode 100644 index 000000000000..6c0734fcb95a --- /dev/null +++ b/dev-ros/laser_proc/Manifest @@ -0,0 +1 @@ +DIST laser_proc-0.1.4.tar.gz 6865 SHA256 9dde874a6ae9de30ea59e37aa0d962a35e4da3ebed7e5a639225b901fe4523bd SHA512 0a9ae28d9ad213f7227027c24b951d0a68799edc662e98e593090a7d01ab0a33671a2a26eeb3fdaf2f77a3d639a2274641c11e478c2f0689327a1fa66601b95a WHIRLPOOL ee36c6bb699c18d3a6118997f275bd0c7c8b9543ddad6517f53606d061bea9ed6e2b1497cdb1f6c6e47634037429832f055135e68baf2021df31d4779cc4c4b7 diff --git a/dev-ros/laser_proc/laser_proc-0.1.4.ebuild b/dev-ros/laser_proc/laser_proc-0.1.4.ebuild new file mode 100644 index 000000000000..5917940777da --- /dev/null +++ b/dev-ros/laser_proc/laser_proc-0.1.4.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/laser_proc" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/rosconsole + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/pluginlib + dev-ros/nodelet +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/laser_proc/laser_proc-9999.ebuild b/dev-ros/laser_proc/laser_proc-9999.ebuild new file mode 100644 index 000000000000..5917940777da --- /dev/null +++ b/dev-ros/laser_proc/laser_proc-9999.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/laser_proc" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/rosconsole + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/pluginlib + dev-ros/nodelet +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/laser_proc/metadata.xml b/dev-ros/laser_proc/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/laser_proc/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest new file mode 100644 index 000000000000..77358be640d8 --- /dev/null +++ b/dev-ros/libmavconn/Manifest @@ -0,0 +1 @@ +DIST mavros-0.15.0.tar.gz 189901 SHA256 f03d5f5968108d43a95d6774f2a76f56131d7d408481ea10f391ab7dc757af1d SHA512 bfd73130e2aa00b4d17f0558d5554d616546909c8a43ceff96623ad78faa77a426229da6c3bce296801014822bf1c61e27b4740c0b2d82d53a7094c892a03306 WHIRLPOOL 3bebdd948d9ab2923a98cc2bca0c845de198292a4013bc03dd5d96bc573d10fd5a6148643a2778358552836043f849375773b4b6dfc430dea965310eab668bd2 diff --git a/dev-ros/libmavconn/libmavconn-0.15.0.ebuild b/dev-ros/libmavconn/libmavconn-0.15.0.ebuild new file mode 100644 index 000000000000..b355f3bf65a3 --- /dev/null +++ b/dev-ros/libmavconn/libmavconn-0.15.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="MAVLink communication library" +LICENSE="GPL-3 LGPL-3 BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + >=dev-ros/mavlink-gbp-release-2015 + dev-libs/boost:= + dev-libs/console_bridge +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/libmavconn/libmavconn-9999.ebuild b/dev-ros/libmavconn/libmavconn-9999.ebuild new file mode 100644 index 000000000000..b355f3bf65a3 --- /dev/null +++ b/dev-ros/libmavconn/libmavconn-9999.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="MAVLink communication library" +LICENSE="GPL-3 LGPL-3 BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + >=dev-ros/mavlink-gbp-release-2015 + dev-libs/boost:= + dev-libs/console_bridge +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/libmavconn/metadata.xml b/dev-ros/libmavconn/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/libmavconn/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/map_server/Manifest b/dev-ros/map_server/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/map_server/Manifest +++ b/dev-ros/map_server/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/map_server/map_server-1.13.1.ebuild b/dev-ros/map_server/map_server-1.13.1.ebuild new file mode 100644 index 000000000000..9d3807fcecf6 --- /dev/null +++ b/dev-ros/map_server/map_server-1.13.1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Offers map data as a ROS service" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/tf + dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-libs/boost:= + media-libs/sdl-image + >=dev-cpp/yaml-cpp-0.5 +" +DEPEND="${RDEPEND} + test? ( dev-ros/rostest dev-cpp/gtest ) + virtual/pkgconfig" diff --git a/dev-ros/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest new file mode 100644 index 000000000000..4a312e40b924 --- /dev/null +++ b/dev-ros/mavlink-gbp-release/Manifest @@ -0,0 +1 @@ +DIST mavlink-gbp-release-2015.10.10.tar.gz 472939 SHA256 a9b6c80a0e8b1df4623e22d83b1e7cebf5242e843f0c83faa699687e2d03d0fd SHA512 9686513a28ec4942da292c0ecf8c8ad84f0e79538272ce4ef353da76bc8ce2f34c20d1d74085b086f7fee315abd64948fe462e40036addfd167b579f86ea5393 WHIRLPOOL 59316cfa5ba2c003dec9299c6e6f2f2920a12cf9379c58ee64ddb2aeca3112915934b67cd1be04370e3571e674c9f6c1010cf8f1d0480121682c8ac3570a15ab diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.10.10.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.10.10.ebuild new file mode 100644 index 000000000000..97f60dd91739 --- /dev/null +++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.10.10.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release" +VER_PREFIX=release/jade/mavlink/ +VER_SUFFIX=-${PV#*_p} +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +EGIT_BRANCH="release/jade/mavlink" +DESCRIPTION="MAVLink message marshaling library" +LICENSE="LGPL-3" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" +S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}" diff --git a/dev-ros/mavlink-gbp-release/metadata.xml b/dev-ros/mavlink-gbp-release/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/mavlink-gbp-release/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/mavros/Manifest b/dev-ros/mavros/Manifest new file mode 100644 index 000000000000..77358be640d8 --- /dev/null +++ b/dev-ros/mavros/Manifest @@ -0,0 +1 @@ +DIST mavros-0.15.0.tar.gz 189901 SHA256 f03d5f5968108d43a95d6774f2a76f56131d7d408481ea10f391ab7dc757af1d SHA512 bfd73130e2aa00b4d17f0558d5554d616546909c8a43ceff96623ad78faa77a426229da6c3bce296801014822bf1c61e27b4740c0b2d82d53a7094c892a03306 WHIRLPOOL 3bebdd948d9ab2923a98cc2bca0c845de198292a4013bc03dd5d96bc573d10fd5a6148643a2778358552836043f849375773b4b6dfc430dea965310eab668bd2 diff --git a/dev-ros/mavros/mavros-0.15.0.ebuild b/dev-ros/mavros/mavros-0.15.0.ebuild new file mode 100644 index 000000000000..00414b533c24 --- /dev/null +++ b/dev-ros/mavros/mavros-0.15.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="MAVLink extendable communication node for ROS" +LICENSE="GPL-3 LGPL-3 BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/diagnostic_updater + dev-ros/pluginlib + dev-ros/roscpp + dev-ros/tf + dev-ros/angles + dev-ros/libmavconn + dev-ros/rosconsole_bridge + dev-libs/boost:= + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/mavros/mavros-9999.ebuild b/dev-ros/mavros/mavros-9999.ebuild new file mode 100644 index 000000000000..00414b533c24 --- /dev/null +++ b/dev-ros/mavros/mavros-9999.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="MAVLink extendable communication node for ROS" +LICENSE="GPL-3 LGPL-3 BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/diagnostic_updater + dev-ros/pluginlib + dev-ros/roscpp + dev-ros/tf + dev-ros/angles + dev-ros/libmavconn + dev-ros/rosconsole_bridge + dev-libs/boost:= + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/mavros/metadata.xml b/dev-ros/mavros/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/mavros/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest new file mode 100644 index 000000000000..77358be640d8 --- /dev/null +++ b/dev-ros/mavros_extras/Manifest @@ -0,0 +1 @@ +DIST mavros-0.15.0.tar.gz 189901 SHA256 f03d5f5968108d43a95d6774f2a76f56131d7d408481ea10f391ab7dc757af1d SHA512 bfd73130e2aa00b4d17f0558d5554d616546909c8a43ceff96623ad78faa77a426229da6c3bce296801014822bf1c61e27b4740c0b2d82d53a7094c892a03306 WHIRLPOOL 3bebdd948d9ab2923a98cc2bca0c845de198292a4013bc03dd5d96bc573d10fd5a6148643a2778358552836043f849375773b4b6dfc430dea965310eab668bd2 diff --git a/dev-ros/mavros_extras/mavros_extras-0.15.0.ebuild b/dev-ros/mavros_extras/mavros_extras-0.15.0.ebuild new file mode 100644 index 000000000000..562281398552 --- /dev/null +++ b/dev-ros/mavros_extras/mavros_extras-0.15.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Extra nodes and plugins for mavros" +LICENSE="GPL-3 LGPL-3 BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/image_transport + dev-ros/cv_bridge + dev-ros/mavros + dev-ros/roscpp + dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/urdf + dev-cpp/eigen:3 +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/mavros_extras/mavros_extras-9999.ebuild b/dev-ros/mavros_extras/mavros_extras-9999.ebuild new file mode 100644 index 000000000000..562281398552 --- /dev/null +++ b/dev-ros/mavros_extras/mavros_extras-9999.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Extra nodes and plugins for mavros" +LICENSE="GPL-3 LGPL-3 BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/image_transport + dev-ros/cv_bridge + dev-ros/mavros + dev-ros/roscpp + dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/urdf + dev-cpp/eigen:3 +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/mavros_extras/metadata.xml b/dev-ros/mavros_extras/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/mavros_extras/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/mavros_msgs/Manifest b/dev-ros/mavros_msgs/Manifest new file mode 100644 index 000000000000..77358be640d8 --- /dev/null +++ b/dev-ros/mavros_msgs/Manifest @@ -0,0 +1 @@ +DIST mavros-0.15.0.tar.gz 189901 SHA256 f03d5f5968108d43a95d6774f2a76f56131d7d408481ea10f391ab7dc757af1d SHA512 bfd73130e2aa00b4d17f0558d5554d616546909c8a43ceff96623ad78faa77a426229da6c3bce296801014822bf1c61e27b4740c0b2d82d53a7094c892a03306 WHIRLPOOL 3bebdd948d9ab2923a98cc2bca0c845de198292a4013bc03dd5d96bc573d10fd5a6148643a2778358552836043f849375773b4b6dfc430dea965310eab668bd2 diff --git a/dev-ros/mavros_msgs/mavros_msgs-0.15.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-0.15.0.ebuild new file mode 100644 index 000000000000..7c9f450664e1 --- /dev/null +++ b/dev-ros/mavros_msgs/mavros_msgs-0.15.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CATKIN_HAS_MESSAGES=yes +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +ROS_SUBDIR=${PN} +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs" + +inherit ros-catkin + +DESCRIPTION="Messages for MAVROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" diff --git a/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild b/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild new file mode 100644 index 000000000000..7c9f450664e1 --- /dev/null +++ b/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CATKIN_HAS_MESSAGES=yes +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +ROS_SUBDIR=${PN} +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs" + +inherit ros-catkin + +DESCRIPTION="Messages for MAVROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" diff --git a/dev-ros/mavros_msgs/metadata.xml b/dev-ros/mavros_msgs/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/mavros_msgs/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/move_base/Manifest b/dev-ros/move_base/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/move_base/Manifest +++ b/dev-ros/move_base/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/move_base/move_base-1.13.1.ebuild b/dev-ros/move_base/move_base-1.13.1.ebuild new file mode 100644 index 000000000000..fec8a930b0c0 --- /dev/null +++ b/dev-ros/move_base/move_base-1.13.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + >=dev-ros/costmap_2d-1.13.1 + dev-ros/roscpp + dev-ros/pluginlib + dev-ros/actionlib + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/nav_core + dev-ros/tf + dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-cpp/eigen:3 +" +DEPEND="${RDEPEND} + dev-ros/cmake_modules" diff --git a/dev-ros/move_base/move_base-9999.ebuild b/dev-ros/move_base/move_base-9999.ebuild index 3a687a8c2c2e..fec8a930b0c0 100644 --- a/dev-ros/move_base/move_base-9999.ebuild +++ b/dev-ros/move_base/move_base-9999.ebuild @@ -16,6 +16,7 @@ SLOT="0" IUSE="" RDEPEND=" + >=dev-ros/costmap_2d-1.13.1 dev-ros/roscpp dev-ros/pluginlib dev-ros/actionlib diff --git a/dev-ros/move_slow_and_clear/Manifest b/dev-ros/move_slow_and_clear/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/move_slow_and_clear/Manifest +++ b/dev-ros/move_slow_and_clear/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.13.1.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.13.1.ebuild new file mode 100644 index 000000000000..18fca39ec649 --- /dev/null +++ b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.13.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Move slow and clear" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/nav_core + dev-ros/costmap_2d + dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/pluginlib + dev-libs/boost:=[threads] + dev-cpp/eigen:3 + sci-libs/pcl +" +DEPEND="${RDEPEND} + dev-ros/cmake_modules + +" diff --git a/dev-ros/nav_core/Manifest b/dev-ros/nav_core/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/nav_core/Manifest +++ b/dev-ros/nav_core/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/nav_core/nav_core-1.13.1.ebuild b/dev-ros/nav_core/nav_core-1.13.1.ebuild new file mode 100644 index 000000000000..c73919561b31 --- /dev/null +++ b/dev-ros/nav_core/nav_core-1.13.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Common interfaces for navigation specific robot actions" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/tf + dev-ros/costmap_2d +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/navfn/Manifest b/dev-ros/navfn/Manifest index 2ab0c74f2366..e1e4d56c9fb3 100644 --- a/dev-ros/navfn/Manifest +++ b/dev-ros/navfn/Manifest @@ -1 +1 @@ -DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/navfn/navfn-1.13.0.ebuild b/dev-ros/navfn/navfn-1.13.1-r1.ebuild index bea902da7af6..134e9c8c59f5 100644 --- a/dev-ros/navfn/navfn-1.13.0.ebuild +++ b/dev-ros/navfn/navfn-1.13.1-r1.ebuild @@ -7,6 +7,8 @@ ROS_REPO_URI="https://github.com/ros-planning/navigation" ROS_SUBDIR=${PN} KEYWORDS="~amd64 ~arm" CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs" +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python2_7 ) inherit ros-catkin diff --git a/dev-ros/navfn/navfn-9999.ebuild b/dev-ros/navfn/navfn-9999.ebuild index bea902da7af6..134e9c8c59f5 100644 --- a/dev-ros/navfn/navfn-9999.ebuild +++ b/dev-ros/navfn/navfn-9999.ebuild @@ -7,6 +7,8 @@ ROS_REPO_URI="https://github.com/ros-planning/navigation" ROS_SUBDIR=${PN} KEYWORDS="~amd64 ~arm" CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs" +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python2_7 ) inherit ros-catkin diff --git a/dev-ros/openni2_camera/Manifest b/dev-ros/openni2_camera/Manifest new file mode 100644 index 000000000000..f667b8d3ee46 --- /dev/null +++ b/dev-ros/openni2_camera/Manifest @@ -0,0 +1 @@ +DIST openni2_camera-0.2.5.tar.gz 22450 SHA256 dc642789e51869fc99ae507ab02d970778485d9c8c7d7cf32d01e46f62e2ceee SHA512 3b19475785d50e9157f61ca91a55fbf7f9fbbc3006f44d44925ec8f23f77068d26d8c7afb00f886b9699b147e8ddb01700539c0d91432cebee0de2b926fa627b WHIRLPOOL ebcb1949c3235be0f734ecb19773f26d562bd7d6453d0ed44630ca394fbd06c795b53fbf8e6e43a013ef6f7bf1352de80c8536dcf1399ddccc6653060d940887 diff --git a/dev-ros/openni2_camera/metadata.xml b/dev-ros/openni2_camera/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/openni2_camera/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/openni2_camera/openni2_camera-0.2.5.ebuild b/dev-ros/openni2_camera/openni2_camera-0.2.5.ebuild new file mode 100644 index 000000000000..1ba2b9822efd --- /dev/null +++ b/dev-ros/openni2_camera/openni2_camera-0.2.5.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera" +CATKIN_HAS_MESSAGES=yes +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="ROS drivers for the Asus Xtion and Primesense Devices" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/image_transport + dev-ros/camera_info_manager + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/nodelet + dev-ros/roscpp + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-libs/OpenNI2 +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/openni2_camera/openni2_camera-9999.ebuild b/dev-ros/openni2_camera/openni2_camera-9999.ebuild new file mode 100644 index 000000000000..1ba2b9822efd --- /dev/null +++ b/dev-ros/openni2_camera/openni2_camera-9999.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera" +CATKIN_HAS_MESSAGES=yes +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="ROS drivers for the Asus Xtion and Primesense Devices" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/image_transport + dev-ros/camera_info_manager + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/nodelet + dev-ros/roscpp + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-libs/OpenNI2 +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/openni2_launch/Manifest b/dev-ros/openni2_launch/Manifest new file mode 100644 index 000000000000..5121f1bca50b --- /dev/null +++ b/dev-ros/openni2_launch/Manifest @@ -0,0 +1 @@ +DIST openni2_launch-0.2.2.tar.gz 3754 SHA256 a8b7b28b82bb5d58accb96e4710e257547324a1f9131cf425d792b6f20535810 SHA512 1bdbccb6b29f1f3a1909faf959e0a2faca48c8229f5c7469b2b279d962f161940ef0d5b879d1c915d725e8c8cab3173c76aabe67bdacce970727cdfd6cb4073e WHIRLPOOL 56b862f859459543140947c8c0d43972c8c709dbb1f72aa2e8b6aa1878c64dcb149385d56c9c5c2b6b92e4422f34d0d2e88b5d81aabbaba74c5ed0729dc0e034 diff --git a/dev-ros/openni2_launch/metadata.xml b/dev-ros/openni2_launch/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/openni2_launch/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/openni2_launch/openni2_launch-0.2.2.ebuild b/dev-ros/openni2_launch/openni2_launch-0.2.2.ebuild new file mode 100644 index 000000000000..8448a4920dfc --- /dev/null +++ b/dev-ros/openni2_launch/openni2_launch-0.2.2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/openni2_launch" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/rgbd_launch + dev-ros/depth_image_proc + dev-ros/image_proc + dev-ros/nodelet + dev-ros/openni2_camera + dev-ros/tf +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/openni2_launch/openni2_launch-9999.ebuild b/dev-ros/openni2_launch/openni2_launch-9999.ebuild new file mode 100644 index 000000000000..8448a4920dfc --- /dev/null +++ b/dev-ros/openni2_launch/openni2_launch-9999.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/openni2_launch" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/rgbd_launch + dev-ros/depth_image_proc + dev-ros/image_proc + dev-ros/nodelet + dev-ros/openni2_camera + dev-ros/tf +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29-r1.ebuild index 1e355523dc13..e48032773cc7 100644 --- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29.ebuild +++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29-r1.ebuild @@ -18,6 +18,7 @@ IUSE="" RDEPEND=" dev-qt/qtcore:4 + dev-qt/qtgui:4 >=dev-ros/pluginlib-1.9.23 >=dev-ros/qt_gui-0.2.18[${PYTHON_USEDEP}] dev-libs/tinyxml diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild index 1e355523dc13..e48032773cc7 100644 --- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild +++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild @@ -18,6 +18,7 @@ IUSE="" RDEPEND=" dev-qt/qtcore:4 + dev-qt/qtgui:4 >=dev-ros/pluginlib-1.9.23 >=dev-ros/qt_gui-0.2.18[${PYTHON_USEDEP}] dev-libs/tinyxml diff --git a/dev-ros/rgbd_launch/Manifest b/dev-ros/rgbd_launch/Manifest new file mode 100644 index 000000000000..34420f22d309 --- /dev/null +++ b/dev-ros/rgbd_launch/Manifest @@ -0,0 +1 @@ +DIST rgbd_launch-2.1.0.tar.gz 4537 SHA256 74c1973c10b687339094fa14a6979359beafded55b81362a0861964dd0964b6e SHA512 aa4339f3ef711ea01e2184a5e3d642188d4c31ff3629e07044deb4ef3a3a4f74edda9997fc6fb7d44ab873158ab0b383e004eaa2f9b06e7f4a722541974dc8bd WHIRLPOOL 574eb3c36af5a27f1b8af0adddb1f676459d92d045626037953b6c26fe9925829c7b3809a15dce141696bd618905ed10e9a4e7134dede5d5d96e66512fae250e diff --git a/dev-ros/rgbd_launch/metadata.xml b/dev-ros/rgbd_launch/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/rgbd_launch/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/rgbd_launch/rgbd_launch-2.1.0.ebuild b/dev-ros/rgbd_launch/rgbd_launch-2.1.0.ebuild new file mode 100644 index 000000000000..4fa6e4250b89 --- /dev/null +++ b/dev-ros/rgbd_launch/rgbd_launch-2.1.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros-drivers/rgbd_launch" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Launch files to open an RGBD device" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/depth_image_proc + dev-ros/image_proc + dev-ros/nodelet + dev-ros/tf +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild b/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild new file mode 100644 index 000000000000..4fa6e4250b89 --- /dev/null +++ b/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros-drivers/rgbd_launch" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Launch files to open an RGBD device" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/depth_image_proc + dev-ros/image_proc + dev-ros/nodelet + dev-ros/tf +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/robot_pose_ekf/Manifest b/dev-ros/robot_pose_ekf/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/robot_pose_ekf/Manifest +++ b/dev-ros/robot_pose_ekf/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.1.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.1.ebuild new file mode 100644 index 000000000000..a2c43b164175 --- /dev/null +++ b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python2_7 ) +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/tf + dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + sci-libs/orocos-bfl +" +DEPEND="${RDEPEND} + test? ( dev-ros/rostest[${PYTHON_USEDEP}] ) + virtual/pkgconfig" diff --git a/dev-ros/robot_pose_publisher/Manifest b/dev-ros/robot_pose_publisher/Manifest new file mode 100644 index 000000000000..872de2f98e03 --- /dev/null +++ b/dev-ros/robot_pose_publisher/Manifest @@ -0,0 +1 @@ +DIST robot_pose_publisher-0.2.3.tar.gz 4225 SHA256 b8e1f7e8957a89a929e66a3222261431e227639100f21a184e22dbd4226a467f SHA512 393c906754015161643a3047e8ab6690292d4446fc89fb1caa6e1a8fd25e6d880bcd23ea9780eea7c2fe7eb83331455894c93a90fdce01d0f483cae90b653314 WHIRLPOOL 4395b4a4395725eb1ff74768f92f0b39c42163b1c5a237d6776c01ec747e80e4fef3ce51ce632877f586e8219e6a9ea97ebfe3c591d1a807d4989239aa3675a6 diff --git a/dev-ros/robot_pose_publisher/metadata.xml b/dev-ros/robot_pose_publisher/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/robot_pose_publisher/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.3.ebuild b/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.3.ebuild new file mode 100644 index 000000000000..ae81a9889c3c --- /dev/null +++ b/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.3.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/WPI-RAIL/robot_pose_publisher" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="A Simple Node to Publish the Robot's Position Relative to the Map using TFs" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/tf + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild b/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild new file mode 100644 index 000000000000..ae81a9889c3c --- /dev/null +++ b/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/WPI-RAIL/robot_pose_publisher" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="A Simple Node to Publish the Robot's Position Relative to the Map using TFs" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/tf + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/robot_state_publisher/Manifest b/dev-ros/robot_state_publisher/Manifest index 7638129411d4..2c2d1a393cf8 100644 --- a/dev-ros/robot_state_publisher/Manifest +++ b/dev-ros/robot_state_publisher/Manifest @@ -1 +1,2 @@ DIST robot_state_publisher-1.10.4.tar.gz 22728 SHA256 3d3ef47bb0a1f3d0540bd9b00ae22d736ffa5e445600929fc311bbec4c98978c SHA512 71690ee2a9ee666a86fd6083d9ca4e3f1b5ddd8bc0a33af5e3f745a828c0afcdc16d82a26f7524fb65dd6a2871b68287260fb147fe87ca538ed265b36763d851 WHIRLPOOL d26f94ab973aede595a79fa60f55f83c9fc0642dff8bd6ffaf9381de251f40aca76b88393d26bcbf4628ec9615fc5f258ad95aa3a897033a06f747cbdc76941c +DIST robot_state_publisher-1.12.0.tar.gz 23259 SHA256 97c2ca34359976c2c4d4a98229ac451d0cea9856a0b67f051508e84886af5809 SHA512 1d2fb58c60849033d2ca479624a2fb14eacf9fcfe555193e8205be0138bdb046e50ac482005fd3c747cd41f86068363cf6f3634980df9851de6c4c80ec7600db WHIRLPOOL 063f95ac4d31bc6ff00178ecd47d7de99bb155f5eb72445bb850bfdaea78ee184dc2d333840af30e7a4084a394aabe5daaed56ae5da809fc50e9c7a75ae1c186 diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-1.12.0.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-1.12.0.ebuild new file mode 100644 index 000000000000..a096ac897173 --- /dev/null +++ b/dev-ros/robot_state_publisher/robot_state_publisher-1.12.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/robot_state_publisher" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Package for publishing the state of a robot to tf" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/kdl_parser + dev-cpp/eigen:3 + sci-libs/orocos_kdl + dev-ros/roscpp + dev-ros/rosconsole + dev-ros/rostime + dev-ros/tf2_ros + dev-ros/tf2_kdl + dev-ros/kdl_conversions + dev-ros/sensor_msgs +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild index a445085af84e..a096ac897173 100644 --- a/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild +++ b/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild @@ -20,8 +20,8 @@ RDEPEND=" dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime - dev-ros/tf - dev-ros/tf_conversions + dev-ros/tf2_ros + dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs " diff --git a/dev-ros/rosbridge_server/files/backports-ssl.patch b/dev-ros/rosbridge_server/files/backports-ssl.patch new file mode 100644 index 000000000000..b8fc226bde0c --- /dev/null +++ b/dev-ros/rosbridge_server/files/backports-ssl.patch @@ -0,0 +1,13 @@ +Index: rosbridge_server/setup.py +=================================================================== +--- rosbridge_server.orig/setup.py ++++ rosbridge_server/setup.py +@@ -11,8 +11,6 @@ from catkin_pkg.python_setup import gene + d = generate_distutils_setup( + packages=[ + 'rosbridge_server', +- 'backports', +- 'backports.ssl_match_hostname', + 'tornado', + 'tornado.platform' + ], diff --git a/dev-ros/rosbridge_server/files/tornado.patch b/dev-ros/rosbridge_server/files/tornado.patch new file mode 100644 index 000000000000..ae2391385238 --- /dev/null +++ b/dev-ros/rosbridge_server/files/tornado.patch @@ -0,0 +1,91 @@ +Index: rosbridge_server/setup.py +=================================================================== +--- rosbridge_server.orig/setup.py ++++ rosbridge_server/setup.py +@@ -10,85 +10,9 @@ from catkin_pkg.python_setup import gene + + d = generate_distutils_setup( + packages=[ +- 'rosbridge_server', +- 'tornado', +- 'tornado.platform' ++ 'rosbridge_server' + ], + package_dir={'': 'src'} + ) + +-# The following code is copied from +-# https://github.com/mongodb/mongo-python-driver/blob/master/setup.py +-# to support installing without the extension on platforms where +-# no compiler is available. +-from distutils.command.build_ext import build_ext +- +-class custom_build_ext(build_ext): +- """Allow C extension building to fail. +- +- The C extension speeds up websocket masking, but is not essential. +- """ +- +- warning_message = """ +-******************************************************************** +-WARNING: %s could not +-be compiled. No C extensions are essential for Tornado to run, +-although they do result in significant speed improvements for +-websockets. +-%s +- +-Here are some hints for popular operating systems: +- +-If you are seeing this message on Linux you probably need to +-install GCC and/or the Python development package for your +-version of Python. +- +-Debian and Ubuntu users should issue the following command: +- +- $ sudo apt-get install build-essential python-dev +- +-RedHat, CentOS, and Fedora users should issue the following command: +- +- $ sudo yum install gcc python-devel +-******************************************************************** +-""" +- +- def run(self): +- try: +- build_ext.run(self) +- except Exception: +- e = sys.exc_info()[1] +- sys.stdout.write('%s\n' % str(e)) +- warnings.warn(self.warning_message % ("Extension modules", +- "There was an issue with " +- "your platform configuration" +- " - see above.")) +- +- def build_extension(self, ext): +- name = ext.name +- try: +- build_ext.build_extension(self, ext) +- except Exception: +- e = sys.exc_info()[1] +- sys.stdout.write('%s\n' % str(e)) +- warnings.warn(self.warning_message % ("The %s extension " +- "module" % (name,), +- "The output above " +- "this warning shows how " +- "the compilation " +- "failed.")) +- +-if (platform.python_implementation() == 'CPython' and +- os.environ.get('TORNADO_EXTENSION') != '0'): +- # This extension builds and works on pypy as well, although pypy's jit +- # produces equivalent performance. +- d['ext_modules'] = [ +- Extension('tornado.speedups', sources=['src/tornado/speedups.c']), +- ] +- +- if os.environ.get('TORNADO_EXTENSION') != '1': +- # Unless the user has specified that the extension is mandatory, +- # fall back to the pure-python implementation on any build failure. +- d['cmdclass'] = {'build_ext': custom_build_ext} +- + setup(**d) diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r2.ebuild index 997490d73c41..de815261bc71 100644 --- a/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild +++ b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r2.ebuild @@ -20,5 +20,11 @@ RDEPEND=" dev-ros/rospy[${PYTHON_USEDEP}] dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] dev-ros/rosauth[${PYTHON_USEDEP}] + dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}] + www-servers/tornado[${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/backports-ssl.patch" + "${FILESDIR}/tornado.patch" +) diff --git a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild index 997490d73c41..de815261bc71 100644 --- a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild +++ b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild @@ -20,5 +20,11 @@ RDEPEND=" dev-ros/rospy[${PYTHON_USEDEP}] dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] dev-ros/rosauth[${PYTHON_USEDEP}] + dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}] + www-servers/tornado[${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/backports-ssl.patch" + "${FILESDIR}/tornado.patch" +) diff --git a/dev-ros/rotate_recovery/Manifest b/dev-ros/rotate_recovery/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/rotate_recovery/Manifest +++ b/dev-ros/rotate_recovery/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.13.1.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.13.1.ebuild new file mode 100644 index 000000000000..0d6f07bd8a4a --- /dev/null +++ b/dev-ros/rotate_recovery/rotate_recovery-1.13.1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/tf + dev-ros/costmap_2d + dev-ros/nav_core + dev-ros/pluginlib + dev-ros/base_local_planner + dev-cpp/eigen:3 +" +DEPEND="${RDEPEND} + dev-ros/cmake_modules" diff --git a/dev-ros/shape_tools/Manifest b/dev-ros/shape_tools/Manifest new file mode 100644 index 000000000000..fb4b451adf1a --- /dev/null +++ b/dev-ros/shape_tools/Manifest @@ -0,0 +1 @@ +DIST shape_tools-0.2.1.tar.gz 3684 SHA256 19a11713c78e409a466bca5168a7710e096a92f92fcafef4fa485bc7606eaf3e SHA512 4d6da49528518776cb51ace908f0f0326b31b2928f0cb8ae0b12bcb0c1fdac99cbcd71f6bd3324d6aecc38a68a10012535b914a2349925eab1487eed8e1bede3 WHIRLPOOL 01a59f454e70c218c033d8af10612ab8897fe523f806a565f397876015b6a293cebd20f66511723d40034dbf33a29c1fbe68635e0b0569ddf100ed5c99efb2b4 diff --git a/dev-ros/shape_tools/metadata.xml b/dev-ros/shape_tools/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/shape_tools/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/shape_tools/shape_tools-0.2.1.ebuild b/dev-ros/shape_tools/shape_tools-0.2.1.ebuild new file mode 100644 index 000000000000..55a402976188 --- /dev/null +++ b/dev-ros/shape_tools/shape_tools-0.2.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros-planning/shape_tools" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Tools for operating on shape messages" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \ + -i CMakeLists.txt \ + || die +} diff --git a/dev-ros/shape_tools/shape_tools-9999.ebuild b/dev-ros/shape_tools/shape_tools-9999.ebuild new file mode 100644 index 000000000000..55a402976188 --- /dev/null +++ b/dev-ros/shape_tools/shape_tools-9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros-planning/shape_tools" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Tools for operating on shape messages" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \ + -i CMakeLists.txt \ + || die +} diff --git a/dev-ros/urg_c/Manifest b/dev-ros/urg_c/Manifest new file mode 100644 index 000000000000..ae3bde5164a8 --- /dev/null +++ b/dev-ros/urg_c/Manifest @@ -0,0 +1 @@ +DIST urg_c-1.0.404.tar.gz 105987 SHA256 cb51032301515297b3839f6dec0c7124bc533936da1e7bbd28989dcb51fa1da4 SHA512 5a0e19a0f73dc99ce63dbf0417ad29647465691b8e0dbc869f96381d68cf2b3a7f0b3989635848fa6f0f3344ae7ca769d6d964ff591e198b445ce49eb31393d1 WHIRLPOOL 2431d32622e604c305d88510e376bf29475f9ba35e9ea9bdf1505103cbefbfd0285201a8671798e751cd62a6c40909fbbe43a89e6abe619fbd73d510d022ec82 diff --git a/dev-ros/urg_c/metadata.xml b/dev-ros/urg_c/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/urg_c/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/urg_c/urg_c-1.0.404.ebuild b/dev-ros/urg_c/urg_c-1.0.404.ebuild new file mode 100644 index 000000000000..30e0accb3395 --- /dev/null +++ b/dev-ros/urg_c/urg_c-1.0.404.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/urg_c" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="URG Helper / URG Widget / URG Library / urg_c" +LICENSE="BSD" +SLOT="0" +IUSE="" + +DEPEND="" +RDEPEND="" diff --git a/dev-ros/urg_c/urg_c-9999.ebuild b/dev-ros/urg_c/urg_c-9999.ebuild new file mode 100644 index 000000000000..30e0accb3395 --- /dev/null +++ b/dev-ros/urg_c/urg_c-9999.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/urg_c" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="URG Helper / URG Widget / URG Library / urg_c" +LICENSE="BSD" +SLOT="0" +IUSE="" + +DEPEND="" +RDEPEND="" diff --git a/dev-ros/urg_node/Manifest b/dev-ros/urg_node/Manifest new file mode 100644 index 000000000000..1ad784195282 --- /dev/null +++ b/dev-ros/urg_node/Manifest @@ -0,0 +1 @@ +DIST urg_node-0.1.9.tar.gz 13159 SHA256 b4691da54db803fb7f9d0bd2e2008a58de4a36fa7082dc69a1938c1702994387 SHA512 5b9493363406e80780909c68db50277a8629a6fdad7b012d63431a8e62de35532630e141e7b6664586f18e84915e6d2c6e5183911755a0e0cf13991158a05a97 WHIRLPOOL a0d622d21f7b9234a4c6083bfbcbf7c15a8f5b4e9d5b7a1c7f8217eb944a75e3d7aa997a04bc7d567b183ad7b37275367bc3680a21a79e043a7e1064039fdd32 diff --git a/dev-ros/urg_node/metadata.xml b/dev-ros/urg_node/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/urg_node/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/urg_node/urg_node-0.1.9.ebuild b/dev-ros/urg_node/urg_node-0.1.9.ebuild new file mode 100644 index 000000000000..e70e01112a0d --- /dev/null +++ b/dev-ros/urg_node/urg_node-0.1.9.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/urg_node" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="ROS wrapper for the Hokuyo urg_c library" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/urg_c + dev-ros/tf + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/nodelet + dev-ros/rosconsole + dev-ros/roscpp + dev-ros/diagnostic_updater + dev-ros/laser_proc + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/urg_node/urg_node-9999.ebuild b/dev-ros/urg_node/urg_node-9999.ebuild new file mode 100644 index 000000000000..e70e01112a0d --- /dev/null +++ b/dev-ros/urg_node/urg_node-9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/urg_node" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="ROS wrapper for the Hokuyo urg_c library" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/urg_c + dev-ros/tf + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/nodelet + dev-ros/rosconsole + dev-ros/roscpp + dev-ros/diagnostic_updater + dev-ros/laser_proc + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/voxel_grid/Manifest b/dev-ros/voxel_grid/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/dev-ros/voxel_grid/Manifest +++ b/dev-ros/voxel_grid/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/voxel_grid/voxel_grid-1.13.1.ebuild b/dev-ros/voxel_grid/voxel_grid-1.13.1.ebuild new file mode 100644 index 000000000000..5fea00fb6474 --- /dev/null +++ b/dev-ros/voxel_grid/voxel_grid-1.13.1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +ROS_SUBDIR=${PN} +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Implementation of an efficient 3D voxel grid" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="dev-ros/roscpp" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest )" diff --git a/dev-ros/xmlrpcpp/files/headers.patch b/dev-ros/xmlrpcpp/files/headers.patch new file mode 100644 index 000000000000..ed0cea6f0f4e --- /dev/null +++ b/dev-ros/xmlrpcpp/files/headers.patch @@ -0,0 +1,15 @@ +Index: ros_comm-1.11.15/utilities/xmlrpcpp/CMakeLists.txt +=================================================================== +--- ros_comm-1.11.15.orig/utilities/xmlrpcpp/CMakeLists.txt ++++ ros_comm-1.11.15/utilities/xmlrpcpp/CMakeLists.txt +@@ -30,9 +30,8 @@ if(WIN32) + target_link_libraries(xmlrpcpp ws2_32) + endif() + +-# FIXME the headers should be in a package-specific subfolder but can not be for backward compatibility + install(DIRECTORY include/ +- DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION} ++ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} + FILES_MATCHING PATTERN "*.h") + + install(TARGETS xmlrpcpp diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15-r1.ebuild index a0ae0fd21c51..b4772f1846dc 100644 --- a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15.ebuild +++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15-r1.ebuild @@ -17,3 +17,11 @@ IUSE="" RDEPEND="dev-ros/cpp_common" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/headers.patch" ) + +src_configure() { + ros-catkin_src_configure + # Hack so that proper -I are added + sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${SYSROOT:-${EPREFIX}}/usr/include/xmlrpcpp\"#" \ + -i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" || die +} diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild index a0ae0fd21c51..b4772f1846dc 100644 --- a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild +++ b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild @@ -17,3 +17,11 @@ IUSE="" RDEPEND="dev-ros/cpp_common" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/headers.patch" ) + +src_configure() { + ros-catkin_src_configure + # Hack so that proper -I are added + sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${SYSROOT:-${EPREFIX}}/usr/include/xmlrpcpp\"#" \ + -i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" || die +} diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest index 66294b256649..d493eec0b9fd 100644 --- a/dev-ruby/arel-helpers/Manifest +++ b/dev-ruby/arel-helpers/Manifest @@ -1,2 +1,3 @@ DIST arel-helpers-2.0.1.gem 9728 SHA256 de627d6d78af542d99bdfd178e7decd8f351e4de66758ac220f92418291b8b82 SHA512 241af61b00822ac091a04673ae0f6421c88ce8b96141cc9f468c62465b2720ca38d1a041faa720db40dd3a4cee407c1126152ac6125b3ed9a759daedd06b6955 WHIRLPOOL 3024a34b8a9720acbfb66e811b97ff1954c3cda83a97bc2544b5dbab0d94f5eb09eec8891c88bd0582dfdffdfe5abbf1e3be47cc9b61b888e52cb8a85121ab3c DIST arel-helpers-2.1.0.gem 10752 SHA256 f3c9ae9bef08367f98fe825ac985034c7c0c0e3de4fb65b45c23fc8d3defc241 SHA512 b3f969f41d634de6170042686a7bdb92571e7a27b701aa05628cc9d461d4c1b6db442ff38f4ad431b7b431a78f9340a292cf1288fa353cddd50af237875e090b WHIRLPOOL f40167d2d85150915fa3aba698483e124004bf5a35499712e9b4493ac126bcb380d5a9557a1d9ed62b94e538841401833fe798a4e44fe5d57b4a21a4c49eddf6 +DIST arel-helpers-2.1.1.gem 10752 SHA256 692fa104b211ca97c1215ddbfb21710d9b581434a5f37062c9d7d8cbfaaa80d9 SHA512 e9a607f2fb34dfdaf447fa306378aa3c59d31695946f09fdf978101f2218f50dc2ba14483b958644c77a0c03705f4cf05a696b2c280bfd28766ad015d83d72fb WHIRLPOOL 00b71849305660a21e40e9975f2966984ee01c944efee80a71feda66e7ac09937a69c17ea1e25cafe6135969ba87160155e991a8c41a87b3bdd523b39c61fa04 diff --git a/dev-ruby/arel-helpers/arel-helpers-2.1.1.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.1.1.ebuild new file mode 100644 index 000000000000..95e0b071f41b --- /dev/null +++ b/dev-ruby/arel-helpers/arel-helpers-2.1.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +inherit ruby-fakegem + +DESCRIPTION="Tools to help construct database queries" +HOMEPAGE="https://github.com/camertron/arel-helpers" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +ruby_add_rdepend "|| ( dev-ruby/activerecord:3.2 + dev-ruby/activerecord:4.0 + dev-ruby/activerecord:4.1 + dev-ruby/activerecord:4.2 )" + +ruby_add_bdepend "test? ( + dev-ruby/rr + dev-ruby/activerecord[sqlite] +)" + +all_ruby_prepare() { + sed -i -e '/pry-nav/ s:^:#:' spec/spec_helper.rb || die +} diff --git a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild index af2c7783bbf5..8491e4c72019 100644 --- a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild +++ b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild @@ -15,5 +15,5 @@ HOMEPAGE="http://chneukirchen.org/repos/bacon" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" diff --git a/dev-ruby/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest index e8a34a8fa07e..db429fba62ce 100644 --- a/dev-ruby/chunky_png/Manifest +++ b/dev-ruby/chunky_png/Manifest @@ -1,2 +1,3 @@ DIST chunky_png-1.3.3.gem 346112 SHA256 4078934795bf845e4015da25d5a64822a286105e62e8cb85c9c94a7ad02d82d1 SHA512 ea9039a88bb26662863faff98248e8a903e2169fab376b74fc2b17b62f6a2b0201ff67902c596d61a98bec74adb5110bca31c0a6e0f5bf201eef3534f234cf8c WHIRLPOOL 72966631bb53c961573a60eb881a850801617eca512a7a47122d0647dcb50dbe0c673f0ba79c4ac244eb20d7b2886cb8ba1862f76527cef12b06d6b9126c4560 DIST chunky_png-1.3.4.gem 349184 SHA256 dc71b0f6bfd38dd9040faa7b1b2ea90c2bfcd5971ee9040785d1b93de484bd58 SHA512 dbcabaf5b5d5627fbf9bf8de3b5692117b71255b25c062068f879fc75c293939d7ff552e9e2a29ca26d711fd00bb9c40385cb36e50c4fcccbaec6d122fa29ca0 WHIRLPOOL a3d92d2106a3a2ae6587acfd57ead27d1f38b9783a80342e0838230259caf5f5661510b070b0bc6aa8289e0f15a7bd3d68338d9aecdaa3f9c4dbc13c52a4a82b +DIST chunky_png-1.3.5.gem 350208 SHA256 b6ab1011b2e79bcc973c92deee4110d071d5cd59ed950efcd0aba49a5f57c06d SHA512 3c036da20a77bf3525f2d76711e3dee697360dce59c0aee13e57f6cd6a77e7cde0bc94be15ba3c8792e45652d6825f520f8d16f5bc90ca2315a9b3ce17870494 WHIRLPOOL e7ac53ed0b2f959d0016a87c48140382f07477cb061558ae25120e04bd4947ca399321520b0fe508f4e481763c72ab4ae03a693e62486d58e0c3482b371990fa diff --git a/dev-ruby/chunky_png/chunky_png-1.3.5.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.5.ebuild new file mode 100644 index 000000000000..5291fc28292d --- /dev/null +++ b/dev-ruby/chunky_png/chunky_png-1.3.5.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_DOCDIR="" + +RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc README.rdoc" + +RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Pure Ruby library that can read and write PNG images" +HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +all_ruby_prepare() { + sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die + rm Gemfile* || die + + # Avoid git dependency + sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die +} diff --git a/dev-ruby/color/Manifest b/dev-ruby/color/Manifest index ddc62cb5a92c..b58ce3960963 100644 --- a/dev-ruby/color/Manifest +++ b/dev-ruby/color/Manifest @@ -1 +1,2 @@ DIST color-1.7.1.tar.gz 40780 SHA256 36deaa02dc327452f7ac4e35fe1ae1c2d7faa9bb2a0b0d9b6c1a112fe29d7f7b SHA512 78e0b4c171ab2754531cf0874088e7b9cc495957fa3de5c3899f176fd629f1677f1fd9bdb68c0a3784cd5939242f8a4127cda8932f114800052c973431739f07 WHIRLPOOL eb719f91162c15aef89f81e263940c41941e18f0fd7007b27377ca3fd781239951eb0dca80df142bb2f22a84e9917ffd322cb9640a684e95227c43d6f0678256 +DIST color-1.8.tar.gz 42530 SHA256 de87df57b7eb6dcdb9f43559bd6f273c543210c567894cc0549fdb4b8e63c470 SHA512 be48a8895b5dd33326a9debe250c87df37025eb2dca05a0eb61b82b31dbc1ee27c175fc1e37262bce88729e882dfb66f449a3a29c76b9ef0ac2064ffa2b4266c WHIRLPOOL 55fb543fbc6bf3d2b4c234b87ede2767f6ce63c27957e913acb8e0e686d82412b61f5a6d6a16592b361c5a02dcb75e5f7a2de56f88e8189ba9360eb5a3cf9493 diff --git a/dev-ruby/color/color-1.8.ebuild b/dev-ruby/color/color-1.8.ebuild new file mode 100644 index 000000000000..c7d921c4960a --- /dev/null +++ b/dev-ruby/color/color-1.8.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 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="History.rdoc README.rdoc" + +inherit ruby-fakegem + +DESCRIPTION="Colour management with Ruby" +HOMEPAGE="https://github.com/halostatue/color" +SRC_URI="https://github.com/halostatue/color/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +ruby_add_bdepend " + test? ( + >=dev-ruby/minitest-5.0 + )" + +each_ruby_test() { + ${RUBY} -Ilib:test:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die +} diff --git a/dev-ruby/contracts/contracts-0.10.1.ebuild b/dev-ruby/contracts/contracts-0.10.1.ebuild index f86eb5401ea7..313029b016f6 100644 --- a/dev-ruby/contracts/contracts-0.10.1.ebuild +++ b/dev-ruby/contracts/contracts-0.10.1.ebuild @@ -17,5 +17,5 @@ HOMEPAGE="https://github.com/egonSchiele/contracts.ruby" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86" IUSE="" diff --git a/dev-ruby/contracts/contracts-0.11.0.ebuild b/dev-ruby/contracts/contracts-0.11.0.ebuild index f86eb5401ea7..313029b016f6 100644 --- a/dev-ruby/contracts/contracts-0.11.0.ebuild +++ b/dev-ruby/contracts/contracts-0.11.0.ebuild @@ -17,5 +17,5 @@ HOMEPAGE="https://github.com/egonSchiele/contracts.ruby" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86" IUSE="" diff --git a/dev-ruby/contracts/contracts-0.12.0.ebuild b/dev-ruby/contracts/contracts-0.12.0.ebuild index f86eb5401ea7..313029b016f6 100644 --- a/dev-ruby/contracts/contracts-0.12.0.ebuild +++ b/dev-ruby/contracts/contracts-0.12.0.ebuild @@ -17,5 +17,5 @@ HOMEPAGE="https://github.com/egonSchiele/contracts.ruby" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86" IUSE="" diff --git a/dev-ruby/daemons/daemons-1.2.3.ebuild b/dev-ruby/daemons/daemons-1.2.3.ebuild index d7a3d53f1246..1f7aafba7ee2 100644 --- a/dev-ruby/daemons/daemons-1.2.3.ebuild +++ b/dev-ruby/daemons/daemons-1.2.3.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/thuehlinger/daemons" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="examples" all_ruby_install() { diff --git a/dev-ruby/dnsruby/metadata.xml b/dev-ruby/dnsruby/metadata.xml index 8d8dd58100fe..0087805ce0a4 100644 --- a/dev-ruby/dnsruby/metadata.xml +++ b/dev-ruby/dnsruby/metadata.xml @@ -5,4 +5,7 @@ <maintainer> <email>mschiff@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">alexdalitz/dnsruby</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild index 4aaecefe3c97..168f504a7c93 100644 --- a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild +++ b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild @@ -15,7 +15,7 @@ inherit multilib ruby-fakegem DESCRIPTION="FastCGI library for Ruby" HOMEPAGE="https://github.com/alphallc/ruby-fcgi-ng" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" LICENSE="Ruby" DEPEND+=" dev-libs/fcgi" diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest index 2e9770e2d7fb..29f1195cc0ac 100644 --- a/dev-ruby/gettext_i18n_rails/Manifest +++ b/dev-ruby/gettext_i18n_rails/Manifest @@ -1,3 +1,4 @@ DIST gettext_i18n_rails-1.2.2.tar.gz 20254 SHA256 4bdaff360864211ee8739155f881cbe505d36ae8ec0d592c8180779f6f84a35e SHA512 c2a02a2aaa118581e81b3ff375ebfb8b4e58fc2313e8d7f321d881370b546d906eec51f848d27f2996ca16938bc7580ed6c27d780d1531a251578ce9260bcb40 WHIRLPOOL c674993506104a8475b7a2be422f11558aa001f362cdc7786fc27cf3b44368ce5855a0ecdc555e28345ad81cd14c70d785c5952cd8bbf6506a0720534c658d38 DIST gettext_i18n_rails-1.2.3.tar.gz 20252 SHA256 48af9946c8165ece5c1c94c01045596e25f00bc679e3eb835e45992663444fd7 SHA512 b28bea0100ca5dd307ead1b77f4e71b491eb12899d772394c6e3ea73150ef4277c7305de0dfd2429ccc635af462f0b0f4f42280cdb666ebc7cee2cf9a43a04a2 WHIRLPOOL f54222b9940b58e16a2e1e27eb36d044ae42fe4b9ed1e06edeb57f5ea1e1ebc727de1cd564cd3679f0851b47fc5ebe93d3913a2ef90de8ebd56917a08ba19913 DIST gettext_i18n_rails-1.3.0.tar.gz 20218 SHA256 b52a90e45d6bcdfac828cebbf52892ccadb320d148bb14a8267f8545b4347877 SHA512 90136a441aad8c5b26fe39454b675b444ff5cdfa87c4d6ec1738583ea5b6db793b1d05db94e9084905249a75f19239acf5812e6e8350d3ee2537aed76387c2d2 WHIRLPOOL b8503ad978faeeaff0a966be62392bbc0ef4361f28575e50afb799431fb311368b656a4c702749d4dd12f2e342f4c79abe5fe1cd56f64aa41441c073e53449e6 +DIST gettext_i18n_rails-1.3.1.tar.gz 20261 SHA256 d50193878e7b8eee61ba48fe33c10f7eed28afdcb7e500dd135743cbc9ffd72f SHA512 761c941aa4d4a746067b84c703b7ca661af3229a2886113a0c5beb1872efd5e74dae7bcf0c6bb476078e636835d19a66e93c8c9c7850024c4ca025e153f1b708 WHIRLPOOL 0b865211641224a5dfc6e76e88297fc2cc8576789a099ca65bc3deefb95318313ec8bae24070fde65c0cd219402cc928265b7ef626435836d3fa8e908ad4ece4 diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.1.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.1.ebuild new file mode 100644 index 000000000000..459fe13b2dd7 --- /dev/null +++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="Readme.md" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +inherit ruby-fakegem + +DESCRIPTION="FastGettext / Rails integration" +HOMEPAGE="https://github.com/grosser/gettext_i18n_rails" +SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +ruby_add_bdepend "test? ( dev-ruby/rails:4.0 dev-ruby/activerecord:4.0[sqlite] dev-ruby/temple )" +ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0" + +all_ruby_prepare() { + rm Gemfile Gemfile.lock || die + + # Remove specs for slim and hamlet, template engines we don't package. + rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die + + # Test against Rails 4.0 (newer versions don't work and we don't use + # appraisals for now). + sed -e '1igem "rails", "~>4.2.0"' -i spec/spec_helper.rb || die +} diff --git a/dev-ruby/gherkin3/Manifest b/dev-ruby/gherkin3/Manifest new file mode 100644 index 000000000000..cfb083307b5b --- /dev/null +++ b/dev-ruby/gherkin3/Manifest @@ -0,0 +1 @@ +DIST gherkin3-3.1.2.gem 28672 SHA256 1dc07216c9b19407518780036dd03c936d4391f0bb18a625d707f2ffb36555f1 SHA512 4476f6b87237293512edcdc131472b65e420a0675e837f473bdc0b938e3a38d428a5058637f421703dbf44a23aec856783e9fa1ecf259d7d63f9af78d96f13e4 WHIRLPOOL d497894ea741a71481b2b30a3d2c93b2098506f911291de4764c149970b9d14ab1deaa5b65bd0f9b8e3f0318fa0cff020336f2114e9d43faeedb01798debd4b4 diff --git a/dev-ruby/gherkin3/gherkin3-3.1.2.ebuild b/dev-ruby/gherkin3/gherkin3-3.1.2.ebuild new file mode 100644 index 000000000000..857b290a3e1b --- /dev/null +++ b/dev-ruby/gherkin3/gherkin3-3.1.2.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2015 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_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_DOCDIR="rdoc" +RUBY_FAKEGEM_EXTRADOC="README.md" + +inherit ruby-fakegem + +DESCRIPTION="Fast Gherkin lexer and parser" +HOMEPAGE="https://github.com/cucumber/gherkin3" +LICENSE="MIT" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86" +SLOT="3" +IUSE="" diff --git a/dev-java/proxool/metadata.xml b/dev-ruby/gherkin3/metadata.xml index b0ed1ba5ec6c..270f0aa2c89c 100644 --- a/dev-java/proxool/metadata.xml +++ b/dev-ruby/gherkin3/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>java</herd> - <upstream> - <remote-id type="sourceforge">proxool</remote-id> - </upstream> + <herd>ruby</herd> + <upstream> + <remote-id type="github">cucumber/gherkin3</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ruby/hashdiff/hashdiff-0.2.2.ebuild b/dev-ruby/hashdiff/hashdiff-0.2.2.ebuild index 64d0aa39bd21..3d6d3726e73b 100644 --- a/dev-ruby/hashdiff/hashdiff-0.2.2.ebuild +++ b/dev-ruby/hashdiff/hashdiff-0.2.2.ebuild @@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/liufengyun/hashdiff" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~ppc64" IUSE="" diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest index ea150c267119..f960fd5fa2e8 100644 --- a/dev-ruby/hashie/Manifest +++ b/dev-ruby/hashie/Manifest @@ -1,4 +1,2 @@ DIST hashie-2.1.2.gem 34816 SHA256 a9e1e4928bf4f5a5683ea9c7ef29e50fb93f72542f9a9550e205fe33a6568923 SHA512 6f72998710da58a2584939b4e74a114ae54168902020dc16ec5ea0422a91316b84aa6835fffb36a2985634f24ff5b0d01bcdb50134a414a269a4881ebcd728ac WHIRLPOOL 6b67c04ef9dc33a9ffdf25d14440bdd3ce621f1bde9b4eb806de63fa39edc76627f80d10435efc708fc48d24f1450046f33aceb20d76238a0cf8b67ddcf72e78 -DIST hashie-3.3.2.gem 48640 SHA256 99fad6bb323e965f72c82f08f86162858b97d9b1a4550cf49c180f211e3291a0 SHA512 22e6a15d70c8dfaebb99564e874640cdce60d3c127841054c38ff2287926f93e5c2d3cade98fb766e69722d442e54276af7dd95575d1bc2800d978f6763149c5 WHIRLPOOL 07fe013d529a13124e8fe9228a728507d0e74fb493677b4ec624a85829942a7a5f0e0d9248080dc6681f619fa5be45cd363218970e3572b83e65630ffd97d7a8 -DIST hashie-3.4.1.gem 54784 SHA256 76dc47a37116e8e6be30e37389776cecd3809efa5e4e207f2d02de0f3d9a4f34 SHA512 9a0e68b0a260cb4387d21284164c0b67fb332860338f773c4368ab4d40aaaececcaa84ea6d92ff391f0914ad7a7aaf3ce54ffbddd1861606035b4021d9a2c197 WHIRLPOOL c81ae5c69f749180838cb1310a99bbea961005ab03d343831f039ec1e855886858c265c24b60946f016c04da5253b9d563298643c9db778be3a01d69cc9950ee DIST hashie-3.4.2.gem 56320 SHA256 b68373c5f6589c5222638433918bc3e256acbaead7f883e5ec18420f507b17ca SHA512 9081d91ad014914f59ec4e18b92c27b6f316f03f476c94d3b469bda54f201d339d553ef142018f0e605d3571418af784d57e25211a6c141cd8eb5a56497c28d6 WHIRLPOOL cc76a268a7b8abc618b236a1958db783a5dc9e14c92b719782db71dd1a518e436b4e801f6854e5c8958298d4212814bae23893c1fe2a42561de28ba993847b2f diff --git a/dev-ruby/hashie/hashie-3.3.2.ebuild b/dev-ruby/hashie/hashie-3.3.2.ebuild deleted file mode 100644 index 8fc819e79e1b..000000000000 --- a/dev-ruby/hashie/hashie-3.3.2.ebuild +++ /dev/null @@ -1,31 +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" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -inherit ruby-fakegem - -DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful" -HOMEPAGE="http://intridea.com/posts/hashie-the-hash-toolkit" - -LICENSE="MIT" -SLOT="3" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" - -ruby_add_bdepend "test? ( dev-ruby/activesupport )" - -all_ruby_prepare() { - # Remove bundler and fix one spec that depends on its requires - #rm Gemfile || die - sed -i -e '/[Bb]undler/d' Rakefile || die - sed -e '/pry/ s:^:#:' -i spec/spec_helper.rb || die -} diff --git a/dev-ruby/hashie/hashie-3.4.1.ebuild b/dev-ruby/hashie/hashie-3.4.1.ebuild deleted file mode 100644 index 8fc819e79e1b..000000000000 --- a/dev-ruby/hashie/hashie-3.4.1.ebuild +++ /dev/null @@ -1,31 +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" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -inherit ruby-fakegem - -DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful" -HOMEPAGE="http://intridea.com/posts/hashie-the-hash-toolkit" - -LICENSE="MIT" -SLOT="3" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" - -ruby_add_bdepend "test? ( dev-ruby/activesupport )" - -all_ruby_prepare() { - # Remove bundler and fix one spec that depends on its requires - #rm Gemfile || die - sed -i -e '/[Bb]undler/d' Rakefile || die - sed -e '/pry/ s:^:#:' -i spec/spec_helper.rb || die -} diff --git a/dev-ruby/hashr/Manifest b/dev-ruby/hashr/Manifest index 49779bd04b85..7e880e03b601 100644 --- a/dev-ruby/hashr/Manifest +++ b/dev-ruby/hashr/Manifest @@ -1,2 +1,3 @@ DIST hashr-0.0.22.gem 9216 SHA256 476445351aed46deed60fabe2012f7cca3795864ea3e64bba0cc7d0f348faeb3 SHA512 92ae0718261ddb9731c546d408d3013cd0920d89e8e4b3a867ef1403bce14b0f7e296723f6b1d70eabf7b7a0df3b6e5ba6722d84ed0de4d619cda60c18a84555 WHIRLPOOL 18e01a1d91074df921b32a73ce0f7666ad6c8baccf2613a373664b7d4d1ae2c9ed5567609beb5d2c556d11d06155021cf729f77e57b992197b7ffcc9fa758c94 DIST hashr-1.0.0.gem 10752 SHA256 2cc847de0d51905662f818f947a5a65f908bfff74742bfe1aff6de175ead3f88 SHA512 3d60f35804fd10f797be694b5bf1dd64d1a6c3e0d07572873ebb86f8dcaa9d979a777d29d92531fe784cc63b0b52b39bcfe19a438b0b359080590a23e93ab31f WHIRLPOOL 389e120b94d2e4571881e900490cb0eca819e96f1b35a48f9ecc621f99a547c1d1a7de38e455aecc6a0f510b2750af54269bfa3faae75711da92454f703f6e0d +DIST hashr-2.0.0.gem 10240 SHA256 7aa6ab08c25e83f27dfd918570d9ce7a0dfb3396a39da41c85af99a52ea4f69e SHA512 7e1e4c443bc974d09f0d34b8592e9de7f994e472dc0f4a8aeba40bf7ca23adf4723c8565fd1205d959b5411a7499121c6dc1a79819361244edbf8fd8cd593463 WHIRLPOOL 94662af16b7e9d5d642ccac860eb2838edd98d03cb771f53448b097109f2ed6bc15e61b8dc3c9c1598850cdc99b669a1b3814db8e90d7b9e491675c13b58336f diff --git a/dev-ruby/hashr/hashr-2.0.0.ebuild b/dev-ruby/hashr/hashr-2.0.0.ebuild new file mode 100644 index 000000000000..91a320b25ae9 --- /dev/null +++ b/dev-ruby/hashr/hashr-2.0.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="README.md" + +inherit ruby-fakegem + +DESCRIPTION="Simple Hash extension to make working with nested hashes easier and less error-prone" +HOMEPAGE="https://github.com/svenfuchs/hashr" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +all_ruby_prepare() { + sed -i -e '1i require "spec_helper"' spec/hashr/delegate/conditional_spec.rb || die +} diff --git a/dev-ruby/highline/highline-1.7.6.ebuild b/dev-ruby/highline/highline-1.7.6.ebuild index 7e14b00ab3de..98c76cdba83d 100644 --- a/dev-ruby/highline/highline-1.7.6.ebuild +++ b/dev-ruby/highline/highline-1.7.6.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/JEG2/highline" IUSE="" LICENSE="|| ( GPL-2 Ruby )" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" all_ruby_prepare() { # fix up gemspec file not to call git diff --git a/dev-ruby/hoe/hoe-3.13.0-r1.ebuild b/dev-ruby/hoe/hoe-3.13.0-r1.ebuild index 0607b0dabd00..29883eefe080 100644 --- a/dev-ruby/hoe/hoe-3.13.0-r1.ebuild +++ b/dev-ruby/hoe/hoe-3.13.0-r1.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm 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" +KEYWORDS="alpha amd64 arm 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="" ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )" diff --git a/dev-ruby/jwt/Manifest b/dev-ruby/jwt/Manifest index 05cde8642b75..48519ce9771f 100644 --- a/dev-ruby/jwt/Manifest +++ b/dev-ruby/jwt/Manifest @@ -1,4 +1,2 @@ -DIST jwt-1.2.1.gem 9216 SHA256 b0cfc9e85b2f851aa49931a4c07156127888fbf003e7ef971d4d6c2e91f98661 SHA512 d9d53b2b7766c9315de9dad3b63f85bbbbc2c8d980098ae5c570ba4890f87dfa1aad21132580210bc622e78172f5ed6fea0a8de4049cc5da5e910620abdfa4a6 WHIRLPOOL f63f18cb18d30b57b8549a5367b0319ad7dc9c8a58e34ba3022662dad6951b9cdbe26da14df6c133c68b2b2df2f75614fb5e2e984e5e9869a28ea2363b78cfc5 -DIST jwt-1.4.1.gem 10752 SHA256 9c29b4b45e805a351e124f32a5c54b20653badf10065b6d410de084668493d0d SHA512 d05a9f08cab8b232d8d11fa97f85ee0b6a261d55a2c3c27f4592e8a649c5986e2cf30e98438112154e9ab59a6d3b9daf2d914f18d6fd39b8ca640d396b9626bf WHIRLPOOL 7d2325f88930c723d3f82c16be15d9408bcfc37fae0e861961c96a3df2dac78b86943b59cd17e81afeb484c7d769e2e3cde14b010f7e954f04b917852eb21677 -DIST jwt-1.5.0.gem 11264 SHA256 0bd816489c49052070c9be711cb01c4181f213308d41d5d4bb220bc16041e500 SHA512 fbaf8cae0e388eea9777e539b41f8b53ac4be67a6cbb3ec5a20864360f24da2d8d401c1f7e9b4b7c236767bc692538a3e3fbcbe1bfc0d96536ea1a24904f561b WHIRLPOOL 2de9601a077fc054ebfb6afbb81be805a44e0b9641a014357e0c9a55eca9b134c53eb884d7fa17cc09cd2a05a1f1f0319a5af7a6ace323198b11fd8b24814558 DIST jwt-1.5.1.gem 12288 SHA256 d3d39adde503148c2f35eb37d4b0ef3da85fc0b295ee339b59b6d76c2763658d SHA512 a0ea17ce11046041316a9dcad63bf5af3b501d257716398cd23b50ea72ecb04f82670552246f71e9731a2a92429f7652d0ad5944ea97e4a9a6e98f612fecbf0e WHIRLPOOL b845fed75bb5403d721cb5b60cb097942988187e620314a79bc011855e767499b1a53a6df354c36d1901a857c70e48a756dd13f4f5491b5a9a2618e9ca8f0660 +DIST jwt-1.5.2.tar.gz 21131 SHA256 6e628b77e541929f13118344e57511ca9dc08de7dcaf0dc0b6dc5dd3793faeb5 SHA512 9b56bf1fad65318f4c6a6d3bb09bad2ac2661704e4d0ae01eaac5b71bf0486abba573536afa1fa0f00b2b68ea445350f723ac5b73319b238c4d69f10b21d0773 WHIRLPOOL 87a9881eef08b15fdf1295543d332465280d56340d371b021c16663f2d6788944638bf4c9560f3d2f4b6982a105986d59824c0491c64ad40120e52ce252d1b88 diff --git a/dev-ruby/jwt/jwt-1.2.1.ebuild b/dev-ruby/jwt/jwt-1.2.1.ebuild deleted file mode 100644 index 32784b34cd7a..000000000000 --- a/dev-ruby/jwt/jwt-1.2.1.ebuild +++ /dev/null @@ -1,20 +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_RECIPE_DOC="rdoc" - -inherit ruby-fakegem - -DESCRIPTION="A Ruby implementation of JSON Web Token draft 06" -HOMEPAGE="https://github.com/progrium/ruby-jwt" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" diff --git a/dev-ruby/jwt/jwt-1.5.0.ebuild b/dev-ruby/jwt/jwt-1.5.0.ebuild deleted file mode 100644 index e928b2e1ac6e..000000000000 --- a/dev-ruby/jwt/jwt-1.5.0.ebuild +++ /dev/null @@ -1,20 +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="rspec3" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" - -inherit ruby-fakegem - -DESCRIPTION="A Ruby implementation of JSON Web Token draft 06" -HOMEPAGE="https://github.com/progrium/ruby-jwt" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" diff --git a/dev-ruby/jwt/jwt-1.4.1.ebuild b/dev-ruby/jwt/jwt-1.5.2.ebuild index e928b2e1ac6e..c209bd695811 100644 --- a/dev-ruby/jwt/jwt-1.4.1.ebuild +++ b/dev-ruby/jwt/jwt-1.5.2.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22" RUBY_FAKEGEM_RECIPE_TEST="rspec3" @@ -12,9 +12,19 @@ RUBY_FAKEGEM_RECIPE_DOC="rdoc" inherit ruby-fakegem DESCRIPTION="A Ruby implementation of JSON Web Token draft 06" -HOMEPAGE="https://github.com/progrium/ruby-jwt" +HOMEPAGE="https://github.com/jwt/ruby-jwt" +SRC_URI="https://github.com/jwt/ruby-jwt/archive/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" + +RUBY_S="ruby-jwt-${P}" + +all_ruby_prepare() { + sed -i -e "/simplecov/ s:^:#:" \ + -e '/^SimpleCov.configure/,/^end/ s:^:#:' \ + -e '/codeclimate/I s:^:#:' \ + spec/spec_helper.rb || die +} diff --git a/dev-ruby/jwt/metadata.xml b/dev-ruby/jwt/metadata.xml index 2aa194a2f228..b18dbe23253b 100644 --- a/dev-ruby/jwt/metadata.xml +++ b/dev-ruby/jwt/metadata.xml @@ -3,6 +3,6 @@ <pkgmetadata> <herd>ruby</herd> <upstream> - <remote-id type="github">progrium/ruby-jwt</remote-id> + <remote-id type="github">jwt/ruby-jwt</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest index fb67e18e552d..ca39b0097a41 100644 --- a/dev-ruby/kramdown/Manifest +++ b/dev-ruby/kramdown/Manifest @@ -1,4 +1,2 @@ -DIST kramdown-1.4.1.gem 226304 SHA256 6e8bcdbc1a4e3aab40253e3d573133fb66fe958a6cea21df4f780f83fdaf1797 SHA512 ea1f32f11a377860851390ce889819ab6fd9aba2b7127a7718eb4f820e2b4acdeee353e303dab42618508727197b2e219dc74b05a0ae2bd4382bd41bba5cbcb3 WHIRLPOOL e57001f1f0d302e4fe9006f9c9a3df6c28d5df61d083208c4d342f1adbcf886fb6ac66adedcdc9aa33c2f6034de9d6d1451c1e7817e1d5f962ab948f2737a988 DIST kramdown-1.4.2.gem 226816 SHA256 ae9b9456c69fa06f9c3058841e09b85e07cda875eb36c3202ea46baf8e123ea8 SHA512 31e7a30bcc453968ec6db0c1f0e5f8cea222dde8b8f6a26da72e0cf1b049c9f4c4e8384685a5e241e41fda526cd0f5fba4ac7debd0fb0d3eb6539dd9afc1dd27 WHIRLPOOL aa0166861584c2e3115923db1de9203581c02f4cab42866a88947a3e52fb32eee4ab2cdcc2fd623669a4c8a2e1972a340d9100a04fbc595bb40bde46e553223f -DIST kramdown-1.6.0.gem 235520 SHA256 8bdb6aed0244d0fe77b2f5b49c44da0c8d597e7909b9f59052f7846bd1b85170 SHA512 f94aefab85fd95a5bc0e110900757408cb832f27f53c6c110295451d10143f879e64ce1c3d08b627645f5cf9b6800fa3b03d393d9733202a893633048849d349 WHIRLPOOL a213cfb292653e0b3bef42283c85b19dcadc88d89e8c17e77607781dcda979bb6ea0ce39ebf91a0a7b2afef63f47eb688791641e1f301fe542011c5114cc590f DIST kramdown-1.8.0.gem 238080 SHA256 54287608f4399006ae5549f009053d2029ad75bf462dc70203c116580ac0d867 SHA512 8dace5b6ad764654c4375a4c2fad171e88448281936ced8d4efc5956e291e7c31b0ef295845241cb3e36976dc4a1e78886d2dff9fc172845622ab74a3b062230 WHIRLPOOL a58df1a8b19b274baea9feb7658b17d524c3abf983c9f56c80c69a7c180e1c48f22b106c2685acb950504531cf10dd388eaf0fc3699eeb3d8aac82cb3521adb7 diff --git a/dev-ruby/kramdown/kramdown-1.4.1.ebuild b/dev-ruby/kramdown/kramdown-1.4.1.ebuild deleted file mode 100644 index 88b5931c2a5c..000000000000 --- a/dev-ruby/kramdown/kramdown-1.4.1.ebuild +++ /dev/null @@ -1,46 +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" - -RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS" - -RUBY_FAKEGEM_EXTRAINSTALL="data" - -inherit ruby-fakegem - -DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition" -HOMEPAGE="http://kramdown.rubyforge.org/" - -LICENSE="MIT" - -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="latex" - -LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )" -RDEPEND+=" ${LATEX_DEPS}" -DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )" - -ruby_add_bdepend "doc? ( dev-ruby/rdoc ) - test? ( >=dev-ruby/coderay-1.0.0 - >=dev-ruby/prawn-1.2.1 - dev-ruby/prawn-table - >=dev-ruby/stringex-1.5.1 )" - -all_ruby_prepare() { - if ! use latex; then - # Remove latex tests. They will fail gracefully when latex isn't - # present at all, but not when components are missing (most - # notable ucs.sty). - sed -i -e '/latex -v/,/^ end/ s:^:#:' test/test_files.rb || die - fi -} - -all_ruby_install() { - all_fakegem_install - - doman man/man1/kramdown.1 -} diff --git a/dev-ruby/kramdown/kramdown-1.6.0.ebuild b/dev-ruby/kramdown/kramdown-1.6.0.ebuild deleted file mode 100644 index 3546ae763b17..000000000000 --- a/dev-ruby/kramdown/kramdown-1.6.0.ebuild +++ /dev/null @@ -1,51 +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" - -RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS" - -RUBY_FAKEGEM_EXTRAINSTALL="data" - -inherit ruby-fakegem - -DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition" -HOMEPAGE="http://kramdown.rubyforge.org/" - -LICENSE="MIT" - -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="latex" - -LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )" -RDEPEND+=" ${LATEX_DEPS}" -DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )" - -ruby_add_rdepend "dev-ruby/prawn:2 - dev-ruby/prawn-table - >=dev-ruby/rouge-1.8 - >=dev-ruby/itextomml-1.5 - >=dev-ruby/coderay-1.0.0 - >=dev-ruby/ritex-1.0 - >=dev-ruby/stringex-1.5.1" - -ruby_add_bdepend "doc? ( dev-ruby/rdoc ) - test? ( >=dev-ruby/minitest-5.0 )" - -all_ruby_prepare() { - if ! use latex; then - # Remove latex tests. They will fail gracefully when latex isn't - # present at all, but not when components are missing (most - # notable ucs.sty). - sed -i -e '/latex -v/,/^ end/ s:^:#:' test/test_files.rb || die - fi -} - -all_ruby_install() { - all_fakegem_install - - doman man/man1/kramdown.1 -} diff --git a/dev-ruby/listen/listen-2.8.6-r1.ebuild b/dev-ruby/listen/listen-2.8.6-r1.ebuild new file mode 100644 index 000000000000..3a83aaf47be7 --- /dev/null +++ b/dev-ruby/listen/listen-2.8.6-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby19 ruby20 ruby21" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +RUBY_FAKEGEM_BINWRAP="" + +inherit ruby-fakegem + +SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz" +DESCRIPTION="Listens to file modifications and notifies you about the changes" +HOMEPAGE="https://github.com/guard/listen" + +LICENSE="MIT" +SLOT="2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +# Block on other packages trying to install a /usr/bin/listen +RDEPEND+="!!media-sound/listen !!media-radio/ax25" + +ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0 + >=dev-ruby/celluloid-0.15.2" +ruby_add_bdepend "test? ( dev-ruby/celluloid-io )" + +all_ruby_prepare() { + sed -i -e "/git/,+3d" -e "/rb-fsevent/d" -e "/bundler/d" -e "/rspec-retry/d" ${PN}.gemspec || die + sed -i -e "/retry/d" spec/spec_helper.rb || die + rm -rf spec/lib/listen/adapter/darwin_spec.rb || die +} diff --git a/dev-ruby/listen/listen-3.0.3.ebuild b/dev-ruby/listen/listen-3.0.3.ebuild index 524cd1dcec88..8b98721ce8ec 100644 --- a/dev-ruby/listen/listen-3.0.3.ebuild +++ b/dev-ruby/listen/listen-3.0.3.ebuild @@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solari IUSE="test" # Block on other packages trying to install a /usr/bin/listen -RDEPEND+="!!media-sound/listen !!media-radio/ax25" +RDEPEND+="!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2" ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0" diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest index b6325d639711..c3270d0b1b1f 100644 --- a/dev-ruby/minitest/Manifest +++ b/dev-ruby/minitest/Manifest @@ -5,3 +5,4 @@ DIST minitest-5.6.1.gem 70656 SHA256 c293d497049aa663dc6332b940bdac9dd3052b62ccf DIST minitest-5.7.0.gem 71680 SHA256 08ef10d1e6314fd0dc9a71ea697fd196d153d6bbffa8c6f7b8350973a772b867 SHA512 22eb2a37bb2f00e1798939d88bdeb8929e6ebd514ba3397e76b78873da7a2d3a5ad6b2889b8d21cb3f75d0211c485e87703396b9d038c05c2b52ff18557552de WHIRLPOOL a864cd94d9c5481498f7b153178a5295337c898597bd6fac12e3776c104cb8a296117f9b5916e1b7956fc156481d96bdd01cb2ed71c097f7ca9ed526dac3a37f DIST minitest-5.8.0.gem 71680 SHA256 875de2784b97b710da76c682e725095ca6c5142093a07474114e52cd6dea0953 SHA512 07ce4cff755ed1ec15f3f927793cca11468a714ae5ab2848ea97ce9b0d9c533dfdc2867df6f66609c7658ded4b1bd4012594356c0f253d1d977c707d4d54f5ee WHIRLPOOL 7ebd286097c5ca98729fc74e53618d4b83106d7ec440b0cffffb0d9d3856c514f6dab7b5671fd2ddf64f13576f82621cba8f49d52cab14fa0c252f0738ae4204 DIST minitest-5.8.1.gem 71680 SHA256 c8d2763ef0f3c86464b83ed60876772a1e7ff669c562bb63064679cf51109103 SHA512 ca2e950521403a1f1e97c386d71097e6ad014bfe34d9799f2070db75b3d72c676daefda0e8a6bbf9f0bd43a640b7a873195278388845b04d3fc46b9e12c8f7ae WHIRLPOOL f96defb6ea36dc8f3a25c60d13389f6ac0169cd35f566e12b03a8157f376c9f0f0929d1361be2fcb324b99dcbaa7101a57ff156f3aafe25ea5ec255564b05194 +DIST minitest-5.8.2.gem 71680 SHA256 2f72bd7eaa8990730aa190c8f49f28956165f4da400d6169cafb55ef77dc2db2 SHA512 a7f4295e05eda6367a500b88a92fdbb0e6228e10ed1ec62c9b3346fdf4fe91f762ab98ea4ce6a2ceaedc09149200a43d4f90fcb317a4d6cbd72d3c8ca0a0f6a8 WHIRLPOOL b76e92bff898f41aea66d8f55d5e80da0055572c7605a09745870289396e6ade7d1864a1916dc41322039c4873acc2704235adb82a1101737890b53242edb060 diff --git a/dev-ruby/minitest/minitest-5.8.2.ebuild b/dev-ruby/minitest/minitest-5.8.2.ebuild new file mode 100644 index 000000000000..1e82b818731b --- /dev/null +++ b/dev-ruby/minitest/minitest-5.8.2.ebuild @@ -0,0 +1,25 @@ +# 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_DOC="rdoc" + +RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc" + +inherit ruby-fakegem + +DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit" +HOMEPAGE="https://github.com/seattlerb/minitest" + +LICENSE="MIT" +SLOT="5" +KEYWORDS="~alpha ~amd64 ~arm ~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 test" + +each_ruby_test() { + ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed" +} diff --git a/dev-ruby/mixlib-shellout/Manifest b/dev-ruby/mixlib-shellout/Manifest index de560e396787..4e5d53168d2a 100644 --- a/dev-ruby/mixlib-shellout/Manifest +++ b/dev-ruby/mixlib-shellout/Manifest @@ -1,2 +1,3 @@ DIST mixlib-shellout-2.2.1.tar.gz 33307 SHA256 68e70a5ba15eca9ebf737f1ed21b3b90744b83f2856bf69e93f7b66348f67d03 SHA512 c9f9724b0929e07ba56a90508b167d6a6971aa7dabcecd320b8abd60a80dd0542e86b0570f3a9db5a76057ad8c4e1f9ec6ff38460a76ccd745a4996f1d69e297 WHIRLPOOL 29ad017b470312651e4c7c4a9f782184107c5e1527d8babf6de9c8a5040c094bb713dbd28bacdeeb5757ab37cb7a55025d137e022aeea9c8a81a9f4f28928b8b DIST mixlib-shellout-2.2.2.tar.gz 33495 SHA256 ecd1b4612465ab650b568c85af05c26cdea874d1bf00586b2c76830dd040bae6 SHA512 8ae64988347786c11c208f648a6b65d3e4b70822175ead4081e0073287baa1a61956193e82d48e7fe03f03c58c5b8678716579d70abb576f5531d32fba50e4c5 WHIRLPOOL f818fea924d616e2a64eb718dd3329e15bb304736985ce8eaa0a223c36db20a18a2e464dbe983292c6cebe1b3c4ddeb8683155c89d95985f79e91e645f4b8a60 +DIST mixlib-shellout-2.2.3.tar.gz 34093 SHA256 8a2929ebf8b87f7a1d9c117d2fd6c45cba1db7da7a79cf38edbf240207393fa6 SHA512 133b7dce0ae944be365f40a7a6277a5bfd735e6b72a8828c44c532d297a23a0244c2eb80407ba935079a2b1b23e496b253fd0ab863af6f3987e630184162729f WHIRLPOOL dce7f5a1787c1c5a50c95362617c78f761c2971dec346ec3de471fa08053949b3b02dec7495ff82270077a6eeaa5b39649ba92df1df7df41597ade2ec8999761 diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-2.2.3.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-2.2.3.ebuild new file mode 100644 index 000000000000..6d1fc6f7db65 --- /dev/null +++ b/dev-ruby/mixlib-shellout/mixlib-shellout-2.2.3.ebuild @@ -0,0 +1,27 @@ +# 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_TASK_DOC="" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md" + +inherit ruby-fakegem + +DESCRIPTION="Run external commands on Unix or Windows" +HOMEPAGE="https://github.com/opscode/mixlib-shellout" +SRC_URI="https://github.com/opscode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +each_ruby_prepare() { + # Make sure we actually use the right interpreter for testing + sed -i -e "/ruby_eval/ s:ruby :${RUBY} :" spec/mixlib/shellout_spec.rb || die +} diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest index f4d452ed8f60..d49399b38cc7 100644 --- a/dev-ruby/msgpack/Manifest +++ b/dev-ruby/msgpack/Manifest @@ -1,4 +1,2 @@ -DIST msgpack-0.5.12.gem 57344 SHA256 423dc261bd9db477965d867b425a399bf9afab4a49e671d4f0eafb3fbdecaa26 SHA512 27bbeb258d6b18cf2711b0afc4c6dfbcd71c21587fb78213f8583f5aa4ef67ec19f34b7501878a63c798a9859e0d63de4773f9d66b190b7d6ba4b4019c864144 WHIRLPOOL a40c0971f3f6942198a398ca26a94326c0a73b759ca0221a30542f139911b492fda195ae21a59bfc71860755f69b04d11fd602b31a1e0658f36bb86d35a053d1 -DIST msgpack-0.6.0.gem 58880 SHA256 217c137b704b34ef7d1d86e9e2da5d2336c0958b50bf9d8f81e18222ffa4170e SHA512 ee482aa45ba3c4f4d79221da3b2c624c7d65f5c5dc70c79ff09217b81508ca186fe21eabe83a444b29a6262ec2508f7724429b4ef5855ecd075bf7500d172a38 WHIRLPOOL cbfc0858fbd16588bcc95368d379b8fe128433ceb089cd244298e6186048bc2b2dcb0e15777cd0f08fa916e79482455e929c17c93dbe46a868aff127f48d3cde -DIST msgpack-0.6.1.gem 59392 SHA256 94fd8ef7ab2db7085429f8da31ab00a39d1e0fe8cf5837ca1f140dcd8b67e9c2 SHA512 1e0edd9148e4544cc1974b76de541d3ab175ee6f38f4e61c4f1bfa3997a49703ad3e518bc78632986f9892535a30adc4dcb72a0e4464c35ca3a625c9f7501c8d WHIRLPOOL b6b1cbd47d4bc729f220a6c623d76399956748bf649ea362c7012dccb029e53d2f003cd78cc86a815f2bd21a985b2ea356e5ea0b13cef37cc6fa612143c180ec DIST msgpack-0.6.2.gem 59904 SHA256 f59a903e239f7caa7c714042171e104029e575cd62415f1927407fd042b478a1 SHA512 7b3a697ee69df19dddcb0de835d4a6910a249bc2747fbeba1ba8ef9d485cdfaf0eafee52fbc5bf00c1c386f25d324109b46160f7ca56643feea1ddc9fc6605e9 WHIRLPOOL 516745a4cc0e2a0559b9ed4948e4db53fd4712a619b7ff9750d9d11e49e6e00b4a85242a30caf30f8bfadc438b70ed327a51728b051bf54a273b2120ed72b833 +DIST msgpack-0.7.0.gem 72704 SHA256 4c387745fac439fa77ec2e0f1d343f0b4c35d611e14ac7e205eece7c2aa45658 SHA512 f2c03389110329eb22fe7c0eea8e686a0cde0a9dcfad8d7ad57b126f6d04aa04c6860537edbb7a4b42de757900ced61eb68932665b24d1d96f1a4a44c46316eb WHIRLPOOL c087b2c5d15d30f8693e0e07d3cfa49c7e8a6d528cecf42f2019721988447e1caed7a180f44bdc83d4d578561ce2ea829e319ec0826f295cc20c1a3d79777389 diff --git a/dev-ruby/msgpack/msgpack-0.5.12.ebuild b/dev-ruby/msgpack/msgpack-0.5.12.ebuild deleted file mode 100644 index b4950871be7b..000000000000 --- a/dev-ruby/msgpack/msgpack-0.5.12.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 - -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_TASK_DOC="doc" -RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_EXTRADOC="README.rdoc" - -inherit multilib ruby-fakegem - -DESCRIPTION="Binary-based efficient data interchange format for ruby binding" -HOMEPAGE="http://msgpack.sourceforge.jp/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="doc" - -ruby_add_bdepend "doc? ( dev-ruby/yard )" - -all_ruby_prepare() { - sed -i -e '/bundler/I s:^:#:' Rakefile || die - - # Remove jruby-specific specs that are run also for other rubies. - rm -rf spec/jruby - - sed -i -e '/git ls-files/d' msgpack.gemspec || die -} - -each_ruby_configure() { - ${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed." -} - -each_ruby_compile() { - emake V=1 -Cext/${PN} - cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library." -} diff --git a/dev-ruby/msgpack/msgpack-0.6.0.ebuild b/dev-ruby/msgpack/msgpack-0.6.0.ebuild deleted file mode 100644 index 2be64469ab79..000000000000 --- a/dev-ruby/msgpack/msgpack-0.6.0.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 - -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_TASK_DOC="doc" -RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_EXTRADOC="README.rdoc" - -inherit multilib ruby-fakegem - -DESCRIPTION="Binary-based efficient data interchange format for ruby binding" -HOMEPAGE="http://msgpack.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="doc" - -ruby_add_bdepend "doc? ( dev-ruby/yard )" - -all_ruby_prepare() { - sed -i -e '/bundler/I s:^:#:' Rakefile || die - - # Remove jruby-specific specs that are run also for other rubies. - rm -rf spec/jruby - - sed -i -e '/git ls-files/d' msgpack.gemspec || die -} - -each_ruby_configure() { - ${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed." -} - -each_ruby_compile() { - emake V=1 -Cext/${PN} - cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library." -} diff --git a/dev-ruby/msgpack/msgpack-0.6.1.ebuild b/dev-ruby/msgpack/msgpack-0.7.0.ebuild index 2be64469ab79..1f72c65b9e5c 100644 --- a/dev-ruby/msgpack/msgpack-0.6.1.ebuild +++ b/dev-ruby/msgpack/msgpack-0.7.0.ebuild @@ -4,7 +4,7 @@ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22" RUBY_FAKEGEM_TASK_DOC="doc" RUBY_FAKEGEM_RECIPE_TEST="rspec3" @@ -26,7 +26,7 @@ all_ruby_prepare() { sed -i -e '/bundler/I s:^:#:' Rakefile || die # Remove jruby-specific specs that are run also for other rubies. - rm -rf spec/jruby + rm -rf spec/jruby || die sed -i -e '/git ls-files/d' msgpack.gemspec || die } diff --git a/dev-ruby/netrc/Manifest b/dev-ruby/netrc/Manifest index cff42ac991f9..f968c790a8f2 100644 --- a/dev-ruby/netrc/Manifest +++ b/dev-ruby/netrc/Manifest @@ -1,3 +1,3 @@ -DIST netrc-0.10.2.gem 10752 SHA256 cd51a5780665bc3978fe2a33e1edd7e902218a7edefccc7a918e39f19cdec72d SHA512 044fd610ca9cbf4e7214492d0af7e147084b6349c646f7fb08a9bd2a053b705d4db8462671e11ff160a908bea0d2d3669794f83d7e591635b65dc762464eb003 WHIRLPOOL 27cd333510afee28e82460cd2758b3beedf912a274d8b093c083231ca8b73580f44d34b6db6c36937ec5dfbe19e7d565b6c9ac4d42150e698c711aa21cb116dd DIST netrc-0.10.3.gem 10752 SHA256 8fa24558ed46e2b2d9a58baa78fd7d11cb7efa3ec7e2ec89a057f76dc3abcce4 SHA512 ba51f2c03496b6b5ebfdcc3a9c1ff47c41961baa50f0aa9ffec487c67fdafe48b810fa28b16c17b9198104b86986b52f43d267c286be3a86018fc59e16481b11 WHIRLPOOL 4b1f70b7193143b77ef34b4163617a3b97c49a3b910dc2a1756da0c703e3ebcd0eaf583679865f3b889f84eff8c5ecf7a50ee66d02ddf51d77b869502e1bdf95 +DIST netrc-0.11.0.gem 10752 SHA256 de1ce33da8c99ab1d97871726cba75151113f117146becbe45aa85cb3dabee3f SHA512 7f0df3f79d92b891d40a49e9b893ca7131077195cf15453b155e37e68e29f8cd3810ba791a06338058262c8cb8fed56c87c295e450c133b428b3398eb99e683a WHIRLPOOL d80d76b038780d1b0acec19715e476658b5793116af1170f909a4f6b066688f77858eef075f43d4fd8a620406636ff0cd0cb1fdfb726af10ae7d1fedc131790d DIST netrc-0.9.0.gem 10240 SHA256 9c8726e3c166cb2f99421639feac44525ce0646c4b01ffb4b41962a63763721c SHA512 da90ef05f47aa956fddd4679f02a5a0c9397f37055efc2c7a738abfad51164a5c9301df7dbe27dbb28e0caaa291dfe5ad414cd2a1598d5803742c58adaca99fd WHIRLPOOL 42726b8ae33a0e53da476f390dec92563ded93e2d5e350467d63b6d88b125b25db2363d398834b8f615e9c110342b175ecdedbde67176ae93005119664de508b diff --git a/dev-ruby/netrc/netrc-0.10.3.ebuild b/dev-ruby/netrc/netrc-0.10.3.ebuild index d50e4537a3d8..5c3f94e0efbf 100644 --- a/dev-ruby/netrc/netrc-0.10.3.ebuild +++ b/dev-ruby/netrc/netrc-0.10.3.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="This library reads and writes .netrc files" HOMEPAGE="https://github.com/geemus/netrc" LICENSE="MIT" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" SLOT="0" IUSE="" diff --git a/dev-ruby/netrc/netrc-0.10.2.ebuild b/dev-ruby/netrc/netrc-0.11.0.ebuild index d50e4537a3d8..faafdd1e8e96 100644 --- a/dev-ruby/netrc/netrc-0.10.2.ebuild +++ b/dev-ruby/netrc/netrc-0.11.0.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22" RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md" @@ -24,5 +24,5 @@ all_ruby_prepare() { } each_ruby_test() { - ${RUBY} -S testrb test/test_*.rb || die + ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die } diff --git a/dev-ruby/netrc/netrc-0.9.0-r1.ebuild b/dev-ruby/netrc/netrc-0.9.0-r1.ebuild deleted file mode 100644 index cd3991462832..000000000000 --- a/dev-ruby/netrc/netrc-0.9.0-r1.ebuild +++ /dev/null @@ -1,28 +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" - -RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" - -inherit ruby-fakegem - -DESCRIPTION="This library reads and writes .netrc files" -HOMEPAGE="https://github.com/geemus/netrc" -LICENSE="MIT" - -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="" - -all_ruby_prepare() { - sed -e '/test_encrypted_roundtrip/a skip "depends on external gpg test keys"' -i test/test_netrc.rb || die -} - -each_ruby_test() { - ${RUBY} -S testrb test/test_*.rb || die -} diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest index 060321827518..512802f68879 100644 --- a/dev-ruby/power_assert/Manifest +++ b/dev-ruby/power_assert/Manifest @@ -1,3 +1,4 @@ DIST power_assert-0.2.2.gem 12800 SHA256 ea8146b060a4da226f5d4519cb122a6572741f5354b7cc40f74147bcbe033558 SHA512 f1bd1677734375eb03b4b9166ff84e29bd96b25e66751c4a2a305e1d9c4a63de76b7bf152a2af54871b6901230b2d2926a935aece3165a736eee1b7813e92400 WHIRLPOOL bf58578391c9b926cb38eb80d17497311f1bdb818af5f1ebb83e2ae390d594e644a38c2be14b2c49c01213dc530d239f42e40fda6b4484f4a376ef3e54ff3440 DIST power_assert-0.2.3.gem 12800 SHA256 46dd1fa63023372da145d5fe3b58abb42c7e5f3fa4e265b7d2f5438d4e918127 SHA512 5b7604534a9fbdcd8b222d04788b375dcebed170c5c5deff2d671e54dd745474b2162c7c04e670ff8a0abda0acc6863994131f612388c2da4988f8620bb6c26f WHIRLPOOL f7bbe2fb70bc06f48a65cc78601f1fd656d6cf828888ce4e633c2cde1aca15c2ae747b07f873c44f935f51712ae6717c8925081c07163668f130afcd78c436f1 DIST power_assert-0.2.4.gem 13312 SHA256 13f192076823f69ba1cc92978cad38f78cb9c3874eecac55c8748d539f5187d4 SHA512 542b897abd90619b74a6da38bfebec89e4e98390d78eb2c2bc98a121b0f5378b8263092bb5283f237474b089ebc3adc8461f246af16fa74e78b5757ea2215e5b WHIRLPOOL 51106eab67b2716e83844c97601ae4367d074040475d8c72770e7d9049b8288203bf592a84e280fb1af99ca8de662729cc6c1dcee28d3d0cd5d8bf4a53e91004 +DIST power_assert-0.2.5.gem 12800 SHA256 432efb2e1231202717d8b38930c87d64fad217f1693c6ecc5210d7815e836189 SHA512 6246a6b1c32d2e5b06e4da329e3d21bef012ec7107ea21e4029fd91146a7ba1311e5888112e45960b984d98103bae52fc43d13e62d2bc00cdbc31ccfb873e973 WHIRLPOOL d0f8b64719f55b47383877b46ff076a6963a69050d66d2c10498afa819567c740a27fc90dd7004b3421c0d0c0f9587b02a7b18b758543c3b1d47eb144bc12bdb diff --git a/dev-ruby/power_assert/power_assert-0.2.5.ebuild b/dev-ruby/power_assert/power_assert-0.2.5.ebuild new file mode 100644 index 000000000000..4b6cc803590c --- /dev/null +++ b/dev-ruby/power_assert/power_assert-0.2.5.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 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.rdoc" + +inherit ruby-fakegem + +DESCRIPTION="Shows each value of variables and method calls in the expression" +HOMEPAGE="https://github.com/k-tsj/power_assert" +LICENSE="|| ( Ruby BSD-2 )" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +SLOT="0" +IUSE="" + +all_ruby_prepare() { + sed -i -e '/bundler/d' Rakefile || die +} diff --git a/dev-ruby/rack/rack-1.4.7.ebuild b/dev-ruby/rack/rack-1.4.7.ebuild index cf97d8ace1f4..909a0db2d1d0 100644 --- a/dev-ruby/rack/rack-1.4.7.ebuild +++ b/dev-ruby/rack/rack-1.4.7.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://rack.github.com/" LICENSE="MIT" SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch ${PN}-1.4.5-fix-test-ruby20.patch ) diff --git a/dev-ruby/rack/rack-1.5.5.ebuild b/dev-ruby/rack/rack-1.5.5.ebuild index 594c8085b65d..252dd43d5b4a 100644 --- a/dev-ruby/rack/rack-1.5.5.ebuild +++ b/dev-ruby/rack/rack-1.5.5.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://rack.github.com/" LICENSE="MIT" SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch ) diff --git a/dev-ruby/rack/rack-1.6.4.ebuild b/dev-ruby/rack/rack-1.6.4.ebuild index ca62a17267fb..0489e49bba68 100644 --- a/dev-ruby/rack/rack-1.6.4.ebuild +++ b/dev-ruby/rack/rack-1.6.4.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://rack.github.com/" LICENSE="MIT" SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch ) diff --git a/dev-ruby/rexical/rexical-1.0.5-r3.ebuild b/dev-ruby/rexical/rexical-1.0.5-r3.ebuild index 00328c3a2160..b42ce3fb95c6 100644 --- a/dev-ruby/rexical/rexical-1.0.5-r3.ebuild +++ b/dev-ruby/rexical/rexical-1.0.5-r3.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Rexical is a lexical scanner generator" HOMEPAGE="https://github.com/tenderlove/rexical/tree/master" LICENSE="LGPL-2" # plus exception -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT="0" IUSE="" diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest index 923c6d16bcfd..d37264642d9a 100644 --- a/dev-ruby/rmagick/Manifest +++ b/dev-ruby/rmagick/Manifest @@ -1,2 +1,3 @@ DIST RMagick-2.13.2.tar.bz2 1208478 SHA256 a8c2df101549f74c66f687eceada6b703183234d7ce67dc84d85d16745a638e3 SHA512 b7e9111b9221467f827e57e1d3113d714dcc5cfd32483a2a3aefc5a59fe7f98efae612145db097c3837ef55c2acd0cdde6638a94ffb595a0fba412edeb469530 WHIRLPOOL 4d89bd1a1fa341b83b539437b8a4893f955d2b196e4469d106acb49b6eac28f6777a82e4120f6a88ffc06e0d2d84e40531f713cd39388584d70ff992422b2a75 DIST rmagick-2.13.4.gem 1539584 SHA256 7877ce2fe1b05e51e62b0a4f5d17ecae6223c17bdb61c9b4e1715dd74d541afa SHA512 c458867654af82adf10e74408055920e01963292c7890b581f473f30a8b090998f085f1701e42190ee1f62de44fcecb5e593df74e68c9d7a8fc8050f359ff643 WHIRLPOOL 2aa5fc6dbc7787d41b46ec36c6e85540aa85e020c9e060df6d2ea22c74e80665f68c32e07d70a10a3a95911943c25724c92730f1edd05c7ccda3867bb725d239 +DIST rmagick-2.15.4.gem 1545216 SHA256 69db6635c2630ffd63c1858646cbc280226f31a7bc34e1c9d1322c2c73e1e386 SHA512 9cb43632e510e3592e3a643117d61020d6cbec932acecc19c1e977cca001ccc04bae46669895fa2f5f0e8d43c09f1c2c429595a9358a4a74cbdbb4ecd8957b80 WHIRLPOOL 92e62fe057c6cd918577ef4a5d54021514d12cb631f7e6debbbb44f2260f361f719a03e973905552dd54089ac65f51926177de43024d0734ff0557cc1e0e0d62 diff --git a/dev-ruby/rmagick/rmagick-2.15.4.ebuild b/dev-ruby/rmagick/rmagick-2.15.4.ebuild new file mode 100644 index 000000000000..704882d7660a --- /dev/null +++ b/dev-ruby/rmagick/rmagick-2.15.4.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_TASK_DOC="" + +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.textile" + +inherit multilib ruby-fakegem + +DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library" +HOMEPAGE="https://github.com/gemhome/rmagick" + +LICENSE="Artistic" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos" +IUSE="doc" + +RDEPEND+=" >=media-gfx/imagemagick-6.4.9:=" +DEPEND+=" >=media-gfx/imagemagick-6.4.9:=[jpeg]" + +ruby_add_bdepend "test? ( dev-ruby/rspec:3 )" + +all_ruby_prepare() { + # Avoid unused dependency on rake-compiler. This also avoids an + # extra compile during tests. + sed -i -e '/extensiontask/ s:^:#:' \ + -e '/ExtensionTask/,/end/ s:^:#:' \ + -e '/compile/ s:^:#:' Rakefile || die + + # Avoid simplecov dependency + sed -i -e '/simplecov/ s:^:#:' Rakefile test/test_all_basic.rb || die + + # Squelch harmless warning about imagemagick installation. + sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die + + # Avoid some tests that seem to be very dependent on specific + # imagemagick versions. color defs? + sed -i -e '/test_gray/,/^ end/ s:^:#:' test/Image2.rb || die + sed -i -e '/test_\(delete_if\|reject\)/,/^ end/ s:^:#:' test/ImageList1.rb || die + sed -i -e '/test_optimize_layers/,/^ end/ s:^:#:' test/ImageList2.rb || die + sed -i -e '/test_\(background\|border\)_color/,/^ end/ s:^:#:' test/Image_attributes.rb || die +} + +each_ruby_configure() { + ${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed" +} + +each_ruby_compile() { + emake -Cext/RMagick V=1 + cp ext/RMagick/RMagick2$(get_modname) lib/ || die +} + +each_ruby_test() { + ${RUBY} -S rake test || die + RSPEC_VERSION=3 ruby-ng_rspec spec || die +} + +all_ruby_install() { + all_fakegem_install + + docinto examples + dodoc examples/* + + if use doc ; then + dohtml -r doc + fi +} diff --git a/dev-ruby/rspectacular/Manifest b/dev-ruby/rspectacular/Manifest index cffe851cf931..fc0cd25b4fc4 100644 --- a/dev-ruby/rspectacular/Manifest +++ b/dev-ruby/rspectacular/Manifest @@ -1,4 +1,2 @@ -DIST rspectacular-0.61.0.gem 14336 SHA256 fffd8099063f110244314aa87e20058899d8dca15378eb4de21f740c2c0c4f82 SHA512 bdabc855ea9bb0cdcb222de47773be6d9ea2d9208bef416e3ab24195a16fc59b2d1af045b9c59851f87dd3ce7cc0ffe479d9ac5e07f4b5418c530dd3a8f7c922 WHIRLPOOL 0b3d98b3ec2991ce70d0a8d50f769f1715353fb9760ae1a7b23e7f53f7793b6bf702e640eaf95f36b9cb9647570d6c44cac634129dadd21dab6b0954728a19b6 -DIST rspectacular-0.62.1.gem 15360 SHA256 2a5e394b96f56ad5f96dbd491666ea96d3ec542815cf3fc6b206bb14141508ca SHA512 60579982d6551b355648237acb0eeb962bf61afe11049fd25e86dc9305612896453edb139ea73e42af0149aa80b39b04ea8698b016bbafb6e197e6a0315da0ba WHIRLPOOL 7766e6e67fbdd757046640d92faaf862241e0d4e4d66146eb1797a0f134b9db423f92baa8b69d5aa35ac8b000f23e56c6ecb833506182f081ccbc19c31be25b6 -DIST rspectacular-0.63.0.gem 15360 SHA256 2bd2ffda1727f789815fdc8bc3e6833de0b13d050eee09e1e82218fd20cdb51d SHA512 9e41f8b94542f7f82554b6473452ce23c81f15994f0b260dc7def3ada7bbbab2e4e65be57c42db6df04bb8dd98efd4ba40cf9c866814aa6812a6485d8d7c623f WHIRLPOOL 09463a228625d75949ffc909142d35d2d5e95e610e3949828426cb0acd3da981732e5e1c2dfcb7cb12dfc17302cb13cf12473aefac9c41a3f9b6fa367d2d2387 DIST rspectacular-0.64.0.gem 15360 SHA256 280a50e4dc11198ccd68873ddd365c460ebbd3335e96ed842f331d731bb74412 SHA512 7fdd7d7c339d368a80dc8c1b200d627dc74a1467d540ee5fbd7652b36af15057491f89721387e9138b1c3f48fcc5938204cebb0bcc51e10bf90a8c2ff9094732 WHIRLPOOL 84aecdb41e62a71de39b3f9820b1a4c53a1e56f8dadb6a23b4b193d056ec7f51fe25bf53f2c4d38b622c89721cb0a49cb98da0acd38145968df16c9351b9228e +DIST rspectacular-0.68.0.gem 15872 SHA256 b0432a85d318a6875e7552c500a768e978a86a2ff55846b84299e9458e3a5b1b SHA512 c77e90f5e6cc1c7191bc69d8a118ece6287350502850320976ba2f00feead68533cb31253d3c1370a36507f9dfc316edea87f3e5479f35d614794458419ec2f3 WHIRLPOOL 4913729de3161ded3d683a9f8615abab01f93a527d1db9e6c764cff2610ca5c2558ef3ede4a06555c049279df50c147e4912c1175100ad733797109c33b3236d diff --git a/dev-ruby/rspectacular/rspectacular-0.61.0.ebuild b/dev-ruby/rspectacular/rspectacular-0.61.0.ebuild deleted file mode 100644 index afcaa36e8501..000000000000 --- a/dev-ruby/rspectacular/rspectacular-0.61.0.ebuild +++ /dev/null @@ -1,24 +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" - -RUBY_FAKEGEM_TASK_TEST="" -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="README.md" - -RUBY_FAKEGEM_BINWRAP="" - -inherit ruby-fakegem - -DESCRIPTION="RSpec support and matchers" -HOMEPAGE="https://github.com/thekompanee/rspectacular" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2" diff --git a/dev-ruby/rspectacular/rspectacular-0.62.1.ebuild b/dev-ruby/rspectacular/rspectacular-0.62.1.ebuild deleted file mode 100644 index afcaa36e8501..000000000000 --- a/dev-ruby/rspectacular/rspectacular-0.62.1.ebuild +++ /dev/null @@ -1,24 +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" - -RUBY_FAKEGEM_TASK_TEST="" -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="README.md" - -RUBY_FAKEGEM_BINWRAP="" - -inherit ruby-fakegem - -DESCRIPTION="RSpec support and matchers" -HOMEPAGE="https://github.com/thekompanee/rspectacular" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2" diff --git a/dev-ruby/rspectacular/rspectacular-0.63.0.ebuild b/dev-ruby/rspectacular/rspectacular-0.68.0.ebuild index 70fe33156db1..70fe33156db1 100644 --- a/dev-ruby/rspectacular/rspectacular-0.63.0.ebuild +++ b/dev-ruby/rspectacular/rspectacular-0.68.0.ebuild diff --git a/dev-ruby/ruby-filemagic/Manifest b/dev-ruby/ruby-filemagic/Manifest index 261b4d7c2af6..f11cea7812a5 100644 --- a/dev-ruby/ruby-filemagic/Manifest +++ b/dev-ruby/ruby-filemagic/Manifest @@ -1,2 +1,2 @@ -DIST ruby-filemagic-0.6.3.gem 216064 SHA256 f9e89cbbeeb69ec4b3181d16cd3efc900b0f1c561b57c6e7a04423501d25d87f SHA512 9d52360805d5ef389293e75cbd205be3f93fc4e2158ff07b653e308262b5c63bd067eea58a86e1e69546e424b037ca11e66bca9feebe04fc33d435d4e49f69b8 WHIRLPOOL d6f4f27fce72f4c6eef3f6852586f37d01ad39d42332790f01d67b031c8fe8c43a39b7b2d2fae03c57ef77fafc996004c2791f9295903c1751fb05ae44ced38f DIST ruby-filemagic-0.7.0.gem 229376 SHA256 e28af7f49955d800c3dfd1a2335c5c1aa9f380e57eda16050250e4345ad0e460 SHA512 ba257ac7ae58e664d0a45c319c9159650a267144941fdf558f2bd7aa442133f8303637153ab1eb89611c8709303afebbab42f1c3674cca89d15f5037c9bc9d43 WHIRLPOOL 8f64cdea5c7ec028e2d9bf116700e34cda12264946ae847ae5cbd014bd0518368788c6769c49c09775f7cdb3f647a6391cfffc4af29b139be4637a34ad4296eb +DIST ruby-filemagic-0.7.1.gem 229376 SHA256 811de93cdc7d13dbd84d5fd3a35d699092e71a768af366637951ca109cbc7eed SHA512 9a05699fd299c20a52443d4a0213761229fa600157731712c8322e25e18cfc1f467075b8cb5e8c1790caeae9778e83cae83bb1c63475ea220a9b2d9ed896cd46 WHIRLPOOL 82d41b0264f16a2acc402ea297bc6db5ab489bdcc9a50933e916b26bf6103f483220e485ff0b102ed4b33a55898dd874a87be630884b847019d51c12ee208c41 diff --git a/dev-ruby/ruby-filemagic/ruby-filemagic-0.6.3.ebuild b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.1.ebuild index 5106e776844f..01382c367890 100644 --- a/dev-ruby/ruby-filemagic/ruby-filemagic-0.6.3.ebuild +++ b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_EXTRADOC="ChangeLog README TODO" @@ -13,7 +13,7 @@ RUBY_FAKEGEM_TASK_TEST="" inherit multilib ruby-fakegem DESCRIPTION="Ruby binding to libmagic" -HOMEPAGE="http://ruby-filemagic.rubyforge.org/" +HOMEPAGE="https://github.com/blackwinter/ruby-filemagic" LICENSE="Ruby" SLOT="0" diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7-r1.ebuild index 492bd3e15b6e..49915a59c29f 100644 --- a/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7.ebuild +++ b/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7-r1.ebuild @@ -16,10 +16,16 @@ RDEPEND+=" x11-libs/gtk+:3" ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV} >=dev-ruby/ruby-pango-${PV}" -ruby_add_rdepend ">=dev-ruby/ruby-gdkpixbuf2-${PV} + +ruby_add_rdepend " >=dev-ruby/ruby-atk-${PV} >=dev-ruby/ruby-gdk3-${PV} - >=dev-ruby/ruby-gio2-${PV}" + >=dev-ruby/ruby-gdkpixbuf2-${PV} + >=dev-ruby/ruby-gio2-${PV} + >=dev-ruby/ruby-glib2-${PV} + >=dev-ruby/ruby-gobject-introspection-${PV} + >=dev-ruby/ruby-pango-${PV} +" all_ruby_prepare() { # Avoid unneeded dependency on test-unit-notify. @@ -29,6 +35,7 @@ all_ruby_prepare() { # Avoid compilation of dependencies during test. sed -i -e '/which make/,/^ end/ s:^:#:' test/run-test.rb || die } + each_ruby_test() { VIRTUALX_COMMAND="${RUBY} test/run-test.rb" virtualmake || die diff --git a/dev-ruby/ruby-net-ldap/Manifest b/dev-ruby/ruby-net-ldap/Manifest index 243c414fe014..1267b22445a8 100644 --- a/dev-ruby/ruby-net-ldap/Manifest +++ b/dev-ruby/ruby-net-ldap/Manifest @@ -1,3 +1,2 @@ DIST net-ldap-0.11.gem 87040 SHA256 fc5487b0c81cbf2beaede0e6c07af036559deb4ab6df185f61ac16562949d8f5 SHA512 8894fac34df186f03b879e707504ce8952030d38d88e902c8a98f195503765f7780771f26775606ff84a7940cd3b1a8193e028f85d05130940d583c222b4cc1f WHIRLPOOL 67d40f4ca3cb640aeb4a315ab2df44256357a6528c9fa3c69be20e1c2a26f1672c7a2c15afb5111f731dd8f0613000b1f6a9c2624230b62ebd67f64dab6f8ce0 -DIST net-ldap-0.7.0.gem 70656 SHA256 d39d341c992abb7273d8b83cbe32a38e69fdeb4eab684dbd2db1232e4065a4b4 SHA512 71000b05bcf7db8a3c40f6311e16385f2569df12c5b193c454dc2ebd043af0183d650626d8805c0e58e59aa842091da1fba37e35cdb58789279ef5b93ad13e7f WHIRLPOOL 6fbbe9a6ffe1832db61d2eb5cacba4675be9cf9bb7dc9d7102e3c04f244dc7572e2a19d96c62b5e6c77b64467d6efe0e76ad9fcc74837b2404387f2ea8c5ea94 -DIST net-ldap-0.8.0.gem 72704 SHA256 e1b7f21b58a4c2ff6f2c3361f584342017f46d4a965f377f192b4cd8855b0242 SHA512 3083a9bb61a048213d524d9795ac61b38d07abd4788b5504b9d642062f9fcf947120c98e10a76d8e3be0dc91b680bae50b056bd9fcd75cdb4a1af2e907953cf9 WHIRLPOOL e6767bc2985faa6262743d9a6273abe2d693c4d12b21fb5dcc256a49634b059fc2bf831a21ce37128158ff18045e8630790eea2bbda8106dca262b392533ddfa +DIST net-ldap-0.12.0.gem 89600 SHA256 cfac33a3b76dd03938f272fefcdbfdc20e0ad419c4b79b6e9d8edb6c003b8a04 SHA512 7ccda246c983a290b2b26ee5117526332c93750f44dae7ba9eb1f193f8953557b20cf3268912aa4f33f93199e3dfc27bdde4f465a63f145fd74d91e42bfa18c1 WHIRLPOOL 0456ef77866338faf1f5369ed04ed195e5487eb5c522b73ff9406c9df9de36ac82238c036a1108885fc7687a7673cdea6e28e8ff963b93934070c0ca7dfee036 diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.12.0.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.12.0.ebuild new file mode 100644 index 000000000000..94c946ebd918 --- /dev/null +++ b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.12.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21" + +RUBY_FAKEGEM_TASK_TEST="test spec" +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc" + +RUBY_FAKEGEM_NAME="net-ldap" + +inherit ruby-fakegem + +DESCRIPTION="Pure ruby LDAP client implementation" +HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap" +LICENSE="MIT" + +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="test" + +ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 )" + +each_ruby_test() { + ${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die +} diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.7.0.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.7.0.ebuild deleted file mode 100644 index 5981aa2faf64..000000000000 --- a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.7.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -# jruby: requires ruby 1.9 compatibility -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_TASK_TEST="test spec" -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc" - -RUBY_FAKEGEM_NAME="net-ldap" - -inherit ruby-fakegem - -DESCRIPTION="Pure ruby LDAP client implementation" -HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap" -LICENSE="MIT" - -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="test" - -ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 - >=dev-ruby/metaid-1 - dev-ruby/test-unit:2 - dev-ruby/rspec:2 )" - -all_ruby_prepare() { - sed -i -e '1igem "test-unit"' test/common.rb || die - - # Avoid an integration spec that hangs due to setting up pipes and - # intercepting openssl connect calls. - rm spec/integration/ssl_ber_spec.rb || die -} diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.8.0.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.8.0.ebuild deleted file mode 100644 index db2ed66dd636..000000000000 --- a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.8.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -# jruby: requires ruby 1.9 compatibility -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_TASK_TEST="test spec" -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc" - -RUBY_FAKEGEM_NAME="net-ldap" - -inherit ruby-fakegem - -DESCRIPTION="Pure ruby LDAP client implementation" -HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap" -LICENSE="MIT" - -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="test" - -ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 - >=dev-ruby/metaid-1 - dev-ruby/test-unit:2 - dev-ruby/rspec:2 )" - -all_ruby_prepare() { - sed -i -e '1igem "test-unit"' test/common.rb || die - - # Fix Specs until RSpec:3 is in tree - sed -i -e 's/truthy/true/' spec/unit/ldap_spec.rb || die - # Avoid an integration spec that hangs due to setting up pipes and - # intercepting openssl connect calls. - rm spec/integration/ssl_ber_spec.rb || die -} diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.4.1.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.4.1.ebuild index 0892766b07ab..a35447d4bfc2 100644 --- a/dev-ruby/ruby-shadow/ruby-shadow-2.4.1.ebuild +++ b/dev-ruby/ruby-shadow/ruby-shadow-2.4.1.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/apalmblad/ruby-shadow http://ttsky.net" LICENSE="Ruby" SLOT="0" -KEYWORDS="amd64 hppa ~ppc ~sparc ~x86" +KEYWORDS="amd64 hppa ppc ~sparc x86" IUSE="" each_ruby_configure() { diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest index 4e160cad776a..954e56c55aea 100644 --- a/dev-ruby/ruby_parser/Manifest +++ b/dev-ruby/ruby_parser/Manifest @@ -1,3 +1,4 @@ DIST ruby_parser-3.6.6.gem 250880 SHA256 d3a3ff8e472f85d769e848caa94938e5c4a7b5d9df75384056431bade8bd2cf5 SHA512 c28fea8970c6449a59c1fed1cb2fec3cd167d45c622a7d7de85cf22f24238cd91e3fae4c20ff0de4bd0f4c3afdfd1979e16ee73f60104bcc39469d13650be02a WHIRLPOOL fdf8abbb6eb1e2c421704effd574b5d7baa21059267fad53b1a4f9e80f46c76afe65065e7b5753769c06159a6bd8c84453b9d8d3989f91492fefb15a7b5a6a64 DIST ruby_parser-3.7.0.gem 310784 SHA256 95d2036b753f399706e3478c1033a81520b27ccf8702e8de076cdfcaff5f1de4 SHA512 bce90b9a266dea59c2c52b80d1524fa6aaf74a6259e7aefe6697081756b8fd6e084ec31042a4b8ca6cf61fbea027fe4255f18d0c3047643a18b03a74b73457d7 WHIRLPOOL 2de7e23ae380e7a2087859cce4d6b97b8399487fc5f504223975f631b8088356a0b3b628d38d6bbecde29a56063cca1c97918a0d7711ddd1482959ffaa0baa35 DIST ruby_parser-3.7.1.gem 311296 SHA256 7cba241552f03f2db4911013fa40bcd925425f713aa712ebdf34431f1d15ab5a SHA512 34e097c97cf5bd606874a0a1aecb4a5eb4a10f97fd088c21a95b1aee52d9c758a1c7d53601bc711fb5b3d57bf1707e157411eb96d15cccd516c6f5024eca9855 WHIRLPOOL 26178317838ee2bbdd928ea5a97a3c3aaef165b49623395dcff58ac819633b9fc2529a754e821e4e2e5257b34f213f92700f691b0506371e9dc8ab3b7b187633 +DIST ruby_parser-3.7.2.gem 311296 SHA256 7f639194041e51680b530480990c0ca3632507e3740a8ef4516592550e3037e6 SHA512 52c026ebdcc687059818d42bb0f4c8e960209deb19f86bd3204c6b0bd3e06ffa01e9d628587f88c866756a81914d5b3cb7df2947433eb39d214a4a144c168442 WHIRLPOOL 63b3189f5ac5153aee8ce7ff1c2ae2533199b59db016a1159e80ec31b23b87e08e97a6bff9112533216f2b07d28ab16e52f462921a0779d45d0cb1c79b1e613f diff --git a/dev-ruby/ruby_parser/ruby_parser-3.7.2.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.7.2.ebuild new file mode 100644 index 000000000000..b6f539a1c402 --- /dev/null +++ b/dev-ruby/ruby_parser/ruby_parser-3.7.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_TASK_DOC="docs" +RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_EXTRADOC="README.txt History.txt" + +inherit ruby-fakegem + +DESCRIPTION="A ruby parser written in pure ruby" +HOMEPAGE="https://github.com/seattlerb/ruby_parser" + +LICENSE="MIT" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +ruby_add_rdepend ">=dev-ruby/sexp_processor-4.6.0:4 + !<dev-ruby/ruby_parser-2.3.1-r1" + +ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )" +ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )" + +DEPEND+=" test? ( dev-util/unifdef )" + +all_ruby_prepare() { + # Remove reference to perforce method that is not in a released + # version of hoe-seattlerb. + #sed -i -e '/perforce/d' Rakefile || die + sed -i -e '/license/d' Rakefile || die + sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die +} diff --git a/dev-ruby/simplecov/simplecov-0.9.1.ebuild b/dev-ruby/simplecov/simplecov-0.9.1.ebuild index 99fa1c70c478..5279fb7ab785 100644 --- a/dev-ruby/simplecov/simplecov-0.9.1.ebuild +++ b/dev-ruby/simplecov/simplecov-0.9.1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby19 ruby20 ruby21 ruby22" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest index 928f277af08c..9f7d6935249e 100644 --- a/dev-ruby/slim/Manifest +++ b/dev-ruby/slim/Manifest @@ -1,2 +1,3 @@ DIST slim-2.0.3.gem 80896 SHA256 ba637becab0090feb16923c808ccf92ab42728eb1799e2bed45d7ca2e34e47fc SHA512 b519bde5725f0eae37f0aa5b0eef99f62749ff19ee17fc87291c5cd38c053106aa57fabc0ead05992c3316c509381c5bb30a9ac42b8584f99beb7f3e59c91bdf WHIRLPOOL 331dec490db9a2d145006e57d072a86eb8b0e45c8fad81fd6ab5bea5b3a2da9cac248fa7dce679f67d3c46f95a869b0ffd981f9d7d943518f7025651172946dc DIST slim-2.1.0.gem 92160 SHA256 de574c991afb2d2b3e081e9d1e4f4e20b339d3b2895b51f7bf022a35a82acd6b SHA512 a092689e62f1189aac9b6657572f76ee9915f1dbfcea7ed90c07386958cbeb6c974d25b7bc85f4cc6887312ab373487618e8dfd8e0f2b9f4dbd0574b0f4b928f WHIRLPOOL a7d141d7c9ce2e88770cc9ffb590465b0d597da1dd3df858a0e0843dc9b182426cc28793df9f56d06f770aff91208433c8fbdef8e5d9780c22edf91d2474989b +DIST slim-3.0.6.gem 96256 SHA256 1315604e79dcf6c89916007ad297e716c35109e19d2d6ce42b5557006138faeb SHA512 06b13f2880752be7e00ee61a86f0d88926b1f0f108b496355a40b30d32101bb777062079b4727eafe7166d404374badb9d2ee50c53dbf4d2206d583c71fb6e7c WHIRLPOOL 4485de92621f7944d74400a561220e1434d0c009cf985864a0169699794028db404ea93d3872e739d49b0c781454e46d85c10d0f5c6b5ba8505c109f1c17362a diff --git a/dev-ruby/slim/slim-3.0.6.ebuild b/dev-ruby/slim/slim-3.0.6.ebuild new file mode 100644 index 000000000000..8493f8c4d344 --- /dev/null +++ b/dev-ruby/slim/slim-3.0.6.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_EXTRADOC="CHANGES README.md" + +RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_TASK_DOC="yard" + +inherit ruby-fakegem + +DESCRIPTION="A template language whose goal is reduce the syntax to the essential parts without becoming cryptic" +HOMEPAGE="http://slim-lang.com/" +LICENSE="MIT" + +KEYWORDS="~amd64" +SLOT="0" +IUSE="doc" + +ruby_add_rdepend ">=dev-ruby/tilt-1.3.3:* <dev-ruby/tilt-2.1:* + >=dev-ruby/temple-0.7.3:0.7" + +ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )" + +ruby_add_bdepend "test? ( dev-ruby/sass )" + +all_ruby_prepare() { + sed -i -e '/bundler/I s:^:#:' Rakefile || die + + # This sinatra code expects tests to be installed but we strip those. + sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die + + # Avoid tests for things we don't have. + sed -i -e '/test_wip_render_with_asciidoc/,/^ end/ s:^:#:' \ + -e '/test_render_with_wiki/,/^ end/ s:^:#:' \ + -e '/test_render_with_creole/,/^ end/ s:^:#:' \ + -e '/test_render_with_org/,/^ end/ s:^:#:' test/core/test_embedded_engines.rb || die +} + +each_ruby_prepare() { + sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die +} diff --git a/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild b/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild new file mode 100644 index 000000000000..bf6335f90e3e --- /dev/null +++ b/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_TASK_DOC="" + +RUBY_FAKEGEM_EXTRADOC="History.txt README.txt" + +inherit ruby-fakegem + +DESCRIPTION="Create sparklines, small graphs to be used inline in texts" +HOMEPAGE="http://sparklines.rubyforge.org/" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-macos" +IUSE="" + +RDEPEND="dev-ruby/rmagick" + +ruby_add_bdepend test "dev-ruby/tidy_table dev-ruby/dust" + +all_ruby_prepare() { + # Don't use deprecated rmagick require for compatibility with newer + # versions. + sed -i -e '/require/ s/RMagick/rmagick/' lib/sparklines.rb || die +} + +each_ruby_test() { + ${RUBY} -I. test/test_all.rb || die +} diff --git a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild index 6d5d5b102dfe..cb3e4bdb2ae8 100644 --- a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild +++ b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test doc" RUBY_PATCHES=( "${P}-require-set.patch" ) diff --git a/dev-ruby/systemu/Manifest b/dev-ruby/systemu/Manifest index dce4c81d871c..77e5f6e00832 100644 --- a/dev-ruby/systemu/Manifest +++ b/dev-ruby/systemu/Manifest @@ -1,2 +1 @@ -DIST systemu-2.6.4.gem 14336 SHA256 5f8c38d0a483f1999aaacac3022bcea4dc6bf524537b93514939787dbf22699a SHA512 070a01b0d131f5d9d0582dd0ba62e02d1203d7cf01494ba2b8165f6fa07309614d33debbc53573dadb94d20d196d80cbb34d0e0274ec42b07a1bfa9efb08ab00 WHIRLPOOL c903e9b1f6653b4b235a9d306b711443670d7928c8f209fa4ccffe44ca29623b6090def690c8fe758f19c3b5ee3acf066c8455ca88c272cf1b2675beb37df106 DIST systemu-2.6.5.gem 15872 SHA256 01f7d014b1453b28e5781e15c4d7d63fc9221c29b174b7aae5253207a75ab33e SHA512 1755e1d24f6d93fd07578859873b94d3fbc855f86c94bf9eb0389959837e94e432883c638ed188e75254312c2ac66eee2041d8b13eff428b473ddf8a8105461f WHIRLPOOL f976734ad2ebc73f9f103b1b3deb652508373ef8b0209656f83052420e4ecd6330e87e893b0ce2e7c93cab34ba917a9355b87ebe352c17f6fc85356c59691443 diff --git a/dev-ruby/systemu/systemu-2.6.4.ebuild b/dev-ruby/systemu/systemu-2.6.4.ebuild deleted file mode 100644 index be2bed802452..000000000000 --- a/dev-ruby/systemu/systemu-2.6.4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -# Test hangs on jruby -USE_RUBY="ruby19 ruby20" - -RUBY_FAKEGEM_TASK_DOC="" - -RUBY_FAKEGEM_EXTRADOC="README" - -inherit ruby-fakegem - -DESCRIPTION="Universal capture of STDOUT and STDERR and handling of child process PID" -HOMEPAGE="http://codeforpeople.com/lib/ruby/systemu/" - -LICENSE="Ruby" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -all_ruby_install() { - all_fakegem_install - - insinto /usr/share/doc/${PF} - doins -r samples -} diff --git a/dev-ruby/systemu/systemu-2.6.5.ebuild b/dev-ruby/systemu/systemu-2.6.5.ebuild index bff6e4d410f0..366507a81c1c 100644 --- a/dev-ruby/systemu/systemu-2.6.5.ebuild +++ b/dev-ruby/systemu/systemu-2.6.5.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="http://codeforpeople.com/lib/ruby/systemu/" LICENSE="Ruby" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" all_ruby_install() { diff --git a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild index c074da5599f5..3711ffba28fb 100644 --- a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild +++ b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild @@ -27,7 +27,7 @@ HOMEPAGE="http://test-unit.rubyforge.org/" LICENSE="Ruby" SLOT="2" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="doc test" all_ruby_compile() { diff --git a/dev-ruby/webmock/webmock-1.22.1.ebuild b/dev-ruby/webmock/webmock-1.22.1.ebuild index d6ce0a96f137..9dbacf4f6857 100644 --- a/dev-ruby/webmock/webmock-1.22.1.ebuild +++ b/dev-ruby/webmock/webmock-1.22.1.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/bblimke/webmock" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~ppc64" IUSE="" ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 dev-ruby/hashdiff" diff --git a/dev-scheme/chicken/chicken-4.10.0-r1.ebuild b/dev-scheme/chicken/chicken-4.10.0-r1.ebuild index 93d2e7230ef4..f994d5593d7e 100644 --- a/dev-scheme/chicken/chicken-4.10.0-r1.ebuild +++ b/dev-scheme/chicken/chicken-4.10.0-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://code.call-cc.org/releases/${MY_PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="alpha amd64 ~ppc ~ppc64 x86" IUSE="emacs doc" DOCS=( NEWS README LICENSE ) diff --git a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild index dda19161b48d..edcf1be6c676 100644 --- a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild +++ b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild @@ -31,6 +31,10 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-ext-ldflags.diff epatch "${FILESDIR}"/${PN}-xz-info.diff epatch "${FILESDIR}"/${PN}-rfc.tls.diff + + mv gc/src/*.[Ss] gc || die + sed -i "/^EXTRA_libgc_la_SOURCES/s|src/||g" gc/Makefile.am + eautoconf } diff --git a/dev-scheme/gauche/gauche-0.9.4.ebuild b/dev-scheme/gauche/gauche-0.9.4.ebuild deleted file mode 100644 index 1a6aaaec57ef..000000000000 --- a/dev-scheme/gauche/gauche-0.9.4.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit autotools eutils - -MY_P="${P^g}" - -DESCRIPTION="A Unix system friendly Scheme Interpreter" -HOMEPAGE="http://practical-scheme.net/gauche/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="ipv6 test" - -RDEPEND="sys-libs/gdbm" -DEPEND="${RDEPEND} - test? ( dev-libs/openssl )" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-rpath.diff - epatch "${FILESDIR}"/${PN}-gauche.m4.diff - epatch "${FILESDIR}"/${PN}-ext-ldflags.diff - epatch "${FILESDIR}"/${PN}-xz-info.diff - epatch "${FILESDIR}"/${PN}-rfc.tls.diff - eautoconf -} - -src_configure() { - econf \ - $(use_enable ipv6) \ - --with-slib="${EPREFIX}"/usr/share/slib -} - -src_test() { - emake -j1 -s check -} - -src_install() { - emake -j1 DESTDIR="${D}" install-pkg install-doc - dodoc AUTHORS ChangeLog HACKING README -} diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest index dbc6684317ff..e1c2d040e5df 100644 --- a/dev-tex/biber/Manifest +++ b/dev-tex/biber/Manifest @@ -1,2 +1,2 @@ -DIST biber-1.9.tar.gz 2046569 SHA256 4b8f7ab78f326f2c862c99f8dbb3b224c49f9289820dc226c9529dfa945d9066 SHA512 6b417fd2537e832e8309e3cd1405037a0e1a6e1bc2f2759a208a97f1107a787c269eb3dd9a5b3875855dd50d641dbe7d61b7127d11f986a05d1ceb08ec6ecfda WHIRLPOOL 47b39ab2e0c35e48f4d627bf24f4c03bbeb6b8f499c6492d403da31098b1eb13cd998713f7fbe38c260dff1418b1bd03aede7fa86cd04baf4d5dbe04816e4377 DIST biber-2.1.tar.gz 2222706 SHA256 7b20049557869a994ed9e0373f620720370981b6412ca415f0408d1af893f8f4 SHA512 4a19bf9781cb90da52d9f08163b9ed400233db5c446054b12ab339786456e85bc7aba16ff8c0a36351ecc66b90e4a93e594e820b52f93566449b8c96b27852fb WHIRLPOOL 0c7b1827e3e9ede6aebd45a00b63eac8cc3e7896d89c219fa2c467b4b6b10f48f2180aeb70d727f14620267943d59646daf4d0f09ddb1bd7b6b4b945d973dc03 +DIST biber-2.2.tar.gz 2296128 SHA256 6dd93476b27ac7603bc9f224a3b00558f86617209f93b74f8cb4a51f54480c2f SHA512 508b5a8046a1ff7ef6482b5c1f86ce427fa47f669ca224ee52252109dd6488ff242ea5076cafd47f66f288fed994b5425eab4c2566346046e0b2f656ca679d7c WHIRLPOOL 2006b26277eaeb707211a1828e70c4bbfd04030f56e91062c57050a5b0479d317455352730976f3f9206eafbafdccc71d9f071f4e9dedace1c77e8c79ab826b4 diff --git a/dev-tex/biber/biber-1.9.ebuild b/dev-tex/biber/biber-2.2.ebuild index 376fe96a48bc..47125b8f205a 100644 --- a/dev-tex/biber/biber-1.9.ebuild +++ b/dev-tex/biber/biber-2.2.ebuild @@ -9,8 +9,8 @@ inherit eutils perl-module MY_PN=biblatex-${PN} DESCRIPTION="A BibTeX replacement for users of biblatex" -HOMEPAGE="http://biblatex-biber.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${PV}/${MY_PN}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="http://biblatex-biber.sourceforge.net/ https://github.com/plk/biber/" +SRC_URI="https://github.com/plk/biber/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( Artistic-2 GPL-1 GPL-2 GPL-3 )" SLOT="0" @@ -32,32 +32,36 @@ RDEPEND=">=dev-lang/perl-5.16 dev-perl/IPC-Run3 dev-perl/libwww-perl[ssl] dev-perl/List-AllUtils + >=dev-perl/List-MoreUtils-0.408.0 dev-perl/Log-Log4perl + dev-perl/LWP-Protocol-https dev-perl/regexp-common dev-perl/Readonly dev-perl/Readonly-XS - >=dev-perl/Text-BibTeX-0.66 + dev-perl/Text-Roman + >=dev-perl/Text-BibTeX-0.700.0 dev-perl/URI dev-perl/Unicode-LineBreak + dev-perl/Unicode-Normalize dev-perl/XML-LibXML-Simple dev-perl/XML-LibXSLT dev-perl/XML-SAX-Base dev-perl/XML-Writer - >=dev-tex/biblatex-2.7 - virtual/perl-IPC-Cmd" + >=dev-tex/biblatex-3.1 + virtual/perl-IPC-Cmd + >=virtual/perl-Unicode-Collate-1.140.0" DEPEND="${RDEPEND} dev-perl/Config-AutoConf dev-perl/Module-Build test? ( dev-perl/File-Which + dev-perl/Test-Differences dev-perl/Test-Pod dev-perl/Test-Pod-Coverage )" -S=${WORKDIR}/${MY_PN}-${PV} - SRC_TEST="parallel" src_prepare(){ - epatch "${FILESDIR}"/${P}-drop-mozilla-ca.patch + epatch "${FILESDIR}"/${PN}-2.1-drop-mozilla-ca.patch } src_install(){ diff --git a/dev-tex/biber/files/biber-1.9-drop-mozilla-ca.patch b/dev-tex/biber/files/biber-1.9-drop-mozilla-ca.patch deleted file mode 100644 index 54732a603989..000000000000 --- a/dev-tex/biber/files/biber-1.9-drop-mozilla-ca.patch +++ /dev/null @@ -1,221 +0,0 @@ -From f31062a94aefff64cc193aa3a394fd3a623c2aa7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu> -Date: Thu, 29 May 2014 14:23:06 +0200 -Subject: [PATCH] Remove Mozilla::CA dependency. - - -diff --git a/Build.PL b/Build.PL -index 3ea589b..76acdc7 100644 ---- a/Build.PL -+++ b/Build.PL -@@ -49,7 +49,6 @@ my $builder = $class->new( - 'IPC::Run3' => 0, - 'List::AllUtils' => 0, - 'List::MoreUtils' => 0, -- 'Mozilla::CA' => '20130114', - 'Regexp::Common' => 0, - 'Log::Log4perl' => 0, - 'Unicode::Collate' => '1.04', -diff --git a/META.json b/META.json -index cf91a91..1855294 100644 ---- a/META.json -+++ b/META.json -@@ -44,7 +44,6 @@ - "List::AllUtils" : "0", - "List::MoreUtils" : "0", - "Log::Log4perl" : "0", -- "Mozilla::CA" : "20130114", - "Regexp::Common" : "0", - "Text::BibTeX" : "0.69", - "URI" : "0", -diff --git a/META.yml b/META.yml -index 7091ddb..82706ee 100644 ---- a/META.yml -+++ b/META.yml -@@ -114,7 +114,6 @@ requires: - List::AllUtils: 0 - List::MoreUtils: 0 - Log::Log4perl: 0 -- Mozilla::CA: 20130114 - Regexp::Common: 0 - Text::BibTeX: 0.69 - URI: 0 -diff --git a/bin/biber b/bin/biber -index 6038535..4c3ea1c 100755 ---- a/bin/biber -+++ b/bin/biber -@@ -73,7 +73,6 @@ GetOptions( - 'sortfirstinits=s', - 'sortlocale|l=s', - 'sortupper=s', -- 'ssl-nointernalca', - 'ssl-noverify-host', - 'tool', - 'tool_align|tool-align', # legacy alias for output_align -@@ -664,12 +663,6 @@ default sorting (B<--collate|-C>). When - using B<--fastsort|-f>, your OS collation locale determines - this and this option is ignored (default is true). - --=item B<--ssl-nointernalca> -- --Don't try to use the default Mozilla CA certificates when using HTTPS to fetch remote data. --This assumes that the user will set one of the perl LWP::UserAgent module environment variables --to find the CA certs. -- - =item B<--ssl-noverify-host> - - Turn off host verification when using HTTPS to fetch remote data sources. -diff --git a/data/schemata/config.rnc b/data/schemata/config.rnc -index e798733..5fcce6d 100644 ---- a/data/schemata/config.rnc -+++ b/data/schemata/config.rnc -@@ -72,7 +72,6 @@ start = element config { - map+ - }+ - }? & -- element ssl-nointernalca { "0" | "1" }? & - element ssl-noverify-host { "0" | "1" }? & - element tool { "0" | "1" }? & - element tool_config { text }? & -diff --git a/data/schemata/config.rng b/data/schemata/config.rng -index 185cde6..f7e4176 100644 ---- a/data/schemata/config.rng -+++ b/data/schemata/config.rng -@@ -335,14 +335,6 @@ - </element> - </optional> - <optional> -- <element name="ssl-nointernalca"> -- <choice> -- <value>0</value> -- <value>1</value> -- </choice> -- </element> -- </optional> -- <optional> - <element name="ssl-noverify-host"> - <choice> - <value>0</value> -diff --git a/lib/Biber/Input/file/biblatexml.pm b/lib/Biber/Input/file/biblatexml.pm -index d3f7377..21b1471 100644 ---- a/lib/Biber/Input/file/biblatexml.pm -+++ b/lib/Biber/Input/file/biblatexml.pm -@@ -97,19 +97,6 @@ sub extract_entries { - else { - if ($1) { # HTTPS - # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues -- # We have to explicitly set the cert path because otherwise the https module -- # can't find the .pem when PAR::Packer'ed -- # Have to explicitly try to require Mozilla::CA here to get it into %INC below -- # It may, however, have been removed by some biber unpacked dists -- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and -- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and -- not defined(Biber::Config->getoption('ssl-nointernalca')) and -- eval {require Mozilla::CA}) { -- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem -- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); -- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' -- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); -- } - - # fallbacks for, e.g., linux - unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { -diff --git a/lib/Biber/Input/file/bibtex.pm b/lib/Biber/Input/file/bibtex.pm -index 33185a6..f3fd9f2 100644 ---- a/lib/Biber/Input/file/bibtex.pm -+++ b/lib/Biber/Input/file/bibtex.pm -@@ -140,19 +140,6 @@ sub extract_entries { - else { - if ($1) { # HTTPS - # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues -- # We have to explicitly set the cert path because otherwise the https module -- # can't find the .pem when PAR::Packer'ed -- # Have to explicitly try to require Mozilla::CA here to get it into %INC below -- # It may, however, have been removed by some biber unpacked dists -- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and -- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and -- not defined(Biber::Config->getoption('ssl-nointernalca')) and -- eval {require Mozilla::CA}) { -- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem -- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); -- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' -- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); -- } - - # fallbacks for, e.g., linux - unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { -diff --git a/lib/Biber/Input/file/endnotexml.pm b/lib/Biber/Input/file/endnotexml.pm -index 14adc38..b880e8a 100644 ---- a/lib/Biber/Input/file/endnotexml.pm -+++ b/lib/Biber/Input/file/endnotexml.pm -@@ -111,19 +111,6 @@ sub extract_entries { - $logger->info("Data source '$source' is a remote EndNote XML datasource - fetching ..."); - if ($1) { # HTTPS - # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues -- # We have to explicitly set the cert path because otherwise the https module -- # can't find the .pem when PAR::Packer'ed -- # Have to explicitly try to require Mozilla::CA here to get it into %INC below -- # It may, however, have been removed by some biber unpacked dists -- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and -- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and -- not defined(Biber::Config->getoption('ssl-nointernalca')) and -- eval {require Mozilla::CA}) { -- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem -- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); -- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' -- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); -- } - - # fallbacks for, e.g., linux - unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { -diff --git a/lib/Biber/Input/file/ris.pm b/lib/Biber/Input/file/ris.pm -index 0dbeacc..dda7466 100644 ---- a/lib/Biber/Input/file/ris.pm -+++ b/lib/Biber/Input/file/ris.pm -@@ -110,19 +110,6 @@ sub extract_entries { - else { - if ($1) { # HTTPS - # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues -- # We have to explicitly set the cert path because otherwise the https module -- # can't find the .pem when PAR::Packer'ed -- # Have to explicitly try to require Mozilla::CA here to get it into %INC below -- # It may, however, have been removed by some biber unpacked dists -- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and -- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and -- not defined(Biber::Config->getoption('ssl-nointernalca')) and -- eval {require Mozilla::CA}) { -- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem -- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); -- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' -- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); -- } - - # fallbacks for, e.g., linux - unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { -diff --git a/lib/Biber/Input/file/zoterordfxml.pm b/lib/Biber/Input/file/zoterordfxml.pm -index 0d05d2b..79ba19e 100644 ---- a/lib/Biber/Input/file/zoterordfxml.pm -+++ b/lib/Biber/Input/file/zoterordfxml.pm -@@ -123,19 +123,6 @@ sub extract_entries { - $logger->info("Data source '$source' is a remote Zotero RDF/XML data source - fetching ..."); - if ($1) { # HTTPS - # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues -- # We have to explicitly set the cert path because otherwise the https module -- # can't find the .pem when PAR::Packer'ed -- # Have to explicitly try to require Mozilla::CA here to get it into %INC below -- # It may, however, have been removed by some biber unpacked dists -- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and -- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and -- not defined(Biber::Config->getoption('ssl-nointernalca')) and -- eval {require Mozilla::CA}) { -- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem -- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); -- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' -- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); -- } - - # fallbacks for, e.g., linux - unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { --- -2.0.0 - diff --git a/dev-tex/biblatex/Manifest b/dev-tex/biblatex/Manifest index 238aca28d7a7..d4299324ca45 100644 --- a/dev-tex/biblatex/Manifest +++ b/dev-tex/biblatex/Manifest @@ -1,2 +1,2 @@ -DIST biblatex-2.9a.tds.tgz 17829003 SHA256 d3e6490505728113bcc5332f1a83fca1db6d50950e0ffaade495f4c5052e5175 SHA512 1341e530bc68096498306b9933a014eaf2e4ebc573b344776ae3f3addd93301927f31da84b368b812e364aae45bdab1624da69a63dfcd0589b3a28c7795f6ab8 WHIRLPOOL 51f30f41e323077a24958e0724d1357763f2c5e9b05ebf6dd11b254cde0d5d20f4a93cf66d9f722d550908d1d0c9856f430edc2067aabd4e4d3c11b293e465df DIST biblatex-3.0.tds.tgz 18965624 SHA256 8de8554eea84dce59a652d61a11e5fcd52c89f303471eb9ca58304b82155e889 SHA512 a8db58907953010c0376bda823ef03250428a2df0172a6e74f2725b19212a8df95c8e742b27f5301a5ca401ccee394d1aa4485bafc2263c985fbde1ce5de4c93 WHIRLPOOL b444a55a0149a5147e1142c4ba8a4ee2251e1f92cece83a8ee7b6ff79a46d46bbb9a22b4f34cdb06aba55eb9b13efb9465d32de60753f27d5c48931044411719 +DIST biblatex-3.1.tds.tgz 18983013 SHA256 96280c084f7f1a5ccde679130f80ae0b7e43265aa51b0ea083caadd01c5ec7d1 SHA512 62a4be3d875f70987c2faf83b7558b46ae936ef4e52afa357a2ac80a65afc15dfd783c1a4a4e140d9aa906bb49153ddec2b4e8233ed2d2a26599468190cde951 WHIRLPOOL 5e75313543b5b36a18e593dda68e3c655142e378877bb74513406ca6515a3d8eea5d67ef802594834a766af270d44e23d9f887f8d71e66e6fc8948c6180af864 diff --git a/dev-tex/biblatex/biblatex-2.9a-r1.ebuild b/dev-tex/biblatex/biblatex-3.1.ebuild index e9a5d908c1f5..47aae74acd4c 100644 --- a/dev-tex/biblatex/biblatex-2.9a-r1.ebuild +++ b/dev-tex/biblatex/biblatex-3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -7,7 +7,7 @@ EAPI=5 inherit latex-package DESCRIPTION="Reimplementation of the bibliographic facilities provided by LaTeX" -HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex" +HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex https://github.com/plk/biblatex/" SRC_URI="mirror://sourceforge/${PN}/${P}.tds.tgz" LICENSE="LPPL-1.3" diff --git a/dev-tex/sketch/metadata.xml b/dev-tex/sketch/metadata.xml index cf72776fa56a..b98516e1eabd 100644 --- a/dev-tex/sketch/metadata.xml +++ b/dev-tex/sketch/metadata.xml @@ -8,7 +8,7 @@ <name>Alexis Ballier</name> </maintainer> <maintainer> - <email>dima@sphinx.net.ru</email> + <email>dima@dzhus.org</email> <name>Dmitry Dzhus</name> </maintainer> </pkgmetadata> diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild index a9978a1ffeb2..b81bb1a26c44 100644 --- a/dev-util/aruba/aruba-0.8.1.ebuild +++ b/dev-util/aruba/aruba-0.8.1.ebuild @@ -17,7 +17,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications" HOMEPAGE="https://github.com/cucumber/aruba" LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86" SLOT="0" IUSE="" diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest index ec0f0aeb89cc..2db73d4cef76 100644 --- a/dev-util/bcpp/Manifest +++ b/dev-util/bcpp/Manifest @@ -1,2 +1,3 @@ DIST bcpp-20050725.tgz 132649 SHA256 1a4b5e8e741d6be400eb68b7c4a3eebc6dabe29948a72a7a0bccb1db075eaa2a SHA512 0ada3aee998fa6748e7492bfe2e0d6e5417640eaa19aa3342637ee1d162c907d2af4fd2d1ab24661f36798d2d51fa017d9c113b8499b32bf4d521e130aa75323 WHIRLPOOL fff51c65b60351c9a7c55d060754e3e09383b905820ab79aa2f371a894a82d8a3fa5a00b00a066380909c49487e262f99a832022b5f214d564e43b8939fcbdcb DIST bcpp-20090630.tgz 138757 SHA256 27b46ab3cef53a658605f350e3982862e17b523e703f23617530a57180200a34 SHA512 660d11c0d8a8d3ccc2a4c14ccb60164a43647fface79ffd86b8d99519e227e32a882fc213a5fef64fd3aee1c409c4bb0a871dfd6d6a09a8ad35e253baef6496b WHIRLPOOL 1fa68efd9874933de2097b87aab0dd586cbc29cf7fc3d4ba6d80984ecb289f01d8093e82fbca3f8077300887a8d1b1b970ed5bcabb0a766489bdcb23704f7ac2 +DIST bcpp-20150811.tgz 145969 SHA256 6a18d68a09c4a0e8bf62d23d13ed7c8a62c98664a655f9d648bc466240ce97c3 SHA512 a11462574bd87cf66dc50ce23f188d335480aae5448b527694791d4b7ae5cde27c0e0c0850dc8899b2b66198c37a434985c833f95f7f2d2d88a3b7dfe4ff34a9 WHIRLPOOL 959677314ce1bbd361b3060f7f8f028ad89cce8d7167ecc169f6d49a854ecfadc50177be2dd2ffdac838252f67af72d2a4c341b2666208bc8cef1aadcee867db diff --git a/dev-util/bcpp/bcpp-20150811.ebuild b/dev-util/bcpp/bcpp-20150811.ebuild new file mode 100644 index 000000000000..10ebb2c3edc8 --- /dev/null +++ b/dev-util/bcpp/bcpp-20150811.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils + +DESCRIPTION="Indents C/C++ source code" +HOMEPAGE="http://invisible-island.net/bcpp/" +SRC_URI="ftp://invisible-island.net/bcpp/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_compile() { + emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"' +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \ + txtdocs/manual.txt || die "dodoc failed" + + # Install our configuration files. + insinto /etc/bcpp + doins bcpp.cfg indent.cfg || die "doins failed" +} + +pkg_postinst() { + elog "Check the documentation for more information on how to" + elog "Run bcpp. Please note that in order to get help for" + elog "bcpp, please run bcpp -h and not the command by itself." + elog "" + elog "Configuration files are at /etc/bcpp." + elog "To use them, use the -c option followed by the filename." +} diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest index 5184a3267234..3e45afe4fe8d 100644 --- a/dev-util/coccinelle/Manifest +++ b/dev-util/coccinelle/Manifest @@ -1,3 +1,4 @@ DIST coccinelle-1.0.0.tgz 3427246 SHA256 e18b4c77964c6f623c385dc8b2fcb46beacd9811927617144620b12d93289e74 SHA512 0c59918dff3d33035f5c928b54de9cbe32f9146d9e4b82545d168140d1395ff5b3e446faff47f39dbb6fceb74f432b419e9c7322e834c11bb50b5fb5d4e4dd46 WHIRLPOOL 8714327d7156bd1ada0c6b0776fefcc4e46b9885354ca686d4de8b35c2dd1cf6372e91dfa3a04645295f411b40d57eee94d81cbd8dfe2c18f3dc3b15ff8e1926 DIST coccinelle-1.0.1.tgz 2772730 SHA256 39caac46c1f80cbe5de21164c5b31a794e3befdb9cd7ef1d080d455ac171b526 SHA512 5a69476941a9582ca6e0663c468a87aba15b6e38243cbb532c517b75066c8fafe37cbe6d398d6183cc7a315c5680efdf425f0bc8cb2184dbf94e446879514a89 WHIRLPOOL 8b38b982b8d19c10c7e3ed77629b6883c4d6455da4da4d68251b492ce36490c5236573bf7c44a34e21887b8be0ca83b4efb39cf13b1c4c6db7db58979ee6a7bc DIST coccinelle-1.0.2.tgz 2790829 SHA256 4e45b904f42c9b84732168782d491c8c1ab23bb85db06c4b9ba2762bea8ac679 SHA512 83c8e250a7e19126ce3f95d0455892d60b2d7a688af3a066edcfb9a8cc146f8a9281c9e019896421e1bc546d366114effef3116105eae19617ad45c26f42c534 WHIRLPOOL 15b64abbad31f49883e4cacc2282ed28eb67f64d951636ee6b690a474b072e6a029c4131adb727f5f7a8d86628b871db0cff144ad8478514529c4c5d5dee9074 +DIST coccinelle-1.0.4.tgz 2484218 SHA256 7f823813a2ea299c0f6c01d8419b83c4dc6617116d32ba99d726443a1c22b06d SHA512 1e7ad7adb700f2e0d844b3f5787c24fc40bc9a61354b5aefa0f957e524e74ba67a8bef594e837a479d3a5f3c8d89c2395e8636838e0451977de8bd3d588d7ce1 WHIRLPOOL 15759395a2253fa8322e034a02388b5f0f6cc0702e82d43e95c3c9ecc2fa5795cb4a3a3fbc48aa2104bd0173adfd58e046f804d63c3ccbe278796cbe4932f46e diff --git a/dev-util/coccinelle/coccinelle-1.0.4.ebuild b/dev-util/coccinelle/coccinelle-1.0.4.ebuild new file mode 100644 index 000000000000..adc67ae5c72d --- /dev/null +++ b/dev-util/coccinelle/coccinelle-1.0.4.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +PYTHON_COMPAT=( python2_7 ) + +inherit multilib eutils python-single-r1 bash-completion-r1 elisp-common autotools + +MY_P="${P/_/-}" +DESCRIPTION="Program matching and transformation engine" +HOMEPAGE="http://coccinelle.lip6.fr/" +SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# ocaml enables ocaml scripting (uses findlib) +CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?] + dev-ml/sexplib:=[ocamlopt?] + dev-ml/menhir:=[ocamlopt?] + || ( dev-ml/camlp4:=[ocamlopt?] <dev-lang/ocaml-4.02.0 ) + dev-ml/parmap:=[ocamlopt?] + emacs? ( virtual/emacs ) + ocaml? ( dev-ml/findlib:= ) + pcre? ( dev-ml/pcre-ocaml:=[ocamlopt?] ) + python? ( ${PYTHON_DEPS} )" + +RDEPEND="${CDEPEND} + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" + +# dev-texlive/texlive-fontsextra contains 'ifsym.sty' +DEPEND="${CDEPEND} + virtual/pkgconfig + doc? ( + virtual/latex-base + dev-texlive/texlive-latexextra + dev-texlive/texlive-fontsextra + )" + +REQUIRED_USE="test? ( ocaml python )" + +DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt ) + +S=${WORKDIR}/${MY_P} + +SITEFILE=50coccinelle-gentoo.el + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if use python ; then + # fix python install location + sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \ + -i Makefile || die + fi + + # This is regenerated by menhir, bundled version does not build with latest + # one... + rm -f parsing_cocci/parser_cocci_menhir.ml + + epatch "${FILESDIR}"/${PN}-1.0.0_rc16-findtool.patch + eautoreconf +} + +src_configure() { + econf \ + $(use_enable python) \ + $(use_enable ocaml) \ + $(use_enable pcre) \ + $(use_enable pcre pcre-syntax) +} + +src_compile() { + emake depend + emake + + use ocamlopt && emake opt + + if use doc ; then + VARTEXFONTS="${T}"/fonts emake docs + fi + + if use emacs ; then + elisp-compile editors/emacs/cocci.el || die + fi +} + +src_test() { + source env.sh # needed for built in-place python plugin + ./spatch standard.h -parse_c -dir tests/ || die + yes | ./spatch -iso_file standard.iso -macro_file_builtins standard.h -testall || die + if use ocamlopt ; then + ./spatch.opt -iso_file standard.iso -macro_file_builtins standard.h -testall || die + fi +} + +src_install() { + default + + use doc && dodoc docs/manual/*.pdf + newbashcomp scripts/spatch.bash_completion spatch + + if use emacs ; then + elisp-install ${PN} editors/emacs/* + elisp-site-file-install "${FILESDIR}"/${SITEFILE} + fi + + if use vim-syntax ; then + newdoc editors/vim/README README-vim + rm editors/vim/README || die + insinto /usr/share/vim/vimfiles + doins -r editors/vim/* + fi + + use python && python_optimize + + export STRIP_MASK='*/coccinelle/spatch' +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-util/codeblocks/codeblocks-13.12-r1.ebuild b/dev-util/codeblocks/codeblocks-13.12-r1.ebuild new file mode 100644 index 000000000000..fa0a728898c8 --- /dev/null +++ b/dev-util/codeblocks/codeblocks-13.12-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +WX_GTK_VER="3.0" + +inherit eutils wxwidgets + +DESCRIPTION="The open source, cross platform, free C++ IDE" +HOMEPAGE="http://www.codeblocks.org/" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd" +SRC_URI="mirror://sourceforge/codeblocks/${P/-/_}-1.tar.gz" + +IUSE="contrib debug pch static-libs" + +RDEPEND="app-arch/zip + x11-libs/wxGTK:${WX_GTK_VER}[X] + contrib? ( + app-text/hunspell + dev-libs/boost:= + dev-libs/libgamin + )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_configure() { + need-wxwidgets unicode + econf \ + --with-wx-config="${WX_CONFIG}" \ + $(use_enable debug) \ + $(use_enable pch) \ + $(use_enable static-libs static) \ + $(use_with contrib contrib-plugins all) +} + +src_install() { + default + prune_libtool_files +} diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild index 878c44ba362d..d103c986e13c 100644 --- a/dev-util/codeblocks/codeblocks-9999.ebuild +++ b/dev-util/codeblocks/codeblocks-9999.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI="5" -WX_GTK_VER="2.8" +WX_GTK_VER="3.0" inherit autotools eutils subversion wxwidgets @@ -18,7 +18,7 @@ ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk" IUSE="contrib debug pch static-libs" RDEPEND="app-arch/zip - x11-libs/wxGTK:2.8[X] + x11-libs/wxGTK:${WX_GTK_VER}[X] contrib? ( app-text/hunspell dev-libs/boost:= @@ -41,6 +41,7 @@ src_prepare() { } src_configure() { + need-wxwidgets unicode econf \ --with-wx-config="${WX_CONFIG}" \ $(use_enable debug) \ diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest index fcdfa118146b..25ddf2a9c6d5 100644 --- a/dev-util/cucumber-core/Manifest +++ b/dev-util/cucumber-core/Manifest @@ -1 +1,2 @@ DIST cucumber-core-1.2.0.gem 41984 SHA256 390e4d05a99d4b648f75343b553cb22c59aa9b4e461ab383323d4ca381b4b4bb SHA512 b24a108a0147afca99d292df7c64320190a1fa0b2fcc08038f3a98eb09d29f3f02e0581004a168e80e0c2091e7e981494f86e9086ff81504a014b52f5fe5ceeb WHIRLPOOL e49a4814d2810abfb1f8d4b79d858c87ce128c98d2e238147d0599eab7acdafa25fa438f1f1addd50dd195484f79fb0257f29dfb5fa5bbba07f173f313b6bedb +DIST cucumber-core-1.3.0.gem 44032 SHA256 28dfebe5e003a28c60266468f781968e30fe26858a823001be3f9aa481fbb98a SHA512 82d5185669ff8962cd4a1da7257e1144028cf0718c6a324facf4686a287526abb5c7848898bb25a848ba535ef0526daea13ec3de93b2b2ffce76c49cfd60ed0b WHIRLPOOL 7278feb976665e7bee4a7b43b0ca320bf95747c919addef167ef56d20293b0a878bf06d2669f97454c63675fad79801c6b906e08a2b3c8991f5d44eaf8d40634 diff --git a/dev-util/cucumber-core/cucumber-core-1.3.0.ebuild b/dev-util/cucumber-core/cucumber-core-1.3.0.ebuild new file mode 100644 index 000000000000..ed7b162250c0 --- /dev/null +++ b/dev-util/cucumber-core/cucumber-core-1.3.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2015 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_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md" + +inherit ruby-fakegem + +DESCRIPTION="Executable feature scenarios" +HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis" +LICENSE="Ruby" + +KEYWORDS="~amd64" +SLOT="0" +IUSE="test" + +ruby_add_bdepend " + test? ( + >=dev-ruby/unindent-1.0 + )" + +USE_RUBY=${USE_RUBY/ruby22} ruby_add_bdepend "test? ( >=dev-ruby/kramdown-1.4.2 )" + +ruby_add_rdepend " + >=dev-ruby/gherkin3-3.1.0:3 +" + +each_ruby_prepare() { + case ${RUBY} in + *ruby22) + # Avoid dependency on kramdown so we can add the ruby22 + # target. + rm -f spec/readme_spec.rb || die + ;; + esac +} diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest index ceda8fc73f0c..e794699e64ac 100644 --- a/dev-util/jenkins-bin/Manifest +++ b/dev-util/jenkins-bin/Manifest @@ -1,3 +1,3 @@ DIST jenkins-bin-1.625.1.war 62885582 SHA256 e5134146d398f00712c19c69bc84a594509505eec2ba6930f8df41689debfbcb SHA512 b05710ffe195476fa22ca2dd226148755310ee17527c0294a0251414bbb085860fd40ec485ce53a4446d36bfaa908f3a4b828e1772d590433120ec3668c239d9 WHIRLPOOL df9dcfa58c2f166929e0c0e22f6daab95d4f42549509943459fbcad70349c9885673db27ee8262421989b69f0503f8e9805d9a889181ab71c6a98f0de5e44245 -DIST jenkins-bin-1.633.war 63242255 SHA256 15d930888bfb31ea231bf617bf88aeb281a5f0488385f555d34c439d308cb2e8 SHA512 517735a4d707d77d979bcbb2f3631b5a527da9824eb91d1bb3741ddb4685f81b15cad6c4a20cb482eaad6f02863b9195d366968c00d63c44690cc426df107c29 WHIRLPOOL 7331d0e4258537cc721b532f70612f1b945d0c5b456781dd6a9fcc2c0fcf75d9960cf7be8b97ae52a6df3a58d728184f608c5b8fb13ee9dc376797c77e1ec96c DIST jenkins-bin-1.634.war 63310617 SHA256 47f9bd9dd3ee400c62905173a9d65605653a10a339e1d593f0b2e0f7456b1d9a SHA512 b736f04cd211b4a3cf56bc5dbd504997319e6d05b4cd6d5629710f69ac6080409923b733109d241debc6737ad4780026e4a67a673aae561ddb40900205da9c56 WHIRLPOOL 396239893cd511b9f21dc6d5f2b17a9dc6bfd7a708401d649a3eb0cadbd34334e726146caf02cb3963caaaf2dbc3aee6277d26b570c835195cb84fd2252a896d +DIST jenkins-bin-1.635.war 63529765 SHA256 6ec3487a56cbb319a8c47cb5986adef5fa2748ebd2ef5752159f47057c4c048f SHA512 b2200c30715c254a87ef7628835eaf6f1b606c8a9da1e15d6264b84d848ff7f7b4de1dcfb0a5b5a905c6c34e1483f393e53c31f00fe76860c5855651ceb05182 WHIRLPOOL 0e5e6769c3712be772ff20af5f0f861dc2ffb665352bff7514c8ab6bd3a97b084a8716c43fa00b2ba0e9f72d09658704852a00b87087555fa4c3f01f6b5773d5 diff --git a/dev-util/jenkins-bin/jenkins-bin-1.633.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.635.ebuild index 37fc08477727..37fc08477727 100644 --- a/dev-util/jenkins-bin/jenkins-bin-1.633.ebuild +++ b/dev-util/jenkins-bin/jenkins-bin-1.635.ebuild diff --git a/dev-util/kdevelop-php-docs/Manifest b/dev-util/kdevelop-php-docs/Manifest index 21f4a59e91f8..0d2d38e1100a 100644 --- a/dev-util/kdevelop-php-docs/Manifest +++ b/dev-util/kdevelop-php-docs/Manifest @@ -1 +1,2 @@ DIST kdevelop-php-docs-1.7.1.tar.xz 32840 SHA256 ae8acbffb882cdc20c32a22a8e522e0aea0c69b3d93376afa79e7b3bcad47568 SHA512 9a78b2d3051fe81b0fc91cb7cea586d0d3391959f55fc5cc05c3ff1f9c4d2a9a83957e50a9feac050d6d01a831fdfd7fa8e0f9dcd6f801723f8b638f60663592 WHIRLPOOL 97e77ce5019ba707b3d37c058a16edd1788055a83f24bdcc6058197e723161dcbc484a8557d32dadc02dd98c1acbd2a5dc732f122bca5e10bcd482e92fb43a5a +DIST kdevelop-php-docs-1.7.2.tar.xz 32892 SHA256 2dff2f54f631296c87007be84a0dc439d328d473717577c0d1450a9fc7e6e828 SHA512 5bbc3a4a61fa87b96182bfa1b3df28f26a35e4eb7ee021c822a031cb71b5900b53bacbac0d4892d8ff021dcc90b74097a0d67f31b17a4c3b7248170b19b54e16 WHIRLPOOL 5ef5309986dc42d41fe90333025075b132d3bfe3107802b97e54e4a1f2f36c37234b87dad3fcaf6d15ab3d79567fd4dae1ae1155403e7f1dfbd3bebf8d2ab32f diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild new file mode 100644 index 000000000000..9a422a3a479b --- /dev/null +++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl +pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW" +KMNAME="kdevelop" +EGIT_REPONAME="kdev-php-docs" +EGIT_BRANCH="1.7" +inherit kde4-base + +DESCRIPTION="PHP documentation plugin for KDevelop 4" +LICENSE="GPL-2 LGPL-2" +IUSE="debug" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + KEYWORDS="~amd64 ~x86" +fi + +RDEPEND=" + !=dev-util/kdevelop-plugins-1.0.0 +" diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest index c411c62d2722..41a092e3dd7a 100644 --- a/dev-util/kdevelop-php/Manifest +++ b/dev-util/kdevelop-php/Manifest @@ -1 +1,2 @@ DIST kdevelop-php-1.7.1.tar.xz 658088 SHA256 396300d605032ac458489fb760801233e94117825ca6a3251ee02090aa694826 SHA512 7602d905cd33299e071452e98539886110bf1f3fbbee3025a6ec2218aac8fef16665b81d23a1810ee22e9eb3eedbe55c00c8951a56b86fad2955ed4846959866 WHIRLPOOL 7e235c05bb0618365752c6c721fea1fd462eba7098e77ca303885c4bb50faf3d2f695f01fed982bc34827bb04f84490eaf5dfa4a37ed29875c1a8493d797b68e +DIST kdevelop-php-1.7.2.tar.xz 658060 SHA256 75de9a5afe32ecaa35eb14e1ae04dd9c6d3e9abf87274ca4537fbdc3b296a369 SHA512 419ac3865c15ba30997e08f655d4ba61877ff15b6f3c0261a52a74e7d158e7a82a638326d2ccae1a435b846f40f76723807ff318ea3242651fb8fee263cdf5e1 WHIRLPOOL bad67fdbff98c2d47dd3034f56abafbb7ff8d1fb17aec3e7004177a50f1f131808b56d80f3c89bb234613ab71badcf2fdd4e67420a3902eda33f2f94489ca2f0 diff --git a/dev-util/kdevelop-php/kdevelop-php-1.7.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.7.2.ebuild new file mode 100644 index 000000000000..5c7b96fdf163 --- /dev/null +++ b/dev-util/kdevelop-php/kdevelop-php-1.7.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nl pl pt +pt_BR ru sk sl sv tr uk zh_CN zh_TW" +VIRTUALX_REQUIRED=test +KDEBASE="kdevelop" +KMNAME="kdev-php" +EGIT_REPONAME="${KMNAME}" +EGIT_BRANCH="1.7" +inherit kde4-base + +DESCRIPTION="PHP plugin for KDevelop 4" +LICENSE="GPL-2 LGPL-2" +IUSE="debug doc" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + KEYWORDS="~amd64 ~x86" +fi + +RESTRICT="test" + +DEPEND=" + >=dev-util/kdevelop-pg-qt-1.0.0:4 +" +RDEPEND=" + dev-util/kdevelop:${SLOT} + doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} ) +" + +PATCHES=( "${FILESDIR}/${PN}"-1.2.0-parmake.patch ) diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest index ebed219c7197..d9fe8ec91c7d 100644 --- a/dev-util/kdevelop-python/Manifest +++ b/dev-util/kdevelop-python/Manifest @@ -1 +1,2 @@ DIST kdev-python-1.7.1.tar.xz 3666536 SHA256 6d95834ffbdc9c74f0c5cca589344b02189902e01901169615484c5b163dbc06 SHA512 f40fad121d5a8106c25fa5b8827f34074f8add115db9a26282b7bb087df2b57665b4bc6d772cd72784e5989eb6319d2807ac7278012b0be4e29ccb6864e79349 WHIRLPOOL 81feab1b3262aa406f4c59989be59d5a73bd8fbd0fed62e207434c0d65656ef10b7ccdcd54c2d1e4b7bab6e7213ef7e0b2638021823507cdc0750e091a88f09f +DIST kdev-python-1.7.2.tar.xz 3668764 SHA256 949254984bd489cd5597d4c4986057c43b60febde329f6f9d1b42228aef9444d SHA512 d49a65786516d6709808126c3ec1ea90ccce8f3a7fbdfd39082e6327d3186089fe9d64380587023f0d4d9eea2304f76d8ff510b52cb29169918596652508bae4 WHIRLPOOL 7a01d9afa3151b3139fde5a0609d4eec2be330afe0e7bd241c22658007108ec78be9fbcaf37b8d55bde34b1b354d5043e2b6e79ed52b194ab40744c196ed5124 diff --git a/dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild new file mode 100644 index 000000000000..924bb1ede2dc --- /dev/null +++ b/dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDEBASE="kdevelop" +KMNAME="kdev-python" +KDE_LINGUAS="bs ca de en_GB es et fi fr it nl pl pt pt_BR sk sl sv tr uk" +PYTHON_COMPAT=( python2_7 ) +EGIT_BRANCH="1.7" +MY_P="${KMNAME}-${PV}" +inherit kde4-base python-any-r1 + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${MY_P}.tar.xz" + KEYWORDS="~amd64 ~x86" + S=${WORKDIR}/${MY_P} +fi + +DESCRIPTION="Python plugin for KDevelop 4" +IUSE="debug" + +DEPEND=" + ${PYTHON_DEPS} +" +RDEPEND=" + dev-util/kdevelop:4 +" + +RESTRICT="test" + +pkg_setup() { + python-any-r1_pkg_setup + kde4-base_pkg_setup +} + +src_compile() { + pushd "${WORKDIR}"/${P}_build > /dev/null || die + emake parser + popd > /dev/null || die + + kde4-base_src_compile +} diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest index 2f6dc573079c..33bd8d86347e 100644 --- a/dev-util/kdevelop/Manifest +++ b/dev-util/kdevelop/Manifest @@ -1 +1,2 @@ DIST kdevelop-4.7.1.tar.xz 4441540 SHA256 e3ad5377f53739a67216d37cda3f88c03f8fbb0c96e2a9ef4056df3c124e95c1 SHA512 a5fcdb4b83f6b9512350d73314df3ed8fd4f8a6544f358c480295f1f1f81799f18e30b44c24b73b4db244e63f01c29990854532688bf0a866c7fe83f924a48bd WHIRLPOOL 630802a540db94a6f56b0c15ff8910ea6168401f88aaf3e14476461d169f4e456f83444fbf8f9c927c7c196b0797c40d58972d1b05a912eeb18d8d5b1239e4f9 +DIST kdevelop-4.7.2.tar.xz 4441896 SHA256 5801a38a9abfebead18b74c0a0f5a6d68118b297c96ef1e2f75c8bfae3463b19 SHA512 f05643f185a02ce9f07b5e48b0cf61de5e0e2ed892b4fbe4edf749319c37466a2e904c7b64604cdff3b1c5c20e384ea23e7fdd1e30ed15642fd70f5e172e570a WHIRLPOOL 2caf928f84e22aacfa2691fc7a2752f84a38cdfccc4b3c176c04c0f81445a25548f7723ee57da293a921f7934789386bce7e4c50751cd4d61da2d15c39490695 diff --git a/dev-util/kdevelop/kdevelop-4.7.2.ebuild b/dev-util/kdevelop/kdevelop-4.7.2.ebuild new file mode 100644 index 000000000000..addf588c8ccd --- /dev/null +++ b/dev-util/kdevelop/kdevelop-4.7.2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl +pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW" +VIRTUALX_REQUIRED="test" +EGIT_BRANCH="4.7" +inherit kde4-base + +DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages" +LICENSE="GPL-2 LGPL-2" +IUSE="+cmake +cxx debug +gdbui okteta qthelp" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + KEYWORDS="~amd64 ~ppc ~x86" +fi + +DEPEND=" + dev-libs/qjson + dev-qt/qtdeclarative:4[webkit] + gdbui? ( + $(add_kdebase_dep ksysguard) + $(add_kdebase_dep libkworkspace) + ) + okteta? ( $(add_kdeapps_dep okteta) ) + qthelp? ( dev-qt/qthelp:4 ) +" +RDEPEND="${DEPEND} + $(add_kdeapps_dep kapptemplate) + $(add_kdeapps_dep kdebase-kioslaves) + cxx? ( >=sys-devel/gdb-7.0[python] ) +" +RESTRICT="test" +# see bug 366471 + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_build cmake) + $(cmake-utils_use_build cmake cmakebuilder) + $(cmake-utils_use_build cxx cpp) + $(cmake-utils_use_with gdbui KDE4Workspace) + $(cmake-utils_use_with okteta LibKasten) + $(cmake-utils_use_with okteta LibOkteta) + $(cmake-utils_use_with okteta LibOktetaKasten) + $(cmake-utils_use_build qthelp) + ) + + kde4-base_src_configure +} diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest index 4e541010e616..fdbb34000556 100644 --- a/dev-util/kdevplatform/Manifest +++ b/dev-util/kdevplatform/Manifest @@ -1 +1,2 @@ DIST kdevplatform-1.7.1.tar.xz 1930560 SHA256 dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac SHA512 b19c925c973ab00b25b03f1bcf1e34a98b8108728f20e7b058bd391a1dde78e33b80705c39632ff594ecf834878e1c54732031b8110400433266c258632468d0 WHIRLPOOL 9e687644b1f31ca317bb3fa0000f388aca80ee305eaa3b43d044181d2b2374ad57613104a400a8a052ed07e5157fbbdc26b7174314cc04ca5b8c788afe4c8f4f +DIST kdevplatform-1.7.2.tar.xz 1929976 SHA256 0afcde7a746adb83b00f2bd6b02efb4022adbd61b6ba4325fb63b71902f1f4e4 SHA512 b95a1837b61d6c63cdd5183194ea70301bb32720df8c5317ba891a91c24c1e174aa69d10131024701bfe710f4848ac50059bc4513cf334d39415d37f4a445d66 WHIRLPOOL 4656a52becd50e9d827010e798941465731872b014400529fde4c45410d7f77d063c7fed237f94991742af997e845145772dbb199df74ae9777d41c2bdc21693 diff --git a/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild b/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild new file mode 100644 index 000000000000..71cd96cd8c19 --- /dev/null +++ b/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DECLARATIVE_REQUIRED="always" +KMNAME="kdevelop" +KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nl pl pt +pt_BR ru sk sl sv th tr uk zh_CN zh_TW" +VIRTUALDBUS_TEST="true" +VIRTUALX_REQUIRED="test" +EGIT_REPONAME="${PN}" +EGIT_BRANCH="1.7" +inherit kde4-base + +DESCRIPTION="KDE development support libraries and apps" +LICENSE="GPL-2 LGPL-2" +IUSE="+classbrowser cvs debug +konsole reviewboard subversion" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + KEYWORDS="~amd64 ~ppc ~x86" +fi + +RESTRICT="test" + +COMMON_DEPEND=" + dev-libs/grantlee:0 + reviewboard? ( dev-libs/qjson ) + subversion? ( + dev-libs/apr + dev-libs/apr-util + dev-vcs/subversion + ) +" +DEPEND="${COMMON_DEPEND} + classbrowser? ( dev-libs/boost ) +" +RDEPEND="${COMMON_DEPEND} + konsole? ( $(add_kdeapps_dep konsole) ) + cvs? ( dev-vcs/cvs ) + !<dev-util/kdevelop-${KDEVELOP_VERSION}:4 +" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_build classbrowser) + $(cmake-utils_use_build cvs) + $(cmake-utils_use_build konsole) + $(cmake-utils_use_find_package reviewboard QJSON) + $(cmake-utils_use_build subversion) + ) + + kde4-base_src_configure +} diff --git a/dev-util/pkgconf/pkgconf-0.9.11.ebuild b/dev-util/pkgconf/pkgconf-0.9.11.ebuild index 105e23d5e00f..1294e1be8040 100644 --- a/dev-util/pkgconf/pkgconf-0.9.11.ebuild +++ b/dev-util/pkgconf/pkgconf-0.9.11.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then else inherit eutils multilib-minimal SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" + KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" fi DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" @@ -20,6 +20,8 @@ LICENSE="BSD-1" SLOT="0" IUSE="+pkg-config strict" +RESTRICT="test" # at least until 0.9.13 + DEPEND="" RDEPEND="${DEPEND} pkg-config? ( diff --git a/dev-util/qstlink2/metadata.xml b/dev-util/qstlink2/metadata.xml index 72c026130307..2920253981cc 100644 --- a/dev-util/qstlink2/metadata.xml +++ b/dev-util/qstlink2/metadata.xml @@ -6,9 +6,6 @@ <email>no111u3@gmail.com</email> <name>Boris Vinogradov</name> </maintainer> - <maintainer> - <email>@gentoo.org</email> - </maintainer> <longdescription> This is a ST-Link V2 (Debugger/Programmer) client developped for Linux, OSX and Windows. diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest index a13bef1e7845..61fe110f2cac 100644 --- a/dev-util/rbtools/Manifest +++ b/dev-util/rbtools/Manifest @@ -1 +1,2 @@ DIST RBTools-0.7.4.tar.gz 158594 SHA256 1626d449eae9d03a8e3e5c0125f77a86eefdc615b86ba7ee1368b238521de198 SHA512 c12d254f1eeb7a8d06a1ab7cbb952f45975da355b436a7514cf9fa0c3fe60b713daa79874c8cf7df05b13acb22441cf6ae06e442b238b5481a01cdaf15f6c5c9 WHIRLPOOL b6116eb6445994dadb3c6003e8fdecf60d9fa17257988c9822b69c5cf19ae369e31c9a07315c14e27cdce35697f0eef16207306f0e6a5ec8fa47a9d0aa66680b +DIST RBTools-0.7.5.tar.gz 160657 SHA256 4f252a3d5ad4a2d25883b9adf0c6ee17ef56146bd9c0586e0aa2a2790748c069 SHA512 f5c795929d8fb09b3f39c18e747096d56205c6fbf73e4a04a5898b5adc058d092e41f835ba6cea8b4b94bc5747cbbdf988131ad66e637cc77e0d59a4509786ef WHIRLPOOL ee414239c9289b1ac17b6fa6e63fcb42c058bde9cd3bb69a8d13e5c038c77a942de48d63091c5e8b499dc47e62f5b469d22ebbba66050138b35c355c02d98d89 diff --git a/dev-util/rbtools/rbtools-0.7.5.ebuild b/dev-util/rbtools/rbtools-0.7.5.ebuild new file mode 100644 index 000000000000..e67f185e4282 --- /dev/null +++ b/dev-util/rbtools/rbtools-0.7.5.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 versionator + +MY_PN="RBTools" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Command line tools for use with Review Board" +HOMEPAGE="http://www.reviewboard.org/" +SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-python/six-1.8.0[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] +" + +DOCS=( AUTHORS NEWS README.md ) + +S=${WORKDIR}/${MY_P} diff --git a/dev-util/schroot/schroot-1.6.10-r3.ebuild b/dev-util/schroot/schroot-1.6.10-r3.ebuild index c926dbd21a70..ef3005c38db9 100644 --- a/dev-util/schroot/schroot-1.6.10-r3.ebuild +++ b/dev-util/schroot/schroot-1.6.10-r3.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm ~x86" IUSE="btrfs +dchroot debug doc lvm nls pam test" COMMON_DEPEND=" diff --git a/dev-util/sysdig/sysdig-0.1.104.ebuild b/dev-util/sysdig/sysdig-0.1.104.ebuild index 0c4d00a5cf57..b6f02fe81a9c 100644 --- a/dev-util/sysdig/sysdig-0.1.104.ebuild +++ b/dev-util/sysdig/sysdig-0.1.104.ebuild @@ -64,6 +64,7 @@ src_configure() { # setup linux-mod ugliness MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver:)" + BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"' BUILD_TARGETS="driver" } diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest index 1a3621987e07..61fb1feeb24d 100644 --- a/dev-vcs/hub/Manifest +++ b/dev-vcs/hub/Manifest @@ -1,2 +1,3 @@ DIST hub-1.12.4.tar.gz 76798 SHA256 b7fe404d7dc5f60554f088bec12de5e80229331430ea0ced46d5bf89ecae5117 SHA512 3c80592954f6f9bd9406adf8faaaf3e307a5387b623b07f06f574e6841899a7e253b67429417ba37c78b53064ddd0188b9f37e3e24130d899207c23bad389618 WHIRLPOOL 46c0870101add366c83d12ea92cfd1d434e841df58101ef8b1250e040cb0fe92590245b3e092780213b837cc2f9d9ad9bd9bff37a110bc608d63cddd7bbf4898 DIST hub-2.2.0.tar.gz 301460 SHA256 2da1351197eb5696c207f22c69a5422af052d74277b73d0b8661efb9ec1d0eb1 SHA512 ad65cfd2a81ab92ab69d31ff7a068cf2da1557ca1d2f6e1b97b7f939249e9955bb2cace42b8900ec2d5b98970fbca27435edcd503af7ee3c05a79462e7734d8a WHIRLPOOL 83ea1d3b1086d7cdcebed6cb604027763cd41dd3f101dd56827c469ec61034a9e3a7b4cbd1111b5b7820707a13679a558704d80d58fed125f07573fb983dff9a +DIST hub-2.2.2.tar.gz 311726 SHA256 610572ee903aea1fa8622c16ab7ddef2bd1bfec9f4854447ab8e0fbdbe6a0cae SHA512 27eb8d3b973b30ab16fa59649af55934a2543d74d5160337be881b9d6038efaac4d19e3b2d3295191e65daedafa93d36773f05b3e3a48eae312b711db34762c0 WHIRLPOOL e4274515eac18938c42b4bf71a5ed7ec0e1c66a4ea65db68559172c039bd2b7b252d0c0ffc7209545f966d4d8b0d7b89c6e075f589ac677e16340ba5c641f778 diff --git a/dev-vcs/hub/hub-2.2.2.ebuild b/dev-vcs/hub/hub-2.2.2.ebuild new file mode 100644 index 000000000000..253f5b6ed670 --- /dev/null +++ b/dev-vcs/hub/hub-2.2.2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit bash-completion-r1 readme.gentoo + +DESCRIPTION="Command-line wrapper for git that makes you better at GitHub" +HOMEPAGE="https://github.com/github/hub" +SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +DEPEND=">=dev-lang/go-1.5.1:=" +RDEPEND=">=dev-vcs/git-1.7.3" + +DOC_CONTENTS="You may want to add 'alias git=hub' to your .{csh,bash}rc" + +src_compile() { + ./script/build || die +} + +#src_test() { +# ./script/test || die +#} + +src_install() { + readme.gentoo_create_doc + + dobin hub + + doman man/${PN}.1 + dodoc README.md + + # Broken with autoloader + # https://github.com/github/hub/issues/592 + #newbashcomp etc/${PN}.bash_completion.sh ${PN} + + insinto /usr/share/zsh/site-functions + newins etc/hub.zsh_completion _${PN} +} diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index ac298865c57e..f567097bbe80 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -1,5 +1,5 @@ DIST mercurial-3.3.2.tar.gz 4165131 SHA256 67c617c740ac706f923371a26f02339b27cd6c36e5d3fb2ccad0dc02361527fa SHA512 f151ea3187b70d70a82f643aaacd2742d0ce5f996590eab008332a7f28df5a19e99634ff33b0509ad38d2b6b411627413a457255df8a8e45025246beebb6fcc1 WHIRLPOOL 740b1ebb68f7c8baf3e6a9b023be2423677e3189221dc302c0601b514193e27eaaf73985c9536c6aa03fa0c5b9be8c092cd7b3eaca5f77ee24bfa276bbb6109c DIST mercurial-3.3.3.tar.gz 4167447 SHA256 a445367f0dcbaf3a6279bfa743b364e729be0d1f0c852cb6d37f297916ffae13 SHA512 bea215b0bd9e8603ade019f01ae0600dd1d1ad77675b38b5e13d86c43dd2c58b6c86c252517f0fcab6444c171e9f53537e4e170739c991ac08a1111169fe545d WHIRLPOOL e5fd41c6d27d7fce8559a2d15b33e24cf702d9497326e2c1062fe2acd22e7ad16cd6981d3dadb5a7458f12dcd35cc98583f53bc3188d99a9638daddb7d95657b DIST mercurial-3.4.2.tar.gz 4296407 SHA256 dcc90e4a8476149ecc8af13c08202860b4c9c987a94c4f3c18b28294b6fd8ecd SHA512 f5ef7064a1ac4189fe4db91fec283cdead257b132674d0869f075b80ba5707e0163e28f18545a9d867336ebc6b1cbb8bcf794b6881b8f23f6c067e68c7ae584b WHIRLPOOL db7389c92680f6058efda6fa4cb7747ff3cd78bc361c43464a938c213b9ce46e8a040a57c68975f02342beb35522c27c3ab6250b2fc6e54777ddd20b0bda5443 -DIST mercurial-3.5.1.tar.gz 4414284 SHA256 997da45da303e399678c5bccd7be39b0fabf29c7e02fd3c8751c2ff88c8a259d SHA512 2435b3c50753e787577a847c96d3e4515015e02bc7ecdd21848530834d210831bb0690d31d4940626bbbe84cfccb1d245f8c4e1156317cda9469e7b870c042d5 WHIRLPOOL 97a0e6762657c2f560041f30e513fe8d5377bf654e39bf8a218d132952f60b59db63a6c078cdac6b529a8cb49ee766054daad9192951987b3a288e3b43e70ba7 DIST mercurial-3.5.2.tar.gz 4415307 SHA256 23fdc038503911b21dc9e556118803f7b1d4150eb14933d2ea3d0ff0dc60ab5d SHA512 d0a4007763186ab72e7ef6e6f6fa84719fcdc2d16208bc99cc32f44cecdc0ccdf5719e18fbc8a5d0735f6441acc0d82bcac05d7c75fee15966c88ee75e7b6bdd WHIRLPOOL 10ec5dd3d1d2e3487f4a290bc0d32fe2237cc450b54774503e7e9e25b12e895c8065f1c2e27dcaa03deac82d1e10e58dd8ea18e9bacf4f24f58a52a3d5c0fea4 +DIST mercurial-3.6.tar.gz 4516703 SHA256 85b5574f3694373e981926374a758dab2128d6f3c593a72a7c9d2cb371054f39 SHA512 5e3fa99f6cb5a4f5867233946714222c53f05d95b791fd0855afc9d5f3dfade8aeae08b3581ea700ae64516f304a120843b4187d1e309c5cf0c15af798889664 WHIRLPOOL 732a938ff2d5064619d55da84f1c718ac149a9236e9631054c9852b359c80e5420f0b020641a2d0d35c32ca4b5771693c0537313b240f80f275aa6b24fc70ccd diff --git a/dev-vcs/mercurial/mercurial-3.5.1.ebuild b/dev-vcs/mercurial/mercurial-3.6.ebuild index 1f57c1ef8c43..1f57c1ef8c43 100644 --- a/dev-vcs/mercurial/mercurial-3.5.1.ebuild +++ b/dev-vcs/mercurial/mercurial-3.6.ebuild diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest index 1c7e0faaf781..6e87fcab6e55 100644 --- a/dev-vcs/stgit/Manifest +++ b/dev-vcs/stgit/Manifest @@ -1,4 +1,4 @@ DIST stgit-0.16-missing-patches.tar.gz 1667 SHA256 f105bb417592be3c68d830ad1cf2e212e6e5cb809bf64cdffb516a0f7badd4f4 SHA512 29d4c3e68121654153b4e5142dd70d818737b09bbc8371d644a36dd9d18afaf78fdda91bc16f953c330bcbae19084384d8bcd216cdfe674df784e33165186db1 WHIRLPOOL c7628853e6c1eff498a95ff22ec3eb3bb69b60dfb0c6dcd5895a650b8d3aba966166dfd426a0c728e3d292f0a2ed197325b0af5ccd63fc99011b5b2e841e7194 DIST stgit-0.16.tar.gz 362687 SHA256 02f1a19350ccf4a26abac1421df8c2d021e78f995c913f9562718a1700318a42 SHA512 782de3d5855aad4f5d040478745990517ebe2b26dc315a3ed41db95399bb46e075d63a70baa0e3aa2ab1012b59e6ad1f5940a904f296ef09d6bca60f66e417dd WHIRLPOOL e2334c041cb260455d549d33b6628fd4f6e1e7da850f2987ba86922504e07aed8177d092550348b52cad8894b0335d20ee1608b855fa1cb6545bdd301a9d38f1 -DIST stgit-0.17.1-upstream-patches-0.tar.xz 5064 SHA256 6e120dd85bcdcbbb64bea98bd5967bb1f01fbc9d3e80b4856d7e328cfcafc31e SHA512 da7b75898466c8be58c48a86aee6209a907f971c7b15b38034940598d353fa6ecb48894b220fbfd8e032e88e746b377c55485c8045c330607e122a082aa0374f WHIRLPOOL aa7b7a5f89703eb35fab26dec0bcf5ceae2e20608b2562c7b6f76e33d43b35113d97282cb6b5f4cdf5da6e11e07faacacb13215cef3f7dac31a862ff809641cb +DIST stgit-0.17.1-upstream-patches-1.tar.xz 15324 SHA256 4ec973ee6a16daee616c5f675294e9351e4953b4d171059cddb504d286939cd3 SHA512 2d756d960b5bd803258afe0bb89cb29a960bc2745adf37f2b574fd114579a867ec51628f2267744ec2eec70090376274bfd720a612093a36f4bb8e4ecb8f6d30 WHIRLPOOL 538a060e8628b9d43af56568a267c2026a9088156af188d5a745adfbb11807dcf948f216e6492d51069c85e80985f156196df6b28eb2664b3e5e27a09b169c57 DIST stgit-0.17.1.tar.gz 398466 SHA256 d43365a0c22e41a6fb9ba1a86de164d6475e79054e7f33805d6a829eb4056ade SHA512 3efdfb9bc024c3a7c0d74d49e85f157d5d5209c9a2ad0ce63a07138c02fb1580e92ac4a91796e79bbd221e6884317e975f9f44e35db0b484fd916bc67cd61abe WHIRLPOOL a7c4c83cfeace12ced60e846ed9daaffadea3ed201a90e72239e3f8df310164e00ce5a89174df177f89df4a609a66ac35e905f31419ed654081c3ab0c2cba859 diff --git a/dev-vcs/stgit/stgit-0.17.1-r1.ebuild b/dev-vcs/stgit/stgit-0.17.1-r2.ebuild index 239ca5b1f5f5..5618db6b835e 100644 --- a/dev-vcs/stgit/stgit-0.17.1-r1.ebuild +++ b/dev-vcs/stgit/stgit-0.17.1-r2.ebuild @@ -9,8 +9,8 @@ PYTHON_COMPAT=( python2_7 ) inherit bash-completion-r1 distutils-r1 DESCRIPTION="Manage a stack of patches using GIT as a backend" -HOMEPAGE="http://www.procode.org/stgit/" -UPSTREAM_VER=0 +HOMEPAGE="https://stgit.org https://gna.org/projects/stgit" +UPSTREAM_VER=1 [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" diff --git a/eclass/bash-completion.eclass b/eclass/bash-completion.eclass index 846e8c8e6345..625ea24692fb 100644 --- a/eclass/bash-completion.eclass +++ b/eclass/bash-completion.eclass @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# @DEAD + # DEPRECATED # This eclass has been superseded by bash-completion-r1 eclass. # Please modify your ebuilds to use that one instead. @@ -31,6 +33,9 @@ inherit eutils +eqawarn "bash-completion.eclass is last rited and will be removed on 2015-11-24." +eqawarn "Please update your ebuilds to use bash-completion-r1 instead." + EXPORT_FUNCTIONS pkg_postinst IUSE="bash-completion" diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 012b13f059c8..2ebde45f1787 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -121,7 +121,7 @@ case ${WANT_CMAKE} in CMAKEDEPEND+="${WANT_CMAKE}? ( " ;; esac -inherit toolchain-funcs multilib flag-o-matic eutils +inherit toolchain-funcs multilib flag-o-matic eutils versionator case ${EAPI} in 2|3|4|5) : ;; @@ -398,15 +398,15 @@ _modify-cmakelists() { enable_cmake-utils_src_prepare() { debug-print-function ${FUNCNAME} "$@" - pushd "${S}" > /dev/null + pushd "${S}" > /dev/null || die debug-print "$FUNCNAME: PATCHES=$PATCHES" [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" - + debug-print "$FUNCNAME: applying user patches" epatch_user - popd > /dev/null + popd > /dev/null || die } # @VARIABLE: mycmakeargs @@ -461,12 +461,22 @@ enable_cmake-utils_src_configure() { # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.) local build_rules=${BUILD_DIR}/gentoo_rules.cmake + # Since cmake-3.4.0_rc1 "<FLAGS>" no longer contains includes and thus + # we need to add "<INCLUDES>" + local includes= + if [[ ${PN} == cmake ]] ; then + if $(version_is_at_least 3.4.0 $(get_version_component_range 1-3 ${PV})) ; then + includes="<INCLUDES>" + fi + elif has_version \>=dev-util/cmake-3.4.0_rc1 ; then + includes="<INCLUDES>" + fi cat > "${build_rules}" <<- _EOF_ || die SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE) - SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) - SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) - SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) - SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE) + SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) + SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) + SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) + SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE) SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE) SET (PKG_CONFIG_EXECUTABLE $(type -P $(tc-getPKG_CONFIG)) CACHE FILEPATH "pkg-config executable" FORCE) _EOF_ @@ -547,6 +557,7 @@ enable_cmake-utils_src_configure() { # Make the array a local variable since <=portage-2.1.6.x does not # support global arrays (see bug #297255). if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then + eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead." local mycmakeargs_local=(${mycmakeargs}) else local mycmakeargs_local=("${mycmakeargs[@]}") @@ -578,11 +589,11 @@ enable_cmake-utils_src_configure() { cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" ) fi - pushd "${BUILD_DIR}" > /dev/null + pushd "${BUILD_DIR}" > /dev/null || die debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}" echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed" - popd > /dev/null + popd > /dev/null || die } enable_cmake-utils_src_compile() { @@ -659,25 +670,25 @@ cmake-utils_src_make() { debug-print-function ${FUNCNAME} "$@" _check_build_dir - pushd "${BUILD_DIR}" > /dev/null + pushd "${BUILD_DIR}" > /dev/null || die ${CMAKE_MAKEFILE_GENERATOR}_src_make "$@" - popd > /dev/null + popd > /dev/null || die } enable_cmake-utils_src_test() { debug-print-function ${FUNCNAME} "$@" _check_build_dir - pushd "${BUILD_DIR}" > /dev/null + pushd "${BUILD_DIR}" > /dev/null || die [[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; } [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure ) if ctest "${myctestargs[@]}" "$@" ; then einfo "Tests succeeded." - popd > /dev/null + popd > /dev/null || die return 0 else if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then @@ -692,7 +703,7 @@ enable_cmake-utils_src_test() { fi # die might not die due to nonfatal - popd > /dev/null + popd > /dev/null || die return 1 fi } @@ -701,13 +712,13 @@ enable_cmake-utils_src_install() { debug-print-function ${FUNCNAME} "$@" _check_build_dir - pushd "${BUILD_DIR}" > /dev/null + pushd "${BUILD_DIR}" > /dev/null || die DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" || die "died running ${CMAKE_MAKEFILE_GENERATOR} install" - popd > /dev/null + popd > /dev/null || die - pushd "${S}" > /dev/null + pushd "${S}" > /dev/null || die einstalldocs - popd > /dev/null + popd > /dev/null || die } # @FUNCTION: cmake-utils_src_prepare diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass index 1fc1b28b0521..abb9ccc9b092 100644 --- a/eclass/darcs.eclass +++ b/eclass/darcs.eclass @@ -126,7 +126,7 @@ darcs_fetch() { # in case EDARCS_DARCS_DIR is a symlink to a dir, get the real # dir's path, otherwise addwrite() doesn't work. - pushd . + pushd . || die cd -P "${EDARCS_TOP_DIR}" > /dev/null EDARCS_TOP_DIR="`/bin/pwd`" @@ -159,7 +159,7 @@ darcs_fetch() { export EDARCS_PATCHCOUNT=$(darcs_patchcount) einfo " patches in repo: ${EDARCS_PATCHCOUNT}" - popd + popd || die } # @FUNCTION: darcs_src_unpack diff --git a/eclass/emul-linux-x86.eclass b/eclass/emul-linux-x86.eclass index 18849c6bc632..a93c6000390d 100644 --- a/eclass/emul-linux-x86.eclass +++ b/eclass/emul-linux-x86.eclass @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# @DEAD + # # Original Author: Mike Doty <kingtaco@gentoo.org> # Adapted from emul-libs.eclass @@ -17,6 +19,10 @@ case "${EAPI:-0}" in *) die "EAPI=${EAPI} is not supported" ;; esac +eqawarn "emul-linux-x86.eclass is last rited and will be removed on 2015-11-24." +eqawarn "Please remove your copies of emul-linux-x86 ebuilds as they are" +eqawarn "no longer supported." + DESCRIPTION="Provides precompiled 32bit libraries" #HOMEPAGE="https://amd64.gentoo.org/emul/content.xml" HOMEPAGE="https://dev.gentoo.org/~pacho/emul.html" diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass index eae6ba1f4ccc..3cb60790dd4c 100644 --- a/eclass/git-2.eclass +++ b/eclass/git-2.eclass @@ -180,7 +180,7 @@ git-2_submodules() { fi debug-print "${FUNCNAME}: working in \"${1}\"" - pushd "${EGIT_DIR}" > /dev/null + pushd "${EGIT_DIR}" > /dev/null || die debug-print "${FUNCNAME}: git submodule init" git submodule init || die @@ -189,7 +189,7 @@ git-2_submodules() { debug-print "${FUNCNAME}: git submodule update" git submodule update || die - popd > /dev/null + popd > /dev/null || die fi } @@ -204,7 +204,7 @@ git-2_branch() { local branchname src debug-print "${FUNCNAME}: working in \"${EGIT_SOURCEDIR}\"" - pushd "${EGIT_SOURCEDIR}" > /dev/null + pushd "${EGIT_SOURCEDIR}" > /dev/null || die local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH} if [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]]; then @@ -215,7 +215,7 @@ git-2_branch() { git checkout -b ${branchname} ${src} \ || die "${FUNCNAME}: changing the branch failed" - popd > /dev/null + popd > /dev/null || die } # @FUNCTION: git-2_gc @@ -228,13 +228,13 @@ git-2_gc() { local args if [[ ${EGIT_REPACK} || ${EGIT_PRUNE} ]]; then - pushd "${EGIT_DIR}" > /dev/null + pushd "${EGIT_DIR}" > /dev/null || die ebegin "Garbage collecting the repository" [[ ${EGIT_PRUNE} ]] && args='--prune' debug-print "${FUNCNAME}: git gc ${args}" git gc ${args} eend $? - popd > /dev/null + popd > /dev/null || die fi } @@ -306,12 +306,12 @@ git-2_move_source() { debug-print-function ${FUNCNAME} "$@" debug-print "${FUNCNAME}: ${MOVE_COMMAND} \"${EGIT_DIR}\" \"${EGIT_SOURCEDIR}\"" - pushd "${EGIT_DIR}" > /dev/null + pushd "${EGIT_DIR}" > /dev/null || die mkdir -p "${EGIT_SOURCEDIR}" \ || die "${FUNCNAME}: failed to create ${EGIT_SOURCEDIR}" ${MOVE_COMMAND} "${EGIT_SOURCEDIR}" \ || die "${FUNCNAME}: sync to \"${EGIT_SOURCEDIR}\" failed" - popd > /dev/null + popd > /dev/null || die } # @FUNCTION: git-2_initial_clone @@ -388,22 +388,22 @@ git-2_fetch() { if [[ ! -d ${EGIT_DIR} ]]; then git-2_initial_clone - pushd "${EGIT_DIR}" > /dev/null + pushd "${EGIT_DIR}" > /dev/null || die cursha=$(git rev-parse ${UPSTREAM_BRANCH}) echo "GIT NEW clone -->" echo " repository: ${EGIT_REPO_URI_SELECTED}" echo " at the commit: ${cursha}" - popd > /dev/null + popd > /dev/null || die elif [[ ${EVCS_OFFLINE} ]]; then - pushd "${EGIT_DIR}" > /dev/null + pushd "${EGIT_DIR}" > /dev/null || die cursha=$(git rev-parse ${UPSTREAM_BRANCH}) echo "GIT offline update -->" echo " repository: $(git config remote.origin.url)" echo " at the commit: ${cursha}" - popd > /dev/null + popd > /dev/null || die else - pushd "${EGIT_DIR}" > /dev/null + pushd "${EGIT_DIR}" > /dev/null || die oldsha=$(git rev-parse ${UPSTREAM_BRANCH}) git-2_update_repo cursha=$(git rev-parse ${UPSTREAM_BRANCH}) @@ -421,7 +421,7 @@ git-2_fetch() { # print nice statistic of what was changed git --no-pager diff --stat ${oldsha}..${UPSTREAM_BRANCH} - popd > /dev/null + popd > /dev/null || die fi # export the version the repository is at export EGIT_VERSION="${cursha}" @@ -454,7 +454,7 @@ git-2_bootstrap() { # combination with --keep-going it would lead in not-updating # pakcages that are up-to-date. if [[ ${EGIT_BOOTSTRAP} ]]; then - pushd "${EGIT_SOURCEDIR}" > /dev/null + pushd "${EGIT_SOURCEDIR}" > /dev/null || die einfo "Starting bootstrap" if [[ -f ${EGIT_BOOTSTRAP} ]]; then @@ -478,7 +478,7 @@ git-2_bootstrap() { fi einfo "Bootstrap finished" - popd > /dev/null + popd > /dev/null || die fi } diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 132c3a1073b8..334b243c447d 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -523,13 +523,13 @@ haskell-cabal_pkg_setup() { haskell-cabal_src_configure() { cabal-is-dummy-lib && return - pushd "${S}" > /dev/null + pushd "${S}" > /dev/null || die cabal-bootstrap cabal-configure "$@" - popd > /dev/null + popd > /dev/null || die } # exported function: nice alias @@ -592,15 +592,15 @@ cabal_src_compile() { } haskell-cabal_src_compile() { - pushd "${S}" > /dev/null + pushd "${S}" > /dev/null || die cabal_src_compile "$@" - popd > /dev/null + popd > /dev/null || die } haskell-cabal_src_test() { - pushd "${S}" > /dev/null + pushd "${S}" > /dev/null || die if cabal-is-dummy-lib; then einfo ">>> No tests for dummy library: ${CATEGORY}/${PF}" @@ -611,7 +611,7 @@ haskell-cabal_src_test() { ./setup "$@" || die "cabal test failed" fi - popd > /dev/null + popd > /dev/null || die } # exported function: cabal-style copy and register @@ -635,11 +635,11 @@ cabal_src_install() { } haskell-cabal_src_install() { - pushd "${S}" > /dev/null + pushd "${S}" > /dev/null || die cabal_src_install - popd > /dev/null + popd > /dev/null || die } haskell-cabal_pkg_postinst() { diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass index 13667173de36..00e52a083e22 100644 --- a/eclass/intel-sdp.eclass +++ b/eclass/intel-sdp.eclass @@ -172,7 +172,7 @@ QA_PREBUILT="${INTEL_SDP_DIR}/*" # Creating necessary links to use intel compiler with eclipse _isdp_link_eclipse_plugins() { local c f - pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null + pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null || die for c in cdt*; do local cv=${c#cdt} ev=3.$(( ${cv:0:1} - 1)) if has_version "dev-util/eclipse-sdk:${ev}"; then @@ -189,7 +189,7 @@ _isdp_link_eclipse_plugins() { done fi done - popd > /dev/null + popd > /dev/null || die } # @FUNCTION: _isdp_big-warning diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 64dca0af538f..1f5734fda617 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -154,7 +154,7 @@ java-ant_bsfix() { echo "QA Notice: Package is using java-ant, but doesn't depend on a Java VM" fi - pushd "${S}" >/dev/null + pushd "${S}" >/dev/null || die local find_args="" [[ "${JAVA_PKG_BSFIX_ALL}" == "yes" ]] || find_args="-maxdepth 1" @@ -172,7 +172,7 @@ java-ant_bsfix() { [[ "${bsfix_these// /}" ]] && eval java-ant_bsfix_files ${bsfix_these} - popd > /dev/null + popd > /dev/null || die } _bsfix_die() { diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 48d07573d5fc..8c9ca0436191 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -40,7 +40,7 @@ S="${WORKDIR}" # JAVA_GENTOO_CLASSPATH="foo,bar-2" # @CODE -# @ECLASS-VARIABLE: JAVA_CLASSPATH_EXTRA +# @ECLASS-VARIABLE: JAVA_GENTOO_CLASSPATH_EXTRA # @DEFAULT_UNSET # @DESCRIPTION: # Extra list of colon separated path elements to be put on the @@ -93,7 +93,7 @@ java-pkg-simple_src_compile() { mkdir -p ${classes} || die "Could not create target directory" # compile - local classpath="${JAVA_CLASSPATH_EXTRA}" dependency + local classpath="${JAVA_GENTOO_CLASSPATH_EXTRA}" dependency for dependency in ${JAVA_GENTOO_CLASSPATH}; do classpath="${classpath}:$(java-pkg_getjars ${dependency})" \ || die "getjars failed for ${dependency}" diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index deab51da4a8c..f7a6a86a7529 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -720,7 +720,7 @@ java-pkg_dosrc() { if [[ ${result} != 12 && ${result} != 0 ]]; then die "failed to zip ${dir_name}" fi - popd >/dev/null + popd >/dev/null || die done # Install the zip @@ -1033,11 +1033,11 @@ java-pkg_jar-from() { java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}" fi fi - popd > /dev/null + popd > /dev/null || die return 0 fi done - popd > /dev/null + popd > /dev/null || die # if no target was specified, we're ok if [[ -z "${target_jar}" ]] ; then return 0 @@ -2487,9 +2487,9 @@ java-pkg_append_() { # @CODE # @RETURN: path to $1's parent directory java-pkg_expand_dir_() { - pushd "$(dirname "${1}")" >/dev/null 2>&1 + pushd "$(dirname "${1}")" >/dev/null 2>&1 || die pwd - popd >/dev/null 2>&1 + popd >/dev/null 2>&1 || die } # @FUNCTION: java-pkg_func-exists diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 3f909b394dcc..e22d04845805 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -437,15 +437,9 @@ _calculate_src_uri() { 4.?.[6-9]? | 4.??.[6-9]?) # Unstable KDE SC releases SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;; - 4.11.14) - # Part of 4.14 actually, sigh. Not stable for next release! - SRC_URI="mirror://kde/stable/4.14.3/src/${_kmname_pv}.tar.xz" ;; 4.11.19) # Part of 15.04.1 actually, sigh. Not stable for next release! SRC_URI="mirror://kde/stable/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;; - 4.11.21) - # Part of 15.04.3 actually, sigh. Not stable for next release! - SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;; 4.11.22) # Part of 15.08.0 actually, sigh. Not stable for next release! SRC_URI="mirror://kde/stable/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;; @@ -458,12 +452,6 @@ _calculate_src_uri() { 4.14.10) # Part of 15.04.3 actually, sigh. Not stable for next release! SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;; - 4.14.11) - # Part of 15.08.0 actually, sigh. Not stable for next release! - SRC_URI="mirror://kde/stable/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;; - 4.14.12) - # Part of 15.08.1 actually, sigh. Not stable for next release! - SRC_URI="mirror://kde/stable/applications/15.08.1/src/${_kmname_pv}.tar.xz" ;; 4.14.13) # Part of 15.08.2 actually, sigh. Not stable for next release! SRC_URI="mirror://kde/stable/applications/15.08.2/src/${_kmname_pv}.tar.xz" ;; diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 133fd264b841..d2fd060c80a3 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -351,7 +351,7 @@ _enable_selected_linguas_dir() { [[ -d ${dir} ]] || die "linguas dir \"${dir}\" does not exist" comment_all_add_subdirectory "${dir}" - pushd "${dir}" > /dev/null + pushd "${dir}" > /dev/null || die # fix all various crazy sr@Latn variations # this part is only ease for ebuilds, so there wont be any die when this @@ -390,7 +390,7 @@ _enable_selected_linguas_dir() { done [[ -n ${linguas} ]] && echo ">>> Enabling languages: ${linguas}" - popd > /dev/null + popd > /dev/null || die } # @FUNCTION: get_kde_version diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index d3aae4e5ae36..2e243b01f9b0 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -209,7 +209,7 @@ kde4-meta_src_extract() { done extractlist+=" $(_list_needed_subdirectories)" - pushd "${WORKDIR}" > /dev/null + pushd "${WORKDIR}" > /dev/null || die # @ECLASS-VARIABLE: KDE4_STRICTER # @DESCRIPTION: @@ -223,7 +223,7 @@ kde4-meta_src_extract() { mv ${topdir} ${P} || die "Died while moving \"${topdir}\" to \"${P}\"" fi - popd > /dev/null + popd > /dev/null || die eend $? @@ -398,7 +398,7 @@ _change_cmakelists_parent_dirs() { kde4-meta_change_cmakelists() { debug-print-function ${FUNCNAME} "$@" - pushd "${S}" > /dev/null + pushd "${S}" > /dev/null || die comment_all_add_subdirectory ./ @@ -547,7 +547,7 @@ kde4-meta_change_cmakelists() { ;; esac - popd > /dev/null + popd > /dev/null || die } # @FUNCTION: kde4-meta_src_configure diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 7c648a16b5d8..e76a969ff486 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -64,6 +64,11 @@ else : ${KDE_DOXYGEN:=false} fi +# @ECLASS-VARIABLE: KDE_DOX_DIR +# @DESCRIPTION: +# Defaults to ".". Otherwise, use alternative KDE doxygen path. +: ${KDE_DOX_DIR:=.} + # @ECLASS-VARIABLE: KDE_EXAMPLES # @DESCRIPTION: # If set to "false", unconditionally ignore a top-level examples subdirectory. @@ -319,6 +324,10 @@ _calculate_live_repo() { _kmname=${PN} fi + if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then + EGIT_BRANCH="Applications/$(get_version_component_range 1-2)" + fi + if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then EGIT_BRANCH="Plasma/$(get_version_component_range 1-2)" fi @@ -395,7 +404,7 @@ kde5_src_prepare() { # when required if [[ ${KDE_BUILD_TYPE} = release ]] ; then if [[ -d po ]] ; then - pushd po > /dev/null + pushd po > /dev/null || die for lang in *; do if ! has ${lang} ${LINGUAS} ; then if [[ ${lang} != CMakeLists.txt ]] ; then @@ -406,17 +415,17 @@ kde5_src_prepare() { fi fi done - popd > /dev/null + popd > /dev/null || die fi if [[ ${KDE_HANDBOOK} = true && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then - pushd ${KDE_DOC_DIR} > /dev/null + pushd ${KDE_DOC_DIR} > /dev/null || die for lang in *; do if ! has ${lang} ${LINGUAS} ; then comment_add_subdirectory ${lang} fi done - popd > /dev/null + popd > /dev/null || die fi else rm -rf po @@ -488,7 +497,7 @@ kde5_src_compile() { # Build doxygen documentation if applicable if use_if_iuse doc ; then - kgenapidox . || die + kgenapidox ${KDE_DOX_DIR} || die fi } diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index b4b3e69512bf..066b489d297d 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -643,7 +643,7 @@ multilib_src_configure() { -DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock -DWITH_DEFAULT_COMPILER_OPTIONS=0 -DWITH_DEFAULT_FEATURE_SET=0 - -DINSTALL_SYSTEMD_UNITDIR=$(systemd_get_unitdir) + -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_unitdir)" ) if in_iuse systemd ; then diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 8d38939e45ad..260420b5b402 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -47,7 +47,7 @@ MYSQL_EXTRAS="" # Use "none" to disable it's use [[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3" -inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user +inherit eutils flag-o-matic ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user # # Supported EAPI versions and export functions diff --git a/eclass/oasis.eclass b/eclass/oasis.eclass index 7dc86f3633cf..7a341ceb4c42 100644 --- a/eclass/oasis.eclass +++ b/eclass/oasis.eclass @@ -42,6 +42,13 @@ # The eclass takes care of setting debug in IUSE. # Set before inheriting the eclass. +# @ECLASS-VARIABLE: OASIS_DOC_DIR +# @DESCRIPTION: +# Specify where to install documentation. Default is for ocamldoc HTML. +# Change it before inherit if this is not what you want. +# EPREFIX is automatically prepended. +: ${OASIS_DOC_DIR:="/usr/share/doc/${PF}/html"} + inherit multilib findlib eutils base case ${EAPI:-0} in @@ -80,7 +87,7 @@ oasis_src_configure() { ${OASIS_SETUP_COMMAND:-ocaml setup.ml} -configure \ --prefix "${EPREFIX}/usr" \ --libdir "${EPREFIX}/usr/$(get_libdir)" \ - --docdir "${EPREFIX}/usr/share/doc/${PF}/html" \ + --docdir "${EPREFIX}${OASIS_DOC_DIR}" \ --destdir "${D}" \ $(oasis_use_enable ocamlopt is_native) \ ${confargs} \ diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 28e13c336db0..54c305cac84d 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# @DEAD + # @ECLASS: qt4-build.eclass # @MAINTAINER: # Qt herd <qt@gentoo.org> diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass index ed392b59fe81..7f2b0756896d 100644 --- a/eclass/ruby-fakegem.eclass +++ b/eclass/ruby-fakegem.eclass @@ -406,13 +406,13 @@ all_ruby_unpack() { eend $? mkdir "${S}" - pushd "${S}" &>/dev/null + pushd "${S}" &>/dev/null || die ebegin "Unpacking data.tar.gz" tar -mxf "${my_WORKDIR}"/data.tar.gz || die eend $? - popd &>/dev/null + popd &>/dev/null || die ;; *.patch.bz2) # We apply the patches with RUBY_PATCHES directly from DISTDIR, @@ -498,9 +498,9 @@ all_fakegem_install() { for dir in ${RUBY_FAKEGEM_DOCDIR}; do [[ -d ${dir} ]] || continue - pushd ${dir} &>/dev/null + pushd ${dir} &>/dev/null || die dohtml -r * || die "failed to install documentation" - popd &>/dev/null + popd &>/dev/null || die done fi @@ -514,12 +514,12 @@ all_fakegem_install() { local bindir=$(find "${D}" -type d -path "*/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/bin" -print -quit) if [[ -d "${bindir}" ]]; then - pushd "${bindir}" &>/dev/null + pushd "${bindir}" &>/dev/null || die local binaries=$(eval ls ${RUBY_FAKEGEM_BINWRAP}) for binary in $binaries; do ruby_fakegem_binwrapper $binary done - popd &>/dev/null + popd &>/dev/null || die fi fi } diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass index d560ba8ed90f..ad25456cae50 100644 --- a/eclass/ruby-ng.eclass +++ b/eclass/ruby-ng.eclass @@ -324,9 +324,9 @@ _ruby_invoke_environment() { eqawarn "Using * expansion of S is deprecated. Use EAPI and RUBY_S instead." ;; esac - pushd "${WORKDIR}"/all &>/dev/null + pushd "${WORKDIR}"/all &>/dev/null || die sub_S=$(eval ls -d "${sub_S}" 2>/dev/null) - popd &>/dev/null + popd &>/dev/null || die fi environment=$1; shift @@ -335,16 +335,16 @@ _ruby_invoke_environment() { S="${my_WORKDIR}"/"${sub_S}" if [[ -d "${S}" ]]; then - pushd "$S" &>/dev/null + pushd "$S" &>/dev/null || die elif [[ -d "${my_WORKDIR}" ]]; then - pushd "${my_WORKDIR}" &>/dev/null + pushd "${my_WORKDIR}" &>/dev/null || die else - pushd "${WORKDIR}" &>/dev/null + pushd "${WORKDIR}" &>/dev/null || die fi ebegin "Running ${_PHASE:-${EBUILD_PHASE}} phase for $environment" "$@" - popd &>/dev/null + popd &>/dev/null || die S=${old_S} } @@ -392,7 +392,7 @@ ruby-ng_pkg_setup() { # Unpack the source archive. ruby-ng_src_unpack() { mkdir "${WORKDIR}"/all - pushd "${WORKDIR}"/all &>/dev/null + pushd "${WORKDIR}"/all &>/dev/null || die # We don't support an each-unpack, it's either all or nothing! if type all_ruby_unpack &>/dev/null; then @@ -401,7 +401,7 @@ ruby-ng_src_unpack() { [[ -n ${A} ]] && unpack ${A} fi - popd &>/dev/null + popd &>/dev/null || die } _ruby_apply_patches() { diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index 91b83aea0eed..437265a9eaa8 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -516,9 +516,9 @@ xorg-2_src_install() { fi if [[ -n ${GIT_ECLASS} ]]; then - pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null + pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null || die git log ${EGIT_COMMIT} > "${S}"/ChangeLog - popd > /dev/null + popd > /dev/null || die fi if [[ -e "${S}"/ChangeLog ]]; then diff --git a/games-emulation/m64py/m64py-0.2.3-r1.ebuild b/games-emulation/m64py/m64py-0.2.3-r2.ebuild index 6ba5a09fe0c4..8871ef11bc3b 100644 --- a/games-emulation/m64py/m64py-0.2.3-r1.ebuild +++ b/games-emulation/m64py/m64py-0.2.3-r2.ebuild @@ -19,7 +19,7 @@ IUSE="" # SDL & libmupen64plus are through ctypes, so they rely on specific ABI RDEPEND="media-libs/libsdl2:0/0[joystick] - dev-python/PyQt5[opengl,${PYTHON_USEDEP}] + dev-python/PyQt5[gui,opengl,widgets,${PYTHON_USEDEP}] >=games-emulation/mupen64plus-core-2.5:0/2-sdl2" python_prepare_all() { diff --git a/games-engines/gemrb/Manifest b/games-engines/gemrb/Manifest index b414d753b1ac..f6df919be2b2 100644 --- a/games-engines/gemrb/Manifest +++ b/games-engines/gemrb/Manifest @@ -1 +1,2 @@ DIST gemrb-0.8.2.tar.gz 12302710 SHA256 57cc267f730d205774fa5a6db1f0dd88b97a8193dbece905d70cb50e433774ee SHA512 2a666537ca540f041122bcd1117cf591c5a223480a5c4c18eebaef6b446fc355c6078d54fcbc3a89b8ba35d7ecbaf53648394e383f0479e84da999fccea1f496 WHIRLPOOL 4ad8a39b937467e7e7a28dbae1d3d449789259124bb0be6dc916ef1396da9b3027ded802d906311ff53785288f423ae7d6fd4d3f339782fa259d6bb3de1c4a31 +DIST gemrb-0.8.3.tar.gz 12370971 SHA256 4996d4d66e60d9ec0c63b94f687c4a6d54f4fbbfb80304245e8ff0fa886f5664 SHA512 6f091ba54d129c47b6ad7c3b1da898c7ef79b80629b373527963a0b35096ccbf91650087c4884081d306da4be7b4cfa1dc2f6d931d7140d7eccb380d9806db1c WHIRLPOOL 4f0da79423dbe9bc0c5438dc0df148005e1c2981e545f7a0649162af1b32384ff9a398eabbcfaea477cec31ee65cc5b3586d7cfa82155a234e21dd4ff8e8bc5e diff --git a/games-engines/gemrb/gemrb-0.8.3.ebuild b/games-engines/gemrb/gemrb-0.8.3.ebuild new file mode 100644 index 000000000000..7898a016ea94 --- /dev/null +++ b/games-engines/gemrb/gemrb-0.8.3.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +WANT_CMAKE=always +inherit eutils python-any-r1 cmake-utils gnome2-utils games + +DESCRIPTION="Reimplementation of the Infinity engine" +HOMEPAGE="http://gemrb.sourceforge.net/" +SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="media-libs/freetype + media-libs/libpng:0 + >=media-libs/libsdl-1.2[video] + media-libs/libvorbis + media-libs/openal + media-libs/sdl-mixer + sys-libs/zlib + ${PYTHON_DEPS}" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +pkg_setup() { + python-any-r1_pkg_setup + games_pkg_setup +} + +src_prepare() { + sed -i \ + -e '/COPYING/d' \ + CMakeLists.txt || die +} + +src_configure() { + mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}" + -DBIN_DIR="${GAMES_BINDIR}" + -DDATA_DIR="${GAMES_DATADIR}/gemrb" + -DSYSCONF_DIR="${GAMES_SYSCONFDIR}/gemrb" + -DLIB_DIR="$(games_get_libdir)" + -DMAN_DIR=/usr/share/man/man6 + -DICON_DIR=/usr/share/pixmaps + -DMENU_DIR=/usr/share/applications + -DDOC_DIR="/usr/share/doc/${PF}" + -DSVG_DIR=/usr/share/icons/hicolor/scalable/apps + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + DOCS="README NEWS AUTHORS" \ + cmake-utils_src_install + 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-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild b/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild new file mode 100644 index 000000000000..6c675feaec69 --- /dev/null +++ b/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +WX_GTK_VER=3.0 +inherit wxwidgets eutils flag-o-matic games + +DESCRIPTION="utilities for the SCUMM game engine" +HOMEPAGE="http://scummvm.sourceforge.net/" +SRC_URI="mirror://sourceforge/scummvm/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE="flac iconv mad png vorbis" +RESTRICT="test" # some tests require external files + +RDEPEND="png? ( media-libs/libpng:0 ) + mad? ( media-libs/libmad ) + flac? ( media-libs/flac ) + vorbis? ( media-libs/libvorbis ) + iconv? ( virtual/libiconv media-libs/freetype:2 ) + sys-libs/zlib + >=dev-libs/boost-1.32 + x11-libs/wxGTK:${WX_GTK_VER}" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + need-wxwidgets unicode + rm -rf *.bat dists/win32 + sed -ri -e '/^(CC|CXX)\b/d' Makefile || die + epatch "${FILESDIR}/${P}-binprefix.patch" +} + +src_configure() { + # Not an autoconf script + ./configure \ + --enable-verbose-build \ + --mandir=/usr/share/man \ + --prefix="${GAMES_PREFIX}" \ + --libdir="${GAMES_PREFIX}/lib" \ + --datadir="${GAMES_DATADIR}" \ + $(use_enable flac) \ + $(use_enable iconv) \ + $(use_enable iconv freetype) \ + $(use_enable mad) \ + $(use_enable png) \ + $(use_enable vorbis) || die +} + +src_install() { + emake DESTDIR="${D}" EXEPREFIX="${PN}-" install + dodoc README TODO + prepgamesdirs +} diff --git a/games-kids/crayon-physics/crayon-physics-55.ebuild b/games-kids/crayon-physics/crayon-physics-55.ebuild index 0bf114e83f3b..2ef6c6b64330 100644 --- a/games-kids/crayon-physics/crayon-physics-55.ebuild +++ b/games-kids/crayon-physics/crayon-physics-55.ebuild @@ -19,9 +19,7 @@ MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN} QA_PREBUILT="${MYGAMEDIR#/}/crayon ${MYGAMEDIR#/}/lib32/*" -# fuck this pulseaudio linkage RDEPEND=" - media-sound/pulseaudio[abi_x86_32(-)] dev-qt/qtcore:4[abi_x86_32(-)] dev-qt/qtgui:4[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] @@ -36,7 +34,7 @@ RDEPEND=" media-libs/sdl-mixer[vorbis,wav] media-libs/smpeg[X,opengl] media-libs/tiff:0 - virtual/jpeg + virtual/jpeg:0 ) )" diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest index ec4584916d8f..6297ea16384e 100644 --- a/games-rpg/manaplus/Manifest +++ b/games-rpg/manaplus/Manifest @@ -1,3 +1,4 @@ +DIST manaplus-1.5.10.24.tar.xz 9452988 SHA256 abc61f6a2d9867e674f2d41fd5418ac972ac27419550a38ac13744caa26f5dae SHA512 249f8b4fc8183259017ebfec41a7ea4b7dd2e952947a4cb2a42dfb88ae1449df60a8569d0823b1ab2b40ee4ef31858e2fd90d741077a1ed0702daf4c8559cdf2 WHIRLPOOL 206b81d3eb9ba9eb34c63e40ee2933289f3cd0c08b4875d1f36375464fa174d2efab1feb1279f232734b7e53123103739f568981887f4c998a725f75b8a0dd33 DIST manaplus-1.5.6.20.tar.xz 9376348 SHA256 cee7ce82c730c3e2254bc335023eb5531a3bcb4434a926f8685e16a2651f5b7e SHA512 bec1a2f9e0c034f234ce66836454df7296ce366a55d635713f4ba6103b4ab12d5a0dfd5d00b6b67a935499226e50ed1d1750f37ac70f06017d047015ba3a3627 WHIRLPOOL 728621e395fdb6ba4491e35d25897346cd70676a459c729cb56d258aeb6b413e144e57f5f306a7084511f5c0cbe3425ac25b921f3c5367d7db3696e43e869365 DIST manaplus-1.5.8.15.tar.xz 9399088 SHA256 c9ebf1c106fd04f8b192b4f07b15528a69bd3541f5eeee7cc5ecfa643a1dab9c SHA512 c99f5f782c794f0697242a2191b0eb5062964919abc6122cc88c2eb2bc32e4ce085b10c4d97d926ee72b0bac406db3130fc05d76cb8e6f1241579a115db8d44d WHIRLPOOL fc5600fe2e42f362abe507a99834bdf1810ef643709fba0005a78119728e4f204df8e7ef2672ba8548fd611f48ddb3b9a063a104b216f3c000b3ee52d83eacab DIST manaplus-1.5.9.26.tar.xz 9441816 SHA256 46efd357bc5e51311300e9239dead96f32a6a0a3c6407c091208e1b359d0151c SHA512 78cb38682fde6fb2fdb2f3805be45d69d926e2965bba3630c47f5f9ebc2d81b7dcae9dd08ae3bcaefd8837b02e09ec8da89b870052a232eb2ca8b9a9f8120413 WHIRLPOOL 4c2f153a79d71e6e69ec0b01419885453777e010c313fd4f86727cd39ec67d5eaeeeaa6237443b594ba3b42fba194e43f15f4fe5f4f43df4366aa2a85b4ce506 diff --git a/games-rpg/manaplus/manaplus-1.5.10.24.ebuild b/games-rpg/manaplus/manaplus-1.5.10.24.ebuild new file mode 100644 index 000000000000..f2ed73b4c199 --- /dev/null +++ b/games-rpg/manaplus/manaplus-1.5.10.24.ebuild @@ -0,0 +1,75 @@ +# 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/games-rpg/twclone/files/twclone-0.14-format.patch b/games-rpg/twclone/files/twclone-0.14-format.patch new file mode 100644 index 000000000000..3e5114179c53 --- /dev/null +++ b/games-rpg/twclone/files/twclone-0.14-format.patch @@ -0,0 +1,75 @@ +--- bigbang.c.old 2015-10-27 09:21:51.172611109 +0100 ++++ bigbang.c 2015-10-27 09:25:41.117233447 +0100 +@@ -530,13 +530,11 @@ + planetfile = fopen ("./planets.data", "w"); + for (loop = 1; loop <= 299 - strlen(terraInfo); loop++) + strcat(terraInfo, " "); +- strcat(terraInfo, "\n"); +- fprintf (planetfile, terraInfo); ++ fprintf (planetfile, "%s\n", terraInfo); + sprintf (ferrinfo, "%d:%d:Ferringhi:1:-2:Unknown:1000:1000:1000:0:0:0:0:3:100000:20:30:10:0:0:0:0:", 2, ferringhiSector); + for (loop = 1; loop <= 299 - strlen(ferrinfo); loop++) + strcat(ferrinfo, " "); +- strcat(ferrinfo, "\n"); +- fprintf(planetfile, ferrinfo); ++ fprintf(planetfile, "%s\n", ferrinfo); + randomPlanetInfo = malloc (sizeof (strNameLength)); + if (numRandomPlanets > 0) + { +@@ -552,8 +550,7 @@ + , c, tempint, randomname (randomPlanetInfo), randomnum(1,5)); + for (loop = 1; loop <= 299 - strlen(ferrinfo); loop++) + strcat(ferrinfo, " "); +- strcat(ferrinfo, "\n"); +- fprintf(planetfile, ferrinfo); ++ fprintf(planetfile, "%s\n", ferrinfo); + + c++; + } +@@ -616,10 +613,9 @@ + fileline = strcat (fileline, ":"); + if (sectorlist[x]->nebulae != NULL) + fileline = strcat (fileline, sectorlist[x]->nebulae); +- fileline = strcat (fileline, ":\n"); + /* Later put in whitespace buffer for saving */ + /* Not needed until user created beacons put in */ +- fprintf (file, fileline); ++ fprintf (file, "%s:\n", fileline); + } + fclose (file); + free (fileline); +@@ -646,8 +642,7 @@ + len = (int) strlen (fileline); + for (y = 0; y <= 99 - len; y++) + strcat (fileline, " "); +- strcat (fileline, "\n"); +- fprintf (file, fileline); ++ fprintf (file, "%s\n", fileline); + } + fclose (file); + +--- config.c.old 2015-10-27 09:30:00.091283678 +0100 ++++ config.c 2015-10-27 09:30:25.068806593 +0100 +@@ -140,9 +140,8 @@ + + for (loop=0; loop < 199 - strlen(buffer); loop++) + strcat(buffer, " "); +- strcat(buffer, "\n"); + +- fprintf(configfile, buffer); ++ fprintf(configfile, "%s\n", buffer); + + fclose(configfile); + free(buffer); +--- planet.c.old 2015-10-27 09:31:44.867282757 +0100 ++++ planet.c 2015-10-27 09:32:17.083667674 +0100 +@@ -59,8 +59,7 @@ + addint(stufftosave, planets[index]->citdl->upgradestart, ':', BUFF_SIZE); + for (loop=0; loop< 399 - strlen(stufftosave); loop++) + strcat(stufftosave, " "); +- strcat(stufftosave, "\n"); +- fprintf(planetfile, stufftosave); ++ fprintf(planetfile, "%s\n", stufftosave); + } + } + fclose(planetfile); diff --git a/games-rpg/twclone/twclone-0.14.ebuild b/games-rpg/twclone/twclone-0.14.ebuild index d06e68e6514e..3e92d768c88b 100644 --- a/games-rpg/twclone/twclone-0.14.ebuild +++ b/games-rpg/twclone/twclone-0.14.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -inherit games +inherit games eutils MY_P="${PN}-source-${PV}" DESCRIPTION="Clone of BBS Door game Trade Wars 2002" @@ -17,6 +17,10 @@ IUSE="" S=${WORKDIR}/${MY_P} +src_prepare() { + epatch "${FILESDIR}"/${P}-format.patch +} + src_install() { DOCS="AUTHORS ChangeLog PROTOCOL README TODO" \ default diff --git a/games-server/etqw-ded/etqw-ded-1.5.ebuild b/games-server/etqw-ded/etqw-ded-1.5.ebuild index 8c45c58f366a..729b4c6a45f4 100644 --- a/games-server/etqw-ded/etqw-ded-1.5.ebuild +++ b/games-server/etqw-ded/etqw-ded-1.5.ebuild @@ -21,8 +21,8 @@ RDEPEND="sys-libs/glibc" S=${WORKDIR}/data dir=${GAMES_PREFIX_OPT}/${PN} -QA_TEXTRELS="${dir:1}/pb/*.so" -QA_EXECSTACK="${dir:1}/*.x86 +QA_PREBUILT="${dir:1}/pb/*.so + ${dir:1}/*.x86 ${dir:1}/*.so*" pkg_nofetch() { @@ -30,9 +30,9 @@ pkg_nofetch() { } src_unpack() { - tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip + tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip || die unpack ./${A}.zip - rm -f ${A}.zip + rm -f ${A}.zip || die } src_install() { diff --git a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch new file mode 100644 index 000000000000..d8c588a32206 --- /dev/null +++ b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch @@ -0,0 +1,65 @@ +--- src/asm.c.old 2015-10-28 13:23:53.465014342 +0100 ++++ src/asm.c 2015-10-28 13:23:10.502813377 +0100 +@@ -652,7 +652,7 @@ + macputs(str); + #else + if (!inCdb) +- fprintf(stderr, str); ++ fprintf(stderr, "%s", str); + #if defined DOSALLGRAPHX + else { + if (displayMode == TEXT) +@@ -833,7 +833,7 @@ + #ifdef __MAC__ + textout(notEnoughMemErr); + #else +- fprintf(stderr, notEnoughMemErr); ++ fprintf(stderr, "%s", notEnoughMemErr); + #endif + Exit(MEMERR); + break; +@@ -916,7 +916,7 @@ + } + + if (ierr >= ERRMAX) { +- sprintf(outs, tooManyMsgErr); ++ sprintf(outs, "%s", tooManyMsgErr); + #ifndef VMS + textout(outs); + #else +--- src/cdb.c.old 2015-10-28 13:24:04.669805966 +0100 ++++ src/cdb.c 2015-10-28 13:23:10.502813377 +0100 +@@ -2760,7 +2760,7 @@ + fprintf(outp, nameByAuthorScores, warrior[idxV[i]].name, warrior[idxV[i]].authorName, + scrV[idxV[i]]); + if (warriors > 2) { +- fprintf(outp, resultsAre); ++ fprintf(outp, "%s", resultsAre); + for (j = 0; j < warriors; ++j) { + fprintf(outp, " %d", warrior[idxV[i]].score[j]); + } +--- src/clparse.c.old 2015-10-28 13:24:10.648694768 +0100 ++++ src/clparse.c 2015-10-28 13:23:10.502813377 +0100 +@@ -289,7 +289,7 @@ + if (next_input(filep, inputs)) { + if (!strcmp(inputs, "-")) { + newFile = stdin; +- fprintf(stderr, readingStdin); ++ fprintf(stderr, "%s", readingStdin); + } else { + if ((newFile = fopen(inputs, "r")) == NULL) { + code = FILENAME; /* command file not found */ +@@ -430,11 +430,11 @@ + errout(outs); + break; + case MEMORY: +- sprintf(outs, outOfMemory); ++ sprintf(outs, "%s", outOfMemory); + errout(outs); + break; + case FILENAME: +- sprintf(outs, cannotOpenParameterFile); ++ sprintf(outs, "%s", cannotOpenParameterFile); + errout(outs); + break; + } diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild index 3efe83a1c9d5..3429dd0f2a9d 100644 --- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild +++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -inherit toolchain-funcs games +inherit toolchain-funcs games eutils MY_PN="${PN/-sdl/}" MY_PV="${PV/e/-5}" @@ -24,6 +24,10 @@ DEPEND="sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) S=${WORKDIR}/${MY_P} +src_prepare() { + epatch "${FILESDIR}"/${P}-format.patch +} + src_compile() { CFLAGS="${CFLAGS} -DEXT94 -DPERMUTATE" LFLAGS="-x" diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild b/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild index 654bb3d17f96..5bd332168264 100644 --- a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild +++ b/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild @@ -4,7 +4,7 @@ EAPI=5 -WX_GTK_VER="2.8" +WX_GTK_VER="3.0" PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads,ssl" @@ -34,7 +34,7 @@ RDEPEND=" net-libs/miniupnpc:= net-misc/curl sys-libs/zlib - virtual/jpeg:62 + virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor diff --git a/games-strategy/asc/asc-2.6.0.0-r1.ebuild b/games-strategy/asc/asc-2.6.0.0-r1.ebuild new file mode 100644 index 000000000000..2f051cb875f0 --- /dev/null +++ b/games-strategy/asc/asc-2.6.0.0-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +WX_GTK_VER=3.0 +inherit eutils toolchain-funcs flag-o-matic wxwidgets games + +DESCRIPTION="turn based strategy game designed in the tradition of the Battle Isle series" +HOMEPAGE="http://www.asc-hq.org/" +SRC_URI="mirror://sourceforge/asc-hq/${P}.tar.bz2 + http://www.asc-hq.org/music/frontiers.ogg + http://www.asc-hq.org/music/time_to_strike.ogg + http://www.asc-hq.org/music/machine_wars.ogg" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="app-arch/bzip2 + media-libs/libsdl[video] + media-libs/libpng:0 + media-libs/sdl-image[gif,jpeg,png] + media-libs/sdl-mixer[vorbis] + media-libs/sdl-sound + dev-libs/boost + dev-games/physfs + media-libs/xvid + dev-libs/expat + media-libs/freetype + dev-lang/lua:0 + x11-libs/wxGTK:${WX_GTK_VER}[X] + dev-libs/libsigc++:1.2" + +DEPEND="${RDEPEND} + dev-lang/perl + virtual/pkgconfig + app-arch/zip" + +src_unpack() { + local f + + unpack ${P}.tar.bz2 + for f in ${A} + do + case ${f} in + *ogg) + cp "${DISTDIR}/${f}" "${S}/data/music" || die + ;; + esac + done +} + +src_configure() { + need-wxwidgets unicode + # Added --disable-paraguitest for bugs 26402 and 4488 + # Added --disable-paragui for bug 61154 since it's not really used much + # and the case is well documented at http://www.asc-hq.org/ + if [[ $(gcc-major-version) -eq 4 ]] ; then + replace-flags -O3 -O2 + fi + egamesconf \ + --disable-paraguitest \ + --disable-paragui \ + --datadir="${GAMES_DATADIR_BASE}" +} + +src_install() { + default + dohtml -r doc/* + prepgamesdirs +} diff --git a/games-util/antimicro/Manifest b/games-util/antimicro/Manifest index 75a1c4c9ee32..6f4d053a8598 100644 --- a/games-util/antimicro/Manifest +++ b/games-util/antimicro/Manifest @@ -1,2 +1,3 @@ DIST antimicro-2.10.1.tar.gz 662670 SHA256 9a65127dc415017dd2c84f06a4c803d6353a1c6a129a2f9a30791cffce0378b4 SHA512 0601ae0ea2bb7249e0bb7fdf12a9d023058bf37fde2f7dc350676d3a0b757ad29e43b5f1c8fd0c4600207338a755f12640ea8b5c8e762f01d528364048326ddf WHIRLPOOL 2e5d32a9bf2e05838111786ceb0f7646b457f4e9042cc99a6aaa79cdcacefacdd9d4698ab42870c6eb97f735f2bb99d904e45d168a34acf87bc0f97524b3eeb0 DIST antimicro-2.19.2.tar.gz 1028594 SHA256 039dd006aa8f8b2f4162ec6e03599aaf2d52523620542915aa7baabe74b8959d SHA512 1e68b2cde2c60765af81ae4eed25787698dc18c699e19371bceaf805fcb97f0166dc5345c70f695f5488f872de28f43bf664f238640eff2343e1d19231ff7df1 WHIRLPOOL e358d8eb7fcffe1e54b1ade0dadbb69b8d2bbad0ec22e25cfbd3c38975a2f46002a4da3f7ee06ee066646c1992c0bd5ebcd6da5a7c1a1a26ea7c5bf729305e7d +DIST antimicro-2.20.2.tar.gz 1069469 SHA256 9e845debb4629cdbc3deedd02821196e27e177724492d937aa966a09f99b70ac SHA512 09847c804b6a1d022f2990d269c9124cfdfab821e0fd1cb1ab5e27e4c6a3bd250fab5977ca614f03c46456ca6e1c7111135b9b4d8f75e54c435e0b712653e282 WHIRLPOOL 6c5f7029c87e5bcf94d39de83fec2e1923d714288d59bd227819c0817a20d46f98673189781a266ec85430ec05a4b5d496ea1892f6a37e8c8c6455090f5831b5 diff --git a/games-util/antimicro/antimicro-2.20.2.ebuild b/games-util/antimicro/antimicro-2.20.2.ebuild new file mode 100644 index 000000000000..5ef14410a095 --- /dev/null +++ b/games-util/antimicro/antimicro-2.20.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils cmake-utils + +DESCRIPTION="Map keyboard and mouse buttons to gamepad buttons" +HOMEPAGE="https://github.com/Ryochan7/antimicro" +SRC_URI="https://github.com/Ryochan7/antimicro/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtnetwork:5 + media-libs/libsdl2[X,joystick] + x11-libs/libX11 + x11-libs/libXtst" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 + virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DUSE_SDL_2=ON + ) + + QT_SELECT=5 cmake-utils_src_configure +} diff --git a/gnome-extra/synapse/synapse-0.2.99.1.ebuild b/gnome-extra/synapse/synapse-0.2.99.1.ebuild index 6fd94532fd4a..f07b0d97a695 100644 --- a/gnome-extra/synapse/synapse-0.2.99.1.ebuild +++ b/gnome-extra/synapse/synapse-0.2.99.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://launchpad.net/synapse-project/0.3/${PV}/+download/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" # "ayatana" support pending on GTK+-3.x version of synapse wrt #411613 IUSE="plugins +zeitgeist" diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild index ad12f2e7546a..47aa715a3b5b 100644 --- a/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild +++ b/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild @@ -30,6 +30,7 @@ RDEPEND=" ${PYTHON_DEPS} dev-libs/json-glib dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/rdflib[${PYTHON_USEDEP}] media-libs/raptor:2 >=dev-libs/glib-2.35.4:2 >=dev-db/sqlite-3.7.11:3 @@ -38,7 +39,6 @@ RDEPEND=" fts? ( dev-libs/xapian[inmemory] ) icu? ( dev-libs/dee[icu?] ) introspection? ( dev-libs/gobject-introspection ) - plugins? ( gnome-extra/zeitgeist-datasources ) telepathy? ( net-libs/telepathy-glib ) " DEPEND="${RDEPEND} @@ -46,6 +46,7 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.35 virtual/pkgconfig " +PDEPEND="plugins? ( gnome-extra/zeitgeist-datasources )" src_prepare() { # pure-python module is better managed manually, see src_install diff --git a/java-virtuals/jmx/jmx-1.0-r3.ebuild b/java-virtuals/jmx/jmx-1.0-r3.ebuild deleted file mode 100644 index 4e2412b8937a..000000000000 --- a/java-virtuals/jmx/jmx-1.0-r3.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit java-virtuals-2 - -DESCRIPTION="Virtual for Java Management Extensions (JMX)" -HOMEPAGE="https://www.gentoo.org" -SRC_URI="" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="" - -RDEPEND="|| ( - virtual/jre:1.7 - virtual/jre:1.6 - virtual/jre:1.5 - dev-java/sun-jmx:0 - ) - >=dev-java/java-config-2.1.8 - " - -JAVA_VIRTUAL_PROVIDES="sun-jmx" -JAVA_VIRTUAL_VM="=virtual/jre-1.7 =virtual/jre-1.6 =virtual/jre-1.5" diff --git a/java-virtuals/jmx/jmx-1.0-r4.ebuild b/java-virtuals/jmx/jmx-1.0-r4.ebuild index 8f8f4b3e8767..662640aad33e 100644 --- a/java-virtuals/jmx/jmx-1.0-r4.ebuild +++ b/java-virtuals/jmx/jmx-1.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ SRC_URI="" LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="" RDEPEND=" diff --git a/kde-apps/kstars/kstars-4.14.3.ebuild b/kde-apps/kstars/kstars-4.14.3.ebuild deleted file mode 100644 index 0a3baf108de9..000000000000 --- a/kde-apps/kstars/kstars-4.14.3.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 - -KDE_HANDBOOK="optional" -inherit flag-o-matic kde4-base - -DESCRIPTION="KDE Desktop Planetarium" -HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars" -KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="debug fits indi" - -REQUIRED_USE="indi? ( fits )" - -DEPEND=" - dev-cpp/eigen:3 - $(add_kdeapps_dep libkdeedu) - fits? ( >=sci-libs/cfitsio-0.390 ) - indi? ( >=sci-libs/indilib-0.9.8 ) -" -RDEPEND="${DEPEND}" - -src_configure() { - # Bug 308903 - use ppc64 && append-flags -mminimal-toc - - local mycmakeargs=( - $(cmake-utils_use_with fits CFitsio) - $(cmake-utils_use_with indi) - ) - - kde4-base_src_configure -} diff --git a/kde-misc/kcm-grub2/metadata.xml b/kde-misc/kcm-grub2/metadata.xml index 52072ceeff07..ce992e4c1c9e 100644 --- a/kde-misc/kcm-grub2/metadata.xml +++ b/kde-misc/kcm-grub2/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>kde</herd> <maintainer> - <email>thevoodoo@gentoo.org</email> + <email>thev00d00@gentoo.org</email> <name>Ian Whyman</name> </maintainer> <use> diff --git a/licenses/ArpWarp b/licenses/ArpWarp deleted file mode 100644 index 818225259308..000000000000 --- a/licenses/ArpWarp +++ /dev/null @@ -1,92 +0,0 @@ -ACADEMIC SOFTWARE LICENSE AGREEMENT FOR END-USERS AT PUBLIC FUNDED ACADEMIC, EDUCATION OR RESEARCH INSTITUTIONS FOR THE USE OF ARP/WARP 7.0 - -By clicking the Acceptance button for the ARP/wARP 7.0 Software ("Licensed Software"), you are consenting to be bound by and become a party to this agreement as the "Licensee". If you do not agree to all of the terms of this agreement, you must not click the Acceptance button, not install the product nor use the product, and you do not become a LICENSEE under this agreement. - -If you are not a member of a public funded academic and/or education and/or research institution you must obtain a commercial license from EMBLEM (Info@embl-em.de). - -This software license agreement is entered into by and between EMBL Enterprise Management GmbH (hereinafter "EMBLEM") located at Boxbergring 107, D-69126 Heidelberg, Germany and the "LICENSEE". - -WHEREAS EMBLEM has the right to license all copyrights and other property rights in the Licensed Software identified as ARP/wARP 7.0 and developed by EMBL (European Molecular Biology Laboratory, Meyerhofstrasse 1, D-69117 Heidelberg, Germany) in collaboration with the NKI (The Netherlands Cancer Institute, Plesmanlaan 121, 1066CX Amsterdam, The Netherlands), and EMBLEM desires to license the Software so that it becomes available for public use and benefit. - -WHEREAS LICENSEE is a public funded academic and/or education and/or research institution. - -WHEREAS LICENSEE desires to acquire a free non-exclusive license to use the Software for internal research purposes only. - -NOW, THEREFORE, in consideration of the mutual promises and covenants contained herein, the parties agree as follows: - -1. Definitions -"Licensed Software", means the current version ARP/wARP 7.0 computer package developed by Victor Lamzin and Anastassis Perrakis, collectively the "Authors", pursuant to this Agreement. - -ARP/wARP 7.0 calls for the use of some CCP4 (Collaborative Computer Project 4, Daresbury Laboratory, UK) programs and specialized libraries. Therefore, LICENSEE of ARP/wARP must obtain a CCP4 license and must install CCP4 prior to installation of ARP/wARP. - -Any opinion, findings, conclusions or recommendations expressed in the ARP/wARP 7.0 suite are those of the authors and do not necessarily reflect the views of EMBL, NKI and EMBLEM. - -2. License -Subject to the terms and conditions of this Agreement a non-exclusive, non-transferable License to use and copy the Licensed Software is made available free of charge for the LICENSEE, which is a non-profit educational, academic and/or research institution. The License is only granted for personal and internal use in research only at one Site, where a Site is defined as a set of contiguous buildings in one location. The software will be used at only one location of LICENSEE. The LICENSEE can use the Software only for academic research projects. This explicitly excludes projects which are contracted to the LICENSEE by third parties for a fee, or projects that are done in collaboration with a third party that is funding the research in whole or in part in exchange for commercial rights on the results and/or possible delay in publication of any relevant results to the academic community. - -This license does not entitle LICENSEE to receive from EMBLEM any copies of the Licensed Software including but not limited to Licensed Software on disks, tapes or CD's, hard-copy documentation, technical support, telephone assistance, or enhancements or updates to the Licensed Software. - -The user and any research assistants, co-workers or other workers who may use the Software agree to not give the source code to third parties or grant licenses on any software that includes the Licensed Software, alone or integrated into other software, to third parties. Modification of the Licensed Software code is prohibited without the prior written consent of EMBLEM. - -3. Ownership -Except as expressly licensed in this Agreement, EMBL and NKI shall retain title to the Licensed Software, and any upgrades and modifications created by EMBL and NKI. - -4. Consideration -In consideration for the license rights granted by EMBLEM, LICENSEE will obtain this academic license free of charge. - -5. Copies -LICENSEE shall have the right to make copies of the Licensed Software for internal use at the Site and for back-up purposes under this Agreement, but agrees that all such copies shall contain the copyright notices and all other reasonable and appropriate proprietary markings or confidential legends that appear on the Licensed Software provided hereunder. - -6. Support -EMBLEM shall have no obligation to offer support services to LICENSEE, and nothing contained herein shall be interpreted as to require EMBLEM to provide maintenance, installation services, debugging, consultation, or end-user support of any kind. - -7. Software Protection -LICENSEE acknowledges that ARP/wARP is proprietary to EMBL and NKI. The software code of the Licensed Software shall be treated as trade secrets and confidential information, and LICENSEE agrees to use their best efforts to hold the same in confidence. LICENSEE's obligation for confidentiality shall not extend to any information which is, or becomes generally available to the public, is already known to or subsequently disclosed by third parties to LICENSEE and is at its free disposal, or is independently developed by LICENSEE or its affiliates without the use of the confidential information disclosed by EMBL or NKI, or is required by law or legal process. - -Except as otherwise expressly permitted in this Agreement, LICENSEE may not (i) modify or create any derivative works of the Licensed Software or documentation to the Licensed Software, including customization, translation or localization; (ii) decompile, disassemble, reverse engineer, or otherwise attempt to derive the source code for the Product; (iii) redistribute, encumber, sell, rent, lease, sublicense, or otherwise transfer rights to the Licensed Software; (iv) remove or alter any trademark, logo, copyright or other proprietary notices, legends, symbols or labels in the Product; or (v) publish any results of benchmark tests run on the Product to a third party without EMBLEM's prior written consent. - -For the avoidance of doubt there is a note on the above: Customizations of the distributed ARP/wARP code (including but not limited to modifications of the ARP/wARP c-shell, tcl/tk and/or python scripts, as well as writing additional scripts or any other kind of computer code that use parts or the whole of the licensed software including but not limited to the so-called "software pipelines") are explicitly considered 'derivative work' as defined in (i). LICENSEE is not permitted to carry out such 'derivative work' for either local use or redistribution of changed code without the written consent of the authors and EMBLEM. - -8. Representations of EMBLEM to LICENSEE -EMBLEM represents to LICENSEE that (i) EMBLEM has the right to grant the License on the Licensed Software and to enter into this agreement and (ii) EMBLEM undertakes to use best efforts to cooperate with and assist LICENSEE, at LICENSEE's expense, in defending itself against any action based on the alleged infringement of any third party patent, copyright or trade secret rights resulting from or relating to the use or licensing of the Licensed Software by LICENSEE. - -9. Indemnity and Disclaimer of Warranties -Except as expressly set forth in this agreement, EMBLEM makes no representations or warranties, expressed or implied. - -The Licensed Software is provided free of charge, and, therefore, on an "as is" basis, without warranty of any kind, expressed or implied, including without limitation the warranties that it is free of defects, virus free, able to operate on an uninterrupted basis, merchantable, fit for a particular purpose or non-interfering. The entire risk as to the quality and performance of the Licensed Software is borne by LICENSEE. - -By way of example, but not limitation, EMBLEM makes no representations or warranties of merchantability or fitness for the Licensed Software and any particular application or that the use of the Licensed Software will not infringe any patents, copyrights or trademarks or other rights of third parties. The entire risk as to the quality and performance of the product is borne by LICENSEE. EMBLEM shall not be liable for any liability or damages with respect to any claim by LICENSEE or any third party on account of, or arising from the license or use of the Software. - -Should the Licensed Software prove defective in any respect, LICENSEE and not EMBL, NKI or their affiliates should assume the entire cost of any service and repair. This disclaimer of warranty constitutes an essential part of this agreement. No use of the Licensed Software is authorized hereunder except under this disclaimer. - -In no event will EMBL, NKI or their affiliates be liable for any indirect, special, incidental or consequential damages arising out of the use of or inability to use the product, including, without limitation, damages for lost profits, loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if advised of the possibility thereof, and regardless of the legal or equitable theory (contract, tort or otherwise) upon which the claim is based. - -LICENSEE has no right to claim any indemnification based on LICENSEE's use of Licensed Software. - -10. Promotional Advertising & References -LICENSEE may not use the name "ARP/wARP" in its promotional advertising, product literature, and other similar promotional materials to be disseminated to the public or any portion thereof. LICENSEE agrees not to identify EMBL and/or NKI in any promotional advertising or other promotional materials to be disseminated to the public, or any portion thereof without EMBLEM's prior written consent. For the avoidance of doubt, scientific literature is not defined as advertising and promotional materials. - -LICENSEE agrees to cite the use of the Licensed Software on all related scientific publications, posters, grant applications, institutional reports or brochures. LICENSEE agrees further that any reference to the software for crystallographic computations will cite one or more publications as set forth in the manual and in agreement with common scientific practice. EMBLEM, EMBL or NKI shall not use LICENSEE's name in publicity or advertising involving this Agreement or otherwise without LICENSEE's prior written consent which may be withheld at LICENSEE's sole discretion. - -11. Term -This Agreement and the license rights granted herein shall become effective as of the date this Agreement is executed by both parties and shall be perpetual unless terminated in accordance with this Section. - -EMBLEM may terminate this Agreement at any time. - -Either party may terminate this Agreement at any time effective upon the other party's breach of any agreement, covenant, or representation made in this Agreement, such breach remaining uncorrected sixty (60) days after written notice thereof. - -LICENSEE shall have the right, at any time, to terminate this Agreement without cause by written notice to EMBLEM specifying the date of termination. - -Upon termination, LICENSEE shall destroy all full and partial copies of the Licensed Software. - -12. Governing Law -This Agreement shall be construed in accordance with the laws of Germany. Place of Jurisdiction shall be Mannheim. - -13. General -The parties agree that this Agreement is the complete and exclusive agreement among the parties and supersedes all proposals and prior agreements whether written or oral, and all other communications among the parties relating to the subject matter of this Agreement. This Agreement cannot be modified except in writing and signed by both parties. Failure by either party at any time to enforce any of the provisions of this Agreement shall not constitute a waiver by such party of such provision nor in any way affect the validity of this Agreement. - -The invalidity of singular provisions does not affect the validity of the entire understanding. The parties are obligated, however, to replace the invalid provisions by a regulation, which comes closest to the economic intent of the invalid provision. The same shall apply mutatis mutandis in case of a gap. - -IN WITNESS WHEREOF, the LICENSEE hereto has caused this Agreement to be duly executed on the date of the download of the software and by accepting the license conditions by pressing the Acceptance button. - -I have read this License Agreement and I agree to uphold the terms and conditions of this license.
\ No newline at end of file diff --git a/licenses/ccp4 b/licenses/ccp4 deleted file mode 100644 index 09c73a68e935..000000000000 --- a/licenses/ccp4 +++ /dev/null @@ -1,371 +0,0 @@ -CCP4 PROGRAM SUITE -LICENCE AGREEMENT -(Academic Use) -THIS LICENCE AGREEMENT is made BETWEEN: -1. THE COUNCIL FOR THE CENTRAL LABORATORY OF THE RESEARCH -COUNCILS, an executive Non-Departmental Public Body established as a Research -Council by Royal Charter under the Science and Technology Act 1965 (“CCLRC”); -and -2. [INSERT NAME OF ACADEMIC/RESEARCH INSTITUTION] whose administrative -offices are at [insert address] ("the Licensee"). -BACKGROUND -CCLRC has assembled the CCP4 suite of software applications and libraries with -support -from the Biotechnology and Biological Sciences Research Council, as part of the -Collaborative Computational Project Number 4. -The CCP4 Software Suite comprises: -a) applications and libraries distributed in source code, that the Licensee may -use -free of charge for Academic Purposes, subject to the terms of clauses 2.1-2.4 of -this Agreement; -b) applications and libraries distributed in source code, that the Licensee may -use, -free of charge, subject to the terms of the LGPL or the GPL; and -c) third party software that is included in the CCP4 suite of programs and that -is -licensed by a third party on that third party's terms and conditions. -1. DEFINITIONS AND INTERPRETATION -1.1 In this Agreement the following expressions have the meaning set opposite: -Academic Purposes: fundamental or basic research or academic teaching, -including any fundamental research that is funded by any -public or charitable body, but not any purpose that -generates revenue (as opposed to grant income) for the -Licensee or any third party. Any research that is wholly or -partially sponsored by any profit making organisation or -that is carried out for the benefit of any profit-making -organisation is not an Academic Purpose; -an Application: a software program designed to provide a specific function -for the user; -the CCP4 Software: the Libraries and Applications distributed by CCLRC from -time to time as part of the CCP4 Software Suite, except -the GNU Software and the Third Party Software; -the CCP4 Website: the website with the URL www.ccp4.ac.uk; -the Current Release: Version 5.0 of the Software, and all later versions that -CCLRC decides may be used under this Agreement; -a Derived Work: any modification of, or enhancement or improvement to, -any of the Software and any software or other work -developed or derived from, or based on, any of the -Software, or that incorporates any of the Software; -the LGPL: the GNU Lesser General Public Licence, a copy of which -appears in Appendix A to this Agreement; -the GPL: the GNU General Public Licence, a copy of which appears -in Appendix B to this Agreement; -the GNU Software: the open source Libraries and Applications that are listed -on the CCP4 Website from time to time as being subject -to, respectively, the terms of the LGPL or the GPL; -a Harmful Element: any virus, worm, time bomb, time lock, drop dead device, -trap and access code or anything else that might disrupt, -disable, harm or impede the operation of any information -system, or that might corrupt, damage, destroy or render -inaccessible any software, data or file on, or that may -allow any unauthorised person to gain access to, any -information system or any software, data or file on it; -Intellectual Property: patents, trade marks, service marks, registered designs, -copyrights, database rights, design rights, know-how, -confidential information, applications for any of the above, -and any similar right recognised from time to time in any -jurisdiction, together with all rights of action in relation to -the infringement of any of the above; -a Library: a collection of reusable programming routines, software -functions or data that may be linked to, or used with, an -Application; -the Licence Period: the period beginning when the Licensee posts or faxes the -completed and signed copy of this Agreement to CCLRC -2 -in accordance with clause 5.1, and ending on the -termination of this Agreement under clause 5.2; -the Software: the suite of programs known as CCP4, comprising the -GNU Software, the CCP4 Software and the Third Party -Software; and -the Third Party Software Procheck, FFTw, libjpeg, CBF, Astexviewer, Rasmol and -Phaser. -2. LICENCE -The CCP4 Software -2.1 CCLRC grants the Licensee a non-exclusive, non-transferable, royalty free -licence to use, -copy, modify, and enhance and distribute the CCP4 Libraries during the Licence -Period -on the terms and conditions of this Agreement provided that: -2.1.1 the Licensee may distribute, or supply any CCP4 Library or any Derived -Work -based on that Library, and may allow any third party to use any CCP4 Library or -any -Derived Work based on that Library, solely on condition that the recipient of -that -CCP4 Library or that Derived Work will comply with clause 2.1.2 below as though -it -were named instead of the Licensee in that clause; and -2.1.2 the Licensee will notify CCLRC of any Derived Work made by or for the -Licensee, or -by any of its employees or students, based on any CCP4 Library, and will provide -CCLRC with a copy of that Derived Work (in source code) within one year after it -was made. The Licensee grants CCLRC an irrevocable, indefinite licence to make -that Derived Work available to any third party on such terms and conditions as -CCLRC may from time to time decide. This clause does not apply to any -executable program based on or combined with a Library, or to any Derived Work -that the Licensee distributes under the LGPL or the GPL. -2.2 CCLRC grants the Licensee a non-exclusive, non-transferable, royalty free -licence to use -and copy the CCP4 Applications during the Licence Period on the terms and -conditions of -this Agreement provided that: -2.2.1 the Licensee may not distribute any CCP4 Application or any Derived Work -based -on any CCP4 Application to any third party, or share their use with any third -party -(whether free of charge or otherwise); and -2.2.2 the Licensee may not copy any CCP4 Application except for the purposes of -making -a reasonable number of back-up copies, nor may the Licensee modify any CCP4 -Application or create any Derived Work based on any CCP4 Application except for -the purpose of error correction. The Licensee will provide CCLRC with a copy of -any -3 -correction made by the Licensee (in source code) within one year after it was -made. -The licensee grants CCLRC an irrevocable, indefinite licence to make that -correction available to any third party on such terms and conditions as CCLRC -may -from time to time decide. -2.3 The CCP4 Software and any Derived Work based on any part of the CCP4 -Software may -be used by the Licensee and its employees and registered students for Academic -Purposes only. -2.4 The licences granted in this clause 2 relate only to the Current Release. -The Licensee -must acquire a new licence for any future version of the Software that CCLRC -decides -requires a new or further licence. -The GNU Software -2.5 The GNU Software is supplied to the Licensee on the terms and conditions of -the LGPL -or the GPL as indicated on the CCP4 Website from time to time. By entering into -this -Agreement the Licensee agrees to comply with the terms of the LGPL or the GPL -as so -indicated. -The Third Party Software -2.6 The Third Party Software is supplied to the Licensee on the terms and -conditions imposed -by the third party owner or licensor. By entering into this Agreement the -Licensee agrees -to comply with those terms and conditions. -The Software -2.7 The Licensee will not tamper with or remove any copyright or other -proprietary notice or -any disclaimer that appears on or in any part of the Software, and will -reproduce the -same in all copies of any of the Software and in all Derived Works. -3. WARRANTIES AND LIABILITY -3.1 The Software is provided for Academic Purposes free of charge. Therefore -CCLRC and -its licensors give no warranty and make no representation in relation to the -Software or -any assistance or advice that CCLRC may give in connection with the Software. -The -Licensee, its employees and students and anyone to whom the Licensee makes the -Software or any Derived Work available, use them at their own risk. The Licensee -will indemnify CCLRC against any claim made by any third party to whom the -Licensee -has made the Software or any Derived Work available. -3.2 Before using any of the software, the Licensee will check that the Software -does not -contain any Harmful Element. Neither CCLRC nor its licensors warrants that the -Software -will run without interruption or be error free, or free from any Harmful -Element. CCLRC is -not obliged to provide any support or error correction service, assistance or -advice in -4 -relation to the Software. If it does provide that sort of service, assistance -or advice, -subject to clause 3.7, CCLRC will not be liable for any loss or damage suffered -by the -Licensee as a result. -3.3 Neither CCLRC nor any of its licensors will be liable to the Licensee to -the extent that any -loss or damage is caused by the Licensee's failure to implement, or the -Licensee's delay -in implementing, any upgrade, update, new release, revision, version or -modification of, or -advice in relation to, the Software that would have remedied or mitigated the -effects of -any error, defect, bug or deficiency. -3.4 The Licensee acknowledges that proper use of the Software and any Derived -Work is -dependent on the Licensee, its employees and students exercising proper skill -and care -in inputting data and interpreting the output provided by the Software or that -Derived -Work. CCLRC and its licensors will not be liable for the consequences of -decisions taken -by the Licensee or any other person on the basis of that output. CCLRC does not -accept -any responsibility for any use which may be made by the Licensee of that -output, nor for -any reliance which may be placed on that output, nor for advice or information -given in -connection with that output. -3.5 Subject to clause 3.7, CCLRC's liability for any breach of this Agreement, -any negligence -or arising in any other way out of the subject matter of this Agreement, will -not extend to -any incidental or consequential damages or losses, or any loss of profits, loss -of revenue, -loss of data, loss of contracts or opportunity, whether direct or indirect, -even if the -Licensee has advised CCLRC of the possibility of those losses arising or if -they were or -are within CCLRC's contemplation. CCLRC’s licensors will not be liable to the -Licensee -for any loss or damage, however caused (including by negligence) and whether -direct or -indirect. -3.6 Subject to clause 3.7, the aggregate liability of CCLRC for any breach of -this Agreement, -any negligence or arising in any other way out of the subject matter of this -Agreement will -not exceed £50,000. -3.7 Nothing in this Agreement (including without limitation the LGPL or the -GPL, as -applicable) limits or excludes CCLRC's liability for death or personal injury -caused by its -negligence or for any fraud, or for any sort of liability that, by law, cannot -be limited or -excluded. -3.8 In addition to the terms and conditions of the LGPL or the GPL (as -applicable), and the -terms that apply to any Third Party Software, the terms of this clause 3 apply -as -between CCLRC and the Licensee, and the validity of any part of this clause 3 -will not -be affected by any part of the LGPL or the GPL or the terms that apply to any -Third -Party Software being held to be invalid by any court. -5 -3.9 The express undertakings and given by CCLRC in this Agreement and the terms -of this -Agreement are in lieu of all warranties, conditions, terms, undertakings and -obligations -on the part of CCLRC, whether express or implied by statute, common law, custom, -trade usage, course of dealing or in any other way. All of these are excluded -to the -fullest extent permitted by law. -4. INTELLECTUAL PROPERTY RIGHTS AND ACKNOWLEDGEMENTS -4.1 Nothing in this Agreement assigns or transfers any Intellectual Property -Rights in any of -the Software. Those rights are reserved to CCLRC or its licensors. -4.2 The Licensee will ensure that, if any of its employees or students publish -any article or -other material resulting from, or relating to, a project or work undertaken -with the -assistance of any part of the Software, that publication will contain a proper -acknowledgement or citation as indicated from time to time on the CCP4 Website. -5. TERMINATION -5.1 This Agreement will take effect and the Licence Period will start when a -completed copy -of this Agreement, signed on behalf of the Licensee, has been posted to the -Secretary to -CCP4, at CCLRC, Daresbury Laboratory, Warrington WA 4 4AD, or faxed to :+44 1925 -603825 (or to any other address or fax number given for this purpose on the CCP4 -website at the time the Licensee downloads this form of Licence Agreement from -that -website). -5.2 This Agreement will terminate immediately and automatically if: -5.2.1 the Licensee is in breach of this Agreement; or -5.2.2 the Licensee becomes insolvent, or if an order is made or a resolution is -passed for -its winding up (except voluntarily for the purpose of solvent amalgamation or -reconstruction), or if an administrator, administrative receiver or receiver is -appointed over the whole or any part of its assets, or if it makes any -arrangement -with its creditors. -5.3 The Licensee's right to use the Software will cease immediately on the -termination of this -Agreement, and the Licensee will destroy all copies of the Software that it or -any of its -employees or students holds. -5.4 Clauses 1, 2.1.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3, 4, 5.3, 5.4, 5.5 and 6 will -survive the expiry of -the Licence Period and the termination of this Agreement, and will continue -indefinitely. -5.5 CCLRC may withdraw any of the Software from the CCP4 Suite at any time. If -any third -party owner of the Intellectual Property in any of the Software withdraws -CCLRC’s right -to distribute that software, the Licensee’s rights under this Agreement in -relation to that -6 -software will immediately terminate, and the Licensee will cease using that -part of the -Software -6. GENERAL -6.1 Headings: The headings in this Agreement are for ease of reference only; -they do not -affect its construction or interpretation. -6.2 Assignment etc: The Licensee may not assign or transfer this Agreement as a -whole, or -any of its rights or obligations under it, without first obtaining the written -consent of -CCLRC. -6.3 Illegal/unenforceable provisions: If the whole or any part of any provision -of this -Agreement is void or unenforceable in any jurisdiction, the other provisions of -this -Agreement, and the rest of the void or unenforceable provision, will continue -in force in -that jurisdiction, and the validity and enforceability of that provision in any -other -jurisdiction will not be affected. -6.4 Waiver of rights: If CCLRC fails to enforce, or delays in enforcing, an -obligation of the -Licensee, or fails to exercise, or delays in exercising, a right under this -Agreement, that -failure or delay will not affect its right to enforce that obligation or -constitute a waiver of -that right. Any waiver by CCLRC of any provision of this Agreement will not, -unless -expressly stated to the contrary, constitute a waiver of that provision on a -future occasion. -6.5 Entire agreement: This Agreement constitutes the entire agreement between -the parties -relating to its subject matter. The Licensee acknowledges that it has not -entered into this -Agreement on the basis of any warranty, representation, statement, agreement or -undertaking except those expressly set out in this Agreement. The Licensee -waives any -claim for breach of, or any right to rescind this Agreement in respect of, any -representation which is not an express provision of this Agreement. However, -this clause -does not exclude any liability which CCLRC may have to the Licensee (or any -right which -the Licensee may have to rescind this Agreement) in respect of any fraudulent -misrepresentation or fraudulent concealment before the signing of this -Agreement. -6.6 Amendments: No variation of, or amendment to, this Agreement will be -effective unless -it is made in writing and signed by each party's representative. -6.7 Third parties: No one except a party to this Agreement has any right to -prevent the -amendment of this Agreement or its termination, and no one except a party to -this -Agreement may enforce any benefit conferred by this Agreement, unless this -Agreement -expressly provides otherwise. -6.8 Governing law: This Agreement is governed by, and is to be construed in -accordance -with, English law. The English Courts will have exclusive jurisdiction to deal -with any -7 -dispute which has arisen or may arise out of or in connection with this -Agreement, except -that CCLRC may bring proceedings against the Licensee or for an injunction in -any -jurisdiction. [If the Licensee's usual place of business or registered office -is not in -England, the Licensee’s address for service in England is ____]. -SIGNED for and on behalf of the Licensee: -Name: -Position: -Signature: -Date: diff --git a/licenses/oasis b/licenses/oasis deleted file mode 100644 index 243a3a6ed613..000000000000 --- a/licenses/oasis +++ /dev/null @@ -1,55 +0,0 @@ - LICENSE of VEC, SAPI, DIMS and Associated Programs - -COPYRIGHT NOTICE: - -Copyright (c) 1985-2002, - Research group on Methods of Solving Crystal Structures, - Institute of Physics, Chinese Academy of Sciences. - All rights reserved. -Authors: - VEC - Wan Zheng-hua, Liu Yu-dong, Fu Zheng-qing, Li Yang, - Cheng Ting-zhu, Li Fang-hua & Fan Hai-fu - SAPI - Zheng Chao-de, Gu Yuan-xin, Wan Zheng-hua, Yao Jia-xing & - Fan Hai-fu - DIMS - Fu Zheng-qing, Li Yang, Liu Yu-dong & Fan Hai-fu - -LICENSE AGREEMENT: - -In consideration of being allowed to copy and/or use this software, -the user agrees to be bound by the terms and conditions of this License -Agreement as "Licensee." This Agreement gives you, the LICENSEE, -certain rights and obligations. By using the software, you indicate -that you have read, understood, and will comply with the following -terms and conditions. - -Permission is hereby granted to use or copy these programs for academic -purpose, provided the text of this NOTICE (to include COPYRIGHT -NOTICE, LICENSE AGREEMENT, and DISCLAIMER) is retained with all -copies. Permission to modify the code and to distribute modified code -is granted, provided the text of this NOTICE is retained, a notice -that the code was modified is included with the above COPYRIGHT NOTICE -and with the COPYRIGHT NOTICE in any modified files, and that this -file ("LICENSE") is distributed with the modified code. - -Title to copyright to this software and its derivatives and to any -associated documentation shall at all times remain with Licensor and -LICENSEE agrees to preserve the same. Nothing in this Agreement shall -be construed as conferring rights to use in advertising, publicity or -otherwise any trademark of the name of the Institute of Physics, Chinese -Academy of Sciences. - -DISCLAIMER: - -THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/licenses/phaser b/licenses/phaser deleted file mode 100644 index e03a57a14797..000000000000 --- a/licenses/phaser +++ /dev/null @@ -1,280 +0,0 @@ -Software: PHASER -Version: 1.3 - -This End User Licence Agreement is a legal agreement between you the -"Licensee" (in your capacity as an individual and as an agent for your -institution or other entity) -and -Cambridge University Technical Services Limited ("CUTS") whose registered -office is at 16 Mill Lane, Cambridge, CB2 1SB UK. - -CUTS is a company wholly owned by the Chancellor, Masters and Scholars of the -University of Cambridge which holds title in intellectual property rights -including in the Software and carries on trading, business and technology -transfer transactions on behalf of the University of Cambridge. - -CUTS is the entire legal and beneficial owner and licensor of the Software and -desires to grant on the Software non-exclusive, restricted-use licences for -in-house use to appropriate academic and non-commercial third parties. - -Downloading the Software from its internet publication site (restricted access -via user ID and password) at -http://www-structmed.cimr.cam.ac.uk/phaser/download.html, installing, or -using of the Software by you indicates your agreement to be bound by the terms -and conditions of this Agreement. If you do not agree to these terms and -conditions, do not download, install or use the Software. - -AGREED TERMS - -1. DEFINITIONS - -1.1 In this Agreement the following words and phrases shall, unless the -context otherwise requires, have the following meanings: - -Commencement Date means the initial date of download of the Software from its -internet publication site by the Licensee; - -Derivatives means computer programs in machine readable object code or source -code form developed or otherwise acquired by the Licensee which are a -modification of, enhancement to, derived from or based upon the Software; - -Intellectual Property Rights means all patents, copyrights, design rights, -trade marks, service marks, trade secrets, know-how, database rights and other -rights in the nature of intellectual property rights (whether registered or -unregistered) and all applications for the same, anywhere in the world; - -Parties means CUTS and the Licensee and "Party" shall mean either of them; - -Software means the computer program and version listed at the head of this -Agreement. - -2. GRANT OF LICENCE - -2.1 CUTS hereby grants to the Licensee and the Licensee hereby accepts a -non-exclusive, non-transferable, royalty-free licence, commencing on the -Commencement Date and for a term of five years therefrom, to download, install -and use the Software subject to the following terms and conditions: - -(a) the Licensee may use the Software solely for its internal use and the -Licensee shall not sell, give, disclose, lend, transfer, sublicense or -otherwise distribute the Software to any third party, or allow the Software to -be accessed over the internet or in any other manner that would allow access -to the Software by anyone other than the Licensee's employees (and consultants -and contractors provided such use is solely for the Licensee's internal use -and subject to the provisions of this Agreement); - -(b) the Licensee may create Derivatives solely for its own internal use but -shall not distribute the Software or any Derivatives in whole or in part to -any third party; - -(c) the Software may be installed and used only on computers owned or leased -by the Licensee; - -(d) the Licensee may copy the Software solely to the extent necessary to -exercise this Licence, and for backup, disaster recovery and archival -purposes, provided that the Licensee shall retain on all copies of the -Software the following copyright notice: © 2000-2005. Cambridge University -Technical Services Limited. All rights reserved. - -3. INTELLECTUAL PROPERTY RIGHTS - -3.1 The Licensee acknowledges that all Intellectual Property Rights in the -Software and any copies thereof belong and shall belong to CUTS and the -Licensee shall have no rights in or to the Software other than the right to -use it in accordance with the terms of the Licence in this Agreement. - -3.2 Title to and ownership of any portion of the Software incorporated into -Derivatives shall at all times remain with CUTS and the Licensee shall not -have any title or ownership interest therein. - -3.3 Title to and ownership of any portion of Derivatives created by the -Licensee and not owned by CUTS pursuant to Clauses 3.1 and 3.2 above shall be -held by the Licensee. Nothing contained in this Licence shall be construed to -limit CUTS rights to modify or to develop other derivatives of the Software -which are similar to or offer the same or similar improvements as any -Derivatives developed by the Licensee. - -3.4 Error fixes, bug fixes, technical suggestions, comments and suggested -improvements to the Software and its code are welcome by the authors of the -Software and CUTS, and in agreeing to provide these to the authors or to CUTS -the Licensee hereby assigns the Intellectual Property Rights in error fixes, -bug fixes, or technical improvements to CUTS which are communicated in any -manner or medium to the authors of the Software or CUTS with a reservation of -use of those improvements and suggestions by the Licensee subject to the terms -and conditions of the Licence in this Agreement. - -4. NO MAINTENANCE OR SUPPORT - -4.1 CUTS is under no obligation whatsoever to: - -(a) provide maintenance or support for the Software; or - -(b) notify the Licensee of error fixes, bug fixes, patches, or upgrades to -the features, functionality or performance of the Software ("Enhancements") -(if any), whether developed by CUTS or third parties. If, in its sole -discretion, CUTS makes an Enhancement available to the Licensee and CUTS does -not separately enter into a written licence agreement with the Licensee -relating to such bug fix, patch or upgrade, then it shall be deemed -incorporated into the Software and subject to this Agreement. - -5. DISCLAIMER OF WARRANTIES - -5.1 CUTS warrants that the Software will conform substantially with its -functional specifications. Otherwise the Software is supplied "as is" without -warranty of any kind. CUTS, its licensors and its employees: - -(a) disclaim any warranties, express or implied, including but not limited to -any implied warranties of merchantability, fitness for a particular purpose, -title or non-infringement of third party rights; - -(b) do not assume any legal liability or responsibility for the accuracy, -completeness, or usefulness of the Software; - -(c) do not represent that use of the Software will not infringe privately -owned rights; - -(d) do not warrant that the Software will function uninterrupted, that it is -error-free or that any errors will be corrected. - -6. LIMITATION OF LIABILITY - -6.1 The Software is provided for academic non-commercial purposes only. -Therefore, in no event will CUTS or its licensors or its employees be liable -to the Licensee for any indirect, incidental, consequential, special or -punitive damages of any kind or nature, including but not limited to loss of -profits or loss of data, for any reason whatsoever, whether such liability is -asserted on the basis of contract, tort (including negligence or strict -liability), or otherwise, even if CUTS has been warned of the possibility of -such loss or damages. - -6.2 The limitations and exclusions in this Agreement shall not apply in -respect of claims for personal injury or death caused by the negligence of -CUTS, its licensors or its employees or in respect of fraud or fraudulent -misrepresentation. - -7. INDEMNITY - -7.1 The Licensee shall indemnify CUTS, the Software authors, the Software -sponsors, and their agents, officers, and employees, against any and all -claims, suits, losses, damages, costs, fees, and expenses arising out of or in -connection with any claim or threatened claim by any third party relating to -or arising from the use of the Software by the Licensee. The Licensee shall -pay all costs incurred by CUTS in enforcing this provision. - -8. TERM AND TERMINATION - -8.1 This Agreement and the Licence granted herein shall come into effect -on the Commencement Date and will continue for the duration of five years -therefrom unless terminated by CUTS in accordance with this Agreement. If the -Licensee breaches any term of this Agreement, and fails to cure such breach -within thirty (30) days of the date of written notice, this Agreement shall -immediately terminate. Upon such termination the Licensee shall immediately -cease using the Software, return to CUTS or destroy all copies of the -Software, and provide CUTS with written certification of the Licensee's -compliance with the foregoing. Termination shall not relieve the Licensee -from its obligations arising prior to such termination. Notwithstanding any -provision of this Agreement to the contrary, Sections 3, 5, 6, 7, 8, 9, 10, -13, 14 and 18 shall survive termination of this Agreement. - -9. CONFIDENTIALITY - -9.1 The Licensee agrees and undertakes that during the term of the Licence in -this Agreement and thereafter it will keep confidential all, and will not use -for its own purposes nor without the prior written consent of CUTS disclose to -any third party any information of a confidential nature (including trade -secrets and information of commercial value) which may become known to the -Licensee and which relates to CUTS unless such information is public knowledge -or already known to the Licensee at the time of disclosure or subsequently -becomes public knowledge other by breach of the Licence in this Agreement or -subsequently comes lawfully into the possession of the Licensee from a third -party. - -10. NO SUBLICENSING AND NO ASSIGNMENT - -10.1 The Licensee shall have no right to sub-license or to assign, -transfer, charge or deal in any other manner the benefit or burden of the -Licence in this Agreement in whole or in part or to allow the Software to -become the subject of any charge, lien or encumbrance without the prior -written consent of CUTS such consent may be withheld without giving any -reasons. - -11. WAIVER - -11.1 No forbearance or delay by either party in enforcing its rights will -prejudice or restrict the rights of that party, and no waiver of any such -rights or of any breach of any contractual terms will be deemed to be a waiver -of any other right or of any later breach. - -12. SEVERABILITY - -12.1 If any provision of the Licence in this Agreement is judged to be -illegal or unenforceable, the continuation in full force and effect of the -remainder of the provisions will not be prejudiced. - -13. NO AGENCY OR PARTNERSHIP - -13.1 Nothing contained or implied in this Agreement constitutes a Party the -partner, agent, or legal representative of another party or of the other Party -for any purpose or creates any partnership, agency or trust, and no Party has -any authority to bind the other Party in any way. - -14. THE CONTRACTS (RIGHTS OF THIRD PARTIES) ACT 1999 - -14.1 The Contracts (Rights of Third Parties) Act 1999 shall not apply to -this Agreement and nothing in this Agreement shall confer or purport to confer -on or operate to give any third Party any benefit or any right to enforce any -term of this Agreement. - -15. NOTICES - -15.1 Any notice to be given under this Agreement shall be in writing and -delivered by hand, prepaid registered post or facsimile to a Party at the -address set out at the head of this Agreement or to such other address or fax -number as any Party may specify in writing to another. Notices are deemed to -have been given: - -(a) if delivered by hand, at the time of delivery unless delivered after 5pm -in the place of receipt or on a non-business day, in which case the notice is -deemed to have been given at 9am the next business day; - -(b) if sent by registered post from within the United Kingdom, three -business days after posting (or seven business days if posted from outside the -United Kingdom); and - -(c) if sent by facsimile, at the time the facsimile is received shown in -the transmission report as the time that the whole facsimile was sent unless -received after 5pm in the place of receipt or on a non-business day, in which -case the notice is deemed to have been given at 9am the next business day. -Any notice served by facsimile transmission shall be confirmed by post. - -16. ENTIRE AGREEMENT - -16.1 This Agreement constitutes the entire agreement and understanding of the -Parties and supersedes all negotiations, understandings or previous agreement -between the Parties relating to the subject matter of this Agreement. - -17. GOVERNING LAW - -17.1 This Agreement and any documents to be entered into pursuant to it -shall be governed by and construed in accordance with English law and each -Party irrevocably submits to the exclusive jurisdiction of the courts of -England over any claim or matter arising under or in connection with this -Agreement and the documents entered into pursuant to it. - -18. EXPORT CONTROL REGULATIONS - -18.1 'Export Control Regulations' means any United Nations trade sanctions -or EU or UK legislation or regulation, from time to time in force, which -impose arms embargoes or control of export of goods, technology or software. - -18.2 The Licensee shall ensure that, in using the Software it shall not and -nor shall its employees breach or compromise directly of indirectly compliance -with any Export Control Regulations. - - - -If you have any questions or feedback concerning the Software, contact -University of Cambridge, Department of Haematology, Cambridge Institute for -Medical Research, Wellcome Trust/MRC Building, Cambridge CB2 0XY UK. -Attn: Professor Randy Read, or via email at cimr-phaser@lists.cam.ac.uk - diff --git a/licenses/phaser-com b/licenses/phaser-com deleted file mode 100644 index 3c1b3a03c800..000000000000 --- a/licenses/phaser-com +++ /dev/null @@ -1,290 +0,0 @@ -Software: PHASER -Version: 1.3 - -This End User Licence Agreement ("Agreement") is a legal agreement between -your company the "Licensee" -and -CAMBRIDGE UNIVERSITY TECHNICAL SERVICES LIMITED ("CUTS") whose registered -office is at 16 Mill Lane, Cambridge, CB2 1SB UK. - -CUTS is a company wholly owned by the Chancellor, Masters and Scholars of the -University of Cambridge which holds title in intellectual property rights -including in the Software and carries on trading, business and technology -transfer transactions on behalf of the University of Cambridge. - -CUTS is the entire legal and beneficial owner and licensor of the Software and -is willing to license use of the Software by the Licensee. As a condition -precedent to the execution and performance of this Licence, the Licensee -(and/or any of its Affiliates, if applicable, the Licensee and its Affiliates -collectively referred to as the "Licensee" for the purposes of this Agreement) -will have paid up annual fees to the PHENIX Industry Consortium for use of -software, including the Software which is the subject of the Licence in this -Agreement, which has been assembled for the PHENIX Industry Consortium. - -Downloading the Software from its internet publication site (restricted access -via user ID and password) at -http://www-structmed.cimr.cam.ac.uk/phaser/download.html, installing, or use -of the Software by the Licensee indicates the Licensee's agreement to be bound -by the terms and conditions of this Agreement. If the Licensee does not agree -to these terms and conditions, the Licensee may not download, install or use -the Software. - -AGREED TERMS - -1. DEFINITIONS - -1.1 In this Agreement the following words and phrases shall, unless the -context otherwise requires, have the following meanings: - -Commencement Date means the initial date of download of the Software from its -internet publication site by the Licensee; - -Derivatives means computer programs in machine readable object code or source -code form developed or otherwise acquired by the Licensee which are a -modification of, enhancement to, derived from or based upon the Software; - -Fee means the annual licence fee payable by the Licensee to the PHENIX -Industry Consortium; - -Intellectual Property Rights means all patents, copyrights, design rights, -trade marks, service marks, trade secrets, know-how, database rights and other -rights in the nature of intellectual property rights (whether registered or -unregistered) and all applications for the same, anywhere in the world; - -Parties means CUTS and the Licensee and "Party" shall mean either of them; - -Software means the computer program and version listed at the head of this -Agreement. - -2. GRANT OF LICENCE - -2.1 In consideration of the Fee, CUTS hereby grants to the Licensee a -non-exclusive, non-transferable, royalty-free licence, commencing on the -Commencement Date and for the duration of payment of the Fee, to download, -install and use the Software subject to the following terms and conditions: - -(a) the Licensee may use the Software solely for its internal use and the -Licensee shall not sell, give, disclose, lend, transfer, sublicense or -otherwise distribute the Software to any third party, or allow the Software to -be accessed over the internet or in any other manner that would allow access -to the Software by anyone other than the Licensee's employees (and consultants -and contractors provided such use is solely for the Licensee's internal use -and subject to the provisions of this Agreement); - -(b) the Licensee may create Derivatives solely for its own internal use but -shall not distribute the Software or any Derivatives in whole or in part to -any third party; - -(c) the Software may be installed and used only on computers owned or leased -by the Licensee; - -(d) the Licensee may copy the Software solely to the extent necessary to -exercise this Licence, and for backup, disaster recovery and archival -purposes, provided that the Licensee shall retain on all copies of the -Software the following copyright notice: © 2000-2005. Cambridge University -Technical Services Limited. All rights reserved. - -3. INTELLECTUAL PROPERTY RIGHTS - -3.1 The Licensee acknowledges that all Intellectual Property Rights in the -Software belong and shall belong to CUTS and the Licensee shall have no rights -in or to the Software other than the right to use it in accordance with the -terms of the Licence in this Agreement. - -3.2 Title to and ownership of any portion of the Software incorporated into -Derivatives shall at all times remain with CUTS and the Licensee shall not -have any title or ownership interest therein. - -3.3 Title to and ownership of any portion of Derivatives created by the -Licensee and not owned by CUTS pursuant to Clauses 3.1 and 3.2 above shall be -held by the Licensee. Nothing contained in this Licence shall be construed to -limit CUTS rights to modify or to develop other derivatives of the Software -which are similar to or offer the same or similar improvements as any -Derivatives developed by the Licensee. - -3.4 Error fixes, bug fixes, technical suggestions, comments and suggested -improvements to the Software and its code are welcome by the authors of the -Software and CUTS, and in agreeing to provide these to the authors or to CUTS -the Licensee hereby assigns the Intellectual Property Rights in error fixes, -bug fixes, or technical improvements to CUTS which are communicated in any -manner or medium to the authors of the Software or CUTS with a reservation of -use of those improvements and suggestions by the Licensee subject to the terms -and conditions of the Licence in this Agreement. - -4. NO MAINTENANCE OR SUPPORT - -4.1 CUTS is under no obligation whatsoever to: - -(a) provide maintenance or support for the Software; or - -(b) notify the Licensee of error fixes, bug fixes, patches, or upgrades to -the features, functionality or performance of the Software ("Enhancements") -(if any), whether developed by CUTS or third parties. If, in its sole -discretion, CUTS makes an Enhancement available to the Licensee and CUTS does -not separately enter into a written licence agreement with the Licensee -relating to such bug fix, patch or upgrade, then it shall be deemed -incorporated into the Software and subject to this Agreement. - -5. DISCLAIMER OF WARRANTIES - -5.1 CUTS warrants that the Software will conform substantially with its -functional specifications. Otherwise the Software is supplied "as is" without -warranty of any kind. CUTS, its licensors and its employees: - -(a) disclaim any warranties, express or implied, including but not limited to -any implied warranties of merchantability, fitness for a particular purpose, -title or non-infringement of third party rights; - -(b) do not assume any legal liability or responsibility for the accuracy, -completeness, or usefulness of the Software; - -(c) do not represent that use of the Software will not infringe privately -owned rights; - -(d) do not warrant that the Software will function uninterrupted, that it is -error-free or that any errors will be corrected. - -6. LIMITATION OF LIABILITY - -6.1 In no event will CUTS or its licensors or its employees be liable to -the Licensee for any indirect, incidental, consequential, special or punitive -damages of any kind or nature, including but not limited to loss of profits or -loss of data, for any reason whatsoever, whether such liability is asserted on -the basis of contract, tort (including negligence or strict liability), or -otherwise, even if CUTS has been warned of the possibility of such loss or -damages. In no event shall CUTS' liability arising from or in connection with -this Agreement exceed a sum equivalent to the annual Fee paid by the Licensee -to the PHENIX Industry Consortium for use of the Software. - -6.2 The limitations and exclusions in this Agreement shall not apply in -respect of claims for personal injury or death caused by the negligence of -CUTS, its licensors or its employees or in respect of fraud or fraudulent -misrepresentation. - -7. INDEMNITY - -7.1 The Licensee shall indemnify CUTS, the Software authors, the Software -sponsors, and their agents, officers, and employees, against any and all -claims, suits, losses, damages, costs, fees, and expenses arising out of or in -connection with any claim or threatened claim by any third party relating to -or arising from the use of the Software by the Licensee. The Licensee shall -pay all costs incurred by CUTS in enforcing this provision. - -8. TERM AND TERMINATION - -8.1 This Agreement and the Licence granted herein shall come into effect -on the Commencement Date and will continue for the duration of payment of the -Fee unless terminated by CUTS in accordance with this Agreement. If the -Licensee breaches any term of this Agreement, and fails to cure such breach -within thirty (30) days of the date of written notice, this Agreement shall -immediately terminate. Upon such termination the Licensee shall immediately -cease using the Software, return to CUTS or destroy all copies of the -Software, and provide CUTS with written certification of the Licensee's -compliance with the foregoing. Termination shall not relieve the Licensee -from its obligations arising prior to such termination. Notwithstanding any -provision of this Agreement to the contrary, Sections 3, 5, 6, 7, 8, 9, 10, -13, 14 and 18 shall survive termination of this Agreement. - -9. CONFIDENTIALITY - -9.1 The Licensee agrees and undertakes that during the term of the Licence in -this Agreement and thereafter it will keep confidential all, and will not use -for its own purposes nor without the prior written consent of CUTS disclose to -any third party any information of a confidential nature (including trade -secrets and information of commercial value) which may become known to the -Licensee and which relates to CUTS unless such information is public knowledge -or already known to the Licensee at the time of disclosure or subsequently -becomes public knowledge other by breach of the Licence in this Agreement or -subsequently comes lawfully into the possession of the Licensee from a third -party. - -10. NO SUBLICENSING AND NO ASSIGNMENT - -10.1 The Licensee shall have no right to sub-license or to assign, -transfer, charge or deal in any other manner the benefit or burden of the -Licence in this Agreement in whole or in part or to allow the Software to -become the subject of any charge, lien or encumbrance without the prior -written consent of CUTS such consent may be withheld without giving any -reasons. - -11. WAIVER - -11.1 No forbearance or delay by either party in enforcing its rights will -prejudice or restrict the rights of that party, and no waiver of any such -rights or of any breach of any contractual terms will be deemed to be a waiver -of any other right or of any later breach. - -12. SEVERABILITY - -12.1 If any provision of the Licence in this Agreement is judged to be -illegal or unenforceable, the continuation in full force and effect of the -remainder of the provisions will not be prejudiced. - -13. NO AGENCY OR PARTNERSHIP - -13.1 Nothing contained or implied in this Agreement constitutes a Party the -partner, agent, or legal representative of another party or of the other Party -for any purpose or creates any partnership, agency or trust, and no Party has -any authority to bind the other Party in any way. - -14. THE CONTRACTS (RIGHTS OF THIRD PARTIES) ACT 1999 - -14.1 The Contracts (Rights of Third Parties) Act 1999 shall not apply to -this Agreement and nothing in this Agreement shall confer or purport to confer -on or operate to give any third Party any benefit or any right to enforce any -term of this Agreement except as expressly provided in this Agreement. - -15. NOTICES - -15.1 Any notice to be given under this Agreement shall be in writing and -delivered by hand, prepaid registered post or facsimile to a Party at the -address set out at the head of this Agreement or to such other address or fax -number as any Party may specify in writing to another. Notices are deemed to -have been given: - -(a) if delivered by hand, at the time of delivery unless delivered after 5pm -in the place of receipt or on a non-business day, in which case the notice is -deemed to have been given at 9am the next business day; - -(b) if sent by registered post from within the United Kingdom, three -business days after posting (or seven business days if posted from outside the -United Kingdom); and - -(c) if sent by facsimile, at the time the facsimile is received shown in -the transmission report as the time that the whole facsimile was sent unless -received after 5pm in the place of receipt or on a non-business day, in which -case the notice is deemed to have been given at 9am the next business day. -Any notice served by facsimile transmission shall be confirmed by post. - -16. ENTIRE AGREEMENT - -16.1 This Agreement constitutes the entire agreement and understanding of -the Parties and supersedes all negotiations, understandings or previous -agreement between the Parties relating to the subject matter of this -Agreement. - -17. GOVERNING LAW - -17.1 This Agreement and any documents to be entered into pursuant to it -shall be governed by and construed in accordance with English law and each -Party irrevocably submits to the exclusive jurisdiction of the courts of -England over any claim or matter arising under or in connection with this -Agreement and the documents entered into pursuant to it. - -18. EXPORT CONTROL REGULATIONS - -18.1 'Export Control Regulations' means any United Nations trade sanctions -or EU or UK legislation or regulation, from time to time in force, which -impose arms embargoes or control of export of goods, technology or software. - -18.2 The Licensee shall ensure that, in using the Software it shall not and -nor shall its employees or consultants or contractors breach or compromise -directly of indirectly compliance with any Export Control Regulations. - - - -If you have any questions or feedback concerning the Software, contact -University of Cambridge, Department of Haematology, Cambridge Institute for -Medical Research, Wellcome Trust/MRC Building, Cambridge CB2 0XY UK. -Attn: Professor Randy Read, or via email at cimr-phaser@lists.cam.ac.uk - diff --git a/licenses/solve b/licenses/solve deleted file mode 100644 index 1dc2c2708ea2..000000000000 --- a/licenses/solve +++ /dev/null @@ -1,18 +0,0 @@ - -SOLVE/RESOLVE Licensing Information -U.S. Universities, non-profits, other non-governmental institutions - -A one-time $500 license fee is good for versions 2.00 to 2.99 for all machines at your institution. You can get a free 45-day trial license, too. -U.S. Government institutions - -For U.S. government institutions, the SOLVE/RESOLVE license is free of charge. One license is good for versions 2.00 to 2.99 for all machines at your institution. -U.S. Commercial institutions - -Contact the Los Alamos Technology Transfer Division for commercial licenses. You can get a free 45-day trial license if you wish. -Non-U.S. Non-commercial institutions - -A one-time $600 license and export fee is good for versions 2.00 to 2.99 for all machines at your institution. -Non-U.S. Commercial institutions - -Contact the Los Alamos Technology Transfer Division for non-U.S. commercial licenses. - diff --git a/mail-mta/exim/exim-4.86-r2.ebuild b/mail-mta/exim/exim-4.86-r2.ebuild index ef5243c53e83..b9caa74b24d7 100644 --- a/mail-mta/exim/exim-4.86-r2.ebuild +++ b/mail-mta/exim/exim-4.86-r2.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="http://www.exim.org/" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~hppa ~ppc64 ~x86" COMMON_DEPEND=">=sys-apps/sed-4.0.5 >=sys-libs/db-3.2 diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest index c1bf4141486a..8f998eecdd45 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-20151011.tar.gz 4306494 SHA256 afa2dcb6bcf6f6b101edb6a3cba3fd36742f18cd43bd069ac93febe1c95f988a SHA512 06718820d4b9db85a8d8596c89ba1cdc976f963e74d67e6056d70ef8f8bcf3372828d41f73759c6b5a07d2699ef410fc8273f3f45426c94c7b553beb682548d3 WHIRLPOOL fb49dc4ace947f22bfa8adfdde4c3412dbc3ad7ae14a2339627bd83049e2ecd2c09bc58c2b9efcdb58c088d2ba6c4f34d8b378750fc113cb87f8116887e94f61 +DIST postfix-3.1-20151031.tar.gz 4297545 SHA256 efb725f83a3350a5e5104411663f0b864e706f537bc487230830c8c06ae24cd8 SHA512 d763c274ac45d70508790a9515b4c4f8e94fdc29f10ad8b947432f29093bf6a4153e05d8b99da694d94affa920e5162a8f1de565d7601990327d4514878daff9 WHIRLPOOL 76a5b6421806d8814015c1297907e7a114f8f23ad2fef84e357bee981175c8fd24b52f8720656e6a9a597e65e4b2f696669000301b1948d63ae751d5d077655f DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3 diff --git a/mail-mta/postfix/postfix-3.0.3-r1.ebuild b/mail-mta/postfix/postfix-3.0.3-r1.ebuild new file mode 100644 index 000000000000..3490dd6687b2 --- /dev/null +++ b/mail-mta/postfix/postfix-3.0.3-r1.ebuild @@ -0,0 +1,314 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator + +MY_PV="${PV/_rc/-RC}" +MY_SRC="${PN}-${MY_PV}" +MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official" +VDA_PV="2.10.0" +VDA_P="${PN}-vda-v13-${VDA_PV}" +RC_VER="2.7" + +DESCRIPTION="A fast and secure drop-in replacement for sendmail" +HOMEPAGE="http://www.postfix.org/" +SRC_URI="${MY_URI}/${MY_SRC}.tar.gz + vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) " + +LICENSE="IBM" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda" + +DEPEND=">=dev-libs/libpcre-3.4 + dev-lang/perl + berkdb? ( >=sys-libs/db-3.2:* ) + cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) + eai? ( dev-libs/icu:= ) + ldap? ( net-nds/openldap ) + ldap-bind? ( net-nds/openldap[sasl] ) + lmdb? ( >=dev-db/lmdb-0.9.11 ) + mysql? ( virtual/mysql ) + pam? ( virtual/pam ) + postgres? ( dev-db/postgresql:* ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + )" + +RDEPEND="${DEPEND} + dovecot-sasl? ( net-mail/dovecot ) + memcached? ( net-misc/memcached ) + net-mail/mailbase + !mail-mta/courier + !mail-mta/esmtp + !mail-mta/exim + !mail-mta/mini-qmail + !mail-mta/msmtp[mta] + !mail-mta/netqmail + !mail-mta/nullmailer + !mail-mta/qmail-ldap + !mail-mta/sendmail + !mail-mta/opensmtpd + !<mail-mta/ssmtp-2.64-r2 + !>=mail-mta/ssmtp-2.64-r2[mta] + !net-mail/fastforward + selinux? ( sec-policy/selinux-postfix )" + +# No vda support for postfix-3.0 +REQUIRED_USE="ldap-bind? ( ldap sasl ) + !vda" + +S="${WORKDIR}/${MY_SRC}" + +pkg_setup() { + # Add postfix, postdrop user/group (bug #77565) + enewgroup postfix 207 + enewgroup postdrop 208 + enewuser postfix 207 -1 /var/spool/postfix postfix,mail +} + +src_prepare() { + if use vda; then + epatch "${DISTDIR}"/${VDA_P}.patch + fi + + sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \ + src/util/sys_defs.h || die "sed failed" + + # change default paths to better comply with portage standard paths + sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed" + + epatch_user +} + +src_configure() { + for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE + do + local AUXLIBS_${name}="" + done + + # Make sure LDFLAGS get passed down to the executables. + local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl" + AUXLIBS_PCRE="$(pcre-config --libs)" + + use pam && mylibs="${mylibs} -lpam" + + if use ldap; then + mycc="${mycc} -DHAS_LDAP" + AUXLIBS_LDAP="-lldap -llber" + fi + + if use mysql; then + mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)" + AUXLIBS_MYSQL="$(mysql_config --libs)" + fi + + if use postgres; then + mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)" + AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq" + fi + + if use sqlite; then + mycc="${mycc} -DHAS_SQLITE" + AUXLIBS_SQLITE="-lsqlite3 -lpthread" + fi + + if use ssl; then + mycc="${mycc} -DUSE_TLS" + mylibs="${mylibs} -lssl -lcrypto" + fi + + if use lmdb; then + mycc="${mycc} -DHAS_LMDB" + AUXLIBS_LMDB="-llmdb -lpthread" + fi + + if ! use eai; then + mycc="${mycc} -DNO_EAI" + fi + + # broken. and "in other words, not supported" by upstream. + # Use inet_protocols setting in main.cf + #if ! use ipv6; then + # mycc="${mycc} -DNO_IPV6" + #fi + + if use sasl; then + if use dovecot-sasl; then + # Set dovecot as default. + mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\"" + fi + if use ldap-bind; then + mycc="${mycc} -DUSE_LDAP_SASL" + fi + mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl" + mylibs="${mylibs} -lsasl2" + elif use dovecot-sasl; then + mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"" + fi + + if ! use nis; then + mycc="${mycc} -DNO_NIS" + fi + + if ! use berkdb; then + mycc="${mycc} -DNO_DB" + if use cdb; then + # change default hash format from Berkeley DB to cdb + mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\"" + fi + fi + + if use cdb; then + mycc="${mycc} -DHAS_CDB -I/usr/include/cdb" + # Tinycdb is preferred. + if has_version dev-db/tinycdb ; then + einfo "Building with dev-db/tinycdb" + AUXLIBS_CDB="-lcdb" + else + einfo "Building with dev-db/cdb" + CDB_PATH="/usr/$(get_libdir)" + for i in cdb.a alloc.a buffer.a unix.a byte.a ; do + AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}" + done + fi + fi + + # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006 + # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check. + mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" + filter-lfs-flags + + # Workaround for bug #76512 + if use hardened; then + [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os + fi + + # Remove annoying C++ comment style warnings - bug #378099 + append-flags -Wno-comment + + sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs + sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs + + emake makefiles shared=yes dynamicmaps=no pie=yes \ + shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \ + DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \ + AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \ + AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \ + AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \ + AUXLIBS_SQLITE="${AUXLIBS_SQLITE}" +} + +src_install () { + local myconf + use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \ + html_directory=\"/usr/share/doc/${PF}/html\"" + + LD_LIBRARY_PATH="${S}/lib" \ + /bin/sh postfix-install \ + -non-interactive \ + install_root="${D}" \ + config_directory="/etc/postfix" \ + manpage_directory="/usr/share/man" \ + command_directory="/usr/sbin" \ + mailq_path="/usr/bin/mailq" \ + newaliases_path="/usr/bin/newaliases" \ + sendmail_path="/usr/sbin/sendmail" \ + ${myconf} \ + || die "postfix-install failed" + + # Fix spool removal on upgrade + rm -Rf "${D}"/var + keepdir /var/spool/postfix + + # Install rmail for UUCP, closes bug #19127 + dobin auxiliary/rmail/rmail + + # Provide another link for legacy FSH + dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail + + # Install qshape tool and posttls-finger + dobin auxiliary/qshape/qshape.pl + doman man/man1/qshape.1 + dobin bin/posttls-finger + doman man/man1/posttls-finger.1 + + # Performance tuning tools and their manuals + dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink} + doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1 + + # Set proper permissions on required files/directories + dodir /var/lib/postfix + keepdir /var/lib/postfix + fowners -R postfix:postfix /var/lib/postfix + fperms 0750 /var/lib/postfix + fowners root:postdrop /usr/sbin/post{drop,queue} + fperms 02711 /usr/sbin/post{drop,queue} + + keepdir /etc/postfix + if use mbox; then + mypostconf="mail_spool_directory=/var/spool/mail" + else + mypostconf="home_mailbox=.maildir/" + fi + LD_LIBRARY_PATH="${S}/lib" \ + "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \ + -e ${mypostconf} || die "postconf failed" + + insinto /etc/postfix + newins "${FILESDIR}"/smtp.pass saslpass + fperms 600 /etc/postfix/saslpass + + newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix + # do not start mysql/postgres unnecessarily - bug #359913 + use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix" + use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix" + + dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES* + use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/ + + pamd_mimic_system smtp auth account + + if use sasl; then + insinto /etc/sasl2 + newins "${FILESDIR}"/smtp.sasl smtpd.conf + fi + + # header files + insinto /usr/include/postfix + doins include/*.h + + # Remove unnecessary files + rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic} + rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual} + + if has_version mail-mta/postfix; then + # let the sysadmin decide when to change the compatibility_level + sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die + fi + + systemd_dounit "${FILESDIR}/${PN}.service" +} + +pkg_postinst() { + # Do not install server.{key,pem) SSL certificates if they already exist + if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \ + && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then + SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}" + install_cert /etc/ssl/postfix/server + chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem} + fi + + if [[ ! -e /etc/mail/aliases.db ]] ; then + ewarn + ewarn "You must edit /etc/mail/aliases to suit your needs" + ewarn "and then run /usr/bin/newaliases. Postfix will not" + ewarn "work correctly without it." + ewarn + fi +} diff --git a/mail-mta/postfix/postfix-3.1_pre20151011.ebuild b/mail-mta/postfix/postfix-3.1_pre20151031.ebuild index 72ad0b53ab6b..9ba2dc5e1d50 100644 --- a/mail-mta/postfix/postfix-3.1_pre20151011.ebuild +++ b/mail-mta/postfix/postfix-3.1_pre20151031.ebuild @@ -25,7 +25,7 @@ IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb me DEPEND=">=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) - cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) + cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) diff --git a/media-fonts/Humor-Sans/metadata.xml b/media-fonts/Humor-Sans/metadata.xml index a417de94b956..ad40b69bb820 100644 --- a/media-fonts/Humor-Sans/metadata.xml +++ b/media-fonts/Humor-Sans/metadata.xml @@ -3,9 +3,9 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>beber@meleeweb.net</email> + <email>bertrand@jacquin.bzh</email> <name>Bertrand Jacquin</name> - <description>Proxied maintainer.</description> + <description>Proxied maintainer</description> </maintainer> <longdescription>A sanserif typeface in the style of xkcd.</longdescription> </pkgmetadata> diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index ab3daf6fc6ec..83132a1dc9dd 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -1,4 +1,5 @@ DIST darktable-1.6.6.tar.xz 3097760 SHA256 f85e4b8219677eba34f5a41e1a0784cc6ec06576326a99f04e460a4f41fd21a5 SHA512 96f0371c0044c40e22c0cf729076032e487fd0af30d27d28ed42ea8bcc3e29971b09d9f628e3b734147265b02fa0243217e687a8e6237b2c0c14b9db330df09c WHIRLPOOL d04e77777fdcfdd5933d7c915375b7418647918af7ef4a5b19703724a113ee5fdfe8db6bb839e9638eecca6c0c9c7542088d12b45634fca57d3b453fa120d7f6 DIST darktable-1.6.7.tar.xz 3113804 SHA256 a75073b49df0a30cd2686624feeb6210bc083bc37112ae6e045f8523db4c4c98 SHA512 6fadc62dc9ac0dd8b11d7d1a1ef1c23bd07abb7e66159d0bd26dd4bb9b36162e390c4f1559dd7c433c18dd55ebff98157234137567e12467995f7f26915b0ea0 WHIRLPOOL 69228b8c734b53b17483ae453df8cd73caf78b5fcbcee6b5cae5f8396c5dd1038ba6036048ab50e15c85cc35adeac0bd49de03f3acb30dbcb822fae2e02b73bf DIST darktable-1.6.8.tar.xz 3118776 SHA256 b676f81bd8cc661a8f76e03ad449da4444f770b6bec3e9accf013c636f690905 SHA512 8811e8f931299b4fb86d3611696061404253985328178231902e749dc55b4f02d5193ce2e2eaf8c6351f9f7374870bcbdc55b145dfb75cd7669556494b457bbb WHIRLPOOL acfe83ebcc697904246a11583d0ff521365639d2006629e76123db93c35ea7ed39cbd7fed54470e5ed0e27cc6b28d70559738d68f36c31be63391c539c5323cb +DIST darktable-1.6.9.tar.xz 3124940 SHA256 0f721e9d298a9407f6c0325d9c95b9dc37fa60f3b6a2f2e3b5675ff97c423173 SHA512 c0e8e83cf1cb10b663e5486f2bdde3cba2db5dbaabacd260999be1173c67618023e785e9087a517959835459f8d54c245d190f63a9422a17f3472f5aa316d492 WHIRLPOOL 0a2446ff7f98cf0297c5948009414dbf828f1cc60a9fb117f1e110f454dd68df611310bd9ff287f1f2345a8ee9818c1918b4ac7791aeb094c01e71a1ecdfce9d DIST darktable-usermanual-1.6.0.pdf 12827069 SHA256 f5c46dbf0a2dd2d391f92555abdefe735c6362e51a755b296d71779492b7e945 SHA512 39ee8c1b4f23883025750416d9d1f73d1dfbec0e6ac3eeef0f15778ced66a373c00b0a46cb3a54b1cfd6e04313313f63e8e3cd3d0cbea011acaa07a725d0ab02 WHIRLPOOL 49a234e57c14d23ccb85eadf2ad03c52eae7f90b0371dce025c04019a7a5cca41858084f735fe0965f93958ab83601571ab3e33acd27c2bcbd381bb0c9da4794 diff --git a/media-gfx/darktable/darktable-1.6.9.ebuild b/media-gfx/darktable/darktable-1.6.9.ebuild new file mode 100644 index 000000000000..9bf8f076ffef --- /dev/null +++ b/media-gfx/darktable/darktable-1.6.9.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils + +DOC_PV="1.6.0" + +DESCRIPTION="A virtual lighttable and darkroom for photographers" +HOMEPAGE="http://www.darktable.org/" +SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/${P}.tar.xz + doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )" + +LICENSE="GPL-3 CC-BY-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +LANGS=" ca cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk" +# TODO add lua once dev-lang/lua-5.2 is unmasked +IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret +nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services webp +${LANGS// / linguas_}" + +# sse3 support is required to build darktable +REQUIRED_USE="cpu_flags_x86_sse3" + +CDEPEND=" + dev-db/sqlite:3 + >=dev-libs/glib-2.28:2 + dev-libs/libxml2:2 + gnome-base/librsvg:2 + media-gfx/exiv2:0=[xmp] + media-libs/lcms:2 + >=media-libs/lensfun-0.2.3 + media-libs/libpng:0= + media-libs/tiff:0 + net-misc/curl + virtual/jpeg:0 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/pango + colord? ( x11-misc/colord:0= ) + flickr? ( media-libs/flickcurl ) + geo? ( net-libs/libsoup:2.4 ) + gphoto2? ( media-libs/libgphoto2:= ) + graphicsmagick? ( media-gfx/graphicsmagick ) + jpeg2k? ( media-libs/openjpeg:0 ) + libsecret? ( + >=app-crypt/libsecret-0.18 + dev-libs/json-glib + ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + slideshow? ( + media-libs/libsdl + virtual/glu + virtual/opengl + ) + web-services? ( dev-libs/json-glib ) + webp? ( media-libs/libwebp:0= )" +RDEPEND="${CDEPEND} + x11-themes/gtk-engines:2 + kde? ( kde-apps/kwalletd:4 )" +DEPEND="${CDEPEND} + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +pkg_pretend() { + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi +} + +src_prepare() { + use cpu_flags_x86_sse3 && append-flags -msse3 + + sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \ + -e "s:\(\${SHARE_INSTALL}/doc/\)darktable:\1${PF}:" \ + -e "s:LICENSE::" \ + -i doc/CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_use colord COLORD) + $(cmake-utils_use_use flickr FLICKR) + $(cmake-utils_use_use geo GEO) + $(cmake-utils_use_use gphoto2 CAMERA_SUPPORT) + $(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK) + $(cmake-utils_use_use jpeg2k OPENJPEG) + $(cmake-utils_use_use kde KWALLET) + $(cmake-utils_use_use libsecret LIBSECRET) + $(cmake-utils_use_use libsecret GLIBJSON) + $(cmake-utils_use_use nls NLS) + $(cmake-utils_use_use opencl OPENCL) + $(cmake-utils_use_use openexr OPENEXR) + $(cmake-utils_use_use openmp OPENMP) + $(cmake-utils_use !rawspeed DONT_USE_RAWSPEED) + $(cmake-utils_use_use squish SQUISH) + $(cmake-utils_use_build slideshow SLIDESHOW) + $(cmake-utils_use_use web-services GLIBJSON) + $(cmake-utils_use_use webp WEBP) + -DUSE_LUA=OFF + -DCUSTOM_CFLAGS=ON + -DINSTALL_IOP_EXPERIMENTAL=ON + -DINSTALL_IOP_LEGACY=ON + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf + + for lang in ${LANGS} ; do + use linguas_${lang} || rm -r "${ED}"/usr/share/locale/${lang} + done + + if use pax_kernel && use opencl ; then + pax-mark Cm "${ED}"/usr/bin/${PN} || die + eqawarn "USE=pax_kernel is set meaning that ${PN} will be run" + eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary" + eqawarn "must be modified and this *may* lead to breakage! If" + eqawarn "you suspect that ${PN} is broken by this modification," + eqawarn "please open a bug." + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} diff --git a/media-gfx/fontypython/files/0001-Do-not-crash-on-empty-pogs-list.patch b/media-gfx/fontypython/files/0001-Do-not-crash-on-empty-pogs-list.patch new file mode 100644 index 000000000000..b652053596c6 --- /dev/null +++ b/media-gfx/fontypython/files/0001-Do-not-crash-on-empty-pogs-list.patch @@ -0,0 +1,21 @@ +From: Pietro Battiston <me@pietrobattiston.it> +Date: Sun, 21 Dec 2014 11:50:28 +0100 +Subject: Do not crash on empty pogs list + +--- + fontypythonmodules/gui_PogChooser.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fontypythonmodules/gui_PogChooser.py b/fontypythonmodules/gui_PogChooser.py +index 94b7f2e..f233529 100644 +--- a/fontypythonmodules/gui_PogChooser.py ++++ b/fontypythonmodules/gui_PogChooser.py +@@ -80,7 +80,7 @@ class PogChooser(wx.ListCtrl) : + i = self.FindItem(-1, select) + self.indexselected = i # Set this to help initial icon settings. + self.Select(i, True) +- else: ++ elif self.__poglistCopy: + self.Select(0, False) + self.indexselected = -1 + diff --git a/media-gfx/fontypython/files/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch b/media-gfx/fontypython/files/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch new file mode 100644 index 000000000000..e6f8fb634e83 --- /dev/null +++ b/media-gfx/fontypython/files/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch @@ -0,0 +1,134 @@ +From: Pietro Battiston <me@pietrobattiston.it> +Date: Sun, 21 Dec 2014 09:14:19 +0100 +Subject: Removed unused code which causes crash with wx 3.0 + +--- + fontypython | 2 -- + fontypythonmodules/dialogues.py | 4 ---- + fontypythonmodules/gui_Left.py | 4 ---- + fontypythonmodules/gui_Middle.py | 5 ----- + fontypythonmodules/gui_PogChooser.py | 4 ---- + fontypythonmodules/gui_Right.py | 4 ---- + fontypythonmodules/gui_ScrolledFontView.py | 4 ---- + fontypythonmodules/wxgui.py | 4 ---- + 8 files changed, 31 deletions(-) + +diff --git a/fontypython b/fontypython +index a05290f..e46e34e 100755 +--- a/fontypython ++++ b/fontypython +@@ -72,8 +72,6 @@ else: # err code -11 + + ## Setup wxPython to access translations : enables the stock buttons. + localedir = "fontypythonmodules/locales" +- langid = wx.LANGUAGE_DEFAULT +- mylocale = wx.Locale( langid ) + + iPC = PC.PathControl() + +diff --git a/fontypythonmodules/dialogues.py b/fontypythonmodules/dialogues.py +index 1fbff5f..eba7ab3 100644 +--- a/fontypythonmodules/dialogues.py ++++ b/fontypythonmodules/dialogues.py +@@ -23,10 +23,6 @@ import wx + import wx.html as html + + +-## Setup wxPython to access translations : enables the stock buttons. +-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG +-mylocale = wx.Locale( langid ) +- + ## langcode = locale.getlocale()[0] # I must not use getlocale... + ## This is suggested by Martin: + loc = locale.setlocale(locale.LC_CTYPE) # use *one* of the categories (not LC_ALL) +diff --git a/fontypythonmodules/gui_Left.py b/fontypythonmodules/gui_Left.py +index 5451f39..7b1f0c6 100644 +--- a/fontypythonmodules/gui_Left.py ++++ b/fontypythonmodules/gui_Left.py +@@ -17,10 +17,6 @@ + + import wx, os + +-## Setup wxPython to access translations : enables the stock buttons. +-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG +-mylocale = wx.Locale( langid ) +- + + from pubsub import * + from wxgui import ps +diff --git a/fontypythonmodules/gui_Middle.py b/fontypythonmodules/gui_Middle.py +index 470e3ea..9af3f9f 100644 +--- a/fontypythonmodules/gui_Middle.py ++++ b/fontypythonmodules/gui_Middle.py +@@ -19,11 +19,6 @@ import wx + import wx.lib.stattext + import wx.lib.buttons as buttons + +-## Setup wxPython to access translations : enables the stock buttons. +-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG +-mylocale = wx.Locale( langid ) +- +- + from pubsub import * + from wxgui import ps + +diff --git a/fontypythonmodules/gui_PogChooser.py b/fontypythonmodules/gui_PogChooser.py +index f233529..c679191 100644 +--- a/fontypythonmodules/gui_PogChooser.py ++++ b/fontypythonmodules/gui_PogChooser.py +@@ -17,10 +17,6 @@ + + import wx, locale + +-## Setup wxPython to access translations : enables the stock buttons. +-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG +-mylocale = wx.Locale( langid ) +- + from pubsub import * + from wxgui import ps + +diff --git a/fontypythonmodules/gui_Right.py b/fontypythonmodules/gui_Right.py +index adefa1d..ea5062b 100644 +--- a/fontypythonmodules/gui_Right.py ++++ b/fontypythonmodules/gui_Right.py +@@ -17,10 +17,6 @@ + + import wx + +-## Setup wxPython to access translations : enables the stock buttons. +-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG +-mylocale = wx.Locale( langid ) +- + from pubsub import * + from wxgui import ps + +diff --git a/fontypythonmodules/gui_ScrolledFontView.py b/fontypythonmodules/gui_ScrolledFontView.py +index d7b3d2f..3e35d62 100644 +--- a/fontypythonmodules/gui_ScrolledFontView.py ++++ b/fontypythonmodules/gui_ScrolledFontView.py +@@ -20,10 +20,6 @@ import wx.lib.scrolledpanel + + from pubsub import * + +-## Setup wxPython to access translations : enables the stock buttons. +-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG +-mylocale = wx.Locale( langid ) +- + import fpsys # Global objects + + from gui_Fitmap import * #Also brings in 'ps' variable +diff --git a/fontypythonmodules/wxgui.py b/fontypythonmodules/wxgui.py +index da80d17..6e6716a 100644 +--- a/fontypythonmodules/wxgui.py ++++ b/fontypythonmodules/wxgui.py +@@ -23,10 +23,6 @@ import fpversion + ## Now, bring in all those big modules + import wx + +-## Setup wxPython to access translations : enables the stock buttons. +-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG +-mylocale = wx.Locale( langid ) +- + ## Fetch my own pubsub stuff + from pubsub import * + ps = CPubsub() diff --git a/media-gfx/fontypython/files/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch b/media-gfx/fontypython/files/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch new file mode 100644 index 000000000000..4875a15ff050 --- /dev/null +++ b/media-gfx/fontypython/files/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch @@ -0,0 +1,28 @@ +From: Pietro Battiston <me@pietrobattiston.it> +Date: Sun, 21 Dec 2014 11:50:09 +0100 +Subject: Adapt to wxpython 3.0, which enforces assertions on ListItems ids. + +--- + fontypythonmodules/gui_PogChooser.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/fontypythonmodules/gui_PogChooser.py b/fontypythonmodules/gui_PogChooser.py +index c679191..4cdf772 100644 +--- a/fontypythonmodules/gui_PogChooser.py ++++ b/fontypythonmodules/gui_PogChooser.py +@@ -200,6 +200,7 @@ class PogChooser(wx.ListCtrl) : + li.SetImage(i) + li.SetText(p) + id = wx.NewId() ++ li.SetId(id) + PogChooser.__poglistCopy[id] = p # record the pog name + row = self.InsertItem( li ) + self.SetItemData( row, id ) # associate back to __poglistCopy +@@ -214,6 +215,7 @@ class PogChooser(wx.ListCtrl) : + li.SetImage(0) + li.SetText(pogname) + id = wx.NewId() ++ li.SetId(id) + self.__poglistCopy[id] = pogname + row = self.InsertItem(li) + self.SetItemData( row, id ) diff --git a/media-gfx/fontypython/fontypython-0.4.4-r3.ebuild b/media-gfx/fontypython/fontypython-0.4.4-r3.ebuild new file mode 100644 index 000000000000..7a002b894c30 --- /dev/null +++ b/media-gfx/fontypython/fontypython-0.4.4-r3.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +WX_GTK_VER=3.0 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 multilib wxwidgets + +DESCRIPTION="Font preview application" +HOMEPAGE="http://savannah.nongnu.org/projects/fontypython" +SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# Crashes w/ debug build of wxGTK (#201315) +DEPEND="dev-python/pillow[${PYTHON_USEDEP}] + dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}] + x11-libs/wxGTK:${WX_GTK_VER}[-debug]" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-pillow.patch" + "${FILESDIR}"/0001-Do-not-crash-on-empty-pogs-list.patch + "${FILESDIR}"/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch + "${FILESDIR}"/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch ) + +src_prepare() { + distutils-r1_src_prepare + need-wxwidgets unicode +} + +src_install() { + distutils-r1_src_install + doman "${S}"/fontypython.1 +} diff --git a/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild new file mode 100644 index 000000000000..76157420b1a1 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org" +SRC_URI="http://www.geeqie.org/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif gtk3 jpeg lcms lirc lua tiff xmp" + +RDEPEND="gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( >=dev-lang/lua-5.1:= ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) + tiff? ( media-libs/tiff:0 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/intltool + sys-devel/gettext" + +src_prepare() { + epatch_user + + eautoreconf +} + +src_configure() { + # clutter does not compile, gps depends on clutter + local myconf="--disable-dependency-tracking + --with-readmedir=/usr/share/doc/${PF} + --disable-clutter + --disable-gps + $(use_enable debug debug-log) + $(use_enable gtk3) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable tiff)" + + if use exif || use xmp; then + myconf="${myconf} --enable-exiv2" + else + myconf="${myconf} --disable-exiv2" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + rm -f "${D}/usr/share/doc/${PF}/COPYING" + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README +} + +pkg_postinst() { + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +} diff --git a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild index b42262b77ba2..d00380e46b52 100644 --- a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild +++ b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2 SIFT" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW" IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})" diff --git a/media-gfx/optipng/optipng-0.7.5-r1.ebuild b/media-gfx/optipng/optipng-0.7.5-r1.ebuild index b3b452856b30..7e089e4025f3 100644 --- a/media-gfx/optipng/optipng-0.7.5-r1.ebuild +++ b/media-gfx/optipng/optipng-0.7.5-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="" RDEPEND="sys-libs/zlib diff --git a/media-gfx/qosmic/qosmic-1.5.0.ebuild b/media-gfx/qosmic/qosmic-1.5.0.ebuild index 534490c399c9..22933508b999 100644 --- a/media-gfx/qosmic/qosmic-1.5.0.ebuild +++ b/media-gfx/qosmic/qosmic-1.5.0.ebuild @@ -15,9 +15,15 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=">=dev-lang/lua-5.1.4 - >=media-gfx/flam3-3.0.1 - || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )" + dev-qt/qtgui:4 + >=media-gfx/flam3-3.0.1" DEPEND="${RDEPEND} virtual/pkgconfig" DOCS="changes.txt README" + +src_prepare() { + qt4-r2_src_prepare + + sed -i -e "/^CONFIG/s/uitools//" ${PN}.pro || die +} diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index 86937900092d..71000610f8b2 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -1,2 +1,3 @@ DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d SHA512 1e9f962bb9d27f17067eb662dabfc0a1aa0d06e16bec4bd28868124b468578d82f14f6d2c1f5de63d2cec57ca4584ec12d3b2c2b1de20f1199aece581453ebc5 WHIRLPOOL 19b939c920a3c157044c85a941debdc664d8781562fa3fc04f061b9d216b089be80edfd43479069382adf13e68160518fdbd5c84a5f4c506a46f8521d4ed2a1c +DIST sane-backends-1.0.25.tar.gz 5955016 SHA256 a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c SHA512 b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df WHIRLPOOL 557a3ac8785c0dd7f98aa55d5edaf76fb5b2b3c86a2431bb40b5b132ac05de3abcb250a8bcf8ed188868c4f124ce0a323a92a5a83c7b44a20908fe40ca323711 DIST sane-backends-git20150628.tar.gz 5765552 SHA256 4cfd1245df8ade75cbfaedec91b1daaea6d30e0736e5d2f9afcd0a56fc357711 SHA512 8e8160b2337502a0b77724ffaa5bd65a6daaa3fa5587f1b72e2714c9253e8130e96170d7f1de38210e17c5524cbe0953ff0464d29db194354d4e9b7249782eaf WHIRLPOOL d9b9a4f44cb3fcda9c8099d5ed3a9764e0a961f80ae1a89dda4e0ec8e6c24c830ad0feebd13c28af848c133a99e50d21c2f01269e434af31b17164a377edbbff diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch b/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch new file mode 100644 index 000000000000..217a4408e2ff --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch @@ -0,0 +1,14 @@ +do not let the tests try reading/locking usb hardware. we also disable +this because the test will abort() if no usb support is found at all. + +--- a/testsuite/sanei/sanei_usb_test.c ++++ b/testsuite/sanei/sanei_usb_test.c +@@ -832,6 +832,8 @@ main (int argc, char **argv) + int detected, opened, i; + SANE_Int dn[MAX_DEVICES]; + ++ return 77; ++ + #ifdef HAVE_LIBUSB + printf ("\n%s built with old libusb\n\n", argv[0]); + #endif diff --git a/media-gfx/sane-backends/sane-backends-1.0.25.ebuild b/media-gfx/sane-backends/sane-backends-1.0.25.ebuild new file mode 100644 index 000000000000..9604d38a5827 --- /dev/null +++ b/media-gfx/sane-backends/sane-backends-1.0.25.ebuild @@ -0,0 +1,347 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs + +# gphoto and v4l are handled by their usual USE flags. +# The pint backend was disabled because I could not get it to compile. +IUSE_SANE_BACKENDS=" + abaton + agfafocus + apple + artec + artec_eplus48u + as6e + avision + bh + canon + canon630u + canon_dr + canon_pp + cardscan + coolscan + coolscan2 + coolscan3 + dc210 + dc240 + dc25 + dell1600n_net + dmc + epjitsu + epson + epson2 + fujitsu + genesys + gt68xx + hp + hp3500 + hp3900 + hp4200 + hp5400 + hp5590 + hpljm1005 + hpsj5s + hs2p + ibm + kodak + kodakaio + kvs1025 + kvs20xx + kvs40xx + leo + lexmark + ma1509 + magicolor + matsushita + microtek + microtek2 + mustek + mustek_pp + mustek_usb + mustek_usb2 + nec + net + niash + p5 + pie + pixma + plustek + plustek_pp + pnm + qcam + ricoh + rts8891 + s9036 + sceptre + sharp + sm3600 + sm3840 + snapscan + sp15c + st400 + stv680 + tamarack + teco1 + teco2 + teco3 + test + u12 + umax + umax1220u + umax_pp + xerox_mfp" + +IUSE="avahi doc gphoto2 ipv6 nls snmp systemd threads usb v4l xinetd" + +for backend in ${IUSE_SANE_BACKENDS}; do + case ${backend} in + # Disable backends that require parallel ports as no one has those anymore. + canon_pp|hpsj5s|mustek_pp|\ + pnm) + IUSE+=" -sane_backends_${backend}" + ;; + mustek_usb2|kvs40xx) + IUSE+=" sane_backends_${backend}" + ;; + *) + IUSE+=" +sane_backends_${backend}" + esac +done + +REQUIRED_USE=" + sane_backends_mustek_usb2? ( threads ) + sane_backends_kvs40xx? ( threads ) +" + +DESCRIPTION="Scanner Access Now Easy - Backends" +HOMEPAGE="http://www.sane-project.org/" +case ${PV} in +9999) + EGIT_REPO_URI="git://anonscm.debian.org/sane/sane-backends.git" + inherit git-r3 autotools + ;; +*_pre*) + MY_P="${PN}-git${PV#*_pre}" + SRC_URI="http://www.sane-project.org/snapshots/${MY_P}.tar.gz + mirror://gentoo/${MY_P}.tar.gz" + S=${WORKDIR}/${MY_P} + ;; +*) + MY_P=${P} + FRS_ID="4146" + SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz" + ;; +esac + +LICENSE="GPL-2 public-domain" +SLOT="0" +if [[ ${PV} != "9999" ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +fi + +RDEPEND=" + sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + sane_backends_dell1600n_net? ( + >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] + >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}] + ) + avahi? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) + sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] ) + gphoto2? ( + >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}] + >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] + ) + v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) + xinetd? ( sys-apps/xinetd ) + snmp? ( net-analyzer/net-snmp ) + systemd? ( sys-apps/systemd:0= ) +" + +DEPEND="${RDEPEND} + v4l? ( sys-kernel/linux-headers ) + doc? ( + virtual/latex-base + dev-texlive/texlive-latexextra + ) + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + +# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) +RDEPEND="${RDEPEND} + !<sys-fs/udev-114" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/sane-config +) + +pkg_setup() { + enewgroup scanner + enewuser saned -1 -1 -1 scanner +} + +src_prepare() { + cat >> backend/dll.conf.in <<-EOF + # Add support for the HP-specific backend. Needs net-print/hplip installed. + hpaio + # Add support for the Epson-specific backend. Needs media-gfx/iscan installed. + epkowa + EOF + epatch "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch + epatch "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch + if [[ ${PV} == "9999" ]] ; then + mv configure.{in,ac} || die + AT_NOELIBTOOLIZE=yes eautoreconf + fi + + # Fix for "make check". Upstream sometimes forgets to update this. + local ver=$(./configure --version | awk '{print $NF; exit 0}') + sed -i \ + -e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \ + testsuite/tools/data/html* || die +} + +src_configure() { + append-flags -fno-strict-aliasing + + # if LINGUAS is set, just use the listed and supported localizations. + if [[ ${LINGUAS+set} == "set" ]]; then + mkdir -p po || die + strip-linguas -u po + printf '%s\n' ${LINGUAS} > po/LINGUAS + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + # the blank is intended - an empty string would result in building ALL backends. + local BACKENDS=" " + + use gphoto2 && BACKENDS="gphoto2" + use v4l && BACKENDS="${BACKENDS} v4l" + for backend in ${IUSE_SANE_BACKENDS}; do + if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then + BACKENDS="${BACKENDS} ${backend}" + fi + done + + local myconf=( + $(use_enable usb libusb_1_0) + $(multilib_native_use_with snmp) + ) + + # you can only enable this backend, not disable it... + if use sane_backends_pnm; then + myconf+=( --enable-pnm-backend ) + fi + if ! use doc; then + myconf+=( --disable-latex ) + fi + if use sane_backends_mustek_pp; then + myconf+=( --enable-parport-directio ) + fi + if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then + myconf+=( sane_cv_use_libieee1284=no ) + fi + + # relative path must be used for tests to work properly + ECONF_SOURCE=${S} \ + SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ + BACKENDS="${BACKENDS}" \ + econf \ + $(use_with gphoto2) \ + $(multilib_native_use_with systemd) \ + $(use_with v4l) \ + $(use_enable avahi) \ + $(use_enable ipv6) \ + $(use_enable nls translations) \ + $(use_enable threads pthread) \ + "${myconf[@]}" +} + +multilib_src_compile() { + emake VARTEXFONTS="${T}/fonts" + + if tc-is-cross-compiler; then + pushd "${BUILD_DIR}"/tools >/dev/null || die + + # The build system sucks and doesn't handle this properly. + # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 + tc-export_build_env BUILD_CC + ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ + -I. -I../include -I"${S}"/include \ + "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ + "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die + local dirs=( hal hotplug hotplug-ng udev ) + local targets=( + hal/libsane.fdi + hotplug/libsane.usermap + hotplug-ng/libsane.db + udev/libsane.rules + ) + mkdir -p "${dirs[@]}" || die + emake "${targets[@]}" + + popd >/dev/null + fi + + if use usb; then + sed -i -e '/^$/d' \ + tools/hotplug/libsane.usermap || die + fi +} + +multilib_src_install() { + emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ + docdir="${EPREFIX}"/usr/share/doc/${PF} + + if multilib_is_native_abi; then + if use usb; then + insinto /etc/hotplug/usb + doins tools/hotplug/libsane.usermap + fi + + udev_newrules tools/udev/libsane.rules 41-libsane.rules + insinto "/usr/share/pkgconfig" + doins tools/sane-backends.pc + fi +} + +multilib_src_install_all() { + keepdir /var/lib/lock/sane + fowners root:scanner /var/lib/lock/sane + fperms g+w /var/lib/lock/sane + dodir /etc/env.d + + if use usb; then + exeinto /etc/hotplug/usb + doexe tools/hotplug/libusbscanner + newdoc tools/hotplug/README README.hotplug + fi + + dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux + prune_libtool_files --all + if use xinetd; then + insinto /etc/xinetd.d + doins "${FILESDIR}"/saned + fi + + newinitd "${FILESDIR}"/saned.initd saned + newconfd "${FILESDIR}"/saned.confd saned +} + +pkg_postinst() { + if use xinetd; then + elog "If you want remote clients to connect, edit" + elog "/etc/sane.d/saned.conf and /etc/hosts.allow" + fi + + elog "If you are using a USB scanner, add all users who want" + elog "to access your scanner to the \"scanner\" group." +} diff --git a/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild index 190f4f7973e2..61a6e8fc0f35 100644 --- a/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild @@ -197,9 +197,10 @@ src_prepare() { "${FILESDIR}"/${PN}-1.0.24-automagic_systemd.patch \ "${FILESDIR}"/${PN}-1.0.24-systemd_pkgconfig.patch \ "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch \ - "${FILESDIR}"/${PN}-1.0.24-cross-compile.patch + "${FILESDIR}"/${PN}-1.0.24-cross-compile.patch \ + "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch # Fix for "make check". - sed -i -e 's/sane-backends 1.0.24git/sane-backends 1.0.24/' testsuite/tools/data/html* + sed -i -e 's/sane-backends 1.0.24/sane-backends 1.0.25git/' testsuite/tools/data/html* mv configure.{in,ac} || die AT_NOELIBTOOLIZE=yes eautoreconf } diff --git a/media-gfx/sane-backends/sane-backends-9999.ebuild b/media-gfx/sane-backends/sane-backends-9999.ebuild index b7c69fcecba7..9604d38a5827 100644 --- a/media-gfx/sane-backends/sane-backends-9999.ebuild +++ b/media-gfx/sane-backends/sane-backends-9999.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit autotools eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs +inherit eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs # gphoto and v4l are handled by their usual USE flags. # The pint backend was disabled because I could not get it to compile. @@ -121,7 +121,7 @@ HOMEPAGE="http://www.sane-project.org/" case ${PV} in 9999) EGIT_REPO_URI="git://anonscm.debian.org/sane/sane-backends.git" - inherit git-r3 + inherit git-r3 autotools ;; *_pre*) MY_P="${PN}-git${PV#*_pre}" @@ -131,7 +131,8 @@ case ${PV} in ;; *) MY_P=${P} - SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz" + FRS_ID="4146" + SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz" ;; esac @@ -142,18 +143,20 @@ if [[ ${PV} != "9999" ]] ; then fi RDEPEND=" - sane_backends_dc210? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] ) - sane_backends_dc240? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] ) - sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] - >=media-libs/tiff-3.9.7-r1[${MULTILIB_USEDEP}] ) + sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + sane_backends_dell1600n_net? ( + >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] + >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}] + ) avahi? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) - usb? ( >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] ) + usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}] - >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] + >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) xinetd? ( sys-apps/xinetd ) @@ -171,11 +174,7 @@ DEPEND="${RDEPEND} # We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) RDEPEND="${RDEPEND} - !<sys-fs/udev-114 - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-medialibs-20140508 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - )" + !<sys-fs/udev-114" MULTILIB_CHOST_TOOLS=( /usr/bin/sane-config @@ -193,12 +192,18 @@ src_prepare() { # Add support for the Epson-specific backend. Needs media-gfx/iscan installed. epkowa EOF - epatch "${FILESDIR}"/niash_array_index.patch \ - "${FILESDIR}"/${PN}-1.0.24-automagic_systemd.patch \ - "${FILESDIR}"/${PN}-1.0.24-systemd_pkgconfig.patch \ - "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch - mv configure.{in,ac} || die - AT_NOELIBTOOLIZE=yes eautoreconf + epatch "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch + epatch "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch + if [[ ${PV} == "9999" ]] ; then + mv configure.{in,ac} || die + AT_NOELIBTOOLIZE=yes eautoreconf + fi + + # Fix for "make check". Upstream sometimes forgets to update this. + local ver=$(./configure --version | awk '{print $NF; exit 0}') + sed -i \ + -e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \ + testsuite/tools/data/html* || die } src_configure() { diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest index 158e49c223b4..81f462755119 100644 --- a/media-libs/aubio/Manifest +++ b/media-libs/aubio/Manifest @@ -1,3 +1,2 @@ -DIST aubio-0.3.2.tar.gz 609006 SHA256 dc1387b048610a6141f523c27314b7a60bd299c3d6789c372445ddc6511512cd SHA512 b3d8445716c0cde02ee1e7b036864598ec7562d8a938a61f644c384d80e95601abcb6e713cdaab7b2613f6f4f27db1cfafa7c23824c61f504e83d11fefdee8fc WHIRLPOOL eeb732702bbb1682d32fde5cce4d17ae402292e1c19dac2e45600b268c955310683712952be8a1f72c08255c8c75c5beff9a127ab5b296883a64a4b5d9cb949a -DIST aubio-0.4.0.tar.bz2 277613 SHA256 49de9a06c819d4c4e0a9198a95eac374a1650083aef16c397004258bac2d33a2 SHA512 4f04ca8a873e45b6cdf84e3fb6028d9ad0abc0300daf83b1f7b08021355b1449f9c8d3a9b617bd479668e6b2c0c63c3ce69d61baeb6b0f621a84e850dedce8b6 WHIRLPOOL 432c0f555d21190838b573b90a68f625b267a399380ac79cb8687e8d2de53db1dff8c9ab235db446b315a98d9df729d45db7360b825e0ad37d6924b09788b1b9 DIST aubio-0.4.1.tar.bz2 288136 SHA256 25d7df0a9cd6366fda764a803424caddf5fb819fc75b42a7a03e1e6f8eb3c695 SHA512 f36800f1a0cbe72509e05d15d79759ed25975e92701804597ed4c9d93e27d5e7b908e0aa65819ce763882945123ea174a0825c7aacf9f9494f56d72de5b8308c WHIRLPOOL ea410de8ca5d81c8b6ff2f98a2353601a48435649e3c5931e41f9e7f4ccb8f9a8faf2156a3632de223638f1e91d608c5a77660fa00633a591488498c5e37fec6 +DIST aubio-0.4.2.tar.bz2 304216 SHA256 1cc58e0fed2b9468305b198ad06b889f228b797a082c2ede716dc30fcb4f8f1f SHA512 b57b6d147b305a264f0055726f76a8452f784b556a7fda911f056adbedd2855048e93c0e21b9f359e3f442f1542189aff0c214dd85141e2e06048a07f47703ff WHIRLPOOL 1fa0c877261c82d095144c05f753dd5ea303838d48627edf18af4275f8b4aba0dbe5806bb2504bc2c5a2c169d5bd8edd76bcb3cd990abd7b42842d0223918270 diff --git a/media-libs/aubio/aubio-0.3.2-r2.ebuild b/media-libs/aubio/aubio-0.3.2-r2.ebuild deleted file mode 100644 index 539474be6c62..000000000000 --- a/media-libs/aubio/aubio-0.3.2-r2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -PYTHON_DEPEND="2:2.6" - -inherit autotools eutils python - -DESCRIPTION="Library for audio labelling" -HOMEPAGE="http://aubio.piem.org" -SRC_URI="http://aubio.piem.org/pub/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ppc64 sparc x86" -IUSE="alsa doc examples jack lash static-libs" - -RDEPEND="sci-libs/fftw:3.0 - media-libs/libsndfile - media-libs/libsamplerate - alsa? ( media-libs/alsa-lib ) - jack? ( media-sound/jack-audio-connection-kit ) - lash? ( media-sound/lash )" -DEPEND="${RDEPEND} - >=dev-lang/swig-1.3.0 - virtual/pkgconfig - doc? ( app-doc/doxygen virtual/latex-base )" - -pkg_setup() { - DOCS=( AUTHORS ChangeLog README TODO ) - - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # disable automagic puredata wrt #369835 - sed -i -e '/AC_CHECK_HEADER/s:m_pd.h:dIsAbLe&:' configure.ac || die - - epatch \ - "${FILESDIR}"/${P}-multilib.patch \ - "${FILESDIR}"/${P}-numarray-gnuplot.patch - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable jack) \ - $(use_enable alsa) \ - $(use_enable lash) -} - -src_compile() { - default - - if use doc; then - export VARTEXFONTS="${T}/fonts" - cd "${S}"/doc - doxygen user.cfg - doxygen devel.cfg - doxygen examples.cfg - fi -} - -src_install() { - # `default` would be enough here if python.eclass supported EAPI=4 - emake DESTDIR="${D}" install || die - dodoc "${DOCS[@]}" - - doman doc/*.1 - if use doc; then - mv doc/user/html doc/user/user - dohtml -r doc/user/user - mv doc/devel/html doc/devel/devel - dohtml -r doc/devel/devel - mv doc/examples/html doc/examples/examples - dohtml -r doc/examples/examples - fi - - if use examples; then - # install dist_noinst_SCRIPTS from Makefile.am - insinto /usr/share/doc/${PF}/examples - doins python/aubio{compare-onset,plot-notes,filter-notes,web.py} || die - docinto examples - newdoc python/README README.examples - fi - - find "${ED}"usr -name '*.la' -exec rm -f {} + -} - -pkg_postinst() { python_mod_optimize aubio; } -pkg_postrm() { python_mod_cleanup aubio; } diff --git a/media-libs/aubio/aubio-0.4.0-r1.ebuild b/media-libs/aubio/aubio-0.4.2.ebuild index 669b939c24b3..9f5142f77429 100644 --- a/media-libs/aubio/aubio-0.4.0-r1.ebuild +++ b/media-libs/aubio/aubio-0.4.2.ebuild @@ -8,7 +8,7 @@ DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE='threads(+)' -inherit distutils-r1 waf-utils multilib +inherit distutils-r1 waf-utils multilib eutils DESCRIPTION="Library for audio labelling" HOMEPAGE="http://aubio.org/" @@ -17,10 +17,13 @@ SRC_URI="http://aubio.org//pub/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python" +IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python" RDEPEND=" - ffmpeg? ( virtual/ffmpeg ) + ffmpeg? ( + !libav? ( >=media-video/ffmpeg-2.6:0= ) + libav? ( >=media-video/libav-9:0= ) + ) fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) @@ -37,7 +40,6 @@ DOCS=( AUTHORS ChangeLog README.md ) PYTHON_SRC_DIR="${S}/python" src_prepare() { - sed -i -e "s:\/lib:\/$(get_libdir):" src/wscript_build || die sed -i -e "s:doxygen:doxygen_disabled:" wscript || die } diff --git a/media-libs/aubio/files/aubio-0.3.2-multilib.patch b/media-libs/aubio/files/aubio-0.3.2-multilib.patch deleted file mode 100644 index 7464fad6cacb..000000000000 --- a/media-libs/aubio/files/aubio-0.3.2-multilib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- python/aubio/Makefile.am -+++ python/aubio/Makefile.am -@@ -68,7 +68,7 @@ - -L$(top_builddir)/ext -laubioext \ - -L$(top_builddir)/src -laubio - --pkgpython_LTLIBRARIES = _aubiowrapper.la -+pkgpyexec_LTLIBRARIES = _aubiowrapper.la - - _aubiowrapper_la_LDFLAGS = -module -avoid-version $(AUBIO_LDFLAGS) - _aubiowrapper_la_SOURCES = aubio_wrap.c diff --git a/media-libs/aubio/files/aubio-0.3.2-numarray-gnuplot.patch b/media-libs/aubio/files/aubio-0.3.2-numarray-gnuplot.patch deleted file mode 100644 index 48d1e76d3530..000000000000 --- a/media-libs/aubio/files/aubio-0.3.2-numarray-gnuplot.patch +++ /dev/null @@ -1,332 +0,0 @@ -http://pkgs.fedoraproject.org/gitweb/?p=aubio.git;a=tree - ---- python/aubio/aubioclass.py -+++ python/aubio/aubioclass.py -@@ -42,8 +42,10 @@ - self.file = new_aubio_sndfile_wo(model.file,filename) - else: - self.file = new_aubio_sndfile_ro(filename) -+ if self.file == None: -+ raise(ValueError, "failed opening file %s" % filename) - def __del__(self): -- del_aubio_sndfile(self.file) -+ if self.file != None: del_aubio_sndfile(self.file) - def info(self): - aubio_sndfile_info(self.file) - def samplerate(self): -@@ -126,7 +128,7 @@ - channels=1,samplerate=44100.,omode=aubio_pitchm_freq,yinthresh=0.1): - self.pitchp = new_aubio_pitchdetection(bufsize,hopsize,channels, - samplerate,mode,omode) -- aubio_pitchdetection_set_yinthresh(self.pitchp,yinthresh) -+ aubio_pitchdetection_set_yinthresh(self.pitchp,yinthresh) - #self.filt = filter(srate,"adsgn") - def __del__(self): - del_aubio_pitchdetection(self.pitchp) ---- python/aubio/bench/onset.py -+++ python/aubio/bench/onset.py -@@ -111,7 +111,7 @@ - for i in self.vlist: - gd.append(i['GD']) - fp.append(i['FP']) -- d.append(Gnuplot.Data(fp, gd, with='linespoints', -+ d.append(Gnuplot.Data(fp, gd, with_='linespoints', - title="%s %s" % (plottitle,i['mode']) )) - - def plotplotroc(self,d,outplot=0,extension='ps'): -@@ -147,7 +147,7 @@ - for i in self.vlist: - x.append(i['prec']) - y.append(i['recl']) -- d.append(Gnuplot.Data(x, y, with='linespoints', -+ d.append(Gnuplot.Data(x, y, with_='linespoints', - title="%s %s" % (plottitle,i['mode']) )) - - def plotplotpr(self,d,outplot=0,extension='ps'): -@@ -172,7 +172,7 @@ - for i in self.vlist: - x.append(i['thres']) - y.append(i['dist']) -- d.append(Gnuplot.Data(x, y, with='linespoints', -+ d.append(Gnuplot.Data(x, y, with_='linespoints', - title="%s %s" % (plottitle,i['mode']) )) - - def plotplotfmeas(self,d,outplot="",extension='ps', title="F-measure"): -@@ -205,7 +205,7 @@ - for i in self.vlist: - x.append(i[var]) - y.append(i['dist']) -- d.append(Gnuplot.Data(x, y, with='linespoints', -+ d.append(Gnuplot.Data(x, y, with_='linespoints', - title="%s %s" % (plottitle,i['mode']) )) - - def plotplotfmeasvar(self,d,var,outplot="",extension='ps', title="F-measure"): -@@ -244,7 +244,7 @@ - total = v['Torig'] - for i in range(len(per)): per[i] /= total/100. - -- d.append(Gnuplot.Data(val, per, with='fsteps', -+ d.append(Gnuplot.Data(val, per, with_='fsteps', - title="%s %s" % (plottitle,v['mode']) )) - #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean)) - #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean)) -@@ -275,7 +275,7 @@ - total = v['Torig'] - for i in range(len(per)): per[i] /= total/100. - -- d.append(Gnuplot.Data(val, per, with='fsteps', -+ d.append(Gnuplot.Data(val, per, with_='fsteps', - title="%s %s" % (plottitle,v['mode']) )) - #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean)) - #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean)) ---- python/aubio/gnuplot.py -+++ python/aubio/gnuplot.py -@@ -23,7 +23,7 @@ - - def audio_to_array(filename): - import aubio.aubioclass -- import numarray -+ from numpy import arange - hopsize = 2048 - filei = aubio.aubioclass.sndfile(filename) - framestep = 1/(filei.samplerate()+0.) -@@ -39,7 +39,7 @@ - while (curpos < readsize): - data.append(myvec.get(curpos,i)) - curpos+=1 -- time = numarray.arange(len(data))*framestep -+ time = arange(len(data))*framestep - return time,data - - def plot_audio(filenames, g, options): -@@ -143,29 +143,29 @@ - - def downsample_audio(time,data,maxpoints=10000): - """ resample audio data to last only maxpoints """ -- import numarray -+ from numpy import array, resize - length = len(time) - downsample = length/maxpoints - if downsample == 0: downsample = 1 -- x = numarray.array(time).resize(length)[0:-1:downsample] -- y = numarray.array(data).resize(length)[0:-1:downsample] -+ x = resize(array(time),length)[0:-1:downsample] -+ y = resize(array(data),length)[0:-1:downsample] - return x,y - - def make_audio_plot(time,data,maxpoints=10000): - """ create gnuplot plot from an audio file """ - import Gnuplot, Gnuplot.funcutils - x,y = downsample_audio(time,data,maxpoints=maxpoints) -- return Gnuplot.Data(x,y,with='lines') -+ return Gnuplot.Data(x,y,with_='lines') - - def make_audio_envelope(time,data,maxpoints=10000): - """ create gnuplot plot from an audio file """ -- import numarray -+ from numpy import array - import Gnuplot, Gnuplot.funcutils - bufsize = 500 -- x = [i.mean() for i in numarray.array(time).resize(len(time)/bufsize,bufsize)] -- y = [i.mean() for i in numarray.array(data).resize(len(time)/bufsize,bufsize)] -+ x = [i.mean() for i in resize(array(time), (len(time)/bufsize,bufsize))] -+ y = [i.mean() for i in resize(array(data), (len(time)/bufsize,bufsize))] - x,y = downsample_audio(x,y,maxpoints=maxpoints) -- return Gnuplot.Data(x,y,with='lines') -+ return Gnuplot.Data(x,y,with_='lines') - - def gnuplot_addargs(parser): - """ add common gnuplot argument to OptParser object """ ---- python/aubio/onsetcompare.py -+++ python/aubio/onsetcompare.py -@@ -106,7 +106,7 @@ - return orig, missed, merged, expc, bad, doubled, l, labs - - def notes_roc (la, lb, eps): -- from numarray import transpose, add, resize -+ from numpy import transpose, add, resize - """ creates a matrix of size len(la)*len(lb) then look for hit and miss - in it within eps tolerance windows """ - gdn,fpw,fpg,fpa,fdo,fdp = 0,0,0,0,0,0 ---- python/aubio/task/beat.py -+++ python/aubio/task/beat.py -@@ -247,7 +247,7 @@ - - def plot(self,oplots,results): - import Gnuplot -- oplots.append(Gnuplot.Data(results,with='linespoints',title="auto")) -+ oplots.append(Gnuplot.Data(results,with_='linespoints',title="auto")) - - def plotplot(self,wplot,oplots,outplot=None,extension=None,xsize=1.,ysize=1.,spectro=False): - import Gnuplot -@@ -258,5 +258,5 @@ - #f = make_audio_plot(time,data) - - g = gnuplot_create(outplot=outplot, extension=extension) -- oplots = [Gnuplot.Data(self.gettruth(),with='linespoints',title="orig")] + oplots -+ oplots = [Gnuplot.Data(self.gettruth(),with_='linespoints',title="orig")] + oplots - g.plot(*oplots) ---- python/aubio/task/notes.py -+++ python/aubio/task/notes.py -@@ -92,18 +92,17 @@ - return now, onset, freq, ifreq - - def plot(self,now,onset,freq,ifreq,oplots): -- import numarray - import Gnuplot - -- oplots.append(Gnuplot.Data(now,freq,with='lines', -+ oplots.append(Gnuplot.Data(now,freq,with_='lines', - title=self.params.pitchmode)) -- oplots.append(Gnuplot.Data(now,ifreq,with='lines', -+ oplots.append(Gnuplot.Data(now,ifreq,with_='lines', - title=self.params.pitchmode)) - - temponsets = [] - for i in onset: - temponsets.append(i*1000) -- oplots.append(Gnuplot.Data(now,temponsets,with='impulses', -+ oplots.append(Gnuplot.Data(now,temponsets,with_='impulses', - title=self.params.pitchmode)) - - def plotplot(self,wplot,oplots,outplot=None,multiplot = 0): -@@ -117,10 +116,10 @@ - # check if ground truth exists - #timet,pitcht = self.gettruth() - #if timet and pitcht: -- # oplots = [Gnuplot.Data(timet,pitcht,with='lines', -+ # oplots = [Gnuplot.Data(timet,pitcht,with_='lines', - # title='ground truth')] + oplots - -- t = Gnuplot.Data(0,0,with='impulses') -+ t = Gnuplot.Data(0,0,with_='impulses') - - g = gnuplot_init(outplot) - g('set title \'%s\'' % (re.sub('.*/','',self.input))) ---- python/aubio/task/onset.py -+++ python/aubio/task/onset.py -@@ -92,7 +92,7 @@ - import Gnuplot, Gnuplot.funcutils - import aubio.txtfile - import os.path -- import numarray -+ from numpy import arange, array, ones - from aubio.onsetcompare import onset_roc - - x1,y1,y1p = [],[],[] -@@ -102,8 +102,8 @@ - self.lenofunc = len(ofunc) - self.maxofunc = max(ofunc) - # onset detection function -- downtime = numarray.arange(len(ofunc))*self.params.step -- oplot.append(Gnuplot.Data(downtime,ofunc,with='lines',title=self.params.onsetmode)) -+ downtime = arange(len(ofunc))*self.params.step -+ oplot.append(Gnuplot.Data(downtime,ofunc,with_='lines',title=self.params.onsetmode)) - - # detected onsets - if not nplot: -@@ -111,11 +111,11 @@ - x1.append(i[0]*self.params.step) - y1.append(self.maxofunc) - y1p.append(-self.maxofunc) -- #x1 = numarray.array(onsets)*self.params.step -- #y1 = self.maxofunc*numarray.ones(len(onsets)) -+ #x1 = array(onsets)*self.params.step -+ #y1 = self.maxofunc*ones(len(onsets)) - if x1: -- oplot.append(Gnuplot.Data(x1,y1,with='impulses')) -- wplot.append(Gnuplot.Data(x1,y1p,with='impulses')) -+ oplot.append(Gnuplot.Data(x1,y1,with_='impulses')) -+ wplot.append(Gnuplot.Data(x1,y1p,with_='impulses')) - - oplots.append((oplot,self.params.onsetmode,self.maxofunc)) - -@@ -126,9 +126,9 @@ - self.title = "" #"(no ground truth)" - else: - t_onsets = aubio.txtfile.read_datafile(datafile) -- x2 = numarray.array(t_onsets).resize(len(t_onsets)) -- y2 = self.maxofunc*numarray.ones(len(t_onsets)) -- wplot.append(Gnuplot.Data(x2,y2,with='impulses')) -+ x2 = array(t_onsets).resize(len(t_onsets)) -+ y2 = self.maxofunc*ones(len(t_onsets)) -+ wplot.append(Gnuplot.Data(x2,y2,with_='impulses')) - - tol = 0.050 - ---- python/aubio/task/pitch.py -+++ python/aubio/task/pitch.py -@@ -156,7 +156,7 @@ - - time = [ (i+self.params.pitchdelay)*self.params.step for i in range(len(pitch)) ] - pitch = [aubio_freqtomidi(i) for i in pitch] -- oplots.append(Gnuplot.Data(time,pitch,with='lines', -+ oplots.append(Gnuplot.Data(time,pitch,with_='lines', - title=self.params.pitchmode)) - titles.append(self.params.pitchmode) - -@@ -170,7 +170,7 @@ - if truth: - timet,pitcht = self.gettruth() - if timet and pitcht: -- oplots = [Gnuplot.Data(timet,pitcht,with='lines', -+ oplots = [Gnuplot.Data(timet,pitcht,with_='lines', - title='ground truth')] + oplots - - g = gnuplot_create(outplot=outplot, extension=extension) ---- python/aubiofilter-notes -+++ python/aubiofilter-notes -@@ -78,7 +78,7 @@ - - from aubio import notefilter,txtfile,gnuplot - """ load midi and raw data """ -- from numarray import array -+ from numpy import array - notelist = array(txtfile.read_datafile(input)) - """ filter it out """ - notelist_filtered = notefilter.segraw_onsets4(notelist,winlength,eps) ---- python/aubionotes -+++ python/aubionotes -@@ -4,7 +4,6 @@ - - import aubio.aubioclass - import aubio.median -- #from numarray import around - from math import floor - hopsize = 512 - bufsize = 4096 ---- python/aubioplot-notes -+++ python/aubioplot-notes -@@ -18,7 +18,7 @@ - def main (sysargs) : - from aubio.txtfile import read_datafile - from aubio.gnuplot import plotnote,plotnote_do -- from numarray import array -+ from numpy import array - filein,fileout = parse_args(sysargs) - #print 'checking', fileerr, 'against', fileorg - """ load midi and raw data """ ---- python/aubioweb.py -+++ python/aubioweb.py -@@ -11,7 +11,7 @@ - sndfile-programs (sndfile-info) - vorbis-tools (oggenc) - python-gnuplot --python-numarray -+python-numpy - - Try the command line tools in aubio/python to test your installation. - ---- python/aubio/plot/keyboard.py -+++ python/aubio/plot/keyboard.py -@@ -30,8 +30,8 @@ - yb = [y0+(y1-y0)*2/3. for i in range(len(xb))] - ybdelta = [(y1-y0)*1/3. for i in range(len(xb))] - -- whites = Gnuplot.Data(xw,yw,xwdelta,ywdelta,with = 'boxxyerrorbars') -- blacks = Gnuplot.Data(xb,yb,xbdelta,ybdelta,with = 'boxxyerrorbars fill solid') -+ whites = Gnuplot.Data(xw,yw,xwdelta,ywdelta,with_ = 'boxxyerrorbars') -+ blacks = Gnuplot.Data(xb,yb,xbdelta,ybdelta,with_ = 'boxxyerrorbars fill solid') - - return blacks,whites - diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest index 11f85227bf5d..fcdbdff6a0c2 100644 --- a/media-libs/chromaprint/Manifest +++ b/media-libs/chromaprint/Manifest @@ -1,4 +1 @@ -DIST chromaprint-0.6.tar.gz 542366 SHA256 5d9b82da226450c14e43482371a1b2a178e2604ab5b2e9259f33b1b461ee9d63 SHA512 8786c84877663d991d3114776c92b47eb4d813a338e312956a54c444ff07bca05692a019145c722bcbfadd8c2e4c2b6c5ccb0eb784d96d41f58b143e8d57db24 WHIRLPOOL 2ed6ccb8e36393afae971873455bb38bd801daf94912badeca067162a5ab467215799439bfb3afcb51bd302435bcd479b9a991d4f4db90c4783e6a43fe94b09f -DIST chromaprint-0.7.tar.gz 543811 SHA256 4e52c3fd443c91a5c429557753d4ba3f9d31d183810412c0d8600892f3975501 SHA512 2ac03f80888d6c12dd05c20adc82e0f2c9e6bf5edc099d7c7b719b8cb353151fb04b78f5c7bca672d5fe8357a791e86fdea7b6952a0d64c346c079548ebfcd38 WHIRLPOOL 34c5cb7c38dc0e4924e068ff0a695e571fdd2233046ef6ea84e9e0e27e6bf9f5eaedceb79c2f8120e9ac6eb30ace3bc9e15ba59027cd498426e7f94536e2da84 -DIST chromaprint-1.1.tar.gz 542360 SHA256 6b14d7ea4964581b73bd3f8038c8857c01e446421c1ae99cbbf64de26b47cd12 SHA512 3d439dfca979e2babc8d2c171b5cb36fd0a5d3b7475e02a0f8bae436f7096e189674b640119f0dccf7cc2cd214bd8674d46b018952f1e3e93ddc0ba19b5155f9 WHIRLPOOL 726c7710f7bd1c138d7ebd1de263a0e214cbd79faf60e35034a60cfd68a9d3b4e52fc1cc93ce4dc7d39683e3a5ac1d7e9bd6c8046cdb5cece83b9c2fbf4971b5 DIST chromaprint-1.2.tar.gz 529646 SHA256 822b8949a322ac04c6f8a3ed78f5e689bcc493c6ca0972bf627c913c8430031a SHA512 dc61db8894a20df3d7e7317cd7cd97148c19be5854dd66409341cb8e47c045e1c632b254e14a869279983a5af2cc6f9effea21b77a63dff729511e6144439cbb WHIRLPOOL b2efb45c23e950b6a4d95c078bed15b03ef35e423b106428a7607034276b343b8c223ffa71e021846ed48f535663e062ae8042d281d769a04effc9afd8a600dd diff --git a/media-libs/chromaprint/chromaprint-0.6.ebuild b/media-libs/chromaprint/chromaprint-0.6.ebuild deleted file mode 100644 index 1399c0cc13ca..000000000000 --- a/media-libs/chromaprint/chromaprint-0.6.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -inherit cmake-utils - -DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints" -HOMEPAGE="http://acoustid.org/chromaprint" -SRC_URI="mirror://github/lalinsky/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test tools" - -# note: use ffmpeg instead of fftw because it's recommended and required for tools -RDEPEND=">=virtual/ffmpeg-0.6 - tools? ( >=media-libs/taglib-1.6 )" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest ) - tools? ( dev-libs/boost )" - -DOCS="NEWS.txt README.txt" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build tools EXAMPLES) - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use_build tools) - -DWITH_AVFFT=ON - ) - - cmake-utils_src_configure -} - -src_test() { - cd "${CMAKE_BUILD_DIR}" || die - emake check -} - -src_install() { - cmake-utils_src_install - use tools && dobin "${CMAKE_BUILD_DIR}"/tools/fpcollect -} diff --git a/media-libs/chromaprint/chromaprint-0.7.ebuild b/media-libs/chromaprint/chromaprint-0.7.ebuild deleted file mode 100644 index 062c6e0a0f5b..000000000000 --- a/media-libs/chromaprint/chromaprint-0.7.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -inherit cmake-utils - -DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints" -HOMEPAGE="http://acoustid.org/chromaprint" -SRC_URI="mirror://github/lalinsky/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="test tools" - -# note: use ffmpeg instead of fftw because it's recommended and required for tools -RDEPEND=">=virtual/ffmpeg-0.10 - tools? ( >=media-libs/taglib-1.6 )" -DEPEND="${RDEPEND} - test? ( - dev-cpp/gtest - dev-libs/boost - ) - tools? ( dev-libs/boost )" - -DOCS="NEWS.txt README.txt" - -PATCHES=( "${FILESDIR}"/${P}-boost.patch - "${FILESDIR}"/${P}-ffmpeg.patch - "${FILESDIR}"/${P}-libav9.patch ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build tools EXAMPLES) - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use_build tools) - -DWITH_AVFFT=ON - ) - - cmake-utils_src_configure -} - -src_test() { - cd "${CMAKE_BUILD_DIR}" || die - emake check -} - -src_install() { - cmake-utils_src_install - use tools && dobin "${CMAKE_BUILD_DIR}"/tools/fpcollect -} diff --git a/media-libs/chromaprint/chromaprint-1.1.ebuild b/media-libs/chromaprint/chromaprint-1.1.ebuild deleted file mode 100644 index 80080d956f53..000000000000 --- a/media-libs/chromaprint/chromaprint-1.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints" -HOMEPAGE="http://acoustid.org/chromaprint" -SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-fbsd" -IUSE="test tools" - -# note: use ffmpeg instead of fftw because it's recommended and required for tools -RDEPEND=" - >=virtual/ffmpeg-0.10 - tools? ( >=media-libs/taglib-1.6 )" -DEPEND="${RDEPEND} - test? ( - dev-cpp/gtest - dev-libs/boost - ) - tools? ( dev-libs/boost )" - -DOCS="NEWS.txt README.txt" - -PATCHES=( - "${FILESDIR}"/${PN}-0.7-ffmpeg.patch - "${FILESDIR}"/${P}-gtest.patch - "${FILESDIR}"/${P}-ffmpeg2.patch - "${FILESDIR}"/${P}-libav_build_fix_for_tools.patch -) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build tools EXAMPLES) - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use_build tools) - -DWITH_AVFFT=ON - ) - cmake-utils_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - emake check -} - -src_install() { - cmake-utils_src_install - use tools && dobin "${BUILD_DIR}"/tools/fpcollect -} diff --git a/media-libs/chromaprint/chromaprint-1.2-r1.ebuild b/media-libs/chromaprint/chromaprint-1.2-r1.ebuild new file mode 100644 index 000000000000..5bbc7ecd9fb3 --- /dev/null +++ b/media-libs/chromaprint/chromaprint-1.2-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit cmake-multilib + +DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints" +HOMEPAGE="http://acoustid.org/chromaprint" +SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd" +IUSE="libav test tools" + +# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools +RDEPEND=" + libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] ) + !libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + test? ( + dev-cpp/gtest[${MULTILIB_USEDEP}] + dev-libs/boost[${MULTILIB_USEDEP}] + )" + +DOCS="NEWS.txt README.md" + +PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch "${FILESDIR}"/${P}-ffmpeg29.patch ) + +multilib_src_configure() { + local mycmakeargs=( + "-DBUILD_EXAMPLES=$(multilib_native_usex tools ON OFF)" + "-DBUILD_TESTS=$(usex test ON OFF)" + -DWITH_AVFFT=ON + ) + cmake-utils_src_configure +} + +multilib_src_test() { + emake check +} diff --git a/media-libs/chromaprint/chromaprint-1.2.ebuild b/media-libs/chromaprint/chromaprint-1.2.ebuild index 670ff3859c7b..c0de492549fb 100644 --- a/media-libs/chromaprint/chromaprint-1.2.ebuild +++ b/media-libs/chromaprint/chromaprint-1.2.ebuild @@ -17,7 +17,7 @@ IUSE="libav test tools" # note: use ffmpeg or libav instead of fftw because it's recommended and required for tools RDEPEND=" libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) + !libav? ( >=media-video/ffmpeg-2.6:0= ) " DEPEND="${RDEPEND} test? ( @@ -27,7 +27,7 @@ DEPEND="${RDEPEND} DOCS="NEWS.txt README.md" -PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch ) +PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch "${FILESDIR}"/${P}-ffmpeg29.patch ) src_configure() { local mycmakeargs=( diff --git a/media-libs/chromaprint/files/chromaprint-0.7-boost.patch b/media-libs/chromaprint/files/chromaprint-0.7-boost.patch deleted file mode 100644 index 46df857689de..000000000000 --- a/media-libs/chromaprint/files/chromaprint-0.7-boost.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- chromaprint-0.7/tests/CMakeLists.txt -+++ chromaprint-0.7/tests/CMakeLists.txt -@@ -1,4 +1,5 @@ - include_directories( -+ ${Boost_INCLUDE_DIRS} - ${GTEST_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR}/../src - ) diff --git a/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch b/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch deleted file mode 100644 index f51e7794b6d8..000000000000 --- a/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=435856 -https://raw.github.com/pld-linux/chromaprint/master/chromaprint-ffmpeg.patch - ---- chromaprint-0.7/src/ext/ffmpeg_decoder.h.orig 2012-09-05 20:05:36.000000000 +0200 -+++ chromaprint-0.7/src/ext/ffmpeg_decoder.h 2012-10-10 17:59:58.632685943 +0200 -@@ -80,7 +80,7 @@ - avcodec_close(m_codec_ctx); - } - if (m_format_ctx) { -- av_close_input_file(m_format_ctx); -+ avformat_close_input(&m_format_ctx); - } - //av_audio_convert_free(m_convert_ctx); - av_free(m_buffer2); -@@ -89,12 +89,12 @@ - - inline bool Decoder::Open() - { -- if (av_open_input_file(&m_format_ctx, m_file_name.c_str(), NULL, 0, NULL) != 0) { -+ if (avformat_open_input(&m_format_ctx, m_file_name.c_str(), NULL, NULL) != 0) { - m_error = "Couldn't open the file." + m_file_name; - return false; - } - -- if (av_find_stream_info(m_format_ctx) < 0) { -+ if (avformat_find_stream_info(m_format_ctx, NULL) < 0) { - m_error = "Couldn't find stream information in the file."; - return false; - } -@@ -129,11 +129,11 @@ - return false; - } - -- if (m_codec_ctx->sample_fmt != SAMPLE_FMT_S16) { -+ if (m_codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) { - m_error = "Unsupported sample format.\n"; - return false; - } -- /*m_convert_ctx = av_audio_convert_alloc(SAMPLE_FMT_S16, 1, -+ /*m_convert_ctx = av_audio_convert_alloc(AV_SAMPLE_FMT_S16, 1, - m_codec_ctx->sample_fmt, 1, - NULL, 0); - if (!m_convert_ctx) { diff --git a/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch b/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch deleted file mode 100644 index c52097056377..000000000000 --- a/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -burN chromaprint-0.7.orig//src/fft_lib_avfft.h chromaprint-0.7/src/fft_lib_avfft.h ---- chromaprint-0.7.orig//src/fft_lib_avfft.h 2012-09-05 20:05:36.000000000 +0200 -+++ chromaprint-0.7/src/fft_lib_avfft.h 2013-02-16 17:34:08.682624779 +0100 -@@ -25,6 +25,7 @@ - extern "C" { - #include <libavcodec/avcodec.h> - #include <libavcodec/avfft.h> -+#include <libavutil/mem.h> - } - #include "combined_buffer.h" - -diff -burN chromaprint-0.7.orig/examples/fpcalc.c chromaprint-0.7/work/chromaprint-0.7/examples/fpcalc.c ---- chromaprint-0.7.orig/examples/fpcalc.c 2012-09-05 20:05:36.000000000 +0200 -+++ chromaprint-0.7/examples/fpcalc.c 2013-02-16 17:40:09.947611629 +0100 -@@ -42,7 +42,7 @@ - goto done; - } - -- if (av_find_stream_info(format_ctx) < 0) { -+ if (avformat_find_stream_info(format_ctx, NULL) < 0) { - fprintf(stderr, "ERROR: couldn't find stream information in the file\n"); - goto done; - } -@@ -65,7 +65,7 @@ - goto done; - } - -- if (avcodec_open(codec_ctx, codec) < 0) { -+ if (avcodec_open2(codec_ctx, codec, NULL) < 0) { - fprintf(stderr, "ERROR: couldn't open the codec\n"); - goto done; - } -diff -burN chromaprint-0.7.orig/src/ext/ffmpeg_decoder.h chromaprint-0.7/src/ext/ffmpeg_decoder.h ---- chromaprint-0.7.orig/src/ext/ffmpeg_decoder.h 2013-02-16 17:49:06.799592088 +0100 -+++ chromaprint-0.7/src/ext/ffmpeg_decoder.h 2013-02-16 17:49:54.037590369 +0100 -@@ -124,7 +124,7 @@ - return false; - } - -- if (avcodec_open(m_codec_ctx, codec) < 0) { -+ if (avcodec_open2(m_codec_ctx, codec, NULL) < 0) { - m_error = "Couldn't open the codec."; - return false; - } diff --git a/media-libs/chromaprint/files/chromaprint-1.0-libav9.patch b/media-libs/chromaprint/files/chromaprint-1.0-libav9.patch deleted file mode 100644 index e8167903471f..000000000000 --- a/media-libs/chromaprint/files/chromaprint-1.0-libav9.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- chromaprint-1.0.orig/src/ext/ffmpeg_decoder.h 2013-11-03 17:32:04.347686878 +0800 -+++ chromaprint-1.0/src/ext/ffmpeg_decoder.h 2013-11-03 17:32:41.082686494 +0800 -@@ -124,7 +124,7 @@ - return false; - } - -- if (avcodec_open(m_codec_ctx, codec) < 0) { -+ if (avcodec_open2(m_codec_ctx, codec, NULL) < 0) { - m_error = "Couldn't open the codec."; - return false; - } diff --git a/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch b/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch deleted file mode 100644 index 2a68de3105dc..000000000000 --- a/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- chromaprint-1.1/src/ext/ffmpeg_decoder.h -+++ chromaprint-1.1/src/ext/ffmpeg_decoder.h -@@ -28,6 +28,10 @@ - } - #include "audio_consumer.h" - -+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE -+# define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 -+#endif -+ - class Decoder - { - public: diff --git a/media-libs/chromaprint/files/chromaprint-1.1-libav_build_fix_for_tools.patch b/media-libs/chromaprint/files/chromaprint-1.1-libav_build_fix_for_tools.patch deleted file mode 100644 index b53f79838091..000000000000 --- a/media-libs/chromaprint/files/chromaprint-1.1-libav_build_fix_for_tools.patch +++ /dev/null @@ -1,59 +0,0 @@ -http://bugs.gentoo.org/498194 -http://bitbucket.org/acoustid/chromaprint/commits/90822f6eee64da2941c9cbd9cd41a9664fead1d4 - -From 90822f6eee64da2941c9cbd9cd41a9664fead1d4 Mon Sep 17 00:00:00 2001 -From: Urs Fleisch <ufleisch@users.sourceforge.net> -Date: Sat, 28 Dec 2013 09:47:31 +0100 -Subject: [PATCH] Build fpcalc if neither HAVE_SWRESAMPLE nor HAVE_AVRESAMPLE - defined, issue #11. - ---- - examples/fpcalc.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/examples/fpcalc.c b/examples/fpcalc.c -index a4b0ff9..e73e358 100644 ---- a/examples/fpcalc.c -+++ b/examples/fpcalc.c -@@ -33,6 +33,8 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name - SwrContext *convert_ctx = NULL; - #elif defined(HAVE_AVRESAMPLE) - AVAudioResampleContext *convert_ctx = NULL; -+#else -+ void *convert_ctx = NULL; - #endif - int max_dst_nb_samples = 0, dst_linsize = 0; - uint8_t *dst_data[1] = { NULL }; -@@ -75,6 +77,7 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name - goto done; - } - -+#if defined(HAVE_SWRESAMPLE) || defined(HAVE_AVRESAMPLE) - if (codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) { - int64_t channel_layout = codec_ctx->channel_layout; - if (!channel_layout) { -@@ -111,6 +114,7 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name - } - #endif - } -+#endif - - if (stream->duration != AV_NOPTS_VALUE) { - *duration = stream->time_base.num * stream->duration / stream->time_base.den; -@@ -155,10 +159,11 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name - max_dst_nb_samples = frame->nb_samples; - } - #if defined(HAVE_SWRESAMPLE) -- if (swr_convert(convert_ctx, dst_data, frame->nb_samples, (const uint8_t **)frame->data, frame->nb_samples) < 0) { -+ if (swr_convert(convert_ctx, dst_data, frame->nb_samples, (const uint8_t **)frame->data, frame->nb_samples) < 0) - #elif defined(HAVE_AVRESAMPLE) -- if (avresample_convert(convert_ctx, dst_data, 0, frame->nb_samples, (uint8_t **)frame->data, 0, frame->nb_samples) < 0) { -+ if (avresample_convert(convert_ctx, dst_data, 0, frame->nb_samples, (uint8_t **)frame->data, 0, frame->nb_samples) < 0) - #endif -+ { - fprintf(stderr, "ERROR: couldn't convert the audio\n"); - goto done; - } --- -1.9.rc2.211.gd198f5d - diff --git a/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch b/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch new file mode 100644 index 000000000000..6910f243b2e0 --- /dev/null +++ b/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch @@ -0,0 +1,48 @@ +commit 37092d380a28abcc63fa120499030a0f2b7df80f +Author: Rodger Combs <rodger.combs@gmail.com> +Date: Fri Oct 2 14:48:01 2015 -0500 + + fpcalc: remove uses of deprecated lavc APIs + +Index: chromaprint-1.2/examples/fpcalc.c +=================================================================== +--- chromaprint-1.2.orig/examples/fpcalc.c ++++ chromaprint-1.2/examples/fpcalc.c +@@ -17,10 +17,6 @@ + #define MAX(a, b) ((a) > (b) ? (a) : (b)) + #define MIN(a, b) ((a) < (b) ? (a) : (b)) + +-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0) +-#define avcodec_free_frame av_freep +-#endif +- + int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name, int max_length, int *duration) + { + int ok = 0, remaining, length, consumed, codec_ctx_opened = 0, got_frame, stream_index; +@@ -131,7 +127,7 @@ int decode_audio_file(ChromaprintContext + remaining = max_length * codec_ctx->channels * codec_ctx->sample_rate; + chromaprint_start(chromaprint_ctx, codec_ctx->sample_rate, codec_ctx->channels); + +- frame = avcodec_alloc_frame(); ++ frame = av_frame_alloc(); + + while (1) { + if (av_read_frame(format_ctx, &packet) < 0) { +@@ -139,7 +135,7 @@ int decode_audio_file(ChromaprintContext + } + + if (packet.stream_index == stream_index) { +- avcodec_get_frame_defaults(frame); ++ av_frame_unref(frame); + + got_frame = 0; + consumed = avcodec_decode_audio4(codec_ctx, frame, &got_frame, &packet); +@@ -196,7 +192,7 @@ finish: + + done: + if (frame) { +- avcodec_free_frame(&frame); ++ av_frame_free(&frame); + } + if (dst_data[0]) { + av_freep(&dst_data[0]); diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest index 8fbbf6e4548f..f78cfbefe7d8 100644 --- a/media-libs/freeverb3/Manifest +++ b/media-libs/freeverb3/Manifest @@ -1,3 +1,4 @@ DIST freeverb3-2.5.13.tar.gz 6143981 SHA256 9c29adc15a94e6140e52f0b1a5a60923a8e9a3beb21ada4182363c60b25126dd SHA512 9ebe020790fdc41fb1d766757b7ea8a2e93e6112e97ada620698fd36f8f471b6ea52e423371490a2b24328354e6b4d2f2f35f345a3bec68a4d55de929199dfb9 WHIRLPOOL 4bf2f6f634492a621eb541064bec6dc2c5afa8b303311c34402b46f5ca82ee7d6162430414f92e11042fbc77e990a25b150d67e6352207d29b1bca5163aeb5bb DIST freeverb3-2.6.6.tar.gz 6208119 SHA256 55c0585c8d53df1bcc5dcb6ffd26fc123583a239c3f064229af71e5f8dca6816 SHA512 755c95ef184487af7e01ea32765b77eba6ffc9738aece3d64f9da019f720075fb7907341689a8adbe81d6fd265a82436da578df2d98ff2e82803a064df4c5dc1 WHIRLPOOL 77795333dc30f3aca514a3a16d8760373bf1ac34fdcc1f3feef3d3bd3071fedf1dcb73ca85b3bf27666c0fba176d86607d68d4c0d5d37a2cfa42a5417d282bb4 DIST freeverb3-3.1.1.tar.xz 6067288 SHA256 6327b6809f4c15dfc74331f0b88af8d92f593d1bf8eabee15ec2a98217aa8d93 SHA512 83feb43a6c178b82958089a3527788f1426bc76e5a86d353df5818a0ebeb1656742e225d4e3eb3187b768169af1a6f2716215408fdb30869452d10d64a967516 WHIRLPOOL e2ac3bec3f2ba90bfc8f25d9c09290dcdc5e43e4528182cbf112614f9d86e97f27beb13a4869cfe5ac10a29af47e4ed9ab64a064189d57ac1d4282a38442b935 +DIST freeverb3-3.1.2_pre20151102.tar.gz 8416503 SHA256 759ba987a6d696a34ce9a5a69ba87687bf678a93de3f49af3ad19df638379ae0 SHA512 ccdcf8832155e479164bb6a4cb2f830db83bf55b8c797ba96686abe8392e7d88f55c6ab8bcb2db447ec3ab4f5cca05e09ec0753a61452c01a32ff9f4008b3536 WHIRLPOOL a61cc9d301ddbbede0b9100219d93523ff7cece133f4402b1d82c2c9008d9cd7b2f89a1b94f8f638a298efd5bdc12eed3296618bcd9ab2cee9332cec733c8ea4 diff --git a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild new file mode 100644 index 000000000000..afddc6d502f8 --- /dev/null +++ b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils multilib versionator + +MY_PV=796b552e8a32cc8e63d40dfb94b8a6209731060b +DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins" +HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3" +SRC_URI="http://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +_IUSE_INSTRUCTION_SETS="cpu_flags_x86_3dnow cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1" +IUSE="${_IUSE_INSTRUCTION_SETS} audacious forcefpu jack openmp plugdouble threads" + +_GTK_DEPEND=">=dev-libs/glib-2.4.7:2 + >=x11-libs/gtk+-3.0.0:3 + x11-libs/pango + x11-libs/cairo" + +RDEPEND=">=sci-libs/fftw-3.0.1 + audacious? ( >=media-sound/audacious-3.6 + ${_GTK_DEPEND} + media-libs/libsndfile ) + jack? ( media-sound/jack-audio-connection-kit + ${_GTK_DEPEND} + media-libs/libsndfile )" +DEPEND=${RDEPEND} + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + eautoreconf +} + +src_configure() { + econf \ + --disable-profile \ + --enable-release \ + --disable-autocflags \ + --enable-undenormal \ + $(use_enable threads pthread) \ + $(use_enable forcefpu) \ + --disable-force3dnow \ + $(use_enable cpu_flags_x86_3dnow 3dnow) \ + $(use_enable cpu_flags_x86_sse sse) \ + $(use_enable cpu_flags_x86_sse2 sse2) \ + $(use_enable cpu_flags_x86_sse3 sse3) \ + $(use_enable cpu_flags_x86_sse4_1 sse4) \ + $(use_enable cpu_flags_x86_avx avx) \ + --disable-fma \ + --disable-fma4 \ + $(use_enable openmp omp) \ + --disable-sample \ + $(use_enable jack) \ + $(use_enable audacious) \ + --disable-srcnewcoeffs \ + $(use_enable plugdouble) \ + --disable-pluginit \ + || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc ChangeLog README || die 'dodoc failed' + + if use audacious ; then + find "${D}/usr/$(get_libdir)/audacious/" -name '*.la' -print -delete || die + fi + + insinto /usr/share/${PN}/samples/IR + doins samples/IR/*.wav || die +} diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest index 07a0b18d41b7..9163b39faad3 100644 --- a/media-libs/gst-plugins-bad/Manifest +++ b/media-libs/gst-plugins-bad/Manifest @@ -2,3 +2,4 @@ DIST gst-plugins-bad-0.10.23-h264-patches.tar.xz 5284 SHA256 40890e4d7792d1b4e18 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild new file mode 100644 index 000000000000..6781558ab7b7 --- /dev/null +++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE="gst-plugins-bad" + +inherit eutils flag-o-matic gstreamer virtualx + +DESCRIPTION="Less plugins for GStreamer" +HOMEPAGE="http://gstreamer.freedesktop.org/" + +LICENSE="LGPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" + +IUSE="X egl gles2 +introspection opengl +orc vnc wayland" +REQUIRED_USE=" + egl? ( !gles2 ) + gles2? ( !egl !opengl ) + opengl? ( X ) + wayland? ( egl ) +" + +# dtmf plugin moved from bad to good in 1.2 +# X11 is automagic for now, upstream #709530 +RDEPEND=" + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=media-libs/gstreamer-1.6:${SLOT}[${MULTILIB_USEDEP},introspection?] + >=media-libs/gst-plugins-base-1.6:${SLOT}[${MULTILIB_USEDEP},introspection?] + introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) + + egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] ) + gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) + opengl? ( + >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}] + virtual/glu[${MULTILIB_USEDEP}] ) + X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) + wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) + + orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) + + !<media-libs/gst-plugins-good-1.1:${SLOT} + x11-libs/libSM[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.12 +" + +src_prepare() { + # FIXME: tests are slower than upstream expects + sed -e 's:/\* tcase_set_timeout.*:tcase_set_timeout (tc_chain, 5 * 60);:' \ + -i tests/check/elements/audiomixer.c || die +} + +multilib_src_configure() { + gstreamer_multilib_src_configure \ + $(multilib_native_use_enable introspection) \ + $(use_enable egl) \ + $(use_enable gles2) \ + $(use_enable opengl) \ + $(use_enable opengl glx) \ + $(use_enable orc) \ + $(use_enable vnc librfb) \ + $(use_enable X x11) \ + $(use_enable wayland) \ + --disable-examples \ + --disable-debug \ + --disable-cocoa \ + --disable-wgl + + if multilib_is_native_abi; then + local x + for x in libs plugins; do + ln -s "${S}"/docs/${x}/html docs/${x}/html || die + done + fi +} + +multilib_src_test() { + unset DISPLAY + Xemake check +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog NEWS README RELEASE" + einstalldocs + prune_libtool_files --modules +} diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest index d183ce5f3329..b7dbc525abb2 100644 --- a/media-libs/gst-plugins-base/Manifest +++ b/media-libs/gst-plugins-base/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d DIST gst-plugins-base-1.2.4.tar.xz 2538012 SHA256 4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550 SHA512 8e7e7fd494ee2335e917dae3fef93a2103db37c8cc645ccf1f63b7e6676a6cc6fee78bb90e43f8ccacab367788a416600577cb3d9630e9d64258ecb3dbe63338 WHIRLPOOL 173b2c71b2be05db75ef0d7c344b64ec5d74ba291cc8058546a2963257a1af8e7699737214e11c2d811e6349a008386f822a82f5fe5f5491f5faca64e9d8f20d DIST gst-plugins-base-1.4.5.tar.xz 2637680 SHA256 77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d SHA512 63d3c531de736ad8a64d6962c0af75857d3b016d7f8e85d1884e8de50e64576902bb1161161b74130ab5dfb1d453eb995e374d8a958eac6e44ae5272eeaaf8b6 WHIRLPOOL cf6ef1c9589ed7a39be74e7663b0821c81b1b4cffdd612ccd7fd5b7929508af21d68817530a4b0fb2517f3a7044ee068afba7602816fdd0ada31444f0bcf8383 +DIST gst-plugins-base-1.6.0.tar.xz 2833380 SHA256 314fd1b707f65caf8eb6164d9422fc51e2b220a890ccd2de6ec03a2883d77231 SHA512 fea97754117f7a923e6622211a218ab1d1d4cbb30f8025777462df5c622061710236477af42df6ea6b817e155d2165af353d6f44b5609b87187ab2fb63aaf406 WHIRLPOOL 97696f2d44bbfd08ccf004493948b890fb28527a6fac2c2a04fe06e395a36a66a945e2153659e9324c5e22adf8af27c8426632379e0f734dddfc7b6661c1d3fa diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.6.0.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.6.0.ebuild new file mode 100644 index 000000000000..09682ecb6a06 --- /dev/null +++ b/media-libs/gst-plugins-base/gst-plugins-base-1.6.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE="gst-plugins-base" +inherit gstreamer + +DESCRIPTION="Basepack of plugins for gstreamer" +HOMEPAGE="http://gstreamer.freedesktop.org/" + +LICENSE="GPL-2+ LGPL-2+" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X" +REQUIRED_USE=" + ivorbis? ( ogg ) + theora? ( ogg ) + vorbis? ( ogg ) +" + +RDEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) + ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] ) + ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) + orc? ( >=dev-lang/orc-0.4.23[${MULTILIB_USEDEP}] ) + pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] ) + theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] ) + vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.12 + X? ( + >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] + >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] + >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] ) +" + +multilib_src_configure() { + gstreamer_multilib_src_configure \ + $(use_enable alsa) \ + $(multilib_native_use_enable introspection) \ + $(use_enable ivorbis) \ + $(use_enable ogg) \ + $(use_enable orc) \ + $(use_enable pango) \ + $(use_enable theora) \ + $(use_enable vorbis) \ + $(use_enable X x) \ + $(use_enable X xshm) \ + $(use_enable X xvideo) \ + --disable-debug \ + --disable-examples \ + --disable-freetypetest \ + --disable-static + # cdparanoia and libvisual are split out, per leio's request + + # bug #366931, flag-o-matic for the whole thing is overkill + if [[ ${CHOST} == *86-*-darwin* ]] ; then + sed -i \ + -e '/FLAGS = /s|-O[23]|-O1|g' \ + gst/audioconvert/Makefile \ + gst/volume/Makefile || die + fi + + if multilib_is_native_abi; then + local x + for x in libs plugins; do + ln -s "${S}"/docs/${x}/html docs/${x}/html || die + done + fi +} + +multilib_src_install_all() { + DOCS="AUTHORS NEWS README RELEASE" + einstalldocs + prune_libtool_files --modules +} diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest index e947067639be..7861d05551db 100644 --- a/media-libs/gst-plugins-good/Manifest +++ b/media-libs/gst-plugins-good/Manifest @@ -2,3 +2,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad2961683 DIST gst-plugins-good-1.2.3.tar.xz 2878780 SHA256 bfb33536a515bdcc34482f64b8d9cc3e47c753878b254923b419bc2f7485e470 SHA512 74203578c92c6979b76e6070fd976989b7b81d3fec4317037d04391cab8142738d7b443915bced1c77e97137ebd47728ef570a55b758a946fb5bc06b7c67b407 WHIRLPOOL 0b5a66751d6e966f4df7455b9227a8da07716a9111cf74bab75e0f3c0efdc8e1e872bb5b220a5ae1edf870c00f5677451f61fb198c709e51bb3f055ebf27669d DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.6.0.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.6.0.ebuild new file mode 100644 index 000000000000..5551d51ee911 --- /dev/null +++ b/media-libs/gst-plugins-good/gst-plugins-good-1.6.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE="gst-plugins-good" +inherit eutils flag-o-matic gstreamer + +DESCRIPTION="Basepack of plugins for GStreamer" +HOMEPAGE="http://gstreamer.freedesktop.org/" + +LICENSE="LGPL-2.1+" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="+orc" + +# dtmf plugin moved from bad to good in 1.2 +RDEPEND=" + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}] + >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}] + >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) + + !<media-libs/gst-plugins-bad-1.1:${SLOT} +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.12 +" + +src_prepare() { + # Disable test due to missing files + # https://bugzilla.gnome.org/show_bug.cgi?id=757087 + sed -e 's:\(tcase_add_test.*test_splitmuxsrc\):// \1:' \ + -i tests/check/elements/splitmux.c || die +} + +multilib_src_configure() { + # Always enable optional bz2 support for matroska + # Always enable optional zlib support for qtdemux and matroska + # Many media files require these to work, as some container headers are often + # compressed, bug #291154 + gstreamer_multilib_src_configure \ + --enable-bz2 \ + --enable-zlib \ + --disable-examples \ + --with-default-audiosink=autoaudiosink \ + --with-default-visualizer=goom + + if multilib_is_native_abi; then + ln -s "${S}"/docs/plugins/html docs/plugins/html || die + fi + +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog NEWS README RELEASE" + einstalldocs + prune_libtool_files --modules +} diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest index b14ec571d6ff..ba8aa210d826 100644 --- a/media-libs/gst-plugins-ugly/Manifest +++ b/media-libs/gst-plugins-ugly/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e +DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57 diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.0.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.0.ebuild new file mode 100644 index 000000000000..69bb42e0936e --- /dev/null +++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE="gst-plugins-ugly" + +inherit eutils flag-o-matic gstreamer + +DESCRIPTION="Basepack of plugins for gstreamer" +HOMEPAGE="http://gstreamer.freedesktop.org/" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="+orc" + +RDEPEND=" + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=media-libs/gstreamer-1.6:${SLOT}[${MULTILIB_USEDEP}] + >=media-libs/gst-plugins-base-1.6:${SLOT}[${MULTILIB_USEDEP}] + orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.12 +" + +multilib_src_configure() { + gstreamer_multilib_src_configure + + if multilib_is_native_abi; then + ln -s "${S}"/docs/plugins/html docs/plugins/html || die + fi + +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog NEWS README RELEASE" + einstalldocs + prune_libtool_files --modules +} diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest index 7c27ae0a08c9..4833b010d5bc 100644 --- a/media-libs/gstreamer-editing-services/Manifest +++ b/media-libs/gstreamer-editing-services/Manifest @@ -1,2 +1,3 @@ DIST gstreamer-editing-services-1.2.1.tar.xz 900316 SHA256 fe768b21af5c644093a06a0e573b6e2fa9b467bec18de408c7ff7171c4fb40b0 SHA512 245d3f8934e36f5c58112a820375c90f775af928f5a32e5f6c5793a6ad0709b1d29f4e60e572778d1b3fca308d5eb7c55f89a04b38de67a0ba254f85d43d42fa WHIRLPOOL d354c6cfb1c8226b6a5f3b7d175187dfa1a099dbe5d292f1d6b691e51638f72534ac1b412e7851b5c05073e731ecefd0dfbc7ee1106459906498d8d6b61b7080 DIST gstreamer-editing-services-1.4.0.tar.xz 915420 SHA256 cc20b90fb7bcec257b2afda7474664d493b1acece66da675d7df584588808bb3 SHA512 4a3e39089810aa15f2e2e802b1f2a0fcf6f3508a86a5aa8323078334a3f3b427a53e0d3bbb62d42140dc43cbcd9d4985faf0b28edefbcb9814fa76cbb638119b WHIRLPOOL 913149756f5a3dc19e2549014b66484e6390c33d7bfd204899d5d3e9d1f86fe73570ed04548d8ad6700cf9b917344917ae647b0b1d8fb06655dc446e42653e56 +DIST gstreamer-editing-services-1.6.0.tar.xz 1013632 SHA256 4a780cc27029d25271cf4f8bc17531aa9a1d435e4f807202fd3790f53b964dbe SHA512 25435a9db98ed9d973a2414047f466b0fb865b869b29a7792c690e11e872933018d7fe8f998a4ddd1b452b21aa4021187f76ab8124366cde9a016292ad27646e WHIRLPOOL 67c88e89e9dd8aa26eac649bb8b4ea09048bcd538149b0c1380220094fe39e2be5966c19c69329a7582f2409aa66272f0ee2c0724d5fc5a468a4f2bcfb4319fd diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.0.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.0.ebuild new file mode 100644 index 000000000000..ac63af2c125e --- /dev/null +++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="no" + +inherit bash-completion-r1 gnome2 + +DESCRIPTION="SDK for making video editors and more" +HOMEPAGE="http://wiki.pitivi.org/wiki/GES" +SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz" + +LICENSE="LGPL-2+" +SLOT="1.0" +KEYWORDS="~amd64 ~x86" +IUSE="+introspection" + +# FIXME: There is something odd with pygobject check for >=4.22, +# check with upstream +COMMON_DEPEND=" + >=dev-libs/glib-2.34:2 + dev-libs/libxml2:2 + >=media-libs/gstreamer-1.6:1.0[introspection?] + >=media-libs/gst-plugins-base-1.6:1.0[introspection?] + introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) +" +RDEPEND="${COMMON_DEPEND} + media-libs/gnonlin:1.0 +" +DEPEND="${COMMON_DEPEND} + >=dev-util/gtk-doc-am-1.3 + virtual/pkgconfig +" +# XXX: tests do pass but need g-e-s to be installed due to missing +# AM_TEST_ENVIRONMENT setup. +RESTRICT="test" + +src_configure() { + # gtk is only used for examples + gnome2_src_configure \ + $(use_enable introspection) \ + --disable-examples \ + --without-gtk \ + --with-bash-completion-dir="$(get_bashcompdir)" \ + --with-package-name="GStreamer editing services ebuild for Gentoo" \ + --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services" +} + +src_compile() { + # Prevent sandbox violations, bug #538888 + # https://bugzilla.gnome.org/show_bug.cgi?id=744135 + # https://bugzilla.gnome.org/show_bug.cgi?id=744134 + addpredict /dev + gnome2_src_compile +} diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest index 19eaed0507b8..32f6114413c7 100644 --- a/media-libs/gstreamer/Manifest +++ b/media-libs/gstreamer/Manifest @@ -1,3 +1,4 @@ DIST gstreamer-0.10.36.tar.xz 3025876 SHA256 9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da SHA512 7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8 WHIRLPOOL 03b841624552be860d4bf824bde9d6d5d6afc629048244b02037c96370c88191f34a6d09f02af61f295a9d6f84952efec2c5d4b0a28e8e70cd17966ed1b01d93 DIST gstreamer-1.2.4.tar.xz 3225208 SHA256 1e7ca67a7870a82c9ed51d51d0008cdbc550c41d64cc3ff3f9a1c2fc311b4929 SHA512 e1feaae567e5dba23270b87bc031b9ba061f664b83a3f18064b8abf802ce3ae6855c97df7a9cb8d861c3c6668e671144da859ae9cda663e88720602198f6f8fc WHIRLPOOL 8c8325ee24d2fe6bb218e6d2cc8e3a2870ac47fb2134914205490decf6593c54ca59f92c95a3da0c7f4eb656191ae9b70a40ae02df87ba64a9c39e9e82fd36c0 DIST gstreamer-1.4.5.tar.xz 3324052 SHA256 40801aa7f979024526258a0e94707ba42b8ab6f7d2206e56adbc4433155cb0ae SHA512 ed7b371f99b7da4ec462e34cd8e02062a0faaad7498a87cfc1ef39f8740db9bca0cc5bfe17ae5ff24abe0bd4a6771e732da193c01ca0e2d835b6c5d9f0d41403 WHIRLPOOL 3065b43a84d8d1d09ec9fb9bda5afc91550cd9f55e2db486c6aceec8fa41dd5ae7d3809c6b6249e86e658c94ffed6ec5a4a7a3cd25b2ab17c24c5a3488355bee +DIST gstreamer-1.6.0.tar.xz 3549712 SHA256 52ef885647afef11c8b7645a9afefe04aa09e8971c4b932e7717872ab8a30fcc SHA512 8e8b5b0ef4e2c74c1f518c11de19c66cd28faac8036321a5de364b774c7d519b6772c41896d61a67a1df76b256183b42b8496175ae03105bd7f506aa748efe5f WHIRLPOOL 2f8b3c4e6ec81d86bba2dd65db87a11ecd0393da78c863f42fed5282f69fa17fef61a0a913c1d125103f02475d428f918a71ac8f3b0ae5bcf41d1b56d50310bf diff --git a/media-libs/gstreamer/gstreamer-1.6.0.ebuild b/media-libs/gstreamer/gstreamer-1.6.0.ebuild new file mode 100644 index 000000000000..3b7dce9213c5 --- /dev/null +++ b/media-libs/gstreamer/gstreamer-1.6.0.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit bash-completion-r1 eutils multilib multilib-minimal pax-utils + +DESCRIPTION="Open source multimedia framework" +HOMEPAGE="http://gstreamer.freedesktop.org/" +SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz" + +LICENSE="LGPL-2+" +SLOT="1.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="+caps +introspection nls +orc test" + +RDEPEND=" + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + caps? ( sys-libs/libcap ) + introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) +" +DEPEND="${RDEPEND} + app-arch/xz-utils + >=dev-util/gtk-doc-am-1.12 + sys-devel/bison + sys-devel/flex + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + nls? ( sys-devel/gettext ) +" +# gtk-doc-am to install API docs + +src_configure() { + if [[ ${CHOST} == *-interix* ]] ; then + export ac_cv_lib_dl_dladdr=no + export ac_cv_func_poll=no + fi + if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then + # GCC groks this, but then refers to an implementation (___multi3, + # ___udivti3) that don't exist (at least I can't find it), so force + # this one to be off, such that we use 2x64bit emulation code. + export gst_cv_uint128_t=no + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + # Set 'libexecdir' to ABI-specific location for the library spawns + # helpers from there. + # Disable static archives, dependency tracking and examples + # to speed up build time + # Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo + local myconf=( + --libexecdir="${EPREFIX}"/usr/$(get_libdir) + --disable-debug + --disable-examples + --disable-static + --disable-valgrind + --enable-check + $(multilib_native_use_enable introspection) + $(use_enable nls) + $(use_enable test tests) + --with-bash-completion-dir="$(get_bashcompdir)" + --with-package-name="GStreamer ebuild for Gentoo" + --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer" + ) + + if use caps ; then + myconf+=( --with-ptp-helper-permissions=capabilities ) + else + myconf+=( + --with-ptp-helper-permissions=setuid-root + --with-ptp-helper-setuid-user=nobody + --with-ptp-helper-setuid-group=nobody + ) + fi + + ECONF_SOURCE="${S}" econf ${myconf[$@]} + + if multilib_is_native_abi; then + local x + for x in gst libs plugins; do + ln -s "${S}"/docs/${x}/html docs/${x}/html || die + done + fi +} + +multilib_src_install() { + # can't do "default", we want to install docs in multilib_src_install_all + emake DESTDIR="${D}" install + + # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579 + use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner" +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE" + einstalldocs + prune_libtool_files --modules + + # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579 + use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}" +} diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest index 90cf5f2c1a22..e33eadb6b476 100644 --- a/media-libs/imlib2/Manifest +++ b/media-libs/imlib2/Manifest @@ -1,3 +1,2 @@ -DIST imlib2-1.4.5.tar.gz 986785 SHA256 6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0 SHA512 6c3bceec39ffcb7515925c3eb4199834295732a1cc9cfa307aa8610e2565e770edfc5464ca983d1d95570bd9bac09c989e0751fa39b07cf794c0c5dce4262edf WHIRLPOOL 53c003601ca6f89927794af0f0ba48f31cce31504061b71f68f0d67b0c4266d2617a24df467af2a03d485d129ad6de745382338addf39f70810ec71db6b0833c DIST imlib2-1.4.6.tar.gz 971792 SHA256 17cc128c0e61974d59c423b59d0fb5cb85c97169adf5b05184cc58f7c87b4f4e SHA512 8c49f2c9a4b997b536ab7553ffd80b764eccf95c6926a90c10390463e353df27c0e52345bdea9ac8fbefae3e29274022e6a8c0944f406a449293a06192a95fe5 WHIRLPOOL 98ff99fb216a867f60287b369a0b05bf5eea2da23ee8bec14f105f1805f12b035f3ff03ede0bc5909eec178b09e285b5bb0ab0c394487502aa893a94a34da90c DIST imlib2-1.4.7.tar.gz 1027716 SHA256 48e98337a560d8904f685447f41c43914fec1f8cd3745a9fd86cba9fd24a6563 SHA512 24728586bf0d2a289fdaa7d05385a059b10092f3f777691881f01d6c9e4aa8f893ebb7bc04933644a9f62163cc649272851f1189f72aee83035816caca3a73a2 WHIRLPOOL 662c671b723f4df8267d84607b74bc76b6790d2a694a2e7b3bef084403ae8f41761813455a404c4886dbf3b7b7782534c17677b1ac81bdccf24120a3d07714e1 diff --git a/media-libs/imlib2/imlib2-1.4.5-r1.ebuild b/media-libs/imlib2/imlib2-1.4.5-r1.ebuild deleted file mode 100644 index 38aa8de88904..000000000000 --- a/media-libs/imlib2/imlib2-1.4.5-r1.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="4" - -EGIT_SUB_PROJECT="legacy" -EGIT_URI_APPEND=${PN} - -if [[ ${PV} != "9999" ]] ; then - EKEY_STATE="release" -fi - -inherit enlightenment toolchain-funcs - -DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" -HOMEPAGE="https://www.enlightenment.org/" - -IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib" - -RDEPEND="=media-libs/freetype-2* - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - gif? ( >=media-libs/giflib-4.1.0 ) - png? ( media-libs/libpng:0 ) - jpeg? ( virtual/jpeg:0 ) - tiff? ( media-libs/tiff:0 ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) - mp3? ( media-libs/libid3tag )" -DEPEND="${RDEPEND} - png? ( virtual/pkgconfig ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.4.5-no-my-libs.patch #497894 - epatch "${FILESDIR}"/${PN}-1.4.5-giflib-5.patch #457634 -} - -src_configure() { - # imlib2 has diff configure options for x86/amd64 mmx - if [[ $(tc-arch) == amd64 ]]; then - E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx ) - else - E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) ) - fi - - [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding ) - - E_ECONF+=( - $(use_enable static-libs static) - $(use_with X x) - $(use_with jpeg) - $(use_with png) - $(use_with tiff) - $(use_with gif) - $(use_with zlib) - $(use_with bzip2) - $(use_with mp3 id3) - ) - - enlightenment_src_configure -} - -src_install() { - enlightenment_src_install - - # enlightenment_src_install should take care of this for us, but it doesn't - find "${ED}" -name '*.la' -delete -} diff --git a/media-libs/imlib2/imlib2-1.4.6-r1.ebuild b/media-libs/imlib2/imlib2-1.4.6-r1.ebuild deleted file mode 100644 index 9cedb2f06ac7..000000000000 --- a/media-libs/imlib2/imlib2-1.4.6-r1.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="4" - -EGIT_SUB_PROJECT="legacy" -EGIT_URI_APPEND=${PN} - -if [[ ${PV} != "9999" ]] ; then - EKEY_STATE="snap" -fi - -inherit enlightenment toolchain-funcs - -DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" -HOMEPAGE="https://www.enlightenment.org/" - -IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib" - -RDEPEND="=media-libs/freetype-2* - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - gif? ( >=media-libs/giflib-4.1.0 ) - png? ( media-libs/libpng:0 ) - jpeg? ( virtual/jpeg:0 ) - tiff? ( media-libs/tiff:0 ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) - mp3? ( media-libs/libid3tag )" -DEPEND="${RDEPEND} - png? ( virtual/pkgconfig ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.4.5-no-my-libs.patch #497894 - epatch "${FILESDIR}"/${PN}-1.4.5-giflib-5.patch #457634 -} - -src_configure() { - # imlib2 has diff configure options for x86/amd64 mmx - if [[ $(tc-arch) == amd64 ]]; then - E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx ) - else - E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) ) - fi - - [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding ) - - E_ECONF+=( - $(use_enable static-libs static) - $(use_with X x) - $(use_with jpeg) - $(use_with png) - $(use_with tiff) - $(use_with gif) - $(use_with zlib) - $(use_with bzip2) - $(use_with mp3 id3) - ) - - enlightenment_src_configure -} - -src_install() { - enlightenment_src_install - - # enlightenment_src_install should take care of this for us, but it doesn't - find "${ED}" -name '*.la' -delete -} diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest new file mode 100644 index 000000000000..23e738ff2c02 --- /dev/null +++ b/media-libs/kvazaar/Manifest @@ -0,0 +1 @@ +DIST kvazaar-0.7.1.tar.gz 288339 SHA256 c3693f801f0e717b1dcab3494d3e18a1687861af1a2c33b8878b2f70bcf18164 SHA512 a7d0a68e4b898f7dbb4175ab8a005d88786f522e185c1814a36a48395d34398880fc18e6baeebe4fef0ea97829e937df2ec9f547e05a9a1b2fdb74e260390e2a WHIRLPOOL ad640f5cf4c8238c7fbda3d126e1d7d37b3619a3eb000737eabf75b464fbf37cbc1de11c643725fb8cfbbfe8aa21df12d2c7b7aed0df29f7d8774256e78818a0 diff --git a/media-libs/kvazaar/kvazaar-0.7.1.ebuild b/media-libs/kvazaar/kvazaar-0.7.1.ebuild new file mode 100644 index 000000000000..50c477d2aec0 --- /dev/null +++ b/media-libs/kvazaar/kvazaar-0.7.1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +SCM="" + +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/ultravideo/kvazaar" +fi + +inherit multilib multilib-minimal ${SCM} + +DESCRIPTION="An open-source HEVC encoder" +HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" + +if [ "${PV#9999}" = "${PV}" ] ; then + SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="cpu_flags_x86_avx2 static-libs" + +DEPEND="" +RDEPEND="${DEPEND}" +S="${WORKDIR}/${P}/src" + +ASM_DEP=">=dev-lang/yasm-1.2.0" +DEPEND="${DEPEND} + abi_x86_32? ( ${ASM_DEP} ) + abi_x86_64? ( ${ASM_DEP} )" + +src_prepare() { + multilib_copy_sources +} + +multilib_src_compile() { + emake \ + ARCH="${CHOST%%-*}" \ + $(usex cpu_flags_x86_avx2 "" "KVZ_DISABLE_AVX2=true") \ + lib-shared \ + $(usex static-libs "lib-static" "") \ + $(multilib_is_native_abi && echo cli) +} + +multilib_src_install() { + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + install-pc install-lib \ + $(usex static-libs "install-static" "") \ + $(multilib_is_native_abi && echo install-prog) +} + +multilib_src_install_all() { + dodoc "${WORKDIR}/${P}/README.md" "${WORKDIR}/${P}/CREDITS" "${WORKDIR}/${P}/doc/"*.txt +} diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild new file mode 100644 index 000000000000..50c477d2aec0 --- /dev/null +++ b/media-libs/kvazaar/kvazaar-9999.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +SCM="" + +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/ultravideo/kvazaar" +fi + +inherit multilib multilib-minimal ${SCM} + +DESCRIPTION="An open-source HEVC encoder" +HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" + +if [ "${PV#9999}" = "${PV}" ] ; then + SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="cpu_flags_x86_avx2 static-libs" + +DEPEND="" +RDEPEND="${DEPEND}" +S="${WORKDIR}/${P}/src" + +ASM_DEP=">=dev-lang/yasm-1.2.0" +DEPEND="${DEPEND} + abi_x86_32? ( ${ASM_DEP} ) + abi_x86_64? ( ${ASM_DEP} )" + +src_prepare() { + multilib_copy_sources +} + +multilib_src_compile() { + emake \ + ARCH="${CHOST%%-*}" \ + $(usex cpu_flags_x86_avx2 "" "KVZ_DISABLE_AVX2=true") \ + lib-shared \ + $(usex static-libs "lib-static" "") \ + $(multilib_is_native_abi && echo cli) +} + +multilib_src_install() { + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + install-pc install-lib \ + $(usex static-libs "install-static" "") \ + $(multilib_is_native_abi && echo install-prog) +} + +multilib_src_install_all() { + dodoc "${WORKDIR}/${P}/README.md" "${WORKDIR}/${P}/CREDITS" "${WORKDIR}/${P}/doc/"*.txt +} diff --git a/sci-chemistry/mosflm/metadata.xml b/media-libs/kvazaar/metadata.xml index ae9ec7c5f6a4..c572c7d9b478 100644 --- a/sci-chemistry/mosflm/metadata.xml +++ b/media-libs/kvazaar/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>sci-chemistry</herd> + <herd>video</herd> <maintainer> - <email>jlec@gentoo.org</email> + <email>media-video@gentoo.org</email> </maintainer> </pkgmetadata> diff --git a/media-libs/libmatroska/libmatroska-1.4.4.ebuild b/media-libs/libmatroska/libmatroska-1.4.4.ebuild index 0346ce65acaf..e6b06d9e366b 100644 --- a/media-libs/libmatroska/libmatroska-1.4.4.ebuild +++ b/media-libs/libmatroska/libmatroska-1.4.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0/6" # subslot = soname major version -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" +KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" IUSE="static-libs" RDEPEND=">=dev-libs/libebml-1.3.3:=" diff --git a/media-libs/libmpdclient/libmpdclient-2.10.ebuild b/media-libs/libmpdclient/libmpdclient-2.10.ebuild index 44b6330690da..b6ecc2508cc3 100644 --- a/media-libs/libmpdclient/libmpdclient-2.10.ebuild +++ b/media-libs/libmpdclient/libmpdclient-2.10.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ppc ppc64 ~sparc x86" +KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sparc x86" IUSE="doc examples static-libs" RDEPEND="" diff --git a/media-libs/libpng/libpng-1.6.18.ebuild b/media-libs/libpng/libpng-1.6.18.ebuild index 1b0c3cefe330..9cebda830dc5 100644 --- a/media-libs/libpng/libpng-1.6.18.ebuild +++ b/media-libs/libpng/libpng-1.6.18.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz LICENSE="libpng" SLOT="0/16" -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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="apng neon static-libs" RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild index 2c5f1a64eb5d..0b51a9ece2a7 100644 --- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild +++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" # WARNING: # If you turn on the custom-cflags use flag in USE and something breaks, # you pick up the pieces. Be prepared for bug reports to be marked INVALID. diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch new file mode 100644 index 000000000000..e8ba8db1e843 --- /dev/null +++ b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch @@ -0,0 +1,118 @@ +--- libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2015-06-08 14:46:24.591876404 +0100 ++++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2015-06-08 14:46:35.345993247 +0100 +@@ -859,7 +859,7 @@ + % + % + */ +-static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels) ++static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels) + { int byte; + int count; + int i; +@@ -870,12 +870,14 @@ + U32 u; + + unsigned char* q; ++ unsigned char* end; + + for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u] = 0; + + byte = 0; + x = 0; + q = pixels; ++ end = pixels + bmp->width * bmp->height; + + for (y = 0; y < bmp->height; ) + { count = ReadBlobByte (src); +@@ -884,7 +886,10 @@ + { /* Encoded mode. */ + byte = ReadBlobByte (src); + for (i = 0; i < count; i++) +- { if (compression == 1) ++ { ++ if (q == end) ++ return 0; ++ if (compression == 1) + { (*(q++)) = (unsigned char) byte; + } + else +@@ -896,13 +901,15 @@ + else + { /* Escape mode. */ + count = ReadBlobByte (src); +- if (count == 0x01) return; ++ if (count == 0x01) return 1; + switch (count) + { + case 0x00: + { /* End of line. */ + x = 0; + y++; ++ if (y >= bmp->height) ++ return 0; + q = pixels + y * bmp->width; + break; + } +@@ -910,13 +917,20 @@ + { /* Delta mode. */ + x += ReadBlobByte (src); + y += ReadBlobByte (src); ++ if (y >= bmp->height) ++ return 0; ++ if (x >= bmp->width) ++ return 0; + q = pixels + y * bmp->width + x; + break; + } + default: + { /* Absolute mode. */ + for (i = 0; i < count; i++) +- { if (compression == 1) ++ { ++ if (q == end) ++ return 0; ++ if (compression == 1) + { (*(q++)) = ReadBlobByte (src); + } + else +@@ -943,7 +957,7 @@ + byte = ReadBlobByte (src); /* end of line */ + byte = ReadBlobByte (src); + +- return; ++ return 1; + } + + /* +@@ -1143,8 +1157,18 @@ + } + } + else +- { /* Convert run-length encoded raster pixels. */ +- DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image); ++ { ++ if (bmp_info.bits_per_pixel == 8) /* Convert run-length encoded raster pixels. */ ++ { ++ if (!DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image)) ++ { WMF_ERROR (API,"corrupt bmp"); ++ API->err = wmf_E_BadFormat; ++ } ++ } ++ else ++ { WMF_ERROR (API,"Unexpected pixel depth"); ++ API->err = wmf_E_BadFormat; ++ } + } + + if (ERR (API)) +--- libwmf-0.2.8.4/src/ipa/ipa.h 2015-06-08 14:46:24.590876393 +0100 ++++ libwmf-0.2.8.4/src/ipa/ipa.h 2015-06-08 14:46:35.345993247 +0100 +@@ -48,7 +48,7 @@ + static unsigned short ReadBlobLSBShort (BMPSource*); + static unsigned long ReadBlobLSBLong (BMPSource*); + static long TellBlob (BMPSource*); +-static void DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*); ++static int DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*); + static void ReadBMPImage (wmfAPI*,wmfBMP*,BMPSource*); + static int ExtractColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned int,unsigned int); + static void SetColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned char,unsigned int,unsigned int); diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch new file mode 100644 index 000000000000..b6d499da98e1 --- /dev/null +++ b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch @@ -0,0 +1,56 @@ +--- libwmf-0.2.8.4/src/player/meta.h ++++ libwmf-0.2.8.4/src/player/meta.h +@@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API, + objects = P->objects; + + i = 0; +- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; ++ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; + + if (i == NUM_OBJECTS (API)) + { WMF_ERROR (API,"Object out of range!"); +@@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w + objects = P->objects; + + i = 0; +- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; ++ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; + + if (i == NUM_OBJECTS (API)) + { WMF_ERROR (API,"Object out of range!"); +@@ -3067,7 +3067,7 @@ static int meta_pen_create (wmfAPI* API, + objects = P->objects; + + i = 0; +- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; ++ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; + + if (i == NUM_OBJECTS (API)) + { WMF_ERROR (API,"Object out of range!"); +@@ -3181,7 +3181,7 @@ static int meta_brush_create (wmfAPI* AP + objects = P->objects; + + i = 0; +- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; ++ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; + + if (i == NUM_OBJECTS (API)) + { WMF_ERROR (API,"Object out of range!"); +@@ -3288,7 +3288,7 @@ static int meta_font_create (wmfAPI* API + objects = P->objects; + + i = 0; +- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; ++ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; + + if (i == NUM_OBJECTS (API)) + { WMF_ERROR (API,"Object out of range!"); +@@ -3396,7 +3396,7 @@ static int meta_palette_create (wmfAPI* + objects = P->objects; + + i = 0; +- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; ++ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; + + if (i == NUM_OBJECTS (API)) + { WMF_ERROR (API,"Object out of range!"); diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch new file mode 100644 index 000000000000..3312841258b0 --- /dev/null +++ b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch @@ -0,0 +1,23 @@ +--- libwmf-0.2.8.4/src/player/meta.h ++++ libwmf-0.2.8.4/src/player/meta.h +@@ -2585,6 +2585,8 @@ + polyrect.BR[i] = clip->rects[i].BR; + } + ++ if (FR->region_clip) FR->region_clip (API,&polyrect); ++ + wmf_free (API,polyrect.TL); + wmf_free (API,polyrect.BR); + } +@@ -2593,9 +2595,10 @@ + polyrect.BR = 0; + + polyrect.count = 0; ++ ++ if (FR->region_clip) FR->region_clip (API,&polyrect); + } + +- if (FR->region_clip) FR->region_clip (API,&polyrect); + + return (changed); + } diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild new file mode 100644 index 000000000000..b30497344620 --- /dev/null +++ b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils gnome2-utils + +#The configure script finds the 5.50 ghostscript Fontmap file while run. +#This will probably work, especially since the real one (6.50) in this case +#is empty. However beware in case there is any trouble + +DESCRIPTION="library for converting WMF files" +HOMEPAGE="http://wvware.sourceforge.net/" +SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="X debug doc expat xml" + +RDEPEND=" + app-text/ghostscript-gpl + media-fonts/urw-fonts + media-libs/freetype:2= + >=media-libs/libpng-1.4:0= + sys-libs/zlib + x11-libs/gdk-pixbuf:2[X?] + virtual/jpeg:0= + xml? ( + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2 ) + ) + X? ( x11-libs/libX11 ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig + X? ( + x11-libs/libXt + x11-libs/libXpm + )" +# plotutils are not really supported yet, so looks like that's it + +REQUIRED_USE="expat? ( xml )" + +DOCS=( README AUTHORS CREDITS ChangeLog NEWS TODO ) + +PATCHES=( + "${FILESDIR}"/${P}-intoverflow.patch + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-pngfix.patch + "${FILESDIR}"/${P}-libpng-1.5.patch + "${FILESDIR}"/${P}-use-system-fonts.patch + "${FILESDIR}"/${P}-gdk-pixbuf.patch + "${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch + "${FILESDIR}"/${P}-CVE-2015-4695.patch + "${FILESDIR}"/${P}-CVE-2015-4696.patch + ) + +AUTOTOOLS_PRUNE_LIBTOOL_FILES='modules' + +src_prepare() { + if ! use doc ; then + sed -e 's:doc::' -i Makefile.am || die + fi + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die + + autotools-utils_src_prepare +} + +src_configure() { + local myeconfargs=() + # NOTE: The gd that is included is gd-2.0.0. Even with --with-sys-gd, that gd is built + # and included in libwmf. Since nothing in-tree seems to use media-libs/libwmf[gd], + # we're explicitly disabling gd use w.r.t. bug 268161 + if use expat; then + myeconfargs+=( --without-libxml2 ) + else + myeconfargs+=( $(use_with xml libxml2) ) + fi + + myeconfargs+=( + --disable-static + $(use_enable debug) + $(use_with X x) + $(use_with expat) + --disable-gd + --with-sys-gd + --with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts + --with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts/ + --with-docdir="${EPREFIX}"/usr/share/doc/${PF} + ) + autotools-utils_src_configure +} + +src_install() { + MAKEOPTS+=" -j1" + autotools-utils_src_install +} + +pkg_preinst() { + gnome2_gdk_pixbuf_savelist +} + +pkg_postinst() { + gnome2_gdk_pixbuf_update +} + +pkg_postrm() { + gnome2_gdk_pixbuf_update +} diff --git a/media-libs/lilv/lilv-0.20.0.ebuild b/media-libs/lilv/lilv-0.20.0.ebuild index 7f427d71bed1..8535f32d8e4d 100644 --- a/media-libs/lilv/lilv-0.20.0.ebuild +++ b/media-libs/lilv/lilv-0.20.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2" LICENSE="ISC" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="doc +dyn-manifest static-libs test" RDEPEND="media-libs/lv2 diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 0bc5c956f4c5..bcbf2e15ca91 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -5,4 +5,5 @@ DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1 DIST mesa-10.5.8.tar.xz 6993084 SHA256 2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663da2b54 SHA512 d7fc441b4cdad8a2905f03091af26ca7b01573bf4d0d928e950270981e4c6e7d20dba6aa97a60500b9a335a3c5cabc7f388a5338d43d391eed3f09dea60b77b2 WHIRLPOOL 68cc3d8490da9759b9d790053c70429be4c529c63b114f65f411112f76cd4daccc3490120a85a84d01cdcb989c0a0e58016b4d80f2238f2320b1caff797f3390 DIST mesa-10.6.9.tar.xz 7041588 SHA256 b04c4de6280b863babc2929573da17218d92e9e4ba6272d548d135415723e8c3 SHA512 32abcf167312dea06482e46da6f15b1c6902696a7dff759561f099eb12a6748673a5d6bb084c12ef57e6f13d3ec1b456541611a710519da87b11fd622f453344 WHIRLPOOL d3bf4627bdf7a576343bd2701948d5872e5d05a43b2980ce4e4915e8d95bd85eadb563cb3588918c55307769132a0cc8592361b4c9fbdf4831c181604d79028b DIST mesa-11.0.3.tar.xz 7264824 SHA256 ab2992eece21adc23c398720ef8c6933cb69ea42e1b2611dc09d031e17e033d6 SHA512 7cec13749a600e589794c4b7c082bcbe47d708d3e4a670160a09b07a0c5afc301b984ac4e26519ed3acda6171f936f700eb62c0977cc392343822603ff6c7c15 WHIRLPOOL edcef9df038384cace1b650efbd0245dc6b7ecdd6e22d35a57590d919b1bceb73ff5b531b441b06da806ff1efe357872d1f16d3d0364fbd85000a2d7b406391f +DIST mesa-11.0.4.tar.xz 7267588 SHA256 40201bf7fc6fa12a6d9edfe870b41eb4dd6669154e3c42c48a96f70805f5483d SHA512 1647ba750b6d8860d8a87aee5444c3aa4d7c916e38a699056d0b4e453651378728a875d6781598dbba7efa96f9c14f1fe6ef615aaa0ce80d02d86116d7331f14 WHIRLPOOL f2a0b877375439f65d888df3a107bf7a95bd6e606ed1337481d70c2c2b7eea0ded936ce06c7fd0cc2f4aaa68d4d7d779776ed9f9b0868b1e6e981ac609cba4ff DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97 diff --git a/media-libs/mesa/mesa-10.5.8.ebuild b/media-libs/mesa/mesa-10.5.8.ebuild index b41243a7ab24..c3a98e492257 100644 --- a/media-libs/mesa/mesa-10.5.8.ebuild +++ b/media-libs/mesa/mesa-10.5.8.ebuild @@ -106,6 +106,7 @@ RDEPEND=" ) ) ) >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] + <sys-devel/llvm-3.7 ) opencl? ( app-eselect/eselect-opencl diff --git a/media-libs/mesa/mesa-10.6.9.ebuild b/media-libs/mesa/mesa-10.6.9.ebuild index 0baae142ad09..36d280b429ec 100644 --- a/media-libs/mesa/mesa-10.6.9.ebuild +++ b/media-libs/mesa/mesa-10.6.9.ebuild @@ -106,6 +106,7 @@ RDEPEND=" ) ) ) >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] + <sys-devel/llvm-3.7 ) opencl? ( app-eselect/eselect-opencl diff --git a/media-libs/mesa/mesa-11.0.4.ebuild b/media-libs/mesa/mesa-11.0.4.ebuild new file mode 100644 index 000000000000..38d52d0732cd --- /dev/null +++ b/media-libs/mesa/mesa-11.0.4.ebuild @@ -0,0 +1,462 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" + +if [[ ${PV} = 9999 ]]; then + GIT_ECLASS="git-r3" + EXPERIMENTAL="true" +fi + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} + +OPENGL_DIR="xorg-x11" + +MY_P="${P/_/-}" +FOLDER="${PV/_rc*/}" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="http://mesa3d.sourceforge.net/" + +if [[ $PV == 9999 ]]; then + SRC_URI="" + KEYWORDS="" +else + SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="MIT" +SLOT="0" +RESTRICT="!bindist? ( bindist )" + +INTEL_CARDS="i915 i965 ilo intel" +RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" +VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm + +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau + wayland xvmc xa kernel_FreeBSD" + +REQUIRED_USE=" + d3d9? ( dri3 gallium ) + llvm? ( gallium ) + opencl? ( gallium llvm ) + openmax? ( gallium ) + gles1? ( egl ) + gles2? ( egl ) + vaapi? ( gallium ) + vdpau? ( gallium ) + wayland? ( egl gbm ) + xa? ( gallium ) + video_cards_freedreno? ( gallium ) + video_cards_intel? ( classic ) + video_cards_i915? ( || ( classic gallium ) ) + video_cards_i965? ( classic ) + video_cards_ilo? ( gallium ) + video_cards_nouveau? ( || ( classic gallium ) ) + video_cards_radeon? ( || ( classic gallium ) ) + video_cards_r100? ( classic ) + video_cards_r200? ( classic ) + video_cards_r300? ( gallium llvm ) + video_cards_r600? ( gallium ) + video_cards_radeonsi? ( gallium llvm ) + video_cards_vmware? ( gallium ) + ${PYTHON_REQUIRED_USE} +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64" +# keep correct libdrm and dri2proto dep +# keep blocks in rdepend for binpkg +RDEPEND=" + !<x11-base/xorg-server-1.7 + !<=x11-proto/xf86driproto-2.0.3 + abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + classic? ( app-eselect/eselect-mesa ) + gallium? ( app-eselect/eselect-mesa ) + >=app-eselect/eselect-opengl-1.3.0 + udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) ) + >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) + dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) + >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes:=[${MULTILIB_USEDEP}] + llvm? ( !kernel_FreeBSD? ( + video_cards_radeonsi? ( || ( + >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] + >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] + ) ) + !video_cards_r600? ( + video_cards_radeon? ( || ( + >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] + >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] + ) ) + ) ) + >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] + ) + opencl? ( + app-eselect/eselect-opencl + dev-libs/libclc + !kernel_FreeBSD? ( || ( + >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] + >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] + ) ) + ) + openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] ) + vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] ) + xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}] +" +for card in ${INTEL_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + " +done + +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +DEPEND="${RDEPEND} + llvm? ( + video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) + ) + opencl? ( + >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] + >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}] + >=sys-devel/gcc-4.6 + ) + sys-devel/gettext + virtual/pkgconfig + >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}] + dri3? ( + >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}] + >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}] + ) + >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}] + >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}] + >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}] + >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}] +" +[[ ${PV} == 9999 ]] && DEPEND+=" + sys-devel/bison + sys-devel/flex + ${PYTHON_DEPS} + $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]") +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +QA_WX_LOAD=" +x86? ( + !pic? ( + usr/lib*/libglapi.so.0.0.0 + usr/lib*/libGLESv1_CM.so.1.1.0 + usr/lib*/libGLESv2.so.2.0.0 + usr/lib*/libGL.so.1.2.0 + usr/lib*/libOSMesa.so.8.0.0 + ) +)" + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + python-any-r1_pkg_setup +} + +src_prepare() { + [[ ${PV} == 9999 ]] && eautoreconf +} + +multilib_src_configure() { + local myconf + + if use classic; then + # Configurable DRI drivers + driver_enable swrast + + # Intel code + driver_enable video_cards_i915 i915 + driver_enable video_cards_i965 i965 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + driver_enable video_cards_intel i915 i965 + fi + + # Nouveau code + driver_enable video_cards_nouveau nouveau + + # ATI code + driver_enable video_cards_r100 radeon + driver_enable video_cards_r200 r200 + if ! use video_cards_r100 && \ + ! use video_cards_r200; then + driver_enable video_cards_radeon radeon r200 + fi + fi + + if use egl; then + myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") " + fi + + if use gallium; then + myconf+=" + $(use_enable d3d9 nine) + $(use_enable llvm gallium-llvm) + $(use_enable openmax omx) + $(use_enable vaapi va) + $(use_enable vdpau) + $(use_enable xa) + $(use_enable xvmc) + " + use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers" + + gallium_enable swrast + gallium_enable video_cards_vmware svga + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_i915 i915 + gallium_enable video_cards_ilo ilo + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + gallium_enable video_cards_intel i915 + fi + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + gallium_enable video_cards_freedreno freedreno + # opencl stuff + if use opencl; then + myconf+=" + $(use_enable opencl) + --with-clang-libdir="${EPREFIX}/usr/lib" + " + fi + fi + + # x86 hardened pax_kernel needs glx-read-only-text, bug 240956 + if [[ ${ABI} == x86 ]]; then + myconf+="$(use_enable pax_kernel glx-read-only-text)" + fi + + # on abi_x86_32 hardened we need to have asm disable + if [[ ${ABI} == x86* ]] && use pic; then + myconf+=" --disable-asm" + fi + + # build fails with BSD indent, bug #428112 + use userland_GNU || export INDENT=cat + + ECONF_SOURCE="${S}" \ + econf \ + --enable-dri \ + --enable-glx \ + --enable-shared-glapi \ + $(use_enable !bindist texture-float) \ + $(use_enable d3d9 nine) \ + $(use_enable debug) \ + $(use_enable dri3) \ + $(use_enable egl) \ + $(use_enable gbm) \ + $(use_enable gles1) \ + $(use_enable gles2) \ + $(use_enable nptl glx-tls) \ + $(use_enable osmesa) \ + $(use_enable !udev sysfs) \ + --enable-llvm-shared-libs \ + --with-dri-drivers=${DRI_DRIVERS} \ + --with-gallium-drivers=${GALLIUM_DRIVERS} \ + PYTHON2="${PYTHON}" \ + ${myconf} +} + +multilib_src_install() { + emake install DESTDIR="${D}" + + if use classic || use gallium; then + ebegin "Moving DRI/Gallium drivers for dynamic switching" + local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so ) + keepdir /usr/$(get_libdir)/dri + dodir /usr/$(get_libdir)/mesa + for x in ${gallium_drivers[@]}; do + if [ -f "$(get_libdir)/gallium/${x}" ]; then + mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ + || die "Failed to move ${x}" + fi + done + if use classic; then + emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install + fi + for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do + if [ -f ${x} -o -L ${x} ]; then + mv -f "${x}" "${x/dri/mesa}" \ + || die "Failed to move ${x}" + fi + done + pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed" + ln -s ../mesa/*.so . || die "Creating symlink failed" + # remove symlinks to drivers known to eselect + for x in ${gallium_drivers[@]}; do + if [ -f ${x} -o -L ${x} ]; then + rm "${x}" || die "Failed to remove ${x}" + fi + done + popd + eend $? + fi + if use opencl; then + ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" + local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" + dodir ${cl_dir}/{lib,include} + if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then + mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ + "${ED}"${cl_dir} + fi + if [ -f "${ED}/usr/include/CL/opencl.h" ]; then + mv -f "${ED}"/usr/include/CL \ + "${ED}"${cl_dir}/include + fi + eend $? + fi + + if use openmax; then + echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx" + doenvd "${T}"/99mesaxdgomx + keepdir /usr/share/mesa/xdg + fi +} + +multilib_src_install_all() { + prune_libtool_files --all + einstalldocs + + if use !bindist; then + dodoc docs/patents.txt + fi + + # Install config file for eselect mesa + insinto /usr/share/mesa + newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf +} + +multilib_src_test() { + if use llvm; then + local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf' + pushd src/gallium/drivers/llvmpipe >/dev/null || die + emake ${llvm_tests} + pax-mark m ${llvm_tests} + popd >/dev/null || die + fi + emake check +} + +pkg_postinst() { + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} + + # Select classic/gallium drivers + if use classic || use gallium; then + eselect mesa set --auto + fi + + # Switch to mesa opencl + if use opencl; then + eselect opencl set --use-old ${PN} + fi + + # run omxregister-bellagio to make the OpenMAX drivers known system-wide + if use openmax; then + ebegin "Registering OpenMAX drivers" + BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \ + OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \ + omxregister-bellagio + eend $? + fi + + # warn about patent encumbered texture-float + if use !bindist; then + elog "USE=\"bindist\" was not set. Potentially patent encumbered code was" + elog "enabled. Please see patents.txt for an explanation." + fi + + if ! has_version media-libs/libtxc_dxtn; then + elog "Note that in order to have full S3TC support, it is necessary to install" + elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice" + elog "textures in some apps, and some others even require this to run." + fi +} + +pkg_prerm() { + if use openmax; then + rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister + fi +} + +# $1 - VIDEO_CARDS flag +# other args - names of DRI drivers to enable +# TODO: avoid code duplication for a more elegant implementation +driver_enable() { + case $# in + # for enabling unconditionally + 1) + DRI_DRIVERS+=",$1" + ;; + *) + if use $1; then + shift + for i in $@; do + DRI_DRIVERS+=",${i}" + done + fi + ;; + esac +} + +gallium_enable() { + case $# in + # for enabling unconditionally + 1) + GALLIUM_DRIVERS+=",$1" + ;; + *) + if use $1; then + shift + for i in $@; do + GALLIUM_DRIVERS+=",${i}" + done + fi + ;; + esac +} diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild index e2d2c7527eaf..a101fc4a06b3 100644 --- a/media-libs/opencv/opencv-3.0.0.ebuild +++ b/media-libs/opencv/opencv-3.0.0.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://opencv.org" SRC_URI=" mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip - contrib? ( https://github.com/Itseez/opencv_contrib/archive/172fdb315280325a617fbb9db5ec5631acd8180e.zip -> ${PN}_contrib.zip )" # commit from 6.8.2015 + contrib? ( https://github.com/Itseez/opencv_contrib/archive/2d1fc7a6cdccd04435795f68126151a51071a539.zip -> ${PN}_contrib.zip )" # commit from 26.10.2015 LICENSE="BSD" SLOT="0/3.0" @@ -103,6 +103,9 @@ src_prepare() { -e '/add_subdirectory(.*3rdparty.*)/ d' \ CMakeLists.txt cmake/*cmake || die + #removing broken sample bug #558104 + rm ../opencv_contrib-master/modules/ximgproc/samples/disparity_filtering.cpp + java-pkg-opt-2_src_prepare } diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch new file mode 100644 index 000000000000..039aebc0dc1a --- /dev/null +++ b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch @@ -0,0 +1,61 @@ +From da48b7fceed0238884f341530b5f4d84005dab57 Mon Sep 17 00:00:00 2001 +From: Alex Merry <alex.merry@kde.org> +Date: Sun, 18 Oct 2015 15:21:45 +0100 +Subject: [PATCH] Fix finding recent versions of GStreamer. + +Newer versions of GStreamer put gst-config.h under +lib/gstreamer-1.0/include, so we need to make sure that directory will +be added to the include path as well. + +REVIEW: 125690 +--- + cmake/FindGStreamer.cmake | 26 +++++++++++++++++++++----- + 1 file changed, 21 insertions(+), 5 deletions(-) + +diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake +index d7243d4..e30c349 100644 +--- a/cmake/FindGStreamer.cmake ++++ b/cmake/FindGStreamer.cmake +@@ -36,6 +36,27 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h + PATH_SUFFIXES gstreamer-1.0 + ) + ++IF (NOT GSTREAMER_INCLUDE_DIR) ++ MESSAGE(STATUS "GStreamer: WARNING: include dir not found") ++ENDIF (NOT GSTREAMER_INCLUDE_DIR) ++ ++# Newer versions of GStreamer put gst-config.h under lib/gstreamer-1.0/include ++FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h ++ PATHS ++ ${PKG_GSTREAMER_INCLUDE_DIRS} ++ PATH_SUFFIXES gstreamer-1.0 ++ ) ++ ++IF (NOT GSTREAMER_CONF_INCLUDE_DIR) ++ MESSAGE(STATUS "GStreamer: WARNING: gstconfig.h not found") ++ENDIF (NOT GSTREAMER_CONF_INCLUDE_DIR) ++ ++IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR) ++ IF (NOT GSTREAMER_CONF_INCLUDE_DIR STREQUAL GSTREAMER_INCLUDE_DIR) ++ LIST(APPEND GSTREAMER_INCLUDE_DIR "${GSTREAMER_CONF_INCLUDE_DIR}") ++ ENDIF() ++ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR) ++ + FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0 + PATHS + ${PKG_GSTREAMER_LIBRARY_DIRS} +@@ -51,11 +72,6 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES gstapp-1.0 + ${PKG_GSTREAMER_LIBRARY_DIRS} + ) + +-IF (GSTREAMER_INCLUDE_DIR) +-ELSE (GSTREAMER_INCLUDE_DIR) +- MESSAGE(STATUS "GStreamer: WARNING: include dir not found") +-ENDIF (GSTREAMER_INCLUDE_DIR) +- + IF (GSTREAMER_LIBRARIES) + ELSE (GSTREAMER_LIBRARIES) + MESSAGE(STATUS "GStreamer: WARNING: library not found") +-- +2.4.10 + diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild index 9159564c04c9..4c6c7fdab159 100644 --- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild +++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild @@ -54,6 +54,8 @@ DEPEND="${RDEPEND} [[ ${PV} == 9999 ]] || S=${WORKDIR}/${MY_P} +PATCHES=( "${FILESDIR}/${P}-gstreamer-1.6.0.patch" ) + pkg_setup() { MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) } diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest index 27838fcb95bb..730152c7ce1d 100644 --- a/media-libs/raspberrypi-userland/Manifest +++ b/media-libs/raspberrypi-userland/Manifest @@ -1,3 +1,4 @@ DIST raspberrypi-userland-0_pre20130705.tar.xz 31966608 SHA256 6307cc9d6103cd8afddf1b94ab44c4071f80884ec85d8e5aadd0f2f3d631c713 SHA512 d83de618e8fa6d49bd0b5b265706c7b290fa5800ac9a674dbf3d34222ab25e92c99877d61c4f706292666bf130ee0118ad54f35c8379a281f8ee90ce76a89651 WHIRLPOOL 8077d99e7a970f37bb4961ac928f9860b47be8aee83bff00eb4c44ee511aa322c532c9ff52528aece0897247ed8472aa70c147794aafe546ece8f8a08c5eb208 DIST raspberrypi-userland-0_pre20140117.tar.xz 31998784 SHA256 2999d711465ddbc6b70d429a0253b8a9c1f838351a96f2b25cc86109a879005f SHA512 5c3dfebdcb36a2a17da94cafcc92067b24b454d5694b0bd216dd0d6752c4f505840880094c22125ab5da60f7b53b9114e8d04359a223e9e00be967cb8585e42e WHIRLPOOL 5179758c2be4b45f640eb8759554e19ea4fc8c83e63b0d4396ae84e67ae82e97824bf12f0766df5a70e2ca5b80e90be80e5c9b2eaa968752829765463d3f6d0d DIST raspberrypi-userland-0_pre20140830.tar.xz 32066536 SHA256 f9a06d2ca7d41cdc700b83eeb7c3e06d3ea6bd3fd187880a563144a6bf6ee901 SHA512 775005177e760fff611d7ce7e4beb466ea111dfc4652b97593d1061b97b1ded32979f8666a0aada6338791abab988883bbfd902f267eba5734e8aa932ebcf487 WHIRLPOOL 3066272a88b868ef20f27614f6f680aa6eb8a43cd2e281a7a930b99be341b037fa843a1c36bfdc6be619544e5b4b8751e5ab58c853b1baff44894b39284bfa55 +DIST raspberrypi-userland-0_pre20150921.tar.xz 32395092 SHA256 771bf96111d40c3b86cf2590f22d02306e5f56668f6ee11ace389c719bfccb2b SHA512 0aad096f5c6d54ef1d494708e80f8fb921e30e0d93ced79b4e939afffa8e824e35347595d6f925d1d7ee86917e72fa0b160ad56c8a4df7711d5e87b5cc399be1 WHIRLPOOL 2204dd8f8acf79c3d8baab770e133d18596f00fbf714e9ab46bf4a5ae1a1c0cf9edcbf763bf7fc0403126bb0ca9de7f422a3427dd429d849df6aee1be08b4b6a diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20150921.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20150921.ebuild new file mode 100644 index 000000000000..e18e32c0d016 --- /dev/null +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20150921.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="Raspberry Pi userspace tools and libraries" +HOMEPAGE="https://github.com/raspberrypi/userland" + +if [[ ${PV} == 9999* ]]; then + inherit git-2 + EGIT_REPO_URI="git://github.com/${PN/-//}.git" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="mirror://gentoo/${P}.tar.xz" + KEYWORDS="~arm" +fi + +LICENSE="BSD" +SLOT="0" + +# TODO: +# * port vcfiled init script +# * stuff is still installed to hardcoded /opt/vc location, investigate whether +# anything else depends on it being there +# * live ebuild + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-2_src_unpack + else + default + mv userland-*/ ${P}/ || die + fi +} + +src_prepare() { + # init script for Debian, not useful on Gentoo + sed -i "/DESTINATION \/etc\/init.d/,+2d" interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die +} + +src_configure() { + # toolchain file not needed, but build fails if it is not specified + local mycmakeargs="-DCMAKE_TOOLCHAIN_FILE=/dev/null" + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + doenvd "${FILESDIR}"/04${PN} + + # enable dynamic switching of the GL implementation + dodir /usr/lib/opengl + dosym ../../../opt/vc /usr/lib/opengl/${PN} + + # tell eselect opengl that we do not have libGL + touch "${ED}"/opt/vc/.gles-only +} diff --git a/media-libs/sratom/sratom-0.4.6.ebuild b/media-libs/sratom/sratom-0.4.6.ebuild index 690a9ad6c7c1..d1edc6c89243 100644 --- a/media-libs/sratom/sratom-0.4.6.ebuild +++ b/media-libs/sratom/sratom-0.4.6.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2" LICENSE="ISC" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="doc static-libs test" RDEPEND=">=media-libs/lv2-1.8.1 diff --git a/media-libs/stops/stops-0.3.0-r1.ebuild b/media-libs/stops/stops-0.3.0-r1.ebuild new file mode 100644 index 000000000000..e16f5957eb7a --- /dev/null +++ b/media-libs/stops/stops-0.3.0-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="Organ stops for aeolus by Fons Adriaensen <fons.adriaensen@skynet.be>" +HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html" +SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +src_install() { + insinto /usr/share/${PN} + doins -r *.ae0 Aeolus* waves +} diff --git a/media-libs/wxsvg/Manifest b/media-libs/wxsvg/Manifest index 54ae158ae914..7ef7f180f4e1 100644 --- a/media-libs/wxsvg/Manifest +++ b/media-libs/wxsvg/Manifest @@ -1,3 +1,4 @@ DIST wxsvg-1.1.13.tar.bz2 669378 SHA256 ebaecb322bb7fad97a3cd686bed9827b00afe84063cf2784a7e19891dabd805e SHA512 6c8dddbb274d1d9cd32fdec1c4ac6f73d3497fd2a29ecbe2d6640c2a65a290940faa92fba954c3990b32f713dc89de74e31484263bbd9c2718dc436ca19d2397 WHIRLPOOL 643aa93161028436c30014cb3a2e36cfab53b5f9341d1e21c129eab6e86b756150dc491cc4cf2be0ef6ff956eb7a5ff5c67f8ee1d26879b228e8af18459e9601 DIST wxsvg-1.4.2.tar.bz2 461580 SHA256 c7555eacb786583dda4288fa6f3e914a14ec175be0a02b31d9c4e19f173bd760 SHA512 6b6c8c5bf5b369da75ee9d034f6be8611019f48066d352b7268a127f1d9f9487c4aa694b0f0529efa3c0b63d51f7c38ba503d7cf83f9e930b876ebc4bcbce9e1 WHIRLPOOL 84cc8a7b849cac5ad1045572c5ee0aa267d8a6e0e97db0c61f2896def7e347055330a61bf89cfb64360411681c15e0df567c05b5efe4bc5dc456ba9285d9d219 DIST wxsvg-1.5.4.tar.bz2 478568 SHA256 5ca0ce0fcb45a3f0801b645000e9b5179bab4d62fb56df51f027d75cbef5a655 SHA512 89d909c1db975dcbca464e3d7850277b72e596bb6020d3c796cb235c55fcb9282472b522a1a3a15cc773eb98e8e2c69f463c5085cfc1b66221316d19ca87cf46 WHIRLPOOL c2caf28102c908e6efdaff413224afde2d83a0e24b199b7904696a334b8b9e64f51f91ab6d3a2ed57c69f3ebaaef96bf1ba890d1af600adb92db47ccfcfbf4cf +DIST wxsvg-1.5.5.tar.bz2 478828 SHA256 e6664de4ee2a0481f47f8b718793ef7c14d296ebe7aee4edbf099258cd9525fc SHA512 4b42ba6ea5675f5794e0450809980030175583813db7e4e216dd5d53e92f43c67c0e62208c77e8e455703d62d1e30606a001b28b924c17ed26fd949638340a1b WHIRLPOOL abc95e7b14d0e298d44b0b7d36731f5099de10bd095400ca9c90af67957bc138c2dc0d91c7477b381a88debf6c24a000fb94ebd0b73d31c4d31ff96dc693dcc2 diff --git a/media-libs/wxsvg/files/ffmpeg29.patch b/media-libs/wxsvg/files/ffmpeg29.patch new file mode 100644 index 000000000000..5f191025fea5 --- /dev/null +++ b/media-libs/wxsvg/files/ffmpeg29.patch @@ -0,0 +1,13 @@ +Index: wxsvg-1.5.5/src/mediadec_ffmpeg.cpp +=================================================================== +--- wxsvg-1.5.5.orig/src/mediadec_ffmpeg.cpp ++++ wxsvg-1.5.5/src/mediadec_ffmpeg.cpp +@@ -263,7 +263,7 @@ wxImage wxFfmpegMediaDecoder::GetNextFra + avcodec_decode_video2(m_codecCtx, m_frame, &frameFinished, &packet); + if (frameFinished) { + SwsContext* imgConvertCtx = sws_getContext(m_codecCtx->width, m_codecCtx->height, m_codecCtx->pix_fmt, +- m_width, m_height, PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL); ++ m_width, m_height, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL); + if (imgConvertCtx == NULL) { + av_free_packet(&packet); + return wxImage(); diff --git a/media-libs/wxsvg/wxsvg-1.5.5.ebuild b/media-libs/wxsvg/wxsvg-1.5.5.ebuild new file mode 100644 index 000000000000..aee66deb5ccc --- /dev/null +++ b/media-libs/wxsvg/wxsvg-1.5.5.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +WX_GTK_VER=3.0 +inherit eutils wxwidgets + +DESCRIPTION="C++ library to create, manipulate and render SVG files" +HOMEPAGE="http://wxsvg.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="wxWinLL-3" +SLOT="0/3" # based on SONAME of libwxsvg.so +KEYWORDS="~amd64 ~x86" +IUSE="static-libs libav" + +RDEPEND=">=dev-libs/expat-2:= + >=dev-libs/glib-2.28:2= + dev-libs/libxml2:= + media-libs/fontconfig:= + media-libs/freetype:2= + x11-libs/cairo:= + x11-libs/pango:= + x11-libs/wxGTK:${WX_GTK_VER}=[X] + libav? ( >=media-video/libav-9:0= ) + !libav? ( >=media-video/ffmpeg-2.6:0= )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog TODO ) + +src_prepare() { + epatch "${FILESDIR}/ffmpeg29.patch" +} + +src_configure() { + need-wxwidgets base-unicode + econf \ + $(use_enable static-libs static) \ + --with-wx-config=${WX_CONFIG} +} + +src_install() { + default + prune_libtool_files +} diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest new file mode 100644 index 000000000000..0bd2aca20e52 --- /dev/null +++ b/media-libs/zimg/Manifest @@ -0,0 +1 @@ +DIST zimg-2.0.1.tar.gz 174318 SHA256 be2557bf944dad07edbaf37d3fd5f1911627294b8d0992a8530048e84df082d8 SHA512 213952b2e51fad2f92d989104be188ff6cdc71b0910a1201a5f772e45b1fa90f522a62e85d8725037560e4505f40958a5497d731f3d03f7b890bfdaa5d0ae13c WHIRLPOOL 4918e22cc76a613a1641aba55f5f2d652186ef84a5719d250dfb499d0c8be8c7dd688dcf95d18e93f152479fad4a8543addf5c9a149fc030f354a090e741bcbb diff --git a/sci-chemistry/solve-resolve-bin/metadata.xml b/media-libs/zimg/metadata.xml index ae9ec7c5f6a4..c572c7d9b478 100644 --- a/sci-chemistry/solve-resolve-bin/metadata.xml +++ b/media-libs/zimg/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>sci-chemistry</herd> + <herd>video</herd> <maintainer> - <email>jlec@gentoo.org</email> + <email>media-video@gentoo.org</email> </maintainer> </pkgmetadata> diff --git a/media-libs/zimg/zimg-2.0.1.ebuild b/media-libs/zimg/zimg-2.0.1.ebuild new file mode 100644 index 000000000000..73b4cb907342 --- /dev/null +++ b/media-libs/zimg/zimg-2.0.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=yes + +SCM="" + +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/sekrit-twc/zimg" +fi + +inherit autotools-multilib ${SCM} + +DESCRIPTION="Scaling, colorspace conversion, and dithering library" +HOMEPAGE="https://github.com/sekrit-twc/zimg" + +if [ "${PV#9999}" = "${PV}" ] ; then + SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}-release-${PV}/" +fi + +LICENSE="WTFPL-2" +SLOT="0" +IUSE="static-libs cpu_flags_x86_sse" + +DEPEND="" +RDEPEND="${DEPEND}" + +src_configure() { + autotools-multilib_src_configure \ + $(use_enable cpu_flags_x86_sse x86simd) +} diff --git a/media-libs/zimg/zimg-9999.ebuild b/media-libs/zimg/zimg-9999.ebuild new file mode 100644 index 000000000000..73b4cb907342 --- /dev/null +++ b/media-libs/zimg/zimg-9999.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=yes + +SCM="" + +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/sekrit-twc/zimg" +fi + +inherit autotools-multilib ${SCM} + +DESCRIPTION="Scaling, colorspace conversion, and dithering library" +HOMEPAGE="https://github.com/sekrit-twc/zimg" + +if [ "${PV#9999}" = "${PV}" ] ; then + SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}-release-${PV}/" +fi + +LICENSE="WTFPL-2" +SLOT="0" +IUSE="static-libs cpu_flags_x86_sse" + +DEPEND="" +RDEPEND="${DEPEND}" + +src_configure() { + autotools-multilib_src_configure \ + $(use_enable cpu_flags_x86_sse x86simd) +} diff --git a/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch b/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch index cfc45f4e4261..46c44173e8ac 100644 --- a/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch +++ b/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch @@ -1,8 +1,6 @@ -Index: zita-convolver-2.0.0/libs/Makefile -=================================================================== ---- zita-convolver-2.0.0.orig/libs/Makefile -+++ zita-convolver-2.0.0/libs/Makefile -@@ -28,9 +28,7 @@ VERSION = $(MAJVERS).$(MINVERS) +--- libs/Makefile.orig 2015-10-16 16:00:45.639918246 +0100 ++++ libs/Makefile 2015-10-28 15:52:17.539967709 +0000 +@@ -28,9 +28,8 @@ DISTDIR = zita-convolver-$(VERSION) @@ -10,10 +8,11 @@ Index: zita-convolver-2.0.0/libs/Makefile -CPPFLAGS += -mmmx -msse -mfpmath=sse -ffast-math -funroll-loops -fpermissive -CPPFLAGS += -march=i686 +CPPFLAGS += -Wall -I. -fPIC -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS ++CXXFLAGS += -ffast-math #CPPFLAGS += -DVECTORIZE LDLFAGS += -@@ -46,7 +44,7 @@ ZITA-CONVOLVER_H = zita-convolver.h +@@ -46,7 +45,7 @@ $(ZITA-CONVOLVER_MIN): $(ZITA-CONVOLVER_O) @@ -22,11 +21,13 @@ Index: zita-convolver-2.0.0/libs/Makefile install: $(ZITA-CONVOLVER_MIN) -@@ -54,7 +52,6 @@ install: $(ZITA-CONVOLVER_MIN) +@@ -54,8 +53,8 @@ install -d $(PREFIX)/$(LIBDIR) install -m 644 $(ZITA-CONVOLVER_H) $(PREFIX)/include install -m 755 $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR) - ldconfig ln -sf $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO) ++ ln -sf $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_MAJ) + clean: diff --git a/media-libs/zita-convolver/zita-convolver-2.0.0-r1.ebuild b/media-libs/zita-convolver/zita-convolver-2.0.0-r1.ebuild new file mode 100644 index 000000000000..86eeeacb498d --- /dev/null +++ b/media-libs/zita-convolver/zita-convolver-2.0.0-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils flag-o-matic multilib toolchain-funcs + +DESCRIPTION="C++ library implementing a real-time convolution matrix" +HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html" +SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cpu_flags_x86_sse" + +RDEPEND="sci-libs/fftw:3.0=" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${P}/libs + +src_prepare() { + epatch "${FILESDIR}"/${P}-makefile.patch +} + +src_compile() { + # upstream defaults to this on x86 but patched out of the Makefile + # try to reenable optimisation for x86 and allow building on other arch's + use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse" + + emake CXX="$(tc-getCXX)" +} + +src_install() { + emake PREFIX="${ED}/usr" LIBDIR="$(get_libdir)" install + dodoc "${WORKDIR}/${P}/AUTHORS" +} diff --git a/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild b/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild new file mode 100644 index 000000000000..94fb168cdb7b --- /dev/null +++ b/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit multilib toolchain-funcs eutils + +MY_P=${P/amb/AMB} + +DESCRIPTION="AMB-plugins ladspa plugin package. Filters by Fons Adriaensen" +HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/" +SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="media-libs/ladspa-sdk" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch "${FILESDIR}/${P}-Makefile.patch" +} + +src_compile() { + emake CXX="$(tc-getCXX)" +} + +src_install() { + dodoc AUTHORS README + insinto /usr/$(get_libdir)/ladspa + insopts -m0755 + doins *.so +} diff --git a/media-plugins/fil-plugins/fil-plugins-0.3.0-r1.ebuild b/media-plugins/fil-plugins/fil-plugins-0.3.0-r1.ebuild new file mode 100644 index 000000000000..14011da48205 --- /dev/null +++ b/media-plugins/fil-plugins/fil-plugins-0.3.0-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils multilib toolchain-funcs + +MY_P=${P/fil/FIL} + +DESCRIPTION="FIL-plugins ladspa plugin package. Filters by Fons Adriaensen" +HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/" +SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND="media-libs/ladspa-sdk" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch "${FILESDIR}/${PN}-makefile.patch" +} + +src_compile() { + emake CXX="$(tc-getCXX)" +} + +src_install() { + dodoc AUTHORS README + insinto /usr/$(get_libdir)/ladspa + insopts -m0755 + doins *.so +} diff --git a/media-plugins/gst-plugins-a52dec/Manifest b/media-plugins/gst-plugins-a52dec/Manifest index b14ec571d6ff..ba8aa210d826 100644 --- a/media-plugins/gst-plugins-a52dec/Manifest +++ b/media-plugins/gst-plugins-a52dec/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e +DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57 diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.0.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.0.ebuild new file mode 100644 index 000000000000..08fa4b1aedfe --- /dev/null +++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-ugly + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="+orc" + +RDEPEND=" + >=media-libs/a52dec-0.7.4-r6[${MULTILIB_USEDEP}] + orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-amr/Manifest b/media-plugins/gst-plugins-amr/Manifest index 4172f1d8942a..55a98c4b5759 100644 --- a/media-plugins/gst-plugins-amr/Manifest +++ b/media-plugins/gst-plugins-amr/Manifest @@ -2,3 +2,4 @@ DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe6357 DIST gst-plugins-ugly-1.2.3.tar.xz 843156 SHA256 537b0a7607eee499026388bb705b5b68985a3fd59fe22ee09accaf8cdf57eb3b SHA512 fdfd22360cf1cb6ba203fb8a5a2a98658c898a41c630e4b466a4a34749b537ea387eee1069adb73bbbacd2da89632c56cd2cf8c371c315b75b11a49f5b9c4beb WHIRLPOOL 0a24e29f2e06d714059c2a83662fbd011808ba2a1996453c4aa44624efeef2a00fd6a4c578332548fc22494c9c1be93497a133f7ce87ab6325198e3465cc9f42 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e +DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57 diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.0.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.0.ebuild new file mode 100644 index 000000000000..6a944bbf1e61 --- /dev/null +++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-ugly + +inherit gstreamer + +DESCRIPTION="GStreamer plugin for AMRNB/AMRWB codec" +HOMEPAGE="http://gstreamer.freedesktop.org/" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +GST_PLUGINS_BUILD="amrnb amrwb" +GST_PLUGINS_BUILD_DIR="amrnb amrwbdec" diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-assrender/Manifest +++ b/media-plugins/gst-plugins-assrender/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.0.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.0.ebuild new file mode 100644 index 000000000000..285087c2d037 --- /dev/null +++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPTION="GStreamer plugin for ASS/SSA rendering with effects support" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +IUSE="" + +RDEPEND=">=media-libs/libass-0.10.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-cdio/Manifest b/media-plugins/gst-plugins-cdio/Manifest index b14ec571d6ff..ba8aa210d826 100644 --- a/media-plugins/gst-plugins-cdio/Manifest +++ b/media-plugins/gst-plugins-cdio/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e +DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57 diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.0.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.0.ebuild new file mode 100644 index 000000000000..bec73c95e324 --- /dev/null +++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-ugly + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest index d183ce5f3329..b7dbc525abb2 100644 --- a/media-plugins/gst-plugins-cdparanoia/Manifest +++ b/media-plugins/gst-plugins-cdparanoia/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d DIST gst-plugins-base-1.2.4.tar.xz 2538012 SHA256 4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550 SHA512 8e7e7fd494ee2335e917dae3fef93a2103db37c8cc645ccf1f63b7e6676a6cc6fee78bb90e43f8ccacab367788a416600577cb3d9630e9d64258ecb3dbe63338 WHIRLPOOL 173b2c71b2be05db75ef0d7c344b64ec5d74ba291cc8058546a2963257a1af8e7699737214e11c2d811e6349a008386f822a82f5fe5f5491f5faca64e9d8f20d DIST gst-plugins-base-1.4.5.tar.xz 2637680 SHA256 77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d SHA512 63d3c531de736ad8a64d6962c0af75857d3b016d7f8e85d1884e8de50e64576902bb1161161b74130ab5dfb1d453eb995e374d8a958eac6e44ae5272eeaaf8b6 WHIRLPOOL cf6ef1c9589ed7a39be74e7663b0821c81b1b4cffdd612ccd7fd5b7929508af21d68817530a4b0fb2517f3a7044ee068afba7602816fdd0ada31444f0bcf8383 +DIST gst-plugins-base-1.6.0.tar.xz 2833380 SHA256 314fd1b707f65caf8eb6164d9422fc51e2b220a890ccd2de6ec03a2883d77231 SHA512 fea97754117f7a923e6622211a218ab1d1d4cbb30f8025777462df5c622061710236477af42df6ea6b817e155d2165af353d6f44b5609b87187ab2fb63aaf406 WHIRLPOOL 97696f2d44bbfd08ccf004493948b890fb28527a6fac2c2a04fe06e395a36a66a945e2153659e9324c5e22adf8af27c8426632379e0f734dddfc7b6661c1d3fa diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.0.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.0.ebuild new file mode 100644 index 000000000000..5832bc2ad012 --- /dev/null +++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-base +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +src_prepare() { + gstreamer_system_link gst-libs/gst/audio:gstreamer-audio +} diff --git a/media-plugins/gst-plugins-dash/Manifest b/media-plugins/gst-plugins-dash/Manifest index a9a03522c82f..8c170de2de7f 100644 --- a/media-plugins/gst-plugins-dash/Manifest +++ b/media-plugins/gst-plugins-dash/Manifest @@ -1,2 +1,3 @@ DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.0.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.0.ebuild new file mode 100644 index 000000000000..7bbdb2186061 --- /dev/null +++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPTION="MPEG-DASH plugin" + +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +src_prepare() { + # FIXME: gsturidownloader does not have a .pc + # gstreamer_system_link \ + # gst-libs/gst/uridownloader:gsturidownloader \ + # gst-libs/gst/adaptativedemux:gstadaptivedemux + + local directory libs + directory="gst-libs/gst/uridownloader" + libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0" + sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \ + -i ext/dash/Makefile.{am,in} || die + + directory="gst-libs/gst/adaptivedemux" + libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0" + sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \ + -i ext/dash/Makefile.{am,in} || die +} diff --git a/media-plugins/gst-plugins-dts/Manifest b/media-plugins/gst-plugins-dts/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-dts/Manifest +++ b/media-plugins/gst-plugins-dts/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.0.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.0.ebuild new file mode 100644 index 000000000000..fdc401c0dfa1 --- /dev/null +++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" +IUSE="+orc" + +RDEPEND=" + >=media-libs/libdca-0.0.5-r3[${MULTILIB_USEDEP}] + orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-dv/Manifest b/media-plugins/gst-plugins-dv/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-dv/Manifest +++ b/media-plugins/gst-plugins-dv/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.0.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.0.ebuild new file mode 100644 index 000000000000..1a532d025913 --- /dev/null +++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPTION="GStreamer plugin to demux and decode DV" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +IUSE="" + +RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +GST_PLUGINS_BUILD="libdv" diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-dvb/Manifest +++ b/media-plugins/gst-plugins-dvb/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.0.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.0.ebuild new file mode 100644 index 000000000000..227f18446321 --- /dev/null +++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPION="GStreamer plugin to allow capture from dvb devices" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND="" +DEPEND="virtual/os-headers" + +multilib_src_compile() { + # Prepare generated headers + emake -C gst-libs/gst/mpegts + gstreamer_multilib_src_compile +} diff --git a/media-plugins/gst-plugins-dvdread/Manifest b/media-plugins/gst-plugins-dvdread/Manifest index b14ec571d6ff..ba8aa210d826 100644 --- a/media-plugins/gst-plugins-dvdread/Manifest +++ b/media-plugins/gst-plugins-dvdread/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e +DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57 diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.0.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.0.ebuild new file mode 100644 index 000000000000..a5f5bbf682f8 --- /dev/null +++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-ugly + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-faac/Manifest +++ b/media-plugins/gst-plugins-faac/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.0.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.0.ebuild new file mode 100644 index 000000000000..1e7ec41a0a85 --- /dev/null +++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-faad/Manifest +++ b/media-plugins/gst-plugins-faad/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.0.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.0.ebuild new file mode 100644 index 000000000000..c6d0af713c11 --- /dev/null +++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-flac/Manifest +++ b/media-plugins/gst-plugins-flac/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.0.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.0.ebuild new file mode 100644 index 000000000000..b1b66f21b7cb --- /dev/null +++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE="gst-plugins-good" +inherit gstreamer + +DESCRIPTION="GStreamer encoder/decoder/tagger for FLAC" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-gdkpixbuf/Manifest +++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.0.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.0.ebuild new file mode 100644 index 000000000000..1f90bf3fe56e --- /dev/null +++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPION="GdkPixbuf-based image decoder, overlay and sink" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +GST_PLUGINS_BUILD="gdk_pixbuf" +GST_PLUGINS_BUILD_DIR="gdk_pixbuf" diff --git a/media-plugins/gst-plugins-hls/Manifest b/media-plugins/gst-plugins-hls/Manifest index a9a03522c82f..8c170de2de7f 100644 --- a/media-plugins/gst-plugins-hls/Manifest +++ b/media-plugins/gst-plugins-hls/Manifest @@ -1,2 +1,3 @@ DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.0.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.0.ebuild new file mode 100644 index 000000000000..45fa0f57e06d --- /dev/null +++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPTION="HTTP live streaming plugin" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# FIXME: automagic fallback from nettle to libgcrypt to openssl +RDEPEND=" + dev-libs/nettle:0=[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" + +src_prepare() { + # FIXME: gsturidownloader does not have a .pc + # gstreamer_system_link \ + # gst-libs/gst/uridownloader:gsturidownloader \ + # gst-libs/gst/adaptativedemux:gstadaptivedemux + + local directory libs + directory="gst-libs/gst/uridownloader" + libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0" + sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \ + -i ext/hls/Makefile.{am,in} || die + + directory="gst-libs/gst/adaptivedemux" + libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0" + sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \ + -i ext/hls/Makefile.{am,in} || die +} diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-jack/Manifest +++ b/media-plugins/gst-plugins-jack/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.0.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.0.ebuild new file mode 100644 index 000000000000..c683268718f5 --- /dev/null +++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPION="GStreamer source/sink to transfer audio data with JACK ports" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +IUSE="" + +RDEPEND=">=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-jpeg/Manifest +++ b/media-plugins/gst-plugins-jpeg/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31-r1.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31-r1.ebuild index f198d3c8b314..06eed1c327d0 100644 --- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31-r1.ebuild +++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,6 +11,6 @@ DESCRIPTION="GStreamer encoder/decoder for JPEG format" KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86" IUSE="" -RDEPEND=">=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] +RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] >=media-libs/gst-plugins-base-0.10.36:${SLOT}[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.2.4-r1.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.2.4-r1.ebuild index ebfb0d33cb25..cb4ed8948e8c 100644 --- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.2.4-r1.ebuild +++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.2.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,5 +11,5 @@ DESCRIPTION="GStreamer encoder/decoder for JPEG format" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" IUSE="" -RDEPEND=">=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]" +RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.4.5.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.4.5.ebuild index c03a9fa28fcd..cb4ed8948e8c 100644 --- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.4.5.ebuild +++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.4.5.ebuild @@ -11,5 +11,5 @@ DESCRIPTION="GStreamer encoder/decoder for JPEG format" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" IUSE="" -RDEPEND=">=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]" +RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.0.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.0.ebuild new file mode 100644 index 000000000000..6f76f5ca2f08 --- /dev/null +++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPTION="GStreamer encoder/decoder for JPEG format" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest index b14ec571d6ff..ba8aa210d826 100644 --- a/media-plugins/gst-plugins-lame/Manifest +++ b/media-plugins/gst-plugins-lame/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e +DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57 diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.0.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.0.ebuild new file mode 100644 index 000000000000..ea1442d8b665 --- /dev/null +++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-ugly + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest index 8ecd88965311..c16e7fc5819a 100644 --- a/media-plugins/gst-plugins-libav/Manifest +++ b/media-plugins/gst-plugins-libav/Manifest @@ -1 +1,2 @@ DIST gst-libav-1.4.5.tar.xz 5220508 SHA256 605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc SHA512 a2f9250a51440358d205ef160119498d52cf4944fe810e736e4561f2cdbb8dabad6220d6e4da507f013c42bea69ce72acc373982642278de0a03605bbcd4f75f WHIRLPOOL 075ad91101def8ee8958eaf3051390a76efa3860a4d6796b7f5f86f9b175ca493aa3094e59b24b19c59025337683178f43346e887d7b5efe46b0f9aeadcd28d2 +DIST gst-libav-1.6.0.tar.xz 7687504 SHA256 6cca6cf73182a882768ef0c860af88c2fd2c77e2c81ce464a998ab4e6baa604c SHA512 5a8290f87bb2c75a8f1d33f242844dfbaf09be511b7966841b766ffa28029ffe8e44b01847014876e5fda4de69db017edbbacc08734545b40674cbe29de570e9 WHIRLPOOL a85128532443bef7ce61c69ea2c37584e9ea7fba0e5e67bbb19d0f9b0b79174c9306ee4bb13ebcf0a44d07add09d054f6558632c6b31dbecb992a46c40dc6345 diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.0.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.0.ebuild new file mode 100644 index 000000000000..cb8d237fe6f5 --- /dev/null +++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +inherit eutils flag-o-matic multilib-minimal + +MY_PN="gst-libav" +DESCRIPTION="FFmpeg based gstreamer plugin" +HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html" +SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz" + +LICENSE="GPL-2" +SLOT="1.0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="libav +orc" + +# XXX: bzip2/lzma are automagic +RDEPEND=" + app-arch/bzip2 + app-arch/xz-utils + >=media-libs/gstreamer-1.4.0:1.0[${MULTILIB_USEDEP}] + >=media-libs/gst-plugins-base-1.4.0:1.0[${MULTILIB_USEDEP}] + !libav? ( >=media-video/ffmpeg-2.2:0=[${MULTILIB_USEDEP}] ) + libav? ( >=media-video/libav-10:0=[${MULTILIB_USEDEP}] ) + orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.12 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +multilib_src_configure() { + GST_PLUGINS_BUILD="" + # always use system ffmpeg/libav if possible + ECONF_SOURCE=${S} \ + econf \ + --disable-maintainer-mode \ + --with-package-name="Gentoo GStreamer ebuild" \ + --with-package-origin="https://www.gentoo.org" \ + --disable-fatal-warnings \ + --with-system-libav \ + $(use_enable orc) +} + +multilib_src_compile() { + # Don't build with -Werror + emake ERROR_CFLAGS= +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files --modules +} diff --git a/media-plugins/gst-plugins-libmms/Manifest b/media-plugins/gst-plugins-libmms/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-libmms/Manifest +++ b/media-plugins/gst-plugins-libmms/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.0.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.0.ebuild new file mode 100644 index 000000000000..3dcf3fab8580 --- /dev/null +++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +IUSE="" + +RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-libpng/Manifest +++ b/media-plugins/gst-plugins-libpng/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.0.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.0.ebuild new file mode 100644 index 000000000000..e6549813842d --- /dev/null +++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPTION="GStreamer encoder/decoder for PNG images" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest index d183ce5f3329..b7dbc525abb2 100644 --- a/media-plugins/gst-plugins-libvisual/Manifest +++ b/media-plugins/gst-plugins-libvisual/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d DIST gst-plugins-base-1.2.4.tar.xz 2538012 SHA256 4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550 SHA512 8e7e7fd494ee2335e917dae3fef93a2103db37c8cc645ccf1f63b7e6676a6cc6fee78bb90e43f8ccacab367788a416600577cb3d9630e9d64258ecb3dbe63338 WHIRLPOOL 173b2c71b2be05db75ef0d7c344b64ec5d74ba291cc8058546a2963257a1af8e7699737214e11c2d811e6349a008386f822a82f5fe5f5491f5faca64e9d8f20d DIST gst-plugins-base-1.4.5.tar.xz 2637680 SHA256 77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d SHA512 63d3c531de736ad8a64d6962c0af75857d3b016d7f8e85d1884e8de50e64576902bb1161161b74130ab5dfb1d453eb995e374d8a958eac6e44ae5272eeaaf8b6 WHIRLPOOL cf6ef1c9589ed7a39be74e7663b0821c81b1b4cffdd612ccd7fd5b7929508af21d68817530a4b0fb2517f3a7044ee068afba7602816fdd0ada31444f0bcf8383 +DIST gst-plugins-base-1.6.0.tar.xz 2833380 SHA256 314fd1b707f65caf8eb6164d9422fc51e2b220a890ccd2de6ec03a2883d77231 SHA512 fea97754117f7a923e6622211a218ab1d1d4cbb30f8025777462df5c622061710236477af42df6ea6b817e155d2165af353d6f44b5609b87187ab2fb63aaf406 WHIRLPOOL 97696f2d44bbfd08ccf004493948b890fb28527a6fac2c2a04fe06e395a36a66a945e2153659e9324c5e22adf8af27c8426632379e0f734dddfc7b6661c1d3fa diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.0.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.0.ebuild new file mode 100644 index 000000000000..8eca90c395cc --- /dev/null +++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-base +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +IUSE="" + +RDEPEND=">=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}] + >=media-plugins/libvisual-plugins-0.4.0-r3[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +src_prepare() { + gstreamer_system_link \ + gst-libs/gst/audio:gstreamer-audio \ + gst-libs/gst/video:gstreamer-video +} diff --git a/media-plugins/gst-plugins-mad/Manifest b/media-plugins/gst-plugins-mad/Manifest index b14ec571d6ff..ba8aa210d826 100644 --- a/media-plugins/gst-plugins-mad/Manifest +++ b/media-plugins/gst-plugins-mad/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e +DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57 diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.0.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.0.ebuild new file mode 100644 index 000000000000..5506eba09628 --- /dev/null +++ b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-ugly + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=">=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.ebuild new file mode 100644 index 000000000000..a739ca93262d --- /dev/null +++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit multilib-build + +DESCRIPTION="Meta ebuild to pull in gst plugins for apps" +HOMEPAGE="https://www.gentoo.org" + +LICENSE="metapackage" +SLOT="1.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264" +REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )" + +RDEPEND=" + >=media-libs/gstreamer-1.6:1.0[${MULTILIB_USEDEP}] + >=media-libs/gst-plugins-base-1.6:1.0[alsa?,ogg?,theora?,vorbis?,X?,${MULTILIB_USEDEP}] + >=media-libs/gst-plugins-good-1.6:1.0[${MULTILIB_USEDEP}] + a52? ( >=media-plugins/gst-plugins-a52dec-1.6:1.0[${MULTILIB_USEDEP}] ) + aac? ( >=media-plugins/gst-plugins-faad-1.6:1.0[${MULTILIB_USEDEP}] ) + cdda? ( || ( + >=media-plugins/gst-plugins-cdparanoia-1.6:1.0[${MULTILIB_USEDEP}] + >=media-plugins/gst-plugins-cdio-1.6:1.0[${MULTILIB_USEDEP}] ) ) + dts? ( >=media-plugins/gst-plugins-dts-1.6:1.0[${MULTILIB_USEDEP}] ) + dv? ( >=media-plugins/gst-plugins-dv-1.6:1.0[${MULTILIB_USEDEP}] ) + dvb? ( + >=media-plugins/gst-plugins-dvb-1.6:1.0[${MULTILIB_USEDEP}] + >=media-libs/gst-plugins-bad-1.6:1.0[${MULTILIB_USEDEP}] ) + dvd? ( + >=media-libs/gst-plugins-ugly-1.6:1.0[${MULTILIB_USEDEP}] + >=media-plugins/gst-plugins-a52dec-1.6:1.0[${MULTILIB_USEDEP}] + >=media-plugins/gst-plugins-dvdread-1.6:1.0[${MULTILIB_USEDEP}] + >=media-plugins/gst-plugins-mpeg2dec-1.6:1.0[${MULTILIB_USEDEP}] + >=media-plugins/gst-plugins-resindvd-1.6:1.0[${MULTILIB_USEDEP}] ) + ffmpeg? ( >=media-plugins/gst-plugins-libav-1.4.5:1.0[${MULTILIB_USEDEP}] ) + flac? ( >=media-plugins/gst-plugins-flac-1.6:1.0[${MULTILIB_USEDEP}] ) + http? ( >=media-plugins/gst-plugins-soup-1.6:1.0[${MULTILIB_USEDEP}] ) + jack? ( >=media-plugins/gst-plugins-jack-1.6:1.0[${MULTILIB_USEDEP}] ) + lame? ( >=media-plugins/gst-plugins-lame-1.6:1.0[${MULTILIB_USEDEP}] ) + libass? ( >=media-plugins/gst-plugins-assrender-1.6:1.0[${MULTILIB_USEDEP}] ) + libvisual? ( >=media-plugins/gst-plugins-libvisual-1.6:1.0[${MULTILIB_USEDEP}] ) + mms? ( >=media-plugins/gst-plugins-libmms-1.6:1.0[${MULTILIB_USEDEP}] ) + modplug? ( >=media-plugins/gst-plugins-modplug-1.6:1.0[${MULTILIB_USEDEP}] ) + mp3? ( + >=media-libs/gst-plugins-ugly-1.6:1.0[${MULTILIB_USEDEP}] + >=media-plugins/gst-plugins-mad-1.6:1.0[${MULTILIB_USEDEP}] ) + mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.6:1.0[${MULTILIB_USEDEP}] ) + opus? ( >=media-plugins/gst-plugins-opus-1.6:1.0[${MULTILIB_USEDEP}] ) + oss? ( >=media-plugins/gst-plugins-oss-1.6:1.0[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.6:1.0[${MULTILIB_USEDEP}] ) + taglib? ( >=media-plugins/gst-plugins-taglib-1.6:1.0[${MULTILIB_USEDEP}] ) + v4l? ( >=media-plugins/gst-plugins-v4l2-1.6:1.0[${MULTILIB_USEDEP}] ) + vaapi? ( >=media-plugins/gst-plugins-vaapi-0.6:1.0[${MULTILIB_USEDEP}] ) + vcd? ( + >=media-plugins/gst-plugins-mplex-1.6:1.0[${MULTILIB_USEDEP}] + >=media-plugins/gst-plugins-mpeg2dec-1.6:1.0[${MULTILIB_USEDEP}] ) + vpx? ( >=media-plugins/gst-plugins-vpx-1.6:1.0[${MULTILIB_USEDEP}] ) + wavpack? ( >=media-plugins/gst-plugins-wavpack-1.6:1.0[${MULTILIB_USEDEP}] ) + x264? ( >=media-plugins/gst-plugins-x264-1.6:1.0[${MULTILIB_USEDEP}] ) +" + +# Usage note: +# The idea is that apps depend on this for optional gstreamer plugins. Then, +# when USE flags change, no app gets rebuilt, and all apps that can make use of +# the new plugin automatically do. + +# When adding deps here, make sure the keywords on the gst-plugin are valid. diff --git a/media-plugins/gst-plugins-mimic/Manifest b/media-plugins/gst-plugins-mimic/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-mimic/Manifest +++ b/media-plugins/gst-plugins-mimic/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.0.ebuild b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.0.ebuild new file mode 100644 index 000000000000..bc8ad062e69b --- /dev/null +++ b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPTION="GStreamer plugin for the MIMIC codec" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND=">=media-libs/libmimic-1.0.4-r2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-modplug/Manifest +++ b/media-plugins/gst-plugins-modplug/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.0.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.0.ebuild new file mode 100644 index 000000000000..b8abc134e585 --- /dev/null +++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-mpeg2dec/Manifest b/media-plugins/gst-plugins-mpeg2dec/Manifest index b14ec571d6ff..ba8aa210d826 100644 --- a/media-plugins/gst-plugins-mpeg2dec/Manifest +++ b/media-plugins/gst-plugins-mpeg2dec/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e +DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57 diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.0.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.0.ebuild new file mode 100644 index 000000000000..880137c223a1 --- /dev/null +++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-ugly + +inherit gstreamer + +DESCRIPTION="Libmpeg2 based decoder plug-in for gstreamer" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-mpeg2enc/Manifest b/media-plugins/gst-plugins-mpeg2enc/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-mpeg2enc/Manifest +++ b/media-plugins/gst-plugins-mpeg2enc/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.0.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.0.ebuild new file mode 100644 index 000000000000..d713d50ebb72 --- /dev/null +++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-mplex/Manifest b/media-plugins/gst-plugins-mplex/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-mplex/Manifest +++ b/media-plugins/gst-plugins-mplex/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.0.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.0.ebuild new file mode 100644 index 000000000000..fce45c672458 --- /dev/null +++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPTION="GStreamer plugin for MPEG/DVD/SVCD/VCD video/audio multiplexing" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +IUSE="" + +RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-neon/Manifest b/media-plugins/gst-plugins-neon/Manifest index bbdabccf01cf..ba964f62ed41 100644 --- a/media-plugins/gst-plugins-neon/Manifest +++ b/media-plugins/gst-plugins-neon/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.3.tar.xz 3281880 SHA256 595d7911a9e6207dea37200587724bdbf841b81a5eb0730118be36976684278c SHA512 6b2715ab455acbc215b88fdbdfd1ebdd5ebd89b1dbcd15b289df416f4b09e53e2bef51bc69c26c830d5743161738675ae89db4ff11b72d29797a2d084ebc142f WHIRLPOOL 93245288a7f5e4686cff87188ccf3bd2bfa5fccc2155ceefb1114a52eef607460449b7e8ac1cdc6351b488b0272f8ca506c558766930f3165c9cc42d4609b7ab DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.0.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.0.ebuild new file mode 100644 index 000000000000..c0ef6a2afd3a --- /dev/null +++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-bad +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-ofa/Manifest b/media-plugins/gst-plugins-ofa/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-ofa/Manifest +++ b/media-plugins/gst-plugins-ofa/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.0.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.0.ebuild new file mode 100644 index 000000000000..d936b4e7ea6f --- /dev/null +++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-opus/Manifest +++ b/media-plugins/gst-plugins-opus/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.0.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.0.ebuild new file mode 100644 index 000000000000..64581ee6589a --- /dev/null +++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPTION="GStreamer plugin for Opus audio codec support" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +IUSE="" + +COMMON_DEPEND=">=media-libs/opus-1.0.2-r2:=[${MULTILIB_USEDEP}]" + +RDEPEND="${COMMON_DEPEND} + media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP},ogg] +" +DEPEND="${COMMON_DEPEND}" diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-oss/Manifest +++ b/media-plugins/gst-plugins-oss/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.0.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.0.ebuild new file mode 100644 index 000000000000..c7a9cca41fd0 --- /dev/null +++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPTION="GStreamer plugin for OSS (Open Sound System) support" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd" +IUSE="" + +RDEPEND="" +DEPEND="virtual/os-headers" diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-pulse/Manifest +++ b/media-plugins/gst-plugins-pulse/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.0.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.0.ebuild new file mode 100644 index 000000000000..35abd1df50fe --- /dev/null +++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPTION="GStreamer plugin for the PulseAudio sound server" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="" + +RDEPEND=">=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-raw1394/Manifest b/media-plugins/gst-plugins-raw1394/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-raw1394/Manifest +++ b/media-plugins/gst-plugins-raw1394/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.0.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.0.ebuild new file mode 100644 index 000000000000..8d528218d8c3 --- /dev/null +++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPTION="GStreamer plugin to capture firewire video" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND=" + >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] + >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" + +GST_PLUGINS_BUILD="dv1394" +GST_PLUGINS_BUILD_DIR="raw1394" diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-resindvd/Manifest +++ b/media-plugins/gst-plugins-resindvd/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.0.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.0.ebuild new file mode 100644 index 000000000000..8e8bd2a8a4f1 --- /dev/null +++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +IUSE="" + +RDEPEND=" + >=media-libs/libdvdnav-4.2.0-r1[${MULTILIB_USEDEP}] + >=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-rtmp/Manifest b/media-plugins/gst-plugins-rtmp/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-rtmp/Manifest +++ b/media-plugins/gst-plugins-rtmp/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.0.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.0.ebuild new file mode 100644 index 000000000000..d303c16504b9 --- /dev/null +++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPTION="GStreamer plugin for supporting RTMP sources" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-schroedinger/Manifest b/media-plugins/gst-plugins-schroedinger/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-schroedinger/Manifest +++ b/media-plugins/gst-plugins-schroedinger/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.0.ebuild b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.0.ebuild new file mode 100644 index 000000000000..9165f4a763e7 --- /dev/null +++ b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +GST_PLUGINS_BUILD="schro" +GST_PLUGINS_BUILD_DIR="schroedinger" diff --git a/media-plugins/gst-plugins-shout2/Manifest b/media-plugins/gst-plugins-shout2/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-shout2/Manifest +++ b/media-plugins/gst-plugins-shout2/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.0.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.0.ebuild new file mode 100644 index 000000000000..88927971e67b --- /dev/null +++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPTION="GStreamer plugin to send data to an icecast server" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-sidplay/Manifest b/media-plugins/gst-plugins-sidplay/Manifest index b14ec571d6ff..ba8aa210d826 100644 --- a/media-plugins/gst-plugins-sidplay/Manifest +++ b/media-plugins/gst-plugins-sidplay/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e +DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57 diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.0.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.0.ebuild new file mode 100644 index 000000000000..a4dd29441a63 --- /dev/null +++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-ugly + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-smoothstreaming/Manifest b/media-plugins/gst-plugins-smoothstreaming/Manifest index a9a03522c82f..8c170de2de7f 100644 --- a/media-plugins/gst-plugins-smoothstreaming/Manifest +++ b/media-plugins/gst-plugins-smoothstreaming/Manifest @@ -1,2 +1,3 @@ DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.0.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.0.ebuild new file mode 100644 index 000000000000..30167d6140fc --- /dev/null +++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPTION="Smooth Streaming plugin" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +src_prepare() { + # FIXME: gsturidownloader does not have a .pc + # gst-libs/gst/uridownloader:gsturidownloader \ + # gst-libs/gst/adaptativedemux:gstadaptivedemux + gstreamer_system_link \ + gst-libs/gst/codecparsers:gstreamer-codecparsers + + local directory libs + directory="gst-libs/gst/uridownloader" + libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0" + sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \ + -i ext/smoothstreaming/Makefile.{am,in} || die + + directory="gst-libs/gst/adaptivedemux" + libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0" + sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \ + -i ext/smoothstreaming/Makefile.{am,in} || die +} diff --git a/media-plugins/gst-plugins-soundtouch/Manifest b/media-plugins/gst-plugins-soundtouch/Manifest index e3144f612be1..fd1718e44499 100644 --- a/media-plugins/gst-plugins-soundtouch/Manifest +++ b/media-plugins/gst-plugins-soundtouch/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.0.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.0.ebuild new file mode 100644 index 000000000000..180630d34da1 --- /dev/null +++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPTION="GStreamer elements for beats-per-minute detection and pitch controlling" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-soup/Manifest +++ b/media-plugins/gst-plugins-soup/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.0.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.0.ebuild new file mode 100644 index 000000000000..e555cee34472 --- /dev/null +++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPTION="GStreamer plugin for HTTP client source/sink" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos" +IUSE="" + +# Depend on >=net-libs/libsoup-2.47.0 once it is stable (see LIBSOUP_DOES_NOT_STEAL_OUR_CONTEXT in ext/soup) +RDEPEND=">=net-libs/libsoup-2.44.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-speex/Manifest b/media-plugins/gst-plugins-speex/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-speex/Manifest +++ b/media-plugins/gst-plugins-speex/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.0.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.0.ebuild new file mode 100644 index 000000000000..a8108a39e102 --- /dev/null +++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPTION="GStreamer plugin to allow encoding and decoding of speex" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-taglib/Manifest b/media-plugins/gst-plugins-taglib/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-taglib/Manifest +++ b/media-plugins/gst-plugins-taglib/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.0.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.0.ebuild new file mode 100644 index 000000000000..224155f71918 --- /dev/null +++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPTION="GStreamer taglib based tag handler" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest index b14ec571d6ff..ba8aa210d826 100644 --- a/media-plugins/gst-plugins-twolame/Manifest +++ b/media-plugins/gst-plugins-twolame/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e +DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57 diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.0.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.0.ebuild new file mode 100644 index 000000000000..6a2fd35ef2c5 --- /dev/null +++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-ugly + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-v4l2/Manifest +++ b/media-plugins/gst-plugins-v4l2/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.0.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.0.ebuild new file mode 100644 index 000000000000..3a4fbdfd8544 --- /dev/null +++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-good + +inherit gstreamer + +DESCRIPION="plugin to allow capture from video4linux2 devices" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="udev" + +RDEPEND=" + >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] + >=media-libs/gst-plugins-base-1.4:1.0[X,${MULTILIB_USEDEP}] + udev? ( >=virtual/libgudev-208:=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + virtual/os-headers +" + +GST_PLUGINS_BUILD="gst_v4l2" + +multilib_src_configure() { + gstreamer_multilib_src_configure \ + --with-libv4l2 \ + $(use_with udev gudev) +} diff --git a/media-plugins/gst-plugins-voaacenc/Manifest b/media-plugins/gst-plugins-voaacenc/Manifest index a9a03522c82f..8c170de2de7f 100644 --- a/media-plugins/gst-plugins-voaacenc/Manifest +++ b/media-plugins/gst-plugins-voaacenc/Manifest @@ -1,2 +1,3 @@ DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.0.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.0.ebuild new file mode 100644 index 000000000000..2450d237c63d --- /dev/null +++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPTION="GStreamer plugin for encoding AAC" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-voamrwbenc/Manifest b/media-plugins/gst-plugins-voamrwbenc/Manifest index a9a03522c82f..8c170de2de7f 100644 --- a/media-plugins/gst-plugins-voamrwbenc/Manifest +++ b/media-plugins/gst-plugins-voamrwbenc/Manifest @@ -1,2 +1,3 @@ DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7 +DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9 diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.0.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.0.ebuild new file mode 100644 index 000000000000..253ae06cd914 --- /dev/null +++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-bad + +inherit gstreamer + +DESCRIPTION="GStreamer plugin for encoding AMR-WB" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest index 79c91ecb6837..dc5b5362c268 100644 --- a/media-plugins/gst-plugins-vpx/Manifest +++ b/media-plugins/gst-plugins-vpx/Manifest @@ -1,2 +1,3 @@ DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.0.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.0.ebuild new file mode 100644 index 000000000000..c68d89cf500c --- /dev/null +++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.0.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-good + +inherit gstreamer + +DESCRIPTION="GStreamer decoder for vpx video format" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +IUSE="" + +# VP9 is under experimental, do not enable it now +RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-wavpack/Manifest b/media-plugins/gst-plugins-wavpack/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-wavpack/Manifest +++ b/media-plugins/gst-plugins-wavpack/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.0.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.0.ebuild new file mode 100644 index 000000000000..8faf418f1a2a --- /dev/null +++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPTION="GStreamer encoder/decoder for wavpack audio format" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +IUSE="" + +RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-x264/Manifest b/media-plugins/gst-plugins-x264/Manifest index b14ec571d6ff..ba8aa210d826 100644 --- a/media-plugins/gst-plugins-x264/Manifest +++ b/media-plugins/gst-plugins-x264/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e +DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57 diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.0.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.0.ebuild new file mode 100644 index 000000000000..faa54312800a --- /dev/null +++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GST_ORG_MODULE=gst-plugins-ugly + +inherit gstreamer + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +IUSE="" + +# 20111220 ensures us X264_BUILD >= 120 +RDEPEND=">=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest index fee47cd0d72f..c0ff4fc2cf1d 100644 --- a/media-plugins/gst-plugins-ximagesrc/Manifest +++ b/media-plugins/gst-plugins-ximagesrc/Manifest @@ -1,3 +1,4 @@ DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c +DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9 diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.0.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.0.ebuild new file mode 100644 index 000000000000..9f6fce49b11a --- /dev/null +++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GST_ORG_MODULE=gst-plugins-good +inherit gstreamer + +DESCRIPTION="GStreamer plugin for X11 video capture stream" + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}] + >=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}] + >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] + >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] +" + +# xshm is a compile time option of ximage +GST_PLUGINS_BUILD="x xshm" +GST_PLUGINS_BUILD_DIR="ximage" diff --git a/media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild b/media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild new file mode 100644 index 000000000000..344f21d487b8 --- /dev/null +++ b/media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit multilib toolchain-funcs + +MY_P=${P/mcp/MCP} + +DESCRIPTION="MCP ladspa plugins package. Includes moogvcf, phaser & chorus" +HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/" +SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND="media-libs/ladspa-sdk" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + tc-export CXX + sed -i -e "s/-O3//" \ + -e "s/g++/$(tc-getCXX) ${LDFLAGS}/" Makefile || die "sed failed" +} + +src_install() { + dodoc AUTHORS README + insinto /usr/$(get_libdir)/ladspa + insopts -m0755 + doins *.so +} diff --git a/media-plugins/rev-plugins/rev-plugins-0.3.1-r2.ebuild b/media-plugins/rev-plugins/rev-plugins-0.3.1-r2.ebuild new file mode 100644 index 000000000000..efe47c855e17 --- /dev/null +++ b/media-plugins/rev-plugins/rev-plugins-0.3.1-r2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit multilib toolchain-funcs + +MY_P=${P/rev/REV} + +DESCRIPTION="REV LADSPA plugins package. A stereo reverb plugin based on the well-known greverb" +HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/" +SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="media-libs/ladspa-sdk" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + tc-export CXX + sed -i Makefile -e 's/-O2//' -e 's/g++/$(CXX) $(LDFLAGS)/' || die +} + +src_install() { + dodoc AUTHORS README + insinto /usr/$(get_libdir)/ladspa + insopts -m0755 + doins *.so +} diff --git a/media-plugins/vco-plugins/vco-plugins-0.3.0-r1.ebuild b/media-plugins/vco-plugins/vco-plugins-0.3.0-r1.ebuild new file mode 100644 index 000000000000..90610293912c --- /dev/null +++ b/media-plugins/vco-plugins/vco-plugins-0.3.0-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit multilib toolchain-funcs + +MY_P=${P/vco/VCO} + +DESCRIPTION="SAW-VCO ladspa plugin package. Anti-aliased oscillators" +HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/" +SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND="media-libs/ladspa-sdk" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + tc-export CXX + sed -i -e "s/-O3//" \ + -e "s/g++/$(tc-getCXX) ${LDFLAGS}/" Makefile || die +} + +src_install() { + dodoc AUTHORS README + insinto /usr/$(get_libdir)/ladspa + insopts -m0755 + doins *.so +} diff --git a/media-plugins/vdr-rpihddevice/Manifest b/media-plugins/vdr-rpihddevice/Manifest index ce7417b22588..d4a4b14255a1 100644 --- a/media-plugins/vdr-rpihddevice/Manifest +++ b/media-plugins/vdr-rpihddevice/Manifest @@ -1,2 +1,3 @@ DIST vdr-rpihddevice-0.0.10.tgz 70150 SHA256 3f6d9165e702d03e836e34531d5012825918613110f9e9215b8c48b9f5333e2e SHA512 7265d00044f9a9a5c27076009e0cda47fdca480d01302997c7759df9d39595f8a3cab9e3eb86dfefd373967b8c8f9800644e01f0a418b6326957cbbc40f27432 WHIRLPOOL 4b24f71ad03437d6118c63cb61a6d07440208591494c593ec3e70e6c688f9c135962894797d9213f41501140692f1d863d2a4ea6984923b41b6a2f87d3bf94a5 DIST vdr-rpihddevice-0.0.11.tgz 77778 SHA256 f2dd9d392ab5585fbdcc55ea3c22612f2becaf878db4b96b69bd603dc145d05b SHA512 2930baa25805fff0f238fda5a4fafb5803f9551d8caa79d5368c0ecb0e38a401184b8976e8ef07c8e3fbdba3ffa45f84b636a137f4d9a21accb7a1676c418644 WHIRLPOOL 1e75bf4a7ada63c8929f7923cc89dd85867eb467bada3f5b149f1988fa74c5fd347cd346adb74949e446ca7520070dc5b98e353c02d6b69f04e35709ca55847c +DIST vdr-rpihddevice-1.0.0.tgz 86760 SHA256 b7bbc29fe75434caaa0f8157a701be31553e6763f94c39e2755ded03354f9ab1 SHA512 1013da0593f9c5d99648d458a34906b2d5bb521824fb124b8e8efaa5017d94895b47c03657a5ae7463f9e5ad5bf415012f7b55bc0442ce12f8478768af14010e WHIRLPOOL e01b5e7befaf266bbf7a0c81017d3a49c536fe6f3bd98b39f8e2937299ed401c60f90471c7c346fd4585a169e5a40893a7a48d1f0e88d82c2c70a70f49cad817 diff --git a/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.0.ebuild b/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.0.ebuild new file mode 100644 index 000000000000..9ee6f6b4c418 --- /dev/null +++ b/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit vdr-plugin-2 + +VERSION="1966" #every bump, new version + +DESCRIPTION="VDR Plugin: Output Device for Raspberry Pi" +HOMEPAGE="http://projects.vdr-developer.org/projects/plg-rpihddevice" +SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" + +KEYWORDS="~arm" +SLOT="0" +LICENSE="GPL-2" +IUSE="" + +DEPEND=">=media-video/vdr-2 + >=media-libs/raspberrypi-userland-0_pre20140117 + virtual/ffmpeg" +RDEPEND="${DEPEND}" diff --git a/media-plugins/vdr-systeminfo/Manifest b/media-plugins/vdr-systeminfo/Manifest index 1fe0ef92a43c..730f7c2e18e7 100644 --- a/media-plugins/vdr-systeminfo/Manifest +++ b/media-plugins/vdr-systeminfo/Manifest @@ -1 +1,2 @@ DIST vdr-systeminfo-0.1.1.tar.bz2 16816 SHA256 2764e88c07a84e4d42ab318e0cd7ad186b549c9843c6fed8e6aa964658685cc1 SHA512 9f107ebbf79e5ded9ee6a991c5c00236dabbce42d7588eb21b814dbaaf249ee7e681f979d7570031fd6eb1bd286afe3943ae4463dc930b7814f739fef3623e54 WHIRLPOOL 46c0cf77236eab8d2d3e96dd12af2e8ce3806c94ada4813e9818faefdce302dd6b3218e040c60d6d2d7c90d2c30789d223a7443a4b1bde6e12a3f0bc563e5cb0 +DIST vdr-systeminfo-0.1.3.tar.bz2 17234 SHA256 70862fd641b819c1bbf063c4c48e7ac52f05ec7046ba174922ab7ccb4c3b08a0 SHA512 9dd2c32632558dd6061e1aa9b76757bf76e0e781405412791343dd7249348fdf0b65c71d8054f55f8f763a75aa17d39bed96a86e4b06a4475642eab4624954fd WHIRLPOOL b34e2c52e19bc38b08b716da61491d27110f98ab998e07d56987bf5df496fa0d4174f4ac67917426d745eb2c273a400f811ec4c79b0cdf4249d4e07e785cf67f diff --git a/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.3_vdr-2.3.1.patch b/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.3_vdr-2.3.1.patch new file mode 100644 index 000000000000..4cadb0bc285b --- /dev/null +++ b/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.3_vdr-2.3.1.patch @@ -0,0 +1,69 @@ +compilefix vdr-2.3.1 +http://www.vdr-portal.de/board1-news/board2-vdr-news/p1254237-announce-vdr-developer-version-2-3-1/#post1254237 +Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (25 Okt 2015) + +--- displayinfo.c 2008-11-09 10:31:23.000000000 +0100 ++++ displayinfo.c 2015-10-14 16:18:28.328868172 +0200 +@@ -224,7 +224,7 @@ + void cInfoLines::Action() + { + int line = 0; +- Lock(); ++ cThread::Lock(); + Clear(); + Unlock(); + cString osdline = NULL; +@@ -236,7 +236,7 @@ + + osdline = PrepareInfoline(++line, &isStatic); + if ((const char*)osdline) { +- Lock(); ++ cThread::Lock(); + Add(new cInfoLine(osdline, isStatic)); + Unlock(); + } +@@ -244,7 +244,7 @@ + while (Running() && NULL != (const char*)osdline && line <= MAX_LINES); + + if (!First()) { +- Lock(); ++ cThread::Lock(); + osdline = tr("Error getting system information"); + Add(new cInfoLine(osdline, true)); + state++; +@@ -252,7 +252,7 @@ + } + else + { +- Lock(); ++ cThread::Lock(); + state++; + Unlock(); + if (Running()) +@@ -260,7 +260,7 @@ + + while (Running()) { + cInfoLine * currentline = NULL; +- Lock(); ++ cThread::Lock(); + if (OsdInitialized) + firstDisplay = false; + currentline = First(); +@@ -274,7 +274,7 @@ + if (!currentline || !currentline->isStatic()) { + osdline = PrepareInfoline(line, &isStatic); + if ((const char*)osdline) { +- Lock(); ++ cThread::Lock(); + currentline->SetStr(osdline); + Unlock(); + } +@@ -283,7 +283,7 @@ + } + while (Running() && NULL != currentline && line <= MAX_LINES); + +- Lock(); ++ cThread::Lock(); + state++; + Unlock(); + diff --git a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild new file mode 100644 index 000000000000..0a48387a201f --- /dev/null +++ b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit vdr-plugin-2 + +DESCRIPTION="VDR Plugin: systeminfo" +HOMEPAGE="http://firefly.vdr-developer.org/systeminfo/" +SRC_URI="http://firefly.vdr-developer.org/systeminfo/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=media-video/vdr-1.4.7" + +RDEPEND="sys-apps/lm_sensors + app-admin/hddtemp" + +src_prepare() { + vdr-plugin-2_src_prepare + + if has_version ">=media-video/vdr-2.3.1"; then + epatch "${FILESDIR}/${P}_vdr-2.3.1.patch" + fi + + # Makefile correction, .eclass fails in some Makefiles + sed -e "s:(VDRINCDIR):(VDRDIR)/include:" -i Makefile +} + +src_install() { + vdr-plugin-2_src_install + + insinto /usr/share/vdr/systeminfo/ + insopts -m0755 + doins "${FILESDIR}"/systeminfo.sh +} diff --git a/media-plugins/vdr-zappilot/files/vdr-zappilot-0.0.5_vdr-2.3.1.patch b/media-plugins/vdr-zappilot/files/vdr-zappilot-0.0.5_vdr-2.3.1.patch new file mode 100644 index 000000000000..4a6c4e25b68d --- /dev/null +++ b/media-plugins/vdr-zappilot/files/vdr-zappilot-0.0.5_vdr-2.3.1.patch @@ -0,0 +1,281 @@ +compile fix >=vdr-2.3.1 +http://www.vdr-portal.de/board1-news/board2-vdr-news/p1254875-announce-vdr-developer-version-2-3-1/#post1254875 +Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (25 Okt 2015) + +diff -rupN b/zappilotosd.c a/zappilotosd.c +--- b/zappilotosd.c 2015-06-24 14:32:15.000000000 +0200 ++++ a/zappilotosd.c 2015-10-22 18:39:36.000000000 +0200 +@@ -69,7 +69,7 @@ cZappilotOsd::~cZappilotOsd(void) + + void cZappilotOsd::DisplayChannel(const cChannel *Channel) + { +- int BufSize = 255; ++ int BufSize = 1020; + if (Channel) + { + if (Channel->GroupSep()) +@@ -172,11 +172,11 @@ void cZappilotOsd::UpdateEPGInfo(int Now + titleFollowingInfo = NULL; + subtitlePresentInfo = NULL; + subtitleFollowingInfo = NULL; +- cSchedulesLock SchedulesLock; +- const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock); ++ LOCK_SCHEDULES_READ; ++ LOCK_CHANNELS_READ; + if (Schedules) + { +- const cSchedule *Schedule = Schedules->GetSchedule(Channels.GetByNumber(PilotChannelNumber)->GetChannelID()); ++ const cSchedule *Schedule = Schedules->GetSchedule(Channels->GetByNumber(PilotChannelNumber)->GetChannelID()); + if (Schedule) + { + // Get Present event +@@ -267,9 +267,9 @@ void cZappilotOsd::UpdateEPGInfo(int Now + void cZappilotOsd::Show() + { + // find the actual current +- cChannel *Channel = Channels.GetByNumber(cDevice::PrimaryDevice()->CurrentChannel()); +- currentChannel = Channels.GetByNumber(cDevice::PrimaryDevice()->CurrentChannel()); +- ++ LOCK_CHANNELS_READ; ++ const cChannel *Channel = Channels->GetByNumber(cDevice::PrimaryDevice()->CurrentChannel()); ++ currentChannel = Channel; + if (Channel) + { + PilotChannelNumber = Channel->Number(); +@@ -333,13 +333,14 @@ eOSState cZappilotOsd::ProcessKey(eKeys + case k1 ... k9: + if (number >= 0) + { +- if (number > Channels.MaxNumber()) ++ LOCK_CHANNELS_READ; ++ if (number > Channels->MaxNumber()) + number = Key - k0; + else + number = number * 10 + Key - k0; + if (number > 0) + { +- cChannel *channel = Channels.GetByNumber(number); ++ const cChannel *channel = Channels->GetByNumber(number); + if (channel) + { + PilotChannelNumber = channel->Number(); +@@ -363,7 +364,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys + if (config.fastbrowse) + { + CursorDown(); +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) + group = channel->Index()-1; + break; +@@ -380,7 +382,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys + if (config.fastbrowse) + { + CursorUp(); +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) + group = channel->Index()-1; + break; +@@ -396,7 +399,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys + { + if (group < 0) + { +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) + group = channel->Index(); + } +@@ -405,15 +409,18 @@ eOSState cZappilotOsd::ProcessKey(eKeys + int SaveGroup = group; + if (NORMALKEY(Key) == kRight) + { +- group = Channels.GetNextGroup(group); ++ LOCK_CHANNELS_READ; ++ group = Channels->GetNextGroup(group); + } + else + { +- group = Channels.GetPrevGroup(group < 1 ? 1 : group); ++ LOCK_CHANNELS_READ; ++ group = Channels->GetPrevGroup(group < 1 ? 1 : group); + } + if (group < 0) + group = SaveGroup; +- cChannel *channel = Channels.Get(group); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->Get(group); + if (channel) + { + //DisplayChannel(channel); +@@ -449,7 +456,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys + else + { + CursorUp(); +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) + group = channel->Index()-1; + break; +@@ -466,20 +474,22 @@ eOSState cZappilotOsd::ProcessKey(eKeys + else + { + CursorDown(); +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) +- group = channel->Index()-1; ++ group = channel->Index()-1; + break; + } + case kNone: + if (number && (int)cTimeMs::Now() - lastTime > 1000) + { +- if (Channels.GetByNumber(number)) ++ LOCK_CHANNELS_READ; ++ if (Channels->GetByNumber(number)) + { + PilotChannelNumber = number; + lastTime = cTimeMs::Now(); + number = 0; +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) + group = channel->Index()-1; + } +@@ -553,7 +563,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys + { + if (group < 0) + { +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) + group = channel->Index(); + } +@@ -562,15 +573,18 @@ eOSState cZappilotOsd::ProcessKey(eKeys + int SaveGroup = group; + if (NORMALKEY(Key) == kBlue) + { +- group = Channels.GetNextGroup(group); ++ LOCK_CHANNELS_READ; ++ group = Channels->GetNextGroup(group); + } + else + { +- group = Channels.GetPrevGroup(group < 1 ? 1 : group); ++ LOCK_CHANNELS_READ; ++ group = Channels->GetPrevGroup(group < 1 ? 1 : group); + } + if (group < 0) + group = SaveGroup; +- cChannel *channel = Channels.Get(group); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->Get(group); + if (channel) + { + //DisplayChannel(channel); +@@ -663,8 +677,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys + void cZappilotOsd::CursorUp() + { + int n = PilotChannelNumber + 1; +- cChannel *channel; +- channel = Channels.GetByNumber(n, 1); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(n, 1); + if (channel) + { + n = channel->Number(); +@@ -678,8 +692,8 @@ void cZappilotOsd::CursorUp() + void cZappilotOsd::CursorDown() + { + int n = PilotChannelNumber - 1; +- cChannel *channel; +- channel = Channels.GetByNumber(n, -1); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(n, -1); + if (channel) + { + n = channel->Number(); +@@ -693,9 +707,13 @@ void cZappilotOsd::CursorDown() + void cZappilotOsd::CursorOK() + { + DrawMenu(0,2); +- if (currentChannel != Channels.GetByNumber(PilotChannelNumber)) ++ LOCK_CHANNELS_READ; ++ const cChannel* chan = Channels->GetByNumber(PilotChannelNumber); ++ ++ if (currentChannel != chan) + { +- cChannel *Channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *Channel = Channels->GetByNumber(PilotChannelNumber); + if (Channel) + { + cDevice::PrimaryDevice()->SwitchChannel(Channel, true); +@@ -750,7 +768,8 @@ void cZappilotOsd::DisplayInfo(int delta + displayTimer = NULL; + displayChannel = Skins.Current()->DisplayChannel(true); + } +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + + if (!isempty(titlePresentInfo)) + { +@@ -778,14 +797,17 @@ void cZappilotOsd::DisplayExtraInfo() + displayEvent = NULL; + } + +- displayEvent = new cMenuEvent(Present,false,true); ++ ++ LOCK_TIMERS_READ; ++ LOCK_CHANNELS_READ; ++ displayEvent = new cMenuEvent(Timers, Channels, Present,false,true); + displayEvent->Display(); + } + + + void cZappilotOsd::DisplayTimer() + { +- ++ + if (displayChannel) + { + delete displayChannel; +@@ -797,13 +819,17 @@ void cZappilotOsd::DisplayTimer() + displayEvent = NULL; + } + ++ LOCK_TIMERS_WRITE; ++ + cTimer *timer = new cTimer(Present); +- cTimer *t = Timers.GetTimer(timer); ++ cTimer *t = Timers->GetMatch(Present); ++ + if (t) + { + delete timer; + timer = t; + } ++ + displayTimer=new cMenuEditTimer(timer, !t); + displayTimer->Display(); + } +diff -rupN b/zappilotosd.h a/zappilotosd.h +--- b/zappilotosd.h 2015-06-24 14:32:15.000000000 +0200 ++++ a/zappilotosd.h 2015-10-22 18:40:02.000000000 +0200 +@@ -39,7 +39,7 @@ class cZappilotOsd : public cOsdObject + int offset; + int lines; + int type; +- cChannel* currentChannel; ++ const cChannel* currentChannel; + + public: + cZappilotOsd(void); diff --git a/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild new file mode 100644 index 000000000000..3101904228a4 --- /dev/null +++ b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit vdr-plugin-2 + +VERSION="1318" # every bump new version + +DESCRIPTION="VDR Plugin: browse fast the EPG information without being forced to switch to a channel" +HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-zappilot" +SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" + +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="GPL-2" +IUSE="" + +DEPEND=">=media-video/vdr-1.7.34" +RDEPEND="${DEPEND}" + +src_prepare() { + vdr-plugin-2_src_prepare + + if has_version ">=media-video/vdr-2.3.1"; then + epatch "${FILESDIR}/${P}_vdr-2.3.1.patch" + fi +} diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest index d7c54593f637..6470b94381f4 100644 --- a/media-sound/ardour/Manifest +++ b/media-sound/ardour/Manifest @@ -7,3 +7,4 @@ DIST ardour-3.5.403.tar.gz 8583763 SHA256 46490623479d9a25e2ab98b817c1f5c42b1d04 DIST ardour-4.0.tar.gz 9189038 SHA256 ea1131a24774d5f8dcab4ac7ea3b36bd427b1e4d0bef6f3db0681bc4ca131cf1 SHA512 2317c5818fe89386319f12062f0af0d08b07f569d6f775b7ecfa4f3a4bb1f565e05f3ff32f05f591c5628bdd402eda5bce4be4f8fa89da6c2092d5edb2c9ae7a WHIRLPOOL 854145ed135f6b23222ab2d6022e31b09221cac0d326fa17c5ee88e4e8ebd033e69c447fcbac35a925ff23974cc8b2b13c076014118977bbc88836124a912ad4 DIST ardour-4.1.tar.gz 9247567 SHA256 1d5eac009f3c84aee11c4e7d1c548747cb5a43eddac92b4e640342b79cc808b9 SHA512 5e13301ca5d8140498256d43729d770c6222b220d2c817651304746a7cc20fe8450b094d978bc9559b9ec7b5a7a95ca1c5131be5b51c78835e75b3b7bbb1be82 WHIRLPOOL 3699ea7f29c9df30ddfa3ad9a1e05f6a3cbccddaf5ae1804679b6c1a50e8b800e14f06760e8d9d44a4ac2631f32db595048640c01b9c967f060bfaee11f28a73 DIST ardour-4.2.tar.gz 9484009 SHA256 c8af454e974be3222bceb374d5b3d126af6c9766326f7e276acb8ef2fa21cfa4 SHA512 cb1d8144216ff959dac1b371c5ec2b99e0fc2137c105fda5c38460c7f148d7f575761453b24ea5ab7c58139a6839b92ee863c6a5485ab4a009da7c362471a2b3 WHIRLPOOL f9d7df4687c4d1a402c43ba43acee9f3b1423f8dcc691ef69590554f49530be5df0ef57f0f20b67ba0efb50690cdc744015f1917bb2051857d496c5cf000f948 +DIST ardour-4.4.tar.gz 9511090 SHA256 d567e99c4476c0122006c85d09a8e4eab93db28be7be99d338ea66be8581bfcf SHA512 8df3e4552b0ccdd76c5ccf06224594325bb8c02f897bb79bd983531a2f4f56c60185b6080e2f8eddb6a274b9d48dc93a47ddc5471e05b253d492c09be816dde0 WHIRLPOOL 86e298b7defa5249c0632368bae64ddde2175e5f5ece66b4932485a4216ae0613b81e2f736f54e7f00a600be5e238fe41559fe2290f3aebbb36b208184aefc25 diff --git a/media-sound/ardour/ardour-4.4.ebuild b/media-sound/ardour/ardour-4.4.ebuild new file mode 100644 index 000000000000..e679540ab020 --- /dev/null +++ b/media-sound/ardour/ardour-4.4.ebuild @@ -0,0 +1,134 @@ +# 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='threads(+)' +inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils + +DESCRIPTION="Digital Audio Workstation" +HOMEPAGE="http://ardour.org/" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="GPL-2" +SLOT="4" +IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" + +RDEPEND=" + >=dev-cpp/glibmm-2.32.0 + >=dev-cpp/gtkmm-2.16:2.4 + >=dev-cpp/libgnomecanvasmm-2.26:2.6 + dev-libs/boost:= + >=dev-libs/glib-2.10.1:2 + dev-libs/libsigc++:2 + >=dev-libs/libxml2-2.6:2 + dev-libs/libxslt + >=gnome-base/libgnomecanvas-2 + media-libs/alsa-lib + media-libs/aubio + media-libs/flac + media-libs/freetype:2 + media-libs/libart_lgpl + media-libs/liblo + >=media-libs/liblrdf-0.4.0-r20 + >=media-libs/libsamplerate-0.1 + >=media-libs/libsndfile-1.0.18 + >=media-libs/libsoundtouch-1.6.0 + media-libs/raptor:2 + >=media-libs/rubberband-1.6.0 + >=media-libs/taglib-1.7 + media-libs/vamp-plugin-sdk + net-misc/curl + sci-libs/fftw:3.0 + virtual/libusb:0 + x11-libs/cairo + >=x11-libs/gtk+-2.8.1:2 + x11-libs/pango + jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) + lv2? ( + >=media-libs/slv2-0.6.1 + media-libs/lilv + media-libs/sratom + dev-libs/sord + >=media-libs/suil-0.6.10 + >=media-libs/lv2-1.4.0 + )" + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + >=media-sound/jack-audio-connection-kit-0.120 + sys-devel/gettext + virtual/pkgconfig + doc? ( app-doc/doxygen[dot] )" + +pkg_setup() { + if has_version \>=dev-libs/libsigc++-2.6 ; then + append-cxxflags -std=c++11 + fi +} + +src_prepare(){ + if ! [[ ${PV} == *9999* ]]; then + epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch + touch "${S}/libs/ardour/revision.cc" + fi + use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch + sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript + MARCH=$(get-flag march) + if use cpu_flags_x86_sse; then + if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then + elog "You enabled sse but use an march that does not support sse!" + elog "We add sse to the flags now, but please consider switching your march in make.conf!" + fi + OPTFLAGS="sse" + fi + if use cpu_flags_x86_mmx; then + if [[ ${MARCH} == "i486" ]]; then + elog "You enabled mmx with i486 set as march! You have been warned!" + fi + OPTFLAGS="${OPTFLAGS} mmx" + fi + if use cpu_flags_x86_3dnow; then + OPTFLAGS="${OPTFLAGS} 3dnow" + fi + sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '${OPTFLAGS}' just some place holders\"/' \ + -i "${S}"/wscript + sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript + append-flags "-lboost_system" +} + +src_configure() { + tc-export CC CXX + mkdir -p "${D}" + waf-utils_src_configure \ + --destdir="${D}" \ + --prefix=/usr \ + --configdir=/etc \ + --nls \ + --optimize \ + $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ + $(usex lv2 "--lv2" "--no-lv2") \ + $(usex doc "--docs" '') \ + $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") +} + +src_install() { + waf-utils_src_install + mv ${PN}.1 ${PN}${SLOT}.1 + doman ${PN}${SLOT}.1 + newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png + make_desktop_entry ardour4 ardour4 ardour4 AudioVideo +} + +pkg_postinst() { + elog "If you are using Ardour and want to keep its development alive" + elog "then please consider to make a donation upstream at ${HOMEPAGE}" +} diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild index e91dce0bb458..81a76d3c3a2e 100644 --- a/media-sound/ardour/ardour-9999.ebuild +++ b/media-sound/ardour/ardour-9999.ebuild @@ -3,19 +3,16 @@ # $Id$ EAPI=5 - PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE='threads(+)' - inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils DESCRIPTION="Digital Audio Workstation" HOMEPAGE="http://ardour.org/" -if [ ${PV} = 9999 ]; then - KEYWORDS="" +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git" - inherit git-2 + inherit git-r3 else KEYWORDS="~amd64 ~x86" SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -23,37 +20,38 @@ fi LICENSE="GPL-2" SLOT="4" -IUSE="altivec doc jack lv2 cpu_flags_x86_sse" +IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" -RDEPEND="media-libs/aubio - media-libs/liblo - sci-libs/fftw:3.0 - media-libs/freetype:2 - >=dev-libs/glib-2.10.1:2 +RDEPEND=" >=dev-cpp/glibmm-2.32.0 - >=x11-libs/gtk+-2.8.1:2 - >=dev-libs/libxml2-2.6:2 - >=media-libs/libsndfile-1.0.18 - >=media-libs/libsamplerate-0.1 - >=media-libs/rubberband-1.6.0 - >=media-libs/libsoundtouch-1.6.0 - media-libs/flac - media-libs/raptor:2 - >=media-libs/liblrdf-0.4.0-r20 - >=gnome-base/libgnomecanvas-2 - media-libs/vamp-plugin-sdk - dev-libs/libxslt - dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 + dev-libs/boost:= + >=dev-libs/glib-2.10.1:2 + dev-libs/libsigc++:2 + >=dev-libs/libxml2-2.6:2 + dev-libs/libxslt + >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib - x11-libs/pango - x11-libs/cairo + media-libs/aubio + media-libs/flac + media-libs/freetype:2 media-libs/libart_lgpl - virtual/libusb:0 - dev-libs/boost + media-libs/liblo + >=media-libs/liblrdf-0.4.0-r20 + >=media-libs/libsamplerate-0.1 + >=media-libs/libsndfile-1.0.18 + >=media-libs/libsoundtouch-1.6.0 + media-libs/raptor:2 + >=media-libs/rubberband-1.6.0 >=media-libs/taglib-1.7 + media-libs/vamp-plugin-sdk net-misc/curl + sci-libs/fftw:3.0 + virtual/libusb:0 + x11-libs/cairo + >=x11-libs/gtk+-2.8.1:2 + x11-libs/pango jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) lv2? ( >=media-libs/slv2-0.6.1 @@ -66,63 +64,60 @@ RDEPEND="media-libs/aubio DEPEND="${RDEPEND} ${PYTHON_DEPS} - virtual/pkgconfig >=media-sound/jack-audio-connection-kit-0.120 sys-devel/gettext + virtual/pkgconfig doc? ( app-doc/doxygen[dot] )" - if ! [ ${PV} = 9999 ]; then - DEPEND="${DEPEND}" - fi -src_unpack() { - if [ ${PV} = 9999 ]; then - git-2_src_unpack - else - unpack ${A} +pkg_setup() { + if has_version \>=dev-libs/libsigc++-2.6 ; then + append-cxxflags -std=c++11 fi } src_prepare(){ - if ! [ ${PV} = 9999 ]; then - epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch + if ! [[ ${PV} == *9999* ]]; then + epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch touch "${S}/libs/ardour/revision.cc" fi - $(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch) - epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch - sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript - sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript - sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript + use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch + sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript + MARCH=$(get-flag march) + if use cpu_flags_x86_sse; then + if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then + elog "You enabled sse but use an march that does not support sse!" + elog "We add -msse to the cflags now, but please consider switching your march in make.conf!" + fi + OPTFLAGS="sse" + fi + if use cpu_flags_x86_mmx; then + if [[ ${MARCH} == "i486" ]]; then + elog "You enabled mmx with i486 set as march! You have been warned!" + fi + OPTFLAGS="${OPTFLAGS} mmx" + fi + if use cpu_flags_x86_3dnow; then + OPTFLAGS="${OPTFLAGS} 3dnow" + fi + sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '${OPTFLAGS}' just some place holders\"/' \ + -i "${S}"/wscript + sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript append-flags "-lboost_system" } src_configure() { - if use cpu_flags_x86_sse; then - MARCH=$(get-flag march) - for ARCHWOSSE in i686 i486; do - if [[ ${MARCH} = ${ARCHWOSSE} ]]; then - for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do - is-flag ${SSEOPT} && SSEON="yes" - done - if [ -z ${SSEON} ]; then - append-flags -msse - elog "You enabled sse but use an march that does not support sse!" - elog "We add -msse to the cflags now, but please consider switching your march in make.conf!" - fi - fi - done - fi tc-export CC CXX mkdir -p "${D}" waf-utils_src_configure \ --destdir="${D}" \ --prefix=/usr \ --configdir=/etc \ - --optimize \ --nls \ - $(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --libjack=weak") \ - $(use lv2 && echo "--lv2" || echo "--no-lv2") \ - $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ - $(use doc && echo "--docs") + --optimize \ + $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ + $(usex lv2 "--lv2" "--no-lv2") \ + $(usex doc "--docs" '') \ + $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") } src_install() { @@ -135,5 +130,5 @@ src_install() { pkg_postinst() { elog "If you are using Ardour and want to keep its development alive" - elog "then please consider to do a donation upstream at ardour.org. Thanks!" + elog "then please consider to make a donation upstream at ${HOMEPAGE}" } diff --git a/media-sound/audacity/audacity-2.0.5-r1.ebuild b/media-sound/audacity/audacity-2.0.5-r1.ebuild new file mode 100644 index 000000000000..50f9262853f9 --- /dev/null +++ b/media-sound/audacity/audacity-2.0.5-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils wxwidgets autotools versionator + +MY_PV=$(replace_version_separator 3 -) +MY_P="${PN}-src-${MY_PV}" +MY_T="${PN}-minsrc-${MY_PV}" +DESCRIPTION="Free crossplatform audio editor" +HOMEPAGE="http://web.audacityteam.org/" +SRC_URI="mirror://gentoo/${MY_T}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86" +IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms soundtouch twolame vamp vorbis" +RESTRICT="test" + +COMMON_DEPEND="x11-libs/wxGTK:2.8[X] + >=app-arch/zip-2.3 + >=media-libs/libsndfile-1.0.0 + dev-libs/expat + libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) + !libsamplerate? ( media-libs/soxr ) + vorbis? ( >=media-libs/libvorbis-1.0 ) + mp3? ( >=media-libs/libmad-0.14.2b ) + flac? ( >=media-libs/flac-1.2.0[cxx] ) + id3tag? ( media-libs/libid3tag ) + sbsms? ( media-libs/libsbsms ) + soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) + vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) + twolame? ( media-sound/twolame ) + ffmpeg? ( virtual/ffmpeg ) + alsa? ( media-libs/alsa-lib ) + jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )" +# Crashes at startup here... +# lv2? ( >=media-libs/slv2-0.6.0 ) +# Disabled upstream ATM +# ladspa? ( >=media-libs/liblrdf-0.4.0 ) + +RDEPEND="${COMMON_DEPEND} + mp3? ( >=media-sound/lame-3.70 )" +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + virtual/pkgconfig" + +REQUIRED_USE="soundtouch? ( midi )" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch + + AT_M4DIR="${S}/m4" eautoreconf +} + +src_configure() { + WX_GTK_VER="2.8" + need-wxwidgets unicode + + # * always use system libraries if possible + # * options listed in the order that configure --help lists them + # * use libsoxr if libsamplerate is not requested + econf \ + --enable-unicode \ + --enable-nyquist \ + --disable-dynamic-loading \ + $(use_enable ladspa) \ + --with-libsndfile=system \ + --with-expat=system \ + $(use_with libsamplerate) \ + $(use_with !libsamplerate libsoxr) \ + $(use_with vorbis libvorbis) \ + $(use_with mp3 libmad) \ + $(use_with flac libflac) \ + $(use_with id3tag libid3tag) \ + $(use_with sbsms) \ + $(use_with soundtouch) \ + $(use_with vamp libvamp) \ + $(use_with twolame libtwolame) \ + $(use_with ffmpeg) \ + $(use_with midi) \ + $(use_with alsa) \ + $(use_with jack) +} + +# $(use_with lv2 slv2) \ +# $(use_with ladspa liblrdf) \ + +src_install() { + emake DESTDIR="${D}" install + + # Remove bad doc install + rm -rf "${D}"/usr/share/doc + + # Install our docs + dodoc README.txt +} diff --git a/media-sound/forked-daapd/metadata.xml b/media-sound/forked-daapd/metadata.xml index d38687d58122..33014c8049bf 100644 --- a/media-sound/forked-daapd/metadata.xml +++ b/media-sound/forked-daapd/metadata.xml @@ -2,13 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>erikmack@gmail.com</email> + <email>stasibear@gentoo.org</email> <name>Erik Mackdanz</name> </maintainer> - <maintainer> - <email>alunduil@gentoo.org</email> - <name>Alex Brandt</name> - </maintainer> <longdescription> This is a much updated version of the original forked-daapd 0.19 (non-gcd), a Linux/FreeBSD DAAP diff --git a/media-sound/guayadeque/files/guayadeque-0.3.7-headers-location.patch b/media-sound/guayadeque/files/guayadeque-0.3.7-headers-location.patch new file mode 100644 index 000000000000..8c6faae5e4d1 --- /dev/null +++ b/media-sound/guayadeque/files/guayadeque-0.3.7-headers-location.patch @@ -0,0 +1,90 @@ +Description: Point sources to the correct wxcurl's headers location. +Author: Alessio Treglia <alessio@debian.org> +Forwarded: no +--- + src/LastFM.cpp | 2 +- + src/LastFMPanel.cpp | 2 +- + src/LyricsPanel.cpp | 2 +- + src/MainFrame.h | 2 +- + src/MusicBrainz.cpp | 2 +- + src/MusicDns.cpp | 2 +- + src/Podcasts.h | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +--- a/src/LastFM.cpp ++++ b/src/LastFM.cpp +@@ -24,7 +24,7 @@ + #include "DbCache.h" + #include "Utils.h" + +-#include "curl/http.h" ++#include "wx/curl/http.h" + + #include <wx/arrimpl.cpp> + #include <wx/sstream.h> +--- a/src/LastFMPanel.cpp ++++ b/src/LastFMPanel.cpp +@@ -21,7 +21,7 @@ + #include "LastFMPanel.h" + + #include "Commands.h" +-#include "curl/http.h" ++#include "wx/curl/http.h" + #include "Images.h" + #include "MainApp.h" + #include "Settings.h" +--- a/src/LyricsPanel.cpp ++++ b/src/LyricsPanel.cpp +@@ -23,7 +23,7 @@ + #include "Base64.h" + #include "Commands.h" + #include "Config.h" +-#include "curl/http.h" ++#include "wx/curl/http.h" + #include "Preferences.h" + #include "Images.h" + #include "ListView.h" +--- a/src/MainFrame.h ++++ b/src/MainFrame.h +@@ -26,7 +26,7 @@ + #include "Config.h" + #include "CoverPanel.h" + #include "Collections.h" +-#include "curl/http.h" ++#include "wx/curl/http.h" + #include "dbus/gudbus.h" + #include "dbus/mpris.h" + #include "dbus/mpris2.h" +--- a/src/MusicBrainz.cpp ++++ b/src/MusicBrainz.cpp +@@ -21,7 +21,7 @@ + #include "MusicBrainz.h" + + #include "Utils.h" +-#include "curl/http.h" ++#include "wx/curl/http.h" + + #include <wx/arrimpl.cpp> + #include <wx/sstream.h> +--- a/src/MusicDns.cpp ++++ b/src/MusicDns.cpp +@@ -21,7 +21,7 @@ + #include "MusicDns.h" + + #include "Commands.h" +-#include "curl/http.h" ++#include "wx/curl/http.h" + #include "MusicBrainz.h" + #include "Utils.h" + #include "Version.h" +--- a/src/Podcasts.h ++++ b/src/Podcasts.h +@@ -21,7 +21,7 @@ + #ifndef PODCASTS_H + #define PODCASTS_H + +-#include "curl/http.h" ++#include "wx/curl/http.h" + + #include <wx/dynarray.h> + #include <wx/xml/xml.h> diff --git a/media-sound/guayadeque/files/guayadeque-0.3.7-wx3.0.patch b/media-sound/guayadeque/files/guayadeque-0.3.7-wx3.0.patch new file mode 100644 index 000000000000..1071de098443 --- /dev/null +++ b/media-sound/guayadeque/files/guayadeque-0.3.7-wx3.0.patch @@ -0,0 +1,700 @@ +Description: Fix to work with wxwidgets3.0 + Based on partial patch by dam. +Author: Olly Betts <olly@survex.com> +Bug-Debian: http://bugs.debian.org/749978 +Forwarded: no +Last-Update: 2014-08-14 + +--- a/src/ListView.h ++++ b/src/ListView.h +@@ -28,6 +28,7 @@ + #include <wx/scrolwin.h> + #include <wx/vlbox.h> + #include <wx/settings.h> ++#include <wx/listbase.h> + + class guListViewClient; + class guListViewHeader; +@@ -330,7 +331,7 @@ + size_t GetVisibleEnd( void ) const { return m_ListBox->GetVisibleEnd(); } + size_t GetFirstVisibleLine() const { return m_ListBox->GetFirstVisibleLine(); } + size_t GetLastVisibleLine() const { return m_ListBox->GetLastVisibleLine(); } +- bool ScrollLines( int lines ) { return m_ListBox->ScrollLines( lines ); } ++ bool ScrollLines( int lines ) { return m_ListBox->wxWindow::ScrollLines( lines ); } + + bool ScrollToLine( size_t line ) { return m_ListBox->ScrollToLine( line ); } + +--- a/src/FileBrowser.cpp ++++ b/src/FileBrowser.cpp +@@ -36,6 +36,7 @@ + #include <wx/arrimpl.cpp> + #include <wx/artprov.h> + #include <wx/clipbrd.h> ++#include <wx/gtk/tglbtn.h> + + WX_DEFINE_OBJARRAY(guFileItemArray); + +@@ -221,7 +222,7 @@ + + DirBtnSizer->Add( 0, 0, 1, wxEXPAND, 5 ); + +- m_ShowLibPathsBtn = new wxToggleBitmapButton( this, wxID_ANY, guImage( guIMAGE_INDEX_tiny_library ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); ++ m_ShowLibPathsBtn = new wxBitmapToggleButton( this, wxID_ANY, guImage( guIMAGE_INDEX_tiny_library ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); + m_ShowLibPathsBtn->SetToolTip( ShowPaths == guFILEBROWSER_SHOWPATH_SYSTEM ? + _( "See used locations" ) : + _( "See system files" ) ); +--- a/src/FileBrowser.h ++++ b/src/FileBrowser.h +@@ -36,6 +36,7 @@ + #include <wx/sizer.h> + #include <wx/string.h> + #include <wx/tglbtn.h> ++#include <wx/gtk/tglbtn.h> + + + #define guPANEL_FILEBROWSER_DIRCTRL ( 1 << 0 ) +@@ -122,7 +123,7 @@ + guMediaViewer * m_MediaViewer; + guGenericDirCtrl * m_DirCtrl; + bool m_AddingFolder; +- wxToggleBitmapButton * m_ShowLibPathsBtn; ++ wxBitmapToggleButton * m_ShowLibPathsBtn; + + void OnShowLibPathsClick( wxCommandEvent& event ); + +--- a/src/AuiNotebook.cpp ++++ b/src/AuiNotebook.cpp +@@ -47,8 +47,8 @@ + m_TextFgColor = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ); + m_SelTextFgColour = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ); + +- m_disabled_close_bmp = guImage( guIMAGE_INDEX_tiny_close_normal ); +- m_active_close_bmp = guImage( guIMAGE_INDEX_tiny_close_highlight ); ++ m_disabledCloseBmp = guImage( guIMAGE_INDEX_tiny_close_normal ); ++ m_activeCloseBmp = guImage( guIMAGE_INDEX_tiny_close_highlight ); + } + + // -------------------------------------------------------------------------------- // +@@ -60,9 +60,9 @@ + wxAuiTabArt * guAuiTabArt::Clone() + { + guAuiTabArt * art = new guAuiTabArt; +- art->SetNormalFont( m_normal_font ); +- art->SetSelectedFont( m_selected_font ); +- art->SetMeasuringFont( m_measuring_font ); ++ art->SetNormalFont( m_normalFont ); ++ art->SetSelectedFont( m_selectedFont ); ++ art->SetMeasuringFont( m_measuringFont ); + // art->m_BgColor = m_BgColor; + // art->m_SelBgColor = m_SelBgColor; + // art->m_TextFgColor = m_TextFgColor; +@@ -75,7 +75,7 @@ + // draw background + //wxColor top_color = m_base_colour; + wxColor top_color = m_BgColor; +- wxColor bottom_color = wxAuiStepColour( m_base_colour, 120 ); ++ wxColor bottom_color = wxAuiStepColour( m_baseColour, 120 ); + wxRect r; + + if( m_flags & wxAUI_NB_BOTTOM ) +@@ -88,7 +88,7 @@ + dc.GradientFillLinear( r, top_color, bottom_color, wxNORTH ); + + // draw base lines +- dc.SetPen( m_border_pen ); ++ dc.SetPen( m_borderPen ); + int y = rect.GetHeight(); + int w = rect.GetWidth(); + +@@ -120,10 +120,10 @@ + if( caption.empty() ) + caption = wxT("Xj"); + +- dc.SetFont(m_selected_font); ++ dc.SetFont(m_selectedFont); + dc.GetTextExtent(caption, &selected_textx, &selected_texty); + +- dc.SetFont(m_normal_font); ++ dc.SetFont(m_normalFont); + dc.GetTextExtent(caption, &normal_textx, &normal_texty); + + // figure out the size of the tab +@@ -135,7 +135,7 @@ + close_button_state, + x_extent); + +- wxCoord tab_height = m_tab_ctrl_height - 1; ++ wxCoord tab_height = m_tabCtrlHeight - 1; + if( !page.active ) + tab_height -= 2; + wxCoord tab_width = tab_size.x; +@@ -150,12 +150,12 @@ + + if( page.active ) + { +- dc.SetFont( m_selected_font ); ++ dc.SetFont( m_selectedFont ); + texty = selected_texty; + } + else + { +- dc.SetFont(m_normal_font); ++ dc.SetFont(m_normalFont); + texty = normal_texty; + } + +@@ -221,7 +221,7 @@ + // } + + // draw tab outline +- dc.SetPen( m_border_pen ); ++ dc.SetPen( m_borderPen ); + dc.SetBrush( * wxTRANSPARENT_BRUSH ); + dc.DrawPolygon( WXSIZEOF( border_points ), border_points ); + +@@ -230,7 +230,7 @@ + if( page.active ) + { + if( m_flags & wxAUI_NB_BOTTOM ) +- dc.SetPen( wxPen( wxColour( wxAuiStepColour( m_base_colour, 170 ) ) ) ); ++ dc.SetPen( wxPen( wxColour( wxAuiStepColour( m_baseColour, 170 ) ) ) ); + // TODO: else if (m_flags &wxAUI_NB_LEFT) {} + // TODO: else if (m_flags &wxAUI_NB_RIGHT) {} + else //for wxAUI_NB_TOP +@@ -246,7 +246,7 @@ + int close_button_width = 0; + if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) + { +- close_button_width = m_active_close_bmp.GetWidth(); ++ close_button_width = m_activeCloseBmp.GetWidth(); + } + + +@@ -284,12 +284,12 @@ + // draw close button if necessary + if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) + { +- wxBitmap bmp = m_disabled_close_bmp; ++ wxBitmap bmp = m_disabledCloseBmp; + + if (close_button_state == wxAUI_BUTTON_STATE_HOVER || + close_button_state == wxAUI_BUTTON_STATE_PRESSED) + { +- bmp = m_active_close_bmp; ++ bmp = m_activeCloseBmp; + } + + wxRect rect(tab_x + tab_width - close_button_width - 1, +@@ -367,14 +367,14 @@ + // UpdateTabCtrlHeight() does the actual tab resizing. It's meant + // to be used interally + // -------------------------------------------------------------------------------- // +-void guAuiNotebook::UpdateTabCtrlHeight() ++bool guAuiNotebook::UpdateTabCtrlHeight() + { + // get the tab ctrl height we will use + int height = CalculateTabCtrlHeight(); + + wxAuiTabArt* art = m_tabs.GetArtProvider(); + +- m_tab_ctrl_height = height; ++ m_tabCtrlHeight = height; + + wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); + size_t i, pane_count = all_panes.GetCount(); +@@ -385,10 +385,12 @@ + continue; + wxTabFrame* tab_frame = (wxTabFrame*)pane.window; + wxAuiTabCtrl* tabctrl = tab_frame->m_tabs; +- tab_frame->SetTabCtrlHeight(m_tab_ctrl_height); ++ tab_frame->SetTabCtrlHeight(m_tabCtrlHeight); + tabctrl->SetArtProvider(art->Clone()); + tab_frame->DoSizing(); + } ++ ++ return true; + } + + // -------------------------------------------------------------------------------- // +@@ -447,7 +449,7 @@ + if( p ) + tabs += wxT( "," ); + +- if( ( int ) page_idx == m_curpage ) ++ if( ( int ) page_idx == m_curPage ) + tabs += wxT( "*" ); + else if( ( int ) p == tabframe->m_tabs->GetActivePage() ) + tabs += wxT( "+" ); +@@ -501,12 +503,12 @@ + // create a new tab frame + wxTabFrame * new_tabs = new wxTabFrame; + new_tabs->m_tabs = new wxAuiTabCtrl( this, +- m_tab_id_counter++, ++ m_tabIdCounter++, + wxDefaultPosition, + wxDefaultSize, + wxNO_BORDER | wxWANTS_CHARS ); + new_tabs->m_tabs->SetArtProvider( m_tabs.GetArtProvider()->Clone() ); +- new_tabs->SetTabCtrlHeight( m_tab_ctrl_height ); ++ new_tabs->SetTabCtrlHeight( m_tabCtrlHeight ); + new_tabs->m_tabs->SetFlags( m_flags ); + wxAuiTabCtrl * dest_tabs = new_tabs->m_tabs; + +@@ -555,7 +557,7 @@ + m_mgr.LoadPerspective( frames ); + + // Force refresh of selection +- m_curpage = -1; ++ m_curPage = -1; + SetSelection( sel_page ); + + return true; +--- a/src/AuiNotebook.h ++++ b/src/AuiNotebook.h +@@ -205,7 +205,7 @@ + + virtual ~guAuiNotebook(); + +- virtual void UpdateTabCtrlHeight(); ++ virtual bool UpdateTabCtrlHeight(); + + wxString SavePerspective( void ); + bool LoadPerspective( const wxString &layout ); +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,7 +120,7 @@ + SET( ADD_WXSQLITE_SUPPORT 0 ) + PKG_CHECK_MODULES( LIBWXSQLITE3 wxsqlite3 ) + IF( NOT LIBWXSQLITE3_LIBRARIES ) +- PKG_CHECK_MODULES( LIBWXSQLITE3 wxsqlite3-2.8 ) ++ PKG_CHECK_MODULES( LIBWXSQLITE3 wxsqlite3-3.0 ) + IF( NOT LIBWXSQLITE3_LIBRARIES ) + ADD_DEFINITIONS(-DADD_WXSQLITE_SUPPORT=1) + SET( ADD_WXSQLITE_SUPPORT 1 ) +--- a/src/LastFMPanel.cpp ++++ b/src/LastFMPanel.cpp +@@ -2812,7 +2812,7 @@ + if( event.GetKeyCode() == WXK_RETURN ) + { + wxCommandEvent CmdEvent( wxEVT_COMMAND_TEXT_ENTER ); +- m_ArtistTextCtrl->AddPendingEvent( CmdEvent ); ++ m_ArtistTextCtrl->GetEventHandler()->AddPendingEvent( CmdEvent ); + return; + } + event.Skip(); +--- a/src/MainApp.cpp ++++ b/src/MainApp.cpp +@@ -360,8 +360,7 @@ + if( LangInfo ) + { + guLogError( wxT( "Could not initialize the translations engine for ( %s )" ), LangInfo->CanonicalName.c_str() ); +- wxStandardPaths StdPaths; +- guLogError( wxT( "Locale directory '%s'" ), StdPaths.GetLocalizedResourcesDir( LangInfo->CanonicalName, wxStandardPaths::ResourceCat_Messages).c_str() ); ++ guLogError( wxT( "Locale directory '%s'" ), wxStandardPaths::Get().GetLocalizedResourcesDir( LangInfo->CanonicalName, wxStandardPaths::ResourceCat_Messages).c_str() ); + } + else + { +--- a/src/PLSoListBox.cpp ++++ b/src/PLSoListBox.cpp +@@ -179,7 +179,7 @@ + if( event.GetKeyCode() == WXK_DELETE ) + { + wxCommandEvent evt( wxEVT_COMMAND_MENU_SELECTED, ID_TRACKS_DELETE ); +- GetParent()->AddPendingEvent( evt ); ++ GetParent()->GetEventHandler()->AddPendingEvent( evt ); + return; + } + +--- a/src/StatusBar.cpp ++++ b/src/StatusBar.cpp +@@ -509,7 +509,7 @@ + } + + // -------------------------------------------------------------------------------- // +-void guStatusBar::DrawField( wxDC &dc, int i ) ++void guStatusBar::DrawField( wxDC &dc, int i, int textHeight ) + { + wxRect rect; + GetFieldRect( i, rect ); +@@ -521,7 +521,7 @@ + dc.DrawLine( rect.x + rect.width, rect.y + 1, rect.x + rect.width, rect.y + rect.height - 1 ); + } + +- DrawFieldText( dc, i ); ++ DrawFieldText( dc, rect, i, textHeight ); + } + + // -------------------------------------------------------------------------------- // +--- a/src/TagInfo.cpp ++++ b/src/TagInfo.cpp +@@ -2453,7 +2453,7 @@ + } + + // -------------------------------------------------------------------------------- // +-bool guTagSetLyrics( const wxString &filename, wxString &lyrics ) ++bool guTagSetLyrics( const wxString &filename, const wxString &lyrics ) + { + guMainFrame * MainFrame = ( guMainFrame * ) wxTheApp->GetTopWindow(); + +--- a/src/TagInfo.h ++++ b/src/TagInfo.h +@@ -329,7 +329,7 @@ + bool guTagSetPicture( const wxString &filename, wxImage * picture ); + bool guTagSetPicture( const wxString &filename, const wxString &imagefile ); + wxString guTagGetLyrics( const wxString &filename ); +-bool guTagSetLyrics( const wxString &filename, wxString &lyrics ); ++bool guTagSetLyrics( const wxString &filename, const wxString &lyrics ); + //void guUpdateTrack( const guTrack &track, const wxImage * image, const wxString &lyrics, const int &changedflags ); + void guUpdateTracks( const guTrackArray &tracks, const guImagePtrArray &images, + const wxArrayString &lyrics, const wxArrayInt &changedflags ); +--- a/src/PlayListAppend.cpp ++++ b/src/PlayListAppend.cpp +@@ -128,7 +128,7 @@ + int guPlayListAppend::GetSelectedPlayList( void ) + { + int Selection = m_PlayListComboBox->GetSelection(); +- if( Selection == wxNOT_FOUND && !m_PlayListComboBox->IsEmpty() ) ++ if( Selection == wxNOT_FOUND && m_PlayListComboBox->GetCount() != 0 ) + { + Selection = FindPlayListItem( m_PlayListItems, m_PlayListComboBox->GetValue().Lower().Trim().Trim( false ) ); + } +--- a/src/AlbumBrowser.cpp ++++ b/src/AlbumBrowser.cpp +@@ -2308,7 +2308,7 @@ + // Its a LeftUp event + event.SetEventType( wxEVT_LEFT_DOWN ); + event.m_leftDown = true; +- m_BigCoverTracksListBox->AddPendingEvent( event ); ++ m_BigCoverTracksListBox->GetEventHandler()->AddPendingEvent( event ); + } + return; + } +--- a/src/AuiDockArt.cpp ++++ b/src/AuiDockArt.cpp +@@ -23,7 +23,34 @@ + #include "Images.h" + #include "Utils.h" + +-extern wxString wxAuiChopText( wxDC &dc, const wxString &text, int max_size ); ++wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size) ++{ ++ wxCoord x,y; ++ ++ // first check if the text fits with no problems ++ dc.GetTextExtent(text, &x, &y); ++ if (x <= max_size) ++ return text; ++ ++ size_t i, len = text.Length(); ++ size_t last_good_length = 0; ++ for (i = 0; i < len; ++i) ++ { ++ wxString s = text.Left(i); ++ s += wxT("..."); ++ ++ dc.GetTextExtent(s, &x, &y); ++ if (x > max_size) ++ break; ++ ++ last_good_length = i; ++ } ++ ++ wxString ret = text.Left(last_good_length); ++ ret += wxT("..."); ++ return ret; ++} ++ + + // -------------------------------------------------------------------------------- // + guAuiDockArt::guAuiDockArt() : wxAuiDefaultDockArt() +@@ -42,12 +69,12 @@ + // -------------------------------------------------------------------------------- // + void guAuiDockArt::DrawCaptionBackground( wxDC &dc, const wxRect &rect, bool active ) + { +- if( m_gradient_type == wxAUI_GRADIENT_NONE ) ++ if( m_gradientType == wxAUI_GRADIENT_NONE ) + { + if( active ) +- dc.SetBrush( wxBrush( m_active_caption_colour ) ); ++ dc.SetBrush( wxBrush( m_activeCaptionColour ) ); + else +- dc.SetBrush( wxBrush( m_inactive_caption_colour ) ); ++ dc.SetBrush( wxBrush( m_inactiveCaptionColour ) ); + + dc.DrawRectangle( rect.x, rect.y, rect.width, rect.height ); + } +@@ -58,15 +85,15 @@ + // on mac the gradients are expected to become darker from the top + #ifdef __WXMAC__ + DrawGradientRectangle( dc, rect, +- m_active_caption_colour, +- m_active_caption_gradient_colour, +- m_gradient_type ); ++ m_activeCaptionColour, ++ m_activeCaptionGradientColour, ++ m_gradientType ); + #else + // on other platforms, active gradients become lighter at the top + DrawGradientRectangle( dc, rect, +- m_active_caption_colour, +- m_active_caption_gradient_colour, +- m_gradient_type ); ++ m_activeCaptionColour, ++ m_activeCaptionGradientColour, ++ m_gradientType ); + #endif + } + else +@@ -74,20 +101,20 @@ + #ifdef __WXMAC__ + // on mac the gradients are expected to become darker from the top + DrawGradientRectangle( dc, rect, +- m_inactive_caption_colour, +- m_inactive_caption_gradient_colour, +- m_gradient_type ); ++ m_inactiveCaptionColour, ++ m_inactiveCaptionGradientColour, ++ m_gradientType ); + #else + // on other platforms, inactive gradients become lighter at the bottom + DrawGradientRectangle( dc, rect, +- m_inactive_caption_colour, +- m_inactive_caption_gradient_colour, +- m_gradient_type ); ++ m_inactiveCaptionColour, ++ m_inactiveCaptionGradientColour, ++ m_gradientType ); + #endif + } + } + +- dc.SetPen( m_border_pen ); ++ dc.SetPen( m_borderPen ); + int y = rect.y + rect.height - 1; + dc.DrawLine( rect.x, y, rect.x + rect.width, y ); + } +@@ -97,11 +124,11 @@ + void guAuiDockArt::DrawCaption( wxDC &dc, wxWindow * window, const wxString &text, const wxRect &rect, wxAuiPaneInfo &pane ) + { + dc.SetPen( * wxTRANSPARENT_PEN ); +- dc.SetFont( m_caption_font ); ++ dc.SetFont( m_captionFont ); + + DrawCaptionBackground( dc, rect, bool( pane.state & wxAuiPaneInfo::optionActive ) ); + +- dc.SetTextForeground( pane.state & wxAuiPaneInfo::optionActive ? m_active_caption_text_colour : m_inactive_caption_text_colour ); ++ dc.SetTextForeground( pane.state & wxAuiPaneInfo::optionActive ? m_activeCaptionTextColour : m_inactiveCaptionTextColour ); + + wxCoord w, h; + dc.GetTextExtent( wxT( "ABCDEFHXfgkj" ), &w, &h ); +@@ -110,11 +137,11 @@ + clip_rect.width -= 3; // text offset + clip_rect.width -= 2; // button padding + if( pane.HasCloseButton() ) +- clip_rect.width -= m_button_size; ++ clip_rect.width -= m_buttonSize; + if( pane.HasPinButton() ) +- clip_rect.width -= m_button_size; ++ clip_rect.width -= m_buttonSize; + if( pane.HasMaximizeButton() ) +- clip_rect.width -= m_button_size; ++ clip_rect.width -= m_buttonSize; + + wxString draw_text = wxAuiChopText( dc, text, clip_rect.width ); + +--- a/src/SmartMode.cpp ++++ b/src/SmartMode.cpp +@@ -500,7 +500,7 @@ + int guGenSmartPlaylist::GetPlayListId( void ) + { + int Selection = m_SaveToComboBox->GetSelection(); +- if( Selection == wxNOT_FOUND && !m_SaveToComboBox->IsEmpty() ) ++ if( Selection == wxNOT_FOUND && m_SaveToComboBox->GetCount() != 0 ) + { + Selection = FindPlayListItem( &m_Playlists, m_SaveToComboBox->GetValue().Lower().Trim().Trim( false ) ); + } +--- a/src/StaticBitmap.cpp ++++ b/src/StaticBitmap.cpp +@@ -70,7 +70,7 @@ + { + wxCommandEvent event( guStaticBitmapMouseOverEvent, guEVT_STATICBITMAP_MOUSE_OVER ); + event.SetEventObject( this ); +- m_Bitmap->AddPendingEvent( event ); ++ m_Bitmap->GetEventHandler()->AddPendingEvent( event ); + } + } + +--- a/src/Equalizer.cpp ++++ b/src/Equalizer.cpp +@@ -537,7 +537,7 @@ + { + int Sel = m_PresetComboBox->GetSelection(); + +- m_SaveButton->Enable( !m_PresetComboBox->IsEmpty() && ++ m_SaveButton->Enable( m_PresetComboBox->GetCount() != 0 && + ( m_BandChanged || !FindPresetName( m_PresetComboBox->GetValue(), m_EQPresets ) ) ); + + m_DelButton->Enable( Sel != wxNOT_FOUND ); +--- a/src/LocationPanel.cpp ++++ b/src/LocationPanel.cpp +@@ -161,7 +161,52 @@ + return 1; + } + +-extern wxColor wxAuiStepColour( const wxColor & c, int percent ); ++unsigned char wxAuiBlendColour(unsigned char fg, unsigned char bg, double alpha) ++{ ++ double result = bg + (alpha * (fg - bg)); ++ if (result < 0.0) ++ result = 0.0; ++ if (result > 255) ++ result = 255; ++ return (unsigned char)result; ++} ++ ++wxColor wxAuiStepColour(const wxColor& c, int ialpha) ++{ ++ if (ialpha == 100) ++ return c; ++ ++ unsigned char r = c.Red(), ++ g = c.Green(), ++ b = c.Blue(); ++ unsigned char bg; ++ ++ // ialpha is 0..200 where 0 is completely black ++ // and 200 is completely white and 100 is the same ++ // convert that to normal alpha 0.0 - 1.0 ++ ialpha = wxMin(ialpha, 200); ++ ialpha = wxMax(ialpha, 0); ++ double alpha = ((double)(ialpha - 100.0))/100.0; ++ ++ if (ialpha > 100) ++ { ++ // blend with white ++ bg = 255; ++ alpha = 1.0 - alpha; // 0 = transparent fg; 1 = opaque fg ++ } ++ else ++ { ++ // blend with black ++ bg = 0; ++ alpha += 1.0; // 0 = transparent fg; 1 = opaque fg ++ } ++ ++ r = wxAuiBlendColour(r, bg, alpha); ++ g = wxAuiBlendColour(g, bg, alpha); ++ b = wxAuiBlendColour(b, bg, alpha); ++ ++ return wxColour(r, g, b); ++} + + // -------------------------------------------------------------------------------- // + void guLocationTreeCtrl::ReloadItems( const bool loadstate ) +--- a/src/StatusBar.h ++++ b/src/StatusBar.h +@@ -46,7 +46,7 @@ + public : + guGauge() : wxControl() { m_LastValue = wxNOT_FOUND; m_PaintWidth = 0; }; + guGauge( wxWindow * parent, const wxString &label = wxEmptyString, bool showporcent = true, wxWindowID id = wxID_ANY, unsigned int max = 100, +- const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxGA_HORIZONTAL ); ++ const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxGA_HORIZONTAL | wxBORDER_NONE ); + ~guGauge( void ); + + void SetRange( int range ); +@@ -101,7 +101,7 @@ + void SetPlayMode( const bool forcegapless ); + void SetAudioScrobble( const bool audioscrobble ); + +- virtual void DrawField( wxDC &dc, int i ); ++ virtual void DrawField( wxDC &dc, int i, int textHeight ); + + }; + +--- a/src/Utils.cpp ++++ b/src/Utils.cpp +@@ -311,7 +311,7 @@ + static const wxChar marks[] = wxT( "-_.\"!~*()'" ); + + wxString RetVal; +- unsigned char CurChar; ++ wxChar CurChar; + + wxCharBuffer CharBuffer = url.ToUTF8(); + int Index; +@@ -352,7 +352,7 @@ + + for( index = 0; index < StrLen; index++ ) + { +- unsigned char C = CharBuffer[ index ]; ++ wxChar C = CharBuffer[ index ]; + { + static const wxChar marks[] = wxT( " -_.\"/+!~*()'[]%" ); //~!@#$&*()=:/,;?+' + +--- a/src/ListView.cpp ++++ b/src/ListView.cpp +@@ -914,7 +914,7 @@ + // iterate over all visible lines + for( ; line < lineMax; line++ ) + { +- const wxCoord hLine = OnGetLineHeight( line ); ++ const wxCoord hLine = OnGetRowHeight( line ); + + rectLine.height = hLine; + +--- a/src/TimeLine.h ++++ b/src/TimeLine.h +@@ -115,7 +115,7 @@ + + virtual void TimerEvent( void ); + virtual int TimerCreate( void ); +- virtual void TimerDestroy( void ) { g_source_remove( m_TimerId ); } ++ virtual void TimerDestroy( void ) { int id = m_TimerId; m_TimerId = 0; if (id) g_source_remove( id ); } + + }; + +--- a/src/SplashWin.cpp ++++ b/src/SplashWin.cpp +@@ -79,7 +79,7 @@ + + Show( true ); + SetThemeEnabled( false ); +- SetBackgroundStyle( wxBG_STYLE_CUSTOM ); ++ SetBackgroundStyle( wxBG_STYLE_ERASE ); + + m_Timer.SetOwner( this ); + m_Timer.Start( timeout, wxTIMER_ONE_SHOT ); +--- a/src/RoundButton.cpp ++++ b/src/RoundButton.cpp +@@ -33,7 +33,7 @@ + + // -------------------------------------------------------------------------------- // + guRoundButton::guRoundButton( wxWindow * parent, const wxImage &image, const wxImage &selimage, const int flags ) : +- wxControl( parent, wxID_ANY ) ++ wxControl( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE ) + { + m_Bitmap = wxBitmap( image ); + m_HoverBitmap = wxBitmap( selimage ); +--- a/src/RatingCtrl.cpp ++++ b/src/RatingCtrl.cpp +@@ -34,7 +34,8 @@ + END_EVENT_TABLE() + + // -------------------------------------------------------------------------------- // +-guRating::guRating( wxWindow * parent, const int style ) : wxControl( parent, wxID_ANY ) ++guRating::guRating( wxWindow * parent, const int style ) : ++ wxControl( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE ) + { + m_Rating = wxNOT_FOUND; + m_Style = style; +--- a/src/ToggleRoundButton.cpp ++++ b/src/ToggleRoundButton.cpp +@@ -35,7 +35,7 @@ + // -------------------------------------------------------------------------------- // + guToggleRoundButton::guToggleRoundButton( wxWindow * parent, const wxImage &image, + const wxImage &selimage, const wxImage &hoverimage ) : +- wxControl( parent, wxID_ANY ) ++ wxControl( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE ) + { + m_Bitmap = wxBitmap( selimage ); + m_DisBitmap = wxBitmap( image ); diff --git a/media-sound/guayadeque/guayadeque-0.3.7-r1.ebuild b/media-sound/guayadeque/guayadeque-0.3.7-r1.ebuild new file mode 100644 index 000000000000..60734acb6dde --- /dev/null +++ b/media-sound/guayadeque/guayadeque-0.3.7-r1.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" + +inherit cmake-utils eutils wxwidgets + +DESCRIPTION="Music management program designed for all music enthusiasts" +HOMEPAGE="http://guayadeque.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ayatana ipod +minimal" + +# No test available, Making src_test fail +RESTRICT="test" + +# Missing +# gstreamer0.10-fluendo-mp3 #120237 +# gstreamer0.10-plugins-bad-multiverse ?? +# gstreamer0.10-plugins-base-apps ?? + +GST_VERSION=0.10 +GST_DEPS=" + dev-perl/GStreamer + media-libs/gnonlin:${GST_VERSION} + media-plugins/gst-plugins-alsa:${GST_VERSION} + media-plugins/gst-plugins-ffmpeg:${GST_VERSION} + media-plugins/gst-plugins-gio:${GST_VERSION} + media-plugins/gst-plugins-gnomevfs:${GST_VERSION} + media-plugins/gst-plugins-libnice:${GST_VERSION} + media-plugins/gst-plugins-pulse:${GST_VERSION} + media-plugins/gst-plugins-soup:${GST_VERSION} + media-plugins/gst-plugins-x:${GST_VERSION} + media-libs/gst-plugins-bad:${GST_VERSION} + media-libs/gst-plugins-base:${GST_VERSION} + media-libs/gst-plugins-good:${GST_VERSION} + media-libs/gst-plugins-ugly:${GST_VERSION} +" + +RDEPEND=" + dev-db/sqlite:3 + >=dev-db/wxsqlite3-3.2.1 + dev-libs/glib:2 + media-libs/flac + media-libs/gstreamer:${GST_VERSION}[introspection] + >=media-libs/taglib-1.6.4 + net-misc/curl + sys-apps/dbus + x11-libs/wxGTK:3.0[X] + ayatana? ( >=dev-libs/libindicate-0.7 ) + ipod? ( media-libs/libgpod ) + !minimal? ( ${GST_DEPS} )" +DEPEND="${RDEPEND} + app-arch/unzip + sys-devel/gettext + virtual/pkgconfig" + +# echo $(cat po/CMakeLists.txt | grep ADD_SUBDIRECTORY | sed 's#ADD_SUBDIRECTORY( \(\w\+\) )#\1#') +LANGS="es uk it de fr is nb th cs ru hu sv nl pt_BR pt el sk pl tr ja sr bg ca_ES hr" +for l in ${LANGS}; do + IUSE="$IUSE linguas_${l}" +done + +PATCHES=( + "${FILESDIR}"/${PN}-0.3.6*-underlinking.patch + "${FILESDIR}"/${P}-wx3.0.patch + "${FILESDIR}"/${P}-headers-location.patch +) + +src_prepare() { + for l in ${LANGS} ; do + if ! use linguas_${l} ; then + sed \ + -e "/${l}/d" \ + -i po/CMakeLists.txt || die + fi + done + + if ! use ipod; then + sed \ + -e '/PKG_CHECK_MODULES( LIBGPOD/,/^ENDIF/d' \ + -i CMakeLists.txt || die + fi + + if ! use ayatana; then + sed \ + -e '/PKG_CHECK_MODULES( LIBINDICATE/,/^ENDIF/d' \ + -i CMakeLists.txt || die + fi + + rm -rf src/wx/wxsql* src/wxsqlite3 || die + + cmake-utils_src_prepare + + # otherwise cmake checks for svn + esvn_clean + + sed 's:-O2::g' -i CMakeLists.txt || die + + sed \ + -e '/Encoding/d' \ + -i guayadeque.desktop || die +} + +pkg_postinst() { + local pkg + if use minimal; then + elog "If you are missing functionalities consider setting USE=-minimal" + elog "or install any of the following packages:" + for pkg in ${GST_DEPS}; do + elog "\t ${pkg}" + done + fi +} diff --git a/media-sound/mpc/mpc-0.27.ebuild b/media-sound/mpc/mpc-0.27.ebuild index 96e76f156fca..a03e5c7a4c06 100644 --- a/media-sound/mpc/mpc-0.27.ebuild +++ b/media-sound/mpc/mpc-0.27.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86" IUSE="iconv" RDEPEND=">=media-libs/libmpdclient-2.2 diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest index f0f893d686cd..1071f76dfed7 100644 --- a/media-sound/mpd/Manifest +++ b/media-sound/mpd/Manifest @@ -1,2 +1,3 @@ DIST mpd-0.19.10.tar.xz 701668 SHA256 c386eb3d22f98dc993b5ae3c272f969aa7763713483c6800040ebf1791b15851 SHA512 037e1ccd69456bd7d388cbcba26de83144816684fb266995b173df960051e84203d3fc7255d7766eee5dbe0629dbb7745b9821664486158d33da4f29189edef8 WHIRLPOOL 02c2ec2c898fbeb9bf39ae9a2b57d85881825489a033f56b6140602f7cd6176f39d4aa09f0dfd2391214bd70d3ffab0e7a7eefcba8085e5ea7d15168028efa53 +DIST mpd-0.19.11.tar.xz 703064 SHA256 7a5c66aa5af97a5b7af3dc49e3d2594071dafd62a14e2e9f7c9a5a86342836c6 SHA512 3ad505a75651facd141efbb43ebb86a9f1b66a0bc044d39c9131068fc20d05037ad449935fd6fc20917dfd690cdc256c1d1deb7427039d2345b13bea2b2eb66e WHIRLPOOL da4a05fce7276e8f98acfe2a0eceb71e747049d9c64b7eed226b5e8e3b2c5fd197098b20509e5cb2ad2f280a4f3872439a893ad58677be5b79b251d57b04c90d DIST mpd-0.19.9.tar.xz 701480 SHA256 47851423053cd38cfad65be5985b41b7cd5bdbe8d0d13378e11748a28b19f26f SHA512 7d74254e009008ed142ce0b69e75fe6f255ec2c814b246f570225af715ec5c3a5c75276f4720bc1ad351d48be5b20f9797843c03aae9380a6062796539507bf4 WHIRLPOOL 04ee826f55512c5f4b28f0bfbf78e23710070970be2f7da07b421483da1d9dad20b0b3513a2529f88d83c92f8202cb57bad09fee894eb18387cbc156312e3a06 diff --git a/media-sound/mpd/mpd-0.19.10.ebuild b/media-sound/mpd/mpd-0.19.10.ebuild index b42113dd05b7..691f47ca075b 100644 --- a/media-sound/mpd/mpd-0.19.10.ebuild +++ b/media-sound/mpd/mpd-0.19.10.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos" +KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos" IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad +fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug diff --git a/media-sound/mpd/mpd-0.19.11.ebuild b/media-sound/mpd/mpd-0.19.11.ebuild new file mode 100644 index 000000000000..da43a94770b2 --- /dev/null +++ b/media-sound/mpd/mpd-0.19.11.ebuild @@ -0,0 +1,250 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user + +DESCRIPTION="The Music Player Daemon (mpd)" +HOMEPAGE="http://www.musicpd.org" +SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos" +IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad + +fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack + lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug + mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder + samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame + unicode upnp vorbis wavpack wildmidi zeroconf zip zlib" + +OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder" +DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod + modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi" +ENCODER_PLUGINS="audiofile flac lame twolame vorbis" + +REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} ) + || ( ${DECODER_PLUGINS} ) + ao? ( glib ) + gme? ( glib ) + jack? ( glib ) + network? ( || ( ${ENCODER_PLUGINS} ) + glib ) + recorder? ( || ( ${ENCODER_PLUGINS} ) ) + sid? ( glib ) + soundcloud? ( glib ) + sqlite? ( glib ) + opus? ( ogg ) + upnp? ( expat ) + vorbis? ( glib ) + wavpack? ( glib )" + +CDEPEND="!<sys-cluster/mpich2-1.4_rc2 + adplug? ( media-libs/adplug ) + alsa? ( media-sound/alsa-utils + media-libs/alsa-lib ) + ao? ( media-libs/libao[alsa?,pulseaudio?] ) + audiofile? ( media-libs/audiofile ) + bzip2? ( app-arch/bzip2 ) + cdio? ( dev-libs/libcdio-paranoia ) + curl? ( net-misc/curl ) + expat? ( dev-libs/expat ) + faad? ( media-libs/faad2 ) + ffmpeg? ( + libav? ( media-video/libav:0= ) + !libav? ( media-video/ffmpeg:0= ) + ) + flac? ( media-libs/flac[ogg?] ) + fluidsynth? ( media-sound/fluidsynth ) + glib? ( dev-libs/glib:2 ) + gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) + icu? ( dev-libs/icu:= ) + id3tag? ( media-libs/libid3tag ) + jack? ( media-sound/jack-audio-connection-kit ) + lame? ( network? ( media-sound/lame ) ) + libmpdclient? ( media-libs/libmpdclient ) + libsamplerate? ( media-libs/libsamplerate ) + mad? ( media-libs/libmad ) + mikmod? ( media-libs/libmikmod:0 ) + mms? ( media-libs/libmms ) + modplug? ( media-libs/libmodplug ) + mpg123? ( >=media-sound/mpg123-1.12.2 ) + musepack? ( media-sound/musepack-tools ) + network? ( >=media-libs/libshout-2 + !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) + nfs? ( net-fs/libnfs ) + ogg? ( media-libs/libogg ) + openal? ( media-libs/openal ) + opus? ( media-libs/opus ) + pulseaudio? ( media-sound/pulseaudio ) + samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) ) + sid? ( media-libs/libsidplay:2 ) + sndfile? ( media-libs/libsndfile ) + soundcloud? ( >=dev-libs/yajl-2 ) + libsoxr? ( media-libs/soxr ) + sqlite? ( dev-db/sqlite:3 ) + systemd? ( sys-apps/systemd ) + tcpd? ( sys-apps/tcp-wrappers ) + twolame? ( media-sound/twolame ) + upnp? ( net-libs/libupnp ) + vorbis? ( media-libs/libvorbis ) + wavpack? ( media-sound/wavpack ) + wildmidi? ( media-sound/wildmidi ) + zeroconf? ( net-dns/avahi[dbus] ) + zip? ( dev-libs/zziplib ) + zlib? ( sys-libs/zlib )" +DEPEND="${CDEPEND} + dev-libs/boost + virtual/pkgconfig" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-mpd ) +" + +pkg_setup() { + use network || ewarn "Icecast and Shoutcast streaming needs networking." + use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." + + enewuser mpd "" "" "/var/lib/mpd" audio + + if use eventfd; then + CONFIG_CHECK+=" ~EVENTFD" + ERROR_EVENTFD="${P} requires eventfd in-kernel support." + fi + if use signalfd; then + CONFIG_CHECK+=" ~SIGNALFD" + ERROR_SIGNALFD="${P} requires signalfd in-kernel support." + fi + if use inotify; then + CONFIG_CHECK+=" ~INOTIFY_USER" + ERROR_INOTIFY_USER="${P} requires inotify in-kernel support." + fi + if use eventfd || use signalfd || use inotify; then + linux-info_pkg_setup + fi +} + +src_prepare() { + DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make + sure that MPD's pid_file is _set_." + + cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" + epatch "${FILESDIR}"/${PN}-0.18.conf.patch +} + +src_configure() { + local mpdconf="--enable-database --disable-roar --disable-documentation + --enable-dsd --enable-largefile --disable-osx --disable-shine-encoder + --disable-solaris-output --enable-tcp --enable-un --disable-werror + --docdir=${EPREFIX}/usr/share/doc/${PF}" + + if use network; then + mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder) + --enable-httpd-output $(use_enable lame lame-encoder) + $(use_enable twolame twolame-encoder) + $(use_enable audiofile wave-encoder)" + else + mpdconf+=" --disable-shout --disable-vorbis-encoder + --disable-httpd-output --disable-lame-encoder + --disable-twolame-encoder --disable-wave-encoder" + fi + + if use samba || use upnp; then + mpdconf+=" --enable-neighbor-plugins" + fi + + append-lfs-flags + append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" + + econf \ + $(use_enable eventfd) \ + $(use_enable signalfd) \ + $(use_enable libmpdclient) \ + $(use_enable expat) \ + $(use_enable upnp) \ + $(use_enable adplug) \ + $(use_enable alsa) \ + $(use_enable ao) \ + $(use_enable audiofile) \ + $(use_enable zlib) \ + $(use_enable bzip2) \ + $(use_enable cdio cdio-paranoia) \ + $(use_enable curl) \ + $(use_enable samba smbclient) \ + $(use_enable nfs) \ + $(use_enable debug) \ + $(use_enable ffmpeg) \ + $(use_enable fifo) \ + $(use_enable flac) \ + $(use_enable fluidsynth) \ + $(use_enable gme) \ + $(use_enable id3tag id3) \ + $(use_enable inotify) \ + $(use_enable ipv6) \ + $(use_enable cdio iso9660) \ + $(use_enable jack) \ + $(use_enable soundcloud) \ + $(use_enable tcpd libwrap) \ + $(use_enable libsamplerate lsr) \ + $(use_enable libsoxr soxr) \ + $(use_enable mad) \ + $(use_enable mikmod) \ + $(use_enable mms) \ + $(use_enable modplug) \ + $(use_enable musepack mpc) \ + $(use_enable mpg123) \ + $(use_enable openal) \ + $(use_enable opus) \ + $(use_enable oss) \ + $(use_enable pipe pipe-output) \ + $(use_enable pulseaudio pulse) \ + $(use_enable recorder recorder-output) \ + $(use_enable sid sidplay) \ + $(use_enable sndfile sndfile) \ + $(use_enable sqlite) \ + $(use_enable systemd systemd-daemon) \ + $(use_enable vorbis) \ + $(use_enable wavpack) \ + $(use_enable wildmidi) \ + $(use_enable zip zzip) \ + $(use_enable icu) \ + $(use_enable glib) \ + $(use_enable faad aac) \ + $(use_with zeroconf zeroconf avahi) \ + "$(systemd_with_unitdir)" \ + ${mpdconf} +} + +src_install() { + emake DESTDIR="${D}" install + + insinto /etc + newins doc/mpdconf.dist mpd.conf + + newinitd "${FILESDIR}"/${PN}2.init ${PN} + + if use unicode; then + sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ + "${ED}"/etc/mpd.conf || die "sed failed" + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}.logrotate ${PN} + + use prefix || diropts -m0755 -o mpd -g audio + dodir /var/lib/mpd + keepdir /var/lib/mpd + dodir /var/lib/mpd/music + keepdir /var/lib/mpd/music + dodir /var/lib/mpd/playlists + keepdir /var/lib/mpd/playlists + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + # also change the homedir if the user has existed before + usermod -d "/var/lib/mpd" mpd +} diff --git a/media-sound/mpdas/mpdas-0.4.0-r1.ebuild b/media-sound/mpdas/mpdas-0.4.0-r1.ebuild index 9e4ffc4440d9..93b7a787ad01 100644 --- a/media-sound/mpdas/mpdas-0.4.0-r1.ebuild +++ b/media-sound/mpdas/mpdas-0.4.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://50hz.ws/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="media-libs/libmpdclient diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild index 7aa3e123d7d2..84b2b43f2bac 100644 --- a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild +++ b/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86" IUSE="clock curl outputs taglib unicode visualizer" RDEPEND=" diff --git a/media-sound/ogg2mp3/metadata.xml b/media-sound/ogg2mp3/metadata.xml index d2247332ee95..73b5b3c0e93c 100644 --- a/media-sound/ogg2mp3/metadata.xml +++ b/media-sound/ogg2mp3/metadata.xml @@ -9,7 +9,7 @@ <name>Tony Vroon</name> </maintainer> <maintainer> - <email>james.ausmus.code@gmail.com</email> + <email>james.ausmus@gmail.com</email> <name>James Ausmus</name> </maintainer> <upstream> diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest index f99e5d8f61bf..5beb48a471ec 100644 --- a/media-sound/qjackctl/Manifest +++ b/media-sound/qjackctl/Manifest @@ -1,5 +1,3 @@ DIST qjackctl-0.3.10.tar.gz 487678 SHA256 5cdd937c44e5c737f3d2c2063ada015cac2fc8ed0cdbcb90d0ba747087270132 SHA512 1d7c310967cd112aad2caa79684b40b90070e5ce78fe2fd71f0a159ff835a8ccb4806dd140237c05d369ec782965472616aca67fc649cf1ba232535dc8b3104f WHIRLPOOL 7a6cb86992d4dafc0dc43bb8587285c0a2db64649c29fb9a4236f050f89ac9df4cd1d6b7083b980a6121bb508eb98da3b48b3d4eca96d655d75bf737e107f9ab -DIST qjackctl-0.3.11.tar.gz 487451 SHA256 944393e87d193e8b495b0878ac3726882b5dc9a8cc596666f75a093bfacb5ff2 SHA512 4fd14cd8da30d9b04b9eac32cc13a4a145c1b695b833e7d97a12fc1609b1e96faf7ce451d6f9dea4f9f664ab4a9a27c7bc5e596f3d8432e0eefdc0181d7f7167 WHIRLPOOL 5083b5e16e86bea80b564b6732b80c5d37075db0cf37f7022a21290d670a4fa6480de4b28b329e348c2676dc1bd410ffba316bf0decccdfe2b5a901c23aceb04 -DIST qjackctl-0.3.12.tar.gz 496010 SHA256 8cff21f2b249d8960ddd8749ec1fa0ed0ec316014d2cf4a8939ac33109b3db93 SHA512 5afa61f4bef986601d9ee84d4c38128847f6160c827ca22abbe70c1a5b20fbd0e914ba00e0d4e16d118fb616d71618aa72d17507170dc9ca5bac6b5a8a2aa5a9 WHIRLPOOL a6fd4b5eeceec4d731fd9d9058ec462b8c247e8a5e62a0ec7ae93204dd4f05c62386b8cfea0082862fc5948420a14bb502353f0d50b9e9f54cc073af54a01e8d -DIST qjackctl-0.3.13.tar.gz 498208 SHA256 11e0041ff38ac46df466968bd5e0e33986f76b7f099bd75a66fbf2a07c1b1295 SHA512 1e515783eea4cd628ee0195b9d711b2d1d5a2651f8a9c1c6077de06055053129019be0657b12bd01238ba7d39e38fd06a361128187ac32d52c16fe873bd50dea WHIRLPOOL abb926b3a06bd5e7e90a3dd6ab3a30b4387b61a2b58c34d04f66b078a634f45e4275e8526a7d020f3d958296299e416479761caa3455758c1d2c68785be6f5ae DIST qjackctl-0.4.0.tar.gz 500534 SHA256 5b651cc5bd85986bcb36b32943e091c931ba229d58732c1724a200e03762485a SHA512 dff5d6bd153cc92149e7a16820ab061f70090eca7a15f8f79ac7b9316e7c279f61e800cfbfc7ec4ce0a13721e717f9f18b98611c22c2a134830111c865d3d001 WHIRLPOOL ae607775d75825355d405b6b3e41ae25793b4a698735d847c9617e6af2eef8dd73cf4ed104e7941c1d014ebeb02d48d128cb363241898ab9ffcb5752ae59464e +DIST qjackctl-0.4.1.tar.gz 824293 SHA256 98024e1ea9f55ac16c290feda051d6494b2261e83f6a918f0fa583b509e2bfd1 SHA512 99de2de422a82a1dbc26dd2d2548afd31a50dc650f2dbe177a26edfe3808a2f66a2206120535edaec8314f3ef25b2dfe6fadfdfb11b814ffe311185c68252881 WHIRLPOOL bfe04a75ba323fd2cf7c8e715ba9a0623bcaadcc47ad74f387aff381036c77d8fec269bfa341783e17a4580fda8f652fa30f52deeb61c857eed817588ab21367 diff --git a/media-sound/qjackctl/qjackctl-0.3.11.ebuild b/media-sound/qjackctl/qjackctl-0.3.11.ebuild deleted file mode 100644 index bb1c6aeacd8e..000000000000 --- a/media-sound/qjackctl/qjackctl-0.3.11.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-r2 - -DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections" -HOMEPAGE="http://qjackctl.sourceforge.net/" -SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="alsa dbus debug portaudio" - -RDEPEND=" - >=media-sound/jack-audio-connection-kit-0.109.2 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - alsa? ( media-libs/alsa-lib ) - dbus? ( dev-qt/qtdbus:4 ) - portaudio? ( media-libs/portaudio )" -DEPEND="${RDEPEND}" - -DOCS="AUTHORS ChangeLog README TODO TRANSLATORS" - -PATCHES=( "${FILESDIR}/${PN}-0.3.9-gcc47.patch" ) - -src_configure() { - econf \ - $(use_enable alsa alsa-seq) \ - $(use_enable dbus) \ - $(use_enable debug) \ - $(use_enable portaudio) - - # Emulate what the Makefile does, so that we can get the correct - # compiler used. - eqmake4 ${PN}.pro -o ${PN}.mak -} - -src_compile() { - emake -f ${PN}.mak - lupdate ${PN}.pro || die "lupdate failed" -} diff --git a/media-sound/qjackctl/qjackctl-0.3.12.ebuild b/media-sound/qjackctl/qjackctl-0.3.12.ebuild deleted file mode 100644 index bb1c6aeacd8e..000000000000 --- a/media-sound/qjackctl/qjackctl-0.3.12.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit qt4-r2 - -DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections" -HOMEPAGE="http://qjackctl.sourceforge.net/" -SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="alsa dbus debug portaudio" - -RDEPEND=" - >=media-sound/jack-audio-connection-kit-0.109.2 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - alsa? ( media-libs/alsa-lib ) - dbus? ( dev-qt/qtdbus:4 ) - portaudio? ( media-libs/portaudio )" -DEPEND="${RDEPEND}" - -DOCS="AUTHORS ChangeLog README TODO TRANSLATORS" - -PATCHES=( "${FILESDIR}/${PN}-0.3.9-gcc47.patch" ) - -src_configure() { - econf \ - $(use_enable alsa alsa-seq) \ - $(use_enable dbus) \ - $(use_enable debug) \ - $(use_enable portaudio) - - # Emulate what the Makefile does, so that we can get the correct - # compiler used. - eqmake4 ${PN}.pro -o ${PN}.mak -} - -src_compile() { - emake -f ${PN}.mak - lupdate ${PN}.pro || die "lupdate failed" -} diff --git a/media-sound/qjackctl/qjackctl-0.3.13.ebuild b/media-sound/qjackctl/qjackctl-0.4.1-r1.ebuild index 9e4eede6137e..0306d52e9d92 100644 --- a/media-sound/qjackctl/qjackctl-0.3.13.ebuild +++ b/media-sound/qjackctl/qjackctl-0.4.1-r1.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=5 -inherit qt4-r2 +inherit qmake-utils DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections" HOMEPAGE="http://qjackctl.sourceforge.net/" @@ -14,12 +14,12 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="alsa dbus debug portaudio" +IUSE="alsa dbus debug portaudio +qt5" RDEPEND=" >=media-sound/jack-audio-connection-kit-0.109.2 - dev-qt/qtcore:4 - dev-qt/qtgui:4 + qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) + !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:4 ) portaudio? ( media-libs/portaudio )" @@ -29,6 +29,8 @@ DOCS="AUTHORS ChangeLog README TODO TRANSLATORS" src_configure() { econf \ + $(use_with !qt5 qt4 "$(qt4_get_bindir)/..") \ + $(use_with qt5 qt5 "$(qt5_get_bindir)/..") \ $(use_enable alsa alsa-seq) \ $(use_enable dbus) \ $(use_enable debug) \ @@ -36,10 +38,13 @@ src_configure() { # Emulate what the Makefile does, so that we can get the correct # compiler used. - eqmake4 ${PN}.pro -o ${PN}.mak + if use qt5 ; then + eqmake5 ${PN}.pro -o ${PN}.mak + else + eqmake4 ${PN}.pro -o ${PN}.mak + fi } src_compile() { emake -f ${PN}.mak - lupdate ${PN}.pro || die "lupdate failed" } diff --git a/media-sound/qsynth/qsynth-0.3.9.ebuild b/media-sound/qsynth/qsynth-0.3.9.ebuild index f63ed827321e..b2cf1b1db04e 100644 --- a/media-sound/qsynth/qsynth-0.3.9.ebuild +++ b/media-sound/qsynth/qsynth-0.3.9.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" IUSE="debug jack alsa pulseaudio" -KEYWORDS="amd64 ppc ~x86" +KEYWORDS="amd64 ppc x86" DEPEND=">=dev-qt/qtcore-4.2:4 >=dev-qt/qtgui-4.2:4 diff --git a/media-sound/qtractor/qtractor-0.7.0.ebuild b/media-sound/qtractor/qtractor-0.7.0-r1.ebuild index 9ee4103e3df6..9ee4103e3df6 100644 --- a/media-sound/qtractor/qtractor-0.7.0.ebuild +++ b/media-sound/qtractor/qtractor-0.7.0-r1.ebuild diff --git a/media-sound/qtractor/qtractor-0.7.1.ebuild b/media-sound/qtractor/qtractor-0.7.1-r1.ebuild index 67a1e441c97b..67a1e441c97b 100644 --- a/media-sound/qtractor/qtractor-0.7.1.ebuild +++ b/media-sound/qtractor/qtractor-0.7.1-r1.ebuild diff --git a/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch b/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch new file mode 100644 index 000000000000..3f1396fcc704 --- /dev/null +++ b/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch @@ -0,0 +1,12 @@ +diff --git a/src/qtlocalpeer.cpp b/src/qtlocalpeer.cpp +index ddd2c74..52d6e6c 100644 +--- a/src/qtlocalpeer.cpp ++++ b/src/qtlocalpeer.cpp +@@ -41,6 +41,7 @@ + #include "qtlocalpeer.h" + #include <QCoreApplication> + #include <QTime> ++#include <QDataStream> + + #if defined(Q_OS_WIN) + #include <QLibrary> diff --git a/media-sound/quimup/quimup-1.4.0.ebuild b/media-sound/quimup/quimup-1.4.0.ebuild index b750bf530552..f39bc027ccaf 100644 --- a/media-sound/quimup/quimup-1.4.0.ebuild +++ b/media-sound/quimup/quimup-1.4.0.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -inherit qmake-utils +inherit eutils qmake-utils MY_P=${PN}_${PV} @@ -29,6 +29,10 @@ S="${WORKDIR}/${PN} ${PV}" DOCS=( changelog FAQ.txt README ) +src_prepare() { + epatch "${FILESDIR}"/${P}-qdatastream.patch +} + src_configure() { eqmake5 } diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest index 3c0ca2732589..a527e1975e5c 100644 --- a/media-sound/quodlibet/Manifest +++ b/media-sound/quodlibet/Manifest @@ -1,3 +1,4 @@ DIST quodlibet-2.6.3.tar.gz 2507416 SHA256 dff4ebb90c676678f72cecbff8ab15d80154354f40a865b6c9c82bb048d48a46 SHA512 ffbf03a4e0f1e5740b0c87ce62aa0cda33d017d0ee95dc6ecb3aeb8cadcde0fb525289658ea8edee088a382af4b261e44acb53cd0dc170520ed4070c8bf488e6 WHIRLPOOL 1ea653b1620170367cf7fa67519166c783192c0ee442598393699bc248cc697d608bf88903685e4ff39ec17b411c2be91d3807980951c61196436d0d23b88ca1 DIST quodlibet-3.1.2.tar.gz 2615449 SHA256 3ef6320f4c72e2e759c2190e87749aae7b59c6b154f48d1102a142fbc961edbf SHA512 f2429606098b74b6affabaafe392ad99b2f739de0c858e4ba45a0e6416963f941fc8276f33e6c68ce54f8412c772399f0341757fbade8b57047d743518c37fe1 WHIRLPOOL 513be2c0c0aa9b0881fae9621d76a730417a309b55492031d1f91a5183ab6f4366b9418fd02c785178daf042e2abf726ce9945315f0cac38fd775ec73d529bc7 DIST quodlibet-3.4.1.tar.gz 3318301 SHA256 0500f8f2e052a67e4397b8f7c634f800c9ce37c0456820aedbbef4003354ba78 SHA512 2f77825b696c9bdf411a039c234383ea728af0ca85d103082a17e3e9c8a13d180f06147c82fad1f0bb06c6e37e66ad99e8e5c227a8a32ed23ca981f33344ffc9 WHIRLPOOL 59858b25a13b2ec24ddd332f846713c65d5081843efdae98505879c21c430e56b0792c55790636977c09098a4aaf8250cbc93e7f4f1862dc2bcc55a7ba2f0871 +DIST quodlibet-3.5.1.tar.gz 3421676 SHA256 f168606ce931c30fcd478d354916bb07ae4ca9a61113af9b988e33f73adcb6c6 SHA512 c14447b17d15ad65fc54e4c81b26b190fa4622b1d83b0b7a4c85e42e332585fe067f93a2f0236bab20186072fb2af0a334bb2741660edb282f1e5e7a00a23c9d WHIRLPOOL 733a7bc88797561a27d2757422bb65bb09f366f91824772b54ac99aefa95b8769f1f566772424a8a819fc7e861bead048ab5c2f4ffc4656d46235454739d09b0 diff --git a/media-sound/quodlibet/quodlibet-3.5.1.ebuild b/media-sound/quodlibet/quodlibet-3.5.1.ebuild new file mode 100644 index 000000000000..cc3bacb90eb1 --- /dev/null +++ b/media-sound/quodlibet/quodlibet-3.5.1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +inherit distutils-r1 gnome2-utils fdo-mime + +DESCRIPTION="audio library tagger, manager, and player for GTK+" +HOMEPAGE="http://quodlibet.readthedocs.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="+dbus gstreamer ipod +udev" + +RDEPEND="dev-libs/keybinder:3[introspection] + dev-python/feedparser[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + >=media-libs/mutagen-1.22[${PYTHON_USEDEP}] + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 + media-plugins/gst-plugins-meta:1.0 + ) + !gstreamer? ( media-libs/xine-lib ) + dbus? ( + app-misc/media-player-info + dev-python/dbus-python[${PYTHON_USEDEP}] + ) + ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) + udev? ( virtual/udev ) + !media-plugins/quodlibet-plugins" +DEPEND="dev-util/intltool" +REQUIRED_USE="ipod? ( dbus )" + +S="${WORKDIR}/${PN}-release-${PV}/${PN}" + +src_prepare() { + local qlconfig=${PN}/config.py + + if ! use gstreamer; then + sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die + fi + + sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die + + distutils-r1_src_prepare +} + +src_install() { + distutils-r1_src_install + dodoc NEWS README +} + +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/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest index ff0749236147..d612e4c2c157 100644 --- a/media-sound/sooperlooper/Manifest +++ b/media-sound/sooperlooper/Manifest @@ -1,3 +1,4 @@ DIST sooperlooper-1.6.17.tar.gz 704953 SHA256 f35b1ffb977499f649cd22ed19441ca55618db4e0d4e0805973f228135b3dbdf SHA512 e7e8494b1ec00ad54ab1a5e42fe295ffe397e98225c81e1d69dd88f696b2e08502fef16f723536ffcc09d7b537a762f43a139c9c08be28f9ae7e41057fc58db5 WHIRLPOOL d194b2fa1015d253059a31014421e7d443f3620ac68e403c4f27d498a8d90f54b3334b9f60f10af0612a5b99c9523aa2b8ec6f7399738237656dde6187589a43 DIST sooperlooper-1.6.18.tar.gz 705462 SHA256 087a52186fefb138ac16deebc1ed4b9ff4945ffb4fe3e2170f60fcf97a3a8c38 SHA512 cccfc6ced0e2441bdc004b892b67141b476a89c19187fa249a30613f3cd1b77b5e6767262249ad42ee50007ea538ae3eff5dce47a529937d7d32e81ed73a5a31 WHIRLPOOL 69f8a1d421a3fe6ad07ae7721fdff760219cbfedf6a4ffdf23217476b56bcbc4bc0f58e00505cfaca05e47c69e13ee17eaa3de9baf01bc2ac3b8dde6a9131db4 DIST sooperlooper-1.6.5-m4.tar.bz2 1463 SHA256 ee8e3084c3d3d4db29f3d7b4dde0d260b9dfb72be8c9362c7fd711fb7784e0bb SHA512 01b4405dcd91e617c8dafb9fcfab99507d0a9637d9b0eec84276c348968e31159b68ce5c8b7f900ab8a830f2b5c91b798146d5272d006a2b866f149e485f228d WHIRLPOOL 8faddc39687193c643265c52ab2930f98094f4d2544e7d1e1005d5acffa00d6577d95484b51919aea4d810320ebef362ce9a9ab98ac3bc41aa0441a9666a4abc +DIST sooperlooper-1.7.3.tar.gz 732406 SHA256 7a7dbdedb5dab28fb1f98ba5827d88df4c7327909ab87f6def167517786f4f58 SHA512 cbc9f6b3e4cafc6f18ddb2e2415d2bac274c8cc578b5dadc6ad878b1bed34e514208bc990c3a7dab0106cbf34ad16be12846851e446d724d77386e70d975e14b WHIRLPOOL 97df9fa8a8a57f4a1cf6929dd68628f72c12e755e9676f69062613456e7c01af0f83a11b01af8e14cd81740e09b26c23943af37f37c164fc61dd2adf4d167e08 diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-sigc++-2.5.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-sigc++-2.5.patch new file mode 100644 index 000000000000..d105e8271407 --- /dev/null +++ b/media-sound/sooperlooper/files/sooperlooper-1.7.3-sigc++-2.5.patch @@ -0,0 +1,166 @@ +Description: support for sigc++>=2.5.2 + since sigc++-2.5.2, the sigc++/object.h has been removed + (and replaced by sigc++/trackable.h> +Author: IOhannes m zmölnig +Last-Update: 2015-10-21 +Forwarded: Jesse Chappell <jesse@essej.net> +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- sooperlooper.orig/configure.ac ++++ sooperlooper/configure.ac +@@ -220,7 +220,15 @@ + AC_SUBST(NCURSES_LIBS) + + dnl sigc++ +- PKG_CHECK_MODULES(SIGCPP, sigc++-2.0 >= 2.2.10) ++ have_sigcpp=no ++ PKG_CHECK_MODULES(SIGCPP, [sigc++-2.0 >= 2.2.10],[have_sigcpp=yes]) ++ if test "x${have_sigcpp}" = "xyes" ++ then ++ presigcpp_CFLAGS=$CFLAGS ++ CFLAGS=$CFLAGS $SIGCPP_CFLAGS ++ AC_CHECK_HEADER([sigc++/object.h], [SIGCPP_CFLAGS="$SIGCPP_CFLAGS -DUSE_SIGCPP_OBJECT_H"]) ++ CFLAGS=$presigcpp_CFLAGS ++ fi + + AC_SUBST(SIGCPP_LIBS) + AC_SUBST(SIGCPP_CFLAGS) +--- sooperlooper.orig/libs/pbd/configure.ac ++++ sooperlooper/libs/pbd/configure.ac +@@ -193,7 +193,15 @@ + PKG_CHECK_MODULES(XML, libxml-2.0 >= 2.5) + + dnl sigc++ +-PKG_CHECK_MODULES(SIGCPP, sigc++-2.0 >= 2.2.10) ++have_sigcpp=no ++PKG_CHECK_MODULES(SIGCPP, [sigc++-2.0 >= 2.2.10],[have_sigcpp=yes]) ++if test "x${have_sigcpp}" = "xyes" ++then ++ presigcpp_CFLAGS=$CFLAGS ++ CFLAGS=$CFLAGS $SIGCPP_CFLAGS ++ AC_CHECK_HEADER([sigc++/object.h], [SIGCPP_CFLAGS="$SIGCPP_CFLAGS -DUSE_SIGCPP_OBJECT_H"]) ++ CFLAGS=$presigcpp_CFLAGS ++fi + + + AM_BUILD_ENVIRONMENT +--- sooperlooper.orig/src/control_osc.hpp ++++ sooperlooper/src/control_osc.hpp +@@ -27,7 +27,11 @@ + #include <list> + #include <utility> + +-#include <sigc++/object.h> ++#ifdef USE_SIGCPP_OBJECT_H ++# include <sigc++/object.h> ++#else ++# include <sigc++/trackable.h> ++#endif + + #include "event.hpp" + #include "event_nonrt.hpp" +--- sooperlooper.orig/src/gui/app_frame.hpp ++++ sooperlooper/src/gui/app_frame.hpp +@@ -26,7 +26,11 @@ + #include <string> + #include <vector> + +-#include <sigc++/object.h> ++#ifdef USE_SIGCPP_OBJECT_H ++# include <sigc++/object.h> ++#else ++# include <sigc++/trackable.h> ++#endif + #include <sigc++/signal.h> + #include <sigc++/connection.h> + +--- sooperlooper.orig/src/gui/config_panel.hpp ++++ sooperlooper/src/gui/config_panel.hpp +@@ -26,7 +26,11 @@ + + #include <string> + #include <vector> +-#include <sigc++/object.h> ++#ifdef USE_SIGCPP_OBJECT_H ++# include <sigc++/object.h> ++#else ++# include <sigc++/trackable.h> ++#endif + + class wxListCtrl; + class wxSpinCtrl; +--- sooperlooper.orig/src/gui/keys_panel.hpp ++++ sooperlooper/src/gui/keys_panel.hpp +@@ -26,7 +26,11 @@ + + #include <string> + #include <vector> +-#include <sigc++/object.h> ++#ifdef USE_SIGCPP_OBJECT_H ++# include <sigc++/object.h> ++#else ++# include <sigc++/trackable.h> ++#endif + + class wxListCtrl; + +--- sooperlooper.orig/src/gui/latency_panel.hpp ++++ sooperlooper/src/gui/latency_panel.hpp +@@ -26,7 +26,11 @@ + + #include <string> + #include <vector> +-#include <sigc++/object.h> ++#ifdef USE_SIGCPP_OBJECT_H ++# include <sigc++/object.h> ++#else ++# include <sigc++/trackable.h> ++#endif + + class wxListCtrl; + +--- sooperlooper.orig/src/gui/main_panel.hpp ++++ sooperlooper/src/gui/main_panel.hpp +@@ -26,7 +26,11 @@ + #include <string> + #include <vector> + +-#include <sigc++/object.h> ++#ifdef USE_SIGCPP_OBJECT_H ++# include <sigc++/object.h> ++#else ++# include <sigc++/trackable.h> ++#endif + #include <sigc++/signal.h> + #include <sigc++/connection.h> + +--- sooperlooper.orig/src/gui/midi_bind_panel.hpp ++++ sooperlooper/src/gui/midi_bind_panel.hpp +@@ -26,7 +26,11 @@ + + #include <string> + #include <vector> +-#include <sigc++/object.h> ++#ifdef USE_SIGCPP_OBJECT_H ++# include <sigc++/object.h> ++#else ++# include <sigc++/trackable.h> ++#endif + #include <list> + + #include <midi_bind.hpp> +--- sooperlooper.orig/src/gui/prefs_dialog.hpp ++++ sooperlooper/src/gui/prefs_dialog.hpp +@@ -26,7 +26,11 @@ + + #include <string> + #include <vector> +-#include <sigc++/object.h> ++#ifdef USE_SIGCPP_OBJECT_H ++# include <sigc++/object.h> ++#else ++# include <sigc++/trackable.h> ++#endif + + class wxListCtrl; + class wxSpinCtrl; diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch new file mode 100644 index 000000000000..fee40e8f98be --- /dev/null +++ b/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch @@ -0,0 +1,177 @@ +Author: Jaromír Mikeš <mira.mikes@seznam.cz>, Olly Betts <olly@survex.com> +Description: build against wx 3.0. +Forwarded: yes + +Index: sooperlooper/src/gui/main_panel.cpp +=================================================================== +--- sooperlooper.orig/src/gui/main_panel.cpp ++++ sooperlooper/src/gui/main_panel.cpp +@@ -448,7 +448,7 @@ MainPanel::init_loopers (int count) + while (count < (int)_looper_panels.size()) { + looperpan = _looper_panels.back(); + _looper_panels.pop_back(); +- _main_sizer->Remove(looperpan); ++ _main_sizer->Detach(looperpan); + looperpan->Destroy(); + } + } +@@ -1277,7 +1277,7 @@ void MainPanel::misc_action (bool releas + } + + +- wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT); ++ wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT); + + if ( !filename.empty() ) + { +@@ -1296,7 +1296,7 @@ void MainPanel::misc_action (bool releas + index = 0; + } + +- wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR); ++ wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR); + + if ( !filename.empty() ) + { +@@ -1408,7 +1408,7 @@ void MainPanel::set_curr_loop (int index + + void MainPanel::do_load_session () + { +- wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR); ++ wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR); + + if ( !filename.empty() ) + { +@@ -1419,7 +1419,7 @@ void MainPanel::do_load_session () + + void MainPanel::do_save_session (bool write_audio) + { +- wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT); ++ wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT); + + if ( !filename.empty() ) + { +Index: sooperlooper/src/gui/pix_button.cpp +=================================================================== +--- sooperlooper.orig/src/gui/pix_button.cpp ++++ sooperlooper/src/gui/pix_button.cpp +@@ -250,7 +250,7 @@ PixButton::OnMouseEvents (wxMouseEvent & + pt.x += bounds.x; + pt.y += bounds.y; + +- if (bounds.Inside(pt)) { ++ if (bounds.Contains(pt)) { + clicked (get_mouse_button(ev)); // emit + + if (ev.MiddleUp() && ev.ControlDown()) { +Index: sooperlooper/src/gui/looper_panel.cpp +=================================================================== +--- sooperlooper.orig/src/gui/looper_panel.cpp ++++ sooperlooper/src/gui/looper_panel.cpp +@@ -1428,7 +1428,7 @@ LooperPanel::clicked_events (int button, + if (cmd == wxT("save")) + { + wxString filename = _mainpanel->do_file_selector (wxT("Choose file to save loop"), +- wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT); ++ wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT); + + if ( !filename.empty() ) + { +@@ -1442,7 +1442,7 @@ LooperPanel::clicked_events (int button, + } + else if (cmd == wxT("load")) + { +- wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxOPEN|wxCHANGE_DIR); ++ wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxFD_OPEN|wxFD_CHANGE_DIR); + + if ( !filename.empty() ) + { +Index: sooperlooper/src/gui/keyboard_target.cpp +=================================================================== +--- sooperlooper.orig/src/gui/keyboard_target.cpp ++++ sooperlooper/src/gui/keyboard_target.cpp +@@ -553,10 +553,10 @@ KeyboardTarget::keycode_from_name (const + keycode = WXK_RETURN; + } + else if ( keyname == wxT("PGUP") ) { +- keycode = WXK_PRIOR; ++ keycode = WXK_PAGEUP; + } + else if ( keyname == wxT("PGDN") ) { +- keycode = WXK_NEXT; ++ keycode = WXK_PAGEDOWN; + } + else if ( keyname == wxT("LEFT") ) { + keycode = WXK_LEFT; +@@ -630,10 +630,10 @@ wxString KeyboardTarget::name_from_keyco + case WXK_RETURN: + text += wxT("return"); + break; +- case WXK_PRIOR: ++ case WXK_PAGEUP: + text += wxT("pageup"); + break; +- case WXK_NEXT: ++ case WXK_PAGEDOWN: + text += wxT("pagedown"); + break; + case WXK_LEFT: +Index: sooperlooper/src/gui/check_box.cpp +=================================================================== +--- sooperlooper.orig/src/gui/check_box.cpp ++++ sooperlooper/src/gui/check_box.cpp +@@ -237,7 +237,7 @@ CheckBox::OnMouseEvents (wxMouseEvent &e + } + else if (ev.LeftUp()) + { +- if (bounds.Inside(ev.GetPosition())) { ++ if (bounds.Contains(ev.GetPosition())) { + // toggle value + _value = !_value; + +Index: sooperlooper/src/gui/midi_bind_panel.cpp +=================================================================== +--- sooperlooper.orig/src/gui/midi_bind_panel.cpp ++++ sooperlooper/src/gui/midi_bind_panel.cpp +@@ -880,7 +880,7 @@ void MidiBindPanel::on_button (wxCommand + } + else if (ev.GetId() == ID_LoadButton) + { +- wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR); ++ wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR); + if ( !filename.empty() ) + { + _parent->get_loop_control().load_midi_bindings(filename, _append_check->GetValue()); +@@ -888,7 +888,7 @@ void MidiBindPanel::on_button (wxCommand + } + else if (ev.GetId() == ID_SaveButton) + { +- wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT); ++ wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT); + + if ( !filename.empty() ) + { +Index: sooperlooper/src/gui/config_panel.cpp +=================================================================== +--- sooperlooper.orig/src/gui/config_panel.cpp ++++ sooperlooper/src/gui/config_panel.cpp +@@ -378,7 +378,7 @@ void ConfigPanel::on_button (wxCommandEv + else if (ev.GetId() == ID_MidiBrowseButton) { + + _parent->get_keyboard().set_enabled(false); +- wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR); ++ wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR); + _parent->get_keyboard().set_enabled(true); + + if ( !filename.empty() ) +@@ -389,8 +389,8 @@ void ConfigPanel::on_button (wxCommandEv + else if (ev.GetId() == ID_SessionBrowseButton) { + + _parent->get_keyboard().set_enabled(false); +- wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR); +- //wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR); ++ wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR); ++ //wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR); + _parent->get_keyboard().set_enabled(true); + + if ( !filename.empty() ) diff --git a/media-sound/sooperlooper/sooperlooper-1.7.3.ebuild b/media-sound/sooperlooper/sooperlooper-1.7.3.ebuild new file mode 100644 index 000000000000..ff1ac18b029a --- /dev/null +++ b/media-sound/sooperlooper/sooperlooper-1.7.3.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +WX_GTK_VER=3.0 + +inherit autotools eutils wxwidgets toolchain-funcs + +DESCRIPTION="Live looping sampler with immediate loop recording" +HOMEPAGE="http://essej.net/sooperlooper/index.html" +SRC_URI="http://essej.net/sooperlooper/${P/_p/-}.tar.gz + mirror://gentoo/${PN}-1.6.5-m4.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="wxwidgets" + +RDEPEND=" + media-sound/jack-audio-connection-kit + >=media-libs/liblo-0.10 + >=dev-libs/libsigc++-2.2.10:2 + >=media-libs/libsndfile-1.0.2 + >=media-libs/libsamplerate-0.0.13 + dev-libs/libxml2 + >=media-libs/rubberband-0.0.13 + sci-libs/fftw:3.0 + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +S=${WORKDIR}/${P/_p*} + +DOCS=( OSC README ) + +src_prepare() { + epatch "${FILESDIR}"/${P}-sigc++-2.5.patch + epatch "${FILESDIR}"/${P}-wx3.0.patch + + cp -rf "${WORKDIR}"/aclocal "${S}" || die "copying aclocal failed" + + AT_M4DIR="${S}"/aclocal eautoreconf +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_configure() { + use wxwidgets && need-wxwidgets unicode + + econf \ + $(use_with wxwidgets gui) \ + --disable-optimize \ + --with-wxconfig-path="${WX_CONFIG}" +} diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest index 1806f434af18..046ed5861ff8 100644 --- a/media-sound/spotify/Manifest +++ b/media-sound/spotify/Manifest @@ -1,3 +1,3 @@ DIST spotify-client_0.9.17.1.g9b85d43.7-1_amd64.deb 42733568 SHA256 717a878bcfa495852d19ac34bb4b0fa1b2f063ab94547defd32725d1dec10775 SHA512 a19403558c0a641b0264641501c9538f169b9e64d532e5d54dd67b7edbb27d400f07395014c9693fed298a1331c053cc9e62988d1293e9b1f1809d68a74646ad WHIRLPOOL 712ac07a3cd3230e3de17e9209380d0e0cc9a33c77cb4753e04490c5bb9a4e2d3e386ee92ffadecd9888ea701aa2a0c4c1b8c579cfa2f5b61d72981a5736f495 -DIST spotify-client_1.0.16.104.g3b776c9e_amd64.deb 69975392 SHA256 2b3e7a7cccadaa4567450e9d3c801a2f72ec9a5ad9295241701874310f6bd96a SHA512 b3663a374021a4b518862b514db8469dd81b3bd35f4d4522a844e647cb79e336d0d814b10f11ed3f1875c8740491394213a588d2b7976e6b95591f2f378fef3f WHIRLPOOL 8a01301489c6afa99991fac297788f67fe4b096cd71cc8927b5de6ebfbd795c996008d9da57b2324ff9dd3113b511a8a95a1106b1e6d6131cc08473380d7f9e4 -DIST spotify-client_1.0.16.104.g3b776c9e_i386.deb 75000034 SHA256 b61ba5b2a42db6e888f002094d3bae7493997e18f2f7821208bcf90b6b129aff SHA512 9773778f49dbdeccb52a496db76fa6ef7cd4bc8df4a3b87f8908a8654fd78a9ca027a3f236e493067413815c130f49804bf32a81c2613bd2302641edfdaf4e22 WHIRLPOOL 1d5a8b033db1f609c0a3b45c4eefb7c3a7e11aff97abbfcbe148e64516dec88475e8c2ebb9eaca8cd61e0191afd114aa2e62f2fa64a8078b9859d3ea8a4cf8f0 +DIST spotify-client_1.0.17.75.g8f111100_amd64.deb 68928916 SHA256 65ad49871a5f281aa7248690c0379fc18c17c063ab640590bbfa7edc02cb223f SHA512 6f8038f41bb613c600d8ad42c65cf93e28bb60e60ee3a239b583fd9ff45234cdcc5934ed5a93e9e3b0307e49e1a8a40dba918636a45bc6b7efdab6f4b49451d8 WHIRLPOOL 458ecd30d843eee10345300e35b4ebba941f942a19fdbeba4d82bd122a7d585d7861b4c034b8564d97a5b7136b605101096a0be4d116542d3ab96ef70df8b381 +DIST spotify-client_1.0.17.75.g8f111100_i386.deb 73966036 SHA256 480d8791d4de95f43ba95e4c5d31fc5a02662c6e041c3eb45f481a5ef6bd39b0 SHA512 05c1c6d60835b880a75e01af77abc327c678d1974d851531eab52b02159ede3921ecd2fc375b429d36309050a2f99942cb33b026892c9c3e4ca2f5c9c54244b2 WHIRLPOOL afc278efd6230b21d49a2716184ae98412f312d9fa8a7acf8e4876e2c8541e525b9d23869c31d3d8d5609fdd70d25590af76ed588e96a32f885c957cdd7aa005 diff --git a/media-sound/spotify/spotify-1.0.16.104.ebuild b/media-sound/spotify/spotify-1.0.17.75.ebuild index 9c05b2994a61..ca28e216e69c 100644 --- a/media-sound/spotify/spotify-1.0.16.104.ebuild +++ b/media-sound/spotify/spotify-1.0.17.75.ebuild @@ -7,7 +7,7 @@ inherit eutils fdo-mime gnome2-utils pax-utils unpacker DESCRIPTION="Spotify is a social music platform" HOMEPAGE="https://www.spotify.com/ch-de/download/previews/" -MY_PV="${PV}.g3b776c9e" +MY_PV="${PV}.g8f111100" MY_P="${PN}-client_${MY_PV}" SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/" SRC_URI="amd64? ( ${SRC_BASE}${MY_P}_amd64.deb ) diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest index b750a4e33fe7..a631699ee113 100644 --- a/media-tv/mythtv/Manifest +++ b/media-tv/mythtv/Manifest @@ -2,6 +2,7 @@ DIST mythtv-0.26.0-9fd7c6102b2cd1a3760337663803b110446c6ea7.tar.xz 179540 SHA256 DIST mythtv-0.26.0.tar.bz2 40887666 SHA256 2f158962ca3009db563dabc32827c47788a688bd67a25abd76f4baa9c3cfe306 SHA512 8c8766542b6a1a877d400fd99343e8149d9c6cc4ab1e425db358bdbdc10b6cb7422bb4bdcf984ce64b2cf02b0ad0725606b266558afcadff9ec9c9bb95bb49c0 WHIRLPOOL c737a1dbdfafe65ae5ee3bde8d0b3a9ad50ebfccec784d6907c78d03f9732637cfbf8b82ecfca80af0b049c65d70c608a81ac3bf27a8070ba3f32d657f5137bb DIST mythtv-0.27-583395f5a376637efcd408a102fa64d0f188c12f.tar.xz 298048 SHA256 2b18428980fe8951694eb9c8594aa2559df491b029987e1a4b983128fdea4f51 SHA512 1d8c2a61bd91d7116ba3b43251d517bda3c8db3c235e73dde66116dc02d14806db9c80bacf6e19eaf816c4765d8e51fe9b53900efa3112134c564c08cc0ca012 WHIRLPOOL 3d50908d085f844cd210c568b50c55c47e4fe8dd8423ffe18303a7c799a45e24dfceaa5221e6f59596394484162d9992f46d5f66b0ad3c57fbb5a240def68dec DIST mythtv-0.27.5-32fd3968acea905d71d9769996487eff280233ea.tar.xz 12292 SHA256 482aadc121a7e770da6d10b5014947ec9ff1350ccc7f672bdc4650ef13e68cca SHA512 8e84cf76541b775143b94da156fdcde1f24d964b58a9423323de730e23142b57c9c44ef01c2202bbb7126058d41153f77f524eebed70f65210c2b9427255ee3a WHIRLPOOL 7375659815ee6170edab81411232bcf73b54575dbb8e69cb5c9c7ff0f13105eddeb01c4026e78ef8c9e7e9d1782880e41a628697c8dd697778cbb4711b3cb820 +DIST mythtv-0.27.5-68e51d6fd4fa25e985b21cb3a5b5ca6fce9aca9d.tar.xz 28096 SHA256 f51bd541cccb0f5b5f20441774d9ee5e10c7a44abba5e6b9795d3c5ce21d0bf0 SHA512 585bcfa6c3fc4ecc384665b40e50362ecd083f2fa22ce9adea8167d4e38a7cbfc7519eee3813f76d7327d093c29d5ca97d9026eb5d180ff4cb7d9af91d7bc428 WHIRLPOOL d2ca6b3c7a6ecc94c4a21dee6a7ad38bdd72b880c00df1e8ac529382cd0aa7618ddfa2b5ba9721a2b99f828c9eaa6ca8ce1b1ac5e23bfff85c28327dfb862884 DIST mythtv-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz 11992 SHA256 aef3b944a9f4b49daa3f5489b58a080db35eb7b85c76819d9d00ccf1adfadfdf SHA512 bddc80f6d7e7ad583459a2192660e6101d53d8821c0f875634f90588bc6fbff86c80fa75f6e8cb859fd5164a81f0ad3427939d57da2b112741b1ea9ce646659d WHIRLPOOL 249d4f5332d943669610b96363b6d2b19d63973ba191bd62900e7d31362b4c541077ffe6ca9eae6027c6d1d5fea1d691722739ff9d0d7af6566d288921444961 DIST mythtv-0.27.5.tar.gz 85652939 SHA256 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b SHA512 b912e010e54271f9321ac1b11d4a31e4093f86c0f2ae3139d4b55085bab142ca3fc6d847d163f6b75aa31320404914c71c094528dc8ee7d70086e56a828b9169 WHIRLPOOL e9ebbbabac6ed53b4ec90537371a63e053bb9a2c0a0e920e43d3d2e475f87bdd0ac5a4604045498e88aaf06b11eb054d50dea7881c87dbd45a36c08309e1b880 DIST mythtv-0.27.tar.gz 85904162 SHA256 494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0 SHA512 2ea070497a7610b8e1548112d9925a28aeedba819c2d063e88cc63daf69947379ce7213e357c26bf2221f8a8e865c937dee3b9bf2695644f2f1adeadf6d11116 WHIRLPOOL 74c4fade0d0f93a64e5f1da3120358f15f6f8891f53b7c74b41a286369e192790cae87829b79a3a90ce3ca23ede63b3dfa809b514b68cee220432794414b8a47 diff --git a/media-tv/mythtv/mythtv-0.27.5_p20151025.ebuild b/media-tv/mythtv/mythtv-0.27.5_p20151025.ebuild new file mode 100644 index 000000000000..3b2a282d3215 --- /dev/null +++ b/media-tv/mythtv/mythtv-0.27.5_p20151025.ebuild @@ -0,0 +1,363 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +BACKPORTS="68e51d6fd4fa25e985b21cb3a5b5ca6fce9aca9d" +MY_P=${P%_p*} + +inherit flag-o-matic multilib eutils python-single-r1 user systemd + +MYTHTV_VERSION="v0.27.5" +MYTHTV_BRANCH="fixes/0.27" + +DESCRIPTION="Homebrew PVR project" +HOMEPAGE="http://www.mythtv.org" +SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz + ${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}" + +SLOT="0/${PV}" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" + +IUSE_INPUT_DEVICES="input_devices_joystick" +IUSE="alsa altivec avahi libass autostart bluray cec crystalhd debug dvb dvd \ +egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python +theora \ +vaapi vdpau +vorbis +wrapper +xml xmltv +xvid ${IUSE_INPUT_DEVICES}" + +REQUIRED_USE=" + bluray? ( xml ) + python? ( ${PYTHON_REQUIRED_USE} ) + theora? ( vorbis )" + +COMMON=" + >=media-libs/freetype-2.0:= + >=media-sound/lame-3.93.1 + sys-libs/zlib:= + x11-libs/libX11:= + x11-libs/libXext:= + x11-libs/libXinerama:= + x11-libs/libXv:= + x11-libs/libXrandr:= + x11-libs/libXxf86vm:= + >=dev-qt/qtcore-4.7.2:4= + >=dev-qt/qtdbus-4.7.2:4= + >=dev-qt/qtgui-4.7.2:4= + >=dev-qt/qtscript-4.7.2:4= + >=dev-qt/qtsql-4.7.2:4=[mysql] + >=dev-qt/qtopengl-4.7.2:4=[egl?] + >=dev-qt/qtwebkit-4.7.2:4= + x11-misc/wmctrl:= + virtual/mysql + virtual/opengl:= + alsa? ( >=media-libs/alsa-lib-1.0.24:= ) + avahi? ( + dev-libs/openssl:0= + net-dns/avahi[mdnsresponder-compat] + ) + bluray? ( + dev-libs/libcdio:= + media-libs/libbluray:= + sys-fs/udisks:0 + ) + cec? ( dev-libs/libcec:= ) + dvb? ( + media-libs/libdvb:= + virtual/linuxtv-dvb-headers:= + ) + dvd? ( + dev-libs/libcdio:= + sys-fs/udisks:0 + ) + egl? ( media-libs/mesa:=[egl] ) + fftw? ( sci-libs/fftw:3.0= ) + hls? ( + media-libs/faac:= + media-libs/libvpx:= + >=media-libs/x264-0.0.20111220:= + ) + ieee1394? ( + >=sys-libs/libraw1394-1.2.0:= + >=sys-libs/libavc1394-0.5.3:= + >=media-libs/libiec61883-1.0.0:= + ) + jack? ( media-sound/jack-audio-connection-kit ) + lcd? ( app-misc/lcdproc ) + libass? ( >=media-libs/libass-0.9.11:= ) + lirc? ( app-misc/lirc ) + perl? ( + dev-perl/DBD-mysql + dev-perl/Net-UPnP + dev-perl/LWP-Protocol-https + dev-perl/HTTP-Message + dev-perl/IO-Socket-INET6 + >=dev-perl/libwww-perl-5 + ) + pulseaudio? ( media-sound/pulseaudio ) + python? ( + ${PYTHON_DEPS} + dev-python/mysql-python + dev-python/lxml + dev-python/urlgrabber + ) + theora? ( media-libs/libtheora:= media-libs/libogg:= ) + vaapi? ( x11-libs/libva:= ) + vdpau? ( x11-libs/libvdpau:= ) + vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= ) + xml? ( >=dev-libs/libxml2-2.6.0:= ) + xvid? ( >=media-libs/xvid-1.1.0:= ) + !media-tv/mythtv-bindings + !x11-themes/mythtv-themes + media-libs/taglib:= + dev-libs/glib:= + " + +RDEPEND="${COMMON} + media-fonts/corefonts + media-fonts/dejavu + media-fonts/liberation-fonts + x11-apps/xinit + autostart? ( + net-dialup/mingetty + x11-wm/evilwm + x11-apps/xset + ) + dvd? ( media-libs/libdvdcss:= ) + xmltv? ( >=media-tv/xmltv-0.5.43 ) + " + +DEPEND="${COMMON} + dev-lang/yasm + x11-proto/xineramaproto + x11-proto/xf86vidmodeproto + " + +S="${WORKDIR}/${MY_P}/mythtv" + +MYTHTV_GROUPS="video,audio,tty,uucp" + +pkg_setup() { + python-single-r1_pkg_setup + enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS} + usermod -a -G ${MYTHTV_GROUPS} mythtv +} + +src_prepare() { + [[ -n ${BACKPORTS} ]] && \ + EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/../patches" \ + epatch + + # Perl bits need to go into vender_perl and not site_perl + sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \ + -i "${S}"/bindings/perl/Makefile + + # Fix up the version info since we are using the fixes/${PV} branch + echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION + echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION + echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION + echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION + + echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro + + epatch "${FILESDIR}/libdir-27.patch" + + epatch_user +} + +src_configure() { + local myconf= + + # Setup paths + myconf="${myconf} --prefix=${EPREFIX}/usr" + myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)" + myconf="${myconf} --libdir-name=$(get_libdir)" + myconf="${myconf} --mandir=${EPREFIX}/usr/share/man" + + # Audio + myconf="${myconf} $(use_enable alsa audio-alsa)" + myconf="${myconf} $(use_enable jack audio-jack)" + use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput" + + use altivec || myconf="${myconf} --disable-altivec" + myconf="${myconf} $(use_enable dvb)" + myconf="${myconf} $(use_enable ieee1394 firewire)" + myconf="${myconf} $(use_enable lirc)" + myconf="${myconf} $(use_enable xvid libxvid)" + myconf="${myconf} --dvb-path=/usr/include" + myconf="${myconf} --enable-xrandr" + myconf="${myconf} --enable-xv" + myconf="${myconf} --enable-x11" + myconf="${myconf} --enable-nonfree" + myconf="${myconf} --enable-libmp3lame" + use cec || myconf="${myconf} --disable-libcec" + use avahi || myconf="${myconf} --disable-libdns-sd" + myconf="${myconf} $(use_enable theora libtheora)" + myconf="${myconf} $(use_enable vorbis libvorbis)" + + if use hls; then + myconf="${myconf} --enable-libx264" + myconf="${myconf} --enable-libvpx" + myconf="${myconf} --enable-libfaac" + fi + + myconf="${myconf} $(use_enable libass)" + + if use perl && use python; then + myconf="${myconf} --with-bindings=perl,python" + elif use perl; then + myconf="${myconf} --without-bindings=python" + myconf="${myconf} --with-bindings=perl" + elif use python; then + myconf="${myconf} --without-bindings=perl" + myconf="${myconf} --with-bindings=python" + else + myconf="${myconf} --without-bindings=perl,python" + fi + + use python && myconf="${myconf} --python=${EPYTHON}" + + if use debug; then + myconf="${myconf} --compile-type=debug" + else + myconf="${myconf} --compile-type=release" + #myconf="${myconf} --enable-debug" does nothing per sphery + #myconf="${myconf} --disable-stripping" does nothing per sphery + fi + + # Video + myconf="${myconf} $(use_enable vdpau)" + myconf="${myconf} $(use_enable vaapi)" + myconf="${myconf} $(use_enable crystalhd)" + + # Input + use input_devices_joystick || myconf="${myconf} --disable-joystick-menu" + + # Clean up DSO load times and other compiler bits + myconf="${myconf} --enable-symbol-visibility" + myconf="${myconf} --enable-pic" + + # CPU settings + for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do + [ "${i}" = "native" ] && i="host" + myconf="${myconf} --cpu=${i}" + break + done + + if tc-is-cross-compiler ; then + myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)" + myconf="${myconf} --cross-prefix=${CHOST}-" + fi + + # Build boosters + has distcc ${FEATURES} || myconf="${myconf} --disable-distcc" + has ccache ${FEATURES} || myconf="${myconf} --disable-ccache" + + chmod +x ./external/FFmpeg/version.sh + + einfo "Running ./configure ${myconf}" + ./configure \ + --cc="$(tc-getCC)" \ + --cxx="$(tc-getCXX)" \ + --ar="$(tc-getAR)" \ + --extra-cflags="${CFLAGS}" \ + --extra-cxxflags="${CXXFLAGS}" \ + --extra-ldflags="${LDFLAGS}" \ + ${myconf} || die "configure died" +} + +src_install() { + emake INSTALL_ROOT="${D}" install || die "install failed" + dodoc AUTHORS UPGRADING README + + insinto /usr/share/mythtv/database + doins database/* + + newinitd "${FILESDIR}"/mythbackend.init-r2 mythbackend + newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend + systemd_dounit "${FILESDIR}"/mythbackend.service + + dodoc keys.txt + + keepdir /etc/mythtv + chown -R mythtv "${ED}"/etc/mythtv + keepdir /var/log/mythtv + chown -R mythtv "${ED}"/var/log/mythtv + dodir /var/log/mythtv/old + + insinto /etc/logrotate.d + newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv + + insinto /usr/share/mythtv/contrib + # Ensure we don't install scripts needing the perl bindings (bug #516968) + use perl || find contrib/ -name '*.pl' -exec rm -f {} \; + # Ensure we don't install scripts needing the python bindings (bug #516968) + use python || find contrib/ -name '*.py' -exec rm -f {} \; + doins -r contrib/* + + # Install our mythfrontend wrapper which is similar to Mythbuntu's + if use wrapper; then + mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real" + newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend + newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend + fi + + if use autostart; then + dodir /etc/env.d/ + echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv + + insinto /home/mythtv + newins "${FILESDIR}"/bash_profile .bash_profile + newins "${FILESDIR}"/xinitrc-r1 .xinitrc + fi + + # Make Python files executable + find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do + if [[ ! "${file##*/}" = "__init__.py" ]]; then + chmod a+x "${file}" + fi + done + + # Ensure that Python scripts are executed by Python 2 + python_fix_shebang "${ED}/usr/share/mythtv" + + # Make shell & perl scripts executable + find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \ + while read file; do + chmod a+x "${file}" + done +} + +pkg_preinst() { + export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/" +} + +pkg_postinst() { + elog "To have this machine operate as recording host for MythTV, " + elog "mythbackend must be running. Run the following:" + elog "rc-update add mythbackend default" + elog + elog "Your recordings folder must be owned 'mythtv'. e.g." + elog "chown -R mythtv /var/lib/mythtv" + + elog "Want mythfrontend to start automatically?" + elog "Set USE=autostart. Details can be found at:" + elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html" + elog + elog "Note that the systemd unit now restarts by default and logs" + elog "to journald via the console at the notice verbosity." +} + +pkg_info() { + if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then + "${EROOT}"/usr/bin/mythfrontend --version + fi +} + +pkg_config() { + echo "Creating mythtv MySQL user and mythconverg database if it does not" + echo "already exist. You will be prompted for your MySQL root password." + "${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql +} diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest index 1db550c6d40f..661bb7467bc1 100644 --- a/media-video/aegisub/Manifest +++ b/media-video/aegisub/Manifest @@ -1,3 +1,5 @@ DIST aegisub-2.1.9.tar.xz 1670496 SHA256 e0591c96183f7713bb14f9d357a2e12bdd3478e4d0a8fad77f14f87a4fc22db7 SHA512 bdb02e3d29db2b7ed165eaf1d541515c15f22199bb209d517089e2c35289b7fc22f6159589004c7f8667a57d26eb7ab6211f9d85ca4bbcd076c5856ac10a3d4f WHIRLPOOL 4ac402e067ff0d863042a8f314c1e55154bacfcc13103772e7c4036b7d927f687b2172003eb51e35469f7af2b640e20f224ff1fa5be83f729eacfaac89c73144 +DIST aegisub-3.0.4.tar.xz 4155728 SHA256 7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a SHA512 2917195a61d16578a83ce0b69006dd0269c086c6eff2f622c47d9880697e4e531a7c0c0232c187f9023635c9d3857a1d6a0cee4f6251e49d22e2b625ac5dda7f WHIRLPOOL 60bd3e0374a60f6af62fe450488e8c68e18957283fff59d704f40e192da624bdf90d68c3cea41122e5b9ca440d218c3bd6d9d8091ed5226a2e9d1b9fdc2ce689 DIST aegisub-3.1.2.tar.xz 4126244 SHA256 36ebfd05cc642b050da1e91ce2d2082b317a37bdfab109e191f861170d7cff86 SHA512 d15e16f9f98c01447b72cde1998c915a2bfc1aa918a4380b54303de8e88ef881f46c3896ab9dc5eddaf4f1376f0908abd8427dbf6af395e6e0b3969ddca402ab WHIRLPOOL fa7afa1a3e736a410d686bc14d173518267e4b1570a468d9871334f06af821040fe7f40d6ba3b1bece9350a70dd43613c4aedfe8480629a283c9a16a2f54ab6d DIST aegisub-3.1.3.tar.xz 4215196 SHA256 efea5bc2bc5e0651ada4f65cfdd8af1b422a15f87933710d11287bf51e2b5e58 SHA512 c406925623e7b8425df47d1cd31ef77d536861335d25c626ecb916ef091341a8156879430f094ffa1d27490a65f79e2edb84593609d589834f3411b2c2841297 WHIRLPOOL 12e40c2ce78e1659046d093d7d34b68b7ceda2744c36be0e15a71a379cc3ced4fb8cde2c364bbd3b7efa803f78229794d5d417c601ae140d79e0c0a9a2711fb0 +DIST aegisub-3.2.2.tar.xz 5252052 SHA256 c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SHA512 54f825e52f238fef8d5cc31c37436e21355aee27883347f905271e5d2a8ff2a77e1b67d5aef38b0f8468bd0bad851fe944e02de27ec96310b902fbe5b1086722 WHIRLPOOL fe948edbb01f11385e14d1912b73942605df18325fcd95f4284a3c2edb73778d90d73038ac4a062e211fd56879590040e3c558fe1e361ec9fe2eee6a5c016448 diff --git a/media-video/aegisub/aegisub-2.1.9.ebuild b/media-video/aegisub/aegisub-2.1.9.ebuild index ef9577d28631..0f49837b22c2 100644 --- a/media-video/aegisub/aegisub-2.1.9.ebuild +++ b/media-video/aegisub/aegisub-2.1.9.ebuild @@ -7,7 +7,7 @@ EAPI="4" WX_GTK_VER="2.8" inherit autotools wxwidgets -DESCRIPTION="Advanced SSA/ASS subtitle editor" +DESCRIPTION="Advanced subtitle editor" HOMEPAGE="http://www.aegisub.org/" SRC_URI="https://rion-overlay.googlecode.com/files/${P}.tar.xz" diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild b/media-video/aegisub/aegisub-3.0.4.ebuild new file mode 100644 index 000000000000..f94961aeff93 --- /dev/null +++ b/media-video/aegisub/aegisub-3.0.4.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=1 +AUTOTOOLS_IN_SOURCE_BUILD=1 +PLOCALES="ar ca cs da de el es eu fa fi fr_FR hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW" +WX_GTK_VER="2.9" + +inherit autotools-utils fdo-mime gnome2-utils l10n wxwidgets + +DESCRIPTION="Advanced subtitle editor" +HOMEPAGE="http://www.aegisub.org/" +SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa debug +ffmpeg +fftw +libass lua openal oss portaudio pulseaudio spell" + +# configure.ac specifies minimal versions for some of the dependencies below. +# However, most of these minimal versions date back to 2006-2010 yy. +# Such version specifiers are meaningless nowadays, so they are omitted. +RDEPEND=" + >=x11-libs/wxGTK-2.9.3:${WX_GTK_VER}[X,opengl,debug?] + media-libs/fontconfig + media-libs/freetype + virtual/libiconv + virtual/opengl + + alsa? ( media-libs/alsa-lib ) + openal? ( media-libs/openal ) + portaudio? ( =media-libs/portaudio-19* ) + pulseaudio? ( media-sound/pulseaudio ) + + ffmpeg? ( >=media-libs/ffmpegsource-2.16:= ) + fftw? ( >=sci-libs/fftw-3.3:= ) + + libass? ( media-libs/libass[fontconfig] ) + lua? ( =dev-lang/lua-5.1*:= ) + spell? ( app-text/hunspell ) +" +DEPEND="${RDEPEND} + oss? ( virtual/os-headers ) + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig +" +REQUIRED_USE=" + || ( alsa openal oss portaudio pulseaudio ) +" + +PATCHES=( + "${FILESDIR}/${P}-fix-lua-macro.patch" + "${FILESDIR}/${P}-respect-user-compiler-flags.patch" +) + +S="${WORKDIR}/${PN}/${PN}" + +src_prepare() { + cp /usr/share/gettext/config.rpath . || die + + remove_locale() { + sed -i -e "s/${1}\.po//" po/Makefile || die + } + + l10n_find_plocales_changes 'po' '' '.po' + l10n_for_each_disabled_locale_do remove_locale + + autotools-utils_src_prepare +} + +src_configure() { + # Prevent sandbox violation from OpenAL detection. Gentoo bug #508184. + use openal && export agi_cv_with_openal="yes" + local myeconfargs=( + --disable-crash-reporter + --disable-update-checker + $(use_enable debug) + $(use_with alsa) + $(use_with ffmpeg ffms2) + $(use_with fftw fftw3) + $(use_with libass) + $(use_with lua) + $(use_with openal) + $(use_with oss) + $(use_with portaudio) + $(use_with pulseaudio libpulse) + $(use_with spell hunspell) + ) + autotools-utils_src_configure +} + +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-video/aegisub/aegisub-3.1.2.ebuild b/media-video/aegisub/aegisub-3.1.2.ebuild index e156dda4f8d8..9152199e3bea 100644 --- a/media-video/aegisub/aegisub-3.1.2.ebuild +++ b/media-video/aegisub/aegisub-3.1.2.ebuild @@ -10,7 +10,7 @@ WX_GTK_VER="3.0" PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW" inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils -DESCRIPTION="Advanced SSA/ASS subtitle editor" +DESCRIPTION="Advanced subtitle editor" HOMEPAGE="http://www.aegisub.org/" SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz" diff --git a/media-video/aegisub/aegisub-3.1.3.ebuild b/media-video/aegisub/aegisub-3.1.3.ebuild index f17f45947fa1..78f1562b10ec 100644 --- a/media-video/aegisub/aegisub-3.1.3.ebuild +++ b/media-video/aegisub/aegisub-3.1.3.ebuild @@ -10,7 +10,7 @@ WX_GTK_VER="3.0" PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW" inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils -DESCRIPTION="Advanced SSA/ASS subtitle editor" +DESCRIPTION="Advanced subtitle editor" HOMEPAGE="http://www.aegisub.org/" SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz" diff --git a/media-video/aegisub/aegisub-3.2.2.ebuild b/media-video/aegisub/aegisub-3.2.2.ebuild new file mode 100644 index 000000000000..e6f23ec43cf4 --- /dev/null +++ b/media-video/aegisub/aegisub-3.2.2.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=1 +AUTOTOOLS_IN_SOURCE_BUILD=1 +PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS uk_UA vi zh_CN zh_TW" +WX_GTK_VER="3.0" + +inherit autotools-utils fdo-mime gnome2-utils l10n toolchain-funcs wxwidgets + +DESCRIPTION="Advanced subtitle editor" +HOMEPAGE="http://www.aegisub.org/" +SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell" + +# configure.ac specifies minimal versions for some of the dependencies below. +# However, most of these minimal versions date back to 2006-2010 yy. +# Such version specifiers are meaningless nowadays, so they are omitted. +RDEPEND=" + >=dev-lang/luajit-2.0.3:2= + >=dev-libs/boost-1.50.0:=[icu,nls,threads] + >=dev-libs/icu-4.8.1.1:= + >=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?] + media-libs/fontconfig + media-libs/freetype + media-libs/libass[fontconfig] + virtual/libiconv + virtual/opengl + + alsa? ( media-libs/alsa-lib ) + openal? ( media-libs/openal ) + portaudio? ( =media-libs/portaudio-19* ) + pulseaudio? ( media-sound/pulseaudio ) + + ffmpeg? ( >=media-libs/ffmpegsource-2.16:= ) + fftw? ( >=sci-libs/fftw-3.3:= ) + + spell? ( app-text/hunspell ) +" +DEPEND="${RDEPEND} + oss? ( virtual/os-headers ) + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig +" +REQUIRED_USE=" + || ( alsa openal oss portaudio pulseaudio ) +" + +# aegisub also bundles luabins (https://github.com/agladysh/luabins). +# Unfortunately, luabins upstream is dead since 2011. +# Thus unbundling luabins is not worth the effort. +PATCHES=( + "${FILESDIR}/${P}-fix-lua-regexp.patch" + "${FILESDIR}/${P}-unbundle-luajit.patch" + "${FILESDIR}/${P}-respect-user-compiler-flags.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then + die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3." + fi +} + +src_prepare() { + cp /usr/share/gettext/config.rpath . || die + + remove_locale() { + rm "po/${1}.po" || die + } + + l10n_find_plocales_changes 'po' '' '.po' + l10n_for_each_disabled_locale_do remove_locale + + autotools-utils_src_prepare +} + +src_configure() { + # Prevent sandbox violation from OpenAL detection. Gentoo bug #508184. + use openal && export agi_cv_with_openal="yes" + local myeconfargs=( + --disable-update-checker + $(use_enable debug) + $(use_with alsa) + $(use_with ffmpeg ffms2) + $(use_with fftw fftw3) + $(use_with openal) + $(use_with oss) + $(use_with portaudio) + $(use_with pulseaudio libpulse) + $(use_with spell hunspell) + ) + autotools-utils_src_configure +} + +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-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild index 4c2168b44081..c678b5f54632 100644 --- a/media-video/aegisub/aegisub-9999.ebuild +++ b/media-video/aegisub/aegisub-9999.ebuild @@ -1,84 +1,101 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=5 -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" +AUTOTOOLS_AUTORECONF=1 +AUTOTOOLS_IN_SOURCE_BUILD=1 +PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS uk_UA vi zh_CN zh_TW" WX_GTK_VER="3.0" -PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW" -inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils git-2 -DESCRIPTION="Advanced SSA/ASS subtitle editor" +inherit autotools-utils fdo-mime gnome2-utils l10n toolchain-funcs wxwidgets git-2 + +DESCRIPTION="Advanced subtitle editor" HOMEPAGE="http://www.aegisub.org/" -EGIT_REPO_URI="https://github.com/Aegisub/Aegisub.git" +EGIT_REPO_URI="git://github.com/Aegisub/Aegisub.git" LICENSE="BSD" SLOT="0" KEYWORDS="" IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell" -REQUIRED_USE=" - || ( alsa openal oss portaudio pulseaudio ) -" - +# configure.ac specifies minimal versions for some of the dependencies below. +# However, most of these minimal versions date back to 2006-2010 yy. +# Such version specifiers are meaningless nowadays, so they are omitted. RDEPEND=" + >=dev-lang/luajit-2.0.4:2= + >=dev-libs/boost-1.50.0:=[icu,nls,threads] + >=dev-libs/icu-4.8.1.1:= >=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?] - virtual/opengl - virtual/glu - >=media-libs/libass-0.10.0[fontconfig] + media-libs/fontconfig + media-libs/freetype + media-libs/libass[fontconfig] virtual/libiconv - >=dev-libs/boost-1.53.0:=[icu,nls,threads] - >=dev-libs/icu-4.8.1.1:= - >=media-libs/fontconfig-2.4.2 - >=media-libs/freetype-2.3.5:2 + virtual/opengl - alsa? ( >=media-libs/alsa-lib-1.0.16 ) - portaudio? ( =media-libs/portaudio-19* ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.5 ) + alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) + portaudio? ( =media-libs/portaudio-19* ) + pulseaudio? ( media-sound/pulseaudio ) + + ffmpeg? ( >=media-libs/ffmpegsource-2.16:= ) + fftw? ( >=sci-libs/fftw-3.3:= ) - spell? ( >=app-text/hunspell-1.2.2 ) - ffmpeg? ( >=media-libs/ffmpegsource-2.17:= ) - fftw? ( >=sci-libs/fftw-3.3 ) + spell? ( app-text/hunspell ) " DEPEND="${RDEPEND} oss? ( virtual/os-headers ) - >=sys-devel/gettext-0.18 dev-util/intltool + sys-devel/gettext virtual/pkgconfig " +REQUIRED_USE=" + || ( alsa openal oss portaudio pulseaudio ) +" + +# aegisub also bundles luabins (https://github.com/agladysh/luabins). +# Unfortunately, luabins upstream is dead since 2011. +# Thus unbundling luabins is not worth the effort. +PATCHES=( + "${FILESDIR}/${PN}-3.2.2-fix-lua-regexp.patch" + "${FILESDIR}/${P}-unbundle-luajit.patch" + "${FILESDIR}/${P}-respect-user-compiler-flags.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then + die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3." + fi +} src_prepare() { - my_rm_loc() { - sed -i -e "s:${1}\.po::" po/Makefile || die + cp /usr/share/gettext/config.rpath . || die + + remove_locale() { rm "po/${1}.po" || die } l10n_find_plocales_changes 'po' '' '.po' - if [ -z "$(l10n_get_locales)" ]; then - sed -e 's/^\s*po\s*$//' -i Makefile || die - else - l10n_for_each_disabled_locale_do my_rm_loc - fi + l10n_for_each_disabled_locale_do remove_locale autotools-utils_src_prepare } src_configure() { - # testing openal does not work in sandbox, bug #508184 + # Prevent sandbox violation from OpenAL detection. Gentoo bug #508184. use openal && export agi_cv_with_openal="yes" local myeconfargs=( + --disable-update-checker + $(use_enable debug) $(use_with alsa) + $(use_with ffmpeg ffms2) + $(use_with fftw fftw3) + $(use_with openal) $(use_with oss) $(use_with portaudio) $(use_with pulseaudio libpulse) - $(use_with openal) - $(use_with ffmpeg ffms2) - $(use_with fftw fftw3) $(use_with spell hunspell) - $(use_enable debug) ) autotools-utils_src_configure } diff --git a/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch b/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch new file mode 100644 index 000000000000..c7f7e32b74cb --- /dev/null +++ b/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch @@ -0,0 +1,13 @@ +diff --git a/aegisub/configure.ac b/aegisub/configure.ac +index d961bd6..17df012 100644 +--- a/aegisub/configure.ac ++++ b/aegisub/configure.ac +@@ -369,7 +369,7 @@ AC_ARG_WITH(lua, + AS_HELP_STRING([--without-lua], + [build without lua 5.1 (auto4)])) + +-AS_IF([test x$with_lua = xno], [$with_auto4_lua="no"; lua_disabled="(disabled)"], [ ++AS_IF([test x$with_lua = xno], [with_auto4_lua="no"; lua_disabled="(disabled)"], [ + # First try pkg-config with several names + PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1 lua5.1 < 5.2, [with_auto4_lua="yes"], [ + PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1 lua-5.1 < 5.2, [with_auto4_lua="yes"], [ diff --git a/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch new file mode 100644 index 000000000000..80e1eb9bde19 --- /dev/null +++ b/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch @@ -0,0 +1,30 @@ +diff --git a/aegisub/configure.ac b/aegisub/configure.ac +index d961bd6..8922042 100644 +--- a/aegisub/configure.ac ++++ b/aegisub/configure.ac +@@ -157,23 +157,17 @@ AS_IF([test x$enable_compiler_flags != xno], [ + AC_C_FLAG([-Wextra],[AC_C_FLAG([-W])]) + AC_C_FLAG([-Wno-unused-parameter]) + AC_C_FLAG([-std=gnu99]) +- AC_C_FLAG([-pipe]) +- AC_C_FLAG([-g]) + AC_CXX_FLAG([-Wall]) + AC_CXX_FLAG([-Wextra],[AC_CXX_FLAG([-W])]) + AC_CXX_FLAG([-Wno-unused-parameter]) + AC_CXX_FLAG([-Wno-long-long]) +- AC_CXX_FLAG([-fno-strict-aliasing]) +- AC_CXX_FLAG([-pipe]) +- AC_CXX_FLAG([-g]) + + # -O* messes with debugging. + AS_IF([test x$enable_debug = xyes], [ + AC_C_FLAG([-O0]) ++ AC_C_FLAG([-g]) + AC_CXX_FLAG([-O0]) +- ], [ +- AC_C_FLAG([-O2]) +- AC_CXX_FLAG([-O2]) ++ AC_CXX_FLAG([-g]) + ]) + ]) + diff --git a/media-video/aegisub/files/aegisub-3.2.2-fix-lua-regexp.patch b/media-video/aegisub/files/aegisub-3.2.2-fix-lua-regexp.patch new file mode 100644 index 000000000000..a05ed2d65125 --- /dev/null +++ b/media-video/aegisub/files/aegisub-3.2.2-fix-lua-regexp.patch @@ -0,0 +1,13 @@ +diff --git a/tools/respack.lua b/tools/respack.lua +index 85955d1..1281ac2 100755 +--- a/tools/respack.lua ++++ b/tools/respack.lua +@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n') + for line in manifest:lines() do + if line:find('.') then + local file = try_open(path..line, 'rb') +- local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '') ++ local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '') + out_cpp:write("const unsigned char " .. id .. "[] = {") + + local len = 0 diff --git a/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch new file mode 100644 index 000000000000..caecf82a7ff6 --- /dev/null +++ b/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch @@ -0,0 +1,30 @@ +diff --git a/configure.ac b/configure.ac +index be657b0..fca48e0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -139,20 +139,17 @@ CC="$PTHREAD_CC" + AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]])) + + AS_IF([test x$enable_compiler_flags != xno], [ +- CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g" +- CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g" ++ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter" ++ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter" ++ AC_C_FLAG([-std=gnu99]) + AC_CXX_FLAG([-std=c++11]) +- AC_CXX_FLAG([-Wno-c++11-narrowing]) + AC_C_FLAG([-Wno-unused-local-typedefs]) + AC_CXX_FLAG([-Wno-unused-local-typedefs]) + + # -O* messes with debugging. + AS_IF([test x$enable_debug = xyes], [ +- CFLAGS="$CFLAGS -O0" +- CXXFLAGS="$CXXFLAGS -O0" +- ], [ +- CFLAGS="$CFLAGS -O3" +- CXXFLAGS="$CXXFLAGS -O3" ++ CFLAGS="$CFLAGS -O0 -g" ++ CXXFLAGS="$CXXFLAGS -O0 -g" + ]) + ]) + diff --git a/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch new file mode 100644 index 000000000000..de0907229dba --- /dev/null +++ b/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch @@ -0,0 +1,134 @@ +diff --git a/Makefile.inc.in b/Makefile.inc.in +index c93b9dc..ae018c3 100644 +--- a/Makefile.inc.in ++++ b/Makefile.inc.in +@@ -78,7 +78,7 @@ CFLAGS_ICONV = @ICONV_CFLAGS@ + CFLAGS_ICU = @ICU_I18N_CFLAGS@ + CFLAGS_LIBASS = @LIBASS_CFLAGS@ + CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@ +-CFLAGS_LUA = -I$(TOP)vendor/luajit/include ++CFLAGS_LUA = @LUAJIT_CFLAGS@ + CFLAGS_OPENAL = @OPENAL_CFLAGS@ + CFLAGS_OSS = @OSS_CFLAGS@ + CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@ +@@ -96,15 +96,11 @@ LIBS_ICONV = @ICONV_LIBS@ + LIBS_ICU = @ICU_UC_LIBS@ @ICU_I18N_LIBS@ + LIBS_LIBASS = @LIBASS_LIBS@ + LIBS_LIBPULSE = @LIBPULSE_LIBS@ +-LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a ++LIBS_LUA = @LUAJIT_LIBS@ + LIBS_OPENAL = @OPENAL_LIBS@ + LIBS_PORTAUDIO = @PORTAUDIO_LIBS@ + LIBS_PTHREAD = @PTHREAD_LIBS@ + +-ifeq (yes, $(BUILD_DARWIN)) +-LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so +-endif +- + FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@ + + ##################### +diff --git a/configure.ac b/configure.ac +index be657b0..de586d5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,8 @@ m4_define([libpulse_required_version], [0.5]) + m4_define([pkgconfig_required_version], [0.20]) + m4_define([portaudio_required_version], [19]) + m4_define([wx_required_version], [3.0.0]) ++# Same version as the bundled one ++m4_define([luajit_required_version], [2.0.3]) + + ####### + # Setup +@@ -205,6 +207,7 @@ AC_SUBST(GL_LIBS) + PKG_CHECK_MODULES(FREETYPE, freetype2 >= freetype_required_version) + PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version) + PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version) ++PKG_CHECK_MODULES(LUAJIT, luajit >= luajit_required_version) + + FONTCONFIG_CONF_DIR=$($PKG_CONFIG --variable=confdir fontconfig) + AC_SUBST(FONTCONFIG_CONF_DIR) +diff --git a/header.mk b/header.mk +index 61c8ba1..050472d 100644 +--- a/header.mk ++++ b/header.mk +@@ -13,7 +13,6 @@ subdirs := \ + tests \ + tools \ + vendor/luabins \ +- vendor/luajit \ + vendor/universalchardet + + subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) +diff --git a/src/Makefile b/src/Makefile +index 60d7101..757bdc6 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui + $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) + src_CXXFLAGS := $(CXXFLAGS_WX) + src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \ +- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) ++ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) \ ++ $(LIBS_LUA) + src_PCH := $(d)agi_pre.h + src_INSTALLNAME := $(AEGISUB_COMMAND) + +@@ -112,7 +113,6 @@ src_OBJ := \ + $(d)video_provider_yuv4mpeg.o \ + $(d)video_slider.o \ + $(d)visual_feature.o \ +- $(LIBS_LUA) \ + $(TOP)lib/libaegisub.a \ + $(TOP)lib/libluabins.a \ + $(TOP)lib/libresrc.a \ +@@ -192,10 +192,10 @@ $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS) + $(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing + $(d)text_file_reader.o_FLAGS := -D_X86_ + $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2) +-$(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include +-$(d)auto4_lua_assfile.o_FLAGS := -I$(TOP)vendor/luajit/include +-$(d)auto4_lua_dialog.o_FLAGS := -I$(TOP)vendor/luajit/include +-$(d)auto4_lua_progresssink.o_FLAGS := -I$(TOP)vendor/luajit/include ++$(d)auto4_lua.o_FLAGS := $(CFLAGS_LUA) ++$(d)auto4_lua_assfile.o_FLAGS := $(CFLAGS_LUA) ++$(d)auto4_lua_dialog.o_FLAGS := $(CFLAGS_LUA) ++$(d)auto4_lua_progresssink.o_FLAGS := $(CFLAGS_LUA) + + $(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h + +diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile +index 6441856..0562eb1 100644 +--- a/src/libresrc/Makefile ++++ b/src/libresrc/Makefile +@@ -10,7 +10,7 @@ resrc_OBJ := \ + + $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp + +-RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua ++RESPACK := cd $(TOP)src/libresrc; luajit $(TOP)tools/respack.lua + + $(d)bitmap.cpp: $(d)bitmap.h + $(d)default_config.cpp: $(d)default_config.h +diff --git a/tools/Makefile b/tools/Makefile +index 81bcef3..0834ac2 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) + + PROGRAM += $(d)repack-thes-dict + +-$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua +- + include $(TOP)Makefile.target +diff --git a/tools/respack.lua b/tools/respack.lua +index 85955d1..11af2f4 100755 +--- a/tools/respack.lua ++++ b/tools/respack.lua +@@ -1,4 +1,4 @@ +-#!../vendor/luajit/src/host/minilua ++#!/usr/bin/env luajit + -- Copyright (c) 2014, Thomas Goyne <plorkyeran@aegisub.org> + -- + -- Permission to use, copy, modify, and distribute this software for any diff --git a/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch new file mode 100644 index 000000000000..ae1f5c1c1ea7 --- /dev/null +++ b/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch @@ -0,0 +1,50 @@ +diff --git a/configure.ac b/configure.ac +index d0b5152..2609161 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -136,20 +136,17 @@ AS_IF([test x$build_darwin != xyes], [ + AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]])) + + AS_IF([test x$enable_compiler_flags != xno], [ +- CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g" +- CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g" ++ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter" ++ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter" ++ AC_C_FLAG([-std=gnu99]) + AC_CXX_FLAG([-std=c++11]) +- AC_CXX_FLAG([-Wno-c++11-narrowing]) + AC_C_FLAG([-Wno-unused-local-typedefs]) + AC_CXX_FLAG([-Wno-unused-local-typedefs]) + + # -O* messes with debugging. + AS_IF([test x$enable_debug = xyes], [ +- CFLAGS="$CFLAGS -O0" +- CXXFLAGS="$CXXFLAGS -O0" +- ], [ +- CFLAGS="$CFLAGS -O3" +- CXXFLAGS="$CXXFLAGS -O3" ++ CFLAGS="$CFLAGS -O0 -g" ++ CXXFLAGS="$CXXFLAGS -O0 -g" + ]) + ]) + +diff --git a/src/Makefile b/src/Makefile +index 08f9216..e2e5602 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -182,14 +182,13 @@ endif + ##################### + # SOURCE-LEVEL CFLAGS + ##################### +-$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized + $(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL) + $(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2) + $(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE) + $(d)charset_detect.o_FLAGS := -D_X86_ + $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG) + $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS) +-$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing ++$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) + $(d)text_file_reader.o_FLAGS := -D_X86_ + $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2) + $(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include diff --git a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch new file mode 100644 index 000000000000..4eea654b2e06 --- /dev/null +++ b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch @@ -0,0 +1,134 @@ +diff --git a/Makefile.inc.in b/Makefile.inc.in +index d1e1da4..aa26b81 100644 +--- a/Makefile.inc.in ++++ b/Makefile.inc.in +@@ -78,7 +78,7 @@ CFLAGS_ICONV = @ICONV_CFLAGS@ + CFLAGS_ICU = @ICU_I18N_CFLAGS@ + CFLAGS_LIBASS = @LIBASS_CFLAGS@ + CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@ +-CFLAGS_LUA = -I$(TOP)vendor/luajit/include ++CFLAGS_LUA = @LUAJIT_CFLAGS@ + CFLAGS_OPENAL = @OPENAL_CFLAGS@ + CFLAGS_OSS = @OSS_CFLAGS@ + CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@ +@@ -96,15 +96,11 @@ LIBS_ICONV = @ICONV_LIBS@ + LIBS_ICU = @ICU_UC_LIBS@ @ICU_I18N_LIBS@ + LIBS_LIBASS = @LIBASS_LIBS@ + LIBS_LIBPULSE = @LIBPULSE_LIBS@ +-LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a ++LIBS_LUA = @LUAJIT_LIBS@ + LIBS_OPENAL = @OPENAL_LIBS@ + LIBS_PORTAUDIO = @PORTAUDIO_LIBS@ + LIBS_PTHREAD = @PTHREAD_LIBS@ + +-ifeq (yes, $(BUILD_DARWIN)) +-LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so +-endif +- + FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@ + + ##################### +diff --git a/configure.ac b/configure.ac +index d0b5152..ecec4de 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,8 @@ m4_define([libpulse_required_version], [0.5]) + m4_define([pkgconfig_required_version], [0.20]) + m4_define([portaudio_required_version], [19]) + m4_define([wx_required_version], [3.0.0]) ++# Same version as the bundled one ++m4_define([luajit_required_version], [2.0.4]) + + ####### + # Setup +@@ -206,6 +208,7 @@ AC_SUBST(GL_LIBS) + PKG_CHECK_MODULES(FREETYPE, freetype2 >= freetype_required_version) + PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version) + PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version) ++PKG_CHECK_MODULES(LUAJIT, luajit >= luajit_required_version) + + FONTCONFIG_CONF_DIR=$($PKG_CONFIG --variable=confdir fontconfig) + AC_SUBST(FONTCONFIG_CONF_DIR) +diff --git a/header.mk b/header.mk +index 61c8ba1..050472d 100644 +--- a/header.mk ++++ b/header.mk +@@ -13,7 +13,6 @@ subdirs := \ + tests \ + tools \ + vendor/luabins \ +- vendor/luajit \ + vendor/universalchardet + + subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) +diff --git a/src/Makefile b/src/Makefile +index 08f9216..bb9233b 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui + $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CPPFLAGS_BOOST) + src_CXXFLAGS := $(CXXFLAGS_WX) + src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \ +- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) ++ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) \ ++ $(LIBS_LUA) + src_PCH := $(d)agi_pre.h + src_INSTALLNAME := $(AEGISUB_COMMAND) + +@@ -112,7 +113,6 @@ src_OBJ := \ + $(d)video_provider_yuv4mpeg.o \ + $(d)video_slider.o \ + $(d)visual_feature.o \ +- $(LIBS_LUA) \ + $(TOP)lib/libaegisub.a \ + $(TOP)lib/libluabins.a \ + $(TOP)lib/libresrc.a \ +@@ -192,10 +192,10 @@ $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS) + $(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing + $(d)text_file_reader.o_FLAGS := -D_X86_ + $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2) +-$(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include +-$(d)auto4_lua_assfile.o_FLAGS := -I$(TOP)vendor/luajit/include +-$(d)auto4_lua_dialog.o_FLAGS := -I$(TOP)vendor/luajit/include +-$(d)auto4_lua_progresssink.o_FLAGS := -I$(TOP)vendor/luajit/include ++$(d)auto4_lua.o_FLAGS := $(CFLAGS_LUA) ++$(d)auto4_lua_assfile.o_FLAGS := $(CFLAGS_LUA) ++$(d)auto4_lua_dialog.o_FLAGS := $(CFLAGS_LUA) ++$(d)auto4_lua_progresssink.o_FLAGS := $(CFLAGS_LUA) + + $(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h + +diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile +index 6441856..0562eb1 100644 +--- a/src/libresrc/Makefile ++++ b/src/libresrc/Makefile +@@ -10,7 +10,7 @@ resrc_OBJ := \ + + $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp + +-RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua ++RESPACK := cd $(TOP)src/libresrc; luajit $(TOP)tools/respack.lua + + $(d)bitmap.cpp: $(d)bitmap.h + $(d)default_config.cpp: $(d)default_config.h +diff --git a/tools/Makefile b/tools/Makefile +index d9f64b8..d56ef63 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) + + PROGRAM += $(d)repack-thes-dict + +-$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua +- + include $(TOP)Makefile.target +diff --git a/tools/respack.lua b/tools/respack.lua +index 85955d1..11af2f4 100755 +--- a/tools/respack.lua ++++ b/tools/respack.lua +@@ -1,4 +1,4 @@ +-#!../vendor/luajit/src/host/minilua ++#!/usr/bin/env luajit + -- Copyright (c) 2014, Thomas Goyne <plorkyeran@aegisub.org> + -- + -- Permission to use, copy, modify, and distribute this software for any diff --git a/media-video/aegisub/metadata.xml b/media-video/aegisub/metadata.xml index 496cc906a4cf..dc3909a1a958 100644 --- a/media-video/aegisub/metadata.xml +++ b/media-video/aegisub/metadata.xml @@ -7,7 +7,14 @@ <name>Nikoli</name> </maintainer> <maintainer> + <email>itumaykin+gentoo@gmail.com</email> + <name>Coacher</name> + </maintainer> + <maintainer> <email>maksbotan@gentoo.org</email> <name>Maxim Koltsov</name> </maintainer> + <upstream> + <remote-id type="github">Aegisub/Aegisub</remote-id> + </upstream> </pkgmetadata> diff --git a/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild new file mode 100644 index 000000000000..fcf2a6b95b1f --- /dev/null +++ b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils flag-o-matic perl-module + +DESCRIPTION="dvd::rip is a graphical frontend for transcode" +HOMEPAGE="http://www.exit1.org/dvdrip/" +SRC_URI="http://www.exit1.org/dvdrip/dist/${P}.tar.gz" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="ffmpeg fping libav mplayer ogg subtitles vcd vorbis xine xvid" + +DEPEND=">=dev-perl/Event-ExecFlow-0.64 + >=dev-perl/Event-RPC-0.89 + dev-perl/gtk2-perl + >=dev-perl/gtk2-ex-formfactory-0.65 + >=dev-perl/libintl-perl-1.16 + || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) + >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] + >=virtual/perl-podlators-2.5.3 +" +RDEPEND="${DEPEND} + x11-libs/gdk-pixbuf:2[jpeg] + x11-libs/gtk+:2 + ffmpeg? ( + libav? ( media-video/libav ) + !libav? ( media-video/ffmpeg:0 ) + ) + fping? ( >=net-analyzer/fping-2.2 ) + mplayer? ( media-video/mplayer ) + ogg? ( media-sound/ogmtools ) + subtitles? ( media-video/subtitleripper ) + vcd? ( + media-video/transcode[mjpeg] + >=media-video/mjpegtools-1.6.0 + ) + vorbis? ( media-sound/vorbis-tools ) + xine? ( media-video/xine-ui ) + xvid? ( media-video/xvid4conf ) + >=media-video/lsdvd-0.15 +" + +pkg_setup() { + filter-flags -ftracer + export SKIP_UNPACK_REQUIRED_MODULES=1 #255269 + + perl_set_version +} + +src_prepare() { + sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die #333739 + epatch "${FILESDIR}"/${P}-fix_parallel_make.patch + # Fix default device for >=udev-180 wrt #224559 + sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die + + # Ubuntu patch for supporting libav + use libav && epatch "${FILESDIR}"/${P}-libav.patch +} + +src_install() { + newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm + make_desktop_entry dvdrip dvd::rip + + mydoc="Changes* Credits README TODO" perl-module_src_install +} + +pkg_postinst() { + # bug 173924 + if use fping; then + ewarn "For dvdrip-master to work correctly with cluster mode," + ewarn "the fping binary must be setuid." + ewarn "" + ewarn "Run this command to fix it:" + ewarn "chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" + ewarn "" + ewarn "Note that this is a security risk when enabled." + fi +} diff --git a/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch b/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch new file mode 100644 index 000000000000..a9d60e2338b1 --- /dev/null +++ b/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch @@ -0,0 +1,29 @@ +Description: Port from ffmpeg to avconv. +Author: Dmitrijs Ledkovs <xnox@ubuntu.com> + +--- dvdrip-0.98.11.orig/lib/Video/DVDRip/Depend.pm ++++ dvdrip-0.98.11/lib/Video/DVDRip/Depend.pm +@@ -114,10 +114,10 @@ my %TOOLS = ( + }, + ffmpeg => { + order => ++$ORDER, +- command => "ffmpeg", ++ command => "avconv", + comment => __ "FFmpeg video converter command line program", + optional => 1, +- version_cmd => "ffmpeg -version", ++ version_cmd => "avconv -version", + get_version => sub { + my ($cmd) = @_; + qx[$cmd 2>&1] =~ /version ([^\s]+)/i; +--- dvdrip-0.98.11.orig/lib/Video/DVDRip/Title.pm ++++ dvdrip-0.98.11/lib/Video/DVDRip/Title.pm +@@ -3184,7 +3184,7 @@ sub get_take_snapshot_command { + . "tcdemux -s 0x80 -x mpeg2 -S $grab_options->{S} " + . "-M 0 -d 0 -P /dev/null | " + . "tcextract -t vob -a 0 -x mpeg2 -d 0 | " +- . "ffmpeg -r $frame_rate -i - -an -r 1 -ss '$start' -vframes 1 snapshot%03d.png "; ++ . "avconv -r $frame_rate -i - -an -r 1 -ss '$start' -vframes 1 snapshot%03d.png "; + + $command .= " && " + . "execflow convert" diff --git a/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild b/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild new file mode 100644 index 000000000000..8e6f47d33e31 --- /dev/null +++ b/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild @@ -0,0 +1,70 @@ +# 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 + epatch "${FILESDIR}/${PN}-2.9.4-ffmpeg29.patch" +} + +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/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch b/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch new file mode 100644 index 000000000000..2ddd41408b59 --- /dev/null +++ b/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch @@ -0,0 +1,31 @@ +Index: DVDStyler-2.9.4/src/mediaenc_ffmpeg.cpp +=================================================================== +--- DVDStyler-2.9.4.orig/src/mediaenc_ffmpeg.cpp ++++ DVDStyler-2.9.4/src/mediaenc_ffmpeg.cpp +@@ -179,7 +179,7 @@ bool wxFfmpegMediaEncoder::addVideoStrea + c->time_base.den = isNTSC(videoFormat) ? 30000 : 25; + c->time_base.num = isNTSC(videoFormat) ? 1001 : 1; + c->gop_size = m_gopSize > 0 ? m_gopSize : (isNTSC(videoFormat) ? 15 : 12); +- c->pix_fmt = PIX_FMT_YUV420P; ++ c->pix_fmt = AV_PIX_FMT_YUV420P; + c->rc_buffer_size = VIDEO_BUF_SIZE; + c->rc_max_rate = 9000000; + c->rc_min_rate = 0; +@@ -280,7 +280,7 @@ void wxFfmpegMediaEncoder::CloseAudioEnc + m_audioStm = NULL; + } + +-AVFrame* allocPicture(PixelFormat pix_fmt, int width, int height) { ++AVFrame* allocPicture(AVPixelFormat pix_fmt, int width, int height) { + AVFrame* frame = av_frame_alloc(); + if (!frame) + return NULL; +@@ -329,7 +329,7 @@ bool wxFfmpegMediaEncoder::OpenVideoEnco + return false; + } + +- m_imgConvertCtx = sws_getContext(c->width, c->height, PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC, ++ m_imgConvertCtx = sws_getContext(c->width, c->height, AV_PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC, + NULL, NULL, NULL); + if (!m_imgConvertCtx) { + wxLogError(wxT("Cannot initialize the conversion context")); diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 1b9dec92ae10..8e0bc3c94cd2 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -2,4 +2,3 @@ DIST ffmpeg-2.6.3.tar.bz2 7803314 SHA256 59eb98c1b5896ac29abc0385f7c875d1b4942d6 DIST ffmpeg-2.6.4.tar.bz2 7811925 SHA256 184f49e6b359426c398ad6c67d89abd362558373a43d3d92f86e554571655a5d SHA512 76c8bb3b23f2d2bac73b1561ef31bb3d1da49b2e182d84a13bf0bf49ea84cd0d64566c9dfafc4ac9d660aa4cecc0f08272b9ee284d1d09776e4599b87920c308 WHIRLPOOL 2d68715fb284979d703905919289c897c5cb002c3d466aca6c9759ca9f93443b749a24747cf218d005d728680ad137990880ec99210b6fb49038587966dd79f4 DIST ffmpeg-2.7.2.tar.bz2 8157217 SHA256 7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2 SHA512 cce58c63ae14dcbd3bdc4758af8427e18ac589f8bd4f2701e54b5e0e61669d5aab212e5829feb67a0fd33bc52b2d64adff93729c0696c44a0f6064a0752433dd WHIRLPOOL dd286393427b89be266ad2b122138dab578843d16bdf9b989b9546734f489c8c5c3d1ab0443ff5039b440a8430802ffe24f0fc38553688ec80984a1cce2ba2a3 DIST ffmpeg-2.8.1.tar.bz2 8564488 SHA256 e2ed5ab28dee1af94336739173eb0019afc21a54e38a96f4e3208e94a07866e2 SHA512 5c493f1eb84dd916f12a709a77ca0317a03ce88caaa1ee5e06b4e03c60ef4520ba58c8972841de25dcadb0da42e88592e6a87c3aca18dba62e246256c33fcf91 WHIRLPOOL f0f26375960dff80055fe257b63f11a1cc598bef9450d0da4a619bfc61ba6df185ea0dcf9c566810c7917159bb193d30a1009051c5b32ea1d746b289c782b8aa -DIST ffmpeg-2.8.tar.bz2 8563832 SHA256 9565236404d3515aab754283c687c0a001019003148bf7f708e643608c0690b8 SHA512 d642317954aeb66cc1ca19d3605561cb8b95bbb308fc1064e693a71842cea2ac94f82144e52cdb389ca00e7e55cbd0bae252df858f50a085f3b1189f36418911 WHIRLPOOL 98a9b3f0bc8aefac50fd812dcd4da4c846d086d3e07ab522582c859d710c6dce6b382a2f8e8da6ddd3885685c935486e5f5b1b0f68f4a8987c4424cf086824e1 diff --git a/media-video/ffmpeg/ffmpeg-2.8-r1.ebuild b/media-video/ffmpeg/ffmpeg-2.8-r1.ebuild deleted file mode 100644 index 6f3904fdb7b9..000000000000 --- a/media-video/ffmpeg/ffmpeg-2.8-r1.ebuild +++ /dev/null @@ -1,455 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=54.56.56 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-2" - EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git" -fi - -inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec" -HOMEPAGE="http://ffmpeg.org/" -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.bz2" -else # Release - SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2" -fi -FFMPEG_REVISION="${PV#*_p}" - -SLOT="0/${FFMPEG_SUBSLOT}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) - amr? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - encode? ( - aac? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - amrenc? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - ) - samba? ( GPL-3 ) -" -if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" -fi - -# Options to use as use_enable in the foo[:bar] form. -# This will feed configure with $(use_enable foo bar) -# or $(use_enable foo foo) if no :bar is set. -# foo is added to IUSE. -FFMPEG_FLAG_MAP=( - +bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls +gpl - +hardcoded-tables +iconv lzma +network openssl +postproc - samba:libsmbclient sdl:ffplay vaapi vdpau X:xlib xcb:libxcb - xcb:libxcb-shm xcb:libxcb-xfixes +zlib - # libavdevice options - cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal - opengl - # indevs - libv4l:libv4l2 pulseaudio:libpulse - # decoders - amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac - jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm - modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh - schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx - zvbi:libzvbi - # libavfilter options - bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa - libass truetype:libfreetype - # libswresample options - libsoxr - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -# Same as above but for encoders, i.e. they do something only with USE=encode. -FFMPEG_ENCODER_FLAG_MAP=( - aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame - aacplus:libaacplus faac:libfaac snappy:libsnappy theora:libtheora - twolame:libtwolame wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 - xvid:libxvid -) - -IUSE=" - alsa +encode examples jack libressl oss pic static-libs test v4l - ${FFMPEG_FLAG_MAP[@]%:*} - ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} -" - -# Strings for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp ) -MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu ) -PPC_CPU_FEATURES=( altivec ) -X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -X86_CPU_REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) - cpu_flags_x86_xop? ( cpu_flags_x86_avx ) - cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) - cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) - cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) - cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) - cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) - cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) - cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) - cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) -" - -IUSE="${IUSE} - ${ARM_CPU_FEATURES[@]%:*} - ${MIPS_CPU_FEATURES[@]%:*} - ${PPC_CPU_FEATURES[@]%:*} - ${X86_CPU_FEATURES[@]%:*} -" - -CPU_REQUIRED_USE=" - ${X86_CPU_REQUIRED_USE} -" - -# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to -# $(tc-arch). -CPU_FEATURES_MAP=" - arm:ARM - arm64:ARM - mips:MIPS - ppc:PPC - ppc64:PPC - x86:X86 - amd64:X86 -" - -FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) -IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" - -RDEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) - bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] ) - bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) - encode? ( - aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) - aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] ) - amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) - faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) - snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] ) - theora? ( - >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) - wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) - webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] ) - x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) - x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) - ) - fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] ) - flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] ) - fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) - frei0r? ( media-plugins/frei0r-plugins ) - fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] ) - gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] ) - gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) - gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) - iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) - iec61883? ( - >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}] - >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}] - ) - ieee1394? ( - >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] - >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - ) - jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] ) - libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] ) - libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) - libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) - libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) - modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) - openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) - ) - opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] ) - librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) - samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] ) - schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) - sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) - vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) - vorbis? ( - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - !xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] ) - >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] - ) - xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) - !media-video/qt-faststart - postproc? ( !media-libs/libpostproc ) -" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - doc? ( app-text/texi2html ) - fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) - libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 ) - librtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - test? ( net-misc/wget sys-devel/bc ) - truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - v4l? ( sys-kernel/linux-headers ) -" - -RDEPEND="${RDEPEND} - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" - -# Code requiring FFmpeg to be built under gpl license -GPL_REQUIRED_USE=" - postproc? ( gpl ) - frei0r? ( gpl ) - cdio? ( gpl ) - samba? ( gpl ) - zvbi? ( gpl ) - encode? ( - x264? ( gpl ) - x265? ( gpl ) - xvid? ( gpl ) - X? ( !xcb? ( gpl ) ) - ) -" -REQUIRED_USE=" - libv4l? ( v4l ) - fftools_cws2fws? ( zlib ) - test? ( encode ) - ${GPL_REQUIRED_USE} - ${CPU_REQUIRED_USE}" -RESTRICT=" - encode? ( faac? ( bindist ) aacplus? ( bindist ) ) - gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) -" - -S=${WORKDIR}/${P/_/-} - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/libavutil/avconfig.h -) - -src_prepare() { - if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot - export revision=git-N-${FFMPEG_REVISION} - fi - epatch_user -} - -multilib_src_configure() { - local myconf=( ${EXTRA_FFMPEG_CONF} ) - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - use openssl && use gpl && myconf+=( --enable-nonfree ) - use samba && myconf+=( --enable-version3 ) - - # Encoders - if use encode ; then - ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" ) - - # Licensing. - if use aac || use amrenc ; then - myconf+=( --enable-version3 ) - fi - if use aacplus || use faac ; then - myconf+=( --enable-nonfree ) - fi - else - myconf+=( --disable-encoders ) - fi - - # Indevs - use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 ) - for i in alsa oss jack ; do - use ${i} || myconf+=( --disable-indev=${i} ) - done - use xcb || ffuse+=( X:x11grab ) - - # Outdevs - for i in alsa oss sdl ; do - use ${i} || myconf+=( --disable-outdev=${i} ) - done - - # Decoders - use amr && myconf+=( --enable-version3 ) - use fdk && use gpl && myconf+=( --enable-nonfree ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - # (temporarily) disable non-multilib deps - if ! multilib_is_native_abi; then - for i in frei0r ; do - myconf+=( --disable-${i} ) - done - fi - - # CPU features - for i in ${CPU_FEATURES_MAP} ; do - if [ "$(tc-arch)" = "${i%:*}" ] ; then - local var="${i#*:}_CPU_FEATURES[@]" - for j in ${!var} ; do - use ${j%:*} || myconf+=( --disable-${j#*:} ) - done - fi - done - - if use pic ; then - myconf+=( --enable-pic ) - # disable asm code if PIC is required - # as the provided asm decidedly is not PIC for x86. - [[ ${ABI} == x86 ]] && myconf+=( --disable-asm ) - fi - [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004 - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag mcpu) $(get-flag march) $(get-flag mtune) ; do - [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) - break - done - - # Mandatory configuration - myconf=( - --enable-avfilter - --enable-avresample - --disable-stripping - "${myconf[@]}" - ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- ) - case ${CHOST} in - *freebsd*) - myconf+=( --target-os=freebsd ) - ;; - mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --mandir="${EPREFIX}/usr/share/man" \ - --enable-shared \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --optflags=" " \ - $(use_enable static-libs static) \ - "${myconf[@]}" - echo "${@}" - "${@}" || die -} - -multilib_src_compile() { - emake V=1 - - if multilib_is_native_abi; then - for i in "${FFTOOLS[@]}" ; do - if use fftools_${i} ; then - emake V=1 tools/${i} - fi - done - fi -} - -multilib_src_install() { - emake V=1 DESTDIR="${D}" install install-man - - if multilib_is_native_abi; then - for i in "${FFTOOLS[@]}" ; do - if use fftools_${i} ; then - dobin tools/${i} - fi - done - fi -} - -multilib_src_install_all() { - dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges - [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use doc && dohtml -r doc/* - if use examples ; then - dodoc -r doc/examples - docompress -x /usr/share/doc/${PF}/examples - fi -} - -multilib_src_test() { - LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \ - emake V=1 fate -} diff --git a/media-video/ffmpeg/ffmpeg-2.8.ebuild b/media-video/ffmpeg/ffmpeg-2.8.ebuild deleted file mode 100644 index 36041cf747f3..000000000000 --- a/media-video/ffmpeg/ffmpeg-2.8.ebuild +++ /dev/null @@ -1,452 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=54.56.56 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-2" - EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git" -fi - -inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec" -HOMEPAGE="http://ffmpeg.org/" -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.bz2" -else # Release - SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2" -fi -FFMPEG_REVISION="${PV#*_p}" - -SLOT="0/${FFMPEG_SUBSLOT}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) - amr? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - encode? ( - aac? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - amrenc? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - ) - samba? ( GPL-3 ) -" -if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" -fi - -# Options to use as use_enable in the foo[:bar] form. -# This will feed configure with $(use_enable foo bar) -# or $(use_enable foo foo) if no :bar is set. -# foo is added to IUSE. -FFMPEG_FLAG_MAP=( - +bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls +gpl - +hardcoded-tables +iconv lzma +network openssl +postproc - samba:libsmbclient sdl:ffplay vaapi vdpau X:xlib xcb:libxcb - xcb:libxcb-shm xcb:libxcb-xfixes +zlib - # libavdevice options - cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal - opengl - # indevs - libv4l:libv4l2 pulseaudio:libpulse - # decoders - amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac - jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm - modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh - schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx - zvbi:libzvbi - # libavfilter options - bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa - libass truetype:libfreetype - # libswresample options - libsoxr - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -# Same as above but for encoders, i.e. they do something only with USE=encode. -FFMPEG_ENCODER_FLAG_MAP=( - aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame - aacplus:libaacplus faac:libfaac snappy:libsnappy theora:libtheora - twolame:libtwolame wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 - xvid:libxvid -) - -IUSE=" - alsa +encode examples jack oss pic static-libs test v4l - ${FFMPEG_FLAG_MAP[@]%:*} - ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} -" - -# Strings for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp ) -MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu ) -PPC_CPU_FEATURES=( altivec ) -X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -X86_CPU_REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) - cpu_flags_x86_xop? ( cpu_flags_x86_avx ) - cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) - cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) - cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) - cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) - cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) - cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) - cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) - cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) -" - -IUSE="${IUSE} - ${ARM_CPU_FEATURES[@]%:*} - ${MIPS_CPU_FEATURES[@]%:*} - ${PPC_CPU_FEATURES[@]%:*} - ${X86_CPU_FEATURES[@]%:*} -" - -CPU_REQUIRED_USE=" - ${X86_CPU_REQUIRED_USE} -" - -# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to -# $(tc-arch). -CPU_FEATURES_MAP=" - arm:ARM - arm64:ARM - mips:MIPS - ppc:PPC - ppc64:PPC - x86:X86 - amd64:X86 -" - -FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) -IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" - -RDEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) - bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] ) - bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) - encode? ( - aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) - aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] ) - amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) - faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) - snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] ) - theora? ( - >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) - wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) - webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] ) - x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) - x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) - ) - fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] ) - flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] ) - fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) - frei0r? ( media-plugins/frei0r-plugins ) - fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] ) - gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] ) - gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) - gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) - iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) - iec61883? ( - >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}] - >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}] - ) - ieee1394? ( - >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] - >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - ) - jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] ) - libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] ) - libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) - libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) - libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) - modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) - openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) - opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] ) - librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) - samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] ) - schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) - sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) - vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) - vorbis? ( - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - !xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] ) - >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] - ) - xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) - !media-video/qt-faststart - postproc? ( !media-libs/libpostproc ) -" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - doc? ( app-text/texi2html ) - fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) - libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 ) - librtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - test? ( net-misc/wget sys-devel/bc ) - truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - v4l? ( sys-kernel/linux-headers ) -" - -RDEPEND="${RDEPEND} - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" - -# Code requiring FFmpeg to be built under gpl license -GPL_REQUIRED_USE=" - postproc? ( gpl ) - frei0r? ( gpl ) - cdio? ( gpl ) - samba? ( gpl ) - zvbi? ( gpl ) - encode? ( - x264? ( gpl ) - x265? ( gpl ) - xvid? ( gpl ) - X? ( !xcb? ( gpl ) ) - ) -" -REQUIRED_USE=" - libv4l? ( v4l ) - fftools_cws2fws? ( zlib ) - test? ( encode ) - ${GPL_REQUIRED_USE} - ${CPU_REQUIRED_USE}" -RESTRICT=" - encode? ( faac? ( bindist ) aacplus? ( bindist ) ) - gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) -" - -S=${WORKDIR}/${P/_/-} - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/libavutil/avconfig.h -) - -src_prepare() { - if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot - export revision=git-N-${FFMPEG_REVISION} - fi - epatch_user -} - -multilib_src_configure() { - local myconf=( ${EXTRA_FFMPEG_CONF} ) - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - use openssl && use gpl && myconf+=( --enable-nonfree ) - use samba && myconf+=( --enable-version3 ) - - # Encoders - if use encode ; then - ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" ) - - # Licensing. - if use aac || use amrenc ; then - myconf+=( --enable-version3 ) - fi - if use aacplus || use faac ; then - myconf+=( --enable-nonfree ) - fi - else - myconf+=( --disable-encoders ) - fi - - # Indevs - use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 ) - for i in alsa oss jack ; do - use ${i} || myconf+=( --disable-indev=${i} ) - done - use xcb || ffuse+=( X:x11grab ) - - # Outdevs - for i in alsa oss sdl ; do - use ${i} || myconf+=( --disable-outdev=${i} ) - done - - # Decoders - use amr && myconf+=( --enable-version3 ) - use fdk && use gpl && myconf+=( --enable-nonfree ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - # (temporarily) disable non-multilib deps - if ! multilib_is_native_abi; then - for i in frei0r ; do - myconf+=( --disable-${i} ) - done - fi - - # CPU features - for i in ${CPU_FEATURES_MAP} ; do - if [ "$(tc-arch)" = "${i%:*}" ] ; then - local var="${i#*:}_CPU_FEATURES[@]" - for j in ${!var} ; do - use ${j%:*} || myconf+=( --disable-${j#*:} ) - done - fi - done - - if use pic ; then - myconf+=( --enable-pic ) - # disable asm code if PIC is required - # as the provided asm decidedly is not PIC for x86. - [[ ${ABI} == x86 ]] && myconf+=( --disable-asm ) - fi - [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004 - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag mcpu) $(get-flag march) $(get-flag mtune) ; do - [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) - break - done - - # Mandatory configuration - myconf=( - --enable-avfilter - --enable-avresample - --disable-stripping - "${myconf[@]}" - ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- ) - case ${CHOST} in - *freebsd*) - myconf+=( --target-os=freebsd ) - ;; - mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --mandir="${EPREFIX}/usr/share/man" \ - --enable-shared \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --optflags=" " \ - $(use_enable static-libs static) \ - "${myconf[@]}" - echo "${@}" - "${@}" || die -} - -multilib_src_compile() { - emake V=1 - - if multilib_is_native_abi; then - for i in "${FFTOOLS[@]}" ; do - if use fftools_${i} ; then - emake V=1 tools/${i} - fi - done - fi -} - -multilib_src_install() { - emake V=1 DESTDIR="${D}" install install-man - - if multilib_is_native_abi; then - for i in "${FFTOOLS[@]}" ; do - if use fftools_${i} ; then - dobin tools/${i} - fi - done - fi -} - -multilib_src_install_all() { - dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges - [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use doc && dohtml -r doc/* - if use examples ; then - dodoc -r doc/examples - docompress -x /usr/share/doc/${PF}/examples - fi -} - -multilib_src_test() { - LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \ - emake V=1 fate -} diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 7844b8ffe537..5f63b0cebb5a 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -79,8 +79,9 @@ FFMPEG_FLAG_MAP=( schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx zvbi:libzvbi # libavfilter options - bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa - libass truetype:libfreetype rubberband:librubberband + bs2b:libbs2b chromaprint flite:libflite frei0r fribidi:libfribidi + fontconfig ladspa libass truetype:libfreetype rubberband:librubberband + zimg:libzimg # libswresample options libsoxr # Threads; we only support pthread for now but ffmpeg supports more @@ -90,9 +91,9 @@ FFMPEG_FLAG_MAP=( # Same as above but for encoders, i.e. they do something only with USE=encode. FFMPEG_ENCODER_FLAG_MAP=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame - aacplus:libaacplus faac:libfaac nvenc:nvenc openh264:libopenh264 - snappy:libsnappy theora:libtheora twolame:libtwolame wavpack:libwavpack - webp:libwebp x264:libx264 x265:libx265 xvid:libxvid + aacplus:libaacplus faac:libfaac kvazaar:libkvazaar nvenc:nvenc + openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame + wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid ) IUSE=" @@ -106,7 +107,7 @@ IUSE=" ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp ) MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu ) PPC_CPU_FEATURES=( altivec ) -X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) +X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) X86_CPU_REQUIRED_USE=" cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) @@ -114,6 +115,7 @@ X86_CPU_REQUIRED_USE=" cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) @@ -159,11 +161,13 @@ RDEPEND=" bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) + chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) + kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] ) mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) nvenc? ( >=media-video/nvenc-5 ) openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] ) @@ -236,6 +240,7 @@ RDEPEND=" >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] ) xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) + zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) !media-video/qt-faststart @@ -315,7 +320,7 @@ multilib_src_configure() { if use aac || use amrenc ; then myconf+=( --enable-version3 ) fi - if use aacplus || use faac ; then + if use aacplus || use faac || use nvenc ; then myconf+=( --enable-nonfree ) fi else diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index d9a078ddb6c6..53adfacfd2d3 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -17,6 +17,7 @@ <flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural filter.</flag> <flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag> <flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></flag> + <flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg>.</flag> <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag> <flag name="faac">Use external faac library for AAC encoding</flag> <flag name="fdk">Use external fdk-aac library for AAC encoding</flag> @@ -27,6 +28,7 @@ <flag name="gpl">Build GPL code. Should be enabled unless you require LGPL binaries.</flag> <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag> <flag name="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag> + <flag name="kvazaar">Enables <pkg>media-libs/kvazaar</pkg> based HEVC encoder.</flag> <flag name="librtmp">Enables Real Time Messaging Protocol using librtmp (<pkg>media-video/rtmpdump</pkg>) in addition to FFmpeg's native implementation.</flag> <flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag> <flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag> @@ -49,6 +51,7 @@ <flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag> <flag name="webp">Enables WebP encoding with <pkg>media-libs/libwebp</pkg>.</flag> <flag name="x265">Enables HEVC encoding with <pkg>media-libs/x265</pkg>.</flag> + <flag name="zimg">Enables <pkg>media-libs/zimg</pkg> based scale filter.</flag> <flag name="zvbi">Enables <pkg>media-libs/zvbi</pkg> based teletext decoder.</flag> </use> </pkgmetadata> diff --git a/media-video/harvid/files/ffmpeg29.patch b/media-video/harvid/files/ffmpeg29.patch new file mode 100644 index 000000000000..09fe15abca27 --- /dev/null +++ b/media-video/harvid/files/ffmpeg29.patch @@ -0,0 +1,301 @@ +Index: harvid-0.8.0/libharvid/decoder_ctrl.c +=================================================================== +--- harvid-0.8.0.orig/libharvid/decoder_ctrl.c ++++ harvid-0.8.0/libharvid/decoder_ctrl.c +@@ -29,7 +29,7 @@ + #include "ffcompat.h" + #include "dlog.h" + +-#define DEFAULT_PIX_FMT (PIX_FMT_RGB24) // TODO global default ++#define DEFAULT_PIX_FMT (AV_PIX_FMT_RGB24) // TODO global default + + //#define HASH_EMIT_KEYS 3 + #define HASH_FUNCTION HASH_SAX +@@ -104,15 +104,15 @@ static inline int my_open_movie(void **v + } + ff_create(vd); + assert ( +- render_fmt == PIX_FMT_YUV420P +- || render_fmt == PIX_FMT_YUV440P +- || render_fmt == PIX_FMT_YUYV422 +- || render_fmt == PIX_FMT_UYVY422 +- || render_fmt == PIX_FMT_RGB24 +- || render_fmt == PIX_FMT_BGR24 +- || render_fmt == PIX_FMT_RGBA +- || render_fmt == PIX_FMT_ARGB +- || render_fmt == PIX_FMT_BGRA ++ render_fmt == AV_PIX_FMT_YUV420P ++ || render_fmt == AV_PIX_FMT_YUV440P ++ || render_fmt == AV_PIX_FMT_YUYV422 ++ || render_fmt == AV_PIX_FMT_UYVY422 ++ || render_fmt == AV_PIX_FMT_RGB24 ++ || render_fmt == AV_PIX_FMT_BGR24 ++ || render_fmt == AV_PIX_FMT_RGBA ++ || render_fmt == AV_PIX_FMT_ARGB ++ || render_fmt == AV_PIX_FMT_BGRA + ); + + if (!ff_open_movie (*vd, fn, render_fmt)) { +@@ -144,7 +144,7 @@ static inline void my_get_info_canonical + static JVOBJECT *newjvo (JVOBJECT *jvo, pthread_mutex_t *appendlock) { + debugmsg(DEBUG_DCTL, "DCTL: newjvo() allocated new decoder object\n"); + JVOBJECT *n = calloc(1, sizeof(JVOBJECT)); +- n->fmt = PIX_FMT_NONE; ++ n->fmt = AV_PIX_FMT_NONE; + n->frame = -1; + pthread_mutex_init(&n->lock, NULL); + JVOBJECT *cptr = jvo; +@@ -175,8 +175,8 @@ static JVOBJECT *testjvd(JVOBJECT *jvo, + if (!(cptr->flags&VOF_VALID) || cptr->id != id) { + continue; + } +- if (fmt != PIX_FMT_NONE && cptr->fmt != fmt +- && cptr->fmt != PIX_FMT_NONE ++ if (fmt != AV_PIX_FMT_NONE && cptr->fmt != fmt ++ && cptr->fmt != AV_PIX_FMT_NONE + ) { + continue; + } +@@ -324,7 +324,7 @@ static int clearjvo(JVD *jvd, int f, int + my_destroy(&cptr->decoder); + cptr->decoder = NULL; + cptr->flags &= ~VOF_OPEN; +- cptr->fmt = PIX_FMT_NONE; ++ cptr->fmt = AV_PIX_FMT_NONE; + } + + hashref_delete_jvo(jvd, cptr); +@@ -410,7 +410,7 @@ static JVOBJECT *getjvo(JVD *jvd) { + if (cptr->flags&(VOF_OPEN)) { + my_destroy(&cptr->decoder); // close it. + cptr->decoder = NULL; // not really need.. +- cptr->fmt = PIX_FMT_NONE; ++ cptr->fmt = AV_PIX_FMT_NONE; + } + + hashref_delete_jvo(jvd, cptr); +@@ -563,7 +563,7 @@ static JVOBJECT *new_video_object(JVD *j + + + jvo->id = id; +- jvo->fmt = fmt == PIX_FMT_NONE ? DEFAULT_PIX_FMT : fmt; ++ jvo->fmt = fmt == AV_PIX_FMT_NONE ? DEFAULT_PIX_FMT : fmt; + jvo->frame = -1; + jvo->flags |= VOF_VALID; + +@@ -619,7 +619,7 @@ static void * dctrl_get_decoder(void *p, + * use it IFF frame == -1 (ie. non-blocking info lookups) */ + if (frame < 0) { + pthread_rwlock_rdlock(&jvd->lock_jdh); +- if (fmt == PIX_FMT_NONE) { ++ if (fmt == AV_PIX_FMT_NONE) { + HASH_FIND(hhi, jvd->jvi, &id, sizeof(unsigned short), jvo); + } else { + const JVOBJECT jvt = {id, fmt, 0}; +@@ -670,7 +670,7 @@ static void * dctrl_get_decoder(void *p, + jvo->lru = time(NULL); + pthread_mutex_unlock(&jvo->lock); + +- if (fmt == PIX_FMT_NONE) fmt = DEFAULT_PIX_FMT; ++ if (fmt == AV_PIX_FMT_NONE) fmt = DEFAULT_PIX_FMT; + + if (!my_open_movie(&jvo->decoder, get_fn(jvd, jvo->id), fmt)) { + pthread_mutex_lock(&jvo->lock); +@@ -798,7 +798,7 @@ int dctrl_decode(void *p, unsigned short + + int dctrl_get_info(void *p, unsigned short id, VInfo *i) { + int err = 0; +- JVOBJECT *jvo = (JVOBJECT*) dctrl_get_decoder(p, id, PIX_FMT_NONE, -1, &err); ++ JVOBJECT *jvo = (JVOBJECT*) dctrl_get_decoder(p, id, AV_PIX_FMT_NONE, -1, &err); + if (!jvo) return err; + my_get_info(jvo->decoder, i); + jvo->hitcount_info++; +Index: harvid-0.8.0/libharvid/ffdecoder.c +=================================================================== +--- harvid-0.8.0.orig/libharvid/ffdecoder.c ++++ harvid-0.8.0/libharvid/ffdecoder.c +@@ -102,7 +102,7 @@ static int ff_getbuffersize(void *ptr, s + + static void render_empty_frame(ffst *ff, uint8_t* buf, int w, int h, int xoff, int ys) { + switch (ff->render_fmt) { +- case PIX_FMT_UYVY422: ++ case AV_PIX_FMT_UYVY422: + { + int i; + for (i = 0; i < w*h*2; i += 2) { +@@ -110,7 +110,7 @@ static void render_empty_frame(ffst *ff, + } + } + break; +- case PIX_FMT_YUYV422: ++ case AV_PIX_FMT_YUYV422: + { + int i; + for (i = 0; i < w*h*2; i += 2) { +@@ -118,25 +118,25 @@ static void render_empty_frame(ffst *ff, + } + } + break; +- case PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUV420P: + { + size_t Ylen = w * h; + memset(buf, 0, Ylen); + memset(buf+Ylen, 0x80, Ylen/2); + } + break; +- case PIX_FMT_YUV440P: ++ case AV_PIX_FMT_YUV440P: + { + size_t Ylen = w * h; + memset(buf, 0, Ylen); + memset(buf+Ylen, 0x80, Ylen); + } + break; +- case PIX_FMT_BGR24: +- case PIX_FMT_RGB24: +- case PIX_FMT_RGBA: +- case PIX_FMT_BGRA: +- case PIX_FMT_ARGB: ++ case AV_PIX_FMT_BGR24: ++ case AV_PIX_FMT_RGB24: ++ case AV_PIX_FMT_RGBA: ++ case AV_PIX_FMT_BGRA: ++ case AV_PIX_FMT_ARGB: + memset(buf, 0, ff_getbuffersize(ff, NULL)); + break; + default: +@@ -147,8 +147,8 @@ static void render_empty_frame(ffst *ff, + #if 1 // draw cross + int x,y; + switch (ff->render_fmt) { +- case PIX_FMT_YUV420P: +- case PIX_FMT_YUV440P: ++ case AV_PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUV440P: + for (x = 0, y = 0; x < w-1; x++, y = h * x / w) { + int off = (x + w * y); + buf[off]=127; buf[off+1]=127; +@@ -156,8 +156,8 @@ static void render_empty_frame(ffst *ff, + buf[off]=127; buf[off+1]=127; + } + break; +- case PIX_FMT_YUYV422: +- case PIX_FMT_UYVY422: ++ case AV_PIX_FMT_YUYV422: ++ case AV_PIX_FMT_UYVY422: + for (x = 0, y = 0; x < w-1; x++, y = h * x / w) { + int off = (x + w * y) * 2; + buf[off] = 127; buf[off+1] = 127; +@@ -165,8 +165,8 @@ static void render_empty_frame(ffst *ff, + buf[off] = 127; buf[off+1] = 127; + } + break; +- case PIX_FMT_RGB24: +- case PIX_FMT_BGR24: ++ case AV_PIX_FMT_RGB24: ++ case AV_PIX_FMT_BGR24: + for (x = 0, y = 0; x < w-1; x++, y = h * x / w) { + int off = 3 * (x + w * y); + buf[off]=255; buf[off+1]=255; buf[off+2]=255; +@@ -174,11 +174,11 @@ static void render_empty_frame(ffst *ff, + buf[off]=255; buf[off+1]=255; buf[off+2]=255; + } + break; +- case PIX_FMT_RGBA: +- case PIX_FMT_BGRA: +- case PIX_FMT_ARGB: ++ case AV_PIX_FMT_RGBA: ++ case AV_PIX_FMT_BGRA: ++ case AV_PIX_FMT_ARGB: + { +- const int O = (ff->render_fmt == PIX_FMT_ARGB) ? 1 : 0; ++ const int O = (ff->render_fmt == AV_PIX_FMT_ARGB) ? 1 : 0; + for (x = 0, y = 0; x < w-1; x++, y = h * x / w) { + int off = 4 * (x + w * y) + O; + buf[off]=255; buf[off+1]=255; buf[off+2]=255; +@@ -749,7 +749,7 @@ void ff_get_info_canonical(void *ptr, VI + + void ff_create(void **ff) { + (*((ffst**)ff)) = (ffst*) calloc(1, sizeof(ffst)); +- (*((ffst**)ff))->render_fmt = PIX_FMT_RGB24; ++ (*((ffst**)ff))->render_fmt = AV_PIX_FMT_RGB24; + (*((ffst**)ff))->want_ignstart = 0; + (*((ffst**)ff))->want_genpts = 0; + (*((ffst**)ff))->packet.data = NULL; +@@ -792,25 +792,25 @@ void ff_resize(void *ptr, int w, int h, + + const char * ff_fmt_to_text(int fmt) { + switch (fmt) { +- case PIX_FMT_NONE: ++ case AV_PIX_FMT_NONE: + return "-"; +- case PIX_FMT_BGR24: ++ case AV_PIX_FMT_BGR24: + return "BGR24"; +- case PIX_FMT_RGB24: ++ case AV_PIX_FMT_RGB24: + return "RGB24"; +- case PIX_FMT_RGBA: ++ case AV_PIX_FMT_RGBA: + return "RGBA"; +- case PIX_FMT_BGRA: ++ case AV_PIX_FMT_BGRA: + return "BGRA"; +- case PIX_FMT_ARGB: ++ case AV_PIX_FMT_ARGB: + return "ARGB"; +- case PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUV420P: + return "YUV420P"; +- case PIX_FMT_YUYV422: ++ case AV_PIX_FMT_YUYV422: + return "YUYV422"; +- case PIX_FMT_UYVY422: ++ case AV_PIX_FMT_UYVY422: + return "UYVY422"; +- case PIX_FMT_YUV440P: ++ case AV_PIX_FMT_YUV440P: + return "YUV440P"; + default: + return "?"; +Index: harvid-0.8.0/src/ics_handler.c +=================================================================== +--- harvid-0.8.0.orig/src/ics_handler.c ++++ harvid-0.8.0/src/ics_handler.c +@@ -109,16 +109,16 @@ void parse_param(struct queryparserstate + else if (!strncmp(val, "jpeg",4)) {qps->a->render_fmt = FMT_JPG; qps->a->misc_int = atoi(&val[4]);} + else if (!strcmp(val, "png")) qps->a->render_fmt = FMT_PNG; + else if (!strcmp(val, "ppm")) qps->a->render_fmt = FMT_PPM; +- else if (!strcmp(val, "yuv")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUV420P;} +- else if (!strcmp(val, "yuv420")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUV420P;} +- else if (!strcmp(val, "yuv440")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUV440P;} +- else if (!strcmp(val, "yuv422")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUYV422;} +- else if (!strcmp(val, "uyv422")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_UYVY422;} +- else if (!strcmp(val, "rgb")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_RGB24;} +- else if (!strcmp(val, "bgr")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_BGR24;} +- else if (!strcmp(val, "rgba")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_RGBA;} +- else if (!strcmp(val, "argb")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_ARGB;} +- else if (!strcmp(val, "bgra")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_BGRA;} ++ else if (!strcmp(val, "yuv")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUV420P;} ++ else if (!strcmp(val, "yuv420")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUV420P;} ++ else if (!strcmp(val, "yuv440")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUV440P;} ++ else if (!strcmp(val, "yuv422")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUYV422;} ++ else if (!strcmp(val, "uyv422")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_UYVY422;} ++ else if (!strcmp(val, "rgb")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_RGB24;} ++ else if (!strcmp(val, "bgr")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_BGR24;} ++ else if (!strcmp(val, "rgba")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_RGBA;} ++ else if (!strcmp(val, "argb")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_ARGB;} ++ else if (!strcmp(val, "bgra")) {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_BGRA;} + /* info, version, rc,... format */ + else if (!strcmp(val, "html")) qps->a->render_fmt = OUT_HTML; + else if (!strcmp(val, "xhtml")) qps->a->render_fmt = OUT_HTML; +@@ -141,7 +141,7 @@ static void parse_http_query_params(stru + static int parse_http_query(CONN *c, char *query, httpheader *h, ics_request_args *a) { + struct queryparserstate qps = {a, NULL, 0}; + +- a->decode_fmt = PIX_FMT_RGB24; ++ a->decode_fmt = AV_PIX_FMT_RGB24; + a->render_fmt = FMT_PNG; + a->frame = 0; + a->misc_int = 0; diff --git a/media-video/harvid/harvid-0.8.0.ebuild b/media-video/harvid/harvid-0.8.0.ebuild index 5c2db6056594..cb77af216155 100644 --- a/media-video/harvid/harvid-0.8.0.ebuild +++ b/media-video/harvid/harvid-0.8.0.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit toolchain-funcs multilib +inherit toolchain-funcs multilib eutils DESCRIPTION="HTTP Ardour Video Daemon" HOMEPAGE="http://x42.github.io/harvid/" @@ -16,8 +16,8 @@ KEYWORDS="~amd64" IUSE="libav" RDEPEND=" - !libav? ( media-video/ffmpeg:= ) - libav? ( media-video/libav:= ) + !libav? ( >=media-video/ffmpeg-2.6:0= ) + libav? ( >=media-video/libav-9:0= ) media-libs/libpng:0= virtual/jpeg:0 " @@ -25,6 +25,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +src_prepare() { + epatch "${FILESDIR}/ffmpeg29.patch" +} + hv_make() { emake \ CC="$(tc-getCC)" \ diff --git a/media-video/nvenc/nvenc-5.0.1.ebuild b/media-video/nvenc/nvenc-5.0.1-r1.ebuild index 22d16cb8d927..27357de4c3f5 100644 --- a/media-video/nvenc/nvenc-5.0.1.ebuild +++ b/media-video/nvenc/nvenc-5.0.1-r1.ebuild @@ -17,7 +17,8 @@ SLOT="0" KEYWORDS="~amd64" IUSE="+tools samples" -RDEPEND=">=dev-util/nvidia-cuda-toolkit-6.5" +RDEPEND=">=x11-drivers/nvidia-drivers-347.09 + tools? ( >=dev-util/nvidia-cuda-toolkit-6.5 )" DEPEND="${RDEPEND} app-arch/unzip" diff --git a/media-video/smplayer/smplayer-14.9.0.6994.ebuild b/media-video/smplayer/smplayer-14.9.0.6994.ebuild index 966f0c70e2f1..c1c070018d5a 100644 --- a/media-video/smplayer/smplayer-14.9.0.6994.ebuild +++ b/media-video/smplayer/smplayer-14.9.0.6994.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux" IUSE="autoshutdown bidi debug mpris +qt4 qt5 streaming" REQUIRED_USE="^^ ( qt4 qt5 )" diff --git a/media-video/smplayer/smplayer-15.9.0.ebuild b/media-video/smplayer/smplayer-15.9.0.ebuild index ea8286e66a06..2e60a50c092a 100644 --- a/media-video/smplayer/smplayer-15.9.0.ebuild +++ b/media-video/smplayer/smplayer-15.9.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux" IUSE="autoshutdown bidi debug mpris +qt4 qt5 streaming" REQUIRED_USE="^^ ( qt4 qt5 )" diff --git a/media-video/videotrans/files/videotrans-1.6.1-libav.patch b/media-video/videotrans/files/videotrans-1.6.1-libav.patch new file mode 100644 index 000000000000..2b4cd0a15b8e --- /dev/null +++ b/media-video/videotrans/files/videotrans-1.6.1-libav.patch @@ -0,0 +1,52 @@ +Description: Migrate from ffmpeg to avconv. +Author: Alessio Treglia <alessio@debian.org> +--- + data/library.sh.in | 8 ++++---- + src/movie-title.in | 2 +- + src/movie-to-dvd.in | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +--- videotrans.orig/data/library.sh.in ++++ videotrans/data/library.sh.in +@@ -250,15 +250,15 @@ audio_params() + then + if [ "${force_or_auto}" = "ac3" ] + then +- msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using ffmpeg. " ++ msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using avconv. " + if [ "${audio_bitrate_override}" != "auto" -a "${audio_bitrate_override}" != "" ] + then +- audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`" ++ audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`" + elif [ "${new_ch}" = "2" ] + then +- audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`" ++ audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`" + else +- audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`" ++ audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`" + fi + audio_ext="ac3" + else +--- videotrans.orig/src/movie-title.in ++++ videotrans/src/movie-title.in +@@ -961,7 +961,7 @@ else + \> "${TEMP}.mplayer" 2\>\&1 \< /dev/null \& + mplayer_pid="$!" + +- # Start mp2enc or ffmpeg to encode the audio ++ # Start mp2enc or avconv to encode the audio + + { + < "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode} +--- videotrans.orig/src/movie-to-dvd.in ++++ videotrans/src/movie-to-dvd.in +@@ -698,7 +698,7 @@ do + } > "${TEMP}.video" 2>&1 & + video_enc_pid="$!" + +- # Start mp2enc or ffmpeg to encode the audio ++ # Start mp2enc or avconv to encode the audio + + { + < "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode} diff --git a/media-video/videotrans/videotrans-1.6.1-r1.ebuild b/media-video/videotrans/videotrans-1.6.1-r1.ebuild new file mode 100644 index 000000000000..7ed341220bf1 --- /dev/null +++ b/media-video/videotrans/videotrans-1.6.1-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils + +DESCRIPTION="A package to convert movies to DVD format and to build DVDs with" +HOMEPAGE="http://videotrans.sourceforge.net/" +SRC_URI="mirror://sourceforge/videotrans/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" + +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="libav" + +DEPEND=" + media-video/mplayer + media-video/mjpegtools[png] + media-video/dvdauthor + || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) + libav? ( media-video/libav ) + !libav? ( media-video/ffmpeg:0 ) +" + +RDEPEND="${DEPEND} + www-client/lynx + app-shells/bash + sys-devel/bc +" + +DOCS="aspects.txt CHANGES THANKS TODO" + +src_prepare() { + # fixing LDFLAGS usage + sed -i -e 's|^\(LDFLAGS.*=\).*\( @LIBS@.*\)|\1\2 @LDFLAGS@|' src/Makefile.in + + # Debian patch to support libav + use libav && epatch "${FILESDIR}"/${P}-libav.patch +} diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index e8674edf718c..d7f6c6abb083 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,3 +1,2 @@ DIST vlc-2.1.5.tar.xz 19574208 SHA256 6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 SHA512 37c6b82b4e89f4a14ed391cc677d9325a032e04bcc51a3e0d7d2ccf9e17a7a0deb90d9129e9dc3baf05a1ea9dae9c05e3177ab17a31098aafa6a2cb23388fa32 WHIRLPOOL c13098f922c7b24f3c718e88807a7dcb656af21bcf2be63d2ec7401583680658bd371e3935ba22537857861e0b1b0c4f0e693c87ed20999c679b4a04cddf7008 -DIST vlc-2.2.0.tar.xz 20861760 SHA256 5e0a27e248c47da723a696420aca3a4dd15cc3ed8cc81618d3f1dc8661b25517 SHA512 41162ff2dcc35edb47721c5a0f5d1346a0bcf3099c641e317ca1ce50baadeec3eef38f10355396a82e029474f6decd1e4355bbf218cadb795ccad3ff81a585bb WHIRLPOOL 83777143ef84177fffb1e034e47012bfe4ac2355883f64d3932dcf0c3edf237d858016523a886d00934da441ae2e7b635dc4111b0fb368083d4b71c43d00f695 DIST vlc-2.2.1.tar.xz 20940288 SHA256 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb SHA512 91cd33ac61ebe376c24b3cc0d1dc52d7765fdccbd17e75abbbbf38f52b400e0269dc48f34ed558bff7ec1dd52c4f27098012709a3eb9fe7e8aad1069516de5de WHIRLPOOL 5c889fc5c0137f022b0b3408a5252668a1a946ed45677bb97bbbf0ec14c9411c24e8d1587e987391596774aaf7f1e4592c55b0c0f76742e84296bbfffb08e885 diff --git a/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch b/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch new file mode 100644 index 000000000000..83a52582a990 --- /dev/null +++ b/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch @@ -0,0 +1,15 @@ +https://git.videolan.org/?p=vlc/vlc-2.2.git;a=commitdiff;h=ce91452460a75d7424b165c4dc8db98114c3cbd9;hp=9e12195d3e4316278af1fa4bcb6a705ff27456fd +--- a/modules/demux/mp4/libmp4.c ++++ b/modules/demux/mp4/libmp4.c +@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box ) + { + for( i_index = 0; ; i_index++ ) + { ++ if ( MP4_Box_Function[i_index].i_parent && ++ p_box->p_father && ++ p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent ) ++ continue; ++ + if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )|| + ( MP4_Box_Function[i_index].i_type == 0 ) ) + { diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml index e0c31998c33a..a9878a37fadd 100644 --- a/media-video/vlc/metadata.xml +++ b/media-video/vlc/metadata.xml @@ -45,6 +45,7 @@ <flag name="macosx-vout">Enables Mac OS X video output module.</flag> <flag name="matroska">Enables matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag> <flag name="media-library">Build the (sqlite based) media library.</flag> + <flag name="mpeg">Add libmpeg2 support for mpeg-1 and mpeg-2 video streams</flag> <flag name="omxil">Enables OpenMAX Integration Layer codec module.</flag> <flag name="optimisememory">Enable optimisation for memory rather than performance.</flag> <flag name="opencv">Enabled OpenCV (computer vision) filter module.</flag> diff --git a/media-video/vlc/vlc-2.2.0.ebuild b/media-video/vlc/vlc-2.2.0.ebuild deleted file mode 100644 index 3629d6f79313..000000000000 --- a/media-video/vlc/vlc-2.2.0.ebuild +++ /dev/null @@ -1,495 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -SCM="" -if [ "${PV%9999}" != "${PV}" ] ; then - SCM="git-r3" - - if [ "${PV%.9999}" != "${PV}" ] ; then - EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git" - else - EGIT_REPO_URI="git://git.videolan.org/vlc.git" - fi -fi - -inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM} - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-beta/-test}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="VLC media player - Video player and streamer" -HOMEPAGE="http://www.videolan.org/vlc/" -if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild - SRC_URI="" -elif [[ "${MY_P}" == "${P}" ]]; then - SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" -else - SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" -fi - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5-8" # vlc - vlccore - -if [ "${PV%9999}" = "${PV}" ] ; then - KEYWORDS="~amd64 ~arm -sparc ~x86 ~x86-fbsd" -else - KEYWORDS="" -fi - -IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec - +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug - directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk - fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls - growl httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify - +libsamplerate libtiger linsys libtar lirc live lua - macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit - matroska media-library cpu_flags_x86_mmx modplug mp3 mpeg - mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus - png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba - schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale - taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau - vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi" - -RDEPEND=" - !<media-video/ffmpeg-1.2:0 - dev-libs/libgpg-error:0 - net-dns/libidn:0 - >=sys-libs/zlib-1.2.5.1-r2:0[minizip] - virtual/libintl:0 - a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) - aalib? ( media-libs/aalib:0 ) - alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) - avahi? ( >=net-dns/avahi-0.6:0[dbus] ) - avcodec? ( - !libav? ( media-video/ffmpeg:0= ) - libav? ( >=media-video/libav-11:0= ) - ) - avformat? ( - !libav? ( media-video/ffmpeg:0= ) - libav? ( media-video/libav:0= ) - ) - bidi? ( >=dev-libs/fribidi-0.10.4:0 ) - bluray? ( >=media-libs/libbluray-0.3:0 ) - cddb? ( >=media-libs/libcddb-1.2:0 ) - chromaprint? ( >=media-libs/chromaprint-0.6:0 ) - dbus? ( >=sys-apps/dbus-1.6:0 ) - dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) - directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 ) - dts? ( >=media-libs/libdca-0.0.5:0 ) - dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 ) - dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) - elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) - faad? ( >=media-libs/faad2-2.6.1:0 ) - fdk? ( media-libs/fdk-aac:0 ) - flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) - fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) - fontconfig? ( media-libs/fontconfig:1.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) - gme? ( media-libs/game-music-emu:0 ) - gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) - gnutls? ( >=net-libs/gnutls-3.0.20:0 ) - ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) - jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 ) - jpeg? ( virtual/jpeg:0 ) - kate? ( >=media-libs/libkate-0.3:0 ) - libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 ) - libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) - libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) - libsamplerate? ( media-libs/libsamplerate:0 ) - libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) - libtiger? ( >=media-libs/libtiger-0.3.1:0 ) - linsys? ( >=media-libs/zvbi-0.2.28:0 ) - lirc? ( app-misc/lirc:0 ) - live? ( >=media-plugins/live-2011.12.23:0 ) - lua? ( >=dev-lang/lua-5.1:0 ) - matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) - modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) - mp3? ( media-libs/libmad:0 ) - mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) - mtp? ( >=media-libs/libmtp-1:0 ) - musepack? ( >=media-sound/musepack-tools-444:0 ) - ncurses? ( sys-libs/ncurses:0=[unicode] ) - ogg? ( >=media-libs/libogg-1:0 ) - opencv? ( >media-libs/opencv-2:0 ) - opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) - opus? ( >=media-libs/opus-1.0.3:0 ) - png? ( media-libs/libpng:0= sys-libs/zlib:0 ) - postproc? ( - !libav? ( >=media-video/ffmpeg-2.2:0= ) - libav? ( media-libs/libpostproc:0= ) - ) - projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) - pulseaudio? ( >=media-sound/pulseaudio-1:0 ) - qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 ) - qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5 >=dev-qt/qtx11extras-5.1:5 ) - rdp? ( >=net-misc/freerdp-1.0.1:0= ) - samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) ) - schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) - sdl? ( >=media-libs/libsdl-1.2.10:0 - sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) ) - sftp? ( net-libs/libssh2:0 ) - shout? ( >=media-libs/libshout-2.1:0 ) - sid? ( media-libs/libsidplay:2 ) - skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) - speex? ( media-libs/speex:0 ) - svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) - swscale? ( - !libav? ( media-video/ffmpeg:0= ) - libav? ( media-video/libav:0= ) - ) - taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) - theora? ( >=media-libs/libtheora-1.0_beta3:0 ) - tremor? ( media-libs/tremor:0 ) - truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 - !fontconfig? ( media-fonts/dejavu:0 ) ) - twolame? ( media-sound/twolame:0 ) - udev? ( >=virtual/udev-142:0 ) - upnp? ( net-libs/libupnp:0 ) - v4l? ( media-libs/libv4l:0 ) - vaapi? ( - x11-libs/libva:0[X,drm] - !libav? ( media-video/ffmpeg:0=[vaapi] ) - libav? ( media-video/libav:0=[vaapi] ) - ) - vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )" - -# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works; -# thus we'll have to wait for a new release there. -RDEPEND="${RDEPEND} - vdpau? ( - >=x11-libs/libvdpau-0.6:0 - !libav? ( >=media-video/ffmpeg-2.2:0= ) - libav? ( >=media-video/libav-10:0= ) - ) - vnc? ( >=net-libs/libvncserver-0.9.9:0 ) - vorbis? ( >=media-libs/libvorbis-1.1:0 ) - vpx? ( media-libs/libvpx:0 ) - X? ( x11-libs/libX11:0 ) - x264? ( >=media-libs/x264-0.0.20090923:0= ) - x265? ( media-libs/x265:0= ) - xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 ) - xml? ( >=dev-libs/libxml2-2.5:2 ) - zvbi? ( >=media-libs/zvbi-0.2.25:0 ) -" - -DEPEND="${RDEPEND} - kde? ( >=kde-base/kdelibs-4:4 ) - xcb? ( x11-proto/xproto:0 ) - app-arch/xz-utils:0 - x86? ( dev-lang/yasm:* ) - amd64? ( dev-lang/yasm:* ) - >=sys-devel/gettext-0.18.3:* - virtual/pkgconfig:* -" - -REQUIRED_USE=" - aalib? ( X ) - bidi? ( truetype ) - cddb? ( cdda ) - dvb? ( dvbpsi ) - dxva2? ( avcodec ) - ffmpeg? ( avcodec avformat swscale ) - fontconfig? ( truetype ) - gnutls? ( gcrypt ) - httpd? ( lua ) - libcaca? ( X ) - libtar? ( skins ) - libtiger? ( kate ) - qt4? ( X !qt5 ) - qt5? ( X !qt4 ) - sdl? ( X ) - skins? ( truetype X ^^ ( qt4 qt5 ) ) - vaapi? ( avcodec X ) - vlm? ( encode ) - xv? ( xcb ) -" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then - if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then - die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754." - fi - fi -} - -src_unpack() { - if [ "${PV%9999}" != "${PV}" ] ; then - git-r3_src_unpack - else - unpack ${A} - fi -} - -src_prepare() { - # Remove unnecessary warnings about unimplemented pragmas on gcc for now. - # Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc. - # - # config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas] - # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas] - # - # https://gcc.gnu.org/c99status.html - if [[ "$(tc-getCC)" == *"gcc"* ]] ; then - sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die - fi - - # Bootstrap when we are on a git checkout. - if [[ "${PV%9999}" != "${PV}" ]] ; then - ./bootstrap - fi - - # Make it build with libtool 1.5 - rm -f m4/lt* m4/libtool.m4 || die - - # We are not in a real git checkout due to the absence of a .git directory. - touch src/revision.txt || die - - # Fix build system mistake. - epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch - - # Patch up incompatibilities and reconfigure autotools. - epatch "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch - - # Fix up broken audio when skipping using a fixed reversed bisected commit. - epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch - - # Bug #541928 - epatch "${FILESDIR}"/${P}-fix-xcb.patch - - # Bug #541678 - epatch "${FILESDIR}"/qt4-select.patch - - # Don't use --started-from-file when not using dbus. - if ! use dbus ; then - sed -i 's/ --started-from-file//' share/vlc.desktop.in || die - fi - - epatch_user - - eautoreconf - - # Disable automatic running of tests. - find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die - - # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used. - # Setting QT_SELECT environment variable will enforce correct binaries. - if use qt4; then - export QT_SELECT=qt4 - elif use qt5; then - export QT_SELECT=qt5 - fi -} - -src_configure() { - # Compatibility fix for Samba 4. - use samba && append-cppflags "-I/usr/include/samba-4.0" - - # We need to disable -fstack-check if use >=gcc 4.8.0. - # See bug #499996 - use x86 && append-cflags $(test-flags-CC -fno-stack-check) - - # Needs libresid-builder from libsidplay:2 which is in another directory... - # FIXME! - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" - - if use truetype || use projectm ; then - local dejavu="/usr/share/fonts/dejavu/" - myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \ - --with-default-font-family=Sans \ - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf - --with-default-monospace-font-family=Monospace" - fi - - local qt_flag="" - if use qt4 ; then - qt_flag="--enable-qt=4" - elif use qt5 ; then - qt_flag="--enable-qt=5" - else - qt_flag="--disable-qt" - fi - - econf \ - ${myconf} \ - --enable-vlc \ - --docdir=/usr/share/doc/${PF} \ - --disable-dependency-tracking \ - --disable-optimizations \ - --disable-update-check \ - --enable-fast-install \ - --enable-screen \ - $(use_enable a52) \ - $(use_enable aalib aa) \ - $(use_enable alsa) \ - $(use_enable altivec) \ - $(use_enable atmo) \ - $(use_enable audioqueue) \ - $(use_enable avahi bonjour) \ - $(use_enable avcodec) \ - $(use_enable avformat) \ - $(use_enable bidi fribidi) \ - $(use_enable bluray) \ - $(use_enable cdda vcd) \ - $(use_enable cddb libcddb) \ - $(use_enable chromaprint) \ - $(use_enable dbus) \ - $(use_enable directfb) \ - $(use_enable directx) \ - $(use_enable dc1394) \ - $(use_enable debug) \ - $(use_enable dts dca) \ - $(use_enable dvbpsi) \ - $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ - $(use_enable dxva2) \ - $(use_enable encode sout) \ - $(use_enable faad) \ - $(use_enable fdk fdkaac) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable fontconfig) \ - $(use_enable gcrypt libgcrypt) \ - $(use_enable gme) \ - $(use_enable gnome gnomevfs) \ - $(use_enable gnutls) \ - $(use_enable growl) \ - $(use_enable httpd) \ - $(use_enable ieee1394 dv1394) \ - $(use_enable jack) \ - $(use_enable jpeg) \ - $(use_enable kate) \ - $(use_with kde kde-solid) \ - $(use_enable libass) \ - $(use_enable libcaca caca) \ - $(use_enable libnotify notify) \ - $(use_enable libsamplerate samplerate) \ - $(use_enable libtar) \ - $(use_enable libtiger tiger) \ - $(use_enable linsys) \ - $(use_enable lirc) \ - $(use_enable live live555) \ - $(use_enable lua) \ - $(use_enable macosx-dialog-provider) \ - $(use_enable macosx-eyetv) \ - $(use_enable macosx-qtkit) \ - $(use_enable macosx-quartztext) \ - $(use_enable matroska mkv) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable modplug mod) \ - $(use_enable mp3 mad) \ - $(use_enable mpeg libmpeg2) \ - $(use_enable mtp) \ - $(use_enable musepack mpc) \ - $(use_enable ncurses) \ - $(use_enable neon) \ - $(use_enable ogg) $(use_enable ogg mux_ogg) \ - $(use_enable omxil) \ - $(use_enable omxil omxil-vout) \ - $(use_enable opencv) \ - $(use_enable opengl glspectrum) \ - $(use_enable opus) \ - $(use_enable optimisememory optimize-memory) \ - $(use_enable png) \ - $(use_enable postproc) \ - $(use_enable projectm) \ - $(use_enable pulseaudio pulse) \ - ${qt_flag} \ - $(use_enable rdp freerdp) \ - $(use_enable rtsp realrtsp) \ - $(use_enable run-as-root) \ - $(use_enable samba smbclient) \ - $(use_enable schroedinger) \ - $(use_enable sdl) \ - $(use_enable sdl-image) \ - $(use_enable sid) \ - $(use_enable sftp) \ - $(use_enable shout) \ - $(use_enable skins skins2) \ - $(use_enable speex) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable svg) \ - $(use_enable svg svgdec) \ - $(use_enable swscale) \ - $(use_enable taglib) \ - $(use_enable theora) \ - $(use_enable tremor) \ - $(use_enable truetype freetype) \ - $(use_enable twolame) \ - $(use_enable udev) \ - $(use_enable upnp) \ - $(use_enable v4l v4l2) \ - $(use_enable vaapi libva) \ - $(use_enable vcdx) \ - $(use_enable vdpau) \ - $(use_enable vlm) \ - $(use_enable vnc) \ - $(use_enable vorbis) \ - $(use_enable vpx) \ - $(use_enable wma-fixed) \ - $(use_with X x) \ - $(use_enable x264) \ - $(use_enable x265) \ - $(use_enable xcb) \ - $(use_enable xml libxml2) \ - $(use_enable xv xvideo) \ - $(use_enable zvbi) $(use_enable !zvbi telx) \ - --disable-asdcp \ - --disable-coverage \ - --disable-cprof \ - --disable-crystalhd \ - --disable-decklink \ - --disable-gles1 \ - --disable-gles2 \ - --disable-goom \ - --disable-kai \ - --disable-kva \ - --disable-maintainer-mode \ - --disable-merge-ffmpeg \ - --disable-mfx \ - --disable-mmal-codec \ - --disable-mmal-vout \ - --disable-opensles \ - --disable-oss \ - --disable-quicktime \ - --disable-rpi-omxil \ - --disable-shine \ - --disable-sndio \ - --disable-vda \ - --disable-vsxu \ - --disable-wasapi - - # ^ We don't have these disabled libraries in the Portage tree yet. - - # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. - # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file - sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die -} - -src_test() { - Xemake check-TESTS -} - -DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt" - -src_install() { - default - - # Punt useless libtool's .la files - find "${D}" -name '*.la' -delete -} - -pkg_postinst() { - if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then - einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" - "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/" - else - ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" - ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" - ewarn "If you do not do it, vlc will take a long time to load." - fi -} diff --git a/media-video/vlc/vlc-2.2.1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild index 73ab21a6bc6d..466b1fb59e9f 100644 --- a/media-video/vlc/vlc-2.2.1.ebuild +++ b/media-video/vlc/vlc-2.2.1-r1.ebuild @@ -125,7 +125,7 @@ RDEPEND=" pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 ) qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5 >=dev-qt/qtx11extras-5.1:5 ) - rdp? ( >=net-misc/freerdp-1.0.1:0= ) + rdp? ( >=net-misc/freerdp-1.0.1:0=[client] ) samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 @@ -203,8 +203,9 @@ REQUIRED_USE=" qt4? ( X !qt5 ) qt5? ( X !qt4 ) sdl? ( X ) - skins? ( truetype X ^^ ( qt4 qt5 ) ) + skins? ( truetype X xml ^^ ( qt4 qt5 ) ) vaapi? ( avcodec X ) + vdpau? ( xcb ) vlm? ( encode ) xv? ( xcb ) " @@ -250,6 +251,7 @@ src_prepare() { # We are not in a real git checkout due to the absence of a .git directory. touch src/revision.txt || die + # PATCHES # Fix build system mistake. epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch @@ -271,6 +273,8 @@ src_prepare() { # Add missed header imgproc_c.h, imgproc.hpp, bug #554562 epatch "${FILESDIR}"/opencv-3.0.0.patch + epatch "${FILESDIR}"//${P}-CVE-2015-5949.patch + # Don't use --started-from-file when not using dbus. if ! use dbus ; then sed -i 's/ --started-from-file//' share/vlc.desktop.in || die diff --git a/net-analyzer/2ping/2ping-1.2.3.ebuild b/net-analyzer/2ping/2ping-1.2.3.ebuild deleted file mode 100644 index ad1efe1932b9..000000000000 --- a/net-analyzer/2ping/2ping-1.2.3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -DESCRIPTION="A bi-directional ping utility" -HOMEPAGE="http://www.finnie.org/software/2ping/" -SRC_URI="http://www.finnie.org/software/2ping/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="crc ipv6 md5 sha server" - -# The 2ping script itself checks if these optional deps are available. -DEPEND=" - dev-lang/perl - virtual/perl-Getopt-Long - virtual/perl-Pod-Parser - virtual/perl-IO - virtual/perl-Time-HiRes - ipv6? ( dev-perl/IO-Socket-INET6 ) - md5? ( virtual/perl-Digest-MD5 ) - sha? ( virtual/perl-Digest-SHA ) - crc? ( dev-perl/Digest-CRC ) -" -RDEPEND="${DEPEND}" - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install - dodoc ChangeLog README - use server && { - doinitd "${FILESDIR}"/2pingd - newconfd "${FILESDIR}"/2pingd.conf 2pingd - } -} diff --git a/net-analyzer/2ping/2ping-2.0.ebuild b/net-analyzer/2ping/2ping-2.0.ebuild deleted file mode 100644 index ad1efe1932b9..000000000000 --- a/net-analyzer/2ping/2ping-2.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -DESCRIPTION="A bi-directional ping utility" -HOMEPAGE="http://www.finnie.org/software/2ping/" -SRC_URI="http://www.finnie.org/software/2ping/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="crc ipv6 md5 sha server" - -# The 2ping script itself checks if these optional deps are available. -DEPEND=" - dev-lang/perl - virtual/perl-Getopt-Long - virtual/perl-Pod-Parser - virtual/perl-IO - virtual/perl-Time-HiRes - ipv6? ( dev-perl/IO-Socket-INET6 ) - md5? ( virtual/perl-Digest-MD5 ) - sha? ( virtual/perl-Digest-SHA ) - crc? ( dev-perl/Digest-CRC ) -" -RDEPEND="${DEPEND}" - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install - dodoc ChangeLog README - use server && { - doinitd "${FILESDIR}"/2pingd - newconfd "${FILESDIR}"/2pingd.conf 2pingd - } -} diff --git a/net-analyzer/2ping/2ping-2.1.1.ebuild b/net-analyzer/2ping/2ping-2.1.1.ebuild deleted file mode 100644 index 1b9cd45e5459..000000000000 --- a/net-analyzer/2ping/2ping-2.1.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit perl-module - -DESCRIPTION="A bi-directional ping utility" -HOMEPAGE="http://www.finnie.org/software/2ping/" -SRC_URI="http://www.finnie.org/software/2ping/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="crc ipv6 md5 sha server" - -# The 2ping script itself checks if these optional deps are available. -DEPEND=" - >=dev-lang/perl-5.6.0:= - virtual/perl-Getopt-Long - virtual/perl-Pod-Parser - virtual/perl-IO - virtual/perl-Time-HiRes - ipv6? ( dev-perl/IO-Socket-INET6 ) - md5? ( virtual/perl-Digest-MD5 ) - sha? ( virtual/perl-Digest-SHA ) - crc? ( dev-perl/Digest-CRC ) -" - -RDEPEND="${DEPEND}" diff --git a/net-analyzer/2ping/2ping-3.0.1.ebuild b/net-analyzer/2ping/2ping-3.0.1.ebuild new file mode 100644 index 000000000000..4c311b30f1b3 --- /dev/null +++ b/net-analyzer/2ping/2ping-3.0.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="A bi-directional ping utility" +HOMEPAGE="http://www.finnie.org/software/2ping/" +SRC_URI="http://www.finnie.org/software/2ping/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +IUSE="server" + +src_install() { + distutils-r1_src_install + doman doc/2ping.1 + dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md} + use server && { + doinitd "${FILESDIR}"/2pingd + newconfd "${FILESDIR}"/2pingd.conf 2pingd + } +} diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest index 1cc8be68715e..970106079f5d 100644 --- a/net-analyzer/2ping/Manifest +++ b/net-analyzer/2ping/Manifest @@ -1,3 +1 @@ -DIST 2ping-1.2.3.tar.gz 28755 SHA256 1d0c3f30c99f1437f799f6ba9d0b49d60468cd78c03feb7bea0dde7eff22d3b5 SHA512 d8939490c98bac7bb8d7196925e7de9c7a4619d12910a1cf8c48fefc0b959879e21e96a1296c96ad37c9f736052f040396a3c62bc7d7d71071c84f176415bd2c WHIRLPOOL 6f0a2e796237e5b8b1ab8b20646d3bc8ed05e14b7046baa06afc7a49f21001fbe860197acc999e1a4a75beeeda52023c8b7613b2ac26d48a6befb0cc5e1b0b65 -DIST 2ping-2.0.tar.gz 33048 SHA256 c6c9c16969cd6b0541a2b0d5d8b1694f176ba7e32448bfa500f6ff8763cf75df SHA512 2bbf5347bc5fc354c8c2c8b8cca00a5c4375d48b984273d91bfe0bf62d0592990a55ac5afcecfa3ed46bf59d58607b505339f07e987d0c084889ab0f41368a2a WHIRLPOOL f3f383f05e891c48dcf23e12670834f3093caf27f8d8525960a8fec6854b497cf940e27370bd4ec95fba0771e64ae59d842acff505c222ba2d87468a74f4ad75 -DIST 2ping-2.1.1.tar.gz 27232 SHA256 20fc09dbbc7fa37b90bfa415bad801697bd56c16c653cda551bfadbad3936f65 SHA512 d290fc2cf03dd40a38f72d9f46abfc0ef2e3c65f420b53d00c299b442ad3d9312f459317f6125d3d9b2de888a1292f5f56f49de6de6b869f1dc325b24e20de19 WHIRLPOOL 9273991e2ddd4f68da4f31e9a282d45a05d993079dd86873ca6822904f0fb0c7fc25fe691c89239020d317feea901409ce13f5a6dfce53fdc10f66437b1eb0ed +DIST 2ping-3.0.1.tar.gz 39752 SHA256 d6997cd1680151e6f7d5e60137d45cd41bf385d26029878afdaaf5dc4f63dcc4 SHA512 c5e8b26591a51bc3410db2ab572b17d6fddbce8f25c8cbfb4eb23cb738b28b12dae1cc395d26987e84191039193853178dffb748b1f951661e319ac2d5c053db WHIRLPOOL 1f90e57a5e5e6788cc832335213fa3c93d029b2bb82837e322dc65b41c1b2dbfe7aa824e38e1595f3378b2ea2978604915404351866cac245276beedef6cbf39 diff --git a/net-analyzer/2ping/files/2pingd b/net-analyzer/2ping/files/2pingd index a1cf292ac5fe..dcb2eefad383 100644 --- a/net-analyzer/2ping/files/2pingd +++ b/net-analyzer/2ping/files/2pingd @@ -4,7 +4,7 @@ # $Id$ DAEMON="/usr/bin/2ping" -PIDFILE="/var/run/2ping" +PIDFILE="/run/2ping.pid" depend() { need net diff --git a/net-analyzer/2ping/metadata.xml b/net-analyzer/2ping/metadata.xml index ea661e700f0a..873423bb6e3c 100644 --- a/net-analyzer/2ping/metadata.xml +++ b/net-analyzer/2ping/metadata.xml @@ -9,9 +9,6 @@ A bi-directional ping utility </longdescription> <use> - <flag name='crc'>Enable crc check.</flag> - <flag name='md5'>Enable md5 hash check.</flag> - <flag name='sha'>Enable sha1 or sha256 check.</flag> <flag name='server'>Install the server init scripts.</flag> </use> </pkgmetadata> diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest index de07ceb29069..94d556222984 100644 --- a/net-analyzer/argus/Manifest +++ b/net-analyzer/argus/Manifest @@ -1,2 +1,2 @@ DIST argus-3.0.8.1.tar.gz 523375 SHA256 1fb921104c8bd843fb9f5a1c32b57b20bfe8cd8a103b3f1d9bb686b9e6c490a4 SHA512 d96332849df7ce2297aa0d81a9f22c12763d04b2936ffaffc0e4b1942535846cfbc41dadf28791eb88d1ffd0429bdc280d16dff44369c415c713064849b158f7 WHIRLPOOL 2c9495d585c2297b3f9951e74a8fd28840941be6b298c0178d44801242d1abda4bd08f9469e2dd1a4b802735611c9ff82bc028d838628b1ccb184ba80d5dc529 -DIST argus-3.0.8.tar.gz 1193140 SHA256 335d889d288763487ad3545c09b944d7d6aa2538630d1fd72eea3704a57bf6e3 SHA512 e4211bb09f442f4dc5c210b878d0f5a9527ff9c95030570e20520f2ca5c3053cc603aa3f0c4aad33363fee6ce02c3d5262bbfdecd2e2157dc00a34f333f14232 WHIRLPOOL 0a07f7f2e57bf7082af0d1ec203463cf0bedf0b682db89ae484e2162bb79f24b084a7c3d30da447d998885458444bc3799bb401c86e1a2b2dc6a7643127da0c9 +DIST argus-3.0.8.2.rc.2.tar.gz 525053 SHA256 a499154248fd32d0809599b78e5078353a97edbbf595ad48701c9646c2c5515f SHA512 c8272ae80f66114a4a83c365d9257d90ffe944cb648112ba9d756ad235d3d7231d09fe9de2dc31f2d72d5070e3e932b8de49661371806c5e1b21d7aea0aad3b1 WHIRLPOOL 80fc3d7c0c96fee1243903119a3d3d6391da6b42e0c3610b817d205d65776f6df93bd99e7a8900d3422dab48a75da5839efd4284cb6abada7bef6989534138b6 diff --git a/net-analyzer/argus/argus-3.0.8.1.ebuild b/net-analyzer/argus/argus-3.0.8.1.ebuild index b6ea865f2e6c..6b6ba91deb03 100644 --- a/net-analyzer/argus/argus-3.0.8.1.ebuild +++ b/net-analyzer/argus/argus-3.0.8.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://qosient.com/argus/src/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="debug sasl tcpd" RDEPEND=" diff --git a/net-analyzer/argus/argus-3.0.8.ebuild b/net-analyzer/argus/argus-3.0.8.2_rc2.ebuild index 1010dcf1d591..e767e08860de 100644 --- a/net-analyzer/argus/argus-3.0.8.ebuild +++ b/net-analyzer/argus/argus-3.0.8.2_rc2.ebuild @@ -7,11 +7,11 @@ inherit autotools eutils user DESCRIPTION="network Audit Record Generation and Utilization System" HOMEPAGE="http://www.qosient.com/argus/" -SRC_URI="http://qosient.com/argus/src/${P}.tar.gz" +SRC_URI="${HOMEPAGE}dev/${P/_rc/.rc.}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="debug sasl tcpd" RDEPEND=" @@ -27,7 +27,10 @@ DEPEND=" >=sys-devel/flex-2.4.6 " +S=${WORKDIR}/${P/_rc/.rc.} + src_prepare() { + find . -type f -execdir chmod +w {} \; #561360 sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \ -i argus/argus.c \ -i support/Config/argus.conf \ @@ -39,7 +42,7 @@ src_prepare() { -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \ -i support/Config/argus.conf || die epatch \ - "${FILESDIR}"/${PN}-3.0.4-disable-tcp-wrappers-automagic.patch \ + "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch \ "${FILESDIR}"/${PN}-3.0.5-Makefile.patch \ "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch eautoreconf diff --git a/net-analyzer/argus/files/argus-3.0.4-disable-tcp-wrappers-automagic.patch b/net-analyzer/argus/files/argus-3.0.4-disable-tcp-wrappers-automagic.patch deleted file mode 100644 index 77bde434282c..000000000000 --- a/net-analyzer/argus/files/argus-3.0.4-disable-tcp-wrappers-automagic.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -270,6 +270,11 @@ - LIBS="$LIBS $V_PCAPDEP" - fi - -+AC_ARG_WITH(wrappers, -+ [ --with-wrappers build with libwrappers suuport], -+ with_wrappers="$withval", -+ with_wrappers="yes") -+if test "x$with_wrappers" != "xno"; then - AC_QOSIENT_TCPWRAP(V_WRAPDEP, V_INCLS) - if test ! -z "$V_WRAPDEP"; then - if test -f $V_WRAPDEP; then -@@ -293,6 +298,7 @@ - AC_DEFINE([HAVE_TCP_WRAPPER], [], [Using Tcp wrappers]) - WRAPLIBS="$V_WRAPDEP" - fi -+fi - - AC_CHECK_FUNCS(xdrmem_create) - if test "$ac_cv_func_xdrmem_create" = yes; then diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest index 05af21b1e6cf..60eb54fbfe4b 100644 --- a/net-analyzer/icinga/Manifest +++ b/net-analyzer/icinga/Manifest @@ -4,4 +4,5 @@ DIST icinga-1.11.4.tar.gz 18657247 SHA256 34e923d8daac0235513ece5f54a2065b9166cc DIST icinga-1.11.7.tar.gz 18657763 SHA256 b6526dd44d42c70e50ebfb58608f1fec8ba6d805fda4fde57f1078c248e25045 SHA512 3c06771f83257afc9096078ba5304ad9a3fbd8d75f22ca62113c45b06f1a015ef3758936dcb3376b3a18584a360ca4a629e5b071570b7215f7b199e414946af1 WHIRLPOOL 4f66389b467f77e5544239c9c1553e185e37f115f057df83330118e2e8883efa5d73b05bc1c9b3801ff522947e098f3169185b71a172bf9ac26173a033ce30d6 DIST icinga-1.12.0.tar.gz 18670338 SHA256 6bcee5605d66a00444454514baeffd8084df6097cf8ebead2b8114387d5def14 SHA512 214eece3d5545f9157c25d83f1ed65eab82ae4508e713efa2aec83d69e0621ff53618a33c266e88f67b13e4734bd62d7e55cb2cbc547946d13e691f9b24c726b WHIRLPOOL 94fd7435f113e839e1d6a71a466060ab3e2f161a64643e011acb01f1a34bfe00a7313ea47434db6f74405b1b3fe7581c39bb39fd04887e4985fcd16f0cc0c827 DIST icinga-1.12.2.tar.gz 18745366 SHA256 3eb3e623070996fffe8ba1d5c0fe8081d3074bca5109de4ee597a9515507a4cc SHA512 eac3d354fa555d8374757a07cc84f028dcead71eb611245e16597b050f8f050d4b955cf7bc70ff0230a7fa8eb004541827c2686b60ccd683a0646c1d7707b264 WHIRLPOOL fc1251966dfce7377e6f4017281b3f35cca2241ee1fb31b654126d8f045a957a6835cdb45d622efaaf0cf0cd89d45969f6a4c81dd628174dc7a9c29cef137b51 +DIST icinga-1.13.3.tar.gz 18738204 SHA256 d6994bcc9e137f6639b781a78a55d29c51d74cdfce7f35c13c47e09f200acd84 SHA512 babdbb823c6d7241aa67c39c35f67bdf9a4963688b6edd1190af32e056639c1e592791071c90eae3daa44bcb63beee2ff260ce5a0d5e7edb0ed3c99d69ffdaed WHIRLPOOL 6886f98f44cf2aed3b1f2a23d905cbbf5ecf22055ba66d44b44c46942947103863e47e8ba889ba97d98a22f9364946cd3e725563d05df105be519486e2f4857d DIST icinga-1.9.6.tar.gz 17082621 SHA256 a70a54d49813f8ea1b58688d5d2b3ecd00a0470a900c84943c044669f582274c SHA512 f2489d6c898e754ca162304651e71e071e5f1d0ce396ecd87ba9e6fd0a14343cca24fd860e661250b2723a696045d45602ebf2fc9aa16dbaf126415ba109b3ff WHIRLPOOL 599b3a257e1ef9b9d713cfbde0233ab171f46ee5f2fffaa2e5a3ab95daaad2c9ee88e61def2420d60e9262fb57dc4a18ea168c0d9b1da52dc85792d2d1389cbf diff --git a/net-analyzer/icinga/icinga-1.13.3.ebuild b/net-analyzer/icinga/icinga-1.13.3.ebuild new file mode 100644 index 000000000000..24f28f853f72 --- /dev/null +++ b/net-analyzer/icinga/icinga-1.13.3.ebuild @@ -0,0 +1,267 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator + +DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" +HOMEPAGE="http://www.icinga.org/" +#MY_PV=$(delete_version_separator 3) +#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" +#S=${WORKDIR}/${PN}-${MY_PV} +#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~x86" +IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web" +DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) + perl? ( dev-lang/perl ) + virtual/mailx + web? ( + media-libs/gd[jpeg,png] + lighttpd? ( www-servers/lighttpd ) + ) + !net-analyzer/nagios-core" +RDEPEND="${DEPEND} + plugins? ( || ( + net-analyzer/monitoring-plugins + net-analyzer/nagios-plugins + ) )" +RESTRICT="test" + +want_apache2 + +pkg_setup() { + depend.apache_pkg_setup + enewgroup icinga + enewgroup nagios + enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" +} + +src_prepare() { + epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch" +} + +src_configure() { + local myconf + + myconf="$(use_enable perl embedded-perl) + $(use_with perl perlcache) + $(use_enable idoutils) + $(use_enable ssl) + --with-cgiurl=/icinga/cgi-bin + --with-log-dir=/var/log/icinga + --libdir=/usr/$(get_libdir) + --bindir=/usr/sbin + --sbindir=/usr/$(get_libdir)/icinga/cgi-bin + --datarootdir=/usr/share/icinga/htdocs + --localstatedir=/var/lib/icinga + --sysconfdir=/etc/icinga + --with-lockfile=/var/run/icinga/icinga.lock + --with-temp-dir=/tmp/icinga + --with-temp-file=/tmp/icinga/icinga.tmp" + + if use idoutils ; then + myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock + --with-icinga-chkfile=/var/lib/icinga/icinga.chk + --with-ido-sockfile=/var/lib/icinga/ido.sock + --with-idomod-tmpfile=/tmp/icinga/idomod.tmp" + fi + + if use eventhandler ; then + myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers" + fi + + if use plugins ; then + myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" + else + myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" + fi + + if use !apache2 && use !lighttpd ; then + myconf+=" --with-command-group=icinga" + else + if use apache2 ; then + myconf+=" --with-httpd-conf=/etc/apache2/conf.d" + myconf+=" --with-command-group=apache" + elif use lighttpd ; then + myconf+=" --with-command-group=lighttpd" + fi + fi + + econf ${myconf} +} + +src_compile() { + tc-export CC + + emake icinga || die "make failed" + + if use web ; then + emake DESTDIR="${D}" cgis || die + fi + + if use contrib ; then + emake DESTDIR="${D}" -C contrib || die + fi + + if use idoutils ; then + emake DESTDIR="${D}" idoutils || die + fi +} + +src_install() { + dodoc Changelog README UPGRADING || die + + if ! use web ; then + sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die + fi + + emake DESTDIR="${D}" install{,-config,-commandmode} || die + + if use idoutils ; then + emake DESTDIR="${D}" install-idoutils || die + fi + + if use contrib ; then + emake DESTDIR="${D}" -C contrib install || die + fi + + if use eventhandler ; then + emake DESTDIR="${D}" install-eventhandlers || die + fi + + newinitd "${FILESDIR}"/icinga-init.d icinga || die + newconfd "${FILESDIR}"/icinga-conf.d icinga || die + if use idoutils ; then + newinitd "${FILESDIR}"/ido2db-init.d ido2db || die + newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die + insinto /usr/share/icinga/contrib/db + doins -r module/idoutils/db/* || die + fi + # Apache Module + if use web ; then + if use apache2 ; then + insinto "${APACHE_MODULES_CONFDIR}" + newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die + elif use lighttpd ; then + insinto /etc/lighttpd + newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die + else + ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver" + ewarn "out-of-the-box. Since you are not using one of them, you" + ewarn "have to configure your webserver accordingly yourself." + fi + fowners -R root:root /usr/$(get_libdir)/icinga || die + cd "${D}" || die + find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} + + find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} + + fi + + if use eventhandler ; then + dodir /etc/icinga/eventhandlers || die + fowners icinga:icinga /etc/icinga/eventhandlers || die + fi + + keepdir /etc/icinga + keepdir /var/lib/icinga + keepdir /var/lib/icinga/archives + keepdir /var/lib/icinga/rw + keepdir /var/lib/icinga/spool/checkresults + + if use apache2 ; then + webserver=apache + elif use lighttpd ; then + webserver=lighttpd + else + webserver=icinga + fi + + fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga" + fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw" + + fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw" + fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga" + + # paxmarks + if use idoutils ; then + pax-mark m usr/sbin/ido2db + fi +} + +pkg_postinst() { + if use web ; then + elog "This does not include cgis that are perl-dependent" + elog "Currently traceroute.cgi is perl-dependent" + elog "Note that the user your webserver is running as needs" + elog "read-access to /etc/icinga." + elog + if use apache2 || use lighttpd ; then + elog "There are several possible solutions to accomplish this," + elog "choose the one you are most comfortable with:" + elog + if use apache2 ; then + elog " usermod -G icinga apache" + elog "or" + elog " chown icinga:apache /etc/icinga" + elog + elog "Also edit /etc/conf.d/apache2 and add a line like" + elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\"" + elog + elog "Icinga web service needs user authentication. If you" + elog "use the base configuration, you need a password file" + elog "with a password for user \"icingaadmin\"" + elog "You can create this file by executing:" + elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin" + elog + elog "you may want to also add apache to the icinga group" + elog "to allow it access to the AuthUserFile" + elog + elif use lighttpd ; then + elog " usermod -G icinga lighttpd " + elog "or" + elog " chown icinga:lighttpd /etc/icinga" + elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'" + fi + elog + elog "That will make icinga's web front end visable via" + elog "http://localhost/icinga/" + elog + else + elog "IMPORTANT: Do not forget to add the user your webserver" + elog "is running as to the icinga group!" + fi + else + ewarn "Please note that you have installed Icinga without web interface." + ewarn "Please don't file any bugs about having no web interface when you do this." + ewarn "Thank you!" + fi + elog + elog "If you want icinga to start at boot time" + elog "remember to execute:" + elog " rc-update add icinga default" + elog + elog "If your kernel has /proc protection, icinga" + elog "will not be happy as it relies on accessing the proc" + elog "filesystem. You can fix this by adding icinga into" + elog "the group wheel, but this is not recomended." + elog + if [ -d "${ROOT}"/var/icinga ] ; then + ewarn + ewarn "/var/icinga was moved to /var/lib/icinga" + ewarn "please move the files if this was an upgrade" + if use idoutils ; then + ewarn "and edit /etc/ido2db.cfg to change the location of the files" + ewarn "it accesses" + ewarn "update your db with the scripts under the directory" + ewarn "/usr/share/icinga/contrib/db/" + fi + ewarn + ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files" + ewarn "remove /var/icinga afterwards to make this warning disappear" + fi +} diff --git a/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild index 8f1219fb881d..a85d6a4b8e4d 100644 --- a/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild +++ b/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild @@ -22,7 +22,10 @@ KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris" IUSE="gnome sqlite X" RDEPEND=" - dev-python/dnspython[${PYTHON_USEDEP}] + || ( + dev-python/dnspython:0[${PYTHON_USEDEP}] + virtual/dnspython[${PYTHON_USEDEP}] + ) >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] ) X? ( diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild index 7b9129b92e6b..bf7f343fbf46 100644 --- a/net-analyzer/linkchecker/linkchecker-9999.ebuild +++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -22,7 +22,7 @@ KEYWORDS="" IUSE="gnome sqlite X" RDEPEND=" - dev-python/dnspython[${PYTHON_USEDEP}] + virtual/dnspython[${PYTHON_USEDEP}] gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] ) X? ( dev-python/PyQt4[X,help,${PYTHON_USEDEP}] diff --git a/net-analyzer/namebench/namebench-1.3.1-r1.ebuild b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild index c64b8e5f0338..b840a5e1117e 100644 --- a/net-analyzer/namebench/namebench-1.3.1-r1.ebuild +++ b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,11 +20,12 @@ IUSE="X" # PYTHON_REQ_USE does not support X? ( tk ) syntax yet DEPEND="X? ( $(python_gen_cond_dep dev-lang/python:2.7[tk] python2_7) )" RDEPEND="${DEPEND} - >=dev-python/dnspython-1.8.0[${PYTHON_USEDEP}] >=dev-python/httplib2-0.6[${PYTHON_USEDEP}] >=dev-python/graphy-1.0[${PYTHON_USEDEP}] >=dev-python/jinja-2.2.1[${PYTHON_USEDEP}] - >=dev-python/simplejson-2.1.2[${PYTHON_USEDEP}]" + >=dev-python/simplejson-2.1.2[${PYTHON_USEDEP}] + virtual/dnspython[${PYTHON_USEDEP}] +" python_prepare_all() { # don't include bundled libraries diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index f72ca712968e..694b1eba4737 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -120,6 +120,7 @@ src_configure() { src_compile() { local dep deps="build-dnet build-nbase build-nsock build-netutil" + use system-lua || deps="build-lua ${deps}" for dep in ${deps}; do emake makefile.dep ${dep} diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml index 12a9db305535..8249714625ca 100644 --- a/net-analyzer/pmacct/metadata.xml +++ b/net-analyzer/pmacct/metadata.xml @@ -3,8 +3,9 @@ <pkgmetadata> <herd>netmon</herd> <use> +<flag name='geoipv2'>Add support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag> <flag name='64bit'>Use 64bit counters instead of 32bit ones</flag> <flag name='mongodb'>Add support for mongodb backend</flag> -<flag name='ulog'>Enable ULOG support</flag> +<flag name='ulog'>Enable support for ULOG in older kernels (deprecated)</flag> </use> </pkgmetadata> diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild new file mode 100644 index 000000000000..e44303f6fccc --- /dev/null +++ b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.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 toolchain-funcs + +DESCRIPTION="A network tool to gather IP traffic information" +HOMEPAGE="http://www.pmacct.net/" +SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads ulog" +REQUIRED_USE=" + ?? ( geoip geoipv2 ) +" + +RDEPEND=" + net-libs/libpcap + geoip? ( dev-libs/geoip ) + geoipv2? ( dev-libs/libmaxminddb ) + mongodb? ( + >=dev-libs/mongo-c-driver-0.8.1-r1 + <dev-libs/mongo-c-driver-0.98 + ) + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql:* ) + sqlite? ( =dev-db/sqlite-3* ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +S="${WORKDIR}/pmacct-daily" + +DOCS=( + CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE + docs/INTERNALS docs/PLUGINS docs/SIGNALS +) + +src_configure() { + tc-export CC AR RANLIB + + econf \ + $(use_enable 64bit) \ + $(use_enable debug) \ + $(use_enable geoip) \ + $(use_enable geoipv2) \ + $(use_enable ipv6) \ + $(use_enable mongodb) \ + $(use_enable mysql) \ + $(use_enable postgres pgsql) \ + $(use_enable sqlite sqlite3) \ + $(use_enable threads) \ + $(use_enable ulog) \ + $(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \ + $(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \ + --disable-debug +} + +src_install() { + default + + for dirname in examples sql; do + docinto ${dirname} + dodoc -r ${dirname}/* + done + + newinitd "${FILESDIR}"/pmacctd-init.d pmacctd + newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd + + insinto /etc/pmacctd + newins examples/pmacctd-imt.conf.example pmacctd.conf +} diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest index 5b1a684031aa..2a2b7ad263af 100644 --- a/net-analyzer/tcpreplay/Manifest +++ b/net-analyzer/tcpreplay/Manifest @@ -1,2 +1 @@ -DIST tcpreplay-4.0.5.tar.gz 2059744 SHA256 63798c8adc9e5be79467e23593838ce0e617b25938cfce3116feda2630344d80 SHA512 bf0e8e64d9431bbf8379d2578edf0a53e6803dfc06d973c388aa885bcc4f029499dad02aed0ee17b78b5eef178b450b6c0b851b9a52a1ac27dc0e1cb2b83a88d WHIRLPOOL dcb446268956fc5f89d211e0aafa1323a2984c614b0637c7cdefdeaa617e594893397476bb358d1dc58cebc7d185fd4914cb88db97b23286606a7ae133a1ec50 DIST tcpreplay-4.1.0.tar.gz 2118212 SHA256 ad285b08d7a61ed88799713c4c5d657a7a503eee832304d3a767f67efe5d1a20 SHA512 bfd7a0679dccd86aba7ca5d102665e6feba72bffb1596915985bc50261f9ac10ce56b870e1aa64a33efa79e3bee89b8c66e2c26328fb15d3722a5bc957ea77a2 WHIRLPOOL e6a07495cb07a09f707b3784d15a266c04a7b3d369b7d8eb9d7d5683838accdcc539255ff05f99c2fc8036d045e66f3a250a0c7f1896024c65065a6c6d282b7a diff --git a/net-analyzer/tcpreplay/tcpreplay-4.0.5-r1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.0.5-r1.ebuild deleted file mode 100644 index 80e5d9530765..000000000000 --- a/net-analyzer/tcpreplay/tcpreplay-4.0.5-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools eutils flag-o-matic - -DESCRIPTION="a suite of utilities for editing and replaying previously captured network traffic" -HOMEPAGE="http://tcpreplay.appneta.com/" -LICENSE="BSD GPL-3" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" - -SLOT="0" -KEYWORDS="amd64 ~sparc x86" -IUSE="debug pcapnav +tcpdump" - -DEPEND=" - >=sys-devel/autogen-5.16.2[libopts] - dev-libs/libdnet - >=net-libs/libpcap-0.9 - tcpdump? ( net-analyzer/tcpdump ) - pcapnav? ( net-libs/libpcapnav ) -" - -RDEPEND="${DEPEND}" - -DOCS=( README docs/{CHANGELOG,CREDIT,HACKING,TODO} ) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch - - sed -i \ - -e '/CFLAGS=/s|-ggdb -std=gnu99|-std=gnu99|g' \ - -e 's|-O3||g' \ - -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ - configure.ac || die - sed -i \ - -e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \ - src/common/sendpacket.c || die - sed -i \ - -e 's|@\([A-Z_]*\)@|$(\1)|g' \ - -e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \ - -e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \ - src/Makefile.am || die - - eautoreconf -} - -src_configure() { - # By default it uses static linking. Avoid that, bug 252940 - econf \ - $(use_enable debug) \ - $(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \ - $(use_with tcpdump tcpdump /usr/sbin/tcpdump) \ - --disable-local-libopts \ - --enable-dynamic-link \ - --enable-shared \ - --with-libdnet \ - --with-testnic2=lo \ - --with-testnic=lo -} - -src_test() { - if [[ ! ${EUID} -eq 0 ]]; then - ewarn "Some tests were disabled due to FEATURES=userpriv" - ewarn "To run all tests issue the following command as root:" - ewarn " # make -C ${S}/test" - make -C test tcpprep || die "self test failed - see ${S}/test/test.log" - else - make test || { - ewarn "Note, that some tests require eth0 iface to be UP." ; - die "self test failed - see ${S}/test/test.log" ; } - fi -} diff --git a/net-analyzer/tcpreplay/tcpreplay-4.1.0-r1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.1.0-r1.ebuild index e70bd4f88175..325f34c848d6 100644 --- a/net-analyzer/tcpreplay/tcpreplay-4.1.0-r1.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-4.1.0-r1.ebuild @@ -11,7 +11,7 @@ LICENSE="BSD GPL-3" SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.gz" SLOT="0" -KEYWORDS="amd64 ~sparc ~x86" +KEYWORDS="amd64 ~sparc x86" IUSE="debug pcapnav +tcpdump" DEPEND=" diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 975427865860..4eccaea7705e 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,3 +1,3 @@ DIST wireshark-1.12.7.tar.bz2 29202490 SHA256 c74a1c14e72ce0f198a93d832e71742c7f312cbbe719e5def9ecef176860f92c SHA512 a4012fa56e8b99e5fb072c1fb82c783a547395ddb013a9473858fdf9fa99270313d6059f9ee210d56c00f420bbad9cab30bdd3c45e9ff07d4f5967c18d1d0f38 WHIRLPOOL 84c60871fb1d8022885108c97323a892bc9ee035fc421e1e96b76819291337e8d0026be6c77e62f03582fb854188535e5fceb50eb17830f5b1a3ff69b3474d4c DIST wireshark-1.12.8.tar.bz2 29216939 SHA256 357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7 SHA512 24ad130d9d0718e610f7def2a08e976871205032b4b4b5269c3ae54894c4121fa3b21a0bc6e45e9c2a41119f5553416d5c452dadf7b02f17e7803511d33809f5 WHIRLPOOL ede6a80e914c4694df9ef6753b65af09c7efadb7d6e3c193fa30871de9e673dac8f7a1f185c3b6ca0a316601d720e141dbe817af2a3a930ec870a75f67cde5a9 -DIST wireshark-2.0.0rc1.tar.bz2 30779877 SHA256 a201938913f770cb1f022165574d312b66b97efaa6ad7a9c90daf325f7806582 SHA512 95b1995a1d6684ab8a0a93c86cd1101c9df6ee1f6d0c76d663ec32396d3ad10d4765b598c19a068bd95994ac6568060c64461a3de58d1d582ebec8f953e868f9 WHIRLPOOL a64cd0be0a145e461c9c2e4b7e495f30a72521ef0069809b1bf5da048c2e75e08516eef49eff838e328fb8aad91c41c5814f3986af1641270ae6495d3b9647a6 +DIST wireshark-2.0.0rc2.tar.bz2 30838572 SHA256 b1d2139bd1e1b008337546059beece59e24387e7b96c3d691203f0ce1881b6c8 SHA512 120bad8bd75c37dc1b12f3878aee68669843f779b6f440e07f106faa354ba5a5b436d8076d9f8e68508c5f23e92e0e30c8e4ce094bca0954cad6502eb24f5451 WHIRLPOOL de476509e20ca457a7ea06e31f3e8708f085e6c7e584a91d88a81f5a6b43249fa612b5e01d464a18356b91da238dcb66d5529c8826277d0d1e2ba117a0d48eee diff --git a/net-analyzer/wireshark/wireshark-2.0.0_rc1-r1.ebuild b/net-analyzer/wireshark/wireshark-2.0.0_rc2.ebuild index a7fa98955a33..a7fa98955a33 100644 --- a/net-analyzer/wireshark/wireshark-2.0.0_rc1-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-2.0.0_rc2.ebuild diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild index a52c2952b782..39c94cb6f8fe 100644 --- a/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild +++ b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild @@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.freeradius.org/pub/freeradius/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~hppa ppc ~ppc64 ~x86" IUSE="scp shadow static-libs" diff --git a/net-dns/hash-slinger/hash-slinger-2.6.ebuild b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild index e3045b354142..8fb61bfb181d 100644 --- a/net-dns/hash-slinger/hash-slinger-2.6.ebuild +++ b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild @@ -5,6 +5,7 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) + inherit python-r1 DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY" @@ -16,26 +17,26 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="ipsec +openpgp +ssh" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + DEPEND="" RDEPEND=" ${PYTHON_DEPS} - dev-python/dnspython[$PYTHON_USEDEP] dev-python/ipaddr[$PYTHON_USEDEP] dev-python/m2crypto[$PYTHON_USEDEP] net-dns/unbound[python,$PYTHON_USEDEP] + virtual/dnspython[$PYTHON_USEDEP] ipsec? ( net-misc/libreswan[dnssec] ) openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] ) ssh? ( net-misc/openssh ) " -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - src_install() { local tools tools="tlsa" - use ssh && tools+=" sshfp" + use ssh && tools+=" sshfp" use openpgp && tools+=" openpgpkey" - use ipsec && tools+=" ipseckey" + use ipsec && tools+=" ipseckey" for tool in $tools ; do doman ${tool}.1 python_foreach_impl python_doscript ${tool} diff --git a/net-dns/hash-slinger/metadata.xml b/net-dns/hash-slinger/metadata.xml index 4b0698ebfd36..064d3c9a7032 100644 --- a/net-dns/hash-slinger/metadata.xml +++ b/net-dns/hash-slinger/metadata.xml @@ -6,8 +6,8 @@ <name>Marc Schiffbauer</name> </maintainer> <use> - <flag name='ipsec'>Enable support for IPSECKEY records (ipseckey)</flag> - <flag name='openpgp'>Enable support for OPENPGPKEY records (openpgpkey)</flag> - <flag name='ssh'>Enable support for SSHFP records (sshfp)</flag> + <flag name="ipsec">Enable support for IPSECKEY records (ipseckey)</flag> + <flag name="openpgp">Enable support for OPENPGPKEY records (openpgpkey)</flag> + <flag name="ssh">Enable support for SSHFP records (sshfp)</flag> </use> </pkgmetadata> diff --git a/net-dns/noip-updater/metadata.xml b/net-dns/noip-updater/metadata.xml index e8f5cc43b3f5..94476e896b19 100644 --- a/net-dns/noip-updater/metadata.xml +++ b/net-dns/noip-updater/metadata.xml @@ -3,10 +3,10 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>influencedchaos@gmail.com</email> - <name>Francis Booth</name> - <description>Active Maintainer, Assign bugs</description> - </maintainer> + <email>boothfsec@gmail.com</email> + <name>Francis Booth</name> + <description>Active Maintainer, Assign bugs</description> + </maintainer> <longdescription lang="en"> no-ip.com dynamic DNS updater </longdescription> diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest index 65e7f0deddaa..154de8903e5e 100644 --- a/net-dns/openresolv/Manifest +++ b/net-dns/openresolv/Manifest @@ -1,3 +1,4 @@ DIST openresolv-3.6.1.tar.bz2 16803 SHA256 38a6908c07b8474cf489095026808d1c5ea5c53bb299beaecd23c05593b09eab SHA512 9735eba662a2b1299db5bfb7ae3bf19b32ca4eb349883011c3752af3bb3becd2f58ede5743d32bc38b17dcae7b0cfa28dc8a57079de90cb141412bd01033637f WHIRLPOOL d589bb982bb3c68077b70498ddb57a23a44a1a4e33235bb92f092f89b450cd10ebab55283e78c7c7bf012d1470f41e2702f5fecd8ff0730c17f9b6e163abc387 DIST openresolv-3.6.2.tar.bz2 17430 SHA256 b0fd1ca59d2ee407db5e9b35d1ef8b670bc808fcc9db7aa31b0784cdd01825d0 SHA512 c3f987c7a45d4c06a2474b8f37a24eb4f9f86b8742486b4e533199003e188209231429aee7c670649fa0f5c0bc45b3a2cd02aab2d0177032cd6bd6bc52162399 WHIRLPOOL 2cfe53c2d62d9f4396f23299d52ed247f910ac32e7c1a52a61856826736e04d012bc379137275e7dcbdbb6fe71181875bb2f73525e6370b3a0166123e38aa19a DIST openresolv-3.7.0.tar.bz2 17699 SHA256 8b7c0b2f6165b51893bceeb2ea1d3e85c08cbd1afc65319003a912166f8c35de SHA512 230df582176f7ade598e2a92834a10f4fd5d1b7d020804694924fe281b5a78fdb73d94eeff32e2a285b0c1557f4517e6b31cf8a3162fc3fa3928283f50527946 WHIRLPOOL 320122ae3dac8f4772badae533da65b8a6fb8ccabf72dbc0d6096fffd8ad5ad4109bc7170e3b73494da94a27db46c96bfea9d5c87aae16a008f4f87772e45616 +DIST openresolv-3.7.2.tar.xz 17340 SHA256 8eac062f3c67d636bd0e898893bd5c7368ad0c470d511110be2d0e73c14de037 SHA512 cc5b54bf0d4e62c345cad9a4973447d38773d992ac9753ca873c472e8b5c4a3f5d926808c1627b54780ff7d70cd3d4e5f26fa169f7337323eae9e33326d7e349 WHIRLPOOL 8876df85c0c2a6dc344a2a5fd89586a5e087970e5304d6a40a8992d4a1106c89ae4dae3717523323262f5b74426c2f1b10faf9904ca06829db4cea9b4a693c34 diff --git a/net-dns/openresolv/openresolv-3.7.2.ebuild b/net-dns/openresolv/openresolv-3.7.2.ebuild new file mode 100644 index 000000000000..1af747f9d1b7 --- /dev/null +++ b/net-dns/openresolv/openresolv-3.7.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +DESCRIPTION="A framework for managing DNS information" +HOMEPAGE="http://roy.marples.name/projects/openresolv" +SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.xz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="selinux" + +DEPEND="!net-dns/resolvconf-gentoo + !<net-dns/dnsmasq-2.40-r1" +RDEPEND="selinux? ( sec-policy/selinux-resolvconf )" + +src_configure() { + econf \ + --prefix= \ + --rundir=/var/run \ + --libexecdir=/lib/resolvconf \ + --restartcmd="/lib/resolvconf/helpers/restartcmd \1" +} + +src_install() { + default + exeinto /lib/resolvconf/helpers + doexe "${FILESDIR}"/restartcmd +} + +pkg_config() { + if [ "${ROOT}" != "/" ]; then + eerror "We cannot configure unless \$ROOT=/" + return 1 + fi + + if [ -n "$(resolvconf -l)" ]; then + einfo "${PN} already has DNS information" + else + ebegin "Copying /etc/resolv.conf to resolvconf -a dummy" + resolvconf -a dummy </etc/resolv.conf + eend $? || return $? + einfo "The dummy interface will disappear when you next reboot" + fi +} diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest index 4edadeb8c345..898996616633 100644 --- a/net-firewall/firehol/Manifest +++ b/net-firewall/firehol/Manifest @@ -1,3 +1 @@ -DIST firehol-1.273.tar.bz2 128128 SHA256 e8d3b4ac3e54097c0e0f14bfab773a75d43b522fa123a42088b7f23f13495ea2 SHA512 dbb311fb9d4fa8861480bae1fac449ce85f52612264ec21658946d87be02027c37af13b754acd791ad454964c588897f8187ec8ce80de3b3ed8a888429bfd708 WHIRLPOOL 0fa7f7644d7bf0268bfc6e817eeb95e7c1784cefa6d4a930c2fec6644774347c28e7a4d39c55df7a4e0f7a0c4697ce6b3c4bafdf6e2124bd478c097b9a6cfb27 -DIST firehol-2.0.2.tar.xz 918860 SHA256 8778d0fc891676777b55e68d852a765205a995029f6e9f599c0090a14ca8ee7c SHA512 d125c4ca7d60494afde04f806bb0fc44ebdb12d7bf59e027c441a087082d9c326d009ba568ef640b01409abdecc3c192a9ae6db6c7370ad0221a19cb3a706902 WHIRLPOOL 10b6edee6a4db07a217e7d13eea4dc5ba02d7f3a44ba1955a5b138a09aa41aea6e39acbcdb04e0ee80d22f3f1d9fc1f061d26d7a10a9d1a7f02230ca21efe514 DIST firehol-2.0.3.tar.xz 898248 SHA256 4bcc2d19ee7d41377f19c3bcd3ae882ba10dd3ebed6eac2deedbce202d1a3d72 SHA512 fab1ddea6d60d5cb91eacc73f79549f454abc7d581c696463f4396465257a708af175f18da7aa2c6ddc3dddc68b21528edb043a3fe539d16f5057e4f0c0db0b6 WHIRLPOOL 50556da7e392575ef2e36a489e544295f909c8621be5e7c91ad8b00f99879d1eebe59076948d8e58839869771547e85c425262438eb5f79d4b2bd8f2bb0009f8 diff --git a/net-firewall/firehol/firehol-1.273-r3.ebuild b/net-firewall/firehol/firehol-1.273-r3.ebuild deleted file mode 100644 index d5f5d8b2757f..000000000000 --- a/net-firewall/firehol/firehol-1.273-r3.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -inherit eutils linux-info - -DESCRIPTION="iptables firewall generator" -HOMEPAGE="http://firehol.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" -KEYWORDS="amd64 ~ppc ~sparc x86" - -DEPEND="sys-apps/iproute2" -RDEPEND="net-firewall/iptables - sys-apps/iproute2[-minimal] - virtual/modutils - || ( - net-misc/wget - net-misc/curl - )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-CVE-2008-4953.patch - epatch "${FILESDIR}"/${P}-log-output.patch #332507 -} - -pkg_setup() { - local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \ - ~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG \ - ~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE \ - ~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_STATE ~NETFILTER_XT_MATCH_OWNER" - - get_version - if [ ${KV_PATCH} -ge 25 ]; then - CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}" - else - CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}" - fi - linux-info_pkg_setup -} - -src_install() { - newsbin firehol.sh firehol - - dodir /etc/firehol /etc/firehol/examples /etc/firehol/services - insinto /etc/firehol/examples - doins examples/* || die - - newconfd "${FILESDIR}"/firehol.conf.d firehol - newinitd "${FILESDIR}"/firehol.initrd.1 firehol - - dodoc ChangeLog README TODO WhatIsNew - dohtml doc/*.html doc/*.css - - docinto scripts - dodoc get-iana.sh adblock.sh - - doman man/*.1 man/*.5 - - # Install this RESERVED_IPS as discussed in bug #332135 - insinto /etc/firehol - doins "${FILESDIR}"/RESERVED_IPS -} - -pkg_postinst() { - elog "The default path to firehol's configuration file is /etc/firehol/firehol.conf" - elog "See /etc/firehol/examples for configuration examples." - # - # Install a default configuration if none is available yet - if [[ ! -e "${ROOT}/etc/firehol/firehol.conf" ]]; then - einfo "Installing a sample configuration as ${ROOT}/etc/firehol/firehol.conf" - cp "${ROOT}/etc/firehol/examples/client-all.conf" "${ROOT}/etc/firehol/firehol.conf" - fi -} diff --git a/net-firewall/firehol/firehol-2.0.2.ebuild b/net-firewall/firehol/firehol-2.0.2.ebuild deleted file mode 100644 index f39413ce29c1..000000000000 --- a/net-firewall/firehol/firehol-2.0.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils linux-info - -DESCRIPTION="iptables firewall generator" -HOMEPAGE="http://firehol.sourceforge.net/" -SRC_URI="http://firehol.org/download/releases/v${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" - -RDEPEND="net-firewall/iptables - sys-apps/iproute2[-minimal] - virtual/modutils - app-arch/gzip" -DEPEND="${RDEPEND}" - -pkg_setup() { - local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \ - ~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG \ - ~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE \ - ~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_STATE ~NETFILTER_XT_MATCH_OWNER" - - get_version - if [ ${KV_PATCH} -ge 25 ]; then - CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}" - else - CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}" - fi - linux-info_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}/${P}-autosave.patch" -} - -src_configure() { - # removing IP6TABLES_CMD has no effect and enable build - # without ipv6 available - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --with-autosave="${EPREFIX}/var/lib/iptables/rules-save" \ - --with-autosave6="${EPREFIX}/var/lib/ip6tables/rules-save" \ - $(use_enable doc) \ - IP6TABLES_CMD=/bin/false \ - IP6TABLES_SAVE_CMD=/bin/false -} - -src_install() { - default - - newconfd "${FILESDIR}"/firehol.conf.d firehol - newinitd "${FILESDIR}"/firehol.initrd.1 firehol - newconfd "${FILESDIR}"/fireqos.conf.d fireqos - newinitd "${FILESDIR}"/fireqos.initrd fireqos -} diff --git a/net-firewall/firehol/firehol-2.0.3-r1.ebuild b/net-firewall/firehol/firehol-2.0.3-r1.ebuild index 5fae33165853..0cb0c653c9bf 100644 --- a/net-firewall/firehol/firehol-2.0.3-r1.ebuild +++ b/net-firewall/firehol/firehol-2.0.3-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://firehol.org/download/releases/v${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" IUSE="doc" -KEYWORDS="amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc x86" RDEPEND="net-firewall/iptables sys-apps/iproute2[-minimal] diff --git a/net-firewall/fwknop/metadata.xml b/net-firewall/fwknop/metadata.xml index 8b1bce7efec2..cc8a621efcda 100644 --- a/net-firewall/fwknop/metadata.xml +++ b/net-firewall/fwknop/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>itumaykin@gmail.com</email> + <email>itumaykin+gentoo@gmail.com</email> <name>Coacher</name> </maintainer> <use> diff --git a/net-firewall/nftables/files/libexec/nftables.sh b/net-firewall/nftables/files/libexec/nftables.sh new file mode 100755 index 000000000000..0d7c091d07f4 --- /dev/null +++ b/net-firewall/nftables/files/libexec/nftables.sh @@ -0,0 +1,150 @@ +#! /bin/sh + +main() { + local NFTABLES_SAVE=${2:-'/var/lib/nftables/rules-save'} + local retval + case "$1" in + "clear") + if ! use_legacy; then + nft flush ruleset + else + clear_legacy + fi + retval=$? + ;; + "list") + if ! use_legacy; then + nft list ruleset + else + list_legacy + fi + retval=$? + ;; + "load") + nft -f ${NFTABLES_SAVE} + retval=$? + ;; + "store") + local tmp_save="${NFTABLES_SAVE}.tmp" + if ! use_legacy; then + nft list ruleset > ${tmp_save} + else + save_legacy ${tmp_save} + fi + retval=$? + if [ ${retval} ]; then + mv ${tmp_save} ${NFTABLES_SAVE} + fi + ;; + esac + return ${retval} +} + +clear_legacy() { + local l3f line table chain first_line + + first_line=1 + if manualwalk; then + for l3f in $(getfamilies); do + nft list tables ${l3f} | while read line; do + table=$(echo ${line} | sed "s/table[ \t]*//") + deletetable ${l3f} ${table} + done + done + else + nft list tables | while read line; do + l3f=$(echo ${line} | cut -d ' ' -f2) + table=$(echo ${line} | cut -d ' ' -f3) + deletetable ${l3f} ${table} + done + fi +} + +list_legacy() { + local l3f + + if manualwalk; then + for l3f in $(getfamilies); do + nft list tables ${l3f} | while read line; do + line=$(echo ${line} | sed "s/table/table ${l3f}/") + echo "$(nft list ${line})" + done + done + else + nft list tables | while read line; do + echo "$(nft list ${line})" + done + fi +} + +save_legacy() { + tmp_save=$1 + touch "${tmp_save}" + if manualwalk; then + for l3f in $(getfamilies); do + nft list tables ${l3f} | while read line; do + line=$(echo ${line} | sed "s/table/table ${l3f}/") + nft ${SAVE_OPTIONS} list ${line} >> ${tmp_save} + done + done + else + nft list tables | while read line; do + nft ${SAVE_OPTIONS} list ${line} >> "${tmp_save}" + done + fi +} + +use_legacy() { + local major_ver minor_ver + + major_ver=$(uname -r | cut -d '.' -f1) + minor_ver=$(uname -r | cut -d '.' -f2) + + [[ $major_ver -ge 4 || $major_ver -eq 3 && $minor_ver -ge 18 ]] && return 1 + return 0 +} + +CHECK_TABLE_NAME="GENTOO_CHECK_TABLE" + +getfamilies() { + local l3f families + + for l3f in ip arp ip6 bridge inet; do + if nft create table ${l3f} ${CHECK_TABLE_NAME} > /dev/null 2>&1; then + families="${families}${l3f} " + nft delete table ${l3f} ${CHECK_TABLE_NAME} + fi + done + echo ${families} +} + +manualwalk() { + local result l3f=`getfamilies | cut -d ' ' -f1` + + nft create table ${l3f} ${CHECK_TABLE_NAME} + nft list tables | read line + if [ $(echo $line | wc -w) -lt 3 ]; then + result=0 + fi + result=1 + nft delete table ${l3f} ${CHECK_TABLE_NAME} + + return $result +} + +deletetable() { + # family is $1 + # table name is $2 + nft flush table $1 $2 + nft list table $1 $2 | while read l; do + chain=$(echo $l | grep -o 'chain [^[:space:]]\+' | cut -d ' ' -f2) + if [ -n "${chain}" ]; then + nft flush chain $1 $2 ${chain} + nft delete chain $1 $2 ${chain} + fi + done + nft delete table $1 $2 +} + +main "$@" +exit $? diff --git a/net-firewall/nftables/files/nftables.init-r2 b/net-firewall/nftables/files/nftables.init-r2 new file mode 100644 index 000000000000..c86d2e3c995f --- /dev/null +++ b/net-firewall/nftables/files/nftables.init-r2 @@ -0,0 +1,123 @@ +#!/sbin/runscript +# Copyright 2014 Nicholas Vinson +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="clear list panic save" +extra_started_commands="reload" +depend() { + need localmount #434774 + before net +} + +start_pre() { + checkkernel || return 1 + checkconfig || return 1 + return 0 +} + +clear() { + /usr/libexec/nftables/nftables.sh clear || return 1 + return 0 +} + +list() { + /usr/libexec/nftables/nftables.sh list || return 1 + return 0 +} + +panic() { + checkkernel || return 1 + if service_started ${RC_SVCNAME}; then + rc-service ${RC_SVCNAME} stop + fi + + ebegin "Dropping all packets" + clear + if nft create table ip filter >/dev/null 2>&1; then + nft -f /dev/stdin <<-EOF + table ip filter { + chain input { + type filter hook input priority 0; + drop + } + chain forward { + type filter hook forward priority 0; + drop + } + chain output { + type filter hook output priority 0; + drop + } + } + EOF + fi + if nft create table ip6 filter >/dev/null 2>&1; then + nft -f /dev/stdin <<-EOF + table ip6 filter { + chain input { + type filter hook input priority 0; + drop + } + chain forward { + type filter hook forward priority 0; + drop + } + chain output { + type filter hook output priority 0; + drop + } + } + EOF + fi +} + +reload() { + checkkernel || return 1 + ebegin "Flushing firewall" + clear + start +} + +save() { + ebegin "Saving nftables state" + checkpath -q -d "$(dirname "${NFTABLES_SAVE}")" + checkpath -q -m 0600 -f "${NFTABLES_SAVE}" + /usr/libexec/nftables/nftables.sh store ${NFTABLES_SAVE} + return $? +} + +start() { + ebegin "Loading nftables state and starting firewall" + clear + /usr/libexec/nftables/nftables.sh load ${NFTABLES_SAVE} + eend $? +} + +stop() { + if yesno ${SAVE_ON_STOP:-yes}; then + save || return 1 + fi + + ebegin "Stopping firewall" + clear + eend $? +} + +checkconfig() { + if [ ! -f ${NFTABLES_SAVE} ]; then + eerror "Not starting nftables. First create some rules then run:" + eerror "rc-service nftables save" + return 1 + fi + return 0 +} + +checkkernel() { + if ! nft list tables >/dev/null 2>&1; then + eerror "Your kernel lacks nftables support, please load" + eerror "appropriate modules and try again." + return 1 + fi + return 0 +} diff --git a/net-firewall/nftables/files/systemd/nftables-restore.service b/net-firewall/nftables/files/systemd/nftables-restore.service new file mode 100644 index 000000000000..7a7eacfee9f3 --- /dev/null +++ b/net-firewall/nftables/files/systemd/nftables-restore.service @@ -0,0 +1,14 @@ +[Unit] +Description=Restore nftables firewall rules +# if both are queued for some reason, don't store before restoring :) +Before=nftables-store.service +# sounds reasonable to have firewall up before any of the services go up +Before=network.target +Conflicts=shutdown.target + +[Service] +Type=oneshot +ExecStart=/usr/libexec/nftables/nftables.sh load /var/lib/nftables/rules-save + +[Install] +WantedBy=basic.target diff --git a/net-firewall/nftables/files/systemd/nftables-store.service b/net-firewall/nftables/files/systemd/nftables-store.service new file mode 100644 index 000000000000..373f8b947d7d --- /dev/null +++ b/net-firewall/nftables/files/systemd/nftables-store.service @@ -0,0 +1,11 @@ +[Unit] +Description=Store nftables firewall rules +Before=shutdown.target +DefaultDependencies=No + +[Service] +Type=oneshot +ExecStart=/usr/libexec/nftables/nftables.sh store /var/lib/nftables/rules-save + +[Install] +WantedBy=shutdown.target diff --git a/net-firewall/nftables/files/systemd/nftables.service b/net-firewall/nftables/files/systemd/nftables.service new file mode 100644 index 000000000000..d6f05c7cf467 --- /dev/null +++ b/net-firewall/nftables/files/systemd/nftables.service @@ -0,0 +1,6 @@ +[Unit] +Description=Store and restore nftables firewall rules + +[Install] +Also=nftables-store.service +Also=nftables-restore.service diff --git a/net-firewall/nftables/nftables-0.5-r2.ebuild b/net-firewall/nftables/nftables-0.5-r2.ebuild new file mode 100644 index 000000000000..a495588efb8f --- /dev/null +++ b/net-firewall/nftables/nftables-0.5-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools linux-info eutils systemd + +DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools" +HOMEPAGE="http://netfilter.org/projects/nftables/" +SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="debug gmp +readline" + +RDEPEND=">=net-libs/libmnl-1.0.3 + >=net-libs/libnftnl-1.0.5 + gmp? ( dev-libs/gmp:0= ) + readline? ( sys-libs/readline:0= )" +DEPEND="${RDEPEND} + >=app-text/docbook2X-0.8.8-r4 + sys-devel/bison + sys-devel/flex" + +S="${WORKDIR}"/v${PV} + +pkg_setup() { + if kernel_is ge 3 13; then + CONFIG_CHECK="~NF_TABLES" + linux-info_pkg_setup + else + eerror "This package requires kernel version 3.13 or newer to work properly." + fi +} + +src_prepare() { + epatch_user + eautoreconf +} + +src_configure() { + econf \ + --sbindir="${EPREFIX}"/sbin \ + $(use_enable debug) \ + $(use_with readline cli) \ + $(use_with !gmp mini_gmp) +} + +src_install() { + default + + dodir /usr/libexec/${PN} + cp -p "${FILESDIR}"/libexec/${PN}.sh "${D}"/usr/libexec/${PN}/${PN}.sh + + newconfd "${FILESDIR}"/${PN}.confd ${PN} + newinitd "${FILESDIR}"/${PN}.init-r2 ${PN} + keepdir /var/lib/nftables + + systemd_dounit "${FILESDIR}"/systemd/${PN}{,-{re,}store}.service +} diff --git a/net-firewall/shorewall-core/Manifest b/net-firewall/shorewall-core/Manifest deleted file mode 100644 index e42704c3edfc..000000000000 --- a/net-firewall/shorewall-core/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST shorewall-core-4.5.21.10.tar.bz2 86185 SHA256 57e4b96ae3258b5150fbb188921845e8843d6b6ccb77d60a10bb984f87951334 SHA512 ad96fd91d5d8eb900b7a2180a37fa1826c7448fd5ff0f94f938e897b2cdf9d7b2a064cb4499fb76107bb8cf8f32c1265a7ff6d5966dae1d1d76a4a61482d6c81 WHIRLPOOL f08ccd4c59bac5f7f1fc8ea1bec853e5286aa1f13ad0b09fd3578d5002266ec210382a73f8a2f8b45dd09dda93cdd695f259ee60803820ed2715dc046ff16e7c -DIST shorewall-core-4.5.21.9.tar.bz2 86021 SHA256 f431edf0109641b7fd7c9568e39917b16f1d776393d58aef328f82bf5ef20656 SHA512 53525a3159e33aefbc39ff59fe300e5da3f51a4c2c363ecb4b56888d87ef48f56b8ec7c4d09668407148898f2704ff60627a90b42203cf48d2e4c3d3c5fd8f41 WHIRLPOOL 032ee33b1e1e3effc1a7b97ad4000b4e9eaf0a1f4d45cffeb252298aaea06444484ccc80b4c5115d59ffb6e2d76e2fac97b2ceb6b2b2c4b7283f4cdd4778a6f6 diff --git a/net-firewall/shorewall-core/files/4.5.21.10-r1/shorewallrc b/net-firewall/shorewall-core/files/4.5.21.10-r1/shorewallrc deleted file mode 100644 index 46f5eb9a3603..000000000000 --- a/net-firewall/shorewall-core/files/4.5.21.10-r1/shorewallrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# Gentoo Shorewall 4.5 rc file -# -BUILD= #Default is to detect the build system -HOST=gentoo #Gentoo GNU Linux -PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc. -SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. -LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. -PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory -CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed -SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin #Directory where system administration programs are installed -MANDIR=${PREFIX}/share/man #Directory where manpages are installed. -INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed. -INITFILE=${PRODUCT} #Name of the product's installed SysV init script -INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script -ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) -SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file -SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR -SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed -SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR -VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored. -VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored. diff --git a/net-firewall/shorewall-core/files/4.5.21.9/shorewallrc b/net-firewall/shorewall-core/files/4.5.21.9/shorewallrc deleted file mode 100644 index 46f5eb9a3603..000000000000 --- a/net-firewall/shorewall-core/files/4.5.21.9/shorewallrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# Gentoo Shorewall 4.5 rc file -# -BUILD= #Default is to detect the build system -HOST=gentoo #Gentoo GNU Linux -PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc. -SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. -LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. -PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory -CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed -SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin #Directory where system administration programs are installed -MANDIR=${PREFIX}/share/man #Directory where manpages are installed. -INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed. -INITFILE=${PRODUCT} #Name of the product's installed SysV init script -INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script -ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) -SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file -SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR -SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed -SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR -VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored. -VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored. diff --git a/net-firewall/shorewall-core/metadata.xml b/net-firewall/shorewall-core/metadata.xml deleted file mode 100644 index 52ffdde3f9be..000000000000 --- a/net-firewall/shorewall-core/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>netmon</herd> - <herd>proxy-maintainers</herd> - <maintainer> - <email>whissi@whissi.de</email> - <name>Thomas D. (Whissi)</name> - </maintainer> -</pkgmetadata> diff --git a/net-firewall/shorewall-core/shorewall-core-4.5.21.10-r1.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.21.10-r1.ebuild deleted file mode 100644 index 4e189a5b858b..000000000000 --- a/net-firewall/shorewall-core/shorewall-core-4.5.21.10-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils prefix versionator - -MY_URL_PREFIX= -case ${P} in - *_beta* | \ - *_rc*) - MY_URL_PREFIX='development/' - ;; -esac - -MY_PV=${PV/_rc/-RC} -MY_PV=${MY_PV/_beta/-Beta} -MY_P=${PN}-${MY_PV} - -MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) -MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) - -DESCRIPTION="Core libraries of shorewall / shorewall(6)-lite" -HOMEPAGE="http://www.shorewall.net/" -SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="selinux" - -DEPEND=" - >=dev-lang/perl-5.10 - virtual/perl-Digest-SHA - !<net-firewall/shorewall-4.5.0.1 -" -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4.20 - >=sys-apps/iproute2-3.8.0[-minimal] - >=sys-devel/bc-1.06.95 - >=sys-apps/coreutils-8.20 - selinux? ( >=sec-policy/selinux-shorewall-2.20130424-r2 ) -" - -DOCS=( changelog.txt releasenotes.txt ) - -S=${WORKDIR}/${PN}-${MY_PV} - -src_prepare() { - cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" - eprefixify "${S}"/shorewallrc.gentoo - - epatch_user -} - -src_configure() { - :; -} - -src_install() { - DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" - default -} - -pkg_postinst() { - if ! has_version sys-apps/net-tools; then - elog "It is recommended to install sys-apps/net-tools which will provide the" - elog "the 'arp' utility which will give you a better 'shorewall-lite dump' output:" - elog "" - elog " # emerge sys-apps/net-tools" - fi -} diff --git a/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild deleted file mode 100644 index f313a9316472..000000000000 --- a/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils prefix versionator - -MY_URL_PREFIX= -case ${P} in - *_beta* | \ - *_rc*) - MY_URL_PREFIX='development/' - ;; -esac - -MY_PV=${PV/_rc/-RC} -MY_PV=${MY_PV/_beta/-Beta} -MY_P=${PN}-${MY_PV} - -MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) -MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) - -DESCRIPTION="Core libraries of shorewall / shorewall(6)-lite" -HOMEPAGE="http://www.shorewall.net/" -SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="selinux" - -DEPEND=" - >=dev-lang/perl-5.10 - virtual/perl-Digest-SHA - !<net-firewall/shorewall-4.5.0.1 -" -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4.20 - >=sys-apps/iproute2-3.8.0[-minimal] - >=sys-devel/bc-1.06.95 - >=sys-apps/coreutils-8.20 - selinux? ( >=sec-policy/selinux-shorewall-2.20130424-r2 ) -" - -DOCS=( changelog.txt releasenotes.txt ) - -S=${WORKDIR}/${PN}-${MY_PV} - -src_prepare() { - cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" - eprefixify "${S}"/shorewallrc.gentoo - - epatch_user -} - -src_configure() { - :; -} - -src_install() { - DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" - default -} - -pkg_postinst() { - if ! has_version sys-apps/net-tools; then - elog "It is recommended to install sys-apps/net-tools which will provide the" - elog "the 'arp' utility which will give you a better 'shorewall-lite dump' output:" - elog "" - elog " # emerge sys-apps/net-tools" - fi -} diff --git a/net-firewall/shorewall-init/Manifest b/net-firewall/shorewall-init/Manifest deleted file mode 100644 index bec4a10e313c..000000000000 --- a/net-firewall/shorewall-init/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST shorewall-init-4.5.21.10.tar.bz2 66287 SHA256 53dc29e61d2ed91b7d47f5d4ef51f751567288b2bf0c4459ddbae8dc8259dc32 SHA512 4856816b4f7c5d9015f4c8e65246297ccf927b979050cb955253ef24947938fc31e5aed9b8f6f4a0f5d2ae390a97cf5cd6010639c677befb981ec85234435f6e WHIRLPOOL a5463c06a7c60129f5b969cc28c4c94701d12955192179055deed9e29bb07cab24c4885b8ec279f247fac83b72fa8e39880bceae153ba82c41f7bd4a7cff0740 -DIST shorewall-init-4.5.21.9.tar.bz2 66436 SHA256 53867182aac095777d08830260596eaad8893c64715a27c837ac928546803f20 SHA512 973302b3f74f655b6b284e36caaa02e95ed3e3afabf5f0eae5307381cf95f8e33f3a85696b573e928dad91b121123ab07903954dfb6fa3b57a4759dfa72f93f6 WHIRLPOOL 43f527cbb4b36b725a981076df1a2efd5213058439916d56baf94dc6981b305286e42d7f8d406f8c6e47362cac92a5674975642e8d2535f0cf6e685db9d918c5 diff --git a/net-firewall/shorewall-init/files/4.5.21.10-r1/01_Remove-ipset-functionality.patch b/net-firewall/shorewall-init/files/4.5.21.10-r1/01_Remove-ipset-functionality.patch deleted file mode 100644 index 620e479f92fc..000000000000 --- a/net-firewall/shorewall-init/files/4.5.21.10-r1/01_Remove-ipset-functionality.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- shorewall-init.old 2013-09-08 23:25:36.364924304 +0200 -+++ shorewall-init 2013-09-08 23:29:27.418736392 +0200 -@@ -79,10 +79,6 @@ - fi - done - -- if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then -- ipset -R < "$SAVE_IPSETS" -- fi -- - return 0 - } - -@@ -100,13 +96,6 @@ - fi - done - -- if [ -n "$SAVE_IPSETS" ]; then -- mkdir -p $(dirname "$SAVE_IPSETS") -- if ipset -S > "${SAVE_IPSETS}.tmp"; then -- grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS" -- fi -- fi -- - return 0 - } - diff --git a/net-firewall/shorewall-init/files/4.5.21.10-r1/README.Gentoo.txt b/net-firewall/shorewall-init/files/4.5.21.10-r1/README.Gentoo.txt deleted file mode 100644 index f7b13fed3de6..000000000000 --- a/net-firewall/shorewall-init/files/4.5.21.10-r1/README.Gentoo.txt +++ /dev/null @@ -1,30 +0,0 @@ -shorewall-init from upstream offers two features (taken from [1]): - - 1. It can 'close' the firewall before the network interfaces are - brought up during boot. - - 2. It can change the firewall state as the result of interfaces - being brought up or taken down. - -On Gentoo we only support the first feature -- the firewall lockdown during -boot. - -We do not support the second feature, because Gentoo doesn't support a -if-{up,down}.d folder like other distributions do. If you would want to use -such a feature, you would have to add a custom action to /etc/conf.d/net -(please refer to the Gentoo Linux Handbook [2] for more information). -If you are able to add your custom {pre,post}{up,down} action, your are -also able to specify what shorewall{6,-lite,6-lite} should do, so there is -no need for upstream's scripts in Gentoo. - -If you disagree with us, feel free to open a bug [3] and contribute your -solution for Gentoo. - -Upstream's original init script also supports saving and restoring of -ipsets. Please use the init script from net-firewall/ipset if you need -such a feature. - - -[1] http://www.shorewall.net/Shorewall-init.html -[2] http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=4&chap=5 -[3] https://bugs.gentoo.org diff --git a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.confd b/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.confd deleted file mode 100644 index 4ca0024579f7..000000000000 --- a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.confd +++ /dev/null @@ -1,9 +0,0 @@ -# List the Shorewall products that Shorewall-init is to -# initialize (space-separated list). -# -# Sample: PRODUCTS="shorewall shorewall6-lite" -# -PRODUCTS="" - -# Startup options - set verbosity to 0 (minimal reporting) -OPTIONS="-V0" diff --git a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.initd b/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.initd deleted file mode 100644 index 3b574c56386b..000000000000 --- a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.initd +++ /dev/null @@ -1,196 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -SHOREWALLRC_FILE="@GENTOO_PORTAGE_EPREFIX@/usr/share/shorewall/shorewallrc" -CONFIG_FILE="@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/${SVCNAME}" - -description="Puts Shorewall in a safe state at boot time" -description="${description} prior to bringing up the network." - -required_files="$SHOREWALLRC_FILE" - -depend() { - need localmount - before net - after bootmisc ipset tmpfiles.setup ulogd -} - - -. $SHOREWALLRC_FILE - -checkconfig() { - local PRODUCT= - - if [ -z "${VARLIB}" ]; then - eerror "\"VARLIB\" isn't defined or empty! Please check" \ - "\"${SHOREWALLRC_FILE}\"." - - - return 1 - fi - - if [ -z "${PRODUCTS}" ]; then - eerror "${SVCNAME} isn't configured! Please check" \ - "\"${CONFIG_FILE}\"." - - - return 1 - fi - - for PRODUCT in ${PRODUCTS}; do - if [ ! -x ${SBINDIR}/${PRODUCT} ]; then - eerror "Invalid product \"${PRODUCT}\" specified" \ - "in \"${CONFIG_FILE}\"!" - eerror "Maybe \"${PRODUCT}\" isn't installed?" - - - return 1 - fi - done - - - return 0 -} - -check_firewall_script() { - if [ ! -x ${STATEDIR}/firewall ]; then - if [ ${PRODUCT} = shorewall -o ${PRODUCT} = shorewall6 ]; then - ebegin "Creating \"${STATEDIR}/firewall\"" - ${SBINDIR}/${PRODUCT} compile 1>/dev/null - eend $? - else - eerror "\"${PRODUCT}\" isn't configured!" - eerror "Please go to your 'administrative system'" \ - "and deploy the compiled firewall" \ - "configuration for this system." - - - return 1 - fi - fi - - - return 0 -} - -is_allowed_to_be_executed() { - # This is not a real service. shorewall-init is an intermediate - # script to put your Shorewall-based firewall into a safe state - # at boot time prior to bringing up the network. - # Please read /usr/share/doc/shorewall-init-*/README.gentoo.gz - # for more information. - # When your system is up, there is no need to call shorewall-init. - # Please call shorewall{,6,-lite,6-lite} directly. That's the - # reason why we are preventing start, stop or restart here. - - local PRODUCT= - - if [ "${RC_RUNLEVEL}" != "boot" -a "${RC_CMD}" = "start" ]; then - # Starting shorewall-init is only allowed at boot time - eerror "This is a boot service, which can only be started" \ - "at boot." - eerror "If you want to get your shorewall-based firewall" \ - "into the same safe boot state again, run" - eerror "" - eindent - for PRODUCT in ${PRODUCTS}; do - eerror "/etc/init.d/${PRODUCT} stop" - done - eoutdent - eerror "" - eerror "Yes, \"stop\" and not start." - eerror "" - return 1 - fi - - if [ "${RC_RUNLEVEL}" != "shutdown" -a "${RC_CMD}" = "stop" ]; then - # Stopping shorewall-init is only allowed at shutdown - eerror "This is a boot service, which cannot be stopped." - eerror "If you really want to stop your Shorewall-based" \ - "firewall the same way this service would stop" \ - "Shorewall at shutdown, please run" - eerror "" - eindent - for PRODUCT in ${PRODUCTS}; do - eerror "/etc/init.d/${PRODUCT} clear" - done - eoutdent - eerror "" - eerror "Keep in mind that this will clear (=bring down)" \ - "your firewall!" - eerror "" - return 1 - fi - - if [ "${RC_CMD}" = "restart" ]; then - eerror "This is a boot service, which cannot be restarted." - eerror "If you want to restart any of your Shorewall-based" \ - "firewalls, run" - eerror "" - eindent - for PRODUCT in ${PRODUCTS}; do - eerror "/etc/init.d/${PRODUCT} restart" - done - eoutdent - eerror "" - return 1 - fi - - - return 0 -} - -set_statedir() { - STATEDIR= - local VARDIR= - - if [ -f ${CONFDIR}/${PRODUCT}/vardir ]; then - STATEDIR=$( . ${CONFDIR}/${PRODUCT}/vardir && echo ${VARDIR} ) - fi - - [ ! -n "${STATEDIR}" ] && STATEDIR=${VARLIB}/${PRODUCT} -} - -start_pre() { - checkconfig || return 1 - - is_allowed_to_be_executed || return 1 -} - -start() { - local PRODUCT= - local STATEDIR= - - for PRODUCT in ${PRODUCTS}; do - set_statedir - - check_firewall_script || return 1 - - ebegin "Initializing \"${PRODUCT}\"" - ${STATEDIR}/firewall stop 1>/dev/null - eend $? - done -} - -stop_pre() { - checkconfig || return 1 - - is_allowed_to_be_executed || return 1 -} - -stop() { - local PRODUCT= - local STATEDIR= - - for PRODUCT in ${PRODUCTS}; do - set_statedir - - check_firewall_script || return 1 - - ebegin "Clearing \"${PRODUCT}\"" - ${STATEDIR}/firewall clear 1>/dev/null - eend $? - done -} diff --git a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.systemd b/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.systemd deleted file mode 100644 index e48a729105b8..000000000000 --- a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.systemd +++ /dev/null @@ -1,16 +0,0 @@ -# -# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5 -# -[Unit] -Description=shorewall-init -Documentation=http://www.shorewall.net/Shorewall-init.html -Before=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/sbin/shorewall-init start -ExecStop=/sbin/shorewall-init stop - -[Install] -WantedBy=multi-user.target diff --git a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewallrc b/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewallrc deleted file mode 100644 index 46f5eb9a3603..000000000000 --- a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewallrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# Gentoo Shorewall 4.5 rc file -# -BUILD= #Default is to detect the build system -HOST=gentoo #Gentoo GNU Linux -PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc. -SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. -LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. -PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory -CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed -SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin #Directory where system administration programs are installed -MANDIR=${PREFIX}/share/man #Directory where manpages are installed. -INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed. -INITFILE=${PRODUCT} #Name of the product's installed SysV init script -INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script -ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) -SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file -SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR -SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed -SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR -VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored. -VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored. diff --git a/net-firewall/shorewall-init/files/4.5.21.9/01_Remove-ipset-functionality.patch b/net-firewall/shorewall-init/files/4.5.21.9/01_Remove-ipset-functionality.patch deleted file mode 100644 index 620e479f92fc..000000000000 --- a/net-firewall/shorewall-init/files/4.5.21.9/01_Remove-ipset-functionality.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- shorewall-init.old 2013-09-08 23:25:36.364924304 +0200 -+++ shorewall-init 2013-09-08 23:29:27.418736392 +0200 -@@ -79,10 +79,6 @@ - fi - done - -- if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then -- ipset -R < "$SAVE_IPSETS" -- fi -- - return 0 - } - -@@ -100,13 +96,6 @@ - fi - done - -- if [ -n "$SAVE_IPSETS" ]; then -- mkdir -p $(dirname "$SAVE_IPSETS") -- if ipset -S > "${SAVE_IPSETS}.tmp"; then -- grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS" -- fi -- fi -- - return 0 - } - diff --git a/net-firewall/shorewall-init/files/4.5.21.9/README.Gentoo.txt b/net-firewall/shorewall-init/files/4.5.21.9/README.Gentoo.txt deleted file mode 100644 index f7b13fed3de6..000000000000 --- a/net-firewall/shorewall-init/files/4.5.21.9/README.Gentoo.txt +++ /dev/null @@ -1,30 +0,0 @@ -shorewall-init from upstream offers two features (taken from [1]): - - 1. It can 'close' the firewall before the network interfaces are - brought up during boot. - - 2. It can change the firewall state as the result of interfaces - being brought up or taken down. - -On Gentoo we only support the first feature -- the firewall lockdown during -boot. - -We do not support the second feature, because Gentoo doesn't support a -if-{up,down}.d folder like other distributions do. If you would want to use -such a feature, you would have to add a custom action to /etc/conf.d/net -(please refer to the Gentoo Linux Handbook [2] for more information). -If you are able to add your custom {pre,post}{up,down} action, your are -also able to specify what shorewall{6,-lite,6-lite} should do, so there is -no need for upstream's scripts in Gentoo. - -If you disagree with us, feel free to open a bug [3] and contribute your -solution for Gentoo. - -Upstream's original init script also supports saving and restoring of -ipsets. Please use the init script from net-firewall/ipset if you need -such a feature. - - -[1] http://www.shorewall.net/Shorewall-init.html -[2] http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=4&chap=5 -[3] https://bugs.gentoo.org diff --git a/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.confd b/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.confd deleted file mode 100644 index 4ca0024579f7..000000000000 --- a/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.confd +++ /dev/null @@ -1,9 +0,0 @@ -# List the Shorewall products that Shorewall-init is to -# initialize (space-separated list). -# -# Sample: PRODUCTS="shorewall shorewall6-lite" -# -PRODUCTS="" - -# Startup options - set verbosity to 0 (minimal reporting) -OPTIONS="-V0" diff --git a/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.initd b/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.initd deleted file mode 100644 index 3b574c56386b..000000000000 --- a/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.initd +++ /dev/null @@ -1,196 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -SHOREWALLRC_FILE="@GENTOO_PORTAGE_EPREFIX@/usr/share/shorewall/shorewallrc" -CONFIG_FILE="@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/${SVCNAME}" - -description="Puts Shorewall in a safe state at boot time" -description="${description} prior to bringing up the network." - -required_files="$SHOREWALLRC_FILE" - -depend() { - need localmount - before net - after bootmisc ipset tmpfiles.setup ulogd -} - - -. $SHOREWALLRC_FILE - -checkconfig() { - local PRODUCT= - - if [ -z "${VARLIB}" ]; then - eerror "\"VARLIB\" isn't defined or empty! Please check" \ - "\"${SHOREWALLRC_FILE}\"." - - - return 1 - fi - - if [ -z "${PRODUCTS}" ]; then - eerror "${SVCNAME} isn't configured! Please check" \ - "\"${CONFIG_FILE}\"." - - - return 1 - fi - - for PRODUCT in ${PRODUCTS}; do - if [ ! -x ${SBINDIR}/${PRODUCT} ]; then - eerror "Invalid product \"${PRODUCT}\" specified" \ - "in \"${CONFIG_FILE}\"!" - eerror "Maybe \"${PRODUCT}\" isn't installed?" - - - return 1 - fi - done - - - return 0 -} - -check_firewall_script() { - if [ ! -x ${STATEDIR}/firewall ]; then - if [ ${PRODUCT} = shorewall -o ${PRODUCT} = shorewall6 ]; then - ebegin "Creating \"${STATEDIR}/firewall\"" - ${SBINDIR}/${PRODUCT} compile 1>/dev/null - eend $? - else - eerror "\"${PRODUCT}\" isn't configured!" - eerror "Please go to your 'administrative system'" \ - "and deploy the compiled firewall" \ - "configuration for this system." - - - return 1 - fi - fi - - - return 0 -} - -is_allowed_to_be_executed() { - # This is not a real service. shorewall-init is an intermediate - # script to put your Shorewall-based firewall into a safe state - # at boot time prior to bringing up the network. - # Please read /usr/share/doc/shorewall-init-*/README.gentoo.gz - # for more information. - # When your system is up, there is no need to call shorewall-init. - # Please call shorewall{,6,-lite,6-lite} directly. That's the - # reason why we are preventing start, stop or restart here. - - local PRODUCT= - - if [ "${RC_RUNLEVEL}" != "boot" -a "${RC_CMD}" = "start" ]; then - # Starting shorewall-init is only allowed at boot time - eerror "This is a boot service, which can only be started" \ - "at boot." - eerror "If you want to get your shorewall-based firewall" \ - "into the same safe boot state again, run" - eerror "" - eindent - for PRODUCT in ${PRODUCTS}; do - eerror "/etc/init.d/${PRODUCT} stop" - done - eoutdent - eerror "" - eerror "Yes, \"stop\" and not start." - eerror "" - return 1 - fi - - if [ "${RC_RUNLEVEL}" != "shutdown" -a "${RC_CMD}" = "stop" ]; then - # Stopping shorewall-init is only allowed at shutdown - eerror "This is a boot service, which cannot be stopped." - eerror "If you really want to stop your Shorewall-based" \ - "firewall the same way this service would stop" \ - "Shorewall at shutdown, please run" - eerror "" - eindent - for PRODUCT in ${PRODUCTS}; do - eerror "/etc/init.d/${PRODUCT} clear" - done - eoutdent - eerror "" - eerror "Keep in mind that this will clear (=bring down)" \ - "your firewall!" - eerror "" - return 1 - fi - - if [ "${RC_CMD}" = "restart" ]; then - eerror "This is a boot service, which cannot be restarted." - eerror "If you want to restart any of your Shorewall-based" \ - "firewalls, run" - eerror "" - eindent - for PRODUCT in ${PRODUCTS}; do - eerror "/etc/init.d/${PRODUCT} restart" - done - eoutdent - eerror "" - return 1 - fi - - - return 0 -} - -set_statedir() { - STATEDIR= - local VARDIR= - - if [ -f ${CONFDIR}/${PRODUCT}/vardir ]; then - STATEDIR=$( . ${CONFDIR}/${PRODUCT}/vardir && echo ${VARDIR} ) - fi - - [ ! -n "${STATEDIR}" ] && STATEDIR=${VARLIB}/${PRODUCT} -} - -start_pre() { - checkconfig || return 1 - - is_allowed_to_be_executed || return 1 -} - -start() { - local PRODUCT= - local STATEDIR= - - for PRODUCT in ${PRODUCTS}; do - set_statedir - - check_firewall_script || return 1 - - ebegin "Initializing \"${PRODUCT}\"" - ${STATEDIR}/firewall stop 1>/dev/null - eend $? - done -} - -stop_pre() { - checkconfig || return 1 - - is_allowed_to_be_executed || return 1 -} - -stop() { - local PRODUCT= - local STATEDIR= - - for PRODUCT in ${PRODUCTS}; do - set_statedir - - check_firewall_script || return 1 - - ebegin "Clearing \"${PRODUCT}\"" - ${STATEDIR}/firewall clear 1>/dev/null - eend $? - done -} diff --git a/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.systemd b/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.systemd deleted file mode 100644 index e48a729105b8..000000000000 --- a/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.systemd +++ /dev/null @@ -1,16 +0,0 @@ -# -# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5 -# -[Unit] -Description=shorewall-init -Documentation=http://www.shorewall.net/Shorewall-init.html -Before=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/sbin/shorewall-init start -ExecStop=/sbin/shorewall-init stop - -[Install] -WantedBy=multi-user.target diff --git a/net-firewall/shorewall-init/files/4.5.21.9/shorewallrc b/net-firewall/shorewall-init/files/4.5.21.9/shorewallrc deleted file mode 100644 index 46f5eb9a3603..000000000000 --- a/net-firewall/shorewall-init/files/4.5.21.9/shorewallrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# Gentoo Shorewall 4.5 rc file -# -BUILD= #Default is to detect the build system -HOST=gentoo #Gentoo GNU Linux -PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc. -SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. -LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. -PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory -CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed -SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin #Directory where system administration programs are installed -MANDIR=${PREFIX}/share/man #Directory where manpages are installed. -INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed. -INITFILE=${PRODUCT} #Name of the product's installed SysV init script -INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script -ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) -SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file -SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR -SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed -SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR -VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored. -VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored. diff --git a/net-firewall/shorewall-init/metadata.xml b/net-firewall/shorewall-init/metadata.xml deleted file mode 100644 index 52ffdde3f9be..000000000000 --- a/net-firewall/shorewall-init/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>netmon</herd> - <herd>proxy-maintainers</herd> - <maintainer> - <email>whissi@whissi.de</email> - <name>Thomas D. (Whissi)</name> - </maintainer> -</pkgmetadata> diff --git a/net-firewall/shorewall-init/shorewall-init-4.5.21.10-r1.ebuild b/net-firewall/shorewall-init/shorewall-init-4.5.21.10-r1.ebuild deleted file mode 100644 index b45250637e2f..000000000000 --- a/net-firewall/shorewall-init/shorewall-init-4.5.21.10-r1.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 eutils versionator prefix - -MY_URL_PREFIX= -case ${P} in - *_beta* | \ - *_rc*) - MY_URL_PREFIX='development/' - ;; -esac - -MY_PV=${PV/_rc/-RC} -MY_PV=${MY_PV/_beta/-Beta} -MY_P=${PN}-${MY_PV} - -MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) -MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) - -DESCRIPTION="Component to secure a Shorewall-protected system at boot time prior to bringing up the network" -HOMEPAGE="http://www.shorewall.net/" -SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -DEPEND=">=sys-apps/coreutils-8.20" -RDEPEND=" - ${DEPEND} - || ( =net-firewall/shorewall-${PVR} =net-firewall/shorewall6-${PVR} =net-firewall/shorewall-lite-${PVR} =net-firewall/shorewall6-lite-${PVR} ) -" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" - eprefixify "${S}"/shorewallrc.gentoo - - cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed" - - cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed" - eprefixify "${S}"/init.gentoo.sh - - cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed" - - epatch "${FILESDIR}"/${PVR}/01_Remove-ipset-functionality.patch - epatch_user -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" - - if [ -d "${D}/etc/logrotate.d" ]; then - # On Gentoo, shorewall-init will not create shorewall-ifupdown.log, - # so we don't need a logrotate folder at all - rm -rf "${D}"/etc/logrotate.d - fi - - if [ -d "${D}/etc/NetworkManager" ]; then - # On Gentoo, we don't support NetworkManager - # so we don't need these folder at all - rm -rf "${D}"/etc/NetworkManager - fi - - if [ -f "${D}/usr/share/shorewall-init/ifupdown" ]; then - # This script won't work on Gentoo - rm -rf "${D}"/usr/share/shorewall-init/ifupdown - fi - - dodoc changelog.txt releasenotes.txt "${FILESDIR}"/${PVR}/README.Gentoo.txt -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Before you can use ${PN}, you need to edit its configuration in:" - elog "" - elog " ${EPREFIX}/etc/conf.d/${PN}" - elog "" - elog "To use ${PN}, please add ${PN} to your boot runlevel:" - elog "" - elog " # rc-update add ${PN} boot" - elog "" - ewarn "Notice:" - ewarn "${PN} is more like a start script than a service." - ewarn "Therefore you cannot start or stop ${PN} at default runlevel." - ewarn "" - ewarn "For more information read ${EPREFIX}/usr/share/doc/${PF}/README.Gentoo.txt.bz2" - fi -} diff --git a/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild b/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild deleted file mode 100644 index 65795dadd495..000000000000 --- a/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils versionator prefix - -MY_URL_PREFIX= -case ${P} in - *_beta* | \ - *_rc*) - MY_URL_PREFIX='development/' - ;; -esac - -MY_PV=${PV/_rc/-RC} -MY_PV=${MY_PV/_beta/-Beta} -MY_P=${PN}-${MY_PV} - -MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) -MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) - -DESCRIPTION="Component to secure a Shorewall-protected system at boot time prior to bringing up the network" -HOMEPAGE="http://www.shorewall.net/" -SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="" - -DEPEND=">=sys-apps/coreutils-8.20" -RDEPEND=" - ${DEPEND} - || ( =net-firewall/shorewall-${PVR} =net-firewall/shorewall6-${PVR} =net-firewall/shorewall-lite-${PVR} =net-firewall/shorewall6-lite-${PVR} ) -" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" - eprefixify "${S}"/shorewallrc.gentoo - - cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed" - - cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed" - eprefixify "${S}"/init.gentoo.sh - - cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed" - - epatch "${FILESDIR}"/${PVR}/01_Remove-ipset-functionality.patch - epatch_user -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" - - if [ -d "${D}/etc/logrotate.d" ]; then - # On Gentoo, shorewall-init will not create shorewall-ifupdown.log, - # so we don't need a logrotate folder at all - rm -rf "${D}"/etc/logrotate.d - fi - - if [ -d "${D}/etc/NetworkManager" ]; then - # On Gentoo, we don't support NetworkManager - # so we don't need these folder at all - rm -rf "${D}"/etc/NetworkManager - fi - - if [ -f "${D}/usr/share/shorewall-init/ifupdown" ]; then - # This script won't work on Gentoo - rm -rf "${D}"/usr/share/shorewall-init/ifupdown - fi - - dodoc changelog.txt releasenotes.txt "${FILESDIR}"/${PVR}/README.Gentoo.txt -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Before you can use ${PN}, you need to edit its configuration in:" - elog "" - elog " ${EPREFIX}/etc/conf.d/${PN}" - elog "" - elog "To use ${PN}, please add ${PN} to your boot runlevel:" - elog "" - elog " # rc-update add ${PN} boot" - elog "" - ewarn "Notice:" - ewarn "${PN} is more like a start script than a service." - ewarn "Therefore you cannot start or stop ${PN} at default runlevel." - ewarn "" - ewarn "For more information read ${EPREFIX}/usr/share/doc/${PF}/README.Gentoo.txt.bz2" - fi -} diff --git a/net-firewall/shorewall-lite/Manifest b/net-firewall/shorewall-lite/Manifest deleted file mode 100644 index 35c9d0db9d85..000000000000 --- a/net-firewall/shorewall-lite/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e -DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4 -DIST shorewall-lite-4.5.21.10.tar.bz2 79456 SHA256 73f2e7101ca7ff296fa3a7be4dec6b6ec3ec562f5c0d746fe6e2355d2b8931e3 SHA512 145c18f7a2859bea9ce265d243a875e83fbbaa2c982f269f1401b73253133d8d48e1060c3b18aefdee09dbc8755fe3e875014dda354f38e90829f0d970b52718 WHIRLPOOL 0d7187d7ede8b01819c241fec61eeef03e17743845188f8e41b3448d814466994b8822e3dc166793d9b5b2b5f4b04dc33bd85664e09771746bc655756790e813 -DIST shorewall-lite-4.5.21.9.tar.bz2 79121 SHA256 af6c039d880581a6eaf7aba9f638ff86e471567b15e16adc607053651d1f50f5 SHA512 fb15881dc4d5fd05c8ca8421ee4a5deb0c9f6fdab955d0fc7dd371bf710706bf6d851bdb8ba00d0d34c1f7f1d2bc2cc39e9e9fe0a6d8b48ed4accc27c011462c WHIRLPOOL 2f8eb61da9b3eafdd184718054d14dfdef39afdf6e3724ee62c0386f12ea3aa3badcf959ee0351f8cdcd744cf4b262e168e5cd6afa677a8674d515541f0f2f80 diff --git a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.confd b/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.confd deleted file mode 100644 index e5957167b5b9..000000000000 --- a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.confd +++ /dev/null @@ -1,15 +0,0 @@ -# Global start/restart/stop options -# -OPTIONS="" - -# Start options -# -STARTOPTIONS="" - -# Stop options -# -STOPOPTIONS="" - -# Restart options -# -RESTARTOPTIONS="" diff --git a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.initd b/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.initd deleted file mode 100644 index 4fdbe607bdf1..000000000000 --- a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.initd +++ /dev/null @@ -1,82 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is' -description="${description} a high-level tool for configuring Netfilter." - -extra_commands="clear" -extra_started_commands="reset" - -description_clear="Clear will remove all rules and chains installed by" -description_clear="${description_clear} Shorewall Lite. The firewall is" -description_clear="${description_clear} then wide open and unprotected." - -description_reset="All the packet and byte counters in the firewall are reset." - -depend() { - need net - provide firewall - after ulogd -} - -status() { - local _retval - /sbin/shorewall-lite status 1>/dev/null - _retval=$? - if [ ${_retval} = '0' ]; then - einfo 'status: started' - mark_service_started "${SVCNAME}" - return 0 - else - einfo 'status: stopped' - mark_service_stopped "${SVCNAME}" - return 3 - fi -} - -start() { - ebegin "Starting shorewall-lite" - /sbin/shorewall-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null - eend $? -} - -stop() { - ebegin "Stopping shorewall-lite" - /sbin/shorewall-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null - eend $? -} - -restart() { - # shorewall comes with its own control script that includes a - # restart function, so refrain from calling svc_stop/svc_start - # here. Note that this comment is required to fix bug 55576; - # runscript.sh greps this script... (09 Jul 2004 agriffis) - - ebegin "Restarting shorewall-lite" - /sbin/shorewall-lite status 1>/dev/null - if [ $? != 0 ] ; then - svc_start - else - /sbin/shorewall-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null - fi - eend $? -} - -clear() { - # clear will remove all the rules and bring the system to an unfirewalled - # state. (21 Nov 2004 eldad) - - ebegin "Clearing all shorewall-lite rules and setting policy to ACCEPT" - /sbin/shorewall-lite ${OPTIONS} clear 1>/dev/null - eend $? -} - -reset() { - # reset the packet and byte counters in the firewall - - ebegin "Resetting the packet and byte counters in shorewall-lite" - /sbin/shorewall-lite ${OPTIONS} reset 1>/dev/null - eend $? -} diff --git a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.systemd deleted file mode 100644 index a7c932418a9c..000000000000 --- a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.systemd +++ /dev/null @@ -1,17 +0,0 @@ -# -# The Shoreline Firewall Lite (Shorewall-Lite) Packet Filtering Firewall - V4.5 -# -[Unit] -Description=Shorewall IPv4 firewall lite -Documentation=man:shorewall-lite(8) http://www.shorewall.net/Documentation_Index.html -After=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=/etc/conf.d/shorewall-lite -ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS -ExecStop=/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS - -[Install] -WantedBy=multi-user.target diff --git a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewallrc b/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewallrc deleted file mode 100644 index 46f5eb9a3603..000000000000 --- a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewallrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# Gentoo Shorewall 4.5 rc file -# -BUILD= #Default is to detect the build system -HOST=gentoo #Gentoo GNU Linux -PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc. -SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. -LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. -PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory -CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed -SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin #Directory where system administration programs are installed -MANDIR=${PREFIX}/share/man #Directory where manpages are installed. -INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed. -INITFILE=${PRODUCT} #Name of the product's installed SysV init script -INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script -ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) -SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file -SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR -SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed -SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR -VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored. -VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored. diff --git a/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.confd b/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.confd deleted file mode 100644 index e5957167b5b9..000000000000 --- a/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.confd +++ /dev/null @@ -1,15 +0,0 @@ -# Global start/restart/stop options -# -OPTIONS="" - -# Start options -# -STARTOPTIONS="" - -# Stop options -# -STOPOPTIONS="" - -# Restart options -# -RESTARTOPTIONS="" diff --git a/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.initd b/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.initd deleted file mode 100644 index 4fdbe607bdf1..000000000000 --- a/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.initd +++ /dev/null @@ -1,82 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is' -description="${description} a high-level tool for configuring Netfilter." - -extra_commands="clear" -extra_started_commands="reset" - -description_clear="Clear will remove all rules and chains installed by" -description_clear="${description_clear} Shorewall Lite. The firewall is" -description_clear="${description_clear} then wide open and unprotected." - -description_reset="All the packet and byte counters in the firewall are reset." - -depend() { - need net - provide firewall - after ulogd -} - -status() { - local _retval - /sbin/shorewall-lite status 1>/dev/null - _retval=$? - if [ ${_retval} = '0' ]; then - einfo 'status: started' - mark_service_started "${SVCNAME}" - return 0 - else - einfo 'status: stopped' - mark_service_stopped "${SVCNAME}" - return 3 - fi -} - -start() { - ebegin "Starting shorewall-lite" - /sbin/shorewall-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null - eend $? -} - -stop() { - ebegin "Stopping shorewall-lite" - /sbin/shorewall-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null - eend $? -} - -restart() { - # shorewall comes with its own control script that includes a - # restart function, so refrain from calling svc_stop/svc_start - # here. Note that this comment is required to fix bug 55576; - # runscript.sh greps this script... (09 Jul 2004 agriffis) - - ebegin "Restarting shorewall-lite" - /sbin/shorewall-lite status 1>/dev/null - if [ $? != 0 ] ; then - svc_start - else - /sbin/shorewall-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null - fi - eend $? -} - -clear() { - # clear will remove all the rules and bring the system to an unfirewalled - # state. (21 Nov 2004 eldad) - - ebegin "Clearing all shorewall-lite rules and setting policy to ACCEPT" - /sbin/shorewall-lite ${OPTIONS} clear 1>/dev/null - eend $? -} - -reset() { - # reset the packet and byte counters in the firewall - - ebegin "Resetting the packet and byte counters in shorewall-lite" - /sbin/shorewall-lite ${OPTIONS} reset 1>/dev/null - eend $? -} diff --git a/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.systemd deleted file mode 100644 index a7c932418a9c..000000000000 --- a/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.systemd +++ /dev/null @@ -1,17 +0,0 @@ -# -# The Shoreline Firewall Lite (Shorewall-Lite) Packet Filtering Firewall - V4.5 -# -[Unit] -Description=Shorewall IPv4 firewall lite -Documentation=man:shorewall-lite(8) http://www.shorewall.net/Documentation_Index.html -After=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=/etc/conf.d/shorewall-lite -ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS -ExecStop=/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS - -[Install] -WantedBy=multi-user.target diff --git a/net-firewall/shorewall-lite/files/4.5.21.9/shorewallrc b/net-firewall/shorewall-lite/files/4.5.21.9/shorewallrc deleted file mode 100644 index 46f5eb9a3603..000000000000 --- a/net-firewall/shorewall-lite/files/4.5.21.9/shorewallrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# Gentoo Shorewall 4.5 rc file -# -BUILD= #Default is to detect the build system -HOST=gentoo #Gentoo GNU Linux -PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc. -SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. -LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. -PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory -CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed -SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin #Directory where system administration programs are installed -MANDIR=${PREFIX}/share/man #Directory where manpages are installed. -INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed. -INITFILE=${PRODUCT} #Name of the product's installed SysV init script -INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script -ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) -SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file -SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR -SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed -SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR -VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored. -VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored. diff --git a/net-firewall/shorewall-lite/metadata.xml b/net-firewall/shorewall-lite/metadata.xml deleted file mode 100644 index 52ffdde3f9be..000000000000 --- a/net-firewall/shorewall-lite/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>netmon</herd> - <herd>proxy-maintainers</herd> - <maintainer> - <email>whissi@whissi.de</email> - <name>Thomas D. (Whissi)</name> - </maintainer> -</pkgmetadata> diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.10-r1.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.21.10-r1.ebuild deleted file mode 100644 index d1dc86eae99a..000000000000 --- a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.10-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils linux-info prefix systemd versionator - -MY_URL_PREFIX= -case ${P} in - *_beta* | \ - *_rc*) - MY_URL_PREFIX='development/' - ;; -esac - -MY_PV=${PV/_rc/-RC} -MY_PV=${MY_PV/_beta/-Beta} -MY_P=${PN}-${MY_PV} -MY_P_DOCS=shorewall-docs-html-${MY_PV} - -MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) -MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) - -DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall" -HOMEPAGE="http://www.shorewall.net/" -SRC_URI=" - http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2 - doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 ) -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc" - -DEPEND="=net-firewall/shorewall-core-${PVR}" -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4.20 - >=sys-apps/iproute2-3.8.0[-minimal] -" - -S=${WORKDIR}/${MY_P} - -pkg_pretend() { - local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4" - - local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support." - - local ERROR_CONNTRACK_IPV4="${PN} requires NF_CONNTRACK_IPV4 support." - - check_extra_config -} - -src_prepare() { - cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" - eprefixify "${S}"/shorewallrc.gentoo - - cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed" - cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed" - cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed" - - epatch_user -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - keepdir /var/lib/${PN} - - DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" - - dodoc changelog.txt releasenotes.txt - if use doc; then - cd "${WORKDIR}/${MY_P_DOCS}" - dohtml -r * - fi -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Before you can use ${PN}, you need to provide a configuration, which you can" - elog "create using ${CATEGORY}/shorewall (the full version, including the compiler)." - elog "" - elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:" - elog "" - elog " # rc-update add ${PN} default" - fi - - if ! has_version ${CATEGORY}/shorewall-init; then - elog "" - elog "Starting with shorewall-lite-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init," - elog "which we recommend to install, to protect your firewall at system boot." - elog "" - elog "To read more about shorewall-init, please visit" - elog " http://www.shorewall.net/Shorewall-init.html" - fi -} diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.9.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.21.9.ebuild deleted file mode 100644 index c9e35b3278f4..000000000000 --- a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.9.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils linux-info prefix systemd versionator - -MY_URL_PREFIX= -case ${P} in - *_beta* | \ - *_rc*) - MY_URL_PREFIX='development/' - ;; -esac - -MY_PV=${PV/_rc/-RC} -MY_PV=${MY_PV/_beta/-Beta} -MY_P=${PN}-${MY_PV} -MY_P_DOCS=shorewall-docs-html-${MY_PV} - -MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) -MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) - -DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall" -HOMEPAGE="http://www.shorewall.net/" -SRC_URI=" - http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2 - doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 ) -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="doc" - -DEPEND="=net-firewall/shorewall-core-${PVR}" -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4.20 - >=sys-apps/iproute2-3.8.0[-minimal] -" - -S=${WORKDIR}/${MY_P} - -pkg_pretend() { - local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4" - - local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support." - - local ERROR_CONNTRACK_IPV4="${PN} requires NF_CONNTRACK_IPV4 support." - - check_extra_config -} - -src_prepare() { - cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" - eprefixify "${S}"/shorewallrc.gentoo - - cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed" - cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed" - cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed" - - epatch_user -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - keepdir /var/lib/${PN} - - DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" - - dodoc changelog.txt releasenotes.txt - if use doc; then - cd "${WORKDIR}/${MY_P_DOCS}" - dohtml -r * - fi -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Before you can use ${PN}, you need to provide a configuration, which you can" - elog "create using ${CATEGORY}/shorewall (the full version, including the compiler)." - elog "" - elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:" - elog "" - elog " # rc-update add ${PN} default" - fi - - if ! has_version ${CATEGORY}/shorewall-init; then - elog "" - elog "Starting with shorewall-lite-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init," - elog "which we recommend to install, to protect your firewall at system boot." - elog "" - elog "To read more about shorewall-init, please visit" - elog " http://www.shorewall.net/Shorewall-init.html" - fi -} diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest index 461f8bb4bbf1..519fcaf87f23 100644 --- a/net-firewall/shorewall/Manifest +++ b/net-firewall/shorewall/Manifest @@ -1,5 +1,3 @@ -DIST shorewall-4.5.21.10.tar.bz2 489469 SHA256 961331ba61e5e6dccc106e43685e45f19bf1e155502067c88e18ecf94c2a794f SHA512 bdc673b999c99624c61caa1239ac3a58c4d85743179de05ed5fe947e755fc4b01425da34b67cb5e6db693c62bf25e316517f1473b450a1d76887e69e4e384682 WHIRLPOOL 04a7afd30d79d6360ec325e7df06ffd6e911d938382a4c0c331312ddf6951d6564f5a0452b244095309fe4ce00b1c72838b0ef76e198e137c153a617dc22e8e5 -DIST shorewall-4.5.21.9.tar.bz2 489618 SHA256 a1fc41abcba3181235e217a5da53bb25d11e6cdeef49dde82a0daeb2bb305fc6 SHA512 137eb33f63a25533f90150de5cd246f47e5072f838f8e42b044bd6a620bce767f8cb2b9da995fcfb61e37ab6774ea97819f6f7408f669539917b419262a68496 WHIRLPOOL be464ef64e06b35ff9fdf74e9b6a8c88b8de1aa766ec3bf2a7ccf9b69731ba23dc638047f5ad44f451ab93e093458f8f88d7b16201d61bbdfce40075f9ef25be DIST shorewall-4.6.10.1.tar.bz2 496061 SHA256 de527474f5bac6bf59678321c604748c48efe28a897d339a2187a45e3efed8ef SHA512 a5ef4783ff04b6faaa2e25d1da57ca3c46860960859dad5cd3b8d3cb252626b1db39c35767b226333f10db7b08b0fb18c0c09cd4eaf14586cb02b1a4259b571d WHIRLPOOL 26ebb72e769d5ca7489f718cabdb1f9cfb78e2acd514329c7036edcafe27f159ffa4cdadeeb1cee43619f748474fcc7a614011147976abb14cf627503a542e3f DIST shorewall-4.6.13.1.tar.bz2 498949 SHA256 fc2c390fecbc0c78d5cd648596abc1edb1d338d748b4a0605695c3141e24d35e SHA512 1b8e0a008660a8b66bcc77bb92f110fbdc04a0925d6f19bb01a6e798baa907f5ca4f6f60851c861963ab49b1a0b2ae652d4d1234fcf18ab56325ebcc66fbefb1 WHIRLPOOL 6c2a63a5c547d429c3d9c5d05683d8c4a2bdc662f58b7b8e7ae197053a13c06ad1c0ae9fcd0face2601d05a7becfaf0948e0765ff22e5dbeace0176e77e4bad6 DIST shorewall-4.6.13.tar.bz2 500076 SHA256 fc4530d891da22d9efaa4339f10ebde27133bef9fe8c6e93abc701991f8b30ba SHA512 5018d34a15784870c521614a725baa05ea8df5e11e11d0177d01fc3012ed006f25b6a2afaf20cbae7b1c189ea841cc5ad2764067af0513f8378b316645524b48 WHIRLPOOL a6fef96deed7f7ad7bdc0273de88c15f77b901ec27905af474399b3b86fd8b6cdfe92556ae2314feaa73cd525960b56d986ce426225f7779e9235ccdc9f7248c @@ -8,8 +6,6 @@ DIST shorewall-core-4.6.10.1.tar.bz2 58247 SHA256 5af804f39f4480685e995080dc8913 DIST shorewall-core-4.6.13.1.tar.bz2 61749 SHA256 d06a4c1050578013c6e37468f0a803fd129f1ac95b6ea5ab8af80f3eb0739539 SHA512 8db64a150101368ad50075f7ed97e2ceecf0d974ae1d0d61f6bc8dd967ff8f222265c543dfbe8f1217d90b21d93398669cc3d6e06a2b2c706c25347b27f13868 WHIRLPOOL 493f9a739388d3ecfe5fc9d04414c272d09a6eade8f236e21ec773b7df423844d2b9b427a297c9fa842ef22e7c491427d74e83dbc0aa267b16c20c1aff8525ed DIST shorewall-core-4.6.13.tar.bz2 61679 SHA256 e31dd55c8df37ee2168c5aa9843f9c2727f6a31a98634445e0c10990360665a4 SHA512 2c769f2f77ee51357f92daa1fe3f794fd3e3b537f0686a004809767340ad7bdd922be2580760cdbb834e8c80f53e9d5329ef86ee741520870c242452b1e44f30 WHIRLPOOL 90668efd2db2f09bf40934206b3124666b96157f085dfabc17ff2c2d65ebb8f348db6727516fced866d16eb4d44aa0ea9d6d91ed907593785788c6cdb50f10dc DIST shorewall-core-5.0.1.tar.bz2 45988 SHA256 fd2c764f34f02b923ad4a2c5b4017b9b96df2c6886710254f2e2771e3b007a0b SHA512 a65965d272190ff4e32022a5ba21eaabfedfde50ffa1c2d100892f1b3796a5908641f5fe40e3c66f9d0bd7666217ba046e61a89368a41d8dc9eaee7db2efa4cf WHIRLPOOL 8366b0d423dc38349e795e65dace67e7c851a00335b49da1c8308796e9ff5c9544c76375d00c8c521ade30b21ccc91e874382c89691cf11927624fc42fd1a434 -DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e -DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4 DIST shorewall-docs-html-4.6.10.1.tar.bz2 4185752 SHA256 eeaec18b7f8663f0b836b76d140d3fad7871075de90f18ccc7b9fbda1538a787 SHA512 1bf1b3f5745d54af3af5f9bb6417c661e2bde8028d699aed4c4fcbe7cf301b8eadfed7be5e9bfdd677659c362d1e757eee13cd1b497a0c6837c179883c33e3a8 WHIRLPOOL 937fc4f76174f615de86eaa08690ebbe42f658154320d3e9972cbb0bcaa461e11fdaf5390f517f5d2f905aa5996ecb7399ca07d1767f647a49d33b1220e8d547 DIST shorewall-docs-html-4.6.13.1.tar.bz2 4280904 SHA256 ded94cd41022855bbb20e3a5a579f82515fea8eb3d6b7ea110e491a5cc654804 SHA512 0f6090a428ead0c5ccfca020776a93c6c69de7043b947c129ca9fba8289919448af4b5c6a2a65dc9317df2979688f86873dc0ff6a04ba6e9a14b26f183872f33 WHIRLPOOL 4cf65fd2e4afcf40d7e7fdaab43002551f7af4bba6a12466d7dab87d5df5cbcf5ed80d3238ec6cf77e59f7587056adc4450db4765a2ef47e9bcf2641cf38407a DIST shorewall-docs-html-4.6.13.tar.bz2 4280790 SHA256 2fdc3d5aa2d998831b66ed2ebf257a581924ef9b5ef1a5a2d18511aeb6f46d3d SHA512 40b3db8e8ca022ee47f928fac512f28dff7da597d19dbf9d19f5d706764d01aa09ff348df37be40a8551a7e6fae9a8b1be7e1321de7f581af4e7217ad6e3bc64 WHIRLPOOL e639126f0b16ad332bf115ccd773e7b32b1b9a0c7bda78cf072096a466d4e78d2a404f2ec923cd1acc152481a01cd90affa9af25496ee136555cc55ed1156a31 diff --git a/net-firewall/shorewall/shorewall-4.5.21.10-r1.ebuild b/net-firewall/shorewall/shorewall-4.5.21.10-r1.ebuild deleted file mode 100644 index 18a2a85decb7..000000000000 --- a/net-firewall/shorewall/shorewall-4.5.21.10-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils linux-info prefix systemd versionator - -MY_URL_PREFIX= -case ${P} in - *_beta* | \ - *_rc*) - MY_URL_PREFIX='development/' - ;; -esac - -MY_PV=${PV/_rc/-RC} -MY_PV=${MY_PV/_beta/-Beta} -MY_P=${PN}-${MY_PV} -MY_P_DOCS=shorewall-docs-html-${MY_PV} - -MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) -MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) - -DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is' -DESCRIPTION+=' a high-level tool for configuring Netfilter' -HOMEPAGE="http://www.shorewall.net/" -SRC_URI=" - http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2 - doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 ) -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc" - -DEPEND=" - >=dev-lang/perl-5.10 - virtual/perl-Digest-SHA - =net-firewall/shorewall-core-${PVR} -" -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4.20 - >=sys-apps/iproute2-3.8.0[-minimal] - >=sys-devel/bc-1.06.95 -" - -S=${WORKDIR}/${MY_P} - -pkg_pretend() { - local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4" - - local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable" - local WARNING_CONNTRACK+=" to run ${PN} on the local system." - - local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will" - local WARNING_CONNTRACK_IPV4+=" be unable to run ${PN} on the local system." - - check_extra_config -} - -src_prepare() { - epatch "${FILESDIR}"/${PVR}/shorewall-10-fix-ipset-support-detection.patch - - cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" - eprefixify "${S}"/shorewallrc.gentoo - - cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed" - cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed" - cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed" - - epatch_user -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - keepdir /var/lib/${PN} - - DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" - - dodoc changelog.txt releasenotes.txt - if use doc; then - dodoc -r Samples - cd "${WORKDIR}"/${MY_P_DOCS} - dohtml -r * - fi -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Before you can use ${PN}, you need to edit its configuration in:" - elog "" - elog " ${EPREFIX}/etc/${PN}/${PN}.conf" - elog "" - elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:" - elog "" - elog " # rc-update add ${PN} default" - fi - - if ! has_version ${CATEGORY}/shorewall-init; then - elog "" - elog "Starting with shorewall-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init," - elog "which we recommend to install, to protect your firewall at system boot." - elog "" - elog "To read more about shorewall-init, please visit" - elog " http://www.shorewall.net/Shorewall-init.html" - fi -} diff --git a/net-firewall/shorewall/shorewall-4.5.21.9.ebuild b/net-firewall/shorewall/shorewall-4.5.21.9.ebuild deleted file mode 100644 index 621938142fc6..000000000000 --- a/net-firewall/shorewall/shorewall-4.5.21.9.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils linux-info prefix systemd versionator - -MY_URL_PREFIX= -case ${P} in - *_beta* | \ - *_rc*) - MY_URL_PREFIX='development/' - ;; -esac - -MY_PV=${PV/_rc/-RC} -MY_PV=${MY_PV/_beta/-Beta} -MY_P=${PN}-${MY_PV} -MY_P_DOCS=shorewall-docs-html-${MY_PV} - -MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) -MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) - -DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is' -DESCRIPTION+=' a high-level tool for configuring Netfilter' -HOMEPAGE="http://www.shorewall.net/" -SRC_URI=" - http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2 - doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 ) -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="doc" - -DEPEND=" - >=dev-lang/perl-5.10 - virtual/perl-Digest-SHA - =net-firewall/shorewall-core-${PVR} -" -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4.20 - >=sys-apps/iproute2-3.8.0[-minimal] - >=sys-devel/bc-1.06.95 -" - -S=${WORKDIR}/${MY_P} - -pkg_pretend() { - local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4" - - local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable" - local WARNING_CONNTRACK+=" to run ${PN} on the local system." - - local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will" - local WARNING_CONNTRACK_IPV4+=" be unable to run ${PN} on the local system." - - check_extra_config -} - -src_prepare() { - cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" - eprefixify "${S}"/shorewallrc.gentoo - - cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed" - cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed" - cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed" - - epatch_user -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - keepdir /var/lib/${PN} - - DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" - - dodoc changelog.txt releasenotes.txt - if use doc; then - dodoc -r Samples - cd "${WORKDIR}"/${MY_P_DOCS} - dohtml -r * - fi -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Before you can use ${PN}, you need to edit its configuration in:" - elog "" - elog " ${EPREFIX}/etc/${PN}/${PN}.conf" - elog "" - elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:" - elog "" - elog " # rc-update add ${PN} default" - fi - - if ! has_version ${CATEGORY}/shorewall-init; then - elog "" - elog "Starting with shorewall-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init," - elog "which we recommend to install, to protect your firewall at system boot." - elog "" - elog "To read more about shorewall-init, please visit" - elog " http://www.shorewall.net/Shorewall-init.html" - fi -} diff --git a/net-firewall/shorewall6-lite/Manifest b/net-firewall/shorewall6-lite/Manifest deleted file mode 100644 index aec4ac1f01d5..000000000000 --- a/net-firewall/shorewall6-lite/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e -DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4 -DIST shorewall6-lite-4.5.21.10.tar.bz2 78934 SHA256 5010ab69de54ff615fda10be5e343c09d44eace8ed2dda1c04467524ea3d2cb2 SHA512 c4006d5648e1a6d558fb41fa05a3832fc8a58644a0612423940be820a452f68cfada3a412c28cece9447a182b488e99c371450eb5dc28a7ed3447a04ae868538 WHIRLPOOL ad649b67e76ffcec6d6bf954aae55543b02936f1f9e56c9e156a29fe4a24fab8ef2547272f1503b68db13b0b907e21674fb5d5a170f754287768c8f2e824e869 -DIST shorewall6-lite-4.5.21.9.tar.bz2 78451 SHA256 7e062c2bcc839ee7d84e958cf45c17a6cd00cfa25d5ee12a8644ac2ff73b40bb SHA512 ec62c0564f83090818060bc743b395cc96378b4249b2a68f54bff39012324c31705d7ad3b02564a9f32bcc2f536af38cbddd704fabe0ed4516f894b0218ca56a WHIRLPOOL e44a9e1e209b4540f1c0fae77d5d7eac6809505dc8956156429cd7b745fbd2fee3ef56811ecf681d7a82e138151a2d1425c5bd30593412fd01f5c7aad62665e6 diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.confd b/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.confd deleted file mode 100644 index e5957167b5b9..000000000000 --- a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.confd +++ /dev/null @@ -1,15 +0,0 @@ -# Global start/restart/stop options -# -OPTIONS="" - -# Start options -# -STARTOPTIONS="" - -# Stop options -# -STOPOPTIONS="" - -# Restart options -# -RESTARTOPTIONS="" diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.initd deleted file mode 100644 index a5436ec9eecc..000000000000 --- a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.initd +++ /dev/null @@ -1,82 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is' -description="${description} a high-level tool for configuring Netfilter." - -extra_commands="clear" -extra_started_commands="reset" - -description_clear="Clear will remove all rules and chains installed by" -description_clear="${description_clear} Shorewall6 Lite. The firewall is" -description_clear="${description_clear} then wide open and unprotected." - -description_reset="All the packet and byte counters in the firewall are reset." - -depend() { - need net - provide firewall - after ulogd -} - -status() { - local _retval - /sbin/shorewall6-lite status 1>/dev/null - _retval=$? - if [ ${_retval} = '0' ]; then - einfo 'status: started' - mark_service_started "${SVCNAME}" - return 0 - else - einfo 'status: stopped' - mark_service_stopped "${SVCNAME}" - return 3 - fi -} - -start() { - ebegin "Starting shorewall6-lite" - /sbin/shorewall6-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null - eend $? -} - -stop() { - ebegin "Stopping shorewall6-lite" - /sbin/shorewall6-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null - eend $? -} - -restart() { - # shorewall comes with its own control script that includes a - # restart function, so refrain from calling svc_stop/svc_start - # here. Note that this comment is required to fix bug 55576; - # runscript.sh greps this script... (09 Jul 2004 agriffis) - - ebegin "Restarting shorewall6-lite" - /sbin/shorewall6-lite status 1>/dev/null - if [ $? != 0 ] ; then - svc_start - else - /sbin/shorewall6-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null - fi - eend $? -} - -clear() { - # clear will remove all the rules and bring the system to an unfirewalled - # state. (21 Nov 2004 eldad) - - ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT" - /sbin/shorewall6-lite ${OPTIONS} clear 1>/dev/null - eend $? -} - -reset() { - # reset the packet and byte counters in the firewall - - ebegin "Resetting the packet and byte counters in shorewall6-lite" - /sbin/shorewall6-lite ${OPTIONS} reset 1>/dev/null - eend $? -} diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.systemd b/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.systemd deleted file mode 100644 index 5af21b6c19bd..000000000000 --- a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.systemd +++ /dev/null @@ -1,17 +0,0 @@ -# -# The Shoreline Firewall 6 Lite (Shorewall6-Lite) Packet Filtering Firewall - V4.5 -# -[Unit] -Description=Shorewall IPv6 firewall lite -Documentation=man:shorewall6-lite(8) http://www.shorewall.net/Documentation_Index.html -After=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=/etc/conf.d/shorewall6-lite -ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS -ExecStop=/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS - -[Install] -WantedBy=multi-user.target diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewallrc b/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewallrc deleted file mode 100644 index 46f5eb9a3603..000000000000 --- a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewallrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# Gentoo Shorewall 4.5 rc file -# -BUILD= #Default is to detect the build system -HOST=gentoo #Gentoo GNU Linux -PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc. -SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. -LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. -PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory -CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed -SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin #Directory where system administration programs are installed -MANDIR=${PREFIX}/share/man #Directory where manpages are installed. -INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed. -INITFILE=${PRODUCT} #Name of the product's installed SysV init script -INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script -ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) -SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file -SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR -SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed -SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR -VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored. -VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored. diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.confd b/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.confd deleted file mode 100644 index e5957167b5b9..000000000000 --- a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.confd +++ /dev/null @@ -1,15 +0,0 @@ -# Global start/restart/stop options -# -OPTIONS="" - -# Start options -# -STARTOPTIONS="" - -# Stop options -# -STOPOPTIONS="" - -# Restart options -# -RESTARTOPTIONS="" diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.initd deleted file mode 100644 index a5436ec9eecc..000000000000 --- a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.initd +++ /dev/null @@ -1,82 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is' -description="${description} a high-level tool for configuring Netfilter." - -extra_commands="clear" -extra_started_commands="reset" - -description_clear="Clear will remove all rules and chains installed by" -description_clear="${description_clear} Shorewall6 Lite. The firewall is" -description_clear="${description_clear} then wide open and unprotected." - -description_reset="All the packet and byte counters in the firewall are reset." - -depend() { - need net - provide firewall - after ulogd -} - -status() { - local _retval - /sbin/shorewall6-lite status 1>/dev/null - _retval=$? - if [ ${_retval} = '0' ]; then - einfo 'status: started' - mark_service_started "${SVCNAME}" - return 0 - else - einfo 'status: stopped' - mark_service_stopped "${SVCNAME}" - return 3 - fi -} - -start() { - ebegin "Starting shorewall6-lite" - /sbin/shorewall6-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null - eend $? -} - -stop() { - ebegin "Stopping shorewall6-lite" - /sbin/shorewall6-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null - eend $? -} - -restart() { - # shorewall comes with its own control script that includes a - # restart function, so refrain from calling svc_stop/svc_start - # here. Note that this comment is required to fix bug 55576; - # runscript.sh greps this script... (09 Jul 2004 agriffis) - - ebegin "Restarting shorewall6-lite" - /sbin/shorewall6-lite status 1>/dev/null - if [ $? != 0 ] ; then - svc_start - else - /sbin/shorewall6-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null - fi - eend $? -} - -clear() { - # clear will remove all the rules and bring the system to an unfirewalled - # state. (21 Nov 2004 eldad) - - ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT" - /sbin/shorewall6-lite ${OPTIONS} clear 1>/dev/null - eend $? -} - -reset() { - # reset the packet and byte counters in the firewall - - ebegin "Resetting the packet and byte counters in shorewall6-lite" - /sbin/shorewall6-lite ${OPTIONS} reset 1>/dev/null - eend $? -} diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.systemd b/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.systemd deleted file mode 100644 index 5af21b6c19bd..000000000000 --- a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.systemd +++ /dev/null @@ -1,17 +0,0 @@ -# -# The Shoreline Firewall 6 Lite (Shorewall6-Lite) Packet Filtering Firewall - V4.5 -# -[Unit] -Description=Shorewall IPv6 firewall lite -Documentation=man:shorewall6-lite(8) http://www.shorewall.net/Documentation_Index.html -After=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=/etc/conf.d/shorewall6-lite -ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS -ExecStop=/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS - -[Install] -WantedBy=multi-user.target diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewallrc b/net-firewall/shorewall6-lite/files/4.5.21.10/shorewallrc deleted file mode 100644 index 46f5eb9a3603..000000000000 --- a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewallrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# Gentoo Shorewall 4.5 rc file -# -BUILD= #Default is to detect the build system -HOST=gentoo #Gentoo GNU Linux -PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc. -SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. -LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. -PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory -CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed -SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin #Directory where system administration programs are installed -MANDIR=${PREFIX}/share/man #Directory where manpages are installed. -INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed. -INITFILE=${PRODUCT} #Name of the product's installed SysV init script -INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script -ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) -SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file -SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR -SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed -SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR -VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored. -VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored. diff --git a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.confd b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.confd deleted file mode 100644 index e5957167b5b9..000000000000 --- a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.confd +++ /dev/null @@ -1,15 +0,0 @@ -# Global start/restart/stop options -# -OPTIONS="" - -# Start options -# -STARTOPTIONS="" - -# Stop options -# -STOPOPTIONS="" - -# Restart options -# -RESTARTOPTIONS="" diff --git a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.initd deleted file mode 100644 index a5436ec9eecc..000000000000 --- a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.initd +++ /dev/null @@ -1,82 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is' -description="${description} a high-level tool for configuring Netfilter." - -extra_commands="clear" -extra_started_commands="reset" - -description_clear="Clear will remove all rules and chains installed by" -description_clear="${description_clear} Shorewall6 Lite. The firewall is" -description_clear="${description_clear} then wide open and unprotected." - -description_reset="All the packet and byte counters in the firewall are reset." - -depend() { - need net - provide firewall - after ulogd -} - -status() { - local _retval - /sbin/shorewall6-lite status 1>/dev/null - _retval=$? - if [ ${_retval} = '0' ]; then - einfo 'status: started' - mark_service_started "${SVCNAME}" - return 0 - else - einfo 'status: stopped' - mark_service_stopped "${SVCNAME}" - return 3 - fi -} - -start() { - ebegin "Starting shorewall6-lite" - /sbin/shorewall6-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null - eend $? -} - -stop() { - ebegin "Stopping shorewall6-lite" - /sbin/shorewall6-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null - eend $? -} - -restart() { - # shorewall comes with its own control script that includes a - # restart function, so refrain from calling svc_stop/svc_start - # here. Note that this comment is required to fix bug 55576; - # runscript.sh greps this script... (09 Jul 2004 agriffis) - - ebegin "Restarting shorewall6-lite" - /sbin/shorewall6-lite status 1>/dev/null - if [ $? != 0 ] ; then - svc_start - else - /sbin/shorewall6-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null - fi - eend $? -} - -clear() { - # clear will remove all the rules and bring the system to an unfirewalled - # state. (21 Nov 2004 eldad) - - ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT" - /sbin/shorewall6-lite ${OPTIONS} clear 1>/dev/null - eend $? -} - -reset() { - # reset the packet and byte counters in the firewall - - ebegin "Resetting the packet and byte counters in shorewall6-lite" - /sbin/shorewall6-lite ${OPTIONS} reset 1>/dev/null - eend $? -} diff --git a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.systemd b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.systemd deleted file mode 100644 index 5af21b6c19bd..000000000000 --- a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.systemd +++ /dev/null @@ -1,17 +0,0 @@ -# -# The Shoreline Firewall 6 Lite (Shorewall6-Lite) Packet Filtering Firewall - V4.5 -# -[Unit] -Description=Shorewall IPv6 firewall lite -Documentation=man:shorewall6-lite(8) http://www.shorewall.net/Documentation_Index.html -After=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=/etc/conf.d/shorewall6-lite -ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS -ExecStop=/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS - -[Install] -WantedBy=multi-user.target diff --git a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewallrc b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewallrc deleted file mode 100644 index 46f5eb9a3603..000000000000 --- a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewallrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# Gentoo Shorewall 4.5 rc file -# -BUILD= #Default is to detect the build system -HOST=gentoo #Gentoo GNU Linux -PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc. -SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. -LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. -PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory -CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed -SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin #Directory where system administration programs are installed -MANDIR=${PREFIX}/share/man #Directory where manpages are installed. -INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed. -INITFILE=${PRODUCT} #Name of the product's installed SysV init script -INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script -ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) -SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file -SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR -SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed -SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR -VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored. -VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored. diff --git a/net-firewall/shorewall6-lite/metadata.xml b/net-firewall/shorewall6-lite/metadata.xml deleted file mode 100644 index 52ffdde3f9be..000000000000 --- a/net-firewall/shorewall6-lite/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>netmon</herd> - <herd>proxy-maintainers</herd> - <maintainer> - <email>whissi@whissi.de</email> - <name>Thomas D. (Whissi)</name> - </maintainer> -</pkgmetadata> diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.10-r1.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.10-r1.ebuild deleted file mode 100644 index c0d084ae95b9..000000000000 --- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.10-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils linux-info prefix systemd versionator - -MY_URL_PREFIX= -case ${P} in - *_beta* | \ - *_rc*) - MY_URL_PREFIX='development/' - ;; -esac - -MY_PV=${PV/_rc/-RC} -MY_PV=${MY_PV/_beta/-Beta} -MY_P=${PN}-${MY_PV} -MY_P_DOCS=shorewall-docs-html-${MY_PV} - -MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) -MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) - -DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6" -HOMEPAGE="http://www.shorewall.net/" -SRC_URI=" - http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2 - doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 ) -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc" - -DEPEND="=net-firewall/shorewall-core-${PVR}" -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4.20[ipv6] - >=sys-apps/iproute2-3.8.0[-minimal] - >=dev-perl/Socket6-0.230.0 -" - -S=${WORKDIR}/${MY_P} - -pkg_pretend() { - local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6" - - local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support." - - local ERROR_CONNTRACK_IPV6="${PN} requires NF_CONNTRACK_IPV6 support." - - check_extra_config -} - -src_prepare() { - cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" - eprefixify "${S}"/shorewallrc.gentoo - - cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed" - cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed" - cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed" - - epatch_user -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - keepdir /var/lib/${PN} - - DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" - - dodoc changelog.txt releasenotes.txt - if use doc; then - cd "${WORKDIR}/${MY_P_DOCS}" - dohtml -r * - fi -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Before you can use ${PN}, you need to provide a configuration, which you can" - elog "create using ${CATEGORY}/shorewall6 (the full version, including the compiler)." - elog "" - elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:" - elog "" - elog " # rc-update add ${PN} default" - fi - - if ! has_version ${CATEGORY}/shorewall-init; then - elog "" - elog "Starting with shorewall6-lite-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init," - elog "which we recommend to install, to protect your firewall at system boot." - elog "" - elog "To read more about shorewall-init, please visit" - elog " http://www.shorewall.net/Shorewall-init.html" - fi -} diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.9.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.9.ebuild deleted file mode 100644 index 0d4dfaccde67..000000000000 --- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.9.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils linux-info prefix systemd versionator - -MY_URL_PREFIX= -case ${P} in - *_beta* | \ - *_rc*) - MY_URL_PREFIX='development/' - ;; -esac - -MY_PV=${PV/_rc/-RC} -MY_PV=${MY_PV/_beta/-Beta} -MY_P=${PN}-${MY_PV} -MY_P_DOCS=shorewall-docs-html-${MY_PV} - -MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) -MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) - -DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6" -HOMEPAGE="http://www.shorewall.net/" -SRC_URI=" - http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2 - doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 ) -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="doc" - -DEPEND="=net-firewall/shorewall-core-${PVR}" -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4.20[ipv6] - >=sys-apps/iproute2-3.8.0[-minimal] - >=dev-perl/Socket6-0.230.0 -" - -S=${WORKDIR}/${MY_P} - -pkg_pretend() { - local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6" - - local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support." - - local ERROR_CONNTRACK_IPV6="${PN} requires NF_CONNTRACK_IPV6 support." - - check_extra_config -} - -src_prepare() { - cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" - eprefixify "${S}"/shorewallrc.gentoo - - cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed" - cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed" - cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed" - - epatch_user -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - keepdir /var/lib/${PN} - - DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" - - dodoc changelog.txt releasenotes.txt - if use doc; then - cd "${WORKDIR}/${MY_P_DOCS}" - dohtml -r * - fi -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Before you can use ${PN}, you need to provide a configuration, which you can" - elog "create using ${CATEGORY}/shorewall6 (the full version, including the compiler)." - elog "" - elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:" - elog "" - elog " # rc-update add ${PN} default" - fi - - if ! has_version ${CATEGORY}/shorewall-init; then - elog "" - elog "Starting with shorewall6-lite-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init," - elog "which we recommend to install, to protect your firewall at system boot." - elog "" - elog "To read more about shorewall-init, please visit" - elog " http://www.shorewall.net/Shorewall-init.html" - fi -} diff --git a/net-firewall/shorewall6/Manifest b/net-firewall/shorewall6/Manifest deleted file mode 100644 index 781ffb09c99f..000000000000 --- a/net-firewall/shorewall6/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e -DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4 -DIST shorewall6-4.5.21.10.tar.bz2 252715 SHA256 1932c54f16750840985257abf27d7dc77235eacdb00560be8424ec9357747c62 SHA512 e436e7020213bbd1da688461eeac969d47b862a8f97c870af610c1e6aae9e01c626d5f9e15c2b500257c3ff5ac97fa63722cf99e10deac03fda9bd284baf907a WHIRLPOOL 15f5e07bce8d88c6fae69d05d261ebc107e2a2f340107748427bc6cfcddec7ad26caee61c28ca006d60425c9cfd6e4eaa1b2b59ea6fcb6f8c8ba44c5c00789ba -DIST shorewall6-4.5.21.9.tar.bz2 252533 SHA256 2c4606fffc49b0129ec79142493949d8efe15bdef4f6e1619af32e694cbd5aba SHA512 91be0dd55485d56b33f52a91f315562998e6aaf7f2f5ddcb1882fcda589146132810d0f1d5ae2ab6e6ec1256319084969e1499bdd3f37e5a63e0cc65d5ed77bb WHIRLPOOL 7e129116662c8501fb12b23f9552a01d9ae14501194376026ea43758d1470ee7739ff90e26985c7d1e9e9a8c7db7cfdc26b64943e8e470893f5d38d7ef51509a diff --git a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.confd b/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.confd deleted file mode 100644 index e5957167b5b9..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.confd +++ /dev/null @@ -1,15 +0,0 @@ -# Global start/restart/stop options -# -OPTIONS="" - -# Start options -# -STARTOPTIONS="" - -# Stop options -# -STOPOPTIONS="" - -# Restart options -# -RESTARTOPTIONS="" diff --git a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.initd b/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.initd deleted file mode 100644 index ba4b43f1ddb9..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.initd +++ /dev/null @@ -1,107 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is' -description="${description} a high-level tool for configuring Netfilter." - -extra_commands="check clear" -extra_started_commands="refresh reset" - -description_check="Checks if the configuration will compile or not." - -description_clear="Clear will remove all rules and chains installed by" -description_clear="${description_clear} Shorewall6. The firewall is then" -description_clear="${description_clear} wide open and unprotected." - -description_refresh="The mangle table will be refreshed along with the" -description_refresh="${description_refresh} blacklist chain (if any)." - -description_reset="All the packet and byte counters in the firewall are reset." - -depend() { - need net - provide firewall - after ulogd -} - -status() { - local _retval - /sbin/shorewall6 status 1>/dev/null - _retval=$? - if [ ${_retval} = '0' ]; then - einfo 'status: started' - mark_service_started "${SVCNAME}" - return 0 - else - einfo 'status: stopped' - mark_service_stopped "${SVCNAME}" - return 3 - fi -} - -start() { - ebegin "Starting shorewall6" - /sbin/shorewall6 ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null - eend $? -} - -stop() { - ebegin "Stopping shorewall6" - /sbin/shorewall6 ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null - eend $? -} - -restart() { - # shorewall comes with its own control script that includes a - # restart function, so refrain from calling svc_stop/svc_start - # here. Note that this comment is required to fix bug 55576; - # runscript.sh greps this script... (09 Jul 2004 agriffis) - - ebegin "Restarting shorewall6" - /sbin/shorewall6 status 1>/dev/null - if [ $? != 0 ] ; then - svc_start - else - /sbin/shorewall6 ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null - fi - eend $? -} - -clear() { - # clear will remove all the rules and bring the system to an unfirewalled - # state. (21 Nov 2004 eldad) - - ebegin "Clearing all shorewall rules and setting policy to ACCEPT" - /sbin/shorewall6 ${OPTIONS} clear 1>/dev/null - eend $? -} - -reset() { - # reset the packet and byte counters in the firewall - - ebegin "Resetting the packet and byte counters in shorewall6" - /sbin/shorewall6 ${OPTIONS} reset 1>/dev/null - eend $? -} - -refresh() { - # refresh the rules involving the broadcast addresses of firewall - # interfaces, the black list, traffic control rules and - # ECN control rules - - ebegin "Refreshing shorewall6 rules" - /sbin/shorewall6 ${OPTIONS} refresh 1>/dev/null - eend $? -} - -check() { - # perform cursory validation of the zones, interfaces, hosts, rules - # and policy files. CAUTION: does not parse and validate the generated - # iptables commands. - - ebegin "Checking shorewall6 configuration" - /sbin/shorewall6 ${OPTIONS} check 1>/dev/null - eend $? -} diff --git a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.systemd b/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.systemd deleted file mode 100644 index 448226c88736..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.systemd +++ /dev/null @@ -1,17 +0,0 @@ -# -# The Shoreline Firewall 6 (Shorewall6) Packet Filtering Firewall - V4.5 -# -[Unit] -Description=Shorewall IPv6 firewall -Documentation=man:shorewall6(8) http://www.shorewall.net/Documentation_Index.html -After=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=/etc/conf.d/shorewall6 -ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS -ExecStop=/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS - -[Install] -WantedBy=multi-user.target diff --git a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewallrc b/net-firewall/shorewall6/files/4.5.21.10-r1/shorewallrc deleted file mode 100644 index 46f5eb9a3603..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewallrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# Gentoo Shorewall 4.5 rc file -# -BUILD= #Default is to detect the build system -HOST=gentoo #Gentoo GNU Linux -PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc. -SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. -LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. -PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory -CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed -SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin #Directory where system administration programs are installed -MANDIR=${PREFIX}/share/man #Directory where manpages are installed. -INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed. -INITFILE=${PRODUCT} #Name of the product's installed SysV init script -INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script -ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) -SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file -SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR -SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed -SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR -VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored. -VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored. diff --git a/net-firewall/shorewall6/files/4.5.21.9/shorewall6.confd b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.confd deleted file mode 100644 index e5957167b5b9..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.9/shorewall6.confd +++ /dev/null @@ -1,15 +0,0 @@ -# Global start/restart/stop options -# -OPTIONS="" - -# Start options -# -STARTOPTIONS="" - -# Stop options -# -STOPOPTIONS="" - -# Restart options -# -RESTARTOPTIONS="" diff --git a/net-firewall/shorewall6/files/4.5.21.9/shorewall6.initd b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.initd deleted file mode 100644 index ba4b43f1ddb9..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.9/shorewall6.initd +++ /dev/null @@ -1,107 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is' -description="${description} a high-level tool for configuring Netfilter." - -extra_commands="check clear" -extra_started_commands="refresh reset" - -description_check="Checks if the configuration will compile or not." - -description_clear="Clear will remove all rules and chains installed by" -description_clear="${description_clear} Shorewall6. The firewall is then" -description_clear="${description_clear} wide open and unprotected." - -description_refresh="The mangle table will be refreshed along with the" -description_refresh="${description_refresh} blacklist chain (if any)." - -description_reset="All the packet and byte counters in the firewall are reset." - -depend() { - need net - provide firewall - after ulogd -} - -status() { - local _retval - /sbin/shorewall6 status 1>/dev/null - _retval=$? - if [ ${_retval} = '0' ]; then - einfo 'status: started' - mark_service_started "${SVCNAME}" - return 0 - else - einfo 'status: stopped' - mark_service_stopped "${SVCNAME}" - return 3 - fi -} - -start() { - ebegin "Starting shorewall6" - /sbin/shorewall6 ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null - eend $? -} - -stop() { - ebegin "Stopping shorewall6" - /sbin/shorewall6 ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null - eend $? -} - -restart() { - # shorewall comes with its own control script that includes a - # restart function, so refrain from calling svc_stop/svc_start - # here. Note that this comment is required to fix bug 55576; - # runscript.sh greps this script... (09 Jul 2004 agriffis) - - ebegin "Restarting shorewall6" - /sbin/shorewall6 status 1>/dev/null - if [ $? != 0 ] ; then - svc_start - else - /sbin/shorewall6 ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null - fi - eend $? -} - -clear() { - # clear will remove all the rules and bring the system to an unfirewalled - # state. (21 Nov 2004 eldad) - - ebegin "Clearing all shorewall rules and setting policy to ACCEPT" - /sbin/shorewall6 ${OPTIONS} clear 1>/dev/null - eend $? -} - -reset() { - # reset the packet and byte counters in the firewall - - ebegin "Resetting the packet and byte counters in shorewall6" - /sbin/shorewall6 ${OPTIONS} reset 1>/dev/null - eend $? -} - -refresh() { - # refresh the rules involving the broadcast addresses of firewall - # interfaces, the black list, traffic control rules and - # ECN control rules - - ebegin "Refreshing shorewall6 rules" - /sbin/shorewall6 ${OPTIONS} refresh 1>/dev/null - eend $? -} - -check() { - # perform cursory validation of the zones, interfaces, hosts, rules - # and policy files. CAUTION: does not parse and validate the generated - # iptables commands. - - ebegin "Checking shorewall6 configuration" - /sbin/shorewall6 ${OPTIONS} check 1>/dev/null - eend $? -} diff --git a/net-firewall/shorewall6/files/4.5.21.9/shorewall6.systemd b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.systemd deleted file mode 100644 index 448226c88736..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.9/shorewall6.systemd +++ /dev/null @@ -1,17 +0,0 @@ -# -# The Shoreline Firewall 6 (Shorewall6) Packet Filtering Firewall - V4.5 -# -[Unit] -Description=Shorewall IPv6 firewall -Documentation=man:shorewall6(8) http://www.shorewall.net/Documentation_Index.html -After=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=/etc/conf.d/shorewall6 -ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS -ExecStop=/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS - -[Install] -WantedBy=multi-user.target diff --git a/net-firewall/shorewall6/files/4.5.21.9/shorewallrc b/net-firewall/shorewall6/files/4.5.21.9/shorewallrc deleted file mode 100644 index 46f5eb9a3603..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.9/shorewallrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# Gentoo Shorewall 4.5 rc file -# -BUILD= #Default is to detect the build system -HOST=gentoo #Gentoo GNU Linux -PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc. -SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. -LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. -PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory -CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed -SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin #Directory where system administration programs are installed -MANDIR=${PREFIX}/share/man #Directory where manpages are installed. -INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed. -INITFILE=${PRODUCT} #Name of the product's installed SysV init script -INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script -ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) -SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file -SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR -SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed -SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR -VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored. -VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored. diff --git a/net-firewall/shorewall6/metadata.xml b/net-firewall/shorewall6/metadata.xml deleted file mode 100644 index 52ffdde3f9be..000000000000 --- a/net-firewall/shorewall6/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>netmon</herd> - <herd>proxy-maintainers</herd> - <maintainer> - <email>whissi@whissi.de</email> - <name>Thomas D. (Whissi)</name> - </maintainer> -</pkgmetadata> diff --git a/net-firewall/shorewall6/shorewall6-4.5.21.10-r1.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.10-r1.ebuild deleted file mode 100644 index 9a42db391e58..000000000000 --- a/net-firewall/shorewall6/shorewall6-4.5.21.10-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils linux-info prefix systemd versionator - -MY_URL_PREFIX= -case ${P} in - *_beta* | \ - *_rc*) - MY_URL_PREFIX='development/' - ;; -esac - -MY_PV=${PV/_rc/-RC} -MY_PV=${MY_PV/_beta/-Beta} -MY_P=${PN}-${MY_PV} -MY_P_DOCS=shorewall-docs-html-${MY_PV} - -MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) -MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) - -DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall,' -DESCRIPTION+=' IPv6 component' -HOMEPAGE="http://www.shorewall.net/" -SRC_URI=" - http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2 - doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 ) -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc" - -DEPEND="=net-firewall/shorewall-${PVR}" -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4.20[ipv6] - >=sys-apps/iproute2-3.8.0[-minimal] - >=dev-perl/Socket6-0.230.0 -" - -S=${WORKDIR}/${MY_P} - -pkg_pretend() { - local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6" - - local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable" - local WARNING_CONNTRACK+=" to run ${PN} on the local system." - - local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will" - local WARNING_CONNTRACK_IPV6+=" be unable to run ${PN} on the local system." - - check_extra_config -} - -src_prepare() { - cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" - eprefixify "${S}"/shorewallrc.gentoo - - cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed" - cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed" - cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed" - - epatch_user -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - keepdir /var/lib/${PN} - - DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" - - dodoc changelog.txt releasenotes.txt - if use doc; then - dodoc -r Samples6 - cd "${WORKDIR}"/${MY_P_DOCS} - dohtml -r * - fi -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Before you can use ${PN}, you need to edit its configuration in:" - elog "" - elog " ${EPREFIX}/etc/${PN}/${PN}.conf" - elog "" - elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:" - elog "" - elog " # rc-update add ${PN} default" - fi - - if ! has_version ${CATEGORY}/shorewall-init; then - elog "" - elog "Starting with shorewall6-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init," - elog "which we recommend to install, to protect your firewall at system boot." - elog "" - elog "To read more about shorewall-init, please visit" - elog " http://www.shorewall.net/Shorewall-init.html" - fi -} diff --git a/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild deleted file mode 100644 index 18f2d8c4d570..000000000000 --- a/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils linux-info prefix systemd versionator - -MY_URL_PREFIX= -case ${P} in - *_beta* | \ - *_rc*) - MY_URL_PREFIX='development/' - ;; -esac - -MY_PV=${PV/_rc/-RC} -MY_PV=${MY_PV/_beta/-Beta} -MY_P=${PN}-${MY_PV} -MY_P_DOCS=shorewall-docs-html-${MY_PV} - -MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) -MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) - -DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall,' -DESCRIPTION+=' IPv6 component' -HOMEPAGE="http://www.shorewall.net/" -SRC_URI=" - http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2 - doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 ) -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="doc" - -DEPEND="=net-firewall/shorewall-${PVR}" -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4.20[ipv6] - >=sys-apps/iproute2-3.8.0[-minimal] - >=dev-perl/Socket6-0.230.0 -" - -S=${WORKDIR}/${MY_P} - -pkg_pretend() { - local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6" - - local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable" - local WARNING_CONNTRACK+=" to run ${PN} on the local system." - - local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will" - local WARNING_CONNTRACK_IPV6+=" be unable to run ${PN} on the local system." - - check_extra_config -} - -src_prepare() { - cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" - eprefixify "${S}"/shorewallrc.gentoo - - cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed" - cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed" - cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed" - - epatch_user -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - keepdir /var/lib/${PN} - - DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" - - dodoc changelog.txt releasenotes.txt - if use doc; then - dodoc -r Samples6 - cd "${WORKDIR}"/${MY_P_DOCS} - dohtml -r * - fi -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Before you can use ${PN}, you need to edit its configuration in:" - elog "" - elog " ${EPREFIX}/etc/${PN}/${PN}.conf" - elog "" - elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:" - elog "" - elog " # rc-update add ${PN} default" - fi - - if ! has_version ${CATEGORY}/shorewall-init; then - elog "" - elog "Starting with shorewall6-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init," - elog "which we recommend to install, to protect your firewall at system boot." - elog "" - elog "To read more about shorewall-init, please visit" - elog " http://www.shorewall.net/Shorewall-init.html" - fi -} diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 803ffec1b48b..dab76f2a4ac0 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -5,6 +5,7 @@ DIST samba-4.0.26.tar.gz 22155521 SHA256 ce2441992c6d18950d752edb2d1274b3f7e056b DIST samba-4.1.20.tar.gz 19561057 SHA256 adcf021c2ee7ebdba99ed90bb06e45bcc8e3fd9419667622704276607b832038 SHA512 abdd696bb19ac458f72304208d62c21f0fee5459b9f8c4241e4cd8c1654e07455c0876013236a10296ba7ef72a7fca3de0bb6e1cd9d03817500720fb493b1988 WHIRLPOOL 48302e865be9860db7775ad864e30b4ca4bc30f9e791d529353b67e29bec79a11e1409e4b59a974111171927d73193fec46ae1dc40197e5a72ade775e82cd41d DIST samba-4.1.21.tar.gz 19561830 SHA256 00f1c26cd310811afb2fa1a3fb72a23bd2e5c2f6466e6efdcb530305d7c3ce2e SHA512 e51652964ff193c9a2e3900198ba557268c405811332a32a7a545fb9eaa6cc8dccbf37d2c664a5a8d6ea3f460b08a24bcedcc7334c1bbdc1bda0b469c448fc0e WHIRLPOOL 7d96a7777a909cb088e4d11fd070e46a615c65a2ca653d3da0ba06ad5e94e3af8c3428dc304704002d86f58f7464d6694be9533913be74fe8a9eca6523aeaa34 DIST samba-4.2.4.tar.gz 20735687 SHA256 fb326ea486973ab684f183774e93bb943fc231ab89937512e70331b86acdf6ae SHA512 a389fb2540858b778677197f01b5e2aa90c85c28e008d2f8e13a422cbf00a19ce862320b57b8141bd7838f74cbd4641efbe030c0fc2d86058f6584f9f8504d2f WHIRLPOOL 90dffe178647233fc8dec9b9ac15c7864f1700fc2aa739f24e33714e81f04ed364f6837ec95827a8ed6af6c7646e1b0eca83f22eaf196706ad9ea1ef8f425635 +DIST samba-4.2.5.tar.gz 20734836 SHA256 8191c4c0730daf7f9e9a3ea1cc6e680798d76bf855269807778adcccc8d706cf SHA512 b3581bd6ff33ce107ab2fb3cc8797852e441ed296df680083bcb25164941c08f870c2edadf5cf41280648c012bb264274854890ca8704ba17289a30efbbd1709 WHIRLPOOL a35bf488b81ba8f753871db35c611b2ad99b90e8bf6afd97df85785a9c84e1d7ad120a76832c09347031e0c895346e150ae9c7353e6bee16e4beccfbeaf7fad8 DIST samba-4.3.0.tar.gz 20417699 SHA256 d8dbb6b29dec1d9aa295655c4aa4eadd1e5367ef7047be22f4d6a18ba8acdb63 SHA512 7edad171dd98a332ebfd51c7c380b1def3d1508399755fc2d333671ce4a7d5e73782871c5760341cb71460d3f7fc4b666d906d61b9e2b28f977301d08bc9a872 WHIRLPOOL cd204bb122cc344b63b01aebc151aeb01e533402eb511ba7c440fc718a568f8004f754a4502c74dfd58869e2e22cfd0f9822c2602e3642da5b69d2bdd2b76d39 DIST samba-4.3.1.tar.gz 20424516 SHA256 9908a80d95b9e2583906ed4347a8c80b769539a2788158992fb48ea9fb4d2c82 SHA512 4a7c7e27e0d231b852b47407fb51cbe2b7851138d9a957c8149346afe1b14a2afa8fff66505abdbafe1ea43fc78b53800941c96c925fbc281b9ff24ef5ecfc98 WHIRLPOOL de09a933e222acf60e03a085370d218f26c917d98fde77535f55ca2f4a3bdcda0877fc8e0666c17ab271731ecdfa34e4ad4425fe83460a169d9ee2061007f059 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139 diff --git a/net-fs/samba/samba-4.2.5.ebuild b/net-fs/samba/samba-4.2.5.ebuild new file mode 100644 index 000000000000..2d125c0cb3c9 --- /dev/null +++ b/net-fs/samba/samba-4.2.5.ebuild @@ -0,0 +1,197 @@ +# 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='threads(+)' + +inherit python-single-r1 waf-utils multilib linux-info systemd eutils + +MY_PV="${PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" + +SRC_PATH="stable" +[[ ${PV} = *_rc* ]] && SRC_PATH="rc" + +SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz" +KEYWORDS="~amd64 ~x86" +[[ ${PV} = *_rc* ]] && KEYWORDS="" + +DESCRIPTION="Samba Suite Version 4" +HOMEPAGE="http://www.samba.org/" +LICENSE="GPL-3" + +SLOT="0" + +IUSE="acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint +ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind" + +# sys-apps/attr is an automagic dependency (see bug #489748) +# sys-libs/pam is an automagic dependency (see bug #489770) +CDEPEND="${PYTHON_DEPS} + dev-libs/iniparser:0 + dev-libs/popt + sys-libs/readline:= + virtual/libiconv + dev-python/subunit[${PYTHON_USEDEP}] + >=net-libs/socket_wrapper-1.1.2 + sys-apps/attr + sys-libs/libcap + >=sys-libs/ldb-1.1.20 + sys-libs/ncurses:0= + >=sys-libs/nss_wrapper-1.0.2 + >=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP}] + >=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP}] + >=sys-libs/tdb-1.3.6[python,${PYTHON_USEDEP}] + >=sys-libs/tevent-0.9.25 + >=sys-libs/uid_wrapper-1.0.1 + sys-libs/zlib + virtual/pam + acl? ( virtual/acl ) + addns? ( net-dns/bind-tools[gssapi] ) + aio? ( dev-libs/libaio ) + cluster? ( >=dev-db/ctdb-1.0.114_p1 ) + cups? ( net-print/cups ) + dmapi? ( sys-apps/dmapi ) + fam? ( virtual/fam ) + gnutls? ( dev-libs/libgcrypt:0 + >=net-libs/gnutls-1.4.0 ) + ldap? ( net-nds/openldap ) + system-mitkrb5? ( app-crypt/mit-krb5 ) + !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl] ) + systemd? ( sys-apps/systemd:0= )" +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + client? ( net-fs/cifs-utils[ads?] ) + selinux? ( sec-policy/selinux-samba ) +" + +REQUIRED_USE="addc? ( gnutls !system-mitkrb5 ) + ads? ( acl gnutls ldap ) + ${PYTHON_REQUIRED_USE}" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" ) + +CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" + +WAF_BINARY="${S}/buildtools/bin/waf" + +pkg_setup() { + python-single-r1_pkg_setup + if use aio ; then + if ! linux_config_exists || ! linux_chkconfig_present AIO; then + ewarn "You must enable AIO support in your kernel config, " + ewarn "to be able to support asynchronous I/O. " + ewarn "You can find it at" + ewarn + ewarn "General Support" + ewarn " Enable AIO support " + ewarn + ewarn "and recompile your kernel..." + fi + fi + if ! use pam ; then + ewarn "You have pam USE flag disabled!" + ewarn "Unfortunately we still have to hard depend on virtual/pam as samba upstream" + ewarn "still unconditionally links libauth4-samba4.so library to libpam.so once being" + ewarn "found on the sytem." + ewarn "Disabling the pam USE flag only disables installation of samba's pam authenti-" + ewarn "cation modules." + fi +} + +src_prepare() { + epatch ${PATCHES[@]} +} + +src_configure() { + local myconf=() + myconf=( + --enable-fhs + --sysconfdir=/etc + --localstatedir=/var + --with-modulesdir=/usr/$(get_libdir)/samba + --with-piddir=/var/run/${PN} + --bundled-libraries=NONE + --builtin-libraries=NONE + --disable-rpath + --disable-rpath-install + --nopyc + --nopyo + $(use_with acl acl-support) + $(usex addc '' '--without-ad-dc') + $(use_with addns dnsupdate) + $(use_with ads) + $(usex ads '--with-shared-modules=idmap_ad' '') + $(use_with aio aio-support) + $(usex cluster '--with-ctdb-dir=/usr' '') + $(use_enable avahi) + $(use_with cluster cluster-support) + $(use_enable cups) + $(use_with dmapi) + $(use_with fam) + $(use_enable gnutls) + $(use_enable iprint) + $(use_with ldap) + $(use_with pam) + $(use_with pam pam_smbpass) + $(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '') + $(use_with quota quotas) + $(use_with syslog) + $(use_with systemd) + $(usex system-mitkrb5 '--with-system-mitkrb5' '') + $(use_with winbind) + $(usex test '--enable-selftest' '') + ) + + CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \ + waf-utils_src_configure ${myconf[@]} +} + +src_install() { + waf-utils_src_install + + # install ldap schema for server (bug #491002) + if use ldap ; then + insinto /etc/openldap/schema + doins examples/LDAP/samba.schema + fi + + # Make all .so files executable + find "${D}" -type f -name "*.so" -exec chmod +x {} + + + # install example config file + insinto /etc/samba + doins examples/smb.conf.default + + # Install init script and conf.d file + newinitd "${CONFDIR}/samba4.initd-r1" samba + newconfd "${CONFDIR}/samba4.confd" samba + + systemd_dotmpfilesd "${FILESDIR}"/samba.conf + systemd_dounit "${FILESDIR}"/nmbd.service + systemd_dounit "${FILESDIR}"/smbd.{service,socket} + systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' + systemd_dounit "${FILESDIR}"/winbindd.service + systemd_dounit "${FILESDIR}"/samba.service +} + +src_test() { + "${WAF_BINARY}" test || die "test failed" +} + +pkg_postinst() { + ewarn "Be aware the this release contains the best of all of Samba's" + ewarn "technology parts, both a file server (that you can reasonably expect" + ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" + ewarn "controller work previously known as 'samba4'." + + elog "For further information and migration steps make sure to read " + elog "http://samba.org/samba/history/${P}.html " + elog "http://samba.org/samba/history/${PN}-4.2.0.html and" + elog "http://wiki.samba.org/index.php/Samba4/HOWTO " +} diff --git a/net-ftp/frox/metadata.xml b/net-ftp/frox/metadata.xml index e6a0d32e6e69..a52713bb6992 100644 --- a/net-ftp/frox/metadata.xml +++ b/net-ftp/frox/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>beber@meleeweb.net</email> + <email>bertrand@jacquin.bzh</email> <name>Bertrand Jacquin</name> <description>Proxied maintainer.</description> </maintainer> diff --git a/net-im/err/err-1.7.1.ebuild b/net-im/err/err-1.7.1-r1.ebuild index 6e0d11ad0d8d..d48befef4a52 100644 --- a/net-im/err/err-1.7.1.ebuild +++ b/net-im/err/err-1.7.1-r1.ebuild @@ -1,29 +1,31 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 PYTHON_COMPAT=( python2_7 ) + inherit distutils-r1 eutils user DESCRIPTION="Plugin based XMPP chatbot designed to be easily deployable, extensible and maintainable" HOMEPAGE="https://gbin.github.com/err/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz" KEYWORDS="~amd64 ~x86" LICENSE="GPL-3" SLOT="0" IUSE="irc qt4 +plugins" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="dev-python/dnspython[${PYTHON_USEDEP}] +RDEPEND=" dev-python/flask[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] dev-python/pyfire[${PYTHON_USEDEP}] dev-python/python-daemon[${PYTHON_USEDEP}] dev-python/xmpppy dev-python/yapsy[${PYTHON_USEDEP}] + virtual/dnspython[${PYTHON_USEDEP}] irc? ( dev-python/pyopenssl[${PYTHON_USEDEP}] dev-python/twisted-core[${PYTHON_USEDEP}] diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest index a579898f86f1..075fcdc881ef 100644 --- a/net-im/gajim/Manifest +++ b/net-im/gajim/Manifest @@ -1,3 +1 @@ -DIST gajim-0.16.3.tar.bz2 4596437 SHA256 a1c85879cb43f80a5a4ece91c5571012bb08c3878b28105db246599e1c4c4515 SHA512 815275c0abbc18ff7309a4142186952f4d46acedeb29c14ab90ab4e60935d427248eedcf6392cf6f197b24928763a58c0a52ccdfb112f28e9c9c727c3f3e45c9 WHIRLPOOL f6f7098ae5098d7f3ade834773002aa62a53d6e43a2c52d07cc1bad29e9b83741a616f1e50953063c060881f1d5a3e8cef87ea2ac0b0f667ee9b330bd995f827 DIST gajim-0.16.4.tar.bz2 4593307 SHA256 2116ad3a5635c54b575ff53eed72fe4651fc50582f5094bfc6113d1cf0d1ce7f SHA512 e8c046aa711207d71080c83d4827400392354eaadb4b431a474fcd94d56bb0fac9f163606a6f7e8abd68c7509158f8e8101b0cc2ecb439443e2966deb707bfdb WHIRLPOOL c6a496f9c02fabbaf76b52e930e5d79f6fad2557e8b458654c538c82041b8ba65bb6f8d75f18438fbabb8aa0e52493494a5847833cc49b70444720b15d6d86a5 -DIST gajim-0.16.tar.bz2 4575445 SHA256 7abd8dfb22522d3a2f0345da2a86b99fb9917bfd97310124df8601fab82ca193 SHA512 af2fd6b750e3ffa5770913a93ac5e61e6dab5688a28a26484ba4a097d73cc38b820797b1fedc60a67bf94e9a641cc80264210d0c4cf997047068c6dcb056ca75 WHIRLPOOL 6d5374bcc574bf851f6dde184f52ef8ca517869b96a85a9598b4c37953c2bc7849ccfdb106d975da80a394555f7ed7486cf356dad06dc11f545d375745e983be diff --git a/net-im/gajim/gajim-0.16.3.ebuild b/net-im/gajim/gajim-0.16.3.ebuild deleted file mode 100644 index edf6fd6f7edc..000000000000 --- a/net-im/gajim/gajim-0.16.3.ebuild +++ /dev/null @@ -1,127 +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="sqlite,xml" - -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils python-r1 versionator - -MY_PV=${PV/_/-} -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Jabber client written in PyGTK" -HOMEPAGE="http://www.gajim.org/" -SRC_URI=" - http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2" -# test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - libnotify? ( dbus ) - avahi? ( dbus ) - gnome? ( gnome-keyring )" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - dev-python/pygtk:2[${PYTHON_USEDEP}] - x11-libs/gtk+:2" -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.40.1 - virtual/pkgconfig - >=sys-devel/gettext-0.17-r1" -RDEPEND="${COMMON_DEPEND} - dev-python/pyasn1[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] - >=dev-python/python-nbxmpp-0.5.3[${PYTHON_USEDEP}] - crypt? ( - app-crypt/gnupg - dev-python/pycrypto[${PYTHON_USEDEP}] - ) - dbus? ( - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-libs/dbus-glib - libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] ) - avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] ) - ) - gnome? ( - dev-python/libgnome-python[${PYTHON_USEDEP}] - dev-python/egg-python[${PYTHON_USEDEP}] - ) - gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] ) - idle? ( x11-libs/libXScrnSaver ) - jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] ) - kde? ( kde-apps/kwalletmanager ) - networkmanager? ( - dev-python/dbus-python[${PYTHON_USEDEP}] - net-misc/networkmanager - ) - spell? ( app-text/gtkspell:2 ) - srv? ( - || ( - dev-python/libasyncns-python[${PYTHON_USEDEP}] - net-dns/bind-tools - ) - ) - xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )" - -RESTRICT="test" - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-0.16-desktop.patch - ) - -src_prepare() { - autotools-utils_src_prepare - python_copy_sources -} - -src_configure() { - configuration() { - local myeconfargs=( - $(use_enable nls) - $(use_with X x) - --docdir="/usr/share/doc/${PF}" - --libdir="$(python_get_sitedir)" - --enable-site-packages - ) - run_in_build_dir autotools-utils_src_configure - } - python_foreach_impl configuration -} - -src_compile() { - compilation() { - run_in_build_dir autotools-utils_src_compile - } - python_foreach_impl compilation -} - -src_test() { - testing() { - run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die - } - python_foreach_impl testing -} - -src_install() { - installation() { - run_in_build_dir autotools-utils_src_install - python_optimize - } - python_foreach_impl installation - - rm "${ED}/usr/share/doc/${PF}/README.html" || die - dohtml README.html -} diff --git a/net-im/gajim/gajim-0.16.4.ebuild b/net-im/gajim/gajim-0.16.4.ebuild index 5e8935f1dbdf..aa4a0739e038 100644 --- a/net-im/gajim/gajim-0.16.4.ebuild +++ b/net-im/gajim/gajim-0.16.4.ebuild @@ -22,7 +22,7 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 arm ~ppc ppc64 x86 ~x86-fbsd" +KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd" IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml" REQUIRED_USE=" diff --git a/net-im/gajim/gajim-0.16.ebuild b/net-im/gajim/gajim-0.16.ebuild deleted file mode 100644 index 37342308efcb..000000000000 --- a/net-im/gajim/gajim-0.16.ebuild +++ /dev/null @@ -1,124 +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="sqlite,xml" - -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils python-r1 versionator - -MY_PV=${PV/_/-} -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Jabber client written in PyGTK" -HOMEPAGE="http://www.gajim.org/" -SRC_URI=" - http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2" -# test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd" -IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - libnotify? ( dbus ) - avahi? ( dbus ) - gnome? ( gnome-keyring )" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - dev-python/pygtk:2[${PYTHON_USEDEP}] - x11-libs/gtk+:2" -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.40.1 - virtual/pkgconfig - >=sys-devel/gettext-0.17-r1" -RDEPEND="${COMMON_DEPEND} - dev-python/pyasn1[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] - >=dev-python/python-nbxmpp-0.5.1[${PYTHON_USEDEP}] - crypt? ( - app-crypt/gnupg - dev-python/pycrypto[${PYTHON_USEDEP}] - ) - dbus? ( - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-libs/dbus-glib - libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] ) - avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] ) - ) - gnome? ( - dev-python/libgnome-python[${PYTHON_USEDEP}] - dev-python/egg-python[${PYTHON_USEDEP}] - ) - gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] ) - idle? ( x11-libs/libXScrnSaver ) - jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] ) - kde? ( kde-apps/kwalletmanager ) - networkmanager? ( - dev-python/dbus-python[${PYTHON_USEDEP}] - net-misc/networkmanager - ) - spell? ( app-text/gtkspell:2 ) - srv? ( - || ( - dev-python/libasyncns-python[${PYTHON_USEDEP}] - net-dns/bind-tools ) - ) - xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )" - -RESTRICT="test" - -S="${WORKDIR}"/${MY_P} - -PATCHES=( "${FILESDIR}"/${P}-desktop.patch ) - -src_prepare() { - autotools-utils_src_prepare - python_copy_sources -} - -src_configure() { - configuration() { - local myeconfargs=( - $(use_enable nls) - $(use_with X x) - --docdir="/usr/share/doc/${PF}" - --libdir="$(python_get_sitedir)" - --enable-site-packages - ) - run_in_build_dir autotools-utils_src_configure - } - python_foreach_impl configuration -} - -src_compile() { - compilation() { - run_in_build_dir autotools-utils_src_compile - } - python_foreach_impl compilation -} - -src_test() { - testing() { - run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die - } - python_foreach_impl testing -} - -src_install() { - installation() { - run_in_build_dir autotools-utils_src_install - python_optimize - } - python_foreach_impl installation - - rm "${ED}/usr/share/doc/${PF}/README.html" || die - dohtml README.html -} diff --git a/net-im/openfire/openfire-3.10.2.ebuild b/net-im/openfire/openfire-3.10.2.ebuild index 6ccd462ed388..cf4db2476dca 100644 --- a/net-im/openfire/openfire-3.10.2.ebuild +++ b/net-im/openfire/openfire-3.10.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="doc" RDEPEND=">=virtual/jre-1.7" diff --git a/net-im/pyaim-t/metadata.xml b/net-im/pyaim-t/metadata.xml index d67761ae6ed4..28d9e8bf392f 100644 --- a/net-im/pyaim-t/metadata.xml +++ b/net-im/pyaim-t/metadata.xml @@ -4,7 +4,7 @@ <herd>net-im</herd> <herd>proxy-maintainers</herd> <maintainer> - <email>carlin@jlab.org</email> + <email>volkris@gmail.com</email> <name>Chris Carlin</name> <description>Proxy maintainer</description> </maintainer> diff --git a/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild b/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild index b5c4fa80eac0..dab353663b62 100644 --- a/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild +++ b/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://ninja.qoop.org/" SRC_URI="ftp://qoop.org/ninja/stable/${P/_/}.tar.gz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ppc ~ppc64 ~sparc ~x86" IUSE="ncurses ipv6 ssl" RESTRICT="test" diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest index e6a2615d9363..e0be55654fa6 100644 --- a/net-libs/gsoap/Manifest +++ b/net-libs/gsoap/Manifest @@ -1,3 +1,4 @@ DIST gsoap_2.7.17.zip 10224444 SHA256 d3af1ce9464b28cacdf1dfbe09b689f8927cbcf3948479996aef52a39afa2c16 SHA512 efb5332e90cbed6013ac2f16b940404cc4de9e84bc85e671cb3588bc6620cd86c8db646a4f3cd77bb3b866dfcc8a793186736ab2241bb8cbaca8d313345d14ac WHIRLPOOL 955e845b5a8b9af1697ca8bcdbb77813f149f7ff162ec51e680c398dab9934c36418572004b7bd24200476b6d45b623f294053b932da2fce94f415becd369af7 DIST gsoap_2.8.12.zip 19974348 SHA256 51eef118544fa846f4d2dea2eedf91c84c46a1abeafc5eee3dcff783f4015a00 SHA512 7f162936d8d331d94b0aa52042c512167198a8de5a279747f49494b0f17442feb4db2ac5abff54e46350562e774b6bdddc577049f7cb59807cab29b12d797a87 WHIRLPOOL 7557396a154405606b2b2a962ac5f19d4853a792c8f96333576e6229506c9fedd8c5652cc1560566dfb51203362063566d2780becb1e1bb0ca2714fabe0a0330 DIST gsoap_2.8.23.zip 22482000 SHA256 e1c30743f1c2cf40b2760568127e14af1b2a00c3026b2e5f0750e8c33d94c061 SHA512 cc90aadfe09aa6406172c9ffa07696851ff594ca7c5b40819494badd8ce978d908d66de63a5831e7aec1bca18ee8b51ed02187057688a3b36eb0a21fe6e0f5a4 WHIRLPOOL e5cfc9c5758847d1fc94cbd38108b80c7548abc0316fe201b58604a3b22d30b9748c81d4aec13f53356593f3ddc2dcba14170a53d63795eab9229ec49d4bc585 +DIST gsoap_2.8.24.zip 23449177 SHA256 6c67bdda7ce9cff62e1faa33c53fb38aa256e2af48b2645a0e5a43142f88b7e8 SHA512 20cad888aa75aa4f715e1120375be7e430554fd0626b8e8684da190ca0547b0d506aac1bc971a674116899fb0fccbb7bc73d03ea46d9af48d72c62e0dfe8e7a7 WHIRLPOOL 37f475317cdfc625b995a67c62f5275950ef886b478ac3adec1402431429650b29406cb45d411b12972d347a1fe176fdbcdbe8f87dc371080418e9bb5566a4a2 diff --git a/net-libs/gsoap/gsoap-2.8.24.ebuild b/net-libs/gsoap/gsoap-2.8.24.ebuild new file mode 100644 index 000000000000..a565476706c1 --- /dev/null +++ b/net-libs/gsoap/gsoap-2.8.24.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools eutils + +MY_P="${PN}-2.8" + +DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services" +HOMEPAGE="http://gsoap2.sourceforge.net" +SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip" + +LICENSE="GPL-2 gSOAP" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc debug examples ipv6 libressl gnutls +ssl" + +RDEPEND=" + sys-libs/zlib + gnutls? ( net-libs/gnutls ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) +" +DEPEND="${RDEPEND} + app-arch/unzip + sys-devel/flex + sys-devel/bison +" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + # Fix Pre-ISO headers + epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch" + + eautoreconf +} + +src_configure() { + local myconf=() + use ssl || myconf+=( --disable-ssl ) + use gnutls && myconf+=( --enable-gnutls ) + use ipv6 && myconf+=( --enable-ipv6 ) + econf \ + ${myconf[@]} \ + $(use_enable debug) \ + $(use_enable examples samples) +} + +src_compile() { + emake -j1 +} + +src_install() { + emake DESTDIR="${D}" install + + # yes, we also install the license-file since + # it contains info about how to apply the licenses + dodoc *.txt + + dohtml changelog.md + + prune_libtool_files --all + + if use examples; then + rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o + insinto /usr/share/doc/${PF}/examples + doins -r gsoap/samples/* + fi + + if use doc; then + dohtml -r gsoap/doc/* + fi +} diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest index 2d8af53de859..10f268ef3121 100644 --- a/net-libs/http-parser/Manifest +++ b/net-libs/http-parser/Manifest @@ -2,3 +2,4 @@ DIST http-parser-2.3.tar.gz 42538 SHA256 3bfe6b4ab7656c86e48b4a43a7a08aee7fd72c1 DIST http-parser-2.4.1.tar.gz 44724 SHA256 4a2597c37b874ce46b30764960d158d18cae2b4cd46458ce3cad98aa106427c9 SHA512 f56b84f0af57cefa46daa10ac2e7b3015c185fa4c55615efa33f9131871a980b5c06ffad1699302ebe847c9325b41403520e0ef4d34bf5f6c48c6edabf1f4cb8 WHIRLPOOL 1873e97df046b10ed7a7da9ad3ba43055634af230b0b4391a8a814bb00455f8864ead809ba2555715e63b9a74202287b2a3c68ced884edf152e794bf70a0cfeb DIST http-parser-2.4.2.tar.gz 44814 SHA256 d93d6cd4d587355bc714d6a79f4e5676d7dd2ccd2fafb21606c87268ea440cbf SHA512 fa2ac6a27807252a8e2ca61e307b92fa7004424dbea69d9ffbd2297f47e0c2af740033126aeb6b11ea172e03c2fbf957c0ab0387836647920c3a9304d07f68ab WHIRLPOOL cbf45915f622ad07ee095f3a592c565847f427575ab0a062ce7d8dbfe3b8b92d4ec97787c3dec4710b7dec4f5b4cde49ece80063b29399c2f44acc14816c08ff DIST http-parser-2.5.0.tar.gz 46070 SHA256 e3b4ba58f4e6ee5fbec781df020e5cb74c3a799a07f059e1e125127a0b801481 SHA512 da94b21f313d09f0557e61574e1187d06ef3bc4e8115c6f8120eac8d26ba6db51469ee5ddb6da5a0c05f49279838e5028afff6a15790708cdca147b3bc66e18f WHIRLPOOL 933ab2f8065fd2e7734d61284a042579edea40f0a0dea6b339a1ba07d9e50f2cd5e14f081d9889b728024171f2faeff7aab97b43c531fbd6badd882026261254 +DIST http-parser-2.6.0.tar.gz 47598 SHA256 a11c5ccb9808496f3de66d54ea1f89271919923307e31c75de2a3a77a6754c97 SHA512 e7bd34ed8270192e55f5e7495972afc9fe2adc36d85df4f09be4958bbf7f93872a056bb8db268cdc1068a9eb79ad9aefc2a8502bda92bac8a2490e08435f09e1 WHIRLPOOL 2bef86db5140c04a2d7e2191e5669c905368a1180c357c512a66a65907b23b317bd2466aa9b1a47c1287e9def7aecdab48c151343b1700d99514b47915df7bf5 diff --git a/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch b/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch new file mode 100644 index 000000000000..a819cf441d32 --- /dev/null +++ b/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch @@ -0,0 +1,64 @@ +From 7fbc87986baa09c342abb21e34613e8bbdc3c9c7 Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@hasufell.de> +Date: Mon, 2 Nov 2015 16:24:43 +0100 +Subject: [PATCH 1/4] makefile: fix DESTDIR usage + +DESTDIR is not supposed to be set inside other variables. It is +standard to have this variable in install/uninstall rules, so it +can be reliably set separately no matter what other variables are set +to. +This also avoids potential bugs with setting SONAME or seds on +installed files (like pkgconfig) which then might include the +temporary DESTDIR directory. + +DESTDIR is really just for installing into a temporary directory or +a chroot, mostly used by package managers. +--- + Makefile | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Makefile b/Makefile +index 33c8ba0..76153a0 100644 +--- a/Makefile ++++ b/Makefile +@@ -55,7 +55,7 @@ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC + LDFLAGS_LIB = $(LDFLAGS) -shared + + INSTALL ?= install +-PREFIX ?= $(DESTDIR)/usr/local ++PREFIX ?= /usr/local + LIBDIR = $(PREFIX)/lib + INCLUDEDIR = $(PREFIX)/include + +@@ -123,19 +123,19 @@ tags: http_parser.c http_parser.h test.c + ctags $^ + + install: library +- $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h +- $(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME) +- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) ++ $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h ++ $(INSTALL) -D $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) ++ ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) + + install-strip: library +- $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h +- $(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME) +- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) ++ $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h ++ $(INSTALL) -D -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) ++ ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) + + uninstall: +- rm $(INCLUDEDIR)/http_parser.h +- rm $(LIBDIR)/$(SONAME) +- rm $(LIBDIR)/libhttp_parser.so ++ rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h ++ rm $(DESTDIR)$(LIBDIR)/$(SONAME) ++ rm $(DESTDIR)$(LIBDIR)/libhttp_parser.so + + clean: + rm -f *.o *.a tags test test_fast test_g \ +-- +2.6.1 + diff --git a/net-libs/http-parser/files/0002-makefile-quote-variables.patch b/net-libs/http-parser/files/0002-makefile-quote-variables.patch new file mode 100644 index 000000000000..096ac6b6bd69 --- /dev/null +++ b/net-libs/http-parser/files/0002-makefile-quote-variables.patch @@ -0,0 +1,50 @@ +From 9bce473ba7417b45bfdb59d4151a8857dcfff4ad Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@hasufell.de> +Date: Mon, 2 Nov 2015 16:27:06 +0100 +Subject: [PATCH 2/4] makefile: quote variables + +Make does not take care of this in make rules. If any of the variables +DESTDIR, INCLUDEDIR or LIBDIR contain whitespaces, then the related +install command will fail. + +This is even more important for the uninstall rule. +--- + Makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index 76153a0..8c4a9d7 100644 +--- a/Makefile ++++ b/Makefile +@@ -123,19 +123,19 @@ tags: http_parser.c http_parser.h test.c + ctags $^ + + install: library +- $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h +- $(INSTALL) -D $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) +- ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) ++ $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" ++ $(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" ++ ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" + + install-strip: library +- $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h +- $(INSTALL) -D -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) +- ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) ++ $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" ++ $(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" ++ ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" + + uninstall: +- rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h +- rm $(DESTDIR)$(LIBDIR)/$(SONAME) +- rm $(DESTDIR)$(LIBDIR)/libhttp_parser.so ++ rm "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" ++ rm "$(DESTDIR)$(LIBDIR)/$(SONAME)" ++ rm "$(DESTDIR)$(LIBDIR)/libhttp_parser.so" + + clean: + rm -f *.o *.a tags test test_fast test_g \ +-- +2.6.1 + diff --git a/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch b/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch new file mode 100644 index 000000000000..cafe68d220c9 --- /dev/null +++ b/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch @@ -0,0 +1,35 @@ +From f45b38c42e7e92a5d0215c44dcf306616536011e Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@hasufell.de> +Date: Mon, 2 Nov 2015 16:32:11 +0100 +Subject: [PATCH 3/4] makefile: fix SONAME symlink, it should not be a full + path + +The symlink destination being a full path doesn't give any benefit and +may break a few use cases of copying these files to a different +destination, while preserving the symlink. +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 8c4a9d7..cbe93e8 100644 +--- a/Makefile ++++ b/Makefile +@@ -125,12 +125,12 @@ tags: http_parser.c http_parser.h test.c + install: library + $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" + $(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" +- ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" ++ ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" + + install-strip: library + $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" + $(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" +- ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" ++ ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" + + uninstall: + rm "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" +-- +2.6.1 + diff --git a/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch b/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch new file mode 100644 index 000000000000..e21cd715499b --- /dev/null +++ b/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch @@ -0,0 +1,31 @@ +From 62b1450cfe2e0df2d912279d38edf1b916020101 Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@hasufell.de> +Date: Mon, 2 Nov 2015 16:39:31 +0100 +Subject: [PATCH 4/4] makefile: add CFLAGS to linking command + +Although we compile the objects explicitly there are some CFLAGS +that may also affect linking, which is not always obvious. + +This can also be a problem for toolchains that support multiple ABIs +and need to set CFLAGS=<abi selector>, which will cause linking +to either fail or produce an unusable executable/library. +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index cbe93e8..ae16f08 100644 +--- a/Makefile ++++ b/Makefile +@@ -102,7 +102,7 @@ libhttp_parser.o: http_parser.c http_parser.h Makefile + $(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o + + library: libhttp_parser.o +- $(CC) $(LDFLAGS_LIB) -o $(SONAME) $< ++ $(CC) $(CFLAGS_LIB) $(LDFLAGS_LIB) -o $(SONAME) $< + + package: http_parser.o + $(AR) rcs libhttp_parser.a http_parser.o +-- +2.6.1 + diff --git a/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch b/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch new file mode 100644 index 000000000000..da966373063f --- /dev/null +++ b/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch @@ -0,0 +1,33 @@ +From b67bfbe6a07529dd82e2ee83b6848d017e6e422f Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@hasufell.de> +Date: Mon, 2 Nov 2015 16:51:28 +0100 +Subject: [PATCH 5/5] makefile: fix install rule dependency + +Otherwise the install rule will recompile the library, no matter +if it has already been compiled. +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index ae16f08..df0b59f 100644 +--- a/Makefile ++++ b/Makefile +@@ -122,12 +122,12 @@ parsertrace_g: http_parser_g.o contrib/parsertrace.c + tags: http_parser.c http_parser.h test.c + ctags $^ + +-install: library ++install: $(SONAME) + $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" + $(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" + ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" + +-install-strip: library ++install-strip: $(SONAME) + $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" + $(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" + ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" +-- +2.6.1 + diff --git a/net-libs/http-parser/http-parser-2.6.0.ebuild b/net-libs/http-parser/http-parser-2.6.0.ebuild new file mode 100644 index 000000000000..186c88065131 --- /dev/null +++ b/net-libs/http-parser/http-parser-2.6.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils toolchain-funcs multilib multilib-minimal + +DESCRIPTION="Http request/response parser for C" +HOMEPAGE="https://github.com/joyent/http-parser" +SRC_URI="https://github.com/joyent/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="static-libs" + +# https://github.com/nodejs/http-parser/pull/272 +PATCHES=( + "${FILESDIR}"/0001-makefile-fix-DESTDIR-usage.patch + "${FILESDIR}"/0002-makefile-quote-variables.patch + "${FILESDIR}"/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch + "${FILESDIR}"/0004-makefile-add-CFLAGS-to-linking-command.patch + "${FILESDIR}"/0005-makefile-fix-install-rule-dependency.patch +) + +src_prepare() { + tc-export CC AR + epatch ${PATCHES[@]} + multilib_copy_sources +} + +multilib_src_compile() { + emake CFLAGS_FAST="${CFLAGS}" library + use static-libs && emake CFLAGS_FAST="${CFLAGS}" package +} + +multilib_src_test() { + emake CFLAGS_DEBUG="${CFLAGS}" test +} + +multilib_src_install() { + emake DESTDIR="${D}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" install + use static-libs && dolib.a libhttp_parser.a +} diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest index 7e8d2735610f..959c5c964379 100644 --- a/net-libs/libmicrohttpd/Manifest +++ b/net-libs/libmicrohttpd/Manifest @@ -1,2 +1,2 @@ DIST libmicrohttpd-0.9.42.tar.gz 1232516 SHA256 00352073367003da40607319e4090a6a8308748b59246ae80e9871f34dad7d5b SHA512 6516f545a5b81aa23bb0d22582f6d7e7f028069d94e0d33d9d6f929e111a3c0e0432eb43b26b4eec87860e8b9f50de38f1b5e6e20cd8faf30512e4891f29b9f3 WHIRLPOOL 9d42c08ee37042debf2e16ddd244c91375e4cecb9843e08d58581a9838677148d90d469bcd4890d4a0680a62e691c659394067da1c7060f7c4e49b309be4417c -DIST libmicrohttpd-0.9.44.tar.gz 1244988 SHA256 f2739cc05112dc00a5ebe1a470174970ca3a3fd71dcd67fb7539af9d83b8411e SHA512 4f8e679e70e95411f762615593fcf2271df542ffab2ddd89f2c435215590ffe375c8e8c1e09cc2d21389d335cad2062944d65591b9478ea26e65123ed5dd56d9 WHIRLPOOL 8cfce79be2c8c6683a8c1b5f1c2d749a6a598346b032726e4f045dda86074fc3a4b44083385a9117eab9a1f85104962aefa2c8e805bb16104e18f6e3c0646cdf +DIST libmicrohttpd-0.9.45.tar.gz 1246332 SHA256 1075def48da9327be22441f4a3460d24159fae2bf4bcfb4ab6e7ca5e95e54a69 SHA512 670d1d1f47ea8657d389302c9bfa8b6d8d12658fb28ce6ed7549db0d4483b1023e7e7d419651f38cef5b024f853d83f336b365624a346b811c2d94ab0d84fb01 WHIRLPOOL 691c1577fd17f6db4bd1990dcfbe4f20cb8944dd51014b349d26bfc8844e367c337eb03c91342b2d9e9923979e36e7464530ed6808636085a2daa006c5295bf6 diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.45-r1.ebuild index 738da03aaeb6..dac0251b6346 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.45-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/" SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" LICENSE="LGPL-2.1" -SLOT="0" +SLOT="0/11" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="epoll messages ssl static-libs test" @@ -20,9 +20,11 @@ RDEPEND="ssl? ( net-libs/gnutls )" +# We disable tests below because they're broken, +# but if enabled, we'll need this. DEPEND="${RDEPEND} test? ( - ssl? ( >=net-misc/curl-7.25.0-r1[ssl] ) + ssl? ( net-misc/curl[ssl] ) )" S=${WORKDIR}/${MY_P} @@ -36,6 +38,7 @@ src_configure() { --disable-examples \ --disable-spdy \ --enable-postprocessor \ + --runstatedir=/run \ $(use_enable epoll) \ $(use_enable test curl) \ $(use_enable messages) \ @@ -44,6 +47,11 @@ src_configure() { $(use_enable static-libs static) } +# tests are broken in the portage environment. +src_test() { + : +} + src_install() { default diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest index 588fdf9c1dab..5a4d1117df87 100644 --- a/net-libs/libtorrent/Manifest +++ b/net-libs/libtorrent/Manifest @@ -1,2 +1,3 @@ DIST libtorrent-0.13.3.tar.gz 732847 SHA256 34317d6783b7f8d0805274c9467475b5432a246c0de8e28fc16e3b0b43f35677 SHA512 40f504db26d52b0c65fc1008c7b1465bde0e316c776028c5448bf15c6fd38389fad780b0c200933e51f63974a43942603e0103d45a98a3dd57f23f01a306ef25 WHIRLPOOL 7ed5c4903413c9a1587a561a9ec4bedf86f1ed78c8f81c0d0ebe7bf7de9f45187cb41520d3187d62d3718c2fb379857fac255311618b42bfcf77794ee8636ff2 DIST libtorrent-0.13.4.tar.gz 768382 SHA256 704e097119dc89e2ee4630396b25de1cd64b0549841347ea75b9ef9217084955 SHA512 6a5ea944c1193d1160563828c5901f0cf557f38c4de61153d505344f3c3c8509c765e01b6cc5e3a53ec2bb184a9e8db32ed4ec154e93a93822804210f0fa45d0 WHIRLPOOL dc3361a1fed59d64e8b6c2fed46d8e20134cd7f0c3b1cad2a1776375a4a3ff796a63fdfb027fa3f81fbb0b409db76592985444702ddf5e034e7c6384b602c4d4 +DIST libtorrent-0.13.6.tar.gz 781253 SHA256 2838a08c96edfd936aff8fbf99ecbb930c2bfca3337dd1482eb5fccdb80d5a04 SHA512 b8aea4060357a8a40d15d42f1f698ef6f3ebdc885000bfbfa5bf9c81af8c88b5503a107e05c214e3e8489126928d336356c5e7e0eaf836b6b84a3cf74633b050 WHIRLPOOL 9bfc9444efef33dce9792b7dc50fd150ebf7462ea656f82ed7cf1b9c3873eb94742c1e3ecdea6d1c382383ca6ebd4ac1e1ea4169328534d056944fb26c2aa4fd diff --git a/net-libs/libtorrent/files/download_constructor.diff b/net-libs/libtorrent/files/download_constructor.diff deleted file mode 100644 index e806cabb64b2..000000000000 --- a/net-libs/libtorrent/files/download_constructor.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- src/download/download_constructor.cc 2011-03-08 17:48:43.000000000 +0300 -+++ src/download/download_constructor.cc.new 2011-03-08 17:36:42.000000000 +0300 -@@ -97,7 +97,17 @@ - - parse_name(b.get_key("info")); - parse_info(b.get_key("info")); -- -+ -+ // hack, quick fix for #2505 -+ if (b.has_key_list("announce-list")) -+ if (b.get_key_list("announce-list").empty()) { -+ b.erase_key("announce-list"); -+ } else { -+ Object::list_type & l = b.get_key_list("announce-list"); -+ if (l.size() == 1 && !l.begin()->is_list()) { -+ b.erase_key("announce-list"); -+ } -+ } - parse_tracker(b); - } - diff --git a/net-libs/libtorrent/libtorrent-0.13.6.ebuild b/net-libs/libtorrent/libtorrent-0.13.6.ebuild new file mode 100644 index 000000000000..42e1ba69d7de --- /dev/null +++ b/net-libs/libtorrent/libtorrent-0.13.6.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils libtool toolchain-funcs + +DESCRIPTION="BitTorrent library written in C++ for *nix" +HOMEPAGE="https://rakshasa.github.io/rtorrent/" +SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz" + +LICENSE="GPL-2" + +# The README says that the library ABI is not yet stable and dependencies on +# the library should be an explicit, syncronized version until the library +# has had more time to mature. Until it matures we should not include a soname +# subslot. +SLOT="0" + +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" +IUSE="debug ipv6 libressl ssl test" + +RDEPEND=" + sys-libs/zlib + >=dev-libs/libsigc++-2.2.2:2 + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + )" +DEPEND="${RDEPEND} + virtual/pkgconfig + test? ( dev-util/cppunit )" + +src_prepare() { + elibtoolize +} + +src_configure() { + # configure needs bash or script bombs out on some null shift, bug #291229 + CONFIG_SHELL=${BASH} econf \ + --enable-aligned \ + $(use_enable debug) \ + $(use_enable ipv6) \ + $(use_enable ssl openssl) \ + --with-posix-fallocate +} + +src_install() { + default + + prune_libtool_files --all +} diff --git a/net-libs/libtorrent/metadata.xml b/net-libs/libtorrent/metadata.xml index aa0f3664825f..50a5b2c6c3fb 100644 --- a/net-libs/libtorrent/metadata.xml +++ b/net-libs/libtorrent/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>net-p2p</herd> + <herd>net-p2p</herd> + <upstream> + <remote-id type="github">rakshasa/libtorrent</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.21-unused-dependency.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.21-unused-dependency.patch new file mode 100644 index 000000000000..3e6656dd272c --- /dev/null +++ b/net-libs/signon-oauth2/files/signon-oauth2-0.21-unused-dependency.patch @@ -0,0 +1,16 @@ +Qt5XmlPatterns is not actually used, but build will fail if it's missing. + +Gentoo-bug: 564316 + +--- src/src.pro ++++ src/src.pro +@@ -4,8 +4,7 @@ + TARGET = oauth2plugin + DESTDIR = lib/signon + QT += core \ +- network \ +- xmlpatterns ++ network + QT -= gui + CONFIG += plugin \ + build_all \ diff --git a/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild index 2c5b49bc870f..2bbabd6efc1b 100644 --- a/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild +++ b/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit qmake-utils +inherit eutils qmake-utils DESCRIPTION="OAuth2 plugin for Signon daemon" HOMEPAGE="https://01.org/gsso/" @@ -30,6 +30,8 @@ src_prepare() { else sed -i -e '/^INSTALLS.*/,+1d' tests/tests.pro || die "couldn't remove tests from install target" fi + + epatch "${FILESDIR}/${P}-unused-dependency.patch" } src_configure() { diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest index 54fc6a82fdac..30ff988e80e6 100644 --- a/net-libs/telepathy-qt/Manifest +++ b/net-libs/telepathy-qt/Manifest @@ -1,2 +1 @@ -DIST telepathy-qt-0.9.5.tar.gz 5862803 SHA256 93474858efe55bf45ee9352f88b852d4a24505939dc81a3a3c6fa5a686809c8e SHA512 2cc141037fbd2cc993f16e2ba52b3f6dda7841ff150f9d40d9e659eafdee67dd23563662954247f46bd8a34db7d87b7ec770da90725a19f634cd396a2d74e34b WHIRLPOOL cfef1a61725d0e07b65995155def64120d7d6993772511971eb7c8f7bcd956ed462544afbf52559cf2d5cc1825aeb1ce1f17371700d5a5e7f540b69da38d0709 DIST telepathy-qt-0.9.6.1.tar.gz 6067468 SHA256 496eb4951ea9b181d7d68a2122a885474c4f73b519319496aa1b97d9b361a1f8 SHA512 d15bdf94ef2b546270130012e8636fb2801b0c4fb50513ac0dbc0e1f6255d84da6df12195b3d26dc6df5a9466929a1073e87d2a9e600c7bf26c3e1aa112113b7 WHIRLPOOL 621137fc10ce3db1d834711aaf876adf98056a5ca8bab22c011e881e71522060cd6110733880db4f6646872501b870305d3590428ea3d809b4b512bbc21e653b diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild deleted file mode 100644 index a5c3ba2d7103..000000000000 --- a/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 cmake-utils virtualx multibuild - -DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol" -HOMEPAGE="http://telepathy.freedesktop.org/" -SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="debug farstream +qt4 qt5 test" - -REQUIRED_USE="|| ( qt4 qt5 )" - -RDEPEND=" - farstream? ( - >=net-libs/telepathy-farstream-0.2.2 - >=net-libs/telepathy-glib-0.18.0 - ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - ) - !net-libs/telepathy-qt4 -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - test? ( - dev-libs/dbus-glib - dev-libs/glib:2 - dev-python/dbus-python - qt4? ( dev-qt/qttest:4 ) - qt5? ( dev-qt/qttest:5 ) - ) -" - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) - -pkg_setup() { - python-any-r1_pkg_setup - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) -} - -src_configure() { - myconfigure() { - local mycmakeargs=( - $(cmake-utils_use_enable debug DEBUG_OUTPUT) - $(cmake-utils_use_enable farstream) - $(cmake-utils_use_enable test TESTS) - -DENABLE_EXAMPLES=OFF - -ENABLE_SERVICE_SUPPORT=ON - ) - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=(-DDESIRED_QT_VERSION=4) - fi - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=(-DDESIRED_QT_VERSION=5) - fi - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile -} - -src_test() { - mytest() { - pushd "${BUILD_DIR}" > /dev/null - VIRTUALX_COMMAND="ctest -E '(CallChannel)'" virtualmake || die "tests failed" - popd > /dev/null - } - - multibuild_foreach_variant mytest -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild index c1796dccae51..d920d98d8296 100644 --- a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" IUSE="debug farstream +qt4 qt5 test" REQUIRED_USE="|| ( qt4 qt5 )" diff --git a/net-mail/dovecot/dovecot-2.2.19-r1.ebuild b/net-mail/dovecot/dovecot-2.2.19-r1.ebuild new file mode 100644 index 000000000000..959d9bced7a4 --- /dev/null +++ b/net-mail/dovecot/dovecot-2.2.19-r1.ebuild @@ -0,0 +1,308 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils multilib ssl-cert systemd user versionator + +MY_P="${P/_/.}" +major_minor="$(get_version_component_range 1-2)" +sieve_version="0.4.9" +if [[ ${PV} == *_rc* ]] ; then + rc_dir="rc/" +else + rc_dir="" +fi +SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz + sieve? ( + http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz + ) + managesieve? ( + http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz + ) " +DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" +HOMEPAGE="http://www.dovecot.org/" + +SLOT="0" +LICENSE="LGPL-2.1 MIT" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" + +IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail" +IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox" +IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib" +IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat" + +IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" + +DEPEND="bzip2? ( app-arch/bzip2 ) + caps? ( sys-libs/libcap ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + lucene? ( >=dev-cpp/clucene-2.3 ) + lzma? ( app-arch/xz-utils ) + lz4? ( app-arch/lz4 ) + mysql? ( virtual/mysql ) + pam? ( virtual/pam ) + postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) + selinux? ( sec-policy/selinux-dovecot ) + solr? ( net-misc/curl dev-libs/expat ) + sqlite? ( dev-db/sqlite:* ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + tcpd? ( sys-apps/tcp-wrappers ) + textcat? ( app-text/libexttextcat ) + vpopmail? ( net-mail/vpopmail ) + zlib? ( sys-libs/zlib ) + virtual/libiconv + dev-libs/icu:=" + +RDEPEND="${DEPEND} + net-mail/mailbase" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + if use managesieve && ! use sieve; then + ewarn "managesieve USE flag selected but sieve USE flag unselected" + ewarn "sieve USE flag will be turned on" + fi + # default internal user + enewgroup dovecot 97 + enewuser dovecot 97 -1 /dev/null dovecot + # default login user + enewuser dovenull -1 -1 /dev/null + # add "mail" group for suid'ing. Better security isolation. + if use suid; then + enewgroup mail + fi +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-10-ssl.patch" + epatch_user +} + +src_configure() { + local conf="" + + if use postgres || use mysql || use sqlite; then + conf="${conf} --with-sql" + fi + + local storages="" + for storage in ${IUSE_DOVECOT_STORAGE//+/}; do + use ${storage} && storages="${storage} ${storages}" + done + [ "${storages}" ] || storages="maildir" + + # turn valgrind tests off. Bug #340791 + VALGRIND=no econf \ + --localstatedir="${EPREFIX}/var" \ + --runstatedir="${EPREFIX}/run" \ + --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ + --without-stemmer \ + --with-storages="${storages}" \ + --disable-rpath \ + --with-icu \ + $( systemd_with_unitdir ) \ + $( use_with bzip2 bzlib ) \ + $( use_with caps libcap ) \ + $( use_with kerberos gssapi ) \ + $( use_with ldap ) \ + $( use_with lucene ) \ + $( use_with lz4 ) \ + $( use_with lzma ) \ + $( use_with mysql ) \ + $( use_with pam ) \ + $( use_with postgres pgsql ) \ + $( use_with sqlite ) \ + $( use_with solr ) \ + $( use_with ssl ) \ + $( use_with tcpd libwrap ) \ + $( use_with textcat ) \ + $( use_with vpopmail ) \ + $( use_with zlib ) \ + $( use_enable static-libs static ) \ + ${conf} + + if use sieve || use managesieve ; then + # The sieve plugin needs this file to be build to determine the plugin + # directory and the list of libraries to link to. + emake dovecot-config + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + econf \ + $( use_enable static-libs static ) \ + --localstatedir="${EPREFIX}/var" \ + --enable-shared \ + --with-dovecot="../${MY_P}" \ + $( use_with managesieve ) + fi +} + +src_compile() { + default + if use sieve || use managesieve ; then + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + fi +} + +src_test() { + default + if use sieve || use managesieve ; then + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + default + fi +} + +src_install () { + default + + # insecure: + # use suid && fperms u+s /usr/libexec/dovecot/deliver + # better: + if use suid;then + einfo "Changing perms to allow deliver to be suided" + fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda" + fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda" + fi + + newinitd "${FILESDIR}"/dovecot.init-r4 dovecot + + rm -rf "${ED}"/usr/share/doc/dovecot + + dodoc AUTHORS NEWS README TODO + dodoc doc/*.{txt,cnf,xml,sh} + docinto example-config + dodoc doc/example-config/*.{conf,ext} + docinto example-config/conf.d + dodoc doc/example-config/conf.d/*.{conf,ext} + docinto wiki + dodoc doc/wiki/* + doman doc/man/*.{1,7} + + # Create the dovecot.conf file from the dovecot-example.conf file that + # the dovecot folks nicely left for us.... + local conf="${ED}/etc/dovecot/dovecot.conf" + local confd="${ED}/etc/dovecot/conf.d" + + insinto /etc/dovecot + doins doc/example-config/*.{conf,ext} + insinto /etc/dovecot/conf.d + doins doc/example-config/conf.d/*.{conf,ext} + fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext + rm -f "${confd}/../README" + + # .maildir is the Gentoo default + local mail_location="maildir:~/.maildir" + if ! use maildir; then + if use mbox; then + mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u" + keepdir /var/dovecot + sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \ + "${confd}/10-mail.conf" || die "sed failed" + elif use mdbox ; then + mail_location="mdbox:~/.mdbox" + elif use sdbox ; then + mail_location="sdbox:~/.sdbox" + fi + fi + sed -i -e \ + "s|#mail_location =|mail_location = ${mail_location}|" \ + "${confd}/10-mail.conf" \ + || die "failed to update mail location settings in 10-mail.conf" + + # We're using pam files (imap and pop3) provided by mailbase + if use pam; then + sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \ + "${confd}/auth-system.conf.ext" \ + || die "failed to update PAM settings in auth-system.conf.ext" + # mailbase does not provide a sieve pam file + use managesieve && dosym imap /etc/pam.d/sieve + sed -i -e \ + 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \ + "${confd}/10-auth.conf" \ + || die "failed to update PAM settings in 10-auth.conf" + fi + + # Disable ipv6 if necessary + if ! use ipv6; then + sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \ + || die "failed to update listen settings in dovecot.conf" + fi + + # Update ssl cert locations + if use ssl; then + sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ + || die "ssl conf failed" + sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \ + -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \ + "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf" + fi + + # Install SQL configuration + if use mysql || use postgres; then + sed -i -e \ + 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \ + "${confd}/10-auth.conf" || die "failed to update SQL settings in \ + 10-auth.conf" + fi + + # Install LDAP configuration + if use ldap; then + sed -i -e \ + 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \ + "${confd}/10-auth.conf" \ + || die "failed to update ldap settings in 10-auth.conf" + fi + + if use vpopmail; then + sed -i -e \ + 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \ + "${confd}/10-auth.conf" \ + || die "failed to update vpopmail settings in 10-auth.conf" + fi + + if use sieve || use managesieve ; then + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + emake DESTDIR="${ED}" install + sed -i -e \ + 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \ + || die "failed to update sieve settings in 15-lda.conf" + rm -rf "${ED}"/usr/share/doc/dovecot + docinto example-config/conf.d + dodoc doc/example-config/conf.d/*.conf + insinto /etc/dovecot/conf.d + doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf + use managesieve && doins doc/example-config/conf.d/20-managesieve.conf + docinto sieve/rfc + dodoc doc/rfc/*.txt + docinto sieve/devel + dodoc doc/devel/DESIGN + docinto plugins + dodoc doc/plugins/*.txt + docinto extensions + dodoc doc/extensions/*.txt + docinto locations + dodoc doc/locations/*.txt + doman doc/man/*.{1,7} + fi + + use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete +} + +pkg_postinst() { + if use ssl; then + # Let's not make a new certificate if we already have one + if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \ + -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then + einfo "Creating SSL certificate" + SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" + install_cert /etc/ssl/dovecot/server + fi + fi + + elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes." +} diff --git a/net-mail/dovecot/dovecot-2.2.19.ebuild b/net-mail/dovecot/dovecot-2.2.19.ebuild index fe51bd2156e2..ec22df82289c 100644 --- a/net-mail/dovecot/dovecot-2.2.19.ebuild +++ b/net-mail/dovecot/dovecot-2.2.19.ebuild @@ -25,7 +25,7 @@ HOMEPAGE="http://www.dovecot.org/" SLOT="0" LICENSE="LGPL-2.1 MIT" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86" IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail" IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox" diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml index 8c799196fde1..d42dc8ddf5bb 100644 --- a/net-mail/dovecot/metadata.xml +++ b/net-mail/dovecot/metadata.xml @@ -19,5 +19,6 @@ <flag name="lzma">Add support for lzma (de)compression</flag> <flag name="lz4">Add support for lz4 (de)compression</flag> <flag name="solr">Add solr full text search (FTS) support</flag> + <flag name="textcat">Add libtextcat language guessing support for full text search (FTS)</flag> </use> </pkgmetadata> diff --git a/net-mail/mailman/mailman-2.1.20-r1.ebuild b/net-mail/mailman/mailman-2.1.20-r1.ebuild new file mode 100644 index 000000000000..41ffb9e301e1 --- /dev/null +++ b/net-mail/mailman/mailman-2.1.20-r1.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils python-single-r1 multilib systemd user + +DESCRIPTION="A python-based mailing list server with an extensive web interface" +SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz" +HOMEPAGE="http://www.list.org/" +S="${WORKDIR}/${P/_p/-}" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="selinux" + +DEPEND=" + virtual/mta + virtual/cron + virtual/httpd-cgi + virtual/dnspython[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-mailman ) +" + +pkg_setup() { + python-single-r1_pkg_setup + INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"} + VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"} + CGIUID=${MAILMAN_CGIUID:-apache} + CGIGID=${MAILMAN_CGIGID:-apache} + MAILUSR=${MAILMAN_MAILUSR:-mailman} + MAILUID=${MAILMAN_MAILUID:-280} + MAILGRP=${MAILMAN_MAILGRP:-mailman} + MAILGID=${MAILMAN_MAILGID:-280} + + # Bug #58526: switch to enew{group,user}. + # need to add mailman here for compile process. + # Duplicated at pkg_postinst() for binary install. + enewgroup ${MAILGRP} ${MAILGID} + enewuser ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch" + epatch "${FILESDIR}/${PN}-2.1.9-icons.patch" +} + +src_configure() { + econf \ + --without-permcheck \ + --prefix="${INSTALLDIR}" \ + --with-mail-gid=${MAILGID} \ + --with-cgi-gid=${CGIGID} \ + --with-cgi-ext="${MAILMAN_CGIEXT}" \ + --with-var-prefix="${VAR_PREFIX}" \ + --with-username=${MAILUSR} \ + --with-groupname=${MAILGRP} \ + --with-python="${PYTHON}" +} + +src_install () { + emake "DESTDIR=${D}" doinstall + + insinto /etc/apache2/modules.d + newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf + sed \ + -e "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" \ + -e "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" \ + -e "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" \ + -i "${D}/etc/apache2/modules.d/50_mailman.conf" || die + + newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo + + dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \ + contrib/README.check_perms_grsecurity contrib/virtusertable + + exeinto ${INSTALLDIR}/bin + doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \ + contrib/mm-handler* + + dodir /etc/mailman + mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman" + dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py + + # Save the old config for updates from pre-2.1.9-r2 + # To be removed some distant day + for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}; do + if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then + cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" || die + fi + done + + newinitd "${FILESDIR}/mailman.rc" mailman + cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die + sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die + systemd_dounit "${T}/mailman.service" + + keepdir ${VAR_PREFIX}/logs + keepdir ${VAR_PREFIX}/locks + keepdir ${VAR_PREFIX}/spam + keepdir ${VAR_PREFIX}/archives/public + keepdir ${VAR_PREFIX}/archives/private + keepdir ${VAR_PREFIX}/lists + keepdir ${VAR_PREFIX}/qfiles + + chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* || die + chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" || die + chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \ + "${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} || die + chmod 2770 "${D}/${VAR_PREFIX}/archives/private" || die + chmod 2770 "${D}/${VAR_PREFIX}/qfiles" || die + chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" || die + + python_optimize ${INSTALLDIR}/bin/ ${INSTALLDIR}/Mailman \ + ${INSTALLDIR}/Mailman/*/ +} + +pkg_postinst() { + enewgroup ${MAILGRP} ${MAILGID} + enewuser ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron + echo + elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional" + elog "Setup information, mailman will NOT run unless you follow" + elog "those instructions!" + echo + + elog "An example Mailman configuration file for Apache has been installed into:" + elog " ${APACHE2_MODULES_CONFDIR}/50_mailman.conf" + echo + elog "To enable, you will need to add \"-D MAILMAN\" to" + elog "/etc/conf.d/apache2." + echo + + ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure" + ewarn "mailman with the following variables:" + ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)" + ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)" + ewarn "MAILMAN_CGIUID (default: apache)" + ewarn "MAILMAN_CGIGID (default: apache)" + ewarn "MAILMAN_CGIEXT (default: empty)" + ewarn "MAILMAN_MAILUSR (default: mailman)" + ewarn "MAILMAN_MAILUID (default: 280)" + ewarn "MAILMAN_MAILGRP (default: mailman)" + ewarn "MAILMAN_MAILGID (default: 280)" + ewarn + ewarn "Config file is now symlinked in /etc/mailman, so etc-update works." + ewarn + ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you" + ewarn "NEED to make a few manual updates to your system:" + ewarn + ewarn "1. Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman" + ewarn "2. Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'" + ewarn "3. Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py" + ewarn + ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from" + ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and" + ewarn "archives/ directory to the new location, ensuring that the" + ewarn "permissions is correct. See bug #208789 for a discussion." +} diff --git a/net-mail/mailman/mailman-2.1.20.ebuild b/net-mail/mailman/mailman-2.1.20.ebuild index 56d61cde0400..33a25bc5f07d 100644 --- a/net-mail/mailman/mailman-2.1.20.ebuild +++ b/net-mail/mailman/mailman-2.1.20.ebuild @@ -20,7 +20,10 @@ IUSE="selinux" DEPEND="virtual/mta virtual/cron virtual/httpd-cgi - dev-python/dnspython" + || ( + dev-python/dnspython:0 + virtual/dnspython + )" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mailman ) " diff --git a/net-misc/axel/axel-2.4-r3.ebuild b/net-misc/axel/axel-2.4-r3.ebuild index ecf041c4c119..e63c85a14139 100644 --- a/net-misc/axel/axel-2.4-r3.ebuild +++ b/net-misc/axel/axel-2.4-r3.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://alioth.debian.org/frs/download.php/${DOWNLOAD_ID}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 hppa ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris" +KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris" IUSE="debug nls" DEPEND="nls? ( sys-devel/gettext )" diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest index 176dd2e6b001..ce150e875355 100644 --- a/net-misc/bfgminer/Manifest +++ b/net-misc/bfgminer/Manifest @@ -1,4 +1,6 @@ DIST bfgminer-3.10.10.tbz2 1087392 SHA256 b361d6f195e4c91eb01b08f0907615029fc9bd7d58c017bc7943d0333c4ba018 SHA512 c8f6ee424dfd948f543c4ef20885f683acd9fc8925eb4cd2b4255b4b1073b5a58303f468adff2e9689df16833d4a1cdabc9f464d241d9eb1c8c5df0eae322cf0 WHIRLPOOL aabce648db6026f6a4527dafa6ed7e64b03cb9b0e5993a8a48b22c93683b78f992f0cb67c03dd2c72945bc92a42fa514a7a28a97a7e73149ddf1fd5e840c8d6a DIST bfgminer-3.10.5.tbz2 1091287 SHA256 224e02979ed27f7cebe47ca7a17fa9a1ecce7680531c3995daade54cc3be2807 SHA512 500745b09ced2102cb7bfee8dbe3e44bf69c3220fff5d2fdc642a1b4c0674f36a1786c1e384ab641dde5b3149713d9b0a4e520cfd50c2cc89710fe54f1315303 WHIRLPOOL 0b4299b56b86cc4633225a321c957ce47fd719f3132c32f34618de2e7b15fc388a39cc3627959207490d7f8fb263942cc3be5a710b9cbe7114988364ba1a43fa DIST bfgminer-4.10.3.tar.xz 988552 SHA256 c9e4ac3754dad838d3a8120afd499751ac2e8b15fe6dd6d18be28fc1ec72355a SHA512 99b684382c61c9e2eb0a3469af0f33ddb427f8f612bbad5623de29168547c7a87d065b18134b7e944163dcb429a9025f42c19ff8ac68cfeed705e008ef6292fb WHIRLPOOL b0887909dc878d9cf914bd092f3abbc2527a30cb4359f31cafbcc417cffa145bc3d3ab7a4809e8b068d8545ee5f01078cde753e37a615dc4532a2a352d75987a +DIST bfgminer-4.10.4.tar.xz 988348 SHA256 93c7e5f3170b39353fa4e924268a2497810df64ad8aae281f205484971e2c0c9 SHA512 5c367babbe7c9cd42fb5f75328989a9da14f0ed11c8922d2a0dcfb40a41552dbfe30c79a7e4f33a1612e85dab506869f96c6b401d6cf57afd27cff71950a3e75 WHIRLPOOL 716eba07b3fb0ab8a1a5600bc14bcc444a70d1b1d3707de547e8c59c3ef587452f4cb153c2fb8b90f806df60d3cd6148fbcf5e1c94de1221e05a2ef25bc4a3c5 DIST bfgminer-5.3.0.tar.xz 1017536 SHA256 d48fa6e51ff70ee1a85f77334a24f842ca6774c073c2d864fe739f07093ef77f SHA512 935b2a0595a2230f8ba9f832a280f52418c1b50b884010bebd2059cbef83d28c535d8d0b3cd7abe5b2420f6dc9fa8e9e0e32839ccdb6cd002a1e874dc5b1841a WHIRLPOOL 0244c9cf2a8928590f69819cfaa222498ae9e0b65aba4c0bc3fc751b7712e9284110ef238dd3bdeaa0562f4eaa292b4257e4d509966ff8e92731dd3f1d9f8ecc +DIST bfgminer-5.4.0.tar.xz 1037568 SHA256 c265e060919545bd2cdb187de0549b372413c49ca02c5bd5621ef9a91b9f5c0c SHA512 26d49e0a8b336c6dcfbae7abb4d5fc97707dffc0cb9d790984d02c4557d8383120b58c8a3e08ce7cc4f5bbfc051d01d518181eab4344b57d119527dfb1d75f84 WHIRLPOOL 2299b8a4082a59541f13cd04cb516b40d599f3080c70c7020e4581bb4ed583902d2221fd418cd13b8d6edcaaf3290db4f03e8e4fc6073ca31a33786b1da547bd diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 4409f48578cd..d1476aea0052 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,4 +1,3 @@ -DIST curl-7.42.1.tar.bz2 3327304 SHA256 e2905973391ec2dfd7743a8034ad10eeb58dab8b3a297e7892a41a7999cac887 SHA512 846c2d2bc73d39240686bf54e4c02553a1ca1640123fef30538cfc8a6317650f4cb9f1cc882016b7826ef9c84cb92adbfa24e55d59d2e7203bdcb12835fb474f WHIRLPOOL ff826e11812334ebca650c54788bf1b81b2927f7b9607b10e79cc70f6d1f9b893aebc816914158243510ffaead3b15a21ce10e7180eeb175b0b503e9ac8b0c6e DIST curl-7.43.0.tar.bz2 3363770 SHA256 baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9 SHA512 0b06ec078680619f56a458ac115142546134917331b71b73ed2c0371c480034dac7ed848814be0dd1e752154c53e48b9e0276b83f75a690df6cfb480ab331272 WHIRLPOOL e5c97b3cbf0f9915f62a100ce2972e6cffcabae753770c2f0a1fc3bcef3a66c0a2d4d7e361b00f442d62eca3b0d9526eb34f6b043fb655648180e81ef630a527 DIST curl-7.44.0.tar.bz2 3398814 SHA256 1e2541bae6582bb697c0fbae49e1d3e6fad5d05d5aa80dbd6f072e0a44341814 SHA512 250a0aa6ba9917cd7666ff180efb02d994d1040759b94370b8c3bb215467d632b867f111b555228ab7f9a7ecd1e5d205204b29cbc003797dd315f628376a376d WHIRLPOOL 6725c44667016365f6c83a75cae1fc1f4d310256194a7f6b2738f642250b5229a565047c9f4882f07dd2daf0a4b5149e22ce91d62c26a52d73c087e50c64f6cd DIST curl-7.45.0.tar.bz2 3473632 SHA256 65154e66b9f8a442b57c436904639507b4ac37ec13d6f8a48248f1b4012b98ea SHA512 71c557c69eb8d160f74a9b76ef83a46ce33ef4e8a66a261699329583dadf10205b4ba4783f92d4e6c8724f6610ffade5b0a9f189b0a7b9169ff839dfc8980481 WHIRLPOOL afc1627cebb64c9111f943fe63d95c8a998934fd02e3b8d12f061d23b174b7475c48451ecc1713ce54771455a6465238aa3b818b0eb9ba5c86ffd06eb1f2bc76 diff --git a/net-misc/curl/curl-7.42.1-r1.ebuild b/net-misc/curl/curl-7.42.1-r1.ebuild deleted file mode 100644 index 91232b6c0f95..000000000000 --- a/net-misc/curl/curl-7.42.1-r1.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit autotools eutils prefix multilib-minimal - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="http://curl.haxx.se/" -SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" - -LICENSE="MIT" -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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads" -IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl" -IUSE+=" elibc_Winnt" - -#lead to lots of false negatives, bug #285669 -RESTRICT="test" - -RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] ) - ssl? ( - curl_ssl_axtls? ( - >=net-libs/axtls-1.4.9-r1[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_gnutls? ( - || ( - ( - >=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}] - >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}] - ) - ( - =net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}] - >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}] - ) - ( - =net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}] - >=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}] - ) - ) - app-misc/ca-certificates - ) - curl_ssl_openssl? ( - >=dev-libs/openssl-1.0.1h-r2[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_nss? ( - >=dev-libs/nss-3.15.4[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_polarssl? ( - >=net-libs/polarssl-1.3.4:=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - ) - idn? ( >=net-dns/libidn-1.28[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,${MULTILIB_USEDEP}] ) - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" - -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 -# rtmp? ( -# media-video/rtmpdump -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) -# ) - -# ssl providers to be added: -# fbopenssl $(use_with spnego) - -# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html - -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - test? ( - sys-apps/diffutils - dev-lang/perl - )" - -# c-ares must be disabled for threads -# only one ssl provider can be enabled -REQUIRED_USE=" - curl_ssl_winssl? ( elibc_Winnt ) - threads? ( !adns ) - ssl? ( - ^^ ( - curl_ssl_axtls - curl_ssl_gnutls - curl_ssl_openssl - curl_ssl_nss - curl_ssl_polarssl - curl_ssl_winssl - ) - )" - -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \ - docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/curl/curlbuild.h -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/curl-config -) - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-7.30.0-prefix.patch \ - "${FILESDIR}"/${PN}-respect-cflags-3.patch \ - "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch - - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 - - epatch_user - eprefixify curl-config.in - eautoreconf -} - -multilib_src_configure() { - einfo "\033[1;32m**************************************************\033[00m" - - # We make use of the fact that later flags override earlier ones - # So start with all ssl providers off until proven otherwise - local myconf=() - myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl ) - myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - if use ssl ; then - if use curl_ssl_axtls; then - einfo "SSL provided by axtls" - einfo "NOTE: axtls is meant for embedded systems and" - einfo "may not be the best choice as an ssl provider" - myconf+=( --with-axtls ) - fi - if use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - if has_version ">=net-libs/gnutls-3.2.15[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then - einfo "gnutls compiled with dev-libs/nettle" - myconf+=( --with-gnutls --with-nettle ) - else - einfo "gnutls compiled with dev-libs/libgcrypt" - myconf+=( --with-gnutls --without-nettle ) - fi - fi - if use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss ) - fi - if use curl_ssl_polarssl; then - einfo "SSL provided by polarssl" - einfo "NOTE: polarssl is meant for embedded systems and" - einfo "may not be the best choice as an ssl provider" - myconf+=( --with-polarssl ) - fi - if use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - fi - if use curl_ssl_winssl; then - einfo "SSL provided by Windows" - myconf+=( --with-winssl ) - fi - else - einfo "SSL disabled" - fi - einfo "\033[1;32m**************************************************\033[00m" - - # These configuration options are organized alphabetically - # within each category. This should make it easier if we - # ever decide to make any of them contingent on USE flags: - # 1) protocols first. To see them all do - # 'grep SUPPORT_PROTOCOLS configure.ac' - # 2) --enable/disable options second. - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort - # 3) --with/without options third. - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort - ECONF_SOURCE="${S}" \ - econf \ - --enable-dict \ - --enable-file \ - --enable-ftp \ - --enable-gopher \ - --enable-http \ - --enable-imap \ - $(use_enable ldap) \ - $(use_enable ldap ldaps) \ - --enable-pop3 \ - --enable-rtsp \ - $(use_enable samba smb) \ - $(use_with ssh libssh2) \ - --enable-smtp \ - --enable-telnet \ - --enable-tftp \ - $(use_enable adns ares) \ - --enable-cookies \ - --enable-hidden-symbols \ - $(use_enable ipv6) \ - --enable-largefile \ - --enable-manual \ - --enable-proxy \ - --disable-soname-bump \ - --disable-sspi \ - $(use_enable static-libs static) \ - $(use_enable threads threaded-resolver) \ - --disable-versioned-symbols \ - --without-cyassl \ - --without-darwinssl \ - $(use_with idn libidn) \ - $(use_with kerberos gssapi "${EPREFIX}"/usr) \ - --without-krb4 \ - $(use_with metalink libmetalink) \ - --without-nghttp2 \ - $(use_with rtmp librtmp) \ - --without-spnego \ - --without-winidn \ - --with-zlib \ - "${myconf[@]}" - - if ! multilib_is_native_abi; then - # avoid building the client - sed -i -e '/SUBDIRS/s:src::' Makefile || die - fi -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files --all - - rm -rf "${ED}"/etc/ - - # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976 - insinto /usr/share/aclocal - doins docs/libcurl/libcurl.m4 -} diff --git a/net-misc/curl/curl-7.42.1.ebuild b/net-misc/curl/curl-7.42.1.ebuild deleted file mode 100644 index 93e5bc53d5b9..000000000000 --- a/net-misc/curl/curl-7.42.1.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit autotools eutils prefix multilib-minimal - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="http://curl.haxx.se/" -SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" - -LICENSE="MIT" -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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads" -IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl" -IUSE="${IUSE} elibc_Winnt" - -#lead to lots of false negatives, bug #285669 -RESTRICT="test" - -RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] ) - ssl? ( - curl_ssl_axtls? ( - >=net-libs/axtls-1.4.9-r1[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_gnutls? ( - || ( - ( - >=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}] - >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}] - ) - ( - =net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}] - >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}] - ) - ( - =net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}] - >=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}] - ) - ) - app-misc/ca-certificates - ) - curl_ssl_openssl? ( - >=dev-libs/openssl-1.0.1h-r2[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_nss? ( - >=dev-libs/nss-3.15.4[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_polarssl? ( - >=net-libs/polarssl-1.3.4:=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - ) - idn? ( >=net-dns/libidn-1.28[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,${MULTILIB_USEDEP}] ) - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" - -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 -# rtmp? ( -# media-video/rtmpdump -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) -# ) - -# ssl providers to be added: -# fbopenssl $(use_with spnego) - -# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html - -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - test? ( - sys-apps/diffutils - dev-lang/perl - )" - -# c-ares must be disabled for threads -# only one ssl provider can be enabled -REQUIRED_USE=" - curl_ssl_winssl? ( elibc_Winnt ) - threads? ( !adns ) - ssl? ( - ^^ ( - curl_ssl_axtls - curl_ssl_gnutls - curl_ssl_openssl - curl_ssl_nss - curl_ssl_polarssl - curl_ssl_winssl - ) - )" - -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \ - docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/curl/curlbuild.h -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/curl-config -) - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-7.30.0-prefix.patch \ - "${FILESDIR}"/${PN}-respect-cflags-3.patch \ - "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch - - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 - - epatch_user - eprefixify curl-config.in - eautoreconf -} - -multilib_src_configure() { - einfo "\033[1;32m**************************************************\033[00m" - - # We make use of the fact that later flags override earlier ones - # So start with all ssl providers off until proven otherwise - local myconf=() - myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl ) - myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - if use ssl ; then - if use curl_ssl_axtls; then - einfo "SSL provided by axtls" - einfo "NOTE: axtls is meant for embedded systems and" - einfo "may not be the best choice as an ssl provider" - myconf+=( --with-axtls ) - fi - if use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - if has_version ">=net-libs/gnutls-3.2.15[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then - einfo "gnutls compiled with dev-libs/nettle" - myconf+=( --with-gnutls --with-nettle ) - else - einfo "gnutls compiled with dev-libs/libgcrypt" - myconf+=( --with-gnutls --without-nettle ) - fi - fi - if use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss ) - fi - if use curl_ssl_polarssl; then - einfo "SSL provided by polarssl" - einfo "NOTE: polarssl is meant for embedded systems and" - einfo "may not be the best choice as an ssl provider" - myconf+=( --with-polarssl ) - fi - if use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - fi - if use curl_ssl_winssl; then - einfo "SSL provided by Windows" - myconf+=( --with-winssl ) - fi - else - einfo "SSL disabled" - fi - einfo "\033[1;32m**************************************************\033[00m" - - # These configuration options are organized alphabetically - # within each category. This should make it easier if we - # ever decide to make any of them contingent on USE flags: - # 1) protocols first. To see them all do - # 'grep SUPPORT_PROTOCOLS configure.ac' - # 2) --enable/disable options second. - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort - # 3) --with/without options third. - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort - ECONF_SOURCE="${S}" \ - econf \ - --enable-dict \ - --enable-file \ - --enable-ftp \ - --enable-gopher \ - --enable-http \ - --enable-imap \ - $(use_enable ldap) \ - $(use_enable ldap ldaps) \ - --enable-pop3 \ - --enable-rtsp \ - $(use_enable samba smb) \ - $(use_with ssh libssh2) \ - --enable-smtp \ - --enable-telnet \ - --enable-tftp \ - $(use_enable adns ares) \ - --enable-cookies \ - --enable-hidden-symbols \ - $(use_enable ipv6) \ - --enable-largefile \ - --enable-manual \ - --enable-proxy \ - --disable-soname-bump \ - --disable-sspi \ - $(use_enable static-libs static) \ - $(use_enable threads threaded-resolver) \ - --disable-versioned-symbols \ - --without-cyassl \ - --without-darwinssl \ - $(use_with idn libidn) \ - $(use_with kerberos gssapi "${EPREFIX}"/usr) \ - --without-krb4 \ - $(use_with metalink libmetalink) \ - --without-nghttp2 \ - $(use_with rtmp librtmp) \ - --without-spnego \ - --without-winidn \ - --with-zlib \ - "${myconf[@]}" - - if ! multilib_is_native_abi; then - # avoid building the client - sed -i -e '/SUBDIRS/s:src::' Makefile || die - fi -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files --all - - rm -rf "${ED}"/etc/ - - # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976 - insinto /usr/share/aclocal - doins docs/libcurl/libcurl.m4 -} diff --git a/net-misc/dahdi/dahdi-2.10.2-r2.ebuild b/net-misc/dahdi/dahdi-2.10.2-r2.ebuild index 8f967ce86565..ebc9cf3283d3 100644 --- a/net-misc/dahdi/dahdi-2.10.2-r2.ebuild +++ b/net-misc/dahdi/dahdi-2.10.2-r2.ebuild @@ -36,7 +36,7 @@ http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="flash" RESTRICT="test" diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild index a7e06783c143..39f3430770fe 100644 --- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild +++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://roy.marples.name/downloads/${PN%-ui}/${P}.tar.bz2" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug gtk gtk3 qt4 libnotify" REQUIRED_USE=" diff --git a/net-misc/electrum/electrum-2.5.1.ebuild b/net-misc/electrum/electrum-2.5.1.ebuild index dcc0ab64b22a..a02b80682018 100644 --- a/net-misc/electrum/electrum-2.5.1.ebuild +++ b/net-misc/electrum/electrum-2.5.1.ebuild @@ -39,7 +39,6 @@ REQUIRED_USE=" RDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/dnspython[${PYTHON_USEDEP}] dev-python/ecdsa[${PYTHON_USEDEP}] dev-python/pbkdf2[${PYTHON_USEDEP}] dev-python/pyasn1[${PYTHON_USEDEP}] @@ -51,6 +50,7 @@ RDEPEND=" dev-python/socksipy[${PYTHON_USEDEP}] dev-python/tlslite[${PYTHON_USEDEP}] dev-libs/protobuf[python,${PYTHON_USEDEP}] + virtual/dnspython[${PYTHON_USEDEP}] qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) gtk3? ( dev-python/pygobject:3[${PYTHON_USEDEP}] diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml index 610c62e1351f..7f347f631bf5 100644 --- a/net-misc/electrum/metadata.xml +++ b/net-misc/electrum/metadata.xml @@ -19,15 +19,15 @@ <name>Emery Hemingway</name> </maintainer> <use> - <flag name='cli'>Enables the CLI interface</flag> - <flag name='cosign'>Enable plugin to support multisig wallets between multiple Electrum clients</flag> - <flag name='email'>Enable plugin to support emailing invoices</flag> - <flag name='fiat'>Enable plugin for looking up fiat values of bitcoin</flag> - <flag name='greenaddress_it'>Enable plugin to verify GreenAddress.it instant transactions</flag> - <flag name='gtk3'>Enable support for gtk+3</flag> - <flag name='qrcode'>Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag> - <flag name='sync'>Enable plugin to sync wallet metadata across multiple Electrum clients</flag> - <flag name='trustedcoin_com'>Enable plugin to use two-factor service by TrustedCoin.com</flag> - <flag name='vkb'>Enable plugin for virtual keyboard</flag> + <flag name="cli">Enables the CLI interface</flag> + <flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag> + <flag name="email">Enable plugin to support emailing invoices</flag> + <flag name="fiat">Enable plugin for looking up fiat values of bitcoin</flag> + <flag name="greenaddress_it">Enable plugin to verify GreenAddress.it instant transactions</flag> + <flag name="gtk3">Enable support for gtk+3</flag> + <flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag> + <flag name="sync">Enable plugin to sync wallet metadata across multiple Electrum clients</flag> + <flag name="trustedcoin_com">Enable plugin to use two-factor service by TrustedCoin.com</flag> + <flag name="vkb">Enable plugin for virtual keyboard</flag> </use> </pkgmetadata> diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest index 7ab66d5021ad..d20b0d549fc3 100644 --- a/net-misc/grive/Manifest +++ b/net-misc/grive/Manifest @@ -1 +1,2 @@ DIST grive-0.4.0_pre20150905.tar.gz 158858 SHA256 c488e9956a48fa5416e1f6082ede649ae9d541b57a5170a4f6ff555e9e92e2aa SHA512 2a6842c742d79345ff805f92e74990de624d656c1f16fd98b2611e2359b051d6dfebef07590390eee3ea07e60143ca9e66ceecd675a3a75d6a099dcb0070ab46 WHIRLPOOL 22d25ea2913568d5132247f3472ca09ee5d291028b8303bd2f6784f1930e3308219f72e7a15b95a5e5a19637fb73e3d60181925afaa21e15f4fdaacc6d7769d4 +DIST grive-0.4.0_pre20151011.tar.gz 160502 SHA256 0e480a0f5aa1ba008d8e7e3f8cb0198728f6c67bf1e588a66a6d68bb39cff573 SHA512 c5b59a8740ee0886d95f64278c1dd8e0c80df8c53b982f0720fd3a9caa82503ce0ef75987afeafa8735b4e88ef6fea6b5266671516165b288156b1ab543dc3f7 WHIRLPOOL 8c888a218732c9be77d5ae407074f59e0c61d4facb70a8caee97f25e1f46fc5c618aeb09510e23ad18e7604cc17f645df9a9245fac96e1f3dff7279b8f0d2626 diff --git a/net-misc/grive/grive-0.4.0_pre20151011.ebuild b/net-misc/grive/grive-0.4.0_pre20151011.ebuild new file mode 100644 index 000000000000..e85fe95e1153 --- /dev/null +++ b/net-misc/grive/grive-0.4.0_pre20151011.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils + +if [[ ${PV} = *9999 ]]; then + inherit git-2 + EGIT_REPO_URI="git://github.com/vitalif/${PN}2.git" +else + inherit vcs-snapshot + COMMIT="44cb91f94e67bcdad77ca564b4d8083cedf72251" + SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="An open source Linux client for Google Drive" +HOMEPAGE="https://github.com/vitalif/grive2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-libs/boost:= + dev-libs/expat + >=dev-libs/json-c-0.11-r1:= + dev-libs/libgcrypt:0= + net-misc/curl + sys-libs/binutils-libs:0= + sys-libs/glibc + dev-libs/yajl +" +DEPEND="${RDEPEND}" diff --git a/net-misc/ipv6calc/metadata.xml b/net-misc/ipv6calc/metadata.xml index 5010986109dc..f6baec0e2963 100644 --- a/net-misc/ipv6calc/metadata.xml +++ b/net-misc/ipv6calc/metadata.xml @@ -7,10 +7,6 @@ <name>Peter Volkov</name> </maintainer> <maintainer> - <email>aaron@flappyport.com</email> - <name>Aaron Bauman</name> - </maintainer> - <maintainer> <email>blueness@gentoo.org</email> <name>Anthony G. Basile</name> </maintainer> diff --git a/net-misc/knemo/knemo-0.7.7.ebuild b/net-misc/knemo/knemo-0.7.7.ebuild index c6e738b367bb..c9b9cd2958e2 100644 --- a/net-misc/knemo/knemo-0.7.7.ebuild +++ b/net-misc/knemo/knemo-0.7.7.ebuild @@ -12,9 +12,9 @@ DESCRIPTION="The KDE Network Monitor" HOMEPAGE="http://kde-apps.org/content/show.php?content=12956" SRC_URI="http://www.kde-apps.org/CONTENT/content-files/12956-${P}.tar.xz" +LICENSE="GPL-2" SLOT="4" KEYWORDS="~amd64 ~x86" -LICENSE="GPL-2" IUSE="debug wifi" DEPEND=" @@ -29,10 +29,8 @@ RDEPEND="${DEPEND}" DOCS=( AUTHORS ChangeLog README ) -PATCHES=() - src_configure() { - mycmakeargs=( + local mycmakeargs=( $(cmake-utils_use_no wifi WIRELESS_SUPPORT) ) diff --git a/net-misc/knemo/metadata.xml b/net-misc/knemo/metadata.xml index 8d1e86a9cefb..a23f444b67d6 100644 --- a/net-misc/knemo/metadata.xml +++ b/net-misc/knemo/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>kde</herd> + <herd>kde</herd> </pkgmetadata> diff --git a/net-misc/libres3/Manifest b/net-misc/libres3/Manifest new file mode 100644 index 000000000000..b18552b756f1 --- /dev/null +++ b/net-misc/libres3/Manifest @@ -0,0 +1 @@ +DIST libres3-1.1.tar.gz 7025033 SHA256 d4b3199db31844811290e8e9674bccd82c05e204537c499ac7d10d385b1cea13 SHA512 cdbefef90076f9f94f3b1635639a4b64e7666532ae6f51434d344e5c4ef1d4dce2787c52903ee5f0d6630ff84d8e79e14c843ac84d9e1affd2c1f16a41ffcfa3 WHIRLPOOL 015f7af705a58a21e8392661ca3ac9c0373803f4b588140af27f2d7706a8e0948fffeed26201ee9bd58f8e71bc0cde4557aaedbfc54f769c9564ebf7c6115a8d diff --git a/net-misc/libres3/libres3-1.1.ebuild b/net-misc/libres3/libres3-1.1.ebuild new file mode 100644 index 000000000000..66adbcf2f58c --- /dev/null +++ b/net-misc/libres3/libres3-1.1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +OASIS_BUILD_TESTS=1 +inherit oasis findlib + +DESCRIPTION="Skylable LibreS3 - Amazon S3 open source replacement" +HOMEPAGE="http://www.skylable.com/products/libres3" +SRC_URI="http://cdn.skylable.com/source/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" +OASIS_DOC_DIR="/usr/share/doc/${PF}" + +RDEPEND=" + >=dev-lang/ocaml-4:= + dev-ml/camlp4:= + dev-ml/jsonm:= + dev-ml/lwt:=[react,ssl] + dev-ml/ocaml-base64:= + dev-ml/ocaml-dns:=[lwt(-)] + dev-ml/ocaml-ipaddr:= + dev-ml/ocaml-re:= + dev-ml/ocaml-ssl:= + >=dev-ml/ocamlnet-3.7.4:=[pcre] + <dev-ml/ocamlnet-4:=[pcre] + dev-ml/optcomp:= + dev-ml/ounit:= + dev-ml/pcre-ocaml:= + dev-ml/tyxml:= + dev-ml/uutf:= + dev-ml/xmlm:= + www-servers/ocsigenserver:=[sqlite] +" +DEPEND=" + dev-ml/oasis + virtual/pkgconfig + ${RDEPEND} +" + +S="${WORKDIR}/${P}/libres3" + +src_prepare() { + sed -e '/..\/..\/COPYING/d' -i _oasis || die + rm setup.ml || die + emake update +} + +src_configure() { + oasis_configure_opts=" + --sysconfdir ${EPREFIX}/etc/${PN} + --localstatedir ${EPREFIX}/var" oasis_src_configure +} + +src_install() { + emake DESTDIR="${D}" install + + if [[ -d /etc/logrotate.d ]]; then + insinto /etc/logrotate.d + doins src/files/conf/logrotate.d/libres3 + fi +} + +pkg_postinst() { + elog "*******************************************************************************" + elog "Just as a heads-up: LibreS3 requires a working SX cluster (net-misc/sx) to be" + elog "of any use. Since LibreS3 is capable of connecting to a remote SX cluster it" + elog "doesn't depend on it. Hence you will likely want to install it." + elog "" + elog "Standard S3 client libraries and tools (for example s3cmd, python-boto," + elog "ocaml-aws, etc.) can be used to access it." + elog "Enjoy." + elog "*******************************************************************************" +} diff --git a/net-misc/libres3/metadata.xml b/net-misc/libres3/metadata.xml new file mode 100644 index 000000000000..d41c60d2594c --- /dev/null +++ b/net-misc/libres3/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>ml</herd> + <herd>proxy-maintainers</herd> + <maintainer> + <email>tomboy64@sina.cn</email> + </maintainer> + <longdescription lang="en"> + LibreS3 adds an S3-compatibility layer over SX Cluster. With LibreS3 you access the data stored in your storage cluster using any existing S3 client. + </longdescription> +</pkgmetadata> diff --git a/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch b/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch new file mode 100644 index 000000000000..403b2d589bee --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch @@ -0,0 +1,21 @@ +http://bugs.ntp.org/show_bug.cgi?id=2951 + +--- a/tests/ntpd/Makefile.in ++++ b/tests/ntpd/Makefile.in +@@ -205,7 +205,7 @@ test_ntp_scanner_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + -o $@ + am_test_ntp_signd_OBJECTS = t-ntp_signd.$(OBJEXT) \ + run-t-ntp_signd.$(OBJEXT) test-libntp.$(OBJEXT) \ +- ntp_signd.$(OBJEXT) $(am__objects_1) ++ $(am__objects_1) + test_ntp_signd_OBJECTS = $(am_test_ntp_signd_OBJECTS) + test_ntp_signd_DEPENDENCIES = $(am__DEPENDENCIES_3) \ + $(top_builddir)/ntpd/ntp_config.o \ +@@ -871,7 +871,6 @@ test_ntp_signd_SOURCES = \ + t-ntp_signd.c \ + run-t-ntp_signd.c \ + $(srcdir)/../libntp/test-libntp.c \ +- $(srcdir)/../../ntpd/ntp_signd.c \ + $(NULL) + + diff --git a/net-misc/ntp/files/ntp-4.2.8-sntp-test-pthreads.patch b/net-misc/ntp/files/ntp-4.2.8-sntp-test-pthreads.patch new file mode 100644 index 000000000000..4f8d15ff854a --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8-sntp-test-pthreads.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/563922 +http://bugs.ntp.org/show_bug.cgi?id=2906 + +--- a/sntp/tests/Makefile.in ++++ b/sntp/tests/Makefile.in +@@ -783,6 +783,7 @@ base_LDADD = \ + $(LIBOPTS_LDADD) \ + $(LDADD_LIBEVENT) \ + $(top_builddir)/../libntp/libntp.a \ ++ $(PTHREAD_LIBS) \ + $(LDADD_LIBNTP) \ + $(LDADD_NTP) \ + $(NULL) diff --git a/net-misc/ntp/ntp-4.2.8_p4.ebuild b/net-misc/ntp/ntp-4.2.8_p4.ebuild index 69c2159d43b4..4bfcda085fa7 100644 --- a/net-misc/ntp/ntp-4.2.8_p4.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p4.ebuild @@ -41,6 +41,8 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966 + epatch "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922 + epatch "${FILESDIR}"/${PN}-4.2.8-ntpd-test-signd.patch append-cppflags -D_GNU_SOURCE #264109 # Make sure every build uses the same install layout. #539092 find sntp/loc/ -type f '!' -name legacy -delete || die diff --git a/net-misc/openconnect/metadata.xml b/net-misc/openconnect/metadata.xml index 7030dec29348..f07fd2d9cea1 100644 --- a/net-misc/openconnect/metadata.xml +++ b/net-misc/openconnect/metadata.xml @@ -6,6 +6,10 @@ <name>Mike Gilbert</name> </maintainer> <maintainer> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <maintainer> <email>mattsch@gmail.com</email> <name>Matthew Schultz</name> <description>Proxied maintainer. Copy on bugs.</description> diff --git a/net-misc/openconnect/openconnect-7.06-r1.ebuild b/net-misc/openconnect/openconnect-7.06-r1.ebuild index ec6630a4f6a2..4654f98e15a9 100644 --- a/net-misc/openconnect/openconnect-7.06-r1.ebuild +++ b/net-misc/openconnect/openconnect-7.06-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" KEYWORDS="amd64 arm ~arm64 ppc64 x86" -IUSE="doc +gnutls gssapi java libproxy nls static-libs" +IUSE="doc +gnutls gssapi java libproxy nls smartcard static-libs" ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW" for lang in $ILINGUAS; do IUSE="${IUSE} linguas_${lang}" @@ -35,7 +35,8 @@ DEPEND="dev-libs/libxml2 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) + smartcard? ( sys-apps/pcsc-lite:0= )" RDEPEND="${DEPEND} sys-apps/iproute2 !<sys-apps/openrc-0.13" @@ -77,6 +78,7 @@ src_configure() { $(use_with libproxy) \ --without-stoken \ $(use_with gssapi) \ + $(use_with smartcard libpcsclite) \ $(use_with java) } diff --git a/net-misc/openconnect/openconnect-7.06-r2.ebuild b/net-misc/openconnect/openconnect-7.06-r2.ebuild index 2a7516896e4b..5a2a4a736fd8 100644 --- a/net-misc/openconnect/openconnect-7.06-r2.ebuild +++ b/net-misc/openconnect/openconnect-7.06-r2.ebuild @@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="doc +gnutls gssapi java libressl libproxy nls static-libs" +IUSE="doc +gnutls gssapi java libressl libproxy nls smartcard static-libs" ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW" for lang in $ILINGUAS; do IUSE="${IUSE} linguas_${lang}" @@ -36,7 +36,8 @@ DEPEND="dev-libs/libxml2 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) + smartcard? ( sys-apps/pcsc-lite:0= )" RDEPEND="${DEPEND} sys-apps/iproute2 !<sys-apps/openrc-0.13" @@ -78,6 +79,7 @@ src_configure() { $(use_with libproxy) \ --without-stoken \ $(use_with gssapi) \ + $(use_with smartcard libpcsclite) \ $(use_with java) } diff --git a/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild b/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild index 227a4fa76f57..b7c0452a30fa 100644 --- a/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild +++ b/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="selinux" DEPEND="!<=net-misc/ntp-4.2.0-r2 diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 461d5c1b4763..cf1e7a014d5e 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -15,6 +15,7 @@ DIST openssh-7.0p1+x509-8.5.diff.gz 411960 SHA256 6000557f1ddae06aff8837d440d933 DIST openssh-7.0p1-hpnssh14v5.tar.xz 21428 SHA256 6032c4547c9f83a6f648ac7c39cdad2bd6fd725e5f3ab2411c5b30298aae1451 SHA512 d4cf4a628c11515bfe8c3a91b4b7039fca28c2f89ad1dde062c4cb433b984b10dec2d37b1f338f18aa7813e60d8608b65ca95b930edc33086710b82780875942 WHIRLPOOL 7b686f243c98017453b3da3e98b7524650b4a0a75fda6add80c7c233d468194d1d1333ffa4445c20856d807548aaa356c87a03ca87d8995a4b7ba350c7714d1e DIST openssh-7.0p1.tar.gz 1493376 SHA256 fd5932493a19f4c81153d812ee4e042b49bbd3b759ab3d9344abecc2bc1485e5 SHA512 d82aa8e85630c3e2102e69da477185e0d30d84211d7d4ee0a1d9822bd234d649fe369bf91ce3d2b5ef0caee687d383cb761b682d3bf24bccbd2ce9a1fe9d9f50 WHIRLPOOL bb8007450ffee580df5a73e3d6ab9b54b7151c46c3b996516e5cb776034be21cbef1281a520279655137e218a757d8092cba3f66e216c6b4c6828876540cb5df DIST openssh-7.1p1+x509-8.6.diff.gz 413931 SHA256 cbf661a1fec080dc9ed335a290414154326c2a13f124985db050b86a91073d52 SHA512 c91d0f1b69b6d34984e94b391ad022271e73d0634cef2df355ba555366bc38d30649b478f245b6c51ce79d71adf1b693bc97826e6c6013a78e7ccfb7023b4bcc WHIRLPOOL 4ed4427e80026996c43a188d7d45f2c53fa6a7fd842a248b1225b27f3e9037e761f0ed172d79b53ada81c24d958a2193e94d918f6ca1320e45d5e68379845981 +DIST openssh-7.1p1-hpnssh14v9.tar.xz 21580 SHA256 a795c2f2621f537b3fd98172cbd1f7c71869e4da78cd280d123fa19ae4262b97 SHA512 6ce151949bf81b5518b95092a2f18d2f24581954e2c629deaf3c1d10136f32f830567aafb9b4045547e95e3ab63cf750e240eac40e2b9caa6d71cb2b132821ec WHIRLPOOL 8e3c9a1d79112092a6cb42c6766ccdf61e5d8fcd366ea5c7d3bab94cf309bcc12f3761476a288158638a340023aa24519d888caac19fb0ef25fa56bdab06412c DIST openssh-7.1p1.tar.gz 1493170 SHA256 fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428 SHA512 f1491ca5a0a733eb27ede966590642a412cb7be7178dcb7b9e5844bbdc8383032f4b00435192b95fc0365b6fe74d6c5ac8d6facbe9d51e1532d049e2f784e8f7 WHIRLPOOL a650a93657f930d20dc3fa24ab720857f63f7cd0a82d1906cf1e58145e866129207851d5e587d678655e5731fa73221ab9b6ea0754533100c25fe2acaa442e05 DIST openssh-lpk-6.7p1-0.3.14.patch.xz 16920 SHA256 0203e6e44e41d58ec46d1611d7efc985134e662bbee51632c29f43ae809003f0 SHA512 344ccde4a04aeb1500400f779e64b2d8a5ad2970de3c4c343ca9605758e22d3812ef5453cd3221b18ad74a9762583c62417879107e4e1dda1398a6a65bcd04b2 WHIRLPOOL 5b6beeb743d04deea70c8b471a328b5f056fd4651e1370c7882e5d12f54fa2170486dcd6f97aa8c58e80af9a2d4012e2dfbcf53185317976d309783ca8d6cf73 DIST openssh-lpk-6.8p1-0.3.14.patch.xz 16940 SHA256 d5f048dc7e9d3fca085c152fc31306f1d8fa793e524c538295915b075ec085b0 SHA512 2470b6b46f8c7ac985f82d14b788a3eb81a468a1d5013cb7f89257d9dd78b6037e24bf54ac57b757db8ed1df24332d659cf918c11ea73592fd24a69c25a54081 WHIRLPOOL b041ee9e0efdf370686f11df4131ab5e5ffb2f11cc66c386a8223bf563c5b78ab9443f06e4adc2e506e440cdec9dc5b20f5972cd8d691d786d2f903bb49b947b diff --git a/net-misc/openssh/openssh-7.1_p1-r1.ebuild b/net-misc/openssh/openssh-7.1_p1-r1.ebuild index 41f49c8d28f5..beebed51f857 100644 --- a/net-misc/openssh/openssh-7.1_p1-r1.ebuild +++ b/net-misc/openssh/openssh-7.1_p1-r1.ebuild @@ -116,7 +116,9 @@ src_prepare() { if use X509 ; then pushd .. >/dev/null + pushd ${HPN_PATCH%.*.*} >/dev/null epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch + popd >/dev/null epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch popd >/dev/null epatch "${WORKDIR}"/${X509_PATCH%.*} diff --git a/net-misc/openssh/openssh-7.1_p1-r2.ebuild b/net-misc/openssh/openssh-7.1_p1-r2.ebuild new file mode 100644 index 000000000000..7ab7d10c45c8 --- /dev/null +++ b/net-misc/openssh/openssh-7.1_p1-r2.ebuild @@ -0,0 +1,323 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" +inherit eutils user flag-o-matic multilib autotools pam systemd versionator + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +HPN_PATCH="${PARCH}-hpnssh14v9.tar.xz" +LDAP_PATCH="${PN}-lpk-6.8p1-0.3.14.patch.xz" +X509_VER="8.6" X509_PATCH="${PN}-${PV//_/}+x509-${X509_VER}.diff.gz" + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="http://www.openssh.org/" +SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + mirror://gentoo/${PN}-6.8_p1-sctp.patch.xz + ${HPN_PATCH:+hpn? ( + mirror://gentoo/${HPN_PATCH} + https://dev.gentoo.org/~polynomial-c/${HPN_PATCH} + mirror://sourceforge/hpnssh/${HPN_PATCH} + )} + ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )} + ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} + " + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl pam +pie sctp selinux skey ssh1 +ssl static X X509" +REQUIRED_USE="ldns? ( ssl ) + pie? ( !static ) + ssh1? ( ssl ) + static? ( !kerberos !pam ) + X509? ( !ldap ssl )" + +LIB_DEPEND=" + ldns? ( + net-libs/ldns[static-libs(+)] + !bindist? ( net-libs/ldns[ecdsa,ssl] ) + bindist? ( net-libs/ldns[-ecdsa,ssl] ) + ) + libedit? ( dev-libs/libedit[static-libs(+)] ) + sctp? ( net-misc/lksctp-tools[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) + ssl? ( + !libressl? ( + >=dev-libs/openssl-0.9.8f:0[bindist=] + dev-libs/openssl:0[static-libs(+)] + ) + libressl? ( dev-libs/libressl[static-libs(+)] ) + ) + >=sys-libs/zlib-1.2.3[static-libs(+)]" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( virtual/pam ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + virtual/pkgconfig + virtual/os-headers + sys-devel/autoconf" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20081028 ) + userland_GNU? ( virtual/shadow ) + X? ( x11-apps/xauth )" + +S=${WORKDIR}/${PARCH} + +pkg_setup() { + # this sucks, but i'd rather have people unable to `emerge -u openssh` + # than not be able to log in to their server any more + maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } + local fail=" + $(use X509 && maybe_fail X509 X509_PATCH) + $(use ldap && maybe_fail ldap LDAP_PATCH) + $(use hpn && maybe_fail hpn HPN_PATCH) + " + fail=$(echo ${fail}) + if [[ -n ${fail} ]] ; then + eerror "Sorry, but this version does not yet support features" + eerror "that you requested: ${fail}" + eerror "Please mask ${PF} for now and check back later:" + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + die "booooo" + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}etc/hosts.{allow,deny} please." + fi +} + +save_version() { + # version.h patch conflict avoidence + mv version.h version.h.$1 + cp -f version.h.pristine version.h +} + +src_prepare() { + sed -i \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ + pathnames.h || die + # keep this as we need it to avoid the conflict between LPK and HPN changing + # this file. + cp version.h version.h.pristine + + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + if use X509 ; then + pushd .. >/dev/null + pushd ${HPN_PATCH%.*.*} >/dev/null + epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch + popd >/dev/null + epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch + popd >/dev/null + epatch "${WORKDIR}"/${X509_PATCH%.*} + epatch "${FILESDIR}"/${PN}-6.3_p1-x509-hpn14v2-glue.patch + epatch "${FILESDIR}"/${PN}-6.9_p1-x509-warnings.patch + save_version X509 + fi + if use ldap ; then + epatch "${WORKDIR}"/${LDAP_PATCH%.*} + save_version LPK + fi + epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex + epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch + # The X509 patchset fixes this independently. + use X509 || epatch "${FILESDIR}"/${PN}-6.8_p1-ssl-engine-configure.patch + epatch "${WORKDIR}"/${PN}-6.8_p1-sctp.patch + if use hpn ; then + EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ + EPATCH_MULTI_MSG="Applying HPN patchset ..." \ + epatch "${WORKDIR}"/${HPN_PATCH%.*.*} + save_version HPN + fi + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable PATH reset, trust what portage gives us #254615 + -e 's:^PATH=/:#PATH=/:' + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + # The -ftrapv flag ICEs on hppa #505182 + use hppa && sed_args+=( + -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' + -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + epatch_user #473004 + + # Now we can build a sane merged version.h + ( + sed '/^#define SSH_RELEASE/d' version.h.* | sort -u + macros=() + for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done + printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}" + ) > version.h + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + addpredict /etc/skey/skeykeys # skey configure code triggers this + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty + --with-privsep-user=sshd + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) + # We apply the ldap patch conditionally, so can't pass --without-ldap + # unconditionally else we get unknown flag warnings. + $(use ldap && use_with ldap) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with sctp) + $(use_with selinux) + $(use_with skey) + $(use_with ssh1) + # The X509 patch deletes this option entirely. + $(use X509 || use_with ssl openssl) + $(use_with ssl md5-passwords) + $(use_with ssl ssl-engine) + ) + + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 + use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + + econf "${myconf[@]}" +} + +src_install() { + emake install-nokeys DESTDIR="${D}" + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + newinitd "${FILESDIR}"/sshd.rc6.4 sshd + newconfd "${FILESDIR}"/sshd.confd sshd + keepdir /var/empty + + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + if use pam ; then + sed -i \ + -e "/^#UsePAM /s:.*:UsePAM yes:" \ + -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ + -e "/^#PrintMotd /s:.*:PrintMotd no:" \ + -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ + "${ED}"/etc/ssh/sshd_config || die + fi + + # Gentoo tweaks to default config files + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config + + # Allow client to pass locale environment variables #367017 + AcceptEnv LANG LC_* + EOF + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config + + # Send locale environment variables #367017 + SendEnv LANG LC_* + EOF + + if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then + insinto /etc/openldap/schema/ + newins openssh-lpk_openldap.schema openssh-lpk.schema + fi + + doman contrib/ssh-copy-id.1 + dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config + + diropts -m 0700 + dodir /etc/skel/.ssh + + systemd_dounit "${FILESDIR}"/sshd.{service,socket} + systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' +} + +src_test() { + local t tests skipped failed passed shell + tests="interop-tests compat-tests" + skipped="" + shell=$(egetshell ${UID}) + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + elog "Running the full OpenSSH testsuite" + elog "requires a usable shell for the 'portage'" + elog "user, so we will run a subset only." + skipped="${skipped} tests" + else + tests="${tests} tests" + fi + # It will also attempt to write to the homedir .ssh + local sshhome=${T}/homedir + mkdir -p "${sshhome}"/.ssh + for t in ${tests} ; do + # Some tests read from stdin ... + HOMEDIR="${sshhome}" \ + emake -k -j1 ${t} </dev/null \ + && passed="${passed}${t} " \ + || failed="${failed}${t} " + done + einfo "Passed tests: ${passed}" + ewarn "Skipped tests: ${skipped}" + if [[ -n ${failed} ]] ; then + ewarn "Failed tests: ${failed}" + die "Some tests failed: ${failed}" + else + einfo "Failed tests: ${failed}" + return 0 + fi +} + +pkg_preinst() { + enewgroup sshd 22 + enewuser sshd 22 -1 /var/empty sshd +} + +pkg_postinst() { + if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then + elog "Starting with openssh-6.9p1, ssh1 support is disabled by default." + fi + if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + fi + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi +} diff --git a/net-misc/openssh/openssh-7.1_p1.ebuild b/net-misc/openssh/openssh-7.1_p1.ebuild index a9a499ee7e5f..45ed87d77f31 100644 --- a/net-misc/openssh/openssh-7.1_p1.ebuild +++ b/net-misc/openssh/openssh-7.1_p1.ebuild @@ -113,7 +113,9 @@ src_prepare() { if use X509 ; then pushd .. >/dev/null + pushd ${HPN_PATCH%.*.*} >/dev/null epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch + popd >/dev/null epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch popd >/dev/null epatch "${WORKDIR}"/${X509_PATCH%.*} diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest index f3a93f3d2d6b..9e288ef75dc8 100644 --- a/net-misc/owncloud-client/Manifest +++ b/net-misc/owncloud-client/Manifest @@ -1,2 +1,3 @@ DIST owncloudclient-2.0.0.tar.xz 11734540 SHA256 21cb79fe11bbacc02a98ad16ae6051248a3676be01b15e870785f91b415323dd SHA512 5602c4055bdae98dec7eb72ca4ec38c881ebb55be0fc44387ae6a1ee8b8ab72f69e2061d807cb34f26a900c2399b170973af5d53a635d19b07df086745ae7123 WHIRLPOOL 7c4a2feeea38fba862ae692f29237dc585f20a90fe9ed2a896954c9d39a255d3ce213c36a785b93cab5b771888fefa3c2374c2f6b231987ca846e1596cfba9bf DIST owncloudclient-2.0.1.tar.xz 11737332 SHA256 97e8fe888b8f59b0703fd9fbd54feecbf14c078ac14e9856bf0327f2b41bc287 SHA512 a09044c5c74c15761d0a531908ac1882f77f02e7199af4f8370253ae5f8d0966609d706a771f074d3c686d33f1db260e61be94a1f8fca239aa6d79d30093ef41 WHIRLPOOL d05dd8a3587987b4c8a86d4958b09e2480ae5390de755dc925f085b3392669835c089530d0cc5180b9c6254fec747aff77f8ba3fe06859501309975f37237986 +DIST owncloudclient-2.0.2.tar.xz 11518700 SHA256 2815dce34b568141d7c2ab90bcd733abb6862970917738e3b120d8073ab68228 SHA512 69b42ba45f95ed85f7afda586fb213069098ca5f7e779121a2a935066438403dba5e56292329997d955bbefbbafc3fadfed6bf1239ae9f0f90c91455d998c616 WHIRLPOOL 52224a5b79b9d28fb22d52ec9b30cc449b8e7b4dd6423c763c1f9bb429a7843d60381ad905921a20c33ab3bf864209f16aa9a55d7049b2175772b5c6ec92f768 diff --git a/net-misc/owncloud-client/owncloud-client-2.0.2.ebuild b/net-misc/owncloud-client/owncloud-client-2.0.2.ebuild new file mode 100644 index 000000000000..3c1f069a00b8 --- /dev/null +++ b/net-misc/owncloud-client/owncloud-client-2.0.2.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="Synchronize files from ownCloud Server with your computer" +HOMEPAGE="http://owncloud.org/" +SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz" + +LICENSE="CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc nautilus samba +sftp test qt4 +qt5" + +REQUIRED_USE="^^ ( qt4 qt5 )" + +RDEPEND=">=dev-db/sqlite-3.4:3 + sys-fs/inotify-tools + virtual/libiconv + nautilus? ( dev-python/nautilus-python ) + qt4? ( + dev-libs/qtkeychain[qt4] + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtgui:4 + dev-qt/qtsql:4 + dev-qt/qtwebkit:4 + net-libs/neon[ssl] + ) + qt5? ( + dev-libs/qtkeychain[qt5] + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + >=dev-qt/qtnetwork-5.4:5 + dev-qt/qtgui:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtsql:5 + dev-qt/qtwebkit:5[printsupport] + ) + samba? ( >=net-fs/samba-3.5 ) + sftp? ( >=net-libs/libssh-0.5 ) + !net-misc/ocsync" +DEPEND="${RDEPEND} + doc? ( + dev-python/sphinx + dev-texlive/texlive-latexextra + virtual/latex-base + ) + qt5? ( dev-qt/linguist-tools:5 ) + test? ( + dev-util/cmocka + qt4? ( dev-qt/qttest:4 ) + qt5? ( dev-qt/qttest:5 ) + )" + +S=${WORKDIR}/${P/-} + +src_prepare() { + # Keep tests in ${T} + sed -i -e "s#\"/tmp#\"${T}#g" test/test*.h || die "sed failed" + + use nautilus || sed -i -e "s/add_subdirectory(nautilus)//" \ + shell_integration/CMakeLists.txt || die "sed failed" +} + +src_configure() { + local mycmakeargs=( + -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DWITH_ICONV=ON + $(cmake-utils_use_with doc DOC) + $(cmake-utils_use test UNIT_TESTING) + $(cmake-utils_use_find_package samba Libsmbclient) + $(cmake-utils_use_find_package sftp LibSSH) + $(cmake-utils_use_build qt4 WITH_QT4) + ) + + cmake-utils_src_configure +} + +src_test() { + # 1 test needs an existing ${HOME}/.config directory + mkdir "${T}"/.config + export HOME="${T}" + cmake-utils_src_test +} + +pkg_postinst() { + if ! use doc ; then + elog "Documentation and man pages not installed" + elog "Enable doc USE-flag to generate them" + fi +} diff --git a/net-misc/ptpd/metadata.xml b/net-misc/ptpd/metadata.xml index a07e1da46b1a..d4d02bcdabba 100644 --- a/net-misc/ptpd/metadata.xml +++ b/net-misc/ptpd/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>jan.breuer@jaybee.cz</email> + <email>honza.breuer@gmail.com</email> <name>Jan Breuer</name> </maintainer> <use> diff --git a/net-misc/sks/files/sks-1.1.5-curve25519.patch b/net-misc/sks/files/sks-1.1.5-curve25519.patch new file mode 100644 index 000000000000..ccf484f45523 --- /dev/null +++ b/net-misc/sks/files/sks-1.1.5-curve25519.patch @@ -0,0 +1,11 @@ +diff -r 1a1b0b48e642 parsePGP.ml +--- a/parsePGP.ml Tue May 26 12:21:29 2015 -0400 ++++ b/parsePGP.ml Tue Oct 13 14:46:03 2015 +0900 +@@ -151,6 +151,7 @@ + | "\x2b\x24\x03\x03\x02\x08\x01\x01\x0d" -> 512 (* brainpoolP512r1 *) + | "\x2b\x81\x04\x00\x0a" -> 256 (* secp256k1 *) + | "\x2b\x06\x01\x04\x01\xda\x47\x0f\x01" -> 256 (* Ed25519 *) ++ | "\x2b\x06\x01\x04\x01\x97\x55\x01\x05\x01" -> 256 (* cv25519 *) + | _ -> failwith "Unknown OID" + in + psize diff --git a/net-misc/sks/sks-1.1.5-r2.ebuild b/net-misc/sks/sks-1.1.5-r2.ebuild new file mode 100644 index 000000000000..4aa095cb09ef --- /dev/null +++ b/net-misc/sks/sks-1.1.5-r2.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit multilib user readme.gentoo systemd + +DESCRIPTION="An OpenPGP keyserver which is decentralized and provides highly reliable synchronization" +HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver" +SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="optimize test" +DOC_CONTENTS="To get sks running, first build the database, +start the databse, import atleast one key, then +run a cleandb. See the sks man page for more information +Typical DB_CONFIG file and sksconf has been installed +in /var/lib/sks and can be used as templates by renaming +to remove the .typical extension. The DB_CONFIG file has +to be in place before doing the database build, or the BDB +environment has to be manually cleared from both KDB and PTree. +The same applies if you are upgrading to this version with an existing KDB/Ptree, +using another version of BDB than 4.8; you need to clear the environment +using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree +Additionally a sample web interface has been installed as +web.typical in /var/lib/sks that can be used by renaming it to web +Important: It is strongly recommended to set up SKS behind a +reverse proxy. Instructions on properly configuring SKS can be +found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering" + +DEPEND="dev-lang/ocaml + dev-ml/cryptokit + sys-libs/db:4.8" +RDEPEND="${DEPEND}" + +pkg_setup() { + ebegin "Creating named group and user" + enewgroup sks + enewuser sks -1 -1 /var/lib/sks sks +} + +src_prepare() { + cp Makefile.local.unused Makefile.local || die + sed -i \ + -e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \ + -e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db4.8/:g" \ + -e "s:^LIBDB=.*$:LIBDB=-ldb-4.8:g" \ + -e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \ + -e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \ + Makefile.local || die + sed -i \ + -e 's:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb -I +cryptokit:g' \ + -e 's:-Werror-implicit-function-declaration::g' \ + Makefile bdb/Makefile || die + sed -i \ + -e 's:/usr/sbin/sks:/usr/bin/sks:g' \ + sks_build.sh || die + + epatch "${FILESDIR}/${P}-eddsa.patch" + epatch "${FILESDIR}/${P}-disable-warn-error-a.patch" + epatch "${FILESDIR}/${P}-curve25519.patch" +} + +src_compile() { + emake dep + # sks build fails with paralell build in module Bdb + emake -j1 all + if use optimize; then + emake all.bc + fi +} + +src_test() { + ./sks unit_test || die +} + +src_install() { + if use optimize; then + emake install.bc + dosym /usr/bin/sks.bc usr/bin/sks + dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail + else + emake install + fi + + dodoc README.md + + newinitd "${FILESDIR}/sks-db.initd" sks-db + newinitd "${FILESDIR}/sks-recon.initd" sks-recon + newconfd "${FILESDIR}/sks.confd" sks + systemd_dounit "${FILESDIR}"/sks-db.service + systemd_dounit "${FILESDIR}"/sks-recon.service + + dodir "/var/lib/sks/web.typical" + insinto /var/lib/sks + newins sampleConfig/DB_CONFIG DB_CONFIG.typical + newins sampleConfig/sksconf.typical sksconf.typical + insinto /var/lib/sks/web.typical + doins sampleWeb/HTML5/* + + keepdir /var/lib/sks + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + if [[ -n ${REPLACING_VERSIONS} ]]; then + einfo "Note when upgrading from versions of SKS earlier than 1.1.4" + einfo "The default values for pagesize settings have changed. To continue" + einfo "using an existing DB without rebuilding, explicit settings have to be" + einfo "added to the sksconf file." + einfo "pagesize: 4" + einfo "ptree_pagesize: 1" + fi; +} diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest index 5e31f1a05aad..55492349493a 100644 --- a/net-misc/sslh/Manifest +++ b/net-misc/sslh/Manifest @@ -1,3 +1 @@ -DIST sslh-1.15.tar.gz 33241 SHA256 fc854cc5d95be2c50293e655b7427032ece74ebef1f7f0119c0fc3e207109ccd SHA512 947c3b1c6020202d2c66376b6c252ecc7baf1cb1ddbc3ba107a8bc757f284a009831f025762f3c5950bbbf76b909b0429e3edd6d5803e243fac09a8d896d12a6 WHIRLPOOL 1debd2c70b33c7defbcc447f2622fdd59563297f396c87c80c12966387f68dee98a417e5b41257a2c1f656ecc6297fb18b801e87ecb99f316b0441c394026a36 -DIST sslh-v1.16.tar.gz 36483 SHA256 e97b3be9f010bc763a7f11c94e54d8ead33cab3f0c93a52bb9a7f708212e5902 SHA512 0a959396b2dcc6d0458be2e6114c063c1a4600999b8a7c2b02236585a989af2aec832ff8a11b62dd7d03c6b1e05263317ba6adb2993fb3887be3e1ba0733a2c7 WHIRLPOOL 03ac58f03bbbef3d2bf2a06429f23e4468c094075548ab81fe75683e08f57bbc4bb329477a2505fa2eb15fcc58ef07c5f7ca6b19fbde0b895826570c71a6552f DIST sslh-v1.17.tar.gz 45447 SHA256 4f3589ed36d8a21581268d53055240eee5e5adf02894a2ca7a6c9022f24b582a SHA512 13e9980f4af4111d1b7c695cc61f6a99dca0dbe6be6391a735ebcd15944094526761dbee1ee52d0a94bff689bd9eeefabe930fc0a515f2389bf0f44e0823a431 WHIRLPOOL ec535e0932ba9debe2a19d6bef81b7a1498c658720bbf2a4a472b7858b7db3062299de605c264bf7dcaad3e912028491f5380c64b8c379ff693243a0a1f9a39a diff --git a/net-misc/sslh/sslh-1.15.ebuild b/net-misc/sslh/sslh-1.15.ebuild deleted file mode 100644 index 0cbdf35b5cfc..000000000000 --- a/net-misc/sslh/sslh-1.15.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit toolchain-funcs - -DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" -HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml" -SRC_URI="http://www.rutschle.net/tech/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="tcpd" - -RDEPEND="tcpd? ( sys-apps/tcp-wrappers ) - dev-libs/libconfig" -DEPEND="${RDEPEND} - dev-lang/perl" - -RESTRICT="test" - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - USELIBWRAP=$(usev tcpd) -} - -src_install() { - dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh - doman sslh.8.gz - dodoc ChangeLog README - - newinitd "${FILESDIR}"/sslh.init.d-2 sslh - newconfd "${FILESDIR}"/sslh.conf.d-2 sslh -} diff --git a/net-misc/sslh/sslh-1.16.ebuild b/net-misc/sslh/sslh-1.16.ebuild deleted file mode 100644 index b6a43ec6f9df..000000000000 --- a/net-misc/sslh/sslh-1.16.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P="${PN}-v${PV}" -inherit toolchain-funcs - -DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" -HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml" -SRC_URI="http://www.rutschle.net/tech/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="caps tcpd" - -RDEPEND="caps? ( sys-libs/libcap ) - tcpd? ( sys-apps/tcp-wrappers ) - dev-libs/libconfig" -DEPEND="${RDEPEND} - dev-lang/perl" - -RESTRICT="test" - -S=${WORKDIR}/${MY_P} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - USELIBCAP=$(usev caps) \ - USELIBWRAP=$(usev tcpd) -} - -src_install() { - dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh - doman sslh.8.gz - dodoc ChangeLog README.md - - newinitd "${FILESDIR}"/sslh.init.d-2 sslh - newconfd "${FILESDIR}"/sslh.conf.d-2 sslh -} diff --git a/net-misc/sslh/sslh-1.17.ebuild b/net-misc/sslh/sslh-1.17.ebuild index b92ece02206f..b6a3380c59f0 100644 --- a/net-misc/sslh/sslh-1.17.ebuild +++ b/net-misc/sslh/sslh-1.17.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.rutschle.net/tech/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86" +KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86" IUSE="caps tcpd" RDEPEND="caps? ( sys-libs/libcap ) diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest index 512fc7c49136..5768e4c384c4 100644 --- a/net-misc/stunnel/Manifest +++ b/net-misc/stunnel/Manifest @@ -1,3 +1,4 @@ DIST stunnel-5.20.tar.gz 625091 SHA256 4a36a3729a7287d9d82c4b38bf72c4d3496346cb969b86129c5deac22b20292b SHA512 59262aacf866cac25bac707b94c5a6185aa868b5fdfab38a9ef03a00b80f106d92e2872c0b0fecbc5d13adb7bdea7f922768fb78f38355dbf67eb34a148441e4 WHIRLPOOL fc890dff4ddeb00df9e8ea84fae8f0f23609d1356c91d4cdeade55f164bad322a8a2df72955b710e46e1f74a33bbc7f5c8d734efc190d0835056926d7c902b26 DIST stunnel-5.23.tar.gz 630943 SHA256 0fc4a702afd2e857bae8ad1f39c51546eb282c3d0ff4f4d55d62aece7328ddea SHA512 f312b5feff78548a7d1e7785068f0a0e3dd3785541f09d5850f9f5c5ee6bdf63b30761d68c3ba17465e87b048acd47e613aab139aab540873a38594f68669cb9 WHIRLPOOL dd32db35f2b09c3414471dd45d74369156a909429cf2becf34e08854d838d8c3c3979fb0b7e9e524a2e01abe7740ea0ac320985bb6dd813081296168ed7f1819 DIST stunnel-5.24.tar.gz 631730 SHA256 ab2e5a1034d422951ddad21b572eb7fa8efb4c4ce04bc86536c6845f3d02b07e SHA512 d9a1ef9cdd3ffafc2a3d1b3383bcf3dfc1a52cdd5a0bcfd64f50addf78a0fd0ce0def6b32ed801f8dfcabbecd64284454b1c90a18435b5d603ecba594d840340 WHIRLPOOL b625adbc9299c04308733bb5ee732350084b603128734214ec3079f58c02b58d08bfc53bf604468cd83cc5dc1bf5d968a4d5139cd98d7b2219303fdd3d6eae64 +DIST stunnel-5.25.tar.gz 635456 SHA256 1fb2209f1e006cc01813e1688599c4d0fb0adde4434c31ab95745b1db97484b7 SHA512 85fc9ab6da4d8a0dd10e1d4f459194a6da3e1245588b7bf4a49855370006da3a43b954f47ddcee542cdefd8da0089940f1abbb88d0c5868be0c5b82d3cb203f8 WHIRLPOOL 852ee95706d4e2ce98173d17b873207c3febb7a1cfddf29328b6934a0058999b588a05d0c71cab7e0fa800755e538ed0c8e59f8642b57fadcc4130a88cd8c18d diff --git a/net-misc/stunnel/stunnel-5.25.ebuild b/net-misc/stunnel/stunnel-5.25.ebuild new file mode 100644 index 000000000000..d75157cf5747 --- /dev/null +++ b/net-misc/stunnel/stunnel-5.25.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit ssl-cert eutils multilib systemd user + +DESCRIPTION="TLS/SSL - Port Wrapper" +HOMEPAGE="http://www.stunnel.org/index.html" +SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz + http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="ipv6 libressl selinux stunnel3 tcpd" + +DEPEND="tcpd? ( sys-apps/tcp-wrappers ) + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl )" +RDEPEND="${DEPEND} + stunnel3? ( dev-lang/perl ) + selinux? ( sec-policy/selinux-stunnel )" + +RESTRICT="test" + +pkg_setup() { + enewgroup stunnel + enewuser stunnel -1 -1 -1 stunnel +} + +src_prepare() { + # Hack away generation of certificate + sed -i -e "s/^install-data-local:/do-not-run-this:/" \ + tools/Makefile.in || die "sed failed" + + echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel +} + +src_configure() { + econf \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + $(use_enable ipv6) \ + $(use_enable tcpd libwrap) \ + --with-ssl="${EPREFIX}"/usr \ + --disable-fips +} + +src_install() { + emake DESTDIR="${D}" install + rm -rf "${ED}"/usr/share/doc/${PN} + rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \ + "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 + use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3 + + # The binary was moved to /usr/bin with 4.21, + # symlink for backwards compatibility + dosym ../bin/stunnel /usr/sbin/stunnel + + dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog + dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ + tools/importCA.html + + insinto /etc/stunnel + doins "${FILESDIR}"/stunnel.conf + doinitd "${FILESDIR}"/stunnel + + doenvd "${T}"/20stunnel + + systemd_dounit "${S}/tools/stunnel.service" + systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf +} + +pkg_postinst() { + if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then + install_cert /etc/stunnel/stunnel + chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} + chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} + fi + + einfo "If you want to run multiple instances of stunnel, create a new config" + einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change " + einfo "\'pid= \' with a unique filename." +} diff --git a/net-misc/vpnc/metadata.xml b/net-misc/vpnc/metadata.xml index 0baeef4b3423..83185b999bbb 100644 --- a/net-misc/vpnc/metadata.xml +++ b/net-misc/vpnc/metadata.xml @@ -3,8 +3,8 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>ljakab@ac.upc.edu</email> - <name>Loránd Jakab</name> + <email>lorand.jakab@schweiz.ch</email> + <name>Lorand Jakab</name> </maintainer> <maintainer> <email>mmokrejs@gmail.com</email> diff --git a/net-misc/yandex-disk/Manifest b/net-misc/yandex-disk/Manifest index 4a41aaba21fe..0fe2de98c09b 100644 --- a/net-misc/yandex-disk/Manifest +++ b/net-misc/yandex-disk/Manifest @@ -2,3 +2,5 @@ DIST yandex-disk-0.1.5.758-1.fedora.i386.rpm 3983558 SHA256 b89b294ea006d28b78c7 DIST yandex-disk-0.1.5.758-1.fedora.x86_64.rpm 4342203 SHA256 1141a27d70041d81c73f38a8f22b841366cf88c0cd7f3980e4ad2e18a9b2c9ac SHA512 28a720cb0147bb43d8d6e0d9454c2cacf849d7b83f0110d6a01bb9b68ad882701981e8bed880fec112ca76d554b3fc92654df0e0b2498bb7e6cc7871059ef6e3 WHIRLPOOL a2e5e78ebff86cd8adad25af3afd1b463c6a2ef79bb3b569b5136f1215a305f3c9ff15bf5cfbc434f813810ac7dd6c5bc3909762136cc3cb67b00fab1320c1f3 DIST yandex-disk-0.1.5.870-1.fedora.i386.rpm 3999971 SHA256 63ef9759844e168ba7042264d406a52dd81d6c986d33706c1b88076223ed35d1 SHA512 ae2d8f6c4b9d76dc7af08543bf20bb6c2cece0d13d0377e2de516a73e3e0916f91539b969c65a2ebd4b321081957766c95c4590698b44b6cf744c28ed4934cf7 WHIRLPOOL d3bce8c44068502eef284ecf9054b642867551c547d9df0dcd089115a3592c786a5fd2064c150bb76c02ccefbcdecd61ec7814340ed389a7de5c241a584e9cd3 DIST yandex-disk-0.1.5.870-1.fedora.x86_64.rpm 4389161 SHA256 31fc1181dd72011e94387d382f08c3b061723767a90d42028598d26d50a03318 SHA512 7494f6c12bbe2648a612e1a43ae92170664bd2082b94dc528ae6a27c9c0cfdabbc2048e0283b89c7c754836fdb6d11d36d0c4052ffb9afe8bbf1fb9fb5944685 WHIRLPOOL d830f733496422f57284e3b3e3e0e956a854f3aa75a7d75e8a2c8cf3f4d1a37f5c23cb52b046fe5e8376e545e53962b633e78bd68e7bd22589668a00eaf64361 +DIST yandex-disk-0.1.5.940-1.fedora.i386.rpm 4551033 SHA256 215d14af442651d2268b64abd9f5593c033f3af7a301f6c1f2c693149c626007 SHA512 40438b9b079c3f1fc9c23794abd320b552f9f77c0f7aa4972fd2de94f60b607bc067a56e00bb35597a505e087ecc6ec7089b90d87695320c685abbf4af735db4 WHIRLPOOL fdb9bd864a213a8b299352e465c6f8676f97da996bf9dcae51c08d5a7902172009fa94d4ab36cff28498fd1b2df335ea0d30f661f18a60c56dc612aa69fa9631 +DIST yandex-disk-0.1.5.940-1.fedora.x86_64.rpm 4349853 SHA256 58f8beae3715893b2f982391107b819492ce6e7536c373c894e5bd0fbe3929b7 SHA512 0e52eb6275a349191b56d89a1e288c7112a8f93c31d4017787ede0a1fd7b69666f8425abb0309500361cbdd56e850e2380f74730d5ace97f1b3e4dd2c5eed6fb WHIRLPOOL 87f84e459bb9a02aa9a4e7cf745591db0bf97c29d1075bf64186e4fd49c00dd150dc03236c65d905f23f365438dd92650352ece435009561d8ea98bd711a520e diff --git a/net-misc/yandex-disk/yandex-disk-0.1.5.870_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.5.870_p1.ebuild index 090f155c40c4..9c840a9953d8 100644 --- a/net-misc/yandex-disk/yandex-disk-0.1.5.870_p1.ebuild +++ b/net-misc/yandex-disk/yandex-disk-0.1.5.870_p1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="YDSLA" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" DEPEND="" RDEPEND="sys-libs/zlib" diff --git a/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild new file mode 100644 index 000000000000..c83d92d2b2e6 --- /dev/null +++ b/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit bash-completion-r1 eutils rpm + +MY_P="${PN}-${PV/_p/-}" + +DESCRIPTION="CLI to access Yandex Disk file storage service" +HOMEPAGE="https://disk.yandex.ru" +SRC_URI=" + amd64? ( http://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/${MY_P}.fedora.x86_64.rpm ) + x86? ( http://repo.yandex.ru/yandex-disk/rpm/stable/i386/${MY_P}.fedora.i386.rpm ) +" + +LICENSE="YDSLA" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" + +DEPEND="" +RDEPEND="sys-libs/zlib" + +S="${WORKDIR}" + +QA_PREBUILT="opt/bin/yandex-disk" + +src_prepare() { + # bug #526312 + sed -i \ + -e '/have /d' \ + -e 's/+o nospace/-o nospace/' \ + -e '/^complete/s/-X //' \ + etc/bash_completion.d/yandex-disk-completion.bash || die + + epatch_user +} + +src_install() { + exeinto /opt/bin + doexe usr/bin/yandex-disk + newbashcomp etc/bash_completion.d/yandex-disk-completion.bash "${PN}" + doman usr/share/man/man1/*.gz + insinto /usr/share + doins -r usr/share/locale +} diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index f916dc6ad131..4e6922d46456 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,3 +1,3 @@ DIST youtube-dl-2015.04.03.tar.gz 1472296 SHA256 0521a15a24a9b620728a2f45ea9163ca74660ed443781b6e69b4e06d36d7bf59 SHA512 6b2c85cfa222a31f3462aab583fa98bb92544cd5fb0d395ca0b69a26c24ab174870d02264e058281f09305752d50aa5a06d0d747205499a530b275e3194fc6f9 WHIRLPOOL 391e06ea261f92e03a0b38618307f1c9d53a2dfb9f2062fe0cd3ded1ea0c411033a17ded581616032c74a9e4fb398a57e565bf847196a23a9f89433f861362ae -DIST youtube-dl-2015.10.18.tar.gz 1767012 SHA256 eece461e6af1fc030ffe29306a24676568c0310a47174168019ab1a62f08029e SHA512 b9a49003dd71ee987856e7f27d6bb078e66dc2992de5b0e8c5d043407fdeef86944cac8d1403547eadfd854fd8b77bff1ac25202e5debcaeee01661a34fb4131 WHIRLPOOL 7dee5962eb400d181f3a0db01a0e8dd81c4444a13040840859c78f10db7e2db9c7451b652af533ef8b159a24122f0e2847fdf41bdde80c946188e66e4fbce224 -DIST youtube-dl-2015.10.24.tar.gz 1771159 SHA256 fa151e925b51f6b5ee154f25089d287832a9387e59561810fd5eac8d00ce3ae1 SHA512 ed2a1633f5c4fb8eacaa2b0ef63e968dd8a90fbef57fafbfcb6889e3d0508794695b1edd89b2121c8efaf0222fd1d66cf43902b9c3d217bbe8a63ae3b92a93bd WHIRLPOOL 0dedb4bafaa03c997f89d52eb334bc1e9492b40d6bbaa7429a62ee78b45712de955f39f13ec995cd10051333117c1dc4bb119270f53fece5da686eceb7e06895 +DIST youtube-dl-2015.11.01.tar.gz 1779098 SHA256 58a981cd708f30567382b97d6db336b25ca2279b759aea3a79e4d39a68351f3a SHA512 954f1ede1bdbe821c1f2696739bd0a1e6e5bbf4ee7cf122e2baa4da1c9561a8db733e6972d28d0f8556ac22308924fd2b8342bb634fe008beec1debfd8e5567c WHIRLPOOL 37ea642eeec688ac72f88a35a31a2bc5a1aa511555b48e41d2b8c5991ec58fc1e440581ecca9f03ff74f210ae5c9eeec47f7f95745fd5888ce7569720282dddc +DIST youtube-dl-2015.11.02.tar.gz 1779176 SHA256 5c5bc5a7fec405ed353bd7052a4a83e8782742d246b24af73393fe70c7b28d8c SHA512 99425739bf8802e50e5d4e11acd9915cb558f735918f145e78bb3e2d587c0b978882ac339ecbb0c8570510ea5843e19017fd40b5b4a2fbc44e5806ebb14bbaf2 WHIRLPOOL e80a4245cfa845cf3e27f19d04ba29af27d11ce5f5f69269633ea3200dbfbbee3afc7410aa7a34dcb03645568a96e1c1cc1ce285de768b1d6eb244a52251aa4f diff --git a/net-misc/youtube-dl/youtube-dl-2015.10.18.ebuild b/net-misc/youtube-dl/youtube-dl-2015.11.01.ebuild index db29af284def..db29af284def 100644 --- a/net-misc/youtube-dl/youtube-dl-2015.10.18.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2015.11.01.ebuild diff --git a/net-misc/youtube-dl/youtube-dl-2015.10.24.ebuild b/net-misc/youtube-dl/youtube-dl-2015.11.02.ebuild index db29af284def..7c5ab5b4b433 100644 --- a/net-misc/youtube-dl/youtube-dl-2015.10.24.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2015.11.02.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=(python{2_7,3_3,3_4}) +PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5}) DISTUTILS_SINGLE_IMPL=true inherit bash-completion-r1 distutils-r1 eutils diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest index 286ca46daceb..1ebf539872a7 100644 --- a/net-misc/youtube-viewer/Manifest +++ b/net-misc/youtube-viewer/Manifest @@ -1 +1,2 @@ DIST youtube-viewer-3.1.1.tar.gz 210183 SHA256 416289dac7c4bb29ad046e41bbf49faaca31f1827379e9e0082f5b282186531d SHA512 1c7236cde68f21a80bb1f3ac29e19f86f52732c784adb70f6fc07177d74ada3a6ae1652e604fc12f62ce8ddf0c172593dd85a419a6d7d804f980fc09afda90f0 WHIRLPOOL 9045cc344bd627806526594daafbd8e17cfefa0e7aaf456c5c3a0c7ebec4bdd53f8ec708e051b37706ac3e1e29af3379e1df8ea21bfd370ca367950e6accf886 +DIST youtube-viewer-3.1.9.tar.gz 222276 SHA256 9b7ba2b50cea054898024bc871e231673269ab50db0526ee3f1a7ae62a51e8d2 SHA512 60ff81defd4d8d1bc1f6b5bceaa03c9bbe64e8fea2083ce60b04b6c14d8b13ded6da255b9aa46bfcb1b76cf33121ddb738d0f0c159e4bd207999ca558a43e86e WHIRLPOOL 2e6a79992c7760d93c2e28f1e4f5c14861b6fefed8e0bebb9a7d88c6cf27000904971b12274a972ca66471ffee7c3bfee8c90218c16ddd0ec96cc8f46779bffd diff --git a/net-misc/youtube-viewer/metadata.xml b/net-misc/youtube-viewer/metadata.xml index 6bf16cf0170d..8bfc8bf11c86 100644 --- a/net-misc/youtube-viewer/metadata.xml +++ b/net-misc/youtube-viewer/metadata.xml @@ -2,7 +2,14 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>maintainer-needed@gentoo.org</email> + <email>hasufell@gentoo.org</email> + <name>Julian Ospald</name> + <description>Primary maintainer, assign him on bugs.</description> + </maintainer> + <maintainer> + <email>zoltan@sinustrom.info</email> + <name>Zoltan Puskas</name> + <description>Proxied maintainer, CC him on bugs.</description> </maintainer> <upstream> <maintainer status="active"> @@ -11,9 +18,13 @@ <bugs-to>https://github.com/trizen/youtube-viewer/issues</bugs-to> <remote-id type="github">trizen/youtube-viewer</remote-id> </upstream> + <use> + <flag name="gtk">Install the gtk GUI, called gtk-youtube-viewer</flag> + </use> <longdescription lang="en"> - Youtube Viewer is a CLI application dedicated for searching and streaming - Youtube Videos with MPlayer. It has been written in Perl and plays videos - from Youtube at the best quality available without using a flash player. + Youtube Viewer is a CLI application dedicated for searching and + streaming Youtube Videos with MPlayer. It has been written in Perl + and plays videos from Youtube at the best quality available without + using a flash player. </longdescription> </pkgmetadata> diff --git a/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild new file mode 100644 index 000000000000..8a9934381814 --- /dev/null +++ b/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit gnome2-utils eutils perl-module vcs-snapshot + +DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer" +HOMEPAGE="https://trizen.googlecode.com" +SRC_URI="https://github.com/trizen/youtube-viewer/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="|| ( Artistic GPL-1+ )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk" + +RDEPEND=" + >=dev-lang/perl-5.16.0 + dev-perl/Data-Dump + dev-perl/JSON + dev-perl/libwww-perl[ssl] + dev-perl/Term-ReadLine-Gnu + virtual/perl-Encode + virtual/perl-File-Path + virtual/perl-File-Spec + virtual/perl-Getopt-Long + virtual/perl-Scalar-List-Utils + virtual/perl-Term-ANSIColor + virtual/perl-Term-ReadLine + virtual/perl-Text-ParseWords + virtual/perl-Text-Tabs+Wrap + gtk? ( + dev-perl/File-ShareDir + >=dev-perl/gtk2-perl-1.244.0 + virtual/freedesktop-icon-theme + x11-libs/gdk-pixbuf:2[X,jpeg] + )" +DEPEND="dev-perl/Module-Build" + +SRC_TEST="do" + +src_prepare() { + perl-module_src_prepare +} + +# build system installs files on "perl Build.PL" too +# do all the work in src_install +src_configure() { :; } +src_compile() { :; } + +src_install() { + local myconf + if use gtk ; then + myconf="--gtk-youtube-viewer" + fi + perl-module_src_configure + perl-module_src_install + + if use gtk ; then + domenu share/gtk-youtube-viewer.desktop + doicon share/icons/gtk-youtube-viewer.png + fi +} + +pkg_preinst() { + use gtk && gnome2_icon_savelist + perl_set_version +} + +pkg_postinst() { + use gtk && gnome2_icon_cache_update + elog + elog "optional dependencies:" + elog " dev-perl/LWP-UserAgent-Cached (cache support)" + elog " dev-perl/Term-ReadLine-Gnu (for a better STDIN support)" + elog " dev-perl/JSON-XS (faster JSON to HASH conversion)" + elog " dev-perl/Mozilla-CA (just in case if there are SSL problems)" + elog " dev-perl/Text-CharWidth (print the results in a fixed-width" + elog " format (--fixed-width, -W))" + elog " virtual/perl-threads (threads support)" + elog + elog "You also need a compatible video player, possible choices are:" + elog " media-video/gnome-mplayer" + elog " media-video/mplayer[network]" + elog " media-video/mpv" + elog " media-video/smplayer" + elog " media-video/vlc" + elog "Also check the configuration file in ~/.config/youtube-viewer/" + elog "and configure your video player backend." +} + +pkg_postrm() { + use gtk && gnome2_icon_cache_update +} diff --git a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild index c1d99f7242f2..9290df158306 100644 --- a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild +++ b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit perl-module git-2 +inherit gnome2-utils eutils perl-module git-r3 DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer" HOMEPAGE="https://trizen.googlecode.com" @@ -19,13 +19,16 @@ IUSE="gtk" RDEPEND=" >=dev-lang/perl-5.16.0 dev-perl/Data-Dump - dev-perl/libwww-perl - || ( media-video/mplayer[X,network] - media-video/mplayer2[X,network] - media-video/mpv[X] ) + dev-perl/JSON + dev-perl/libwww-perl[ssl] + dev-perl/Term-ReadLine-Gnu + virtual/perl-Encode + virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long + virtual/perl-Scalar-List-Utils virtual/perl-Term-ANSIColor + virtual/perl-Term-ReadLine virtual/perl-Text-ParseWords virtual/perl-Text-Tabs+Wrap gtk? ( @@ -36,11 +39,12 @@ RDEPEND=" )" DEPEND="dev-perl/Module-Build" -EGIT_SOURCEDIR="${WORKDIR}" -S=${WORKDIR}/WWW-YoutubeViewer - SRC_TEST="do" +src_prepare() { + perl-module_src_prepare +} + # build system installs files on "perl Build.PL" too # do all the work in src_install src_configure() { :; } @@ -53,22 +57,40 @@ src_install() { fi perl-module_src_configure perl-module_src_install + + if use gtk ; then + domenu share/gtk-youtube-viewer.desktop + doicon share/icons/gtk-youtube-viewer.png + fi +} + +pkg_preinst() { + use gtk && gnome2_icon_savelist + perl_set_version } pkg_postinst() { - einfo + use gtk && gnome2_icon_cache_update + elog elog "optional dependencies:" - elog " dev-perl/LWP-Protocol-https or dev-perl/libwww-perl[ssl]" - elog " and virtual/perl-MIME-Base64" - elog " (for HTTPS protocol and login support)" + elog " dev-perl/LWP-UserAgent-Cached (cache support)" elog " dev-perl/Term-ReadLine-Gnu (for a better STDIN support)" + elog " dev-perl/JSON-XS (faster JSON to HASH conversion)" + elog " dev-perl/Mozilla-CA (just in case if there are SSL problems)" elog " dev-perl/Text-CharWidth (print the results in a fixed-width" elog " format (--fixed-width, -W))" - elog " dev-perl/XML-Fast (faster XML to HASH conversion)" - elog " net-misc/gcap (for retrieving Youtube closed captions)" - elog " virtual/perl-File-Temp (for posting comments)" - elog " virtual/perl-Scalar-List-Utils (to shuffle the playlists" - elog " (--shuffle, -s))" elog " virtual/perl-threads (threads support)" - einfo + elog + elog "You also need a compatible video player, possible choices are:" + elog " media-video/gnome-mplayer" + elog " media-video/mplayer[network]" + elog " media-video/mpv" + elog " media-video/smplayer" + elog " media-video/vlc" + elog "Also check the configuration file in ~/.config/youtube-viewer/" + elog "and configure your video player backend." +} + +pkg_postrm() { + use gtk && gnome2_icon_cache_update } diff --git a/net-p2p/i2p/metadata.xml b/net-p2p/i2p/metadata.xml index 316d7cc335ca..16fc6e2d1135 100644 --- a/net-p2p/i2p/metadata.xml +++ b/net-p2p/i2p/metadata.xml @@ -7,7 +7,6 @@ <email>sam@cmpct.info</email> <description>Proxy-maintainer; add or CC them for bugs</description> </maintainer> -<maintainer><email>zlg@gentoo.org</email></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> <use> <flag name="nls">Adds Native Language Support using GNU gettext.</flag> diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest index eb354f0c1a72..abc99eba05d8 100644 --- a/net-p2p/rtorrent/Manifest +++ b/net-p2p/rtorrent/Manifest @@ -1,2 +1,3 @@ DIST rtorrent-0.9.3.tar.gz 583311 SHA256 9e93ca41beb1afe74ad7ad8013e0d53ae3586c9b0e97263d722f721535cc7310 SHA512 a6cc390795c0cf36bf70f4f141db3e176c81df0d6754fe2e6a95ef59385a70e7ce006fe81b83deff5b32e06cc771d03c5c7ba1140be64b2d252719e8aa2058f3 WHIRLPOOL 7cb2e51718596145ef8a07b1de0bb9ccd4dc923a4ec8091a3f775dffaafe5111873d43047e6e32720a202774454e53443e402010d956954f19cdfdb08983ec52 DIST rtorrent-0.9.4.tar.gz 601913 SHA256 bc0a2c1ee613b68f37021beaf4e64a9252f91ed06f998c1e897897c354ce7e84 SHA512 ae243d0336acff50e91e4ed9d306beb4705559775518e6dc122ec18a1530e59e2c531cf54f4b79899a1569ca18d343fce255071b45c41df1357bddfe926692aa WHIRLPOOL 03eb3cff0f7d490ada2199310fd2ba7576de8e20557e532df49be17f84aa2afb9cb8137b2eb317bc0fb4ce8ce035e900c65c32e81dc5d5d215923d91e8c0612a +DIST rtorrent-0.9.6.tar.gz 610845 SHA256 1e69c24f1f26f8f07d58d673480dc392bfc4317818c1115265b08a7813ff5b0e SHA512 704f7b79d5bc78b817da21a6886662a5a97fde210a110c50f708bdc18e1dcf3ef5c5f4e2740261d41221cfc69c19926bf34e10057adf10601da9e6e06b2cef75 WHIRLPOOL df5878014087d894e9796508627ec508ff5d042c78cc09e8d9ae57a7f9556bb549f9900e3995a7296420438ca0edda245907f8ae0c71d5a0ae28c3af7a6f992e diff --git a/net-p2p/rtorrent/metadata.xml b/net-p2p/rtorrent/metadata.xml index 0547227d9821..9fa2e6deabbe 100644 --- a/net-p2p/rtorrent/metadata.xml +++ b/net-p2p/rtorrent/metadata.xml @@ -3,11 +3,12 @@ <pkgmetadata> <herd>net-p2p</herd> <longdescription lang="en"> - Console BitTorrent client using ncurses based on libtorrent written in C++. -</longdescription> + Console BitTorrent client using ncurses based on libtorrent written in C++. + </longdescription> <use> - <flag name="daemon">Uses <pkg>app-misc/screen</pkg> to daemonize this - application - </flag> + <flag name="daemon">Uses <pkg>app-misc/screen</pkg> to daemonize this application</flag> </use> + <upstream> + <remote-id type="github">rakshasa/rtorrent</remote-id> + </upstream> </pkgmetadata> diff --git a/net-p2p/rtorrent/rtorrent-0.9.6.ebuild b/net-p2p/rtorrent/rtorrent-0.9.6.ebuild new file mode 100644 index 000000000000..efbf0261f74c --- /dev/null +++ b/net-p2p/rtorrent/rtorrent-0.9.6.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools eutils systemd + +DESCRIPTION="BitTorrent Client using libtorrent" +HOMEPAGE="https://rakshasa.github.io/rtorrent/" +SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" +IUSE="daemon debug ipv6 selinux test xmlrpc" + +COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.} + >=dev-libs/libsigc++-2.2.2:2 + >=net-misc/curl-7.19.1 + sys-libs/ncurses:0= + xmlrpc? ( dev-libs/xmlrpc-c )" +RDEPEND="${COMMON_DEPEND} + daemon? ( app-misc/screen ) + selinux? ( sec-policy/selinux-rtorrent ) +" +DEPEND="${COMMON_DEPEND} + dev-util/cppunit + virtual/pkgconfig" + +DOCS=( doc/rtorrent.rc ) + +src_prepare() { + # bug #358271 + epatch \ + "${FILESDIR}"/${PN}-0.9.1-ncurses.patch \ + "${FILESDIR}"/${PN}-0.9.4-tinfo.patch + + # https://github.com/rakshasa/rtorrent/issues/332 + cp "${FILESDIR}"/rtorrent.1 "${S}"/doc/ || die + + eautoreconf +} + +src_configure() { + # configure needs bash or script bombs out on some null shift, bug #291229 + CONFIG_SHELL=${BASH} econf \ + --disable-dependency-tracking \ + $(use_enable debug) \ + $(use_enable ipv6) \ + $(use_with xmlrpc xmlrpc-c) +} + +src_install() { + default + doman doc/rtorrent.1 + + if use daemon; then + newinitd "${FILESDIR}/rtorrentd.init" rtorrentd + newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd + systemd_newunit "${FILESDIR}/rtorrentd_at.service" "rtorrentd@.service" + fi +} diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest index 35c3c93d6465..7039cce72a59 100644 --- a/net-print/cups-filters/Manifest +++ b/net-print/cups-filters/Manifest @@ -1,5 +1,4 @@ DIST cups-filters-1.0.71.tar.xz 1339116 SHA256 3180aa209c383402822e568ccef8e1ca43f51e30b3af2039c34ebae919a69c1f SHA512 dc243e88d535c8d7e7fd53074b1093a46fc22742504efa09096d2b216846df875e4d914f25d2f726034692538cfdf1b713bc1ef44d199003a21e242b99f44a01 WHIRLPOOL 4afc7079594563f57af81501192cc0cba19db6cd5c10a9544339858a343e245b485e528fbf80eecd711341b23b8321bde817c49db7ddd2f0b801da2b4b9c580d -DIST cups-filters-1.0.73.tar.xz 1351652 SHA256 84521dc5079e683144e95e22ffcdbc3d51c44f9d4079c5bcc7f7ff421e94ec75 SHA512 ae380403569640fab21c9a0914b894628bcc57b709d68c05b620ec425734436281fe752d99b83c114927110489e523ffdb676b723109094dc7ef6d53bc9e8f41 WHIRLPOOL 3c447ed182a73cab84349101f5846c0cf9784de0b50960bc689de3f4086becf392229d378cc5fa70857adc66191f67e564ed5b6f2c081a7184e62b788d1f80f9 -DIST cups-filters-1.0.74.tar.xz 1352328 SHA256 55e86080c3778d247d88bf6232947cb7c2057a6bce501c6e707800846f71119b SHA512 b7eac4915ee95524af37342bd3dcb4a430052f32360654df5c2cab9373c1c1993d51f5066b44936f5a0ed43b4f34ff22db54f65de1eff4361469577621496954 WHIRLPOOL 07da3a30af49b6ae73d308260b73ef4a67989fab9a2546bd40c75a921c51e058b2e7cab418d8e8e51def1dc414ba6d9c7924cddd1652b59fb160d07806b0454d DIST cups-filters-1.0.75.tar.xz 1352492 SHA256 7c69ecea306e33d940b698ef34230c126a1016a5a02c8b18faa466d1aa4c3073 SHA512 a385f4c3aeca8c9a8c9b577b4f90e3e4ceb4488795dd5215b36a6d34832b0719d08d4bd8f653bda6182e5433ee046bae00dd1ab46aa932e66480e3657225c15f WHIRLPOOL 4fcd637c445a7f9b18a8b29185e36169be766f743ff14f1601909110fdb40a4e42c6e58253d63162b263d2efd15f98de0e3731ad1afcb6c909a497c798a3b6d3 DIST cups-filters-1.0.76.tar.xz 1353016 SHA256 b3a190b11a102af6994e41d2cfa47e5caf999c7d046f3c0b940f6b38729f5b32 SHA512 1c438ffc10551b79468f7f850e8f036defaa9c2e1114153107ff909904f25786c36635ea29cb8b07a2d6df37ab2e68bd91731d783e279f1a36decba9204baf7d WHIRLPOOL c9f0e0347f434aab1bc041c56704343fea1c656a355d69d274f3ab5883471815962ae23e9d96533b945e119dff4d3d8204a31b35a179e59b435d067fdc8e2a07 +DIST cups-filters-1.1.0.tar.xz 1357364 SHA256 03505a803799308f22bebd6ff8162a12efb4cfd5cfcd39f81479ae6301d52c7b SHA512 1138aa4c9ff6f870b018af738d221cc20ba01375cfb6f63a87a62277f4180ca3c426a79c2c19ccbf6d592245c22c926cd86afc0a9987f20b545047a1e3c4dbb4 WHIRLPOOL 15caeb7d705068824ea6f1e6776d30110af056e8ed9299eea84c111d3f884dc29cdec34591c8bf71be597b02bdadedd99517934bb6b78c339d9efb4be335fd8e diff --git a/net-print/cups-filters/cups-filters-1.0.74.ebuild b/net-print/cups-filters/cups-filters-1.0.74.ebuild deleted file mode 100644 index 924c5156c9c1..000000000000 --- a/net-print/cups-filters/cups-filters-1.0.74.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -inherit base eutils perl-module autotools systemd - -if [[ "${PV}" == "9999" ]] ; then - inherit bzr - EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters" - KEYWORDS="" -else - SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint" -fi -DESCRIPTION="Cups PDF filters" -HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat" - -LICENSE="MIT GPL-2" -SLOT="0" -IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf" - -RDEPEND=" - >=app-text/ghostscript-gpl-9.09 - app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] - >=app-text/qpdf-3.0.2:= - media-libs/fontconfig - media-libs/freetype:2 - media-libs/lcms:2 - >=net-print/cups-1.7.3 - !<=net-print/cups-1.5.9999 - sys-devel/bc - sys-libs/zlib - dbus? ( sys-apps/dbus ) - foomatic? ( !net-print/foomatic-filters ) - jpeg? ( virtual/jpeg:0 ) - perl? ( dev-lang/perl:= ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0 ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen -" - -src_prepare() { - base_src_prepare - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die - eautoreconf -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable dbus) \ - $(use_enable zeroconf avahi) \ - $(use_enable static-libs static) \ - --with-fontdir="fonts/conf.avail" \ - --with-pdftops=pdftops \ - --enable-imagefilters \ - $(use_with jpeg) \ - $(use_with png) \ - $(use_with tiff) \ - --with-rcdir=no \ - --with-browseremoteprotocols=DNSSD,CUPS \ - --without-php -} - -src_compile() { - MAKEOPTS=-j1 default - - if use perl; then - pushd "${S}/scripting/perl" > /dev/null - perl-module_src_configure - perl-module_src_compile - popd > /dev/null - fi -} - -src_install() { - default - - if use perl; then - pushd "${S}/scripting/perl" > /dev/null - perl-module_src_install - perl_delete_localpod - popd > /dev/null - fi - - # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831 - dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster - dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl - - prune_libtool_files --all - - cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die - - if ! use zeroconf ; then - sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die - sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die - fi - - if ! use foomatic ; then - # this needs an upstream solution / configure switch - rm -v "${ED}/usr/bin/foomatic-rip" || die - rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die - rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die - fi - - doinitd "${T}"/cups-browsed - systemd_dounit "${S}/utils/cups-browsed.service" -} - -pkg_postinst() { - if ! use foomatic ; then - ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely." - ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained." - fi -} diff --git a/net-print/cups-filters/cups-filters-1.0.73.ebuild b/net-print/cups-filters/cups-filters-1.1.0.ebuild index 924c5156c9c1..924c5156c9c1 100644 --- a/net-print/cups-filters/cups-filters-1.0.73.ebuild +++ b/net-print/cups-filters/cups-filters-1.1.0.ebuild diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest index f2ed0d7a191c..e8346e8966a7 100644 --- a/net-proxy/haproxy/Manifest +++ b/net-proxy/haproxy/Manifest @@ -1,3 +1,3 @@ DIST haproxy-1.4.26.tar.gz 837280 SHA256 a8787dae723c045eebd0ed9e0213514f909a67325d64e963eaf50c35b147d3d3 SHA512 f21901069f651f3320c2b7cb6aee96fced5d4d5d4a73eec0d94dd8bd109a391d8da85026389e7209f85026cdefc1b879afcfd0a9bc0970e41aedd59e35935454 WHIRLPOOL 406b7f8bb4b9b3f6b8080f58431a804abea1d834ef9b8d86ede328b27e4f3fe944fbdae5bad8c3f7da75c81c92ff0e030950e09feac28eac4f763e511b5e7dce DIST haproxy-1.5.14.tar.gz 1345345 SHA256 9565dd38649064d0350a2883fa81ccfe92eb17dcda457ebdc01535e1ab0c8f99 SHA512 83d6101fd402f37845ab3febc914335e4c6d9bdebbb0ff81c8e048d5252ffa5a1b77c4250a434fed5dd541ef1f1f2c47d969b59f7a51d6ab9aea38a8646a9798 WHIRLPOOL 7d2c580589b9b31e1eba169e4bf930ac42d2564e21eb1c25adbdd39b701abd221fd671ebc227167ab956a48b2c30eeb740a6394355a8fa748c408ee42fdff6fc -DIST haproxy-1.6.0.tar.gz 1538022 SHA256 e83a272b7d3638cf1d37bba58d3e75f497c1862315ee5bb7f5efc1d98d26e25b SHA512 44bfcd040c87e0c3e7d925bb671009e8ed568a7a32ae32ac5d58921417aaa458b772a1368876fee8bf9252106fb315c1c3d29b7f03739a239567b86fb3c25e8e WHIRLPOOL 06afedc7dc7110e0985864f6d955261489997fd55644a16320203e47e14fc6f3bbb9020b772dfc571c01c76c7a55c8883a910f5b0553e70d4f321c1a14d97a2d +DIST haproxy-1.6.1.tar.gz 1538337 SHA256 71da2abe610ed42afd6678c2e95321db5f3c416fe2803235f75fc459d8246289 SHA512 ffb71b4a7fc4d4ede6c479689f6073e7e436b21f8e5010bf6bf73fce60c1cde0f02fd15a60e0c1ee5e15d0561b8b7c931bcdbb11058afc18c501e46179675c7f WHIRLPOOL 7751b35ba576329b7c68b93fddb0d1f4772c436d11945e3d1ceb69e5448d11d51530a277f810450b7a2265b5dd81a802e996c20a9547aac679628900bf129436 diff --git a/net-proxy/haproxy/haproxy-1.6.0.ebuild b/net-proxy/haproxy/haproxy-1.6.1.ebuild index e9cd80d6b5fe..e9cd80d6b5fe 100644 --- a/net-proxy/haproxy/haproxy-1.6.0.ebuild +++ b/net-proxy/haproxy/haproxy-1.6.1.ebuild diff --git a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild index 7610ef908faa..b305f4d1c3df 100644 --- a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild +++ b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://www.squidguard.org/Downloads/Devel/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ppc ~ppc64 ~sparc ~x86" IUSE="ldap" diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest index 4d54215a7579..ff84641b0712 100644 --- a/net-wireless/blueman/Manifest +++ b/net-wireless/blueman/Manifest @@ -1,2 +1 @@ -DIST blueman-1.23.tar.gz 1223094 SHA256 50b261bcdc2e99e176c7c194825da1259500aaacaccb92714d97af0209a4f011 SHA512 529a43dace73bf362baac69404a9e87d14f5bcb7b07b18194434c7a6c1dbc22f8fecdb4923c92a77b65656405a492b9e147e77cb7a161df4a93e8b78a003eba7 WHIRLPOOL 4070b4d86cbe743278730e4ee3022bcfdea590b5b76e545cc67912a3498de993ed0c62cb67ac2cd3ad3b8e3c17c5d5a8b1f8fa6e214234a64a784146c6d6d542 DIST blueman-2.0.tar.xz 1941332 SHA256 81a5ca95124f12bfb62d2d2d0d265af70cdae1d43b0c6e4fc6d2bad8f82958f1 SHA512 44d3967d031f7482e7700674970eff08fee53d8cbeb96e46b2f97e2a2fb6b5790f663ed73129eab241545ebaa6c5748dc6cf6b90a2c4795b27e90b5399d71f80 WHIRLPOOL 394bac3e0b457fdbb79c69fe9181abafde3f9b1138ff71c4dc23bc78424b76284e3ad9cf02dc168848fa461541f86fa2bba5aee0f014e460f0852e1bfa163dae diff --git a/net-wireless/blueman/blueman-1.23-r2.ebuild b/net-wireless/blueman/blueman-1.23-r2.ebuild deleted file mode 100644 index ae5de7c75a9e..000000000000 --- a/net-wireless/blueman/blueman-1.23-r2.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="4" - -PYTHON_DEPEND="2:2.7" - -inherit eutils python gnome2-utils - -DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks" -HOMEPAGE="https://github.com/blueman-project/blueman" -SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gconf sendto network nls policykit pulseaudio" - -CDEPEND="dev-libs/glib:2 - >=x11-libs/gtk+-2.12:2 - x11-libs/startup-notification - dev-python/pygobject:2 - <net-wireless/bluez-5 - >=net-wireless/bluez-4.21" -DEPEND="${CDEPEND} - nls? ( dev-util/intltool sys-devel/gettext ) - virtual/pkgconfig - >=dev-python/pyrex-0.9.8" -RDEPEND="${CDEPEND} - >=app-mobilephone/obex-data-server-0.4.4 - sys-apps/dbus - dev-python/pygtk - dev-python/notify-python - dev-python/dbus-python - x11-themes/hicolor-icon-theme - gconf? ( dev-python/gconf-python ) - sendto? ( gnome-base/nautilus ) - network? ( || ( net-dns/dnsmasq - net-misc/dhcp - >=net-misc/networkmanager-0.8 ) ) - policykit? ( sys-auth/polkit ) - pulseaudio? ( media-sound/pulseaudio )" - -pkg_setup() { - python_set_active_version 2.7 - python_pkg_setup -} - -src_prepare() { - # disable pyc compiling - ln -sf $(type -P true) py-compile - - sed -i \ - -e '/^Encoding/d' \ - data/blueman-manager.desktop.in || die "sed failed" - - epatch \ - "${FILESDIR}/${P}-plugins-conf-file.patch" \ - "${FILESDIR}/${P}-fix-broken-status-icon.patch" \ - "${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch" -} - -src_configure() { - econf \ - --disable-static \ - $(use_enable policykit polkit) \ - $(use_enable sendto) \ - --disable-hal \ - $(use_enable nls) -} - -src_install() { - default - - python_convert_shebangs 2.7 "${D}"/usr/bin/blueman-* "${D}/usr/libexec/blueman-mechanism" - - rm "${D}"/$(python_get_sitedir)/*.la - use sendto && rm "${D}"/usr/lib*/nautilus-sendto/plugins/*.la - - use gconf || rm "${D}"/$(python_get_sitedir)/${PN}/plugins/config/Gconf.py - use policykit || rm -rf "${D}"/usr/share/polkit-1 - use pulseaudio || rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py,plugins/applet/Pulse*.py} - - python_need_rebuild -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - python_mod_optimize ${PN} - gnome2_icon_cache_update -} - -pkg_postrm() { - python_mod_cleanup ${PN} - gnome2_icon_cache_update -} diff --git a/net-wireless/blueman/blueman-2.0-r1.ebuild b/net-wireless/blueman/blueman-2.0-r1.ebuild index f84849c4fc4b..22cc3b8048e4 100644 --- a/net-wireless/blueman/blueman-2.0-r1.ebuild +++ b/net-wireless/blueman/blueman-2.0-r1.ebuild @@ -13,10 +13,10 @@ HOMEPAGE="https://github.com/blueman-project/blueman" if [[ ${PV} == "9999" ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://github.com/blueman-project/blueman.git" - KEYWORDS="" + KEYWORDS="~ppc" else SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~ppc ~x86" fi LICENSE="GPL-3" diff --git a/net-wireless/blueman/blueman-2.0.ebuild b/net-wireless/blueman/blueman-2.0.ebuild deleted file mode 100644 index 473715688d65..000000000000 --- a/net-wireless/blueman/blueman-2.0.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) -inherit eutils gnome2-utils linux-info python-single-r1 - -DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks" -HOMEPAGE="https://github.com/blueman-project/blueman" - -if [[ ${PV} == "9999" ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/blueman-project/blueman.git" - KEYWORDS="" -else - SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="appindicator network nls policykit pulseaudio thunar" - -COMMON_DEPEND=" - dev-python/pygobject:3 - >=net-wireless/bluez-4.61:= - ${PYTHON_DEPS}" -DEPEND="${COMMON_DEPEND} - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - nls? ( dev-util/intltool sys-devel/gettext )" -RDEPEND="${COMMON_DEPEND} - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - sys-apps/dbus - x11-libs/gtk+:3[introspection] - x11-libs/libnotify[introspection] - || ( - x11-themes/faenza-icon-theme - x11-themes/gnome-icon-theme - x11-themes/mate-icon-theme - ) - appindicator? ( dev-libs/libappindicator:3[introspection] ) - network? ( - net-dns/avahi[autoipd] - net-firewall/iptables - sys-apps/net-tools - || ( - net-dns/dnsmasq - net-misc/dhcp - >=net-misc/networkmanager-0.8 - ) - ) - policykit? ( sys-auth/polkit ) - pulseaudio? ( media-sound/pulseaudio[bluetooth] ) - thunar? ( xfce-base/thunar ) - !net-wireless/gnome-bluetooth -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -pkg_pretend() { - if use network; then - local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES - ~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE" - linux-info_pkg_setup - fi -} - -pkg_setup() { - pkg_pretend - python-single-r1_pkg_setup -} - -src_prepare() { - epatch \ - "${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch" - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - econf \ - --docdir=/usr/share/doc/${PF} \ - --disable-runtime-deps-check \ - --disable-static \ - $(use_enable policykit polkit) \ - $(use_enable nls) \ - $(use_enable thunar thunar-sendto) -} - -src_install() { - default - - python_fix_shebang "${D}" - rm "${D}"/$(python_get_sitedir)/*.la || die - - use appindicator || { rm "${D}"/$(python_get_sitedir)/${PN}/plugins/applet/AppIndicator.py* || die; } - use pulseaudio || { rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py*,plugins/manager/Pulse*.py*} || die; } -} - -pkg_preinst() { - gnome2_icon_savelist - gnome2_schemas_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - gnome2_schemas_update -} - -pkg_postrm() { - gnome2_icon_cache_update - gnome2_schemas_update -} diff --git a/net-wireless/blueman/metadata.xml b/net-wireless/blueman/metadata.xml index e028100b41ba..65cf63c6b439 100644 --- a/net-wireless/blueman/metadata.xml +++ b/net-wireless/blueman/metadata.xml @@ -10,9 +10,7 @@ </maintainer> <use> <flag name="appindicator">Enable usage of <pkg>dev-libs/libappindicator</pkg> to export menu options</flag> - <flag name="gconf">Enable the GConf configuration backend</flag> <flag name="network">Add functionality to setup (host) PAN connections using either <pkg>net-dns/dnsmasq</pkg> or <pkg>net-misc/dhcp</pkg></flag> - <flag name="sendto">Install the sendto-plugin for <pkg>gnome-base/nautilus</pkg></flag> <flag name="thunar">Install the sendto-plugin for <pkg>xfce-base/thunar</pkg></flag> </use> <upstream> diff --git a/net-wireless/bluez/bluez-5.35.ebuild b/net-wireless/bluez/bluez-5.35.ebuild index 2340b6bedeee..286ec96e8777 100644 --- a/net-wireless/bluez/bluez-5.35.ebuild +++ b/net-wireless/bluez/bluez-5.35.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0/3" -KEYWORDS="amd64 arm ~hppa ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~x86" IUSE="cups debug +obex +readline selinux systemd test +udev" CDEPEND=" diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest index 97adc135c590..e39f94dceb80 100644 --- a/net-wireless/broadcom-sta/Manifest +++ b/net-wireless/broadcom-sta/Manifest @@ -1,7 +1,10 @@ DIST README-broadcom-sta-6.30.223.248.txt 16775 SHA256 e25eaa7e666a361abff679d7518c75200ee4d90f8e5cb16f69af3f033c68811a SHA512 e635629f0a75059fa13b2bd2a756397631bc0add43786b0064d3f0232c9bd42dae394b9631846bf602f6cea628a49928ec2344df453ec5075168736627494020 WHIRLPOOL 4b0923b276bca6c3a0f8b37c903e3cd1b3f9ea37b07ffe308b831e505c691f4b77489abd491cd2c7334fe692846fe797c7d4b0ac63e8786f4190f5c2791e6b46 +DIST README-broadcom-sta-6.30.223.271.txt 16755 SHA256 4d6d63f6eb40f84359be06f1f6f26075827a0d25cdaa364d8ccb6561bf162e34 SHA512 ce277af132b656705aee3f8072d1082bfd2a1b7c63a9e330a470546437d4034e7964c64a4f9c326bf15c5f74b9c09a56d720542a41e5ae6e0d42d335488f31f5 WHIRLPOOL 3a544132315cbbc633ac6b6102d71109fea3b9e7742c299f2fe403ecc43206380051c91353c4d79033ac1939fe862b84cb8e435f06687af804fdc2ad5619beb7 DIST bcmwl-kernel-source_6.30.223.30%2Bbdcom-0ubuntu1%7Eppa1_amd64.deb 1779122 SHA256 de6529ae67f339aee185be93e3c12ffa944ef6b4807d176d6fda661de52136ba SHA512 93b17029538ec17be61902f1e5237a300f532dc88fd7475ac202c249a9cec099c5d170b0ebc043e1bda1987f6f925b6a28d4aa80748218f735a3790ded0565cd WHIRLPOOL 47f54a2fc286e58adef1383496fe3e65430ef643d8e7b8830cb87c0558319780f71944296211c62ccccaa4e3a216019fc5a29dd48903240362c656bb79ae55c2 DIST bcmwl-kernel-source_6.30.223.30%2Bbdcom-0ubuntu1%7Eppa1_i386.deb 1732452 SHA256 d689040ac2ef67b9947f892b52764cd94c2090499747b57d63c2b40c7bc8eabb SHA512 323db5e6c8fc702990d7137bd11d2e8bba7ed073ee8da00125d147872edf90dd051a959198dbdaf92808403cdcfd582f17afb8a6f5e741382d3a0cffd6ce130a WHIRLPOOL db24f078e2639f609021028304e7caf48b9a3737b6fdf4b2522ab74606c6cb0b11a94706978b1fd1acdf66c59e351a4a433cf9e500862931a1e9dce6e5562c01 DIST hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz 1735911 SHA256 d57c33f6bf4ebe68cac67ffe39c2260b8990bb0f07413dfd021dd4db845199a7 SHA512 adb3d9d9375888df3317d6af3d6d45c53412a677e5431051cbfe8c9eac3b13760022fd9b970e77caaeb0fa010ee8bd32ad80076d7279b60719bfb8562c09951f WHIRLPOOL f037e26d7f85d9a1bf3f2638fa6d6bbda43384e24fb249e90afcfff792be8013f1e0f2a1876c4675e39911d4e4877f0ab785eab15f7a6460621fe14c21bab486 DIST hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz 2824762 SHA256 b196543a429c22b2b8d75d0c1d9e6e7ff212c3d3e1f42cc6fd9e4858f01da1ad SHA512 9f067cf5e1be562c78252791c0b2324b568c8533903842e18e92f2b10c3277e1d15ed42a5925acbd443de373f5113d05447b885a8d52ef57695babe48d68a0ff WHIRLPOOL f3bfef5b3dcbf6d051facbda0078a9850a1cf2f851bca07fd7538ffc3d5c0bf118622d217bb7737fdd87825af73b61ddd2d9a52c3d13a8070be02d1a584a8b14 +DIST hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz 2869247 SHA256 4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd SHA512 0361ba30d97bcb1dedf46c11ef1b9a16f09cde3faa6be87b3ccc28679f34183c2fdf511e7c3b5c26b304f6961da454ccf71844b92bbb2f25aa876249496a2f1b WHIRLPOOL c96c21e4d497136c4ac5a8f3f1d3e84a7b5f5478ca7c1276262481d66b919639f475b99783ad993c01c94e380275fdd6eb39dd53f224b43912f7a395cada575c DIST hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz 1786627 SHA256 5f37b2b879e29b220dc64ce2e93d922dc231d4241da03bcbab15ced10e649b4a SHA512 a83defe4553f680b984bf49788377436c5f563f2920c129d87a3930fb6501d0f833d353acf229fa4f67b761e4564428c62bc1c8e3e23c0727d01b8c4f797f6af WHIRLPOOL d1ddc19e29a6927ae0f172613d429a92d5009515b4db1bc188b0ced41ff39565512d4f85721bcf4ddd0a951afadfd7bc303219ed93a20f83e1936a9c82717e47 DIST hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz 2875739 SHA256 3d994cc6c05198f4b6f07a213ac1e9e45a45159899e6c4a7feca5e6c395c3022 SHA512 ce1e9f7f52cd98eaba5cf4ec0c7276bddf3ad906a0111eb236665daca72f36139ca4a8af72658cf91b0eaaa8479e54f5bb3bce77a0cc9bc1966f044b76b8295a WHIRLPOOL 6393507f340f4244d8e40c81102e37f9df0d5dbc0ce4e0fd3ed187ddde6faf3be9bfae59371eb307d031974b5b6d1417c7c11fbdd51b9f3b168ccd83d48276d9 +DIST hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz 2928541 SHA256 5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be SHA512 6855781f7c69a9aecb9461932423688964879d5a4df571f01ae7adaa7bf21a410bef839605d555afb6c8f4eec92fe8510af6cb120930095617ff6cdcccedaf17 WHIRLPOOL 8a905a35581f5c4a1177a3da7356731a360ba5c72e2897d363682afc49b73c46b031776012bba983842b894505d71e6f20f9404120b676e0b79b9ef003342e56 diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r1.ebuild new file mode 100644 index 000000000000..a0fe86a7c5d5 --- /dev/null +++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils linux-info linux-mod + +DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver" +HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php" +SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35" +SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz ) + amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz ) + http://www.broadcom.com/docs/linux_sta/README_${PV}.txt -> README-${P}.txt" + +LICENSE="Broadcom" +KEYWORDS="-* ~amd64 ~x86" + +RESTRICT="mirror" + +DEPEND="virtual/linux-sources" +RDEPEND="" + +S="${WORKDIR}" + +MODULE_NAMES="wl(net/wireless)" +MODULESD_WL_ALIASES=("wlan0 wl") + +pkg_setup() { + # bug #300570 + # NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled + # make checks non-fatal. The correct fix is blackisting ssb and, perhaps + # b43 via udev rules. Moreover, previous fix broke binpkgs support. + CONFIG_CHECK="~!B43 ~!BCMA ~!SSB" + CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP" + ERROR_B43="B43: If you insist on building this, you must blacklist it!" + ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!" + ERROR_SSB="SSB: If you insist on building this, you must blacklist it!" + ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice." + ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!" + ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else." + ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA." + if kernel_is ge 3 8 8; then + CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT" + elif kernel_is ge 2 6 32; then + CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211" + elif kernel_is ge 2 6 31; then + CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211" + elif kernel_is ge 2 6 29; then + CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT COMPAT_NET_DEV_OPS" + else + CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP" + fi + + linux-mod_pkg_setup + + BUILD_PARAMS="-C ${KV_DIR} M=${S}" + BUILD_TARGETS="wl.ko" +} + +src_prepare() { + epatch \ + "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \ + "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \ + "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \ + "${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" \ + "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch" + + epatch_user +} + +src_install() { + linux-mod_src_install + + dodoc "${DISTDIR}/README-${P}.txt" +} diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch new file mode 100644 index 000000000000..9a0e7136c53b --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch @@ -0,0 +1,12 @@ +--- a/src/wl/sys/wl_linux.c 2014-06-26 12:42:08.000000000 +0200 ++++ b/src/wl/sys/wl_linux.c 2015-01-22 01:44:58.580453805 +0100 +@@ -2157,8 +2159,8 @@ + wlif = WL_DEV_IF(dev); + wl = WL_INFO(dev); + ++ skb->prev = NULL; + if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) { +- skb->prev = NULL; + + TXQ_LOCK(wl); + diff --git a/net-wireless/broadcom-sta/metadata.xml b/net-wireless/broadcom-sta/metadata.xml index 81110864a84b..8358ba2fcf65 100644 --- a/net-wireless/broadcom-sta/metadata.xml +++ b/net-wireless/broadcom-sta/metadata.xml @@ -9,6 +9,9 @@ <email>mpagano@gentoo.org</email> <name>Mike Pagano</name> </maintainer> + <maintainer> + <email>tomboy64@sina.cn</email> + </maintainer> <upstream> <remote-id type="launchpad">~albertomilone</remote-id> </upstream> diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch index deb6996784ce..0f340c9566d2 100644 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch +++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch @@ -1,7 +1,8 @@ -diff -Naur wpa_supplicant/dbus/dbus_new_helpers.c wpa_supplicant-fixed/dbus/dbus_new_helpers.c ---- wpa_supplicant/dbus/dbus_new_helpers.c 2015-09-27 15:02:05.000000000 -0400 -+++ wpa_supplicant-fixed/dbus/dbus_new_helpers.c 2015-10-05 18:38:58.489713168 -0400 -@@ -847,7 +847,7 @@ +diff --git a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c +index 45623f3..0fc3d08 100644 +--- a/wpa_supplicant/dbus/dbus_new_helpers.c ++++ b/wpa_supplicant/dbus/dbus_new_helpers.c +@@ -847,7 +847,7 @@ void wpa_dbus_mark_property_changed(struct wpas_dbus_priv *iface, const struct wpa_dbus_property_desc *dsc; int i = 0; diff --git a/perl-core/Unicode-Collate/Manifest b/perl-core/Unicode-Collate/Manifest index ab25b2015d5e..f0f1f7495b66 100644 --- a/perl-core/Unicode-Collate/Manifest +++ b/perl-core/Unicode-Collate/Manifest @@ -1 +1,2 @@ DIST Unicode-Collate-1.12.tar.gz 863579 SHA256 d4a71dca428e1a76a235a0cde8d0c59c85288cc4de9c3dafadb375b2a55f45af SHA512 d09a60450c836ddcdad9d5714827bf54f8115e6c1d2983d1496ee654b87cacadcdbacad4f12343a43ef73090d29236fb98140c5942cc36ceceff6bf337a42eac WHIRLPOOL 2c98584efa51c785e36711f5a425b14c447564c0a35fb02ae2248a96d35ba236cb9ed534cbd8d8f80af899c1db501015a2fe2e98c79291b3c7692ab0154f8334 +DIST Unicode-Collate-1.14.tar.gz 866047 SHA256 628a5bb3b5e81c1d4cdf680bc882f2296a50892860af1800b31e796ee166767a SHA512 a234c7ebb2f92886a68e39b681cb428bf99dd999f6a12ce137b132824072a07a60df3d26a4b147b2ec52c61df4f7c2fab5dad5cb40cce27fdff021cdf8208568 WHIRLPOOL 862769708fce1e60bcc53d5a320af222f9b3d79348ec9d415c0f5bd6f382d9ee39cdcf4b4a71c4ec27b015e78d69e4b4fa55a2ffc86a75b7db7580abeca39cc2 diff --git a/perl-core/Unicode-Collate/Unicode-Collate-1.140.0.ebuild b/perl-core/Unicode-Collate/Unicode-Collate-1.140.0.ebuild new file mode 100644 index 000000000000..f127d1e69243 --- /dev/null +++ b/perl-core/Unicode-Collate/Unicode-Collate-1.140.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 + +MODULE_AUTHOR=SADAHIRO +MODULE_VERSION=1.14 +inherit perl-module + +DESCRIPTION="Unicode Collate Algorithm" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND=" + virtual/perl-Carp + virtual/perl-File-Spec +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker +" + +SRC_TEST="do parallel" diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask index 3f19865eebdd..6a148cf6e845 100644 --- a/profiles/arch/alpha/package.use.mask +++ b/profiles/arch/alpha/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015) +# Tests require non-keyworded qt5 +dev-qt/qtchooser test + # Justin Lecher <jlec@gentoo.org> (14 Oct 2015) # Requires dev-python/ipython which triggers a long dep chain dev-python/restkit cli diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask index a39627db1b6f..bdfd5da68711 100644 --- a/profiles/arch/amd64-fbsd/package.use.mask +++ b/profiles/arch/amd64-fbsd/package.use.mask @@ -2,8 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015) +# Tests require non-keyworded qt5 +dev-qt/qtchooser test + # Johannes Huber <johu@gentoo.org> (28 Jan 2015) -# Missing keyword on dev-libs/botan,dev-libs/pkcs11-helper +# Missing keyword on dev-libs/botan and dev-libs/pkcs11-helper app-crypt/qca botan pkcs11 # Michael Palimaka <kensington@gentoo.org) (26 Dec 2014) diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask index 5961da1f40e6..51e1166a053f 100644 --- a/profiles/arch/arm/package.use.mask +++ b/profiles/arch/arm/package.use.mask @@ -2,6 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# James Le Cuirot <chewi@gentoo.org> (19 Oct 2015) +# Issue with keywording sub-dependency jflex but this should be +# resolved very shortly. Masking this now to unbreak the tree. +dev-java/rhino test + # Pawel Hajdan jr <phajdan.jr@gentoo.org> (15 Oct 2015) # Repoman reports dependency issues on arm. www-client/chromium system-ffmpeg diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask index 8fcdbd216d7b..ce7f7f1921fd 100644 --- a/profiles/arch/arm/package.use.stable.mask +++ b/profiles/arch/arm/package.use.stable.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Michael Palimaka <kensington@gentoo.org> (28 Oct 2015) +# KDE is not stable on arm +media-video/vlc kde + # Pacho Ramos <pacho@gentoo.org> (03 Oct 2015) # Missing stable, bug #529462 media-gfx/graphviz java diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask index 8e4054baf698..59a4b52bb257 100644 --- a/profiles/arch/hppa/use.mask +++ b/profiles/arch/hppa/use.mask @@ -7,11 +7,6 @@ # HPPA has no NUMA support in the kernel numa -# Julian Ospald <hasufell@gentoo.org> (20 Sep 2015) -# no LibreSSL support yet -curl_ssl_libressl -libressl - # Jeroen Roovers <jer@gentoo.org> (3 Feb 2015) # app-misc/geoclue has not been tested on HPPA geoclue diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index b82322e0c510..0f34e846164d 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015) +# Tests require non-keyworded qt5 +dev-qt/qtchooser test + # Justin Lecher <jlec@gentoo.org> (14 Oct 2015) # Requires dev-python/ipython which triggers a long dep chain dev-python/restkit cli diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask index 9697e3c14c87..d2832b079fab 100644 --- a/profiles/arch/mips/package.use.mask +++ b/profiles/arch/mips/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015) +# Tests require non-keyworded qt5 +dev-qt/qtchooser test + # Mike Frysinger <vapier@gentoo.org> (10 Sep 2015) # Requires matplotlib which requires a bit more. dev-python/numpydoc test diff --git a/profiles/arch/powerpc/package.use.force b/profiles/arch/powerpc/package.use.force index d011e8fff45e..846a4b60dbf4 100644 --- a/profiles/arch/powerpc/package.use.force +++ b/profiles/arch/powerpc/package.use.force @@ -15,5 +15,4 @@ net-p2p/sancho-bin java # sci-chemistry/arp-warp-bin is not available for ppc # sci-chemistry/solve-resolve-bin is not available for ppc # sci-chemistry/cns is not available for ppc -sci-chemistry/oasis minimal sci-libs/cctbx minimal diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask index 4a791e4a4d25..89e90cd41353 100644 --- a/profiles/arch/powerpc/package.use.mask +++ b/profiles/arch/powerpc/package.use.mask @@ -2,6 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Pacho Ramos <pacho@gentoo.org> (27 Oct 2015) +# Missing keywords +net-wireless/blueman appindicator + +# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (26 Oct 2015) +# x11-drivers/xf86-video-amdgpu is not keyworded +x11-base/xorg-drivers video_cards_amdgpu + # Bernard Cafarelli <voyageur@gentoo.org> (06 Aug 2015) # Dependencies missing keywords, bug #543604 sys-devel/llvm ocaml @@ -291,12 +299,6 @@ mail-client/claws-mail pda # No media-sound/lilypond here, yet (bug #356069) app-text/asciidoc test -# Kacper Kowalik <xarthisius@gentoo.org> (16 Jan 2011) -# bug 303931 -# dev-lang/icc is not available for ppc -# sci-chemistry/arp-warp-bin is not available for ppc -sci-chemistry/ccp4 arpwarp - # Justin Lecher <jlec@gentoo.org> (01 Nov 2010) # Deps not Keyworded sci-chemistry/apbs fetk diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask index 2f9807c96dfb..e5b68cd4fff6 100644 --- a/profiles/arch/powerpc/ppc32/package.use.mask +++ b/profiles/arch/powerpc/ppc32/package.use.mask @@ -4,6 +4,14 @@ # This file requires >=portage-2.1.1 +# Anthony G. Basile <blueness@gentoo.org> (26 Oct 2015) +# Mask x265 on vlc for bug #564138 +media-video/vlc x265 + +# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015) +# Tests require non-keyworded qt5 +dev-qt/qtchooser test + # Ben de Groot <yngwin@gentoo.org> (20 Jul 2015) # missing keyword media-sound/audacity midi diff --git a/profiles/arch/powerpc/ppc64/64le/eapi b/profiles/arch/powerpc/ppc64/64le/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/arch/powerpc/ppc64/64le/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/powerpc/ppc64/64le/make.defaults b/profiles/arch/powerpc/ppc64/64le/make.defaults new file mode 100644 index 000000000000..3f18179c2231 --- /dev/null +++ b/profiles/arch/powerpc/ppc64/64le/make.defaults @@ -0,0 +1,9 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +CHOST="powerpc64le-unknown-linux-gnu" +CFLAGS="-O2 -pipe" +CXXFLAGS="${CFLAGS}" +FFLAGS="${CFLAGS}" +FCFLAGS="${CFLAGS}" diff --git a/profiles/arch/powerpc/ppc64/64le/parent b/profiles/arch/powerpc/ppc64/64le/parent new file mode 100644 index 000000000000..00012cfe73e4 --- /dev/null +++ b/profiles/arch/powerpc/ppc64/64le/parent @@ -0,0 +1,2 @@ +../../../../features/64bit-native +.. diff --git a/profiles/arch/sparc/package.mask b/profiles/arch/sparc/package.mask index 42415f28a687..6421c9f3ed4c 100644 --- a/profiles/arch/sparc/package.mask +++ b/profiles/arch/sparc/package.mask @@ -2,6 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Patrice Clement <monsieurp@gentoo.org> (30 Oct 2015) +# Requires dependencies that are not stable on sparc yet. +# See https://qa-reports.gentoo.org/output/gentoo-ci/7182f7a/5.html#l2294 +mail-mta/postfix + # Raúl Porcel <armin76@gentoo.org> (17 Nov 2014) # Mask sys-devel/kgcc64 since >=gcc-4.4 can build 64bit kernels sys-devel/kgcc64 diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index 0bea619cb06f..669c685e5595 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015) +# Tests require non-keyworded qt5 +dev-qt/qtchooser test + # Sergey Popov <pinkbyte@gentoo.org> (24 Oct 2015) # Not tested net-mail/dovecot lz4 diff --git a/profiles/arch/x86-fbsd/package.use.mask b/profiles/arch/x86-fbsd/package.use.mask index 79f20d5f9765..115e8178126a 100644 --- a/profiles/arch/x86-fbsd/package.use.mask +++ b/profiles/arch/x86-fbsd/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015) +# Tests require non-keyworded qt5 +dev-qt/qtchooser test + # Johannes Huber <johu@gentoo.org> (28 Jan 2015) # Missing keyword on dev-libs/botan app-crypt/qca botan diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 4d49b915e6b5..20235c59b89b 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -57,10 +57,6 @@ sci-libs/gdal ruby # See bug #480574 media-libs/mlt ruby -# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (02 Sep 2015) -# x11-drivers/xf86-video-amdgpu is not keyworded on most arches -x11-base/xorg-drivers video_cards_amdgpu - # Andreas K. Huettel <dilfridge@gentoo.org> (1 Sep 2015) # Currently broken upstream. We still hope it will get fixed. app-office/libreoffice telepathy @@ -156,10 +152,6 @@ www-apps/venus test # dev-java/sun-j2me-bin is going away. dev-java/proguard j2me -# Christoph Junghans <ottxor@gentoo.org> (03 Apr 2015) -# >=~sys-devel/dragonegg-3.6 is broken (bug #543644) -sys-devel/byfl dragonegg - # Lars Wendler <polynomial-c@gentoo.org> (19 Mar 2015) # >=games-strategy/freeciv-2.5.0 requires >=dev-lang/lua-5.2 # No stable qt5 yet. diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask index 159c1812431b..bf96aa8c8892 100644 --- a/profiles/base/package.use.stable.mask +++ b/profiles/base/package.use.stable.mask @@ -5,6 +5,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in package.use.mask +# Justin Lecher <jlec@gentoo.org> (27 Oct 2015) +# No stable dev-python/PyQt5 for now +dev-python/matplotlib qt5 + # Mike Gilbert <floppym@gentoo.org> (03 Oct 2015) # Unmask python3.5 for python-exec dev-lang/python-exec -python_targets_python3_5 diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask index cc70abdf5c1a..b830e7cc8c6f 100644 --- a/profiles/default/linux/package.use.mask +++ b/profiles/default/linux/package.use.mask @@ -38,10 +38,6 @@ net-p2p/fms frost # upstream will not fix this problem soon media-video/rtmpdump polarssl -# Anthony G. Basile <blueness@gentoo.org> (10 Aug 2013) -# mask php and mono bindings pending more testing -=dev-libs/xapian-bindings-1.3.1 php mono - # Diego Elio Pettenò (27 Aug 2012) # The libpci access is only used for linux. net-analyzer/net-snmp -pci diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/parent new file mode 100644 index 000000000000..64683a942ea2 --- /dev/null +++ b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../arch/powerpc/ppc64/64le diff --git a/profiles/default/linux/uclibc/amd64/make.defaults b/profiles/default/linux/uclibc/amd64/make.defaults index 3e8b3eb0f8a0..5170460cad7b 100644 --- a/profiles/default/linux/uclibc/amd64/make.defaults +++ b/profiles/default/linux/uclibc/amd64/make.defaults @@ -16,7 +16,7 @@ FCFLAGS="${CFLAGS}" ABI="amd64" DEFAULT_ABI="amd64" MULTILIB_ABIS="amd64" -CHOST_amd64=${CHOST} +CHOST_amd64="${CHOST}" LIBDIR_amd64="lib" IUSE_IMPLICIT="abi_x86_64" diff --git a/profiles/default/linux/uclibc/arm/make.defaults b/profiles/default/linux/uclibc/arm/make.defaults index 943fc5056da1..1b3c79cf4ac2 100644 --- a/profiles/default/linux/uclibc/arm/make.defaults +++ b/profiles/default/linux/uclibc/arm/make.defaults @@ -10,3 +10,11 @@ CFLAGS="-O2" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" + +# Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015) +# Multilib-related setup, bug #515130 +ABI="arm" +DEFAULT_ABI="arm" +MULTILIB_ABIS="arm" +CHOST_arm="${CHOST}" +LIBDIR_arm="lib" diff --git a/profiles/default/linux/uclibc/mips/make.defaults b/profiles/default/linux/uclibc/mips/make.defaults index 83ecdce523ab..1a0e9303fde1 100644 --- a/profiles/default/linux/uclibc/mips/make.defaults +++ b/profiles/default/linux/uclibc/mips/make.defaults @@ -16,6 +16,6 @@ FCFLAGS="${CFLAGS}" ABI="o32" DEFAULT_ABI="o32" MULTILIB_ABIS="o32" -CHOST_o32=${CHOST} +CHOST_o32="${CHOST}" LIBDIR_o32="lib" IUSE_IMPLICIT="abi_mips_o32" diff --git a/profiles/default/linux/uclibc/mips/mipsel/make.defaults b/profiles/default/linux/uclibc/mips/mipsel/make.defaults index 63552029022c..cfb232d1cf52 100644 --- a/profiles/default/linux/uclibc/mips/mipsel/make.defaults +++ b/profiles/default/linux/uclibc/mips/mipsel/make.defaults @@ -3,4 +3,4 @@ # $Id$ CHOST="mipsel-gentoo-linux-uclibc" -CHOST_o32=${CHOST} +CHOST_o32="${CHOST}" diff --git a/profiles/default/linux/uclibc/mips/package.use.mask b/profiles/default/linux/uclibc/mips/package.use.mask index e06a9432e54d..807c6db77727 100644 --- a/profiles/default/linux/uclibc/mips/package.use.mask +++ b/profiles/default/linux/uclibc/mips/package.use.mask @@ -1,9 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015) +# Tests require non-keyworded qt5 +dev-qt/qtchooser test + # Anthony G. Basile <blueness@gentoo.org> (10 Sep 2015) -# # seccomp code is currently broken, bug #560098 +# seccomp code is currently broken, bug #560098 app-misc/pax-utils seccomp # Matthias Maier <tamiko@gentoo.org> (24 Dec 2014) diff --git a/profiles/default/linux/uclibc/mips/packages.build b/profiles/default/linux/uclibc/mips/packages.build new file mode 100644 index 000000000000..8b4519b65a09 --- /dev/null +++ b/profiles/default/linux/uclibc/mips/packages.build @@ -0,0 +1,5 @@ +# Copyright 1999-2014 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +dev-libs/libintl diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask index c922c72230a2..7aabfa878e66 100644 --- a/profiles/default/linux/uclibc/package.mask +++ b/profiles/default/linux/uclibc/package.mask @@ -6,6 +6,9 @@ sys-libs/musl sys-libs/glibc sys-libs/pam +# DT_RUNPATH is broken on uclibc, bug #561684 +>sys-devel/binutils-config-4-r2 + # We use eudev which is tested on both uclibc and musl sys-apps/systemd sys-fs/udev diff --git a/profiles/default/linux/uclibc/ppc/make.defaults b/profiles/default/linux/uclibc/ppc/make.defaults index 2610601e791a..1ffb33c58008 100644 --- a/profiles/default/linux/uclibc/ppc/make.defaults +++ b/profiles/default/linux/uclibc/ppc/make.defaults @@ -16,6 +16,6 @@ FCFLAGS="${CFLAGS}" ABI="ppc" DEFAULT_ABI="ppc" MULTILIB_ABIS="ppc" -CHOST_ppc=${CHOST} +CHOST_ppc="${CHOST}" LIBDIR_ppc="lib" IUSE_IMPLICIT="abi_ppc_32" diff --git a/profiles/default/linux/uclibc/ppc/package.use.mask b/profiles/default/linux/uclibc/ppc/package.use.mask index 8beeb390a47e..f262e5d438a4 100644 --- a/profiles/default/linux/uclibc/ppc/package.use.mask +++ b/profiles/default/linux/uclibc/ppc/package.use.mask @@ -1,6 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation. +# Copyright 1999-2015 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015) +# Tests require non-keyworded qt5 +dev-qt/qtchooser test + dev-libs/libpcre cxx sys-libs/ncurses cxx diff --git a/profiles/default/linux/uclibc/x86/make.defaults b/profiles/default/linux/uclibc/x86/make.defaults index 07738439f38a..17f8085afcb7 100644 --- a/profiles/default/linux/uclibc/x86/make.defaults +++ b/profiles/default/linux/uclibc/x86/make.defaults @@ -16,7 +16,7 @@ FCFLAGS="${CFLAGS}" ABI="x86" DEFAULT_ABI="x86" MULTILIB_ABIS="x86" -CHOST_x86=${CHOST} +CHOST_x86="${CHOST}" LIBDIR_x86="lib" IUSE_IMPLICIT="abi_x86_32" diff --git a/profiles/hardened/linux/musl/amd64/make.defaults b/profiles/hardened/linux/musl/amd64/make.defaults index ee429b6bfd5a..d178ceab3765 100644 --- a/profiles/hardened/linux/musl/amd64/make.defaults +++ b/profiles/hardened/linux/musl/amd64/make.defaults @@ -16,7 +16,7 @@ FCFLAGS="${CFLAGS}" ABI="amd64" DEFAULT_ABI="amd64" MULTILIB_ABIS="amd64" -CHOST_amd64=${CHOST} +CHOST_amd64="${CHOST}" LIBDIR_amd64="lib" IUSE_IMPLICIT="abi_x86_64" diff --git a/profiles/hardened/linux/musl/amd64/x32/make.defaults b/profiles/hardened/linux/musl/amd64/x32/make.defaults index cf5a09254092..41eab4ef9c4f 100644 --- a/profiles/hardened/linux/musl/amd64/x32/make.defaults +++ b/profiles/hardened/linux/musl/amd64/x32/make.defaults @@ -9,6 +9,6 @@ CHOST="x86_64-gentoo-linux-muslx32" ABI="x32" DEFAULT_ABI="x32" MULTILIB_ABIS="x32" -CHOST_x32=${CHOST} +CHOST_x32="${CHOST}" LIBDIR_x32="lib" IUSE_IMPLICIT="abi_x86_x32" diff --git a/profiles/hardened/linux/musl/arm/make.defaults b/profiles/hardened/linux/musl/arm/make.defaults index b747d8716372..762b83bd7a30 100644 --- a/profiles/hardened/linux/musl/arm/make.defaults +++ b/profiles/hardened/linux/musl/arm/make.defaults @@ -10,3 +10,11 @@ CFLAGS="-O2" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" + +# Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015) +# Multilib-related setup, bug #515130 +ABI="arm" +DEFAULT_ABI="arm" +MULTILIB_ABIS="arm" +CHOST_arm="${CHOST}" +LIBDIR_arm="lib" diff --git a/profiles/hardened/linux/musl/mips/make.defaults b/profiles/hardened/linux/musl/mips/make.defaults index 04c30a65e93d..eb625b931268 100644 --- a/profiles/hardened/linux/musl/mips/make.defaults +++ b/profiles/hardened/linux/musl/mips/make.defaults @@ -16,6 +16,6 @@ FCFLAGS="${CFLAGS}" ABI="o32" DEFAULT_ABI="o32" MULTILIB_ABIS="o32" -CHOST_o32=${CHOST} +CHOST_o32="${CHOST}" LIBDIR_o32="lib" IUSE_IMPLICIT="abi_mips_o32" diff --git a/profiles/hardened/linux/musl/mips/mipsel/make.defaults b/profiles/hardened/linux/musl/mips/mipsel/make.defaults index f24306b9244a..42455023951c 100644 --- a/profiles/hardened/linux/musl/mips/mipsel/make.defaults +++ b/profiles/hardened/linux/musl/mips/mipsel/make.defaults @@ -3,7 +3,7 @@ # $Id$ CHOST="mipsel-gentoo-linux-musl" -CHOST_o32=${CHOST} +CHOST_o32="${CHOST}" # Disable sandbox because its currently broken on mipsel-musl FEATURES="-sandbox" diff --git a/profiles/hardened/linux/musl/packages.build b/profiles/hardened/linux/musl/packages.build index 5042e0489b29..d62198d24693 100644 --- a/profiles/hardened/linux/musl/packages.build +++ b/profiles/hardened/linux/musl/packages.build @@ -6,4 +6,6 @@ # a stage 1 based on this profile. dev-util/pkgconf +sys-apps/attr sys-apps/sandbox +dev-python/pyxattr diff --git a/profiles/hardened/linux/musl/ppc/make.defaults b/profiles/hardened/linux/musl/ppc/make.defaults index fb93eadb01b7..e64479841140 100644 --- a/profiles/hardened/linux/musl/ppc/make.defaults +++ b/profiles/hardened/linux/musl/ppc/make.defaults @@ -14,6 +14,6 @@ FCFLAGS="${CFLAGS}" ABI="ppc" DEFAULT_ABI="ppc" MULTILIB_ABIS="ppc" -CHOST_ppc=${CHOST} +CHOST_ppc="${CHOST}" LIBDIR_ppc="lib" IUSE_IMPLICIT="abi_ppc_32" diff --git a/profiles/hardened/linux/musl/x86/make.defaults b/profiles/hardened/linux/musl/x86/make.defaults index 9007af355c6d..4ee83085aad7 100644 --- a/profiles/hardened/linux/musl/x86/make.defaults +++ b/profiles/hardened/linux/musl/x86/make.defaults @@ -16,7 +16,7 @@ FCFLAGS="${CFLAGS}" ABI="x86" DEFAULT_ABI="x86" MULTILIB_ABIS="x86" -CHOST_x86=${CHOST} +CHOST_x86="${CHOST}" LIBDIR_x86="lib" IUSE_IMPLICIT="abi_x86_32" diff --git a/profiles/hardened/linux/package.mask b/profiles/hardened/linux/package.mask index ba917fdb9eff..8d82d3a398df 100644 --- a/profiles/hardened/linux/package.mask +++ b/profiles/hardened/linux/package.mask @@ -31,3 +31,6 @@ app-crypt/hmaccalc # due to C99 struct init requirement by hardened kernels, # see bug 540196 comment 9. net-fs/openafs-kernel + +# Crashes immediately on start. bug 560666 +=www-client/qutebrowser-0.4.1 diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask index bf28f291960a..a644d4f5702a 100644 --- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask +++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask @@ -1,7 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015) +# Tests require non-keyworded qt5 +dev-qt/qtchooser test + # Kacper Kowalik <xarthisius@gentoo.org> (25 Apr 2012) # Masking due to unsolved dependencies app-admin/puppet rrdtool diff --git a/profiles/package.mask b/profiles/package.mask index ace39767c6f5..6b975bde2a87 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,37 @@ #--- END OF EXAMPLES --- +# Michał Górny <mgorny@gentoo.org> (30 Oct 2015) +# Uses unsafe ioctls that could result in data corruption. Upstream +# is working on replacing them in the wip/dedup-syscall branch. +# Keep it masked until they are done. sys-fs/duperemove is +# the suggested replacement for the meantime. +sys-fs/bedup + +# James Le Cuirot <chewi@gentoo.org> (29 Oct 2015) +# Dead project with no revdeps. Removal in 30 days. +dev-java/flute + +# Patrice Clement <monsieurp@gentoo.org> (29 Oct 2015) +# Upstream is somewhat alive but there are better XML parsers out there. +# Removal in 30 days. See #268619. +dev-java/castor + +# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (29 Oct 2015) +# Mask until it is decided how to address xorg-server file collisions #564358 +=x11-drivers/xf86-input-evdev-2.10.0 + +# Patrice Clement <monsieurp@gentoo.org> (29 Oct 2015) +# No release since 2007. Has dependencies on old ebuilds. +# Removal in 30 days. See #564370 +dev-db/octopus + +# Ian Delaney <idella4@gentoo.org> (27 Oct 2015) +# fails to build dev-lisp/sbcl-1.2.16 #563812 +# mgorny: dev-lisp/uiop as version-bound revdep +=dev-lisp/asdf-3.1.6 +=dev-lisp/uiop-3.1.6 + # Justin Lecher <jlec@gentoo.org> (23 Oct 2015) # Breaking changes #563540 =app-text/ghostscript-gpl-9.18 @@ -107,35 +138,11 @@ dev-java/commons-grant =sys-kernel/vanilla-sources-4.1.9 =sys-kernel/gentoo-sources-4.1.9 -# Patrice Clement <monsieurp@gentoo.org> (1 Oct 2015) -# Project is over 10 years old and seems to have stalled. -# Masked for removal in 30 days. See bug 561954. -dev-java/xmlc - # Andreas K. Huettel <dilfridge@gentoo.org> (27 Sep 2015) # Dead upstream, buggy, effectively unmaintained. Removal # in 30 days. app-emulation/vmware-view-open-client -# James Le Cuirot <chewi@gentoo.org> (27 Sep 2015) -# No release since 2007 and no revdeps. Removal in 30 days. -dev-java/commons-transaction - -# James Le Cuirot <chewi@gentoo.org> (27 Sep 2015) -# A string of interdependent obsolete Java packages. hibernate and -# axis are alive upstream but we have no immediate plans to bump -# them. hibernate has also been modularized so would now be called -# hibernate-core anyway. Removal in 30 days. -dev-java/commons-modeler -dev-java/hibernate -dev-java/hibernate-annotations -dev-java/jax-rpc -dev-java/mx4j -dev-java/mx4j-core -dev-java/mx4j-tools -dev-java/proxool -www-servers/axis:1 - # Dion Moult <moult@gentoo.org> (24 Sep 2015) # Masked for removal in 30 days. Bug #466724 # Heavily out of date. Use sci-chemistry/icm @@ -219,21 +226,6 @@ dev-lang/gpc # app-forensics/afl instead. Bug #544794 dev-util/bunny -# Michael Orlitzky <mjo@gentoo.org> (21 Sep 2015) -# Mask for removal in 30 days. Obsolete. Bug #561040. -dev-php/smarty-docs - -# Ian Delaney <idella4@gentoo.org> (21 Jul 2015) -# Packages deprecated in favour of new form of -# net-firewall/shorewall -# Bug #560392 -net-firewall/shorewall-core -net-firewall/shorewall-init -net-firewall/shorewall-lite -net-firewall/shorewall6 -net-firewall/shorewall6-lite -<net-firewall/shorewall-4.6.10.1 - # Andreas K. Huettel <dilfridge@gentoo.org> (19 Sep 2015) # Masked for security reasons, bugs 516044, 552644 # Keeping it in the tree for now for users who cannot upgrade @@ -241,41 +233,6 @@ net-firewall/shorewall6-lite =app-emulation/vmware-workstation-9* =app-emulation/vmware-modules-271* -# Justin Lecher <jlec@gentoo.org> (15 Sep 2015) -# Outdated and multiple bugs -# Use upstream installer for up to version -dev-libs/libjwc_c -dev-libs/libjwc_f -sci-chemistry/arp-warp-bin -sci-chemistry/balbes -sci-chemistry/ccp4 -sci-chemistry/ccp4-apps -sci-chemistry/ccp4i -<sci-chemistry/coot-0.8 -sci-chemistry/imosflm -sci-chemistry/makecif -sci-chemistry/molrep -sci-chemistry/mosflm -sci-chemistry/mrbump -sci-chemistry/oasis -sci-chemistry/pdb-extract -sci-chemistry/pointless -sci-chemistry/refmac -sci-chemistry/scala -sci-chemistry/sfcheck -sci-chemistry/solve-resolve-bin -sci-chemistry/xdsi -sci-chemistry/xia2 -sci-libs/balbes-db -sci-libs/cctbx -<sci-libs/coot-data-3 -sci-libs/ccp4-libs -<=sci-libs/clipper-2.1_p100511-r1 -<sci-libs/mmdb-1.25.5-r1:0 -<sci-libs/monomer-db-5.41 -<sci-libs/ssm-1.4 -x11-libs/libxdl_view - # Michał Górny <mgorny@gentoo.org> (09 Sep 2015) # Package to be used with gentoo-x86 CVS, so pretty much defunct now. # Removal in 30 days. Bug #560056. @@ -389,11 +346,17 @@ app-emulation/emul-linux-x86-jna # Justin Lecher <jlec@gentoo.org> (28 Feb 2015) # Unfixed security problems +# No upstream support anymore # CVE-2015-{0219,0220,0221,0222,5145} # #536586 # #554864 +=dev-python/django-1.4* =dev-python/django-1.5* =dev-python/django-1.6* +# Not supported by any django version upstream supports +dev-python/south +dev-python/Djblets +dev-util/reviewboard # Michał Górny <mgorny@gentoo.org> (11 Feb 2015) # Potentially destructive to @world, bug #539746. @@ -407,10 +370,6 @@ app-emulation/emul-linux-x86-jna # Mask live ebuild =dev-util/radare2-9999 -# Anthony G. Basile <blueness@gentoo.org> (28 Jan 2015) -# Its broken and we're waiting for fixes from upstream, bug #536196 -=net-misc/tor-0.2.6.2_alpha-r1 - # Anthony G. Basile <blueness@gentoo.org> (9 Jan 2015) # p.mask the -9999 version =dev-misc/i2pd-9999 @@ -475,10 +434,6 @@ www-apps/trac-downloads # someone needs to investigate. >=net-libs/libzrtpcpp-4 -# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (03 Sep 2014) -# Temporary mask until it is verified to work -=media-libs/raspberrypi-userland-0_pre20140830 - # Christian Faulhammer <fauli@gentoo.org> (02 Sep 2014) # website not working anymore and will stay like this, # tool is useless. See bug 504734 diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 9274218a35d8..39d74f3b8ec0 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -131,6 +131,7 @@ ppc64 default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/sy ppc64 default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde stable ppc64 default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde/systemd stable ppc64 default/linux/powerpc/ppc64/13.0/64bit-userland/developer stable +ppc64 default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian exp # RISC-V Profiles riscv default/linux/riscv/13.0 exp diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors index 23d8fd26daa6..07378815c58f 100644 --- a/profiles/thirdpartymirrors +++ b/profiles/thirdpartymirrors @@ -12,7 +12,7 @@ gimp http://de-mirror.gimper.net/pub/gimp/ http://gimp.afri.cc/pub/gimp/ http:/ github https://github.com/downloads gmt ftp://mirror.geosci.usyd.edu.au/pub/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ibis.grdl.noaa.gov/pub/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.iag.usp.br/pub/gmt/ ftp://ftp.geologi.uio.no/pub/gmt/ gnome http://download.gnome.org/ -gnu http://ftp.gnu.org/gnu/ ftp://ftp.gnu.org/gnu/ ftp://gnu.mirror.iweb.com http://gnu.mirror.iweb.com ftp://mirror.vexxhost.com/gnu/ http://gnu.mirror.vexxhost.com/ ftp://gnu.opencube.ca/ http://gnu.opencube.ca/ http://mirror.sdunix.com/gnu/ ftp://mirrors.kernel.org/gnu/ http://mirrors.kernel.org/gnu/ http://open-source-box.org/ ftp://open-source-box.org/gnu/ http://gnu.mirrors.hoobly.com/gnu/ http://mirror.easthsia.com/gnu http://mirror.keystealth.org/gnu/ ftp://mirror.keystealth.org/gnu/ http://gnu.mirrorcatalogs.com/ ftp://gnu.mirrorcatalogs.com/gnu/ http://mirrors.axint.net/repos/gnu.org/ http://mirrors.syringanetworks.net/gnu/ ftp://mirrors.syringanetworks.net/gnu/ http://mirror.team-cymru.org/gnu/ ftp://mirror.team-cymru.org/gnu/ ftp://mirror.anl.gov/pub/gnu/ http://mirror.anl.gov/pub/gnu/ http://mirror.thecodefactory.org/gnu/ http://gnu.askapache.com/ ftp://aeneas.mit.edu/pub/gnu/ http://ftp.wayne.edu/gnu/ http://mirror.nexcess.net/gnu/ http://psg.mtu.edu/pub/gnu/ ftp://psg.mtu.edu/pub/gnu/ http://gnu.mirror.constant.com/ ftp://spinellicreations.com/gnu/ http://mirror.clarkson.edu/gnu/ http://mirrors.ibiblio.org/pub/mirrors/gnu/ftp/gnu/ http://mirrors.zerg.biz/gnu/ http://reflection.oss.ou.edu/gnu/gnu/ ftp://reflection.oss.ou.edu/gnu/gnu/ http://gnu.mirrors.pair.com/gnu/ ftp://gnu.mirrors.pair.com/gnu/gnu/ ftp://ftp.unicamp.br/pub/gnu/ http://gnu.c3sl.ufpr.br/ftp/ http://mirror.nbtelecom.com.br/gnu/ http://mirror.cedia.org.ec/gnu/ ftp://mirror.cedia.org.ec/gnu http://download.polytechnic.edu.na/pub/ftp.gnu.org/gnu/ http://mirror.is.co.za/mirror/ftp.gnu.org/gnu/ ftp://ftp.is.co.za/mirror/ftp.gnu.org/gnu/ http://gnu.afri.cc/ http://mirrors.ispros.com.bd/gnu http://mirror.bjtu.edu.cn/gnu/ http://mirrors.ustc.edu.cn/gnu/ ftp://mirrors.ustc.edu.cn/gnu/ http://mirror.hust.edu.cn/gnu/ http://infinity.kmeacollege.ac.in/gnu/ ftp://infinity.kmeacollege.ac.in/gnu/ http://gnumirror.nkn.in/ http://ftp.jaist.ac.jp/pub/GNU/ http://mirror.jre655.com/GNU ftp://mirror.jre655.com/GNU http://public.p-knowledge.co.jp/gnu-mirror/gnu/ http://ftp.kaist.ac.kr/gnu/gnu/ http://ossm.utm.my/gnu/ http://mirror.squ.edu.om/gnu/ http://ftp.twaren.net/Unix/GNU/gnu/ ftp://ftp.twaren.net/Unix/GNU/gnu/ http://ftp.yzu.edu.tw/gnu/ ftp://ftp.yzu.edu.tw/gnu/ http://mirror.aarnet.edu.au/pub/gnu/ ftp://mirror.aarnet.edu.au/pub/gnu/ http://gnu.mirror.uber.com.au/ ftp://gd.tuwien.ac.at/gnu/gnusrc/ http://gd.tuwien.ac.at/gnu/gnusrc/ http://tweedo.com/mirror/gnu/ http://gnu.cu.be/ http://ftp.download-by.net/gnu/gnu/ http://mirrors.dotsrc.org/gnu/ ftp://mirrors.dotsrc.org/gnu/ ftp://ftp.funet.fi/pub/gnu/prep/ http://www.nic.funet.fi/pub/gnu/ftp.gnu.org/pub/gnu/ http://mirror.bbln.org/gnu ftp://mirror.bbln.org/gnu http://mirror.ibcp.fr/pub/gnu/ ftp://ftp.igh.cnrs.fr/pub/gnu/ http://ftp.igh.cnrs.fr/pub/gnu/ http://gnu.cardse.net/ ftp://www.artfiles.org/gnu.org/ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ ftp://ftp.cs.tu-berlin.de/pub/gnu/ http://ftp.halifax.rwth-aachen.de/gnu/ ftp://ftp.halifax.rwth-aachen.de/gnu/ http://ftp.u-tx.net/gnu/ ftp://ftp.u-tx.net/gnu/ ftp://ftp.informatik.rwth-aachen.de/pub/gnu/ http://ftp.hosteurope.de/mirror/ftp.gnu.org/gnu/ http://mirror.checkdomain.de/gnu ftp://mirror.checkdomain.de/gnu http://mirror3.layerjet.com/gnu/ http://ftp.hawo.stw.uni-erlangen.de/gnu ftp://ftp.hawo.stw.uni-erlangen.de/gnu http://mirror.netcologne.de/gnu ftp://mirror.netcologne.de/gnu ftp://ftp.cc.uoc.gr/mirrors/gnu/ http://ftp.cc.uoc.gr/mirrors/gnu/ ftp://ftp.ntua.gr/pub/gnu/ ftp://ftp.heanet.ie/pub/gnu/ http://ftp.heanet.ie/mirrors/gnu/ http://mirror2.mirror.garr.it/mirrors/gnuftp/gnu/ http://mirrors.muzzy.it/gnu ftp://mirrors.muzzy.it/gnu ftp://ftp.mirror.nl/pub/mirror/gnu/ ftp://ftp.nluug.nl/pub/gnu/ http://gnu.xl-mirror.nl/ http://mirror.arbitrary.nl/gnu/ http://ftp.snt.utwente.nl/pub/software/gnu/ ftp://ftp.snt.utwente.nl/pub/software/gnu/ ftp://ftp.uninett.no/pub/gnu/ http://gnuftp.uib.no/ ftp://gnuftp.uib.no/pub/gnuftp/ http://ftp.task.gda.pl/pub/gnu/ ftp://ftp.task.gda.pl/pub/gnu/ ftp://sunsite.icm.edu.pl/pub/gnu/ ftp://mirrors.nfsi.pt/pub/gnu/ http://mirrors.nfsi.pt/gnu/ ftp://mirrors.fe.up.pt/pub/gnu/ http://mirrors.fe.up.pt/pub/gnu/ http://gnu.mirrors.linux.ro/ ftp://gnu.mirrors.linux.ro/gnu/ http://mirror.tochlab.net/pub/gnu/ ftp://mirror.tochlab.net/pub/gnu/ http://mirror.sbb.rs/gnu/ ftp://mirror.sbb.rs/gnu/ http://gnu.prunk.si http://mirror.lihnidos.org/GNU/ftp/gnu/ http://ftp.gul.es/gnu/ftp.gnu.org/gnu/ ftp://ftp.gul.es/gnu/ftp.gnu.org/gnu/ http://ftp.rediris.es/mirror/GNU/gnu/ ftp://ftp.rediris.es/mirror/GNU/gnu/ http://217.160.6.133/Asturies/GNU/gnu/ ftp://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://mirror.switch.ch/ftp/mirror/gnu/ ftp://mirror.switch.ch/mirror/gnu/ http://mirror.rackdc.com/gnu/ ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://ftp.gnu.org.ua/gnu/ ftp://ftp.gnu.org.ua/gnu/ http://ftp-gnu-org.ip-connect.vn.ua/ ftp://ftp-gnu-org.ip-connect.vn.ua/mirror/ftp.gnu.org/ http://mirror.lagoon.nc/pub/gnu/ ftp://mirror.lagoon.nc/pub/gnu/ +gnu http://ftp.gnu.org/gnu/ ftp://ftp.gnu.org/gnu/ ftp://gnu.mirror.iweb.com http://gnu.mirror.iweb.com ftp://mirror.vexxhost.com/gnu/ http://gnu.mirror.vexxhost.com/ ftp://gnu.opencube.ca/ http://gnu.opencube.ca/ http://mirror.sdunix.com/gnu/ ftp://mirrors.kernel.org/gnu/ http://mirrors.kernel.org/gnu/ http://open-source-box.org/ ftp://open-source-box.org/gnu/ http://gnu.mirrors.hoobly.com/gnu/ http://mirror.easthsia.com/gnu http://mirror.keystealth.org/gnu/ ftp://mirror.keystealth.org/gnu/ http://gnu.mirrorcatalogs.com/ ftp://gnu.mirrorcatalogs.com/gnu/ http://mirrors.axint.net/repos/gnu.org/ http://mirrors.syringanetworks.net/gnu/ ftp://mirrors.syringanetworks.net/gnu/ http://mirror.team-cymru.org/gnu/ ftp://mirror.team-cymru.org/gnu/ ftp://mirror.anl.gov/pub/gnu/ http://mirror.anl.gov/pub/gnu/ http://mirror.thecodefactory.org/gnu/ http://gnu.askapache.com/ ftp://aeneas.mit.edu/pub/gnu/ http://ftp.wayne.edu/gnu/ http://mirror.nexcess.net/gnu/ http://psg.mtu.edu/pub/gnu/ ftp://psg.mtu.edu/pub/gnu/ http://gnu.mirror.constant.com/ ftp://spinellicreations.com/gnu/ http://mirror.clarkson.edu/gnu/ http://mirrors.ibiblio.org/pub/mirrors/gnu/ftp/gnu/ http://mirrors.zerg.biz/gnu/ http://reflection.oss.ou.edu/gnu/gnu/ ftp://reflection.oss.ou.edu/gnu/gnu/ http://gnu.mirrors.pair.com/gnu/ ftp://gnu.mirrors.pair.com/gnu/gnu/ ftp://ftp.unicamp.br/pub/gnu/ http://gnu.c3sl.ufpr.br/ftp/ http://mirror.nbtelecom.com.br/gnu/ http://mirror.cedia.org.ec/gnu/ ftp://mirror.cedia.org.ec/gnu http://download.polytechnic.edu.na/pub/ftp.gnu.org/gnu/ http://mirror.is.co.za/mirror/ftp.gnu.org/gnu/ ftp://ftp.is.co.za/mirror/ftp.gnu.org/gnu/ http://gnu.afri.cc/ http://mirrors.ispros.com.bd/gnu http://mirror.bjtu.edu.cn/gnu/ http://mirrors.ustc.edu.cn/gnu/ ftp://mirrors.ustc.edu.cn/gnu/ http://mirror.hust.edu.cn/gnu/ http://infinity.kmeacollege.ac.in/gnu/ ftp://infinity.kmeacollege.ac.in/gnu/ http://gnumirror.nkn.in/ http://ftp.jaist.ac.jp/pub/GNU/ http://mirror.jre655.com/GNU ftp://mirror.jre655.com/GNU http://public.p-knowledge.co.jp/gnu-mirror/gnu/ http://ftp.kaist.ac.kr/gnu/gnu/ http://ossm.utm.my/gnu/ http://mirror.squ.edu.om/gnu/ http://ftp.twaren.net/Unix/GNU/gnu/ ftp://ftp.twaren.net/Unix/GNU/gnu/ http://ftp.yzu.edu.tw/gnu/ ftp://ftp.yzu.edu.tw/gnu/ http://mirror.aarnet.edu.au/pub/gnu/ ftp://mirror.aarnet.edu.au/pub/gnu/ http://gnu.mirror.uber.com.au/ ftp://gd.tuwien.ac.at/gnu/gnusrc/ http://gd.tuwien.ac.at/gnu/gnusrc/ http://tweedo.com/mirror/gnu/ http://gnu.cu.be/ http://ftp.download-by.net/gnu/gnu/ http://mirrors.dotsrc.org/gnu/ ftp://mirrors.dotsrc.org/gnu/ ftp://ftp.funet.fi/pub/gnu/prep/ http://www.nic.funet.fi/pub/gnu/ftp.gnu.org/pub/gnu/ http://mirror.bbln.org/gnu ftp://mirror.bbln.org/gnu http://mirror.ibcp.fr/pub/gnu/ ftp://ftp.igh.cnrs.fr/pub/gnu/ http://ftp.igh.cnrs.fr/pub/gnu/ http://gnu.cardse.net/ ftp://www.artfiles.org/gnu.org/ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ ftp://ftp.cs.tu-berlin.de/pub/gnu/ http://ftp.halifax.rwth-aachen.de/gnu/ ftp://ftp.halifax.rwth-aachen.de/gnu/ http://ftp.u-tx.net/gnu/ ftp://ftp.u-tx.net/gnu/ ftp://ftp.informatik.rwth-aachen.de/pub/gnu/ http://ftp.hosteurope.de/mirror/ftp.gnu.org/gnu/ http://mirror.checkdomain.de/gnu ftp://mirror.checkdomain.de/gnu http://mirror3.layerjet.com/gnu/ http://ftp.hawo.stw.uni-erlangen.de/gnu ftp://ftp.hawo.stw.uni-erlangen.de/gnu http://mirror.netcologne.de/gnu ftp://mirror.netcologne.de/gnu ftp://ftp.cc.uoc.gr/mirrors/gnu/ http://ftp.cc.uoc.gr/mirrors/gnu/ ftp://ftp.ntua.gr/pub/gnu/ ftp://ftp.heanet.ie/pub/gnu/ http://ftp.heanet.ie/mirrors/gnu/ http://mirror2.mirror.garr.it/mirrors/gnuftp/gnu/ http://mirrors.muzzy.it/gnu ftp://mirrors.muzzy.it/gnu ftp://ftp.mirror.nl/pub/mirror/gnu/ ftp://ftp.nluug.nl/pub/gnu/ http://mirror.arbitrary.nl/gnu/ http://ftp.snt.utwente.nl/pub/software/gnu/ ftp://ftp.snt.utwente.nl/pub/software/gnu/ ftp://ftp.uninett.no/pub/gnu/ http://gnuftp.uib.no/ ftp://gnuftp.uib.no/pub/gnuftp/ http://ftp.task.gda.pl/pub/gnu/ ftp://ftp.task.gda.pl/pub/gnu/ ftp://sunsite.icm.edu.pl/pub/gnu/ ftp://mirrors.nfsi.pt/pub/gnu/ http://mirrors.nfsi.pt/gnu/ ftp://mirrors.fe.up.pt/pub/gnu/ http://mirrors.fe.up.pt/pub/gnu/ http://gnu.mirrors.linux.ro/ ftp://gnu.mirrors.linux.ro/gnu/ http://mirror.tochlab.net/pub/gnu/ ftp://mirror.tochlab.net/pub/gnu/ http://mirror.sbb.rs/gnu/ ftp://mirror.sbb.rs/gnu/ http://gnu.prunk.si http://mirror.lihnidos.org/GNU/ftp/gnu/ http://ftp.gul.es/gnu/ftp.gnu.org/gnu/ ftp://ftp.gul.es/gnu/ftp.gnu.org/gnu/ http://ftp.rediris.es/mirror/GNU/gnu/ ftp://ftp.rediris.es/mirror/GNU/gnu/ http://217.160.6.133/Asturies/GNU/gnu/ ftp://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://mirror.switch.ch/ftp/mirror/gnu/ ftp://mirror.switch.ch/mirror/gnu/ http://mirror.rackdc.com/gnu/ ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://ftp.gnu.org.ua/gnu/ ftp://ftp.gnu.org.ua/gnu/ http://ftp-gnu-org.ip-connect.vn.ua/ ftp://ftp-gnu-org.ip-connect.vn.ua/mirror/ftp.gnu.org/ http://mirror.lagoon.nc/pub/gnu/ ftp://mirror.lagoon.nc/pub/gnu/ gnu-alpha ftp://alpha.gnu.org/gnu/ http://alpha.gnu.org/gnu/ ftp://ftp.funet.fi/pub/gnu/alpha/gnu/ http://www.nic.funet.fi/pub/gnu/alpha/gnu/ ftp://gnualpha.uib.no/pub/gnualpha/ http://gnualpha.uib.no/ ftp://mirrors.fe.up.pt/pub/gnu-alpha/ http://mirrors.fe.up.pt/pub/gnu-alpha/ http://mirror.lihnidos.org/GNU/alpha/gnu/ http://mirrors.ibiblio.org/gnu/alpha/gnu/ http://gnualpha.spinellicreations.com/gnu/ http://gnu.c3sl.ufpr.br/alpha/gnu/ gnupg ftp://ftp.gnupg.org/gcrypt/ http://gnupg.unixmexico.org/ftp/ http://ftp.linux.it/pub/mirrors/gnupg/ ftp://ftp.surfnet.nl/pub/security/gnupg/ ftp://sunsite.icm.edu.pl/pub/security/gnupg/ ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/ ftp://ftp.hi.is/pub/mirrors/gnupg/ ftp://gd.tuwien.ac.at/privacy/gnupg/ http://www.ring.gr.jp/pub/net/gnupg/ ftp://ftp.ring.gr.jp/pub/net/gnupg/ http://public.planetmirror.com/pub/ hackage http://hackage.haskell.org/ http://dev.gentoo.org/~qnikst/hdiff.luite.com/ @@ -28,7 +28,7 @@ netbsd ftp://ftp.NetBSD.org/pub/NetBSD ftp://ftp.au.NetBSD.org/pub/NetBSD ftp:/ nongnu http://download.savannah.nongnu.org/releases-noredirect/ http://ftp.cc.uoc.gr/mirrors/nongnu.org/ http://ftp.twaren.net/Unix/NonGNU/ http://mirror.csclub.uwaterloo.ca/nongnu/ ftp://mirror.csclub.uwaterloo.ca/nongnu/ http://mirrors.fe.up.pt/pub/nongnu/ ftp://mirrors.fe.up.pt/pub/nongnu/ http://mirrors.zerg.biz/nongnu/ http://nongnu.askapache.com/ http://nongnu.uib.no/ ftp://nongnu.uib.no/pub/nongnu/ http://savannah.c3sl.ufpr.br/ ftp://savannah.c3sl.ufpr.br/savannah-nongnu/ ftp://ftp.twaren.net/Unix/NonGNU/ openbsd ftp://ftp.openbsd.org/pub/OpenBSD ftp://ftp.it.net.au/mirrors/OpenBSD ftp://openbsd.wiretapped.net/pub/OpenBSD ftp://gd.tuwien.ac.at/opsys/OpenBSD ftp://playboy.wu-wien.ac.at/pub/OpenBSD ftp://ftp.ca.openbsd.org/pub/OpenBSD ftp://ftp.shellhung.org/pub/OpenBSD ftp://ftp.jaquet.dk/pub/openSSH/portable ftp://ftp.fi.debian.org/pub/OpenBSD ftp://ftp.ac-creteil.fr/OpenBSD ftp://ftp.fr.openbsd.org/pub/OpenBSD ftp://ftp.club-internet.fr/pub/OpenBSD ftp://ftp.de.openbsd.org/pub/OpenBSD ftp://ftp.tu-clausthal.de/pub/OpenBSD ftp://ftp.freenet.de/pub/ftp.openbsd.org/pub/OpenBSD ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD ftp://pandemonium.tiscali.de/pub/OpenBSD ftp://ftp.taubenschlag.uni-frankfurt.de/pub/mirror/ftp.openssh.com/portable ftp://openbsd.bay13.net/pub/OpenBSD ftp://ftp.uni-stuttgart.de/pub/OpenBSD ftp://ftp.fh-wolfenbuettel.de/pub/os/openbsd ftp://filoktitis.noc.uoa.gr/pub/OpenBSD ftp://ftp.physics.auth.gr/pub/mirrors/OpenBSD/OpenBSD ftp://ftp.fsn.hu/pub/OpenBSD ftp://ftp.netlab.is.tsukuba.ac.jp/pub/os/OpenBSD ftp://ftp.iij.ad.jp/pub/OpenBSD ftp://ftp.jp.openbsd.org/pub/OpenBSD ftp://ftp.kddlabs.co.jp/OpenBSD ftp://ftp.nl.uu.net/pub/OpenBSD ftp://ftp.calyx.nl/pub/OpenBSD ftp://ftp.nluug.nl/pub/OpenBSD ftp://mirror.widexs.nl/pub ftp://ftp.inet.no/pub/OpenBSD ftp://ftp.uninett.no/pub/OpenBSD ftp://sunsite.icm.edu.pl/pub/OpenBSD ftp://ftp.task.gda.pl/pub/OpenBSD ftp://ftp.physics.uvt.ro/pub/OpenBSD ftp://ftp.gamma.ru/pub/OpenBSD ftp://ftp.radio-msu.net/pub/OpenBSD ftp://ftp.isu.net.sa/pub/ftp.openbsd.org/OpenBSD ftp://ftp.rediris.es/mirror/OpenBSD ftp://ftp.stacken.kth.se/pub/OpenBSD ftp://ftp.sunet.se/pub/OpenBSD ftp://mirror.pudas.net/OpenBSD ftp://ftp.solnet.ch/mirror/OpenBSD ftp://sunsite.cnlab-switch.ch/pub/OpenBSD ftp://openbsd.csie.nctu.edu.tw/pub/OpenBSD ftp://openbsd.nsysu.edu.tw/pub/OpenBSD ftp://ftp.tku.edu.tw/pub/OpenBSD ftp://ftp.linux.org.tr/OpenBSD ftp://ftp.openbsd.org.ua/pub/OpenBSD ftp://ftp.plig.org/pub/OpenBSD ftp://ftp3.usa.openbsd.org/pub/OpenBSD ftp://mirror.csit.fsu.edu/pub/OpenBSD ftp://reflection.ncsa.uiuc.edu/pub/OpenBSD ftp://ftp.src.uchicago.edu/pub/OpenBSD ftp://rt.fm/pub/OpenBSD ftp://ftp.cse.buffalo.edu/pub/OpenBSD ftp://ftp.stealth.net/pub/mirrors/ftp.openssh.com/pub/OpenBSD ftp://openbsd.mirrors.pair.com ftp://carroll.cac.psu.edu/pub/OpenBSD ftp://mirrors.rcn.net/pub/OpenBSD ftp://openbsd.secsup.org/pub/openbsd ftp://ftp.tux.org/bsd/openbsd ftp://mirror.cs.wisc.edu/pub/mirrors/OpenBSD openldap ftp://ftp.OpenLDAP.org/pub/OpenLDAP ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP http://www.PlanetMirror.com/pub/openldap ftp://ftp.ucr.ac.cr/pub/Unix/openldap ftp://ftp.ntua.gr/mirror/OpenLDAP ftp://ftp.dti.ad.jp/pub/net/OpenLDAP ftp://ftp.u-aizu.ac.jp/pub/net/openldap ftp://ftp.holywar.net/pub/mirror/OpenLDAP ftp://ftp.nl.uu.net/pub/unix/db/openldap ftp://ftp.linux.pt/pub/mirrors/OpenLDAP ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP ftp://ftp.plig.net/pub/OpenLDAP -openssl ftp://ftp.openssl.org ftp://mirror.switch.ch/mirror/openssl/ http://mirror.switch.ch/ftp/mirror/openssl/ ftp://ftp.pca.dfn.de/pub/tools/net/openssl/ ftp://sunsite.uio.no/pub/security/openssl/ ftp://ftp.sunet.se/pub/security/tools/net/openssl/ ftp://gd.tuwien.ac.at/infosys/security/openssl/ ftp://ftp.kfki.hu/pub/packages/security/openssl/ ftp://guest.kuria.katowice.pl/pub/openssl/ ftp://ftp.fi.muni.cz/pub/openssl/ ftp://ftp.linux.hr/pub/openssl/ http://openssl.parentinginformed.com/ http://openssl.initrd.net/ ftp://ftp.tpnet.pl/pub/security/openssl/ http://openssl.skazkaforyou.com/ http://openssl.raffsoftware.com/ +openssl ftp://ftp.openssl.org ftp://mirror.switch.ch/mirror/openssl/ http://mirror.switch.ch/ftp/mirror/openssl/ ftp://ftp.pca.dfn.de/pub/tools/net/openssl/ ftp://sunsite.uio.no/pub/security/openssl/ ftp://ftp.sunet.se/pub/security/tools/net/openssl/ ftp://gd.tuwien.ac.at/infosys/security/openssl/ ftp://ftp.kfki.hu/pub/packages/security/openssl/ ftp://guest.kuria.katowice.pl/pub/openssl/ ftp://ftp.fi.muni.cz/pub/openssl/ http://openssl.parentinginformed.com/ ftp://ftp.tpnet.pl/pub/security/openssl/source/ http://openssl.skazkaforyou.com/ http://openssl.raffsoftware.com/ opera ftp://ftp.opera.com/pub/opera ftp://mirror.switch.ch/mirror/opera ftp://ftp.tu-cottbus.de/pub/net/opera ftp://ftp.sunet.se/pub/www/clients/Opera ftp://ftp.task.gda.pl/pub/opera ftp://ftp.uit.no/pub/www/opera ftp://ftp.tiscali.nl/pub/mirrors/opera ftp://ftp.ntua.gr/pub/www/Opera ftp://ftp.rediris.es/mirror/opera ftp://ftp.heanet.ie/pub/opera postgresql http://ftp.postgresql.org/pub/ ftp://ftp.postgresql.org/pub/ pypi https://pypi.python.org/packages/source diff --git a/ros-meta/navigation/Manifest b/ros-meta/navigation/Manifest index 2ab0c74f2366..6e83d7512541 100644 --- a/ros-meta/navigation/Manifest +++ b/ros-meta/navigation/Manifest @@ -1 +1,2 @@ DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd +DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/ros-meta/navigation/navigation-1.13.1.ebuild b/ros-meta/navigation/navigation-1.13.1.ebuild new file mode 100644 index 000000000000..483b54df82a2 --- /dev/null +++ b/ros-meta/navigation/navigation-1.13.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-planning/navigation" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="2D navigation stack" +LICENSE="BSD LGPL-2.1" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/amcl + dev-ros/base_local_planner + dev-ros/carrot_planner + dev-ros/clear_costmap_recovery + dev-ros/costmap_2d + dev-ros/dwa_local_planner + dev-ros/fake_localization + dev-ros/global_planner + dev-ros/map_server + dev-ros/move_base + dev-ros/move_slow_and_clear + dev-ros/nav_core + dev-ros/navfn + dev-ros/robot_pose_ekf + dev-ros/rotate_recovery + dev-ros/voxel_grid +" +DEPEND="${RDEPEND}" diff --git a/sci-astronomy/stellarium/stellarium-0.13.3.ebuild b/sci-astronomy/stellarium/stellarium-0.13.3.ebuild index fa0c9c74d0d3..03b9c6766ed5 100644 --- a/sci-astronomy/stellarium/stellarium-0.13.3.ebuild +++ b/sci-astronomy/stellarium/stellarium-0.13.3.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug nls sound stars" RESTRICT="test" diff --git a/sci-biology/biopython/Manifest b/sci-biology/biopython/Manifest index e835e2490342..a54d05e74a8f 100644 --- a/sci-biology/biopython/Manifest +++ b/sci-biology/biopython/Manifest @@ -1 +1,2 @@ DIST biopython-1.65.tar.gz 12641342 SHA256 463cc81db84e9bfcdfb15629511c81ed556a6c0287e670dbfe80f03c65d2a88e SHA512 2a9c6a89d0279374c243938d13bfdd6f2b124a08afbfb0c262e1e4827c48a141fb9941f4cdb960f76b523f0ac152095a8c6ea566d9b469ce9daf8a7e7993f7af WHIRLPOOL 40757938c0eb7e30c9609ef5aa2d397fa21ad92cd20c9b6300cde1b381a0e6c21e4ebb7f4d25bf02651789437d7d86341154b907ccc0007759c17939f2e29da2 +DIST biopython-1.66.tar.gz 13724754 SHA256 5178ea3b343b1d8710f39205386093e5369ed653aa020e1b0c4b7622a59346c1 SHA512 6bb01f1058728f957527447df82ffbb9027e74564e81c8308b3404d033a0f12fef50da05b343bd4c4eae98508931eedc9c4bc23b2efdf36bbb49f1557fa52d71 WHIRLPOOL 0cfe3f4829ec72afa466b17cf6745cc334105713ebeeb06019e2df94acc1289aeb07a7bba70a50afeae00de90c48d2455a1af8cf26f916ceb4c0ab92a4a05fbd diff --git a/sci-biology/biopython/biopython-1.66.ebuild b/sci-biology/biopython/biopython-1.66.ebuild new file mode 100644 index 000000000000..d5c5fb686deb --- /dev/null +++ b/sci-biology/biopython/biopython-1.66.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) + +inherit distutils-r1 eutils + +DESCRIPTION="Python modules for computational molecular biology" +HOMEPAGE="http://www.biopython.org/ https://pypi.python.org/pypi/biopython/" +SRC_URI="http://www.biopython.org/DIST/${P}.tar.gz" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + dev-python/matplotlib[$(python_gen_usedep 'python*')] + dev-python/networkx[$(python_gen_usedep 'python*')] + dev-python/numpy[$(python_gen_usedep 'python*')] + dev-python/rdflib[$(python_gen_usedep 'python*')] + dev-python/pygraphviz[$(python_gen_usedep 'python2*')] + dev-python/reportlab[$(python_gen_usedep 'python*')] + media-gfx/pydot[$(python_gen_usedep 'python2*')] + " +DEPEND="${RDEPEND} + sys-devel/flex" + +DOCS=( CONTRIB DEPRECATED NEWS README Doc/. ) + +python_test() { + distutils_install_for_testing + cp -r "${S}"/{Doc,Tests} "${TEST_DIR}"/lib/ || die + cd "${TEST_DIR}"/lib/Tests || die + rm ./test_BioSQL_psycopg2.py ./test_BioSQL_MySQLdb.py ./test_BioSQL_mysql_connector.py || die + ${PYTHON} run_tests.py --offline --verbose || die +} + +python_install_all() { + distutils-r1_python_install_all + + dodir /usr/share/${PN} + cp -r --preserve=mode Scripts Tests "${ED}"/usr/share/${PN} || die +} + +pkg_postinst() { + elog "For database support you need to install:" + optfeature "MySQL" dev-python/mysql-python + optfeature "PostGreSQL" dev-python/psycopg + echo + elog "Some applications need extra packages:" + optfeature "EMBOSS (The European Molecular Biology Open Software Suite)" sci-biology/emboss +} diff --git a/sci-biology/rebase/Manifest b/sci-biology/rebase/Manifest index e385613ad060..7bc8b26873ee 100644 --- a/sci-biology/rebase/Manifest +++ b/sci-biology/rebase/Manifest @@ -1,3 +1,4 @@ DIST rebase-1508.tar.xz 69944352 SHA256 579ef686b0efea32d88633f85411da9c1396572eec0d20bd163ca7bf615c7b04 SHA512 d5dc9eb704ce28ab7951ab2a8781de76dcbd7a4b6d6c6634abcd36766c8dce77b6d8a712789fe6293a6ddc66cd9103e17121b0ff52f0d3fbabfc5bf47c2f2100 WHIRLPOOL f082a3096cef636a61a176d3d3fe5b993bc83e3b332d134ebc20201d21f2f66e3400ffc5d561018c63fb3201c5fc0862126a32c17c5c96f118859b62a618d341 DIST rebase-1509.tar.xz 81228428 SHA256 ffad3955197850b4383bf7b96278af357cb99bec129e7a00d7d601e76868870b SHA512 2d9f90c24ab977b29a1e1e790966f48274691375ab5f4b7a4f37c1e62dc8bd4d0b4409475e9b97bb63e3f481066f8407efc4d1314ee24c836f60b53d736d77ed WHIRLPOOL ab86576f037d142a285f3830f88e5b750a52f79c90f35bd117695a5de125c753747329522b1f514c503ff7e28e8aaaa2298bff3379f134db06fc270ec7364a52 DIST rebase-1510.tar.xz 90412200 SHA256 0a33a34003c95f65d8ec8bbf11907bccad47d0bdddc39030a663df5ef2922f87 SHA512 c76b42df5a5bc64a951693b35a8664195a0fb1b84bdd64f80e8986a705ca1279e51c324153a83272ecb9b3dfb3fd565cb43c2b25c9e37655767c278e6320590e WHIRLPOOL 238841844c19ad028147a4a5a366a219e405b1ae1d0ae79767775518a0ecdabe37948a260724e4053af183ad00799c60da21d57dae84cdc6859e19a04aac314a +DIST rebase-1511.tar.xz 95276416 SHA256 e8b0686ad02d15d833febf5f353cb66febfccb730fb7e92968b05739d8d4a494 SHA512 b7998763a092389be8d5eb4b9c59a7297859d4f03be6a4c3933288d5407fe1b64268d6fb03b7df0604ad0801991937ee345c2f932c9621ea7bab4d68c9c59261 WHIRLPOOL 53ce94b77fb5b1557b790bad48064066833f6800ebef29a33f80e3fa6b8dbf0666443dc0301521e88d4e9f38579011edc37979f12b95cd84ea8afb07f7e8ffc7 diff --git a/sci-biology/rebase/rebase-1511.ebuild b/sci-biology/rebase/rebase-1511.ebuild new file mode 100644 index 000000000000..1bfa8ba6880d --- /dev/null +++ b/sci-biology/rebase/rebase-1511.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MY_PV=${PV#1} + +DESCRIPTION="A restriction enzyme database" +HOMEPAGE="http://rebase.neb.com" +SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" + +SLOT="0" +LICENSE="public-domain" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +IUSE="emboss minimal" + +RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )" +DEPEND="${RDEPEND}" + +RESTRICT="binchecks strip" + +src_compile() { + if use emboss; then + echo; einfo "Indexing Rebase for usage with EMBOSS." + mkdir REBASE || die + EMBOSS_DATA="." rebaseextract -auto -infile withrefm.${MY_PV} \ + -protofile proto.${MY_PV} -equivalences \ + || die "Indexing Rebase failed." + echo + fi +} + +src_install() { + if ! use minimal; then + insinto /usr/share/${PN} + doins withrefm.${MY_PV} proto.${MY_PV} + fi + newdoc REBASE.DOC README + if use emboss; then + insinto /usr/share/EMBOSS/data/REBASE + doins REBASE/embossre.{enz,ref,sup} + insinto /usr/share/EMBOSS/data + doins REBASE/embossre.equ + fi +} diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch new file mode 100644 index 000000000000..ed5aa43e23c3 --- /dev/null +++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch @@ -0,0 +1,12 @@ +## 70_choose_tree.dpatch by William Alexander Grant <william.grant@ubuntu.com.au> +--- tv-0.5.orig/tview.cpp ++++ tv-0.5/tview.cpp +@@ -209,7 +209,7 @@ + wxT("SVG vector picture files (*.svg)|*.svg"), + wxSAVE|wxOVERWRITE_PROMPT); + +- if (dialog.ShowModal() == wxID_OK) ++ if ((dialog.ShowModal() == wxID_OK) && (p.GetNumTrees() != 0)) + { + wxSVGFileDC pictureDC (dialog.GetPath(), 600, 650) ; + OnDraw (&pictureDC); diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-fix_loading_crash.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-fix_loading_crash.patch new file mode 100644 index 000000000000..c136539726a3 --- /dev/null +++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-fix_loading_crash.patch @@ -0,0 +1,40 @@ +Bug: http://code.google.com/p/treeviewx/issues/detail?id=1 +Description: fix crash on loading tree file. +Author: Tim Booth +--- tv-0.5.orig/tview.cpp ++++ tv-0.5/tview.cpp +@@ -278,7 +278,7 @@ + char buf[256]; + strcpy (buf, p->GetLabel().c_str()); + wchar_t wbuf[256]; +- mbstowcs (wbuf, buf, size_t(wbuf)); ++ mbstowcs (wbuf, buf, 256); + s << wbuf; + #else + s << p->GetLabel().c_str(); +@@ -563,7 +563,7 @@ + char buf[256]; + strcpy (buf, t.GetName().c_str()); + wchar_t wbuf[256]; +- mbstowcs (wbuf, buf, size_t(wbuf)); ++ mbstowcs (wbuf, buf, 256); + txt << wbuf; + #else + txt << t.GetName().c_str(); +@@ -712,7 +712,7 @@ + char buf[256]; + strcpy (buf, p.GetIthTreeName(i).c_str()); + wchar_t wbuf[256]; +- mbstowcs (wbuf, buf, size_t(wbuf)); ++ mbstowcs (wbuf, buf, 256); + + std::wstring tname = wbuf; + +@@ -1046,6 +1046,7 @@ + void MyCanvas::OnSize(wxSizeEvent& event) + { + Resize (); ++ Refresh(); + event.Skip(); + } + diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-svg.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-svg.patch new file mode 100644 index 000000000000..67a62179bb87 --- /dev/null +++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-svg.patch @@ -0,0 +1,30 @@ +Author: Olly Betts <olly@survex.com> +Description: Update configure.in to match what it must have said when configure was generated. + One thing I should probably explain about the patch as my change may + seem odd otherwise - upstream's configure.in says "USE_SVG=0" but the + generated configure says "USE_SVG=1", so I've simply updated + configure.in to match what it must have said when configure was + generated. +Forwarded: no +--- tv-0.5.orig/configure.in ++++ tv-0.5/configure.in +@@ -66,7 +66,9 @@ + case "$wx_version" in + 2.4.*) WX_SVG_LIB=[`$WX_CONFIG --basename`_dcsvg-`echo ${wx_version} | sed -e "s:\.[0-9]\{1,\}$::"`] + ;; +- *) WX_SVG_LIB=[`$WX_CONFIG --basename`_svg-`echo ${wx_version} | sed -e "s:\.[0-9]\{1,\}$::"`] ++ 2.*) WX_SVG_LIB=[`$WX_CONFIG --basename`_svg-`echo ${wx_version} | sed -e "s:\.[0-9]\{1,\}$::"`] ++ ;; ++ *) WX_SVG_LIB= + ;; + esac + +@@ -76,7 +78,7 @@ + + if test "$USE_SVG" = 1 ; then + CXXFLAGS="$CXXFLAGS -DUSE_SVG" +- LIBS="$LIBS -l$WX_SVG_LIB" ++ test -n "$WX_SVG_LIB" && LIBS="$LIBS -l$WX_SVG_LIB" + fi + + AC_OUTPUT(Makefile ncl-2.0/Makefile ncl-2.0/src/Makefile TreeLib/Makefile tv.spec) diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-treeview-xpm-not-xbm.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-treeview-xpm-not-xbm.patch new file mode 100644 index 000000000000..a57ae19aaf26 --- /dev/null +++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-treeview-xpm-not-xbm.patch @@ -0,0 +1,16 @@ +Description: Fix the extension of the icon +Author: Olly Betts <olly@survex.com> +Last-Update: 2014-06-21 +Forwarded: http://code.google.com/p/treeviewx/issues/detail?id=4 + +--- tv-0.5.orig/tv.cpp ++++ tv-0.5/tv.cpp +@@ -215,7 +215,7 @@ + frame->SetIcon(wxIcon("app")); // use the name of the icon in the resource file + #endif + #if defined(__WXGTK__) || defined(__WXMOTIF__) +- frame->SetIcon(wxIcon(wxT("bitmaps/treeview.xbm"))); ++ frame->SetIcon(wxIcon(wxT("/usr/share/pixmaps/treeviewx.xpm"))); + #endif + + #ifdef __WXMAC__ diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch new file mode 100644 index 000000000000..b1db5749990c --- /dev/null +++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch @@ -0,0 +1,78 @@ + tv.cpp | 4 ++-- + tview.cpp | 12 ++++++++---- + 2 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/tv.cpp b/tv.cpp +old mode 100755 +new mode 100644 +index 1abe90b..0df45a8 +--- a/tv.cpp ++++ b/tv.cpp +@@ -163,9 +163,9 @@ bool MyApp::OnInit(void) + { + // Optional command line argument is name of file to open + #if wxUSE_UNICODE +- wchar_t *InputFile = NULL; ++ const wchar_t *InputFile = NULL; + #else +- char *InputFile = NULL; ++ const char *InputFile = NULL; + #endif + // Read input/output files + if (argc > 1) +diff --git a/tview.cpp b/tview.cpp +old mode 100755 +new mode 100644 +index 93972c3..4b2d593 +--- a/tview.cpp ++++ b/tview.cpp +@@ -62,9 +62,13 @@ + #ifdef __WXMSW__ + #else + #ifdef USE_SVG ++#if wxMAJOR_VERSION >= 3 ++ #include <wx/dcsvg.h> ++#else + #include <wx/svg/dcsvg.h> + #endif + #endif ++#endif + + // GUI interface + #include "tv.h" +@@ -186,7 +190,7 @@ void TView::OnSavePicture (wxCommandEvent& WXUNUSED(event)) + wxFrame *f = GetMainFrame(); + wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""), + pictureFileName, wxT("Enhanced metafile (*.emf)|*.emf"), +- wxSAVE|wxOVERWRITE_PROMPT); ++ wxFD_SAVE|wxFD_OVERWRITE_PROMPT); + + if (dialog.ShowModal() == wxID_OK) + { +@@ -206,7 +210,7 @@ void TView::OnSavePicture (wxCommandEvent& WXUNUSED(event)) + #endif + wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""), + pictureFileName, wxT("SVG vector picture files (*.svg)|*.svg"), +- wxSAVE|wxOVERWRITE_PROMPT); ++ wxFD_SAVE|wxFD_OVERWRITE_PROMPT); + + if (dialog.ShowModal() == wxID_OK) + { +@@ -361,7 +365,7 @@ bool TView::OnClose(bool deleteWindow) + + // Clear the canvas in case we're in single-window mode, + // and the canvas stays. +-#if (wxMINOR_VERSION > 4) // from 2.5 Clear is deprecated ++#if (wxMAJOR_VERSION >= 3 || wxMINOR_VERSION > 4) // from 2.5 Clear is deprecated + canvas->ClearBackground(); + #else + canvas->Clear(); +@@ -686,7 +690,7 @@ void TView::OnLeafFont (wxCommandEvent& WXUNUSED(event)) + wxFontData data; + data.SetInitialFont (LeafFont); + +-#ifdef __WXMAC__ ++#if wxMAJOR_VERSION >= 3 || defined __WXMAC__ + wxFontDialog dialog((wxWindow *)GetFrame(), data); + #else + wxFontDialog dialog((wxWindow *)GetMainFrame(), &data); diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-wxstring-maxlen.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-wxstring-maxlen.patch new file mode 100644 index 000000000000..2c5179f778ca --- /dev/null +++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-wxstring-maxlen.patch @@ -0,0 +1,34 @@ +Description: Remove wxSTRING_MAXLEN (removed in wx3.0) and incomp. definition. + The definition wxSTRING_MAXLEN was removed from the public API of wxWidgets. + Its meaning was basically "take all the string", whenever a string length was + expected. The missing definition didn't raise a compilation error because + TreeLib's treedrawer.h contained a fall-back definition, which is however + incompatible with the original definition of wxWidgets and therefore is + interpreted by wxWidgets as a number representing the real string length. + This patch gets rid of the dangerous fall-back definition and of all of its + uses by using alternative wxString constructors that achieve the same + behavior. +Author: Martin Steghöfer <martin@steghoefer.eu> +Last-Update: Sun, 10 Aug 2014 14:06:42 +0200 +Bug-Debian: http://bugs.debian.org/751255 + +--- tv-0.5.orig/TreeLib/treedrawer.cpp ++++ tv-0.5/TreeLib/treedrawer.cpp +@@ -245,7 +245,7 @@ + // error in gcc, which is probably a gcc bug + { + wxCoord w, h, descent; +- wxString s (formatedString.c_str(), wxSTRING_MAXLEN); ++ wxString s (formatedString.c_str()); + pt.x += dc->GetCharWidth(); + pt.y -= dc->GetCharHeight()/2; + dc->DrawText (s, (int)pt.x, (int)pt.y); +@@ -566,7 +566,7 @@ + + #if USE_WXWINDOWS + wxCoord w, h; +- wxString s (buf, wxSTRING_MAXLEN); ++ wxString s (buf); + dc->GetTextExtent (s, &w, &h); + int x = (int)pt2.x; + int y = (int)pt2.y; diff --git a/sci-biology/treeviewx/files/treeviewx-gcc-3.4.patch b/sci-biology/treeviewx/files/treeviewx-gcc-3.4.patch deleted file mode 100644 index 9d64fabb6a9b..000000000000 --- a/sci-biology/treeviewx/files/treeviewx-gcc-3.4.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- TreeLib/nodeiterator.h.old 2002-02-24 15:37:17.000000000 -0500 -+++ TreeLib/nodeiterator.h 2005-02-27 14:23:30.971981368 -0500 -@@ -128,34 +128,34 @@ - - template <class N> N *PreorderIterator<N>::begin () - { -- cur = root; -- return cur; -+ this->cur = this->root; -+ return this->cur; - } - - template <class N> N *PreorderIterator<N>::next () - { -- if (cur->GetChild()) -+ if (this->cur->GetChild()) - { -- stk.push (cur); -- N *p = (N *)(cur->GetChild()); -- cur = p; -+ this->stk.push (this->cur); -+ N *p = (N *)(this->cur->GetChild()); -+ this->cur = p; - } - else - { -- while (!stk.empty() && (cur->GetSibling() == NULL)) -+ while (!this->stk.empty() && (this->cur->GetSibling() == NULL)) - { -- cur = stk.top(); -- stk.pop(); -+ this->cur = this->stk.top(); -+ this->stk.pop(); - } -- if (stk.empty()) -- cur = NULL; -+ if (this->stk.empty()) -+ this->cur = NULL; - else - { -- N *p = (N *)(cur->GetSibling()); -- cur = p; -+ N *p = (N *)(this->cur->GetSibling()); -+ this->cur = p; - } - } -- return cur; -+ return this->cur; - } - - ---- TreeLib/profile.h.old 2002-12-10 06:37:57.000000000 -0500 -+++ TreeLib/profile.h 2005-02-27 14:27:51.205419872 -0500 -@@ -77,7 +77,7 @@ - #include <ctime> - #endif - -- -+using namespace std; - - /** - *@typedef std::map <std::string, int, std::less<std::string> > LabelMap; ---- TreeLib/treedrawer.cpp.old 2003-08-22 06:47:28.000000000 -0400 -+++ TreeLib/treedrawer.cpp 2005-02-27 14:26:19.279394752 -0500 -@@ -406,7 +406,7 @@ - if (q->IsLeaf()) - { - double d = q->GetPathLength() - mMaxPathLength; -- mUltrametric = (std::fabs(d) <= 0.0001); -+ mUltrametric = (fabs(d) <= 0.0001); - // cout << mMaxPathLength << ":" << q->GetPathLength() << " " << d << endl; - } - q = u.next(); diff --git a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild new file mode 100644 index 000000000000..99fe49d602da --- /dev/null +++ b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER=3.0 + +inherit autotools eutils wxwidgets + +DESCRIPTION="A phylogenetic tree viewer" +HOMEPAGE="http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/" +SRC_URI="http://darwin.zoology.gla.ac.uk/~rpage/${PN}/download/0.5/tv-${PV}.tar.gz" +LICENSE="GPL-2" + +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="" + +DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/tv-${PV}" + +PATCHES=( + "${FILESDIR}"/${PN}-wxt.patch + "${FILESDIR}"/${P}-gcc4.3.patch + "${FILESDIR}"/${P}-70_choose_tree.patch + "${FILESDIR}"/${P}-fix_loading_crash.patch + "${FILESDIR}"/${P}-wx30.patch + "${FILESDIR}"/${P}-svg.patch + "${FILESDIR}"/${P}-treeview-xpm-not-xbm.patch + "${FILESDIR}"/${P}-wxstring-maxlen.patch + ) + +src_prepare() { + epatch "${PATCHES[@]}" + mv configure.{in,ac} || die + eautoreconf +} diff --git a/sci-chemistry/arp-warp-bin/Manifest b/sci-chemistry/arp-warp-bin/Manifest deleted file mode 100644 index 739b86dac839..000000000000 --- a/sci-chemistry/arp-warp-bin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST arp_warp_7.5.tar.gz 198643246 SHA256 d16fc6775905e56e5159f4a658f654b98d94f78143a2537ba67bffaed7ef1ad8 SHA512 351ed4bad863bac63005d128c693b7dde60c03ca5e8bd449ea602646f7f856c022070e542bcacae2793fbde88d67e7b5639bedeec55eeb191017a2ec19d03768 WHIRLPOOL d4ea42179a8a406508c82320567dc39ce419a2cba8b9e6ed05739dbbf0c9aba072b720c56987c4c94806ba2772f9c8787bde898f7c76543cc4702f00b7f16532 diff --git a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.5.ebuild b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.5.ebuild deleted file mode 100644 index ef10d0ab3d5d..000000000000 --- a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.5.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils prefix - -MY_P="arp_warp_${PV}" - -DESCRIPTION="Improvement and interpretation of crystallographic electron density maps" -SRC_URI="${MY_P}.tar.gz" -HOMEPAGE="http://www.embl-hamburg.de/ARP/" - -LICENSE="ArpWarp" -SLOT="0" -KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux" -IUSE="cpu_flags_x86_sse2" - -REQUIRED_USE="cpu_flags_x86_sse2" - -RDEPEND=" - app-shells/tcsh - sci-chemistry/refmac - virtual/awk - virtual/jre - virtual/opengl - x11-libs/libX11" -DEPEND="" - -RESTRICT="fetch" - -S="${WORKDIR}/${MY_P}" - -QA_PREBUILT="opt/arp-warp-bin/bin/*" - -pkg_nofetch(){ - elog "Fill out the form at http://www.embl-hamburg.de/ARP/" - elog "and place ${A} in ${DISTDIR}" -} - -src_prepare() { - epatch "${FILESDIR}"/7.3-setup.patch - eprefixify "${S}"/share/arpwarp_setup_base.* - - sed -e '/exit/d' -i "${S}"/share/arpwarp_setup_base.* || die -} - -src_install(){ - m_type=$(uname -m) - os_type=$(uname) - - exeinto /opt/${PN}/bin/bin-${m_type}-${os_type} - doexe "${S}"/bin/bin-${m_type}-${os_type}/* "${S}"/share/*{pl,sh} - - insinto /opt/${PN}/bin/bin-${m_type}-${os_type} - doins "${S}"/share/*{gif,bmp,XYZ,bash,csh,dat,lib,tbl,llh,prm} - - insinto /etc/profile.d/ - newins "${S}"/share/arpwarp_setup_base.csh 90arpwarp_setup.csh - newins "${S}"/share/arpwarp_setup_base.bash 90arpwarp_setup.sh - - dodoc "${S}"/README manual/UserGuide${PV}.pdf - dohtml -r "${S}"/manual/html/* -} - -pkg_postinst(){ - testcommand=$(echo 3 2 | awk '{printf"%3.1f",$1/$2}') - if [ $testcommand == "1,5" ];then - ewarn "*** ERROR ***" - ewarn " 3/2=" $testcommand - ewarn "Invalid decimal separator (must be ".")" - ewarn "You need to set this correctly!!!" - echo - ewarn "One way of setting the decimal separator is:" - ewarn "setenv LC_NUMERIC C' in your .cshrc file" - ewarn "\tor" - ewarn "export LC_NUMERIC=C' in your .bashrc file" - ewarn "Otherwise please consult your system manager" - fi -} diff --git a/sci-chemistry/arp-warp-bin/files/7.3-setup.patch b/sci-chemistry/arp-warp-bin/files/7.3-setup.patch deleted file mode 100644 index faed9c1102fd..000000000000 --- a/sci-chemistry/arp-warp-bin/files/7.3-setup.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/share/arpwarp_setup_base.bash b/share/arpwarp_setup_base.bash -index 29e769c..0b8a51e 100644 ---- a/share/arpwarp_setup_base.bash -+++ b/share/arpwarp_setup_base.bash -@@ -13,10 +13,10 @@ else - identifier=${nameprocessor}'-'${namesystem} - fi - # --arpwarphome="$1X" -+arpwarphome="@GENTOO_PORTAGE_EPREFIX@/opt/arp-warp-bin" - # - export warpbin=${arpwarphome}/bin/bin-${identifier} --export warpdoc=${arpwarphome}/manual -+export warpdoc=@GENTOO_PORTAGE_EPREFIX@/usr/share/doc/arp-warp-bin-7.1/html/ - export PATH=${warpbin}:${PATH} - # - # Checks for existence of $warpbin directory -diff --git a/share/arpwarp_setup_base.csh b/share/arpwarp_setup_base.csh -index 41b11e9..a4edcff 100644 ---- a/share/arpwarp_setup_base.csh -+++ b/share/arpwarp_setup_base.csh -@@ -13,7 +13,7 @@ else - set identifier = ${nameprocessor}'-'${namesystem} - endif - # --set arpwarphome = '$1X' -+set arpwarphome = '@GENTOO_PORTAGE_EPREFIX@/opt/arp-warp-bin' - # - setenv warpbin ${arpwarphome}/bin/bin-${identifier} - # diff --git a/sci-chemistry/balbes/Manifest b/sci-chemistry/balbes/Manifest deleted file mode 100644 index c5f8b2747027..000000000000 --- a/sci-chemistry/balbes/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST balbes-1.0.0_p100317.tar.gz 506464 SHA256 c5bf6c2086e1a3d7d380e5501c0cffdb91cbf77c74d2951dd345273f21921d0c SHA512 0029e459877113de212574daec8532f0d225e96772c6a777d34af94e5f11c1253ca941266e68da79e0a5c5a96416a824f76c6f1d8652d9a60a34756989cae41e WHIRLPOOL 9024490eea43ef526f00aff9f2045e2689dd6d9e7575c9fd3de2a23fc4af3ad784660df4c78c9aa6380df1dac9fbf46c8b6be105a3094761ebdd43c5cb541beb -DIST ccp4-6.1.3-core-src.tar.gz 242134076 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 SHA512 413eba806107ebcdbd93e9122275463709133d9b2a9ce44ae57a6c2350465a47ba66ad9875237aead74f5d422c0104f58f728ab37a757b10d82cde92af444c20 WHIRLPOOL faebf8ee7920013bc3d0e83565207dca1f31ba0b5c92fe1eae4b740f70ff2031d95787fa0d545b09c853d25657c08973527e43de02fddc086988123ca2a6339c diff --git a/sci-chemistry/balbes/balbes-1.0.0_p100317-r2.ebuild b/sci-chemistry/balbes/balbes-1.0.0_p100317-r2.ebuild deleted file mode 100644 index 5334207c0229..000000000000 --- a/sci-chemistry/balbes/balbes-1.0.0_p100317-r2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -CCP4VER="6.1.3" -PYTHON_DEPEND="2" - -inherit eutils fortran-2 python toolchain-funcs - -DESCRIPTION="Automated molecular replacement (MR) pipeline" -HOMEPAGE="http://www.ysbl.york.ac.uk/~fei/balbes/index.html" -SRC_URI=" - mirror://gentoo/${P}.tar.gz - ftp://ftp.ccp4.ac.uk/ccp4/${CCP4VER}/ccp4-${CCP4VER}-core-src.tar.gz" - -SLOT="0" -LICENSE="ccp4" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -# bundled PyXML is modified and cannot be replaced - -COMMON_DEPEND="sci-libs/ccp4-libs" -RDEPEND="${COMMON_DEPEND} - ~sci-libs/balbes-db-${CCP4VER} - !<=sci-chemistry/ccp4-apps-6.1.3-r1" -DEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}"/src - -pkg_setup() { - fortran-2_pkg_setup - python_set_active_version 2 -} - -src_unpack() { - unpack ${P}.tar.gz - tar xvzf "${DISTDIR}"/ccp4-${CCP4VER}-core-src.tar.gz \ - ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/bin_py \ - ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/PyXML-0.8.4 - python_convert_shebangs 2 "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/bin_py/balbes -} - -src_prepare() { - mkdir "${WORKDIR}"/bin || die - epatch "${FILESDIR}"/${PV}-makefile.patch - cd "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/ - epatch "${FILESDIR}"/pyxml-0.8.4-python-2.6.patch -} - -src_compile() { - emake \ - BLANC_FORT="$(tc-getFC) ${FFLAGS}" || die - cd "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/PyXML-0.8.4 - find build -delete - $(PYTHON) setup.py build - find xml/xslt test -delete -} - -src_install() { - insinto /usr/share/balbes/BALBES_0.0.1/ - doins -r \ - "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/bin_py \ - "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/PyXML-0.8.4 || die - dobin \ - "${WORKDIR}"/bin/* \ - "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/bin_py/balbes \ - || die -} - -pkg_postinst() { - python_mod_optimize /usr/share/balbes/BALBES_0.0.1/{bin_py,PyXML-0.8.4} -} - -pkg_postrm() { - python_mod_cleanup /usr/share/balbes/BALBES_0.0.1/{bin_py,PyXML-0.8.4} -} diff --git a/sci-chemistry/balbes/files/1.0.0_p100317-makefile.patch b/sci-chemistry/balbes/files/1.0.0_p100317-makefile.patch deleted file mode 100644 index da17240642d7..000000000000 --- a/sci-chemistry/balbes/files/1.0.0_p100317-makefile.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff --git a/makefile b/makefile -index baaceb5..85a7baf 100755 ---- a/makefile -+++ b/makefile -@@ -70,6 +70,15 @@ OBJDB_G = get_pdb_list.o - - #OBJDB_Z = blanc2mtz.o libutils.o - -+# incomplete targets: -+# dimer_search_db domain_search_db domain align3 -+all: search_db get_structure_db manage_db search_dm dom2ch \ -+ save_si get_pdb_list_db update_db \ -+ update_dom_db bl2mtz check_file_db fobs2cif sol_check \ -+ get_trns p2s check_cell alt_sg \ -+ align cell_list create_bins \ -+ get_pdb_list_db get_ch get_nm get_mod -+ - search_db: sdb_l - - get_structure_db: tdb_l -@@ -201,58 +210,58 @@ save_seg_id.o: save_seg_id.f - $(BLANC_FORT) -c save_seg_id.f - - sdb_l: $(OBJDB_S) -- $(BLANC_FORT) -o ../bin/search_DB $(OBJDB_S) -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/search_DB $(OBJDB_S) - tdb_l: $(OBJDB_T) -- $(BLANC_FORT) -o ../bin/get_structure_DB $(OBJDB_T) -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/get_structure_DB $(OBJDB_T) - mdb_l: $(OBJDB_M) -- $(BLANC_FORT) -o ../bin/manage_DB $(OBJDB_M) -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/manage_DB $(OBJDB_M) - mdm_l: $(OBJDB_MD) -- $(BLANC_FORT) -o ../bin/search_DOM $(OBJDB_MD) -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/search_DOM $(OBJDB_MD) - d2c_l: $(OBJDB_A) -- $(BLANC_FORT) -o ../bin/domain2chain $(OBJDB_A) -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/domain2chain $(OBJDB_A) - upd_l: $(OBJDB_U) -- $(BLANC_FORT) -o ../bin/update_DB $(OBJDB_U) -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/update_DB $(OBJDB_U) - dom_l: $(OBJDB_V) -- $(BLANC_FORT) -o ../bin/update_domain_DB $(OBJDB_V) -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/update_domain_DB $(OBJDB_V) - ddb_l: $(OBJDB_D) -- $(BLANC_FORT) -o ../bin/dimer_search $(OBJDB_D) -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/dimer_search $(OBJDB_D) - dmdb_l: $(OBJDB_N) -- $(BLANC_FORT) -o ../bin/domain_search $(OBJDB_N) -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/domain_search $(OBJDB_N) - gdb_l: $(OBJDB_G) -- $(BLANC_FORT) -o ../bin/get_pdb_list $(OBJDB_G) -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/get_pdb_list $(OBJDB_G) - b2m_l: blanc2mtz.o libutils.o -- $(BLANC_FORT) -o ../bin/blanc2mtz blanc2mtz.o libutils.o $(CLIB)/libccp4f.a $(CLIB)/libccp4c.a -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/blanc2mtz blanc2mtz.o libutils.o -lccp4f -lccp4c - f2c_l: f2cif.o libutils.o -- $(BLANC_FORT) -o ../bin/f2cif f2cif.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/f2cif f2cif.o libutils.o - chf_l: check_file_DB.o libutils.o -- $(BLANC_FORT) -o ../bin/check_file_DB check_file_DB.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/check_file_DB check_file_DB.o libutils.o - chc_l: check_cell_sg.o libutils.o -- $(BLANC_FORT) -o ../bin/check_cell_sg check_cell_sg.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/check_cell_sg check_cell_sg.o libutils.o - asl_l: alt_sg_list.o libutils.o -- $(BLANC_FORT) -o ../bin/alt_sg_list alt_sg_list.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/alt_sg_list alt_sg_list.o libutils.o - sc_l: $(OBJDB_C) -- $(BLANC_FORT) -o ../bin/solution_check $(OBJDB_C) -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/solution_check $(OBJDB_C) - gt_l: $(OBJDB_R) -- $(BLANC_FORT) -o ../bin/get_trans $(OBJDB_R) -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/get_trans $(OBJDB_R) - dmn_l: domain.o libutils.o -- $(BLANC_FORT) -o ../bin/domain domain.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/domain domain.o libutils.o - pack: pdb_pack.o libutils.o -- $(BLANC_FORT) -o ../bin/pdb_pack pdb_pack.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/pdb_pack pdb_pack.o libutils.o - p2s_l: $(OBJDB_P) -- $(BLANC_FORT) -o ../bin/pdb2s $(OBJDB_P) -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/pdb2s $(OBJDB_P) - aln_l: align_DB.o DB_subr.o libutils.o -- $(BLANC_FORT) -o ../bin/align_DB align_DB.o DB_subr.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/align_DB align_DB.o DB_subr.o libutils.o - aln3_l: align_DB_new.o DB_subr.o libutils.o -- $(BLANC_FORT) -o ../bin/align_DB_new align_DB_new.o DB_subr.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/align_DB_new align_DB_new.o DB_subr.o libutils.o - cell_l: create_cell_list.o DB_subr.o libutils.o -- $(BLANC_FORT) -o ../bin/create_cell_list create_cell_list.o DB_subr.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/create_cell_list create_cell_list.o DB_subr.o libutils.o - getch_l: get_chain.o DB_subr.o libutils.o -- $(BLANC_FORT) -o ../bin/get_chain get_chain.o DB_subr.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/get_chain get_chain.o DB_subr.o libutils.o - getnmr_l: get_nmr.o DB_subr.o libutils.o -- $(BLANC_FORT) -o ../bin/get_nmr get_nmr.o DB_subr.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/get_nmr get_nmr.o DB_subr.o libutils.o - getmod_l: get_model.o libutils.o -- $(BLANC_FORT) -o ../bin/get_model get_model.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/get_model get_model.o libutils.o - crb_l: create_binaries.o DB_subr.o libutils.o -- $(BLANC_FORT) -o ../bin/create_binaries create_binaries.o DB_subr.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/create_binaries create_binaries.o DB_subr.o libutils.o - save_si_l: save_seg_id.o DB_subr.o libutils.o -- $(BLANC_FORT) -o ../bin/save_seg_id save_seg_id.o DB_subr.o libutils.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/save_seg_id save_seg_id.o DB_subr.o libutils.o diff --git a/sci-chemistry/balbes/files/pyxml-0.8.4-python-2.6.patch b/sci-chemistry/balbes/files/pyxml-0.8.4-python-2.6.patch deleted file mode 100644 index d29b0b6a9eb2..000000000000 --- a/sci-chemistry/balbes/files/pyxml-0.8.4-python-2.6.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -rupN PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py ---- PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2008-12-15 16:54:36.000000000 +0900 -+++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2008-12-15 16:57:02.000000000 +0900 -@@ -24,8 +24,8 @@ class ParsedAbbreviatedAbsoluteLocationP - self._rel = rel - nt = ParsedNodeTest.ParsedNodeTest('node', '') - ppl = ParsedPredicateList.ParsedPredicateList([]) -- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -- self._step = ParsedStep.ParsedStep(as, nt, ppl) -+ as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -+ self._step = ParsedStep.ParsedStep(as_, nt, ppl) - return - - def evaluate(self, context): -diff -rupN PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py ---- PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2008-12-15 16:54:36.000000000 +0900 -+++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2008-12-15 16:58:58.000000000 +0900 -@@ -28,8 +28,8 @@ class ParsedAbbreviatedRelativeLocationP - self._right = right - nt = ParsedNodeTest.ParsedNodeTest('node','') - ppl = ParsedPredicateList.ParsedPredicateList([]) -- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -- self._middle = ParsedStep.ParsedStep(as, nt, ppl) -+ as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -+ self._middle = ParsedStep.ParsedStep(as_, nt, ppl) - - def evaluate(self, context): - res = [] diff --git a/sci-chemistry/balbes/metadata.xml b/sci-chemistry/balbes/metadata.xml deleted file mode 100644 index 4bb6be5e5d0c..000000000000 --- a/sci-chemistry/balbes/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> - <maintainer> - <email>jlec@gentoo.org</email> - </maintainer> - <longdescription> - BALBES is a system for solving protein structures using x-ray - crystalographic data. Molecular Replacement(MR) is its core - scientific method. BALBES aims to integrate all components, - necessary for finding a solution structure by MR, into one system. - It consists of a database, scientific programs and a python - pipeline. The system is automated so that it needs no user's - intervention when running complicated combination of jobs such - as model searching, molecular replacement and refinement. -</longdescription> -</pkgmetadata> diff --git a/sci-chemistry/ccp4-apps/Manifest b/sci-chemistry/ccp4-apps/Manifest deleted file mode 100644 index e56aec5512a2..000000000000 --- a/sci-chemistry/ccp4-apps/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST 6.1.3-oasis4.0.patch.bz2 946 SHA256 12d7c5965e0c46b0f482514d9083d6be94d65eeb14ba29c17d507d5f9669f84b SHA512 7c7bf4ef90550708bf41b1831dbe71c38418b46455adb3d42ec609d287894ac9260d9671f1759f71c713ced72fa004b9808391ea6874007ac8b7d7637f349d32 WHIRLPOOL a2bc27e1e054e1717c387f3800533fa490c03d1d18d3fe3cff4676f0ec47799a1681a206e01013c1b8f8e41162303446a824b86effeef2ed73f059feb07fb820 -DIST ccp4-6.1.3-core-src.tar.gz 242134076 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 SHA512 413eba806107ebcdbd93e9122275463709133d9b2a9ce44ae57a6c2350465a47ba66ad9875237aead74f5d422c0104f58f728ab37a757b10d82cde92af444c20 WHIRLPOOL faebf8ee7920013bc3d0e83565207dca1f31ba0b5c92fe1eae4b740f70ff2031d95787fa0d545b09c853d25657c08973527e43de02fddc086988123ca2a6339c diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r13.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r13.ebuild deleted file mode 100644 index 5e1032133922..000000000000 --- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r13.ebuild +++ /dev/null @@ -1,395 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils fortran-2 flag-o-matic gnuconfig python-single-r1 toolchain-funcs - -MY_P="${PN/-apps}-${PV}" - -#UPDATE="04_03_09" -#PATCHDATE="090511" - -PATCH_TOT="0" - -DESCRIPTION="Protein X-ray crystallography toolkit" -HOMEPAGE="http://www.ccp4.ac.uk/" -SRC="ftp://ftp.ccp4.ac.uk/ccp4" -SRC_URI=" - ${SRC}/${PV}/${MY_P}-core-src.tar.gz - https://dev.gentoo.org/~jlec/distfiles/${PV}-oasis4.0.patch.bz2" -# patch tarball from upstream - [[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz" -# patches created by us - [[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} https://dev.gentoo.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2" - -for i in $(seq $PATCH_TOT); do - NAME="PATCH${i}[1]" - SRC_URI="${SRC_URI} - ${SRC}/${PV}/patches/${!NAME}" -done - -LICENSE="ccp4" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="examples X" - -X11DEPS=" - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXt - x11-libs/libxdl_view" - -TKDEPS=" - >=dev-lang/tk-8.3:0= - >=dev-tcltk/blt-2.4 - dev-tcltk/iwidgets - dev-tcltk/itcl - dev-tcltk/itk - >=dev-tcltk/tdom-0.8 - dev-tcltk/tktreectrl" - -SCILIBS=" - ~sci-libs/ccp4-libs-${PV} - >=sci-libs/ccp4-libs-${PV}-r7 - sci-libs/clipper - sci-libs/fftw:2.1 - sci-libs/mmdb:0 - sci-libs/ssm - virtual/blas - virtual/lapack" - -SCIAPPS=" - sci-chemistry/pdb-extract - sci-chemistry/pymol - sci-chemistry/rasmol - >=sci-chemistry/oasis-4.0-r1" - -RDEPEND=" - ${TKDEPS} - ${SCILIBS} - app-shells/tcsh - dev-python/pyxml - dev-libs/libxml2:2 - dev-libs/libjwc_c - dev-libs/libjwc_f - dev-libs/boehm-gc - !app-office/sc - !<sci-chemistry/ccp4-6.1.3 - X? ( ${X11DEPS} )" -DEPEND="${RDEPEND} - X? ( - x11-misc/imake - x11-proto/inputproto - x11-proto/xextproto - )" -PDEPEND="${SCIAPPS}" - -RESTRICT="mirror" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - fortran-2_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - tc-export PKG_CONFIG - einfo "Applying upstream patches ..." - for patch in $(seq $PATCH_TOT); do - base="PATCH${patch}" - dir=$(eval echo \${${base}[0]}) - p=$(eval echo \${${base}[1]}) - pushd "${dir}" >& /dev/null - ccp_patch "${DISTDIR}/${p}" - popd >& /dev/null - done - einfo "Done." - echo - - [[ -n ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch - - einfo "Applying Gentoo patches ..." - - # it tries to create libdir, bindir etc on live system in configure - ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch - - # We already have sci-chemistry/rasmol - # Also remember to create the bindir. - ccp_patch "${FILESDIR}"/${PV}-dont-build-double-and-make-bindir.patch - - # libraries come from sci-libs/ccp4-libs - ccp_patch "${FILESDIR}"/${PV}-dont-build-libs.patch - - # We have seperate ebuilds for those - for bin in molref xia scala imosflm balbes; do - ccp_patch "${FILESDIR}"/${PV}-dont-build-${bin}.patch - done - - # don't configure what is not build - ccp_patch "${FILESDIR}"/${PV}-dont-configure.patch - - # Set python paths correctly - ccp_patch "${FILESDIR}"/${PV}-pythonpath.patch - - # Set python paths correctly - ccp_patch "${FILESDIR}"/${PV}-pisa.patch - - # Set python paths correctly - ccp_patch "${FILESDIR}"/${PV}-clipper-template.patch - - # Fix upstreams code - ccp_patch "${FILESDIR}"/${PV}-impl-dec.patch - - # Not renaming, but unbundling libs - ccp_patch "${FILESDIR}"/${PV}-rename-rapper-ng.patch - - # Use pkg-config to detect BLAS/LAPCK - ccp_patch "${FILESDIR}"/${PV}-lapack.patch - - # unbundle libs - ccp_patch "${FILESDIR}"/${PV}-unbundle.patch - - # tcl-8.6 - ccp_patch "${FILESDIR}"/${P}-tcl8.6.patch - - # Update things for oasis 4 usage - epatch "${WORKDIR}"/${PV}-oasis4.0.patch - sed 's: oasis : :g' -i src/Makefile.in || die - - einfo "Done." # done applying Gentoo patches - echo - - find ./lib/src/mmdb ./lib/ssm ./lib/clipper ./lib/fftw lib/lapack -delete - - sed \ - -e "s:/usr:${EPREFIX}/usr:g" \ - -e 's:-Wl,-rpath,$CLIB::g' \ - -e 's: -rpath $CLIB::g' \ - -e 's: -I${srcdir}/include/cpp_c_headers::g' \ - -e 's:sleep 1:sleep .2:g' \ - -e 's:\\$(XCIF_LIB):-L$srcdir/lib/ccif -lccif:g' \ - -e 's:\\$(XLAPACK_LIB):${XLAPACK_LIB}:g' \ - -e 's:\\$(CXX_LIBS):\${CXX_LIBS}:g' \ - -e 's:\\$(XLDFLAGS):\${XLDFLAGS}:g' \ - -i configure || die - - sed \ - -e '/o crunch2/s:$: ${XLAPACK_LIB}:g' \ - -i src/Makefile* || die - - find "${S}" -name "Makefile.*" \ - -exec sed -e 's|_FLAGS-|_FLAGS:-|g' -e "s:\(eval \$([[:alnum:]]*)\):\1 \$(GENTOOLDFLAGS):g" -i '{}' \; - - # Don't build refmac, sfcheck, balbes, molrep binaries; available from the standalone version - sed -i -e "/^REFMACTARGETS/s:^.*:REFMACTARGETS="":g" configure || die - - # Rapper bundles libxml2 and boehm-gc. Don't build, use or install those. - pushd src/rapper 2>/dev/null - eautoreconf - popd 2>/dev/null - - gnuconfig_update - - python_fix_shebang -f . -} - -src_configure() { - # Build system is broken if we set LDFLAGS - export GENTOOLDFLAGS="${LDFLAGS}" - unset LDFLAGS - - # These are broken with ./src/procheck/ps.f - filter-flags "-floop-*" - - # GENTOO_OSNAME can be one of: - # irix irix64 sunos sunos64 aix hpux osf1 linux freebsd - # linux_compaq_compilers linux_intel_compilers generic Darwin - # ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers - if [[ "$(tc-getFC)" = "ifort" ]]; then - if use ia64; then - GENTOO_OSNAME="ia64_linux_intel" - else - # Should be valid for x86, maybe amd64 - GENTOO_OSNAME="linux_intel_compilers" - fi - else - # Should be valid for x86 and amd64, at least - GENTOO_OSNAME="linux" - fi - - # Sets up env - ln -s \ - ccp4.setup-bash \ - "${S}"/include/ccp4.setup - - # We agree to the license by emerging this, set in LICENSE - sed -i \ - -e "s~^\(^agreed=\).*~\1yes~g" \ - "${S}"/configure || die - - # Fix up variables -- need to reset CCP4_MASTER at install-time - sed -i \ - -e "s~^\(setenv CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \ - -e "s~^\(export CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \ - -e "s~^\(.*export CBIN=.*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \ - -e "s~^\(.*setenv CBIN .*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \ - -e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1${EPREFIX}/usr/bin~g" \ - "${S}"/include/ccp4.setup* || die - - # Set up variables for build - source "${S}"/include/ccp4.setup-sh - - export CC=$(tc-getCC) - export CXX=$(tc-getCXX) - export COPTIM=${CFLAGS} - export CXXOPTIM=${CXXFLAGS} - # Default to -O2 if FFLAGS is unset - export FC=$(tc-getFC) - export FOPTIM=${FFLAGS:- -O2} - export BINSORT_SCR="${T}" - export CCP4_MASTER="${WORKDIR}" - export CCP4I_TCLTK="${EPREFIX}/usr/bin" - export MAKE="make ${MAKEOPTS} ${EXTRA_EMAKE}" - - # Can't use econf, configure rejects unknown options like --prefix - ./configure \ - $(use_enable X x) \ - --with-shared-libs \ - --with-fftw="${EPREFIX}/usr" \ - --with-warnings \ - --disable-pdb_extract \ - --disable-cctbx \ - --disable-phaser \ - --disable-diffractionImg \ - --disable-clipper \ - --disable-ssm \ - --disable-mosflm \ - --disable-mrbump \ - --tmpdir="${TMPDIR}" \ - ${GENTOO_OSNAME} || die "configure failed" - - # We do this manually, since disabling the clipper libraries also - # disables the clipper programs - pushd src/clipper_progs 2>/dev/null - econf \ - --prefix="${S}" \ - --bindir="${ED}"/usr/libexec/ccp4/bin \ - --with-ccp4="${S}" \ - --with-clipper="${EPREFIX}/usr" \ - --with-fftw="${EPREFIX}/usr" \ - --with-mmdb="${EPREFIX}/usr" \ - CXX=$(tc-getCXX) - popd 2>/dev/null -} - -src_compile() { - # fsplit is required for the programs - pushd lib/src 2>/dev/null - emake fsplit -j1 || die - popd 2>/dev/null - - # We do this manually, since disabling the clipper libraries also - # disables the clipper programs - pushd src/clipper_progs 2>/dev/null - emake || die - popd 2>/dev/null - - emake -j1 || die "emake failed" -} - -src_install() { - # Set up variables for build - source "${S}"/include/ccp4.setup-sh - - # if we don't make this, a ton of programs fail to install - mkdir "${S}"/bin || die - - # We do this manually, since disabling the clipper libraries also - # disables the clipper programs - pushd "${S}"/src/clipper_progs 2>/dev/null - emake install || die - popd 2>/dev/null - - einstall || die "install failed" - - # Collision with sci-chemistry/mrbump - rm -f "${S}"/bin/{mrbump,pydbviewer} || die - - # Bins - exeinto /usr/libexec/ccp4/bin/ - doexe "${S}"/bin/* || die - - # Libs - for file in "${S}"/lib/*; do - if [[ -d ${file} ]]; then - continue - elif [[ -x ${file} ]]; then - dolib.so ${file} || die - else - insinto /usr/$(get_libdir) - doins ${file} || die - fi - done - - rm -f "${S}"/include/ccp4.setup* - - # smartie -- log parsing - insinto /usr/share/ccp4 - doins -r "${S}"/share/smartie || die - - # Install docs and examples - local _man - pushd "${S}"/man/cat1 > /dev/null - for _man in *; do - newman ${_man} ${_man%??}-ccp4${_man:${#_man}-2:2} - done - popd > /dev/null - - mv "${S}"/manual/README "${S}"/manual/README-manual - dodoc manual/* README CHANGES doc/* examples/README || die - - rm "${ED}"/usr/share/doc/${PF}/GNUmakefile.* - rm "${ED}"/usr/share/doc/${PF}/COPYING.* - - dohtml -r "${S}"/html/* - - if use examples; then - for i in data rnase toxd; do - docinto examples/${i} - dodoc "${S}"/examples/${i}/* - done - - docinto examples/tutorial - dohtml -r "${S}"/examples/tutorial/html examples/tutorial/tut.css - for i in data results; do - docinto examples/tutorial/${i} - dodoc "${S}"/examples/tutorial/${i}/* - done - - for i in non-runnable runnable; do - docinto examples/unix/${i} - dodoc "${S}"/examples/unix/${i}/* - done - fi - # Needed for ccp4i docs to work - dosym ../../share/doc/${PF}/examples /usr/$(get_libdir)/ccp4/examples || die - dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/ccp4/html || die - - cat >> "${T}"/baubles <<- EOF - #!${EPREFIX}/bin/bash - exec "${EPYTHON}" "\${CCP4}/share/ccp4/smartie/baubles.py" - EOF - - exeinto /usr/libexec/ccp4/bin/ - doexe "${T}"/baubles || die -} - -# Epatch wrapper for bulk patching -ccp_patch() { - EPATCH_SINGLE_MSG=" ${1##*/} ..." epatch ${1} -} diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-clipper-template.patch b/sci-chemistry/ccp4-apps/files/6.1.3-clipper-template.patch deleted file mode 100644 index 433a78dbd23b..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-clipper-template.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- src/clipper_progs/src/intensity_target.h.orig 2010-01-21 11:27:13.236795886 -0600 -+++ src/clipper_progs/src/intensity_target.h 2010-01-21 11:31:33.450686927 -0600 -@@ -70,9 +70,31 @@ - { - public: - //! constructor: takes the datalist against which to calc target -- TargetFn_scaleLogI1I2( const HKL_data<T1>& hkl_data1_, const HKL_data<T2>& hkl_data2_ ); -+ TargetFn_scaleLogI1I2( const HKL_data<T1>& hkl_data1_, const HKL_data<T2>& hkl_data2_ ) -+ { -+ hkl_data1 = &hkl_data1_; -+ hkl_data2 = &hkl_data2_; -+ } - //! return the value and derivatives of the target function -- Rderiv rderiv( const HKL_info::HKL_reference_index& ih, const ftype& intensityh ) const; -+ Rderiv rderiv( const HKL_info::HKL_reference_index& ih, const ftype& intensityh ) const -+ { -+ Rderiv result; -+ result.r = result.dr = result.dr2 = 0.0; -+ const T1& it1 = (*hkl_data1)[ih]; -+ const T2& it2 = (*hkl_data2)[ih]; -+ if ( !it1.missing() && !it2.missing() ) -+ if ( it1.I() > 1.0e-6 && it2.I() > 1.0e-6 ) { -+ const ftype eps = ih.hkl_class().epsilon(); -+ const ftype i1 = it1.I() / eps; -+ const ftype i2 = it2.I() / eps; -+ const ftype w = sqrt( i1 * i2 ); -+ const ftype d = intensityh + log(i1) - log(i2); -+ result.r = w * d * d; -+ result.dr = 2.0 * w * d; -+ result.dr2 = 2.0 * w; -+ } -+ return result; -+ } - //! the type of the function: optionally used to improve convergence - FNtype type() const { return QUADRATIC; } - private: -@@ -109,33 +131,4 @@ - return result; - } - -- // Log I1-I2 scaling -- -- template<class T1, class T2> TargetFn_scaleLogI1I2<T1,T2>::TargetFn_scaleLogI1I2( const HKL_data<T1>& hkl_data1_, const HKL_data<T2>& hkl_data2_ ) -- { -- hkl_data1 = &hkl_data1_; -- hkl_data2 = &hkl_data2_; -- } -- -- template<class T1, class T2> TargetFn_base::Rderiv TargetFn_scaleLogI1I2<T1,T2>::rderiv( const HKL_info::HKL_reference_index& ih, const ftype& intensityh ) const -- { -- Rderiv result; -- result.r = result.dr = result.dr2 = 0.0; -- const T1& it1 = (*hkl_data1)[ih]; -- const T2& it2 = (*hkl_data2)[ih]; -- if ( !it1.missing() && !it2.missing() ) -- if ( it1.I() > 1.0e-6 && it2.I() > 1.0e-6 ) { -- const ftype eps = ih.hkl_class().epsilon(); -- const ftype i1 = it1.I() / eps; -- const ftype i2 = it2.I() / eps; -- const ftype w = sqrt( i1 * i2 ); -- const ftype d = intensityh + log(i1) - log(i2); -- result.r = w * d * d; -- result.dr = 2.0 * w * d; -- result.dr2 = 2.0 * w; -- } -- return result; -- } -- -- - #endif diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-balbes.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-balbes.patch deleted file mode 100644 index f1df3e5e19f9..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-balbes.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/share/Makefile.in b/share/Makefile.in -index 2d4f20b..4500993 100755 ---- a/share/Makefile.in -+++ b/share/Makefile.in -@@ -18,9 +18,6 @@ install : - for i in $(MRBUMP_TARGETS); do \ - test -s $(MRBUMP_BINDIR)/$$i && $(INSTALL_PROGRAM) $(MRBUMP_BINDIR)/$$i $(bindir)/$$i || true ;\ - done -- for i in $(BALBES_TARGETS); do \ -- test -s $(BALBES_BINDIR)/$$i && $(INSTALL_PROGRAM) $(BALBES_BINDIR)/$$i $(bindir)/$$i || true ;\ -- done - - clean : ; -rm -f core *.o *~ a.out - diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-double-and-make-bindir.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-double-and-make-bindir.patch deleted file mode 100644 index e62ae12adfbe..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-double-and-make-bindir.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ccp4-6.1.1/x-windows/Makefile.in 2008-08-11 19:20:01.000000000 +0200 -+++ ccp4-6.1.1/x-windows/Makefile.in.new 2009-02-27 14:32:25.000000000 +0100 -@@ -35,7 +35,7 @@ - # - # all - # --all : xdlview libjwc_c libjwc_f rotgen_ hklview xjiffy rasmol2 ipmosflm -+all : rotgen_ hklview xjiffy - # - # xdl_view - # -@@ -157,11 +157,10 @@ - # - install_obj = hklview rotgen ipmosflm - install: all -+ mkdir -p $(bindir) - $(INSTALL_PROGRAM) $(srcdir)/hklview $(bindir) - cd $(srcdir)/XCCPJIFFY ; $(MAKE) bindir=$(bindir) libdir=$(libdir) install -- $(INSTALL_PROGRAM) $(rasmol_dir)/rasmol $(bindir) - cd $(rotgen_dir); $(MAKE) install -- $(INSTALL_PROGRAM) $(mosflm_dir)/bin/ipmosflm $(bindir) - # - # clean - # diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-imosflm.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-imosflm.patch deleted file mode 100644 index f645643e1c67..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-imosflm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ccp4i/Makefile.in 2009-06-19 15:08:53.000000000 +0200 -+++ ccp4i/Makefile.in.new 2009-08-04 21:10:14.000000000 +0200 -@@ -9,7 +9,7 @@ - SHELL = /bin/sh - DESTDIR = $(prefix) - CCP4I_BINDIR = $(top_srcdir)/ccp4i/bin --CCP4I_TARGETS = ccp4i imosflm loggraph crank mapslicer -+CCP4I_TARGETS = ccp4i loggraph crank mapslicer - - install : - for i in $(CCP4I_TARGETS); do \ diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-libs.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-libs.patch deleted file mode 100644 index 1d1323005540..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-libs.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile.in 2009-06-19 15:13:29.000000000 +0200 -+++ Makefile.in.new 2009-08-02 23:06:41.000000000 +0200 -@@ -2,7 +2,7 @@ - # $Id$ - - SHELL = /bin/sh --DIRS = $(fftwdir) $(clipperdir) $(diffimdir) $(lapackdir) $(ccifdir) lib/src $(ssmdir) src lib/data unsupported/src x-windows share ccp4i $(prereleasedir) -+DIRS = src lib/data unsupported/src x-windows share ccp4i $(prereleasedir) - # this is for the benefit of makes that don't pass variable values in - # recursive invocations, so that you can override these values on the - # command line at the top level -@@ -69,19 +69,19 @@ - $(MAKE) -i $(MFLAGS) $(MVARS) install; else true; fi ; \ - $(MAKE) install - --srcdir : FORCE libdir -+srcdir : FORCE - if test -d src; then cd src; $(MAKE) $(MFLAGS) $(MVARS); else true; fi - - supported : srcdir - --unsupported : FORCE libdir -+unsupported : FORCE - if test -d unsupported/src; then cd unsupported/src; \ - $(MAKE) $(MFLAGS) $(MVARS); else true; fi - --datadir : FORCE libdir -+datadir : FORCE - cd lib/data; $(MAKE) $(MFLAGS) $(MVARS) - --xwindir : FORCE libdir -+xwindir : FORCE - if test -f x-windows/Makefile; then cd x-windows; \ - $(MAKE) -i $(MFLAGS) ; else true; fi - diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-molref.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-molref.patch deleted file mode 100644 index f16b0ecb938c..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-molref.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/pisa/Makefile.am 2007-07-10 10:56:05.000000000 +0200 -+++ src/pisa/Makefile.am.new 2009-06-11 21:16:51.000000000 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS = molref pisastore sbase -+SUBDIRS = pisastore sbase - - pkgdatadir = $(datadir)/pisa - ---- src/pisa/Makefile.in 2009-06-12 21:12:08.000000000 +0200 -+++ src/pisa/Makefile.in.new 2009-06-12 21:41:52.000000000 +0200 -@@ -82,7 +82,7 @@ - am__quote = @am__quote@ - install_sh = @install_sh@ - pisa_LDFLAGS = @pisa_LDFLAGS@ --SUBDIRS = molref pisastore sbase -+SUBDIRS = pisastore sbase - - dist_pkgdata_DATA = pisa.cfg - diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-scala.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-scala.patch deleted file mode 100644 index af4fd8219c4f..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-scala.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- ./src/Makefile.in 2009-03-20 15:06:41.000000000 +0100 -+++ ./src/Makefile.in.new 2009-07-31 23:46:13.000000000 +0200 -@@ -50,7 +50,7 @@ - - # these live in subdirectories and have more than one dependency: - OTHERS = rsps anglen secstr proclean pplot gfac2pdb tplot mplot probplot rmsdev nb \ -- scala dm dmmulti stereo mapmask maprot ncsmask \ -+ dm dmmulti stereo mapmask maprot ncsmask \ - sftools tlsanl tlsextract topp toplist dyndom sc combat mlphare fffear ffjoin \ - anisoanl $(REFMACTARGETS) dtrek2scala crunch2 pmf doser mat2symop symop2mat - -@@ -637,7 +637,7 @@ - - ### scala, mapmask, maprot, ncsmask, combat - --scala mapmask maprot ncsmask combat sc dyndom: # dependencies below -+mapmask maprot ncsmask combat sc dyndom: # dependencies below - @$(SETFLAGS) pwd=`pwd` ; rm -f $@; \ - cd $(srcdir)/$@_; \ - echo $(FC) $${$@_FLAGS-"$(FFLAGS)"} -c -o $$pwd/$@.o `pwd`/$@.f ;\ -@@ -1002,21 +1002,6 @@ - proclean: $(srcdir)/procheck/clean.f $(srcdir)/procheck/brkcln.par - rmsdev: $(srcdir)/procheck/rmsdev.f $(srcdir)/procheck/rmsdev.inc - --scaladir = $(srcdir)/scala_ --scala : $(scaladir)/scala.f $(scaladir)/column.fh $(scaladir)/orient.fh \ -- $(scaladir)/params.fh $(scaladir)/rfile.fh $(scaladir)/scales.fh \ -- $(scaladir)/nbtchc.fh $(scaladir)/parameter.fh $(scaladir)/refcon.fh \ -- $(scaladir)/rundef.fh $(scaladir)/sdfacc.fh $(scaladir)/flags.fh \ -- $(scaladir)/inout.fh $(scaladir)/dump.fh $(scaladir)/tie.fh \ -- $(scaladir)/outcon.fh $(scaladir)/version.fh $(scaladir)/anomtc.fh \ -- $(scaladir)/axes.fh $(scaladir)/bigarg.fh \ -- $(scaladir)/errors.fh $(scaladir)/flow.fh $(scaladir)/glocon.fh \ -- $(scaladir)/means.fh $(scaladir)/refflg.fh $(scaladir)/stats.fh \ -- $(scaladir)/symmty.fh $(scaladir)/sharvest.fh $(scaladir)/chtml.fh \ -- $(scaladir)/htmbuf.fh $(scaladir)/sphhrm.fh $(scaladir)/crlncf.fh \ -- $(scaladir)/datasets.fh $(scaladir)/dts_storage.fh \ -- $(scaladir)/sclinimeans.fh $(scaladir)/timecor.fh -- - freemask.o: $(dmdir)/freemask.f $(dmdir)/crystal.fh $(dmdir)/cycl.fh \ - $(dmdir)/dmheader.fh $(dmdir)/io.fh $(dmdir)/output.fh \ - $(dmdir)/params.fh $(dmdir)/uvwdata.fh diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-xia.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-xia.patch deleted file mode 100644 index 3af4af503fa6..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-xia.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/Makefile.in 2009-07-05 16:50:25.000000000 +0200 -+++ src/Makefile.in.new 2009-07-05 19:38:06.000000000 +0200 -@@ -50,9 +50,9 @@ - - # these live in subdirectories and have more than one dependency: - OTHERS = rsps anglen secstr proclean pplot gfac2pdb tplot mplot probplot rmsdev nb \ -- scala dm dmmulti stereo mapmask maprot ncsmask chef \ -+ scala dm dmmulti stereo mapmask maprot ncsmask \ - sftools tlsanl tlsextract topp toplist dyndom sc combat mlphare fffear ffjoin \ -- anisoanl $(REFMACTARGETS) dtrek2scala crunch2 pmf doser mat2symop symop2mat -+ anisoanl $(REFMACTARGETS) dtrek2scala crunch2 pmf - - # targets built from .c sources: - CSIMPLE = pltdev binsort diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-configure.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-configure.patch deleted file mode 100644 index 1e59578473ff..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-configure.patch +++ /dev/null @@ -1,111 +0,0 @@ ---- configure 2009-08-07 12:11:28.000000000 +0200 -+++ configure.new.nolib 2009-08-17 22:30:39.000000000 +0200 -@@ -3113,41 +3113,6 @@ - RX_L="$configdir/lib/rxdispencer/rx" - export RX_H RX_L - fi -- echo -- echo "Running separate configure for CCIF library." -- echo -- cd lib/ccif -- echo "Updating modification times for configuration files" -- echo "Please wait..." -- for i in configure.in aclocal.m4 configure Makefile.in; do -- touch $i && sleep 1 -- done -- echo "...done." -- -- if [ "X$LIBFOPTIM" != "X" ]; then -- FOPTIM_save=$FOPTIM -- FOPTIM=$LIBFOPTIM -- FFLAGS="${FOPTIM} ${XFFLAGS}" -- fi -- if [ "X$LIBCOPTIM" != "X" ]; then -- COPTIM_save=$COPTIM -- COPTIM=$LIBCOPTIM -- CFLAGS="${COPTIM} ${XCFLAGS}" -- fi -- ( touch /tmp/$$.cache_file 2>/dev/null && \ -- cat /dev/null > /tmp/$$.cache_file && \ -- ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --cache-file=/tmp/$$.cache_file ) || \ -- ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif -- rm -f /tmp/$$.cache_file -- if [ "X$LIBFOPTIM" != "X" ]; then -- FOPTIM=$FOPTIM_save -- FFLAGS="${FOPTIM} ${XFFLAGS}" -- fi -- if [ "X$LIBCOPTIM" != "X" ]; then -- COPTIM=$COPTIM_save -- CFLAGS="${COPTIM} ${XCFLAGS}" -- fi -- cd ../.. - echo - echo "Returning to main configure." - echo -@@ -5094,53 +5059,6 @@ - echo "configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}" - ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} - echo -- echo "CCP4 configure: Running separate configure for libjwc_c library." -- echo -- cd ${srcdir}/${xwindir}/libjwc/libjwc_c -- echo "Updating modification times for configuration files in libjwc_c" -- echo "Please wait..." -- for i in configure.in Makefile.am aclocal.m4 configure Makefile.in ltconfig ltmain.sh; do -- touch $i && sleep 1 -- done -- echo "...done." -- echo -- echo "configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}" -- ( touch /tmp/$$.cache_file 2>/dev/null && \ -- cat /dev/null > /tmp/$$.cache_file && \ -- ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} --cache-file=/tmp/$$.cache_file ) || \ -- ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} -- rm -f /tmp/$$.cache_file -- echo -- echo "CCP4 configure: Running separate configure for libjwc_f library." -- echo -- cd ${srcdir}/${xwindir}/libjwc/libjwc_f -- # for g77 3.1 some builds do not have no-common for system libs, -- # so disable for now -- echo "Updating modification times for configuration files in libjwc_f" -- echo "Please wait..." -- for i in configure.in Makefile.am aclocal.m4 configure Makefile.in ltconfig ltmain.sh; do -- touch $i && sleep 1 -- done -- echo "...done." -- echo -- # for g77 3.1 some builds do not have no-common for system libs, -- # so disable for now -- case $system in -- Darwin* ) -- echo "configure --disable-shared --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}" -- ( touch /tmp/$$.cache_file 2>/dev/null && \ -- cat /dev/null > /tmp/$$.cache_file && \ -- ./configure --disable-shared --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} --cache-file=/tmp/$$.cache_file ) || \ -- ./configure --disable-shared --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} -- ;; -- * ) -- echo "configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}" -- ( touch /tmp/$$.cache_file 2>/dev/null && \ -- cat /dev/null > /tmp/$$.cache_file && \ -- ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} --cache-file=/tmp/$$.cache_file ) || \ -- ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} -- esac -- rm -f /tmp/$$.cache_file - - if test "$non_shared" = yes; then - #this is a bit of a cheat/fudge but that's life! -@@ -5210,12 +5128,6 @@ - fi - - echo -- echo "CCP4 configure: Running separate configure for Mosflm" -- echo -- cd ${srcdir}/${mosflmdir} -- echo "configure $xopts --with-ccp4-prefix=${prefix} --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}" -- ./configure $xopts --with-ccp4-prefix=${prefix} --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} -- echo - cd ../.. - echo "Returning to main configure." - echo diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-make-dirs-in-configure.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-make-dirs-in-configure.patch deleted file mode 100644 index 583697cea0a1..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-make-dirs-in-configure.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- ccp4-6.0.99e.orig/configure 2008-07-31 10:37:22.000000000 -0700 -+++ ccp4-6.0.99e/configure 2008-07-31 10:39:18.000000000 -0700 -@@ -643,45 +643,45 @@ - # echo "! Beware -- the $system installation isn't properly tested." ; } - syswarn='echo; echo "! Beware -- the $system installation is not properly tested."' - --if test -z "$onlylibs" ; then -- for i in CCP4_SCR BINSORT_SCR; do -- if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -- else -- eval echo "! No directory \$$i and can\'t create it." -- echo " Check the value of $i." -- badvar=1 -- fi -- done -- -- for i in libdir bindir includedir; do -- if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -- else -- eval echo "! No directory \$$i and can\'t create it." -- echo " Check the argument of --$i." -- badvar=1 -- fi -- done -- -- for i in $dotsrc $dotunsupp $dotunsuppsrc $dotdeprec $dotdeprecsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do -- if test -d $i || mkdir $i; then : -- else -- eval echo "! No directory $i and can\'t create it." -- badvar=1 -- fi -- done --else -- # Kludge to fool the "Makefile" target in the top-level CCP4 -- # Makefile into not trying to remake src/Makefile.in -- for i in $srcdir/src $srcdir/lib/src ; do -- if test -d $i || mkdir $i; then -- if ! test -f $i/Makefile.in ; then -- echo -- echo "onlylibs: making dummy file $i/Makefile.in" -- touch $i/Makefile.in -- fi -- fi -- done --fi -+#if test -z "$onlylibs" ; then -+# for i in CCP4_SCR BINSORT_SCR; do -+# if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -+# else -+# eval echo "! No directory \$$i and can\'t create it." -+# echo " Check the value of $i." -+# badvar=1 -+# fi -+# done -+# -+# for i in libdir bindir includedir; do -+# if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -+# else -+# eval echo "! No directory \$$i and can\'t create it." -+# echo " Check the argument of --$i." -+# badvar=1 -+# fi -+# done -+# -+# for i in $dotsrc $dotunsupp $dotunsuppsrc $dotdeprec $dotdeprecsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do -+# if test -d $i || mkdir $i; then : -+# else -+# eval echo "! No directory $i and can\'t create it." -+# badvar=1 -+# fi -+# done -+#else -+# # Kludge to fool the "Makefile" target in the top-level CCP4 -+# # Makefile into not trying to remake src/Makefile.in -+# for i in $srcdir/src $srcdir/lib/src ; do -+# if test -d $i || mkdir $i; then -+# if ! test -f $i/Makefile.in ; then -+# echo -+# echo "onlylibs: making dummy file $i/Makefile.in" -+# touch $i/Makefile.in -+# fi -+# fi -+# done -+#fi - - ### sanity checks - diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-impl-dec.patch b/sci-chemistry/ccp4-apps/files/6.1.3-impl-dec.patch deleted file mode 100644 index db8236063043..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-impl-dec.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff --git a/lib/DiffractionImage/Bruker/FRM_LIB.c b/lib/DiffractionImage/Bruker/FRM_LIB.c -index bfda882..f821e04 100755 ---- a/lib/DiffractionImage/Bruker/FRM_LIB.c -+++ b/lib/DiffractionImage/Bruker/FRM_LIB.c -@@ -38,6 +38,8 @@ FRM_LIB: Routines for reading, writing, and handling frame files. - #include "sys/types.h" /* _open, etc. */ - #include "sys/stat.h" /* _open, etc. */ - -+#include <unistd.h> -+ - #ifndef _MSC_VER - int min(int a, int b) - { -diff --git a/lib/DiffractionImage/MAR/mar300_header.c b/lib/DiffractionImage/MAR/mar300_header.c -index 1a933de..1c40c32 100755 ---- a/lib/DiffractionImage/MAR/mar300_header.c -+++ b/lib/DiffractionImage/MAR/mar300_header.c -@@ -23,6 +23,9 @@ - */ - #include "mar300_header.h" - -+#include <sys/types.h> -+#include <unistd.h> -+ - /* - * Local functions - */ -diff --git a/lib/DiffractionImage/MAR/mar345_header.c b/lib/DiffractionImage/MAR/mar345_header.c -index a8351ea..16d0f7b 100755 ---- a/lib/DiffractionImage/MAR/mar345_header.c -+++ b/lib/DiffractionImage/MAR/mar345_header.c -@@ -32,6 +32,9 @@ - */ - #include "mar345_header.h" - -+#include <sys/types.h> -+#include <unistd.h> -+ - /* - * Definitions - */ -diff --git a/lib/DiffractionImage/MAR/nb_header.c b/lib/DiffractionImage/MAR/nb_header.c -index 07f2741..6364ca4 100755 ---- a/lib/DiffractionImage/MAR/nb_header.c -+++ b/lib/DiffractionImage/MAR/nb_header.c -@@ -20,6 +20,8 @@ - #include <io.h> - #endif - -+#include <sys/types.h> -+#include <unistd.h> - /* - * mar software include files - */ -diff --git a/lib/DiffractionImage/MAR/swap.c b/lib/DiffractionImage/MAR/swap.c -index 443bb8c..0d96b3f 100755 ---- a/lib/DiffractionImage/MAR/swap.c -+++ b/lib/DiffractionImage/MAR/swap.c -@@ -10,6 +10,9 @@ - * - **********************************************************************/ - -+#define _XOPEN_SOURCE -+#include <unistd.h> -+ - void swaplong(); - void swapshort(); - -diff --git a/lib/ccif/f_interface.c b/lib/ccif/f_interface.c -index 0f6a6b7..a09dc48 100755 ---- a/lib/ccif/f_interface.c -+++ b/lib/ccif/f_interface.c -@@ -25,6 +25,7 @@ - ********************************************************************/ - - #include "stdpccts.h" -+#include <sys/mman.h> - - /* This file is terribly organised, and badly needs re-doing. There is probably - * scope for splitting this into three modules: -diff --git a/lib/src/ccp4_general_f.c b/lib/src/ccp4_general_f.c -index 8b5d04f..74ee3f7 100755 ---- a/lib/src/ccp4_general_f.c -+++ b/lib/src/ccp4_general_f.c -@@ -26,6 +26,7 @@ - #include <string.h> - #include <stdlib.h> - #include <math.h> -+#include <time.h> - #include "ccp4_errno.h" - #include "ccp4_fortran.h" - #include "ccp4_parser.h" -diff --git a/lib/src/ccp4_program.c b/lib/src/ccp4_program.c -index 3e83d4d..bb3e975 100755 ---- a/lib/src/ccp4_program.c -+++ b/lib/src/ccp4_program.c -@@ -25,6 +25,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <time.h> - #include "ccp4_program.h" - #include "ccp4_parser.h" - #include "ccp4_utils.h" -diff --git a/lib/src/fsplit.c b/lib/src/fsplit.c -index ee8af24..c6fb3cd 100755 ---- a/lib/src/fsplit.c -+++ b/lib/src/fsplit.c -@@ -50,6 +50,7 @@ static char sccsid[] = "@(#)fsplit.c 5.5 (Berkeley) 3/12/91"; - #include <string.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <unistd.h> - - /* - * usage: fsplit [-e efile] ... [file] -diff --git a/src/clipper_progs/src/pirate/compress42.c b/src/clipper_progs/src/pirate/compress42.c -index ea52e96..30dbd56 100755 ---- a/src/clipper_progs/src/pirate/compress42.c -+++ b/src/clipper_progs/src/pirate/compress42.c -@@ -142,6 +142,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <errno.h> -+#include <unistd.h> - - #ifdef DIRENT - # include <dirent.h> -diff --git a/src/mtz2cif_/mtz2cif.c b/src/mtz2cif_/mtz2cif.c -index e224430..c7b82f4 100755 ---- a/src/mtz2cif_/mtz2cif.c -+++ b/src/mtz2cif_/mtz2cif.c -@@ -28,6 +28,7 @@ - #include "cmtzlib.h" - #include "ccp4_parser.h" - #include "ccp4_general.h" -+#include "ccp4_program.h" - #include "csymlib.h" - #include "mtz2cif_lib.h" - -diff --git a/x-windows/XCCPJIFFY/xplot84driver.c b/x-windows/XCCPJIFFY/xplot84driver.c -index 67e0bf1..76526ab 100755 ---- a/x-windows/XCCPJIFFY/xplot84driver.c -+++ b/x-windows/XCCPJIFFY/xplot84driver.c -@@ -11,6 +11,7 @@ - - #include <stdio.h> - #include <sys/types.h> -+#include <stdlib.h> - - #include <X11/StringDefs.h> - #include <X11/Intrinsic.h> diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch b/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch deleted file mode 100644 index 62892db01147..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch +++ /dev/null @@ -1,597 +0,0 @@ -diff --git a/configure b/configure -index 833f483..bcfa62d 100755 ---- a/configure -+++ b/configure -@@ -3226,574 +3226,14 @@ else - echo - echo "Warning: this option has not been extensively tested!" - echo "Please report problems to ccp4@ccp4.ac.uk" -- # Search for vendor LAPACK/BLAS first -- if test ! "$with_netlib_lapack" ; then -- # Initialise variables to blank -- lapackdir= -- XLAPACK_LIB= -- # Possible directories to check for vendor or pre-existing LAPACK or -- # BLAS - add to these if you want to test others -- trydirs="`echo $LD_LIBRARY_PATH |sed -e s/:/\ /g` /lib /usr/lib /usr/local/lib" -- # Possible library names -- # These are the names like xxxx where the library will be libxxxx.a -- # or libxxxx.so -- echo -- echo "Guessing names for native/vendor LAPACK and/or BLAS libraries" -- echo "on this system" -- case $system in -- linux | linux64 | linux32 ) -- # linux users will usually have them in /usr/lib but don't call it -- trylapack="lapack" -- tryblas="blas" -- # if code is non_shared then this can lead to problems. both blas and lapack -- # need to be resolved even if they are not called! -- if test "$non_shared" = yes; then -- echo "You are compiling linux non_shared. This sometimes causes problems " -- echo " so checking for requirements." -- echo "Checking: try to link library against test program" -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF -- PROGRAM TESTLINK --C A bit of scala code to test the linking -- real bf(3), bnorm --c -- integer maxbmt -- parameter (maxbmt = 2) -- double precision B(maxbmt,maxbmt), eigval(maxbmt), -- $ eigvec(maxbmt,maxbmt), w(5*maxbmt) -- integer m, ia, ix, istat --c -- B(1,1) = 1.00 -- B(1,2) = 1.00 -- B(2,1) = 1.00 -- B(2,2) = 1.00 --c -- m = maxbmt -- ia = maxbmt -- ix = maxbmt -- call dsyev('N', 'L', m, B, ia, eigval, w, 5*maxbmt, istat) -- end --EOF -- #firstly test without -lblas -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack" -- echo $test_compile -- if { (eval $test_compile >& /dev/null ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- echo "... only -llapack needed" -- XLAPACK_LIB="-llapack" -- # Set the next two variables so that configure -- # doesn't try to build netlib libraries -- LAPACKLIB="lapack" -- noblas=yes -- trylapack= -- tryblas= -- else -- echo "more than just -llapack needed...." -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack -lblas" -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- echo "...-llapack and -lblas were needed" -- XLAPACK_LIB="-llapack -lblas" -- # Set the next two variables so that configure -- # doesn't try to build netlib libraries -- LAPACKLIB="lapack blas" -- noblas=no -- trylapack= -- tryblas= -- else -- echo "....could not find either lapack or blas." -- fi -- fi -- fi -- # add 64 bit libs -- case $system in -- linux64 ) trydirs="/usr/lib64 ${trydirs}" ;; -- esac -- -- ;; -- osf1) -- # OSF1 has dxml (old version) and cxml -- # which should have both lapack and blas -- trylapack="dxml cxml" -- tryblas= -- trydirs="${trydirs} /usr/shlib" -- ;; -- irix) -- # Additional search paths for IRIX -- trydirs="${trydirs} /usr/lib32" -- # SCSL should have both LAPACK and BLAS -- trylapack="scs" -- tryblas="blas" -- ;; -- irix64) -- # Additional search paths for IRIX64 -- trydirs="${trydirs} /usr/lib64" -- # SCSL should have both LAPACK and BLAS -- trylapack="scs" -- tryblas="blas" -- # Extra compiler flags? -- #XLAPACKFLAGS="-OPT:IEEE_NaN_inf=ON" -- ;; -- aix) -- # Additional search paths for AIX -- trydirs="${trydirs}" -- # AIX might have ESSL library - blas only I think -- trylapack= -- tryblas="essl" -- ;; -- hpux) -- # Additional search paths for HPUX -- trydirs="${trydirs} /opt/fortran/lib /opt/fortran/lib/pa2.0 /opt/mlib/lib/pa2.0" -- # HPUX should have both LAPACK (part of mlib) and BLAS -- trylapack="lapack" -- tryblas="blas" -- # Extra compiler flags? -- # +U77 required for ETIME function - this is already in XFFLAGS -- #XLAPACKFLAGS="+U77" -- ;; -- -- sunos | sunos64) -- # Sun has libraries with BLAS and LAPACK invoked using -- # -xlic_lib=sunperf -- trylapack= -- tryblas= -- echo "SunOs can use the Sun Performance Library (if installed)" -- echo "which has both BLAS and LAPACK 3.0" -- echo -- echo "Looking for a valid library to use..." -- echo -- # Loop over the possible library names -- try_libs="sunperf" -- for testlib in $try_libs -- do -- if test ! "$XLAPACK_LIB" ; then -- # Try running a test compile to see if this a valid library -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF --c Test fortran program to link against library -- PROGRAM TESTLINK -- IMPLICIT NONE -- INTEGER A -- A = 1 -- STOP -- END --EOF -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -dalign -xlic_lib=$testlib" -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- echo "... -xlic_lib=$testlib is okay" -- XLAPACK_LIB="-dalign -xlic_lib=$testlib" -- # Set the next two variables so that configure -- # doesn't try to build netlib libraries -- LAPACKLIB="$testlib" -- noblas=yes -- else -- # Compilation failed -- echo "... cannot use -xlic_lib=$testlib" -- fi -- # End of test for testlib -- fi -- # End of loop over possible lib names -- done -- # Report if no suitable library was found -- if test ! "$XLAPACK_LIB" ; then -- echo -- echo "No suitable LAPACK library was found." -- echo "This may be because the Sun Performance Library is not" -- echo "installed on your system" -- echo "Contact your system administrator or Sun vendor" -- fi -- ;; -- Darwin | Darwin32 | Darwin64 ) -- # Darwin has libraries with BLAS and LAPACK invoked using -- # -framework vecLib -- echo "Darwin can use the vecLib Library (if installed)" -- echo "which has both BLAS and LAPACK 3.0" -- echo -- # This is a special case so try running a test compile -- echo "Checking: try to link library against test program" -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF --c Test fortran program to link against library -- PROGRAM TESTLINK -- IMPLICIT NONE -- INTEGER A -- A = 1 -- STOP -- END --EOF -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -framework vecLib" -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- echo "... -framework vecLib is okay" -- XLAPACK_LIB="-framework vecLib" -- # Set the next two variables so that configure -- # doesn't try to build netlib libraries -- LAPACKLIB="vecLib" -- noblas=yes -- else --#alternative linking for vecLib libraries -- case `uname -sr` in -- *Darwin\ 7.* ) test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -lcc_dynamic -Wl,-framework -Wl,vecLib" ;; -- * ) test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -Wl,-framework -Wl,vecLib" ;; -- esac -- -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- echo "... -framework vecLib is okay" -- XLAPACK_LIB="-Wl,-framework -Wl,vecLib" -- # Set the next two variables so that configure -- # doesn't try to build netlib libraries -- LAPACKLIB="-Wl,-framework -Wl,vecLib" -- noblas=yes -- else -- # Compilation failed -- echo "... cannot use -framework vecLib" -- echo -- fi -- fi -- trylapack= -- tryblas= --# try the fink installation -- trydirs="${trydirs} /sw" -- ;; -- Darwin_ibm_compilers ) -- # Darwin has libraries with BLAS and LAPACK invoked using -- # -framework vecLib -- echo "Darwin can use the vecLib Library (if installed)" -- echo "which has both BLAS and LAPACK 3.0" -- echo -- # This is a special case so try running a test compile -- echo "Checking: try to link library against test program" -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF --c Test fortran program to link against library -- PROGRAM TESTLINK -- IMPLICIT NONE -- INTEGER A -- A = 1 -- STOP -- END --EOF -- case `uname -sr` in -- Darwin\ 8* ) -- XLAPACK_LIB="-L/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A -lLAPACK -lBLAS" -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f $XLAPACK_LIB" -- ;; -- Darwin\ 7* ) -- XLAPACK_LIB="-L/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A -lLAPACK -lBLAS" -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -lcc_dynamic $XLAPACK_LIB" -- ;; -- *) -- XLAPACK_LIB="/System/Library/Frameworks/vecLib.Framework/Versions/Current/VecLib" -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f $XLAPACK_LIB" -- esac -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- echo "... -framework vecLib is okay" -- # Set the next two variables so that configure -- # doesn't try to build netlib libraries -- LAPACKLIB="vecLib" -- noblas=yes -- else -- # Compilation failed -- XLAPACK_LIB="" -- echo "... cannot use -framework vecLib" -- echo -- fi -- trylapack= -- tryblas= --# try the fink installation -- trydirs="${trydirs} /sw" -- ;; -- -- Darwin_intel_compilers) -- # Darwin has libraries with BLAS and LAPACK invoked using -- # -F vecLib -- echo "Darwin can use the vecLib Library (if installed)" -- echo "which has both BLAS and LAPACK 3.0" -- echo -- # This is a special case so try running a test compile -- echo "Checking: try to link library against test program" -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF --c Test fortran program to link against library -- PROGRAM TESTLINK -- IMPLICIT NONE -- INTEGER A -- A = 1 -- STOP -- END --EOF -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -Wl,-framework -Wl,vecLib" -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- # doesn't try to build netlib libraries -- XLAPACK_LIB="-F /System/Library/Frameworks -Qoption,ld,-framework -Qoption,ld,vecLib" -- LAPACKLIB="vecLib" -- noblas=yes -- else -- # Compilation failed -- echo "... cannot use -framework vecLib" -- echo -- fi -- trylapack= -- tryblas= --# try the fink installation -- trydirs="${trydirs} /sw" -- ;; -- --# linux_ia64_sgi_altix) --# SGI Japan -- ia64_linux_intel) -- # Additional search paths for Linux/IA64 -- trydirs="${trydirs} /opt/scsl/lib /usr/lib /usr/local/lib" -- # SCSL and MKL should have both LAPACK and BLAS -- trylapack="mkl_lapack scs lapack" -- tryblas="mkl scs blas" -- ;; -- linux_ibm_compilers ) -- trylapack="lapack" -- tryblas="blas" -- ;; -- linux64_ibm_compilers ) -- trydirs="/usr/lib64 ${trydirs}" -- trylapack="lapack" -- tryblas="blas" -- ;; -- linux_intel_compilers ) -- trydirs="/usr/lib64 ${trydirs}" -- trylapack="mkl_lapack lapack" -- tryblas="mkl blas" -- ;; -- *) -- echo "The guesses for this system may not be correct - please" -- echo "e-mail ccp4@ccp4.ac.uk if you have any extra information" -- echo -- # Default guess is just libblas -- trylapack="lapack" -- tryblas="blas" -- ;; -- esac -- # -- # Search for LAPACK libraries -- # -- # Write out what the guesses are -- if test "$trylapack" ; then -- echo "Possible LAPACK library names for this system:" -- for libname in $trylapack -- do -- echo " lib$libname" -- done -- # Possible library name extensions -- tryexts="a so dylib" -- # Now loop over all the possibilities and see if anything -- # turns up -- echo -- echo "Searching for libraries with LAPACK and BLAS:" -- for testdir in $trydirs -- do -- for testlib in $trylapack -- do -- for ext in $tryexts -- do -- if test ! "$LAPACKLIB"; then -- if test -s "$testdir/lib$testlib.$ext" ; then -- echo "...found LAPACK library: $testdir/lib$testlib.$ext" -- # Now try and link to a test program -- # This is really for IRIX where libraries can be -- # o32 or n32 -- echo " Testing: try to link library against test program" -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF --c Test fortran program to link against library -- PROGRAM TESTLINK -- IMPLICIT NONE -- INTEGER A -- A = 1 -- STOP -- END --EOF -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib" -- test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS" -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- have_lapack=yes -- else --# cover clapack option -- echo $test_ccompile -- if { (eval $test_ccompile ) 2>&1; } && test -s testlink ; then -- have_lapack=yes -- fi -- fi -- if test x$have_lapack = xyes ; then -- # This one is okay -- LAPACKLIB="$testlib" -- LAPACKDIR="$testdir" -- echo "Link ok - using lib$LAPACKLIB from $LAPACKDIR" -- # -- XLAPACK_LIB="-L$LAPACKDIR -l$LAPACKLIB" -- # -- # Test to see if we need BLAS too -- # Do this by trying to compile a test program -- # Use the LSAME test for now -- echo -- echo " * Checking whether we need a separate BLAS library *" -- echo " Testing: try linking library against test program" -- cd lib/lapack/test -- if test -f testlsame ; then -- rm -f testsame testlsame.o -- fi -- test_compile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB" -- test_ccompile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB $XLDFLAGS" -- echo $test_compile -- if { ( eval $test_compile) 2>&1;} && test -s testlsame ; then -- have_blas=yes -- else --#cblas route -- echo $test_ccompile -- if { ( eval $test_ccompile) 2>&1;} && test -s testlsame ; then -- have_blas=yes -- fi -- fi -- if test x$have_blas = xyes ; then -- echo "Test program okay - additional separate BLAS not required" -- noblas=yes -- else -- echo "Test program failed - need a separate BLAS library" -- fi -- cd ../../.. -- else -- # Keep looking -- echo " link failed - cannot use lib$testlib" -- fi -- fi -- fi -- done -- done -- if test ! "$LAPACKLIB"; then -- echo "...nothing in $testdir" -- fi -- done -- fi -- -- # If LAPACKLIB hasn't been set at this point then no LAPACK library -- # was found -- if test ! "$LAPACKLIB" ; then -- echo -- echo "No pre-existing LAPACK library found - NetLib LAPACK will be built instead" -- make_lapack=lapacklib -- fi -- # Look for possible BLAS -- if test ! "$noblas" ; then -- if test "$tryblas" ; then -- echo -- echo "Possible BLAS library names for this system:" -- for libname in $tryblas -- do -- echo " lib$libname" -- done -- # Possible library name extensions -- tryexts="a so" -- # Now loop over all the possibilities and see if anything -- # turns up -- echo -- echo "Searching for libraries with BLAS:" -- for testdir in $trydirs -- do -- for testlib in $tryblas -- do -- for ext in $tryexts -- do -- if test ! "$BLASLIB"; then -- if test -s "$testdir/lib$testlib.$ext" ; then -- echo "...found BLAS library: $testdir/lib$testlib.$ext" -- # Now try and link to a test program -- # This is really for IRIX where libraries can be -- # o32 or n32 -- echo " Testing: try to link library against test program" -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF --c Test fortran program to link against library -- PROGRAM TESTLINK -- IMPLICIT NONE -- INTEGER A -- A = 1 -- STOP -- END --EOF -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib" -- test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS" -- echo $test_compile -- if { ( eval $test_compile) 2>&1;} && test -s testlink ; then -- have_blas=yes -- else -- echo $test_ccompile -- if { ( eval $test_compile) 2>&1;} && test -s testlink ; then -- have_blas=yes -- fi -- fi -- if test x$have_blas = xyes ; then -- # This one is okay -- BLASLIB="$testlib" -- BLASDIR="$testdir" -- BLASEXT="$ext" -- echo "Link ok - using lib$BLASLIB from $BLASDIR" -- XLAPACK_LIB="$XLAPACK_LIB -L$BLASDIR -l$BLASLIB" -- else -- # Keep looking -- echo " link failed - cannot use lib$testlib" -- fi -- fi -- fi -- done -- done -- if test ! "$BLASLIB"; then -- echo "...nothing in $testdir" -- fi -- done -- fi -- # Do we need to build BLAS too? -- if test ! "$BLASLIB" ; then -- echo -- echo "No pre-existing BLAS library was found - NetLib BLAS will be built instead" -- echo "This may result in poorer performance of the LAPACK routines" -- make_blas=blaslib -- BLASLIB=blas -- BLASDIR="$srcdir/lib/lapack" -- BLASEXT="a" -- fi -- fi -+ # gentoo is clever -+ make_blas= -+ make_lapack= -+ BLASLIB=$(${PKG_CONFIG} --libs blas) -+ LAPACKLIB=$(${PKG_CONFIG} --libs lapack) -+ XLAPACK_LIB="${BLASLIB} ${LAPACKLIB}" -+ XFFLAGS_LAPACK="$(${PKG_CONFIG} --cflags lapack blas)" - # Otherwise force building of NetLib BLAS and LAPACK libs -- else -- echo -- echo "! Force building of NetLib BLAS and LAPACK..." -- make_blas=blaslib -- make_lapack=lapacklib -- BLASLIB=blas -- BLASDIR="$srcdir/lib/lapack" -- BLASEXT="a" -- fi - # need to know if we the lapack library was linked using the C or - # fortran linker - if test -f testlink.f || test -f testlink || test -f testlink.c ; then -@@ -3916,8 +3356,8 @@ RANLIB = ${RANLIB} - INSTALL_DATA = ${INSTALL_DATA} - libdir = $libdir - # --BLASLIB = lib${BLASLIB}.${BLASEXT} --LAPACKLIB = liblapack.a -+BLASLIB = ${BLASLIB} -+LAPACKLIB = ${LAPACKLIB} - # - # These variables define targets in the main Makefile - blaslib = ${make_blas} diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-pisa.patch b/sci-chemistry/ccp4-apps/files/6.1.3-pisa.patch deleted file mode 100644 index 9d8fefe965e5..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-pisa.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/pisa/sbase/Makefile.am b/src/pisa/sbase/Makefile.am -index 053e83a..4ff3394 100755 ---- a/src/pisa/sbase/Makefile.am -+++ b/src/pisa/sbase/Makefile.am -@@ -1,4 +1,4 @@ --pkgdatadir = $(datadir)/sbase -+pkgdatadir = $(datadir)/pisa/sbase - dist_pkgdata_DATA = \ - graph.sbase index.sbase struct.sbase - -diff --git a/src/pisa/sbase/Makefile.in b/src/pisa/sbase/Makefile.in -index faa3f7f..8630bd7 100755 ---- a/src/pisa/sbase/Makefile.in -+++ b/src/pisa/sbase/Makefile.in -@@ -62,7 +62,7 @@ POST_UNINSTALL = : - EXEEXT = @EXEEXT@ - OBJEXT = @OBJEXT@ - PATH_SEPARATOR = @PATH_SEPARATOR@ --pkgdatadir = $(datadir)/sbase -+pkgdatadir = $(datadir)/pisa/sbase - AMTAR = @AMTAR@ - AR_FLAGS = @AR_FLAGS@ - AWK = @AWK@ diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-pythonpath.patch b/sci-chemistry/ccp4-apps/files/6.1.3-pythonpath.patch deleted file mode 100644 index 7a012be6ef02..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-pythonpath.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/ccp4-6.1.2/include/ccp4.setup-bash b/ccp4-6.1.2/include/ccp4.setup-bash -index 9848101..cea8ae6 100755 ---- a/ccp4-6.1.2/include/ccp4.setup-bash -+++ b/ccp4-6.1.2/include/ccp4.setup-bash -@@ -188,9 +188,9 @@ fi - #Python path for the subprocess fixed module - - if [ $ccp4_first_in_path -eq 1 ]; then -- setenv PYTHONPATH ${CCP4}/share/python:${PYTHONPATH} -+ setenv PYTHONPATH ${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python:${PYTHONPATH} - else -- setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/python -+ setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python - fi - - ### PLOT_COMMAND PRINT_COMMAND for the XCCPJIFFY programs to compile ### -diff --git a/ccp4-6.1.2/include/ccp4.setup-csh b/ccp4-6.1.2/include/ccp4.setup-csh -index 42f0820..93c2cf3 100755 ---- a/ccp4-6.1.2/include/ccp4.setup-csh -+++ b/ccp4-6.1.2/include/ccp4.setup-csh -@@ -180,9 +180,9 @@ endif - #Python path for the subprocess fixed module - if (${?PYTHONPATH}) then - if ($ccp4_first_in_path) then -- setenv PYTHONPATH ${CCP4}/share/python:${PYTHONPATH} -+ setenv PYTHONPATH ${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python:${PYTHONPATH} - else -- setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/python -+ setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python - endif - else - setenv PYTHONPATH ${CCP4}/share/python -diff --git a/ccp4-6.1.2/include/ccp4.setup-sh b/ccp4-6.1.2/include/ccp4.setup-sh -index 4396ebf..a0455bd 100755 ---- a/ccp4-6.1.2/include/ccp4.setup-sh -+++ b/ccp4-6.1.2/include/ccp4.setup-sh -@@ -228,9 +228,9 @@ test -r $CCP4/include/ccp4.msg && cat $CCP4/include/ccp4.msg - #Python path for the subprocess fixed module - - if test $ccp4_first_in_path -eq 1; then -- export PYTHONPATH=${CCP4}/share/python:${PYTHONPATH} -+ export PYTHONPATH=${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python:${PYTHONPATH} - else -- export PYTHONPATH=${PYTHONPATH}:${CCP4}/share/python -+ export PYTHONPATH=${PYTHONPATH}:${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python - fi - - ################### THE REST SHOULDN'T NEED EDITING ##################### -diff --git a/ccp4-6.1.2/include/ccp4.setup-zsh b/ccp4-6.1.2/include/ccp4.setup-zsh -index 0e5c2ce..53523f3 100755 ---- a/ccp4-6.1.2/include/ccp4.setup-zsh -+++ b/ccp4-6.1.2/include/ccp4.setup-zsh -@@ -157,10 +157,10 @@ export CLASSPATH - #Python path for the subprocess fixed module - - if ($ccp4_first_in_path) then -- PYTHONPATH=${CCP4}/share/python:${PYTHONPATH} -+ PYTHONPATH=${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python:${PYTHONPATH} - export PYTHONPATH - else -- PYTHONPATH=${PYTHONPATH}:${CCP4}/share/python -+ PYTHONPATH=${PYTHONPATH}:${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python - export PYTHONPATH - fi - diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-rename-rapper-ng.patch b/sci-chemistry/ccp4-apps/files/6.1.3-rename-rapper-ng.patch deleted file mode 100644 index a5144cfa5d33..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-rename-rapper-ng.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/src/Makefile.in b/src/Makefile.in -index 70781f3..b2dcc25 100755 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -760,7 +760,7 @@ chainsawobjs = chainsaw.o - pdbcur : $(pdbcurobjs) - @$(SETFLAGS) ; rm -f pdbcur; eval $(CXX) $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -o pdbcur $(pdbcurobjs) $(LDCXXFLAGS) - ncont : $(ncontobjs) -- @$(SETFLAGS) ; rm -f ncont; eval $(CXX) $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -o ncont $(ncontobjs) $(LDCXXFLAGS) -+ @$(SETFLAGS) ; rm -f ncont; eval $(CXX) $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -o ncont $(ncontobjs) $(LDCXXFLAGS) -lmmdb - coord_format : $(coord_formatobjs) - @$(SETFLAGS) xxx=1 ; \ - rm -f coord_format; \ -diff --git a/src/rapper/LOOP/Makefile.am b/src/rapper/LOOP/Makefile.am -index 85f212e..2608c6d 100755 ---- a/src/rapper/LOOP/Makefile.am -+++ b/src/rapper/LOOP/Makefile.am -@@ -15,12 +15,12 @@ params.cpp typed_value.cpp misc.cpp residue.cpp atom.cpp psa.cpp edm_sidechains. - hash_table.cpp surface.cpp parse.cpp band.cpp edensity.cpp read_map.cpp iterator.cpp \ - residue_range.cpp pop_search_frags.cpp saxs.cpp lib_choral.cpp pdf.cpp WeightedDistribMean.cpp - --rapper_LDADD = ../gc7.0/libgc.la ../libxml2/libxml2.la -+rapper_LDADD = @GC_LIBS@ @LIBXML_LIBS@ - - pkgdatadir = $(datadir)/rapper - dist_pkgdata_DATA = params.xml - --INCLUDES = -I. -I../gc7.0/include -I../libxml2/include -+INCLUDES = -I. @LIBXML_CFLAGS@ @GC_CFLAGS@ - #SUBDIRS = \ - #@PYTHON_USE_TRUE@ python - -diff --git a/src/rapper/Makefile.am b/src/rapper/Makefile.am -index e78b10d..486b931 100755 ---- a/src/rapper/Makefile.am -+++ b/src/rapper/Makefile.am -@@ -1,3 +1,3 @@ --SUBDIRS = libxml2 gc7.0 LOOP data -+SUBDIRS = LOOP data - - EXTRA_DIST = -diff --git a/src/rapper/configure.ac b/src/rapper/configure.ac -index 5e4ef69..268a579 100755 ---- a/src/rapper/configure.ac -+++ b/src/rapper/configure.ac -@@ -48,6 +48,13 @@ AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno) - - AC_SUBST(rapper_LDFLAGS) - --AC_CONFIG_SUBDIRS([gc7.0 libxml2]) -+PKG_CHECK_MODULES([LIBXML],[libxml-2.0]) -+AC_SUBST([LIBXML_CFLAGS]) -+AC_SUBST([LIBXML_LIBS]) -+ -+PKG_CHECK_MODULES([GC],[bdw-gc]) -+AC_SUBST([GC_CFLAGS]) -+AC_SUBST([GC_LIBS]) -+ - #AC_OUTPUT(Makefile LOOP/Makefile LOOP/python/Makefile data/Makefile) - AC_OUTPUT(Makefile LOOP/Makefile data/Makefile) diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-unbundle.patch b/sci-chemistry/ccp4-apps/files/6.1.3-unbundle.patch deleted file mode 100644 index 107cfd740238..000000000000 --- a/sci-chemistry/ccp4-apps/files/6.1.3-unbundle.patch +++ /dev/null @@ -1,131 +0,0 @@ - src/Makefile.in | 14 +++++----- - src/pisa/configure.ac | 67 +++++++++---------------------------------------- - 2 files changed, 19 insertions(+), 62 deletions(-) - -diff --git a/src/Makefile.in b/src/Makefile.in -index 70781f3..b11db04 100755 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -778,8 +778,8 @@ chainsaw : $(chainsawobjs) - eval $(CXX) $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -o chainsaw $(chainsawobjs) $(LDCXXFLAGS) - pdbcur.o pcur_funcs.o ncont.o coord_format.o pdb_merge.o chainsaw.o: # dependencies at end - @$(SETFLAGS) xxx=1 ; \ -- echo $(CXX) -I$(mmdb_appdir) -I$(incdir) -I$(incdir)/mmdb $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(mmdb_appdir)/`basename $@ .o`.cpp ; -- eval $(CXX) -I$(mmdb_appdir) -I$(incdir) -I$(incdir)/mmdb $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(mmdb_appdir)/`basename $@ .o`.cpp -+ echo $(CXX) -I$(mmdb_appdir) -I$(incdir) `pkg-config --cflags mmdb` $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(mmdb_appdir)/`basename $@ .o`.cpp ; -+ eval $(CXX) -I$(mmdb_appdir) -I$(incdir) `pkg-config --cflags mmdb` $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(mmdb_appdir)/`basename $@ .o`.cpp - - ### bp3, afro, gcx - -@@ -813,8 +813,8 @@ gcx : libbp3 $(gcxobjs) - - $(libbp3objs) $(bp3objs) $(afroobjs) $(gcxobjs) : # dependencies at end - @$(SETFLAGS) xxx=1 ; \ -- echo $(CXX) -I$(bp3dir) -I$(incdir) -I$(incdir)/mmdb $${bp3_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(bp3dir)/`basename $@ .o`.C ; \ -- eval $(CXX) -I$(bp3dir) -I$(incdir) -I$(incdir)/mmdb $${bp3_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(bp3dir)/`basename $@ .o`.C -+ echo $(CXX) -I$(bp3dir) -I$(incdir) `pkg-config --cflags mmdb` $${bp3_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(bp3dir)/`basename $@ .o`.C ; \ -+ eval $(CXX) -I$(bp3dir) -I$(incdir) `pkg-config --cflags mmdb` $${bp3_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(bp3dir)/`basename $@ .o`.C - - ### crunch2 pmf - -@@ -853,7 +853,7 @@ cif2xml : $(cif2xmlobjs) - cross_validate : $(cross_validateobjs) - @$(SETFLAGS); rm -f cross_validate; eval $(CXX) $${harvest_app_FLAGS-"$(CXXFLAGS)"} -o cross_validate $(cross_validateobjs) $(LDCXXFLAGS) - cif2xml.o cross_validate.o : # dependencies at end -- @$(SETFLAGS); eval $(CXX) -I$(harvest_appdir) -I$(incdir) -I$(incdir)/mmdb $${harvest_app_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(harvest_appdir)/`basename $@ .o`.cpp -+ @$(SETFLAGS); eval $(CXX) -I$(harvest_appdir) -I$(incdir) `pkg-config --cflags mmdb` $${harvest_app_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(harvest_appdir)/`basename $@ .o`.cpp - - pdb_extractdir = $(srcdir)/harvest_app_/pdb_extract - pdb_extract_suite : -@@ -873,8 +873,8 @@ $(dev_tools_ctargets) : - $(dev_tools_cxxtargets) : - @$(SETFLAGS) xxx=1; \ - rm -f $@; \ -- echo $(CXX) $${dev_tools_FLAGS-"$(CXXFLAGS)"} -o $@ $(dev_toolsdir)/$@.cpp -I$(incdir) -I$(incdir)/mmdb $(LDCXXFLAGS) ;\ -- eval $(CXX) $${dev_tools_FLAGS-"$(CXXFLAGS)"} -o $@ $(dev_toolsdir)/$@.cpp -I$(incdir) -I$(incdir)/mmdb $(LDCXXFLAGS) -+ echo $(CXX) $${dev_tools_FLAGS-"$(CXXFLAGS)"} -o $@ $(dev_toolsdir)/$@.cpp -I$(incdir) `pkg-config --cflags mmdb` $(LDCXXFLAGS) ;\ -+ eval $(CXX) $${dev_tools_FLAGS-"$(CXXFLAGS)"} -o $@ $(dev_toolsdir)/$@.cpp -I$(incdir) `pkg-config --cflags mmdb` $(LDCXXFLAGS) - - ### mlphare - mlphare: -diff --git a/src/pisa/configure.ac b/src/pisa/configure.ac -index 81afdda..044b6f8 100755 ---- a/src/pisa/configure.ac -+++ b/src/pisa/configure.ac -@@ -31,64 +31,21 @@ AC_CHECK_FUNCS([floor pow rint sqrt]) - # test for function in m - AC_CHECK_LIB([m], [sqrt]) - --dnl Optional: Check for MMDB. --AM_PATH_MMDB(, -- [ if test "x$mmdb_prefix" != x ; then -- if test "x$ac_MMDB_CXXFLAGS" != x && test "x$ac_MMDB_LDOPTS" = x ; then -- case "$ac_MMDB_CXXFLAGS" in -- *src/mmdb ) -- ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#src/mmdb#src#g` -- ;; -- *include/mmdb ) -- ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#include/mmdb#lib#g` -- ;; -- *) -- esac -- MMDB_CXXFLAGS="$ac_MMDB_CXXFLAGS" -- MMDB_LIBS=`echo "$ac_MMDB_LDOPTS -lmmdb" | sed s#-I#-L#` -- AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS]) -- else -- MMDB_CXXFLAGS="-I$mmdb_prefix/src -I$mmdb_prefix/src/mmdb -I$mmdb_prefix/include -I$mmdb_prefix/include/mmdb" -- MMDB_LIBS="-L$mmdb_prefix/src -L$mmdb_prefix/lib -lmmdb" -- AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS]) -- fi -- else -- AC_MSG_ERROR([mmdb not found]) -- fi -- ] --) -+PKG_CHECK_MODULES([MMDB],[mmdb]) -+PKG_CHECK_MODULES([SSM],[ssm]) -+ -+MMDB_CXXFLAGS=${MMDB_CFLAGS} -+ -+AC_SUBST([MMDB_CFLAGS]) -+AC_SUBST([MMDB_CXXFLAGS]) -+AC_SUBST([SSM_CFLAGS]) -+ -+AC_SUBST([MMDB_LIBS]) -+AC_SUBST([SSM_LIBS]) - --ac_saved_CXXFLAGS=$CXXFLAGS --ac_saved_LIBS=$LIBS - CXXFLAGS="$CXXFLAGS $MMDB_CXXFLAGS" - LIBS="$MMDB_LIBS $LIBS" --AM_PATH_SSM(, -- [ if test "x$ssm_prefix" != x ; then -- if test "x$ac_SSM_CXXFLAGS" != x && test "x$ac_SSM_LDOPTS" = x ; then -- case "$ac_SSM_CXXFLAGS" in -- *lib/ssm ) -- ac_SSM_LDOPTS=`echo "$ac_SSM_CXXFLAGS" | sed s#lib/ssm#lib#g` -- ;; -- *include/ssm ) -- ac_SSM_LDOPTS=`echo "$ac_SSM_CXXFLAGS" | sed s#include/ssm#lib#g` -- ;; -- *) -- esac -- SSM_CXXFLAGS="$ac_SSM_CXXFLAGS" -- SSM_LIBS=`echo "$ac_SSM_LDOPTS -lssm" | sed s#-I#-L#` -- AC_MSG_WARN([assuming library $SSM_LIBS headers $SSM_CXXFLAGS]) -- else -- SSM_CXXFLAGS="-I$ssm_prefix/include/ssm -I$ssm_prefix/lib/ssm" -- SSM_LIBS="-L$ssm_prefix/lib -L$ssm_prefix/lib/ssm -lssm" -- AC_MSG_WARN([assuming library $SSM_LIBS headers $SSM_CXXFLAGS]) -- fi -- else -- AC_MSG_ERROR([ssm not found]) -- fi -- ] --) --CXXFLAGS=$ac_saved_CXXFLAGS --LIBS=$ac_saved_LIBS -+ - - # Checks for typedefs, structures, and compiler characteristics. - # diff --git a/sci-chemistry/ccp4-apps/files/ccp4-apps-6.1.3-tcl8.6.patch b/sci-chemistry/ccp4-apps/files/ccp4-apps-6.1.3-tcl8.6.patch deleted file mode 100644 index 4b98545eec83..000000000000 --- a/sci-chemistry/ccp4-apps/files/ccp4-apps-6.1.3-tcl8.6.patch +++ /dev/null @@ -1,130 +0,0 @@ - src/ccp4mapwish_/c_src/ccp4mapwish_canvas.c | 34 ++++++++++++++--------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -diff --git a/src/ccp4mapwish_/c_src/ccp4mapwish_canvas.c b/src/ccp4mapwish_/c_src/ccp4mapwish_canvas.c -index 2c9f02f..98d814a 100755 ---- a/src/ccp4mapwish_/c_src/ccp4mapwish_canvas.c -+++ b/src/ccp4mapwish_/c_src/ccp4mapwish_canvas.c -@@ -297,7 +297,7 @@ int canvas_draw_line(char *canvas, int npts, float *x, float *y, char *tags, - puts("canvas_draw_line: about to evaluate the command..."); - } - if (Tcl_Eval(interp,command) != TCL_OK) { -- printf("canvas_draw_line: error from Tcl_Eval: %s",interp->result); -+ printf("canvas_draw_line: error from Tcl_Eval: %s",Tcl_GetStringResult(interp)); - return 0; - } - if (CCP4MAPWISH_CANVAS_DIAG) -@@ -432,7 +432,7 @@ int canvas_draw_rectangle(char *canvas, int npts, float *x, float *y, - puts("canvas_draw_rectangle: about to evaluate the command..."); - } - if (Tcl_Eval(interp,command) != TCL_OK) { -- printf("canvas_draw_rectangle: error from Tcl_Eval: %s",interp->result); -+ printf("canvas_draw_rectangle: error from Tcl_Eval: %s",Tcl_GetStringResult(interp)); - printf("canvas_draw_rectangle:\ncanvas = \"%s\"\ntags = \"%s\"\ncolor = \"%s\"\nunits = \"%c\"\n",canvas,tags,color,units); - return 0; - } -@@ -536,7 +536,7 @@ int canvas_draw_label(char *canvas, char *text, float x, float y, - /* Execute the command which draws the label */ - if (CCP4MAPWISH_CANVAS_DIAG) printf("canvas_draw_label: command is: %s\n",command); - if (Tcl_Eval(interp,command) != TCL_OK) { -- printf("canvas_draw_label: error from Tcl_Eval: %s\n",interp->result); -+ printf("canvas_draw_label: error from Tcl_Eval: %s\n",Tcl_GetStringResult(interp)); - return 0; - } - -@@ -617,7 +617,7 @@ int canvas_scale_canvas(char *canvas, char *tag, float scale) - /* Execute the command which scales the canvas */ - if (CCP4MAPWISH_CANVAS_DIAG) printf("canvas_scale_canvas: command is: %s\n",command); - if (Tcl_Eval(interp,command) != TCL_OK) { -- printf("canvas_scale_canvas: error from Tcl_Eval: %s\n",interp->result); -+ printf("canvas_scale_canvas: error from Tcl_Eval: %s\n",Tcl_GetStringResult(interp)); - return 0; - } - -@@ -706,7 +706,7 @@ int canvas_shift_canvas(char *canvas) - /* Execute the command which resizes the canvas */ - if (CCP4MAPWISH_CANVAS_DIAG) printf("canvas_shift_canvas: command is: %s\n",command); - if (Tcl_Eval(interp,command) != TCL_OK) { -- printf("canvas_shift_canvas: error from Tcl_Eval: %s\n",interp->result); -+ printf("canvas_shift_canvas: error from Tcl_Eval: %s\n",Tcl_GetStringResult(interp)); - return 0; - } - -@@ -789,7 +789,7 @@ int canvas_shift_element(char *canvas, char *tag, int shiftx, int shifty) - /* Execute the command which resizes the canvas */ - if (CCP4MAPWISH_CANVAS_DIAG) printf("canvas_shift_canvas: command is: %s\n",command); - if (Tcl_Eval(interp,command) != TCL_OK) { -- printf("canvas_shift_element: error from Tcl_Eval: %s\n",interp->result); -+ printf("canvas_shift_element: error from Tcl_Eval: %s\n",Tcl_GetStringResult(interp)); - return 0; - } - -@@ -861,7 +861,7 @@ int canvas_delete(char *canvas, char *tag) - /* Execute the command which deletes the tagged items */ - if (CCP4MAPWISH_CANVAS_DIAG) printf("canvas_delete: command is: %s\n",command); - if (Tcl_Eval(interp,command) != TCL_OK) { -- printf("canvas_scale_canvas: error from Tcl_Eval: %s\n",interp->result); -+ printf("canvas_scale_canvas: error from Tcl_Eval: %s\n",Tcl_GetStringResult(interp)); - return 0; - } - -@@ -892,15 +892,15 @@ int canvas_exists(char *canvas) - - sprintf(tmpstr,"winfo exists %s",canvas); - if (Tcl_Eval(interp,tmpstr) != TCL_OK) { -- printf("canvas_exists: error from Tcl_Eval: %s",interp->result); -+ printf("canvas_exists: error from Tcl_Eval: %s",Tcl_GetStringResult(interp)); - return 0; - } - /* Extract a long int using strtol - If no conversion takes place then "endptr" will be equal - to "result" */ -- istatus = (int) strtol(interp->result,&endptr,10); -- if (strcmp(interp->result,endptr) == 0) { -- printf("canvas_exists: bad return status from winfo command \"%s\"\n",interp->result); -+ istatus = (int) strtol(Tcl_GetStringResult(interp),&endptr,10); -+ if (strcmp(Tcl_GetStringResult(interp),endptr) == 0) { -+ printf("canvas_exists: bad return status from winfo command \"%s\"\n",Tcl_GetStringResult(interp)); - return 0; - } - if (!istatus) { -@@ -930,13 +930,13 @@ float canvas_get_tk_scaling(char *canvas, char units) - - /* Execute the tk scaling command */ - if (Tcl_Eval(interp,"tk scaling") != TCL_OK) { -- printf("canvas_get_tk_scaling: error from Tcl_Eval: %s",interp->result); -+ printf("canvas_get_tk_scaling: error from Tcl_Eval: %s",Tcl_GetStringResult(interp)); - return (float) 0.0; - } - - /* Extract a float from the result */ -- tkscale = ((float) strtod(interp->result,&endptr)); -- if (strcmp(interp->result,endptr) == 0) { -+ tkscale = ((float) strtod(Tcl_GetStringResult(interp),&endptr)); -+ if (strcmp(Tcl_GetStringResult(interp),endptr) == 0) { - printf("canvas_get_tk_scaling: couldn't extract scale factor\n"); - return (float) 0.0; - } -@@ -1021,19 +1021,19 @@ int canvas_get_limits(char *canvas, int limits[4]) - - /* Evaluate the command */ - if (Tcl_Eval(interp,command) != TCL_OK) { -- printf("canvas_get_limits: error from Tcl_Eval: %s\n",interp->result); -+ printf("canvas_get_limits: error from Tcl_Eval: %s\n",Tcl_GetStringResult(interp)); - return 0; - } - - /* Process the result - it should consist of 4 integers */ - /* Use strtok which can split the string based on tokens - set by the programmer - in this case a space */ -- if (!interp->result) { -+ if (!Tcl_GetStringResult(interp)) { - puts("canvas_get_limits: failed to fetch canvas limits"); - return TCL_ERROR; - } - i = 0; -- p = strtok(interp->result," "); -+ p = strtok(Tcl_GetStringResult(interp)," "); - if (p == NULL) { - return 0; - } diff --git a/sci-chemistry/ccp4-apps/metadata.xml b/sci-chemistry/ccp4-apps/metadata.xml deleted file mode 100644 index 51fdedab1b38..000000000000 --- a/sci-chemistry/ccp4-apps/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> -</pkgmetadata> diff --git a/sci-chemistry/ccp4/ccp4-6.1.3-r1.ebuild b/sci-chemistry/ccp4/ccp4-6.1.3-r1.ebuild deleted file mode 100644 index eea4a408b472..000000000000 --- a/sci-chemistry/ccp4/ccp4-6.1.3-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit fortran-2 - -DESCRIPTION="Protein X-ray crystallography toolkit -- meta package" -HOMEPAGE="http://www.ccp4.ac.uk/" -SRC_URI="" - -LICENSE="ccp4" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="X arpwarp +balbes" - -RDEPEND=" - ~sci-chemistry/ccp4-apps-${PV}[X?] - !<=sci-chemistry/ccp4-apps-${PV}-r2 - >=sci-chemistry/molrep-11.0.00-r1 - >=sci-chemistry/mosflm-7.0.6-r2 - sci-chemistry/mrbump[X?] - >=sci-chemistry/oasis-4.0-r1 - >=sci-chemistry/pdb-extract-3.004-r2 - >=sci-chemistry/refmac-5.5.0110-r1 - >=sci-chemistry/scala-3.3.18-r1 - >=sci-chemistry/sfcheck-7.03.18-r1 - sci-chemistry/xia2 - arpwarp? ( sci-chemistry/arp-warp-bin ) - balbes? ( sci-chemistry/balbes ) - X? ( - ~sci-chemistry/ccp4i-${PV} - sci-chemistry/imosflm - sci-chemistry/pymol - sci-chemistry/rasmol - )" -DEPEND="" diff --git a/sci-chemistry/ccp4/files/6.0.1-dont-make-dirs-in-configure.patch b/sci-chemistry/ccp4/files/6.0.1-dont-make-dirs-in-configure.patch deleted file mode 100644 index 1420419ffab0..000000000000 --- a/sci-chemistry/ccp4/files/6.0.1-dont-make-dirs-in-configure.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- ccp4-6.0.1.orig/configure 2006-06-10 17:30:02.000000000 -0700 -+++ ccp4-6.0.1/configure 2006-06-10 17:45:43.000000000 -0700 -@@ -623,45 +623,45 @@ - # echo "! Beware -- the $system installation isn't properly tested." ; } - syswarn='echo; echo "! Beware -- the $system installation is not properly tested."' - --if test -z "$onlylibs" ; then -- for i in CCP4_SCR BINSORT_SCR; do -- if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -- else -- eval echo "! No directory \$$i and can\'t create it." -- echo " Check the value of $i." -- badvar=1 -- fi -- done -- -- for i in libdir bindir; do -- if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -- else -- eval echo "! No directory \$$i and can\'t create it." -- echo " Check the argument of --$i." -- badvar=1 -- fi -- done -- -- for i in $dotsrc $dotunsupp $dotunsuppsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do -- if test -d $i || mkdir $i; then : -- else -- eval echo "! No directory $i and can\'t create it." -- badvar=1 -- fi -- done --else -- # Kludge to fool the "Makefile" target in the top-level CCP4 -- # Makefile into not trying to remake src/Makefile.in -- for i in $srcdir/src $srcdir/lib/src ; do -- if test -d $i || mkdir $i; then -- if ! test -f $i/Makefile.in ; then -- echo -- echo "onlylibs: making dummy file $i/Makefile.in" -- touch $i/Makefile.in -- fi -- fi -- done --fi -+#if test -z "$onlylibs" ; then -+# for i in CCP4_SCR BINSORT_SCR; do -+# if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -+# else -+# eval echo "! No directory \$$i and can\'t create it." -+# echo " Check the value of $i." -+# badvar=1 -+# fi -+# done -+# -+# for i in libdir bindir; do -+# if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -+# else -+# eval echo "! No directory \$$i and can\'t create it." -+# echo " Check the argument of --$i." -+# badvar=1 -+# fi -+# done -+# -+# for i in $dotsrc $dotunsupp $dotunsuppsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do -+# if test -d $i || mkdir $i; then : -+# else -+# eval echo "! No directory $i and can\'t create it." -+# badvar=1 -+# fi -+# done -+#else -+# # Kludge to fool the "Makefile" target in the top-level CCP4 -+# # Makefile into not trying to remake src/Makefile.in -+# for i in $srcdir/src $srcdir/lib/src ; do -+# if test -d $i || mkdir $i; then -+# if ! test -f $i/Makefile.in ; then -+# echo -+# echo "onlylibs: making dummy file $i/Makefile.in" -+# touch $i/Makefile.in -+# fi -+# fi -+# done -+#fi - - ### sanity checks - diff --git a/sci-chemistry/ccp4/files/6.0.1-ppc-double-define-gerror.patch b/sci-chemistry/ccp4/files/6.0.1-ppc-double-define-gerror.patch deleted file mode 100644 index a77d9494a05c..000000000000 --- a/sci-chemistry/ccp4/files/6.0.1-ppc-double-define-gerror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ccp4-6.0.1.orig/lib/src/library_f.c 2006-06-12 07:06:22.000000000 -0700 -+++ ccp4-6.0.1/lib/src/library_f.c 2006-06-12 07:21:56.000000000 -0700 -@@ -716,7 +716,7 @@ - - #endif /* end of apple xlf support */ - --#if ( defined (__linux__) && defined (_CALL_SYSV) ) -+#if ( defined (__linux__) && defined (_CALL_SYSV) && ! defined(G95) && ! defined (GFORTRAN) ) - /* linuxppc xlf support */ - void gerror_ (str, Lstr) - char *str; diff --git a/sci-chemistry/ccp4/files/6.0.2-dont-make-dirs-in-configure.patch b/sci-chemistry/ccp4/files/6.0.2-dont-make-dirs-in-configure.patch deleted file mode 100644 index 1420419ffab0..000000000000 --- a/sci-chemistry/ccp4/files/6.0.2-dont-make-dirs-in-configure.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- ccp4-6.0.1.orig/configure 2006-06-10 17:30:02.000000000 -0700 -+++ ccp4-6.0.1/configure 2006-06-10 17:45:43.000000000 -0700 -@@ -623,45 +623,45 @@ - # echo "! Beware -- the $system installation isn't properly tested." ; } - syswarn='echo; echo "! Beware -- the $system installation is not properly tested."' - --if test -z "$onlylibs" ; then -- for i in CCP4_SCR BINSORT_SCR; do -- if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -- else -- eval echo "! No directory \$$i and can\'t create it." -- echo " Check the value of $i." -- badvar=1 -- fi -- done -- -- for i in libdir bindir; do -- if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -- else -- eval echo "! No directory \$$i and can\'t create it." -- echo " Check the argument of --$i." -- badvar=1 -- fi -- done -- -- for i in $dotsrc $dotunsupp $dotunsuppsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do -- if test -d $i || mkdir $i; then : -- else -- eval echo "! No directory $i and can\'t create it." -- badvar=1 -- fi -- done --else -- # Kludge to fool the "Makefile" target in the top-level CCP4 -- # Makefile into not trying to remake src/Makefile.in -- for i in $srcdir/src $srcdir/lib/src ; do -- if test -d $i || mkdir $i; then -- if ! test -f $i/Makefile.in ; then -- echo -- echo "onlylibs: making dummy file $i/Makefile.in" -- touch $i/Makefile.in -- fi -- fi -- done --fi -+#if test -z "$onlylibs" ; then -+# for i in CCP4_SCR BINSORT_SCR; do -+# if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -+# else -+# eval echo "! No directory \$$i and can\'t create it." -+# echo " Check the value of $i." -+# badvar=1 -+# fi -+# done -+# -+# for i in libdir bindir; do -+# if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -+# else -+# eval echo "! No directory \$$i and can\'t create it." -+# echo " Check the argument of --$i." -+# badvar=1 -+# fi -+# done -+# -+# for i in $dotsrc $dotunsupp $dotunsuppsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do -+# if test -d $i || mkdir $i; then : -+# else -+# eval echo "! No directory $i and can\'t create it." -+# badvar=1 -+# fi -+# done -+#else -+# # Kludge to fool the "Makefile" target in the top-level CCP4 -+# # Makefile into not trying to remake src/Makefile.in -+# for i in $srcdir/src $srcdir/lib/src ; do -+# if test -d $i || mkdir $i; then -+# if ! test -f $i/Makefile.in ; then -+# echo -+# echo "onlylibs: making dummy file $i/Makefile.in" -+# touch $i/Makefile.in -+# fi -+# fi -+# done -+#fi - - ### sanity checks - diff --git a/sci-chemistry/ccp4/files/6.0.2-gcc-4.1.2-idate-fix.patch b/sci-chemistry/ccp4/files/6.0.2-gcc-4.1.2-idate-fix.patch deleted file mode 100644 index c118cc53baff..000000000000 --- a/sci-chemistry/ccp4/files/6.0.2-gcc-4.1.2-idate-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=175630 -JTRiley - ---- ccp4-6.0.2.orig/src/refmac5_/make_unix_ccp4.f 2005-09-06 07:29:56.000000000 -0400 -+++ ccp4-6.0.2.new/src/refmac5_/make_unix_ccp4.f 2007-05-02 20:03:46.000000000 -0400 -@@ -97,7 +97,7 @@ - - READ(CID,'(I2,1X,I2,1X,I2,2X)') IH(4),IH(3),IH(2) - -- CALL IDATE(IMON,IDAY,IYR) -+ CALL UIDATE(IMON,IDAY,IYR) - IF(IYR.GE.99) THEN - IYR=IYR+1900 - ELSE diff --git a/sci-chemistry/ccp4/files/6.0.2-ppc-double-define-gerror.patch b/sci-chemistry/ccp4/files/6.0.2-ppc-double-define-gerror.patch deleted file mode 100644 index a77d9494a05c..000000000000 --- a/sci-chemistry/ccp4/files/6.0.2-ppc-double-define-gerror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ccp4-6.0.1.orig/lib/src/library_f.c 2006-06-12 07:06:22.000000000 -0700 -+++ ccp4-6.0.1/lib/src/library_f.c 2006-06-12 07:21:56.000000000 -0700 -@@ -716,7 +716,7 @@ - - #endif /* end of apple xlf support */ - --#if ( defined (__linux__) && defined (_CALL_SYSV) ) -+#if ( defined (__linux__) && defined (_CALL_SYSV) && ! defined(G95) && ! defined (GFORTRAN) ) - /* linuxppc xlf support */ - void gerror_ (str, Lstr) - char *str; diff --git a/sci-chemistry/ccp4/files/ccp4i-default-to-firefox.patch b/sci-chemistry/ccp4/files/ccp4i-default-to-firefox.patch deleted file mode 100644 index 106db895b775..000000000000 --- a/sci-chemistry/ccp4/files/ccp4i-default-to-firefox.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ccp4-5.99.5.orig/ccp4i/etc/configure.def.dist 2006-01-06 17:54:17.000000000 -0800 -+++ ccp4-5.99.5/ccp4i/etc/configure.def.dist 2006-01-06 17:54:47.000000000 -0800 -@@ -54,8 +54,8 @@ - MESSAGE _text "" - BLT_LIBRARY _text "" - MENU_LENGTH _positiveint 25 --HYPERTEXT_VIEWER _text netscape --START_NETSCAPE _text netscape -+HYPERTEXT_VIEWER _text firefox -+START_NETSCAPE _text firefox - O_MAPMAN _text mapman - MAPMAN_MAXSIZE _positiveint 4194304 - QUANTA_MBKALL _text mbkall diff --git a/sci-chemistry/ccp4/files/check-blas-lapack-pthread.patch b/sci-chemistry/ccp4/files/check-blas-lapack-pthread.patch deleted file mode 100644 index 02a2aa6d8877..000000000000 --- a/sci-chemistry/ccp4/files/check-blas-lapack-pthread.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- ccp4-5.99.5.orig/configure 2006-01-17 00:35:36.000000000 -0800 -+++ ccp4-5.99.5/configure 2006-01-17 10:44:39.000000000 -0800 -@@ -2410,12 +2410,12 @@ - end - EOF - #firslty test without -lblas -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack" -+ test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack -lpthread" - echo $test_compile - if { (eval $test_compile >& /dev/null ) 2>&1; } && test -s testlink ; then - # Compilation was okay -- echo "... only -llapack needed" -- XLAPACK_LIB="-llapack" -+ echo "... only -llapack -lpthread needed" -+ XLAPACK_LIB="-llapack -lpthread" - # Set the next two variables so that configure - # doesn't try to build netlib libraries - LAPACKLIB="lapack" -@@ -2424,12 +2424,12 @@ - tryblas= - else - echo "more than just -llapack needed...." -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack -lblas" -+ test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack -lblas -lpthread" - echo $test_compile - if { (eval $test_compile ) 2>&1; } && test -s testlink ; then - # Compilation was okay -- echo "...-llapack and -lblas were needed" -- XLAPACK_LIB="-llapack -lblas" -+ echo "...-llapack, -lpthread and -lblas were needed" -+ XLAPACK_LIB="-llapack -lpthread -lblas" - # Set the next two variables so that configure - # doesn't try to build netlib libraries - LAPACKLIB="lapack blas" -@@ -2720,8 +2720,8 @@ - STOP - END - EOF -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib" -- test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS" -+ test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib -lpthread" -+ test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS -lpthread" - echo $test_compile - if { (eval $test_compile ) 2>&1; } && test -s testlink ; then - have_lapack=yes -@@ -2738,7 +2738,7 @@ - LAPACKDIR="$testdir" - echo "Link ok - using lib$LAPACKLIB from $LAPACKDIR" - # -- XLAPACK_LIB="-L$LAPACKDIR -l$LAPACKLIB" -+ XLAPACK_LIB="-L$LAPACKDIR -l$LAPACKLIB -lpthread" - # - # Test to see if we need BLAS too - # Do this by trying to compile a test program -@@ -2750,8 +2750,8 @@ - if test -f testlsame ; then - rm -f testsame testlsame.o - fi -- test_compile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB" -- test_ccompile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB $XLDFLAGS" -+ test_compile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB -lpthread" -+ test_ccompile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB $XLDFLAGS -lpthread" - echo $test_compile - if { ( eval $test_compile) 2>&1;} && test -s testlsame ; then - have_blas=yes -@@ -2830,8 +2830,8 @@ - STOP - END - EOF -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib" -- test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS" -+ test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib -lpthread" -+ test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS -lpthread" - echo $test_compile - if { ( eval $test_compile) 2>&1;} && test -s testlink ; then - have_blas=yes -@@ -3033,7 +3033,7 @@ - if test -f testlsame ; then - rm -f testsame testlsame.o - fi -- test_compile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$BLASDIR -l$BLASLIB" -+ test_compile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$BLASDIR -l$BLASLIB -lpthread" - echo $test_compile - if { ( eval $test_compile) 2>&1;} && test -s testlsame ; then - echo "Found LSAME in lib$BLASLIB" -@@ -3046,7 +3046,7 @@ - if test -f testxerbla ; then - rm -f testxerbla testxerbla.o - fi -- test_compile="$FC $FOPTIM $XFFLAGS -o testxerbla xerblatst.f -L$BLASDIR -l$BLASLIB" -+ test_compile="$FC $FOPTIM $XFFLAGS -o testxerbla xerblatst.f -L$BLASDIR -l$BLASLIB -lpthread" - echo $test_compile - if { ( eval $test_compile) 2>&1;} && test -s testxerbla ; then - # Found lsame -@@ -3080,7 +3080,7 @@ - cd ../.. - # - lapackdir=lib/lapack -- XLAPACK_LIB="-L$srcdir/lib/lapack -llapack -L$BLASDIR -l$BLASLIB" -+ XLAPACK_LIB="-L$srcdir/lib/lapack -llapack -L$BLASDIR -l$BLASLIB -lpthread" - # netlib lapack is in fortran, so we may need the fortran libraries when - # we are linking using the C or C++ compilers - case $system in diff --git a/sci-chemistry/ccp4/files/clipper-find-mccp4-includes.patch b/sci-chemistry/ccp4/files/clipper-find-mccp4-includes.patch deleted file mode 100644 index 3bf5a0652247..000000000000 --- a/sci-chemistry/ccp4/files/clipper-find-mccp4-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ccp4-5.99.5/lib/clipper/configure.orig 2006-01-07 16:54:13.000000000 -0800 -+++ ccp4-5.99.5/lib/clipper/configure 2006-01-07 16:54:31.000000000 -0800 -@@ -21751,7 +21751,7 @@ - - if test "x$mccp4_prefix" != x; then - # ie. mccp4=thing was given (thing is what we're checking for) -- ac_MCCP4_CXXFLAGS="-I$mccp4_prefix/include" -+ ac_MCCP4_CXXFLAGS="-I$mccp4_prefix/include -I$mccp4_prefix/include/mccp4" - ac_MCCP4_LDOPTS="-L$mccp4_prefix/lib -lmccp4" - else - # treat as standard lib/include diff --git a/sci-chemistry/ccp4/files/create-mosflm-bindir.patch b/sci-chemistry/ccp4/files/create-mosflm-bindir.patch deleted file mode 100644 index 34d6197572fc..000000000000 --- a/sci-chemistry/ccp4/files/create-mosflm-bindir.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ccp4-5.99.5.orig/x-windows/Makefile.in 2006-01-06 12:31:02.000000000 -0800 -+++ ccp4-5.99.5/x-windows/Makefile.in 2006-01-06 12:31:30.000000000 -0800 -@@ -158,6 +158,7 @@ - install_obj = ipdisp.exe hklview xdldataman xdlmapman \ - rotgen ipmosflm - install: all -+ mkdir -p $(bindir) - $(INSTALL_PROGRAM) $(srcdir)/ipdisp.exe $(bindir) - $(INSTALL_PROGRAM) $(srcdir)/ipdisp/ipdisp $(bindir) - $(INSTALL_PROGRAM) $(srcdir)/hklview $(bindir) diff --git a/sci-chemistry/ccp4/files/dont-build-rasmol.patch b/sci-chemistry/ccp4/files/dont-build-rasmol.patch deleted file mode 100644 index 8da54fd26de8..000000000000 --- a/sci-chemistry/ccp4/files/dont-build-rasmol.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ccp4-5.99.5.orig/x-windows/Makefile.in 2005-12-05 03:06:57.000000000 -0800 -+++ ccp4-5.99.5/x-windows/Makefile.in 2005-12-05 03:07:23.000000000 -0800 -@@ -35,7 +35,7 @@ - # - # all - # --all : xdlview libjwc_c libjwc_f rotgen_ hklview ipdisp.exe xdlgjk xjiffy rasmol2 ipmosflm -+all : xdlview libjwc_c libjwc_f rotgen_ hklview ipdisp.exe xdlgjk xjiffy ipmosflm - # - # xdl_view - # -@@ -161,7 +161,6 @@ - $(INSTALL_PROGRAM) $(srcdir)/xdldataman $(bindir) - $(INSTALL_PROGRAM) $(srcdir)/xdlmapman $(bindir) - cd $(srcdir)/XCCPJIFFY ; $(MAKE) install -- $(INSTALL_PROGRAM) $(rasmol_dir)/rasmol $(bindir) - cd $(rotgen_dir); $(MAKE) install - $(INSTALL_PROGRAM) $(mosflm_dir)/bin/ipmosflm $(bindir) - cd $(xdlview_dir); $(MAKE) install diff --git a/sci-chemistry/ccp4/files/make-ipmosflm-dir.patch b/sci-chemistry/ccp4/files/make-ipmosflm-dir.patch deleted file mode 100644 index 7813141b2ec2..000000000000 --- a/sci-chemistry/ccp4/files/make-ipmosflm-dir.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ccp4-5.99.5.orig/x-windows/Mosflm/mosflm/Makefile.in 2006-01-06 00:04:12.000000000 -0800 -+++ ccp4-5.99.5/x-windows/Mosflm/mosflm/Makefile.in 2006-01-06 00:04:41.000000000 -0800 -@@ -37,6 +37,7 @@ - ${F77} ${FFLAGS} -o $@ $< - - ipmosflm: ${OBJS} -+ mkdir -p ${DPSBIN} - ${FLINK} ${FFLAGS} ${OBJS} ${LOCALLIBS} ${LIBS} \ - -o ${DPSBIN}/ipmosflm ${LDFLAGS} - diff --git a/sci-chemistry/ccp4/files/make-mosflm-cbf-libdir.patch b/sci-chemistry/ccp4/files/make-mosflm-cbf-libdir.patch deleted file mode 100644 index ae4b7633b105..000000000000 --- a/sci-chemistry/ccp4/files/make-mosflm-cbf-libdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ccp4-5.99.5.orig/x-windows/Mosflm/cbf/Makefile.in 2006-01-05 23:42:19.000000000 -0800 -+++ ccp4-5.99.5/x-windows/Mosflm/cbf/Makefile.in 2006-01-05 23:43:35.000000000 -0800 -@@ -132,7 +132,7 @@ - # - # CBF library - # --$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) -+$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) $(LIB) - $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) - $(AR) cr $@ *.o - $(RANLIB) $@ diff --git a/sci-chemistry/ccp4/files/make-mosflm-index-libdir.patch b/sci-chemistry/ccp4/files/make-mosflm-index-libdir.patch deleted file mode 100644 index 97607b689672..000000000000 --- a/sci-chemistry/ccp4/files/make-mosflm-index-libdir.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ccp4-5.99.5.orig/x-windows/Mosflm/index/Makefile.in 2006-01-05 23:15:09.000000000 -0800 -+++ ccp4-5.99.5/x-windows/Mosflm/index/Makefile.in 2006-01-05 23:15:30.000000000 -0800 -@@ -76,6 +76,7 @@ - - # local version of libdps_index.a - ${LIB}/dps_index.a: ${IOBJS} ${HOBJS} -+ mkdir -p ${LIB} - ar ru ${LIB}/dps_index.a ${IOBJS} ${HOBJS} - - ${LIB}/libpeak.a: diff --git a/sci-chemistry/ccp4/files/make-mosflm-libdir.patch b/sci-chemistry/ccp4/files/make-mosflm-libdir.patch deleted file mode 100644 index eac1b9f1721e..000000000000 --- a/sci-chemistry/ccp4/files/make-mosflm-libdir.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ccp4-5.99.5.orig/x-windows/Mosflm/src/dps/index/Makefile.in 2006-01-05 22:48:47.000000000 -0800 -+++ ccp4-5.99.5/x-windows/Mosflm/src/dps/index/Makefile.in 2006-01-05 22:49:02.000000000 -0800 -@@ -42,6 +42,7 @@ - $(LOCALLIBS) $(LIBS) - - index: $(IOBJS) -+ mkdir -p $(LIBDIR) - ${AR} $(AR_FLAGS) $(LIBDIR)/libdps_index.a $(IOBJS) - chmod 644 $(LIBDIR)/libdps_index.a - diff --git a/sci-chemistry/ccp4/files/pass-clipper-enablevals.patch b/sci-chemistry/ccp4/files/pass-clipper-enablevals.patch deleted file mode 100644 index 3e1a8b0e6be8..000000000000 --- a/sci-chemistry/ccp4/files/pass-clipper-enablevals.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ccp4-5.99.5.orig/configure 2006-01-06 11:45:43.000000000 -0800 -+++ ccp4-5.99.5/configure 2006-01-06 11:46:53.000000000 -0800 -@@ -3210,7 +3210,7 @@ - #ccp4 setup - xopts="${xopts} --with-ccp4=${srcdir}" - #interface setup -- xopts="${xopts} --enable-mmdb --enable-cif --enable-ccp4 --enable-minimol" -+ xopts="${xopts} --enable-mmdb --enable-cif --enable-ccp4 --enable-minimol --enable-mmdbold --enable-mtz --with-mccp4=/usr" - echo - echo "********* CLIPPER CONFIGURATION ***********" - echo diff --git a/sci-chemistry/ccp4/metadata.xml b/sci-chemistry/ccp4/metadata.xml deleted file mode 100644 index d37774eb9ada..000000000000 --- a/sci-chemistry/ccp4/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> - <use> - <flag name="balbes">Install sci-chemistry/balbes</flag> - <flag name="arpwarp">Add binary arp-warp for molecular replacement</flag> - </use> -</pkgmetadata> diff --git a/sci-chemistry/ccp4i/Manifest b/sci-chemistry/ccp4i/Manifest deleted file mode 100644 index e082cb44f7fb..000000000000 --- a/sci-chemistry/ccp4i/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST 6.1.3-oasis4.0.patch.bz2 946 SHA256 12d7c5965e0c46b0f482514d9083d6be94d65eeb14ba29c17d507d5f9669f84b SHA512 7c7bf4ef90550708bf41b1831dbe71c38418b46455adb3d42ec609d287894ac9260d9671f1759f71c713ced72fa004b9808391ea6874007ac8b7d7637f349d32 WHIRLPOOL a2bc27e1e054e1717c387f3800533fa490c03d1d18d3fe3cff4676f0ec47799a1681a206e01013c1b8f8e41162303446a824b86effeef2ed73f059feb07fb820 -DIST ccp4-6.1.3-core-src.tar.gz 242134076 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 SHA512 413eba806107ebcdbd93e9122275463709133d9b2a9ce44ae57a6c2350465a47ba66ad9875237aead74f5d422c0104f58f728ab37a757b10d82cde92af444c20 WHIRLPOOL faebf8ee7920013bc3d0e83565207dca1f31ba0b5c92fe1eae4b740f70ff2031d95787fa0d545b09c853d25657c08973527e43de02fddc086988123ca2a6339c -DIST ccp4i-6.1.3-arpwarp.patch.bz2 58498 SHA256 297e6f75354f3a1932302f7039bf449484c95eb41b8634ae96d93c754b47c687 SHA512 0bf18d9768b722c553e79eed04de316f6b0b4695f7678e1d850d5e22735ecc79cdb961ea76b6482457fff232892b81ce191cd48fa588ded8058184a871dffb65 WHIRLPOOL f24625941e31e951f13c94cf31e2ca061840b016aa3fd038d29710d9ca400d364467dc3fa1e42a55944d63ac7e42a0a6baa39a596c55b18610eeb552d232d1b8 diff --git a/sci-chemistry/ccp4i/ccp4i-6.1.3-r4.ebuild b/sci-chemistry/ccp4i/ccp4i-6.1.3-r4.ebuild deleted file mode 100644 index bdfba7800493..000000000000 --- a/sci-chemistry/ccp4i/ccp4i-6.1.3-r4.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib python-single-r1 virtualx - -MY_PN="${PN%i}" -MY_P="${MY_PN}-${PV}" - -#UPDATE="04_03_09" -#PATCHDATE="090511" - -SRC="ftp://ftp.ccp4.ac.uk/ccp4" - -DESCRIPTION="Protein X-ray crystallography toolkit -- graphical interface" -HOMEPAGE="http://www.ccp4.ac.uk/" -SRC_URI=" - ${SRC}/${PV}/${MY_P}-core-src.tar.gz - mirror://gentoo/${P}-arpwarp.patch.bz2 - https://dev.gentoo.org/~jlec/distfiles/${PV}-oasis4.0.patch.bz2" -[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz" -[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} https://dev.gentoo.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2" - -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -LICENSE="ccp4" -IUSE="" - -RDEPEND=" - app-shells/tcsh - media-gfx/graphviz - >=dev-lang/tk-8.3:0 - >=dev-tcltk/blt-2.4 - sci-libs/ccp4-libs" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PV}-fix-baubles.patch - "${WORKDIR}"/${P}-arpwarp.patch - ) - -src_prepare() { - epatch ${PATCHES[@]} - - [[ ! -z ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch - - epatch "${WORKDIR}"/${PV}-oasis4.0.patch - python_fix_shebang ccp4i/ share/dbccp4i/ -} - -src_configure() { - : -} - -src_compile() { - : -} - -src_install() { - # rm imosflm stuff - rm -rf "${S}"/ccp4i/{bin/imosflm,imosflm} || die - - rm -rf "${S}"/ccp4i/{bin,etc}/WINDOWS || die - - # This is installed by mrbump - rm -rf "${S}"/ccp4i/{tasks/{dbviewer.tcl,mrbump.*},templates/mrbump.com,scripts/mrbump.script} || die - - # CCP4Interface - GUI - insinto /usr/$(get_libdir)/ccp4 - doins -r "${S}"/ccp4i - exeinto /usr/$(get_libdir)/ccp4/ccp4i/bin - doexe "${S}"/ccp4i/bin/* - dosym ../$(get_libdir)/ccp4/ccp4i/bin/ccp4i /usr/bin/ccp4i - - dodir /usr/$(get_libdir)/ccp4/ccp4i/unix - - # dbccp4i - insinto /usr/share/ccp4 - doins -r "${S}"/share/dbccp4i -} - -pkg_postinst() { - _ccp4-setup() { - source "${EPREFIX}/etc/profile" - export USER=root - bash "${EPREFIX}"/usr/$(get_libdir)/ccp4/ccp4i/bin/ccp4i -h > /dev/null - } - VIRTUALX_COMMAND="_ccp4-setup" virtualmake - echo "" - elog "ccp4i needs some enviromental settings. So please" - elog "\t source ${EPREFIX}/etc/profile" - echo "" -} diff --git a/sci-chemistry/ccp4i/files/6.1.3-fix-baubles.patch b/sci-chemistry/ccp4i/files/6.1.3-fix-baubles.patch deleted file mode 100644 index 2c5f659b8018..000000000000 --- a/sci-chemistry/ccp4i/files/6.1.3-fix-baubles.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ccp4i/etc/configure.def.dist 2009-01-09 16:45:08.000000000 +0100 -+++ ccp4i/etc/configure.def.dist.new 2009-07-07 23:17:26.000000000 +0200 -@@ -53,8 +53,8 @@ - RUN_IMOSFLM _text "ccp4iwish [file join [GetEnvPath CCP4I_TOP] imosflm imosflm.tcl] project [GetCurrentProjectDir [GetCurrentProject]]" - RUN_CCP4MG _text "ccp4mg" - RUN_COOT _text "coot" --RUN_BAUBLES _text "python [file join [GetEnvPath CCP4] share smartie baubles.py]" --RUN_DBVIEWER _text "wish [file join [GetEnvPath CCP4] share dbccp4i application viewer.tcl]" -+RUN_BAUBLES _text "python [file join [GetEnvPath CCP4] share ccp4 smartie baubles.py]" -+RUN_DBVIEWER _text "wish [file join [GetEnvPath DBCCP4I_TOP] application viewer.tcl]" - ENABLE_BUBBLE_HELP _logical 1 - DISABLE_TASKS _logical 1 - CCP4_SETUP_COMMAND _text setup_ccp4 -@@ -62,7 +62,7 @@ - BLT_LIBRARY _text "" - MENU_LENGTH _positiveint 25 - HYPERTEXT_VIEWER _text firefox --START_NETSCAPE _text netscape -+START_NETSCAPE _text firefox - O_MAPMAN _text mapman - MAPMAN_MAXSIZE _positiveint 4194304 - QUANTA_MBKALL _text mbkall diff --git a/sci-chemistry/ccp4i/files/6.1.3-rename-rapper.patch b/sci-chemistry/ccp4i/files/6.1.3-rename-rapper.patch deleted file mode 100644 index 9f5cfb4b635f..000000000000 --- a/sci-chemistry/ccp4i/files/6.1.3-rename-rapper.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/ccp4i/scripts/check.script b/ccp4i/scripts/check.script -index def44bc..dd4bb7e 100755 ---- a/ccp4i/scripts/check.script -+++ b/ccp4i/scripts/check.script -@@ -24,7 +24,7 @@ - if $RUN_RAMPAGE { - - # Generate command line -- set cmd "[BinPath rapper]" -+ set cmd "[BinPath rappermc]" - - set rapperdatadir [FileJoin [GetEnvPath CCP4] share rapper] - set paramsfile [FileJoin $rapperdatadir params.xml] -diff --git a/ccp4i/scripts/rapper.script b/ccp4i/scripts/rapper.script -index cdae1e2..faae226 100755 ---- a/ccp4i/scripts/rapper.script -+++ b/ccp4i/scripts/rapper.script -@@ -17,7 +17,7 @@ - - #set up command line - --set cmd "[BinPath rapper]" -+set cmd "[BinPath rappermc]" - - set rapperdatadir [FileJoin [GetEnvPath CCP4] share rapper] - set paramsfile [FileJoin [GetEnvPath CCP4] share rapper params.xml] -@@ -180,7 +180,7 @@ append outfiles " $XYZOUT PROJECT" - - # Run RAPPER to join loop back to framework and out put to defined pdb file - # Also need to sort out multimodel files join - FIX ME --set cmd2 "[BinPath rapper]" -+set cmd2 "[BinPath rappermc]" - append cmd2 " $paramsfile joinpdb " - append cmd2 " --pdb2 \"$root\-loop.pdb\" " - append cmd2 " --pdb \"$root\-framework.pdb\" " -diff --git a/ccp4i/tasks/check.tcl b/ccp4i/tasks/check.tcl -index ae88ff2..ee3307b 100755 ---- a/ccp4i/tasks/check.tcl -+++ b/ccp4i/tasks/check.tcl -@@ -46,7 +46,7 @@ proc check_run { arrayname } { - # Check for Rampage program. If it is not found, we switch off the option. - # If it was the only option, script will fail with next check. - if { $array(RUN_RAMPAGE) == 1 } { -- if { [FindExecutable "rapper"] == "" } { -+ if { [FindExecutable "rappermc"] == "" } { - WarningMessage "Input Error: Rapper_Rampage program not found in system path." - set array(RUN_RAMPAGE) 0 - } -diff --git a/ccp4i/tasks/rapper.tcl b/ccp4i/tasks/rapper.tcl -index e299057..8843a3f 100755 ---- a/ccp4i/tasks/rapper.tcl -+++ b/ccp4i/tasks/rapper.tcl -@@ -28,7 +28,7 @@ proc rapper_run { arrayname } { - # Check for RAPPER program. If it is not found, we switch off the option. - # If it was the only option, script will fail with next check. - if { [regexp MODEL $build_type ] && $prog_type == "RAPPER"} { -- if { [FindExecutable "rapper"] == "" } { -+ if { [FindExecutable "rappermc"] == "" } { - WarningMessage "Input Error: RAPPER program not found in system path." - set build_type 0 - } diff --git a/sci-chemistry/ccp4i/files/6.1.3-rename-superpose.patch b/sci-chemistry/ccp4i/files/6.1.3-rename-superpose.patch deleted file mode 100644 index 74cd2b946601..000000000000 --- a/sci-chemistry/ccp4i/files/6.1.3-rename-superpose.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/ccp4i/scripts/superpose.script b/ccp4i/scripts/superpose.script -index 3483c97..5027536 100755 ---- a/ccp4i/scripts/superpose.script -+++ b/ccp4i/scripts/superpose.script -@@ -21,7 +21,7 @@ - - if { [regexp SSM $SUPERPOSE_MODE ] } { - -- set cmd "[BinPath superpose] \"$XYZIN2\" -s $SSM_MOVING \"$XYZIN1\" -s $SSM_FIXED \"$XYZOUT_LOCAL\"" -+ set cmd "[BinPath superpose-ccp4] \"$XYZIN2\" -s $SSM_MOVING \"$XYZIN1\" -s $SSM_FIXED \"$XYZOUT_LOCAL\"" - set status [Execute $cmd "" program_status report ] - - } elseif { [regexp TOP $SUPERPOSE_MODE ] } { -diff --git a/ccp4i/tasks/superpose.tcl b/ccp4i/tasks/superpose.tcl -index 748bf6e..c92122a 100755 ---- a/ccp4i/tasks/superpose.tcl -+++ b/ccp4i/tasks/superpose.tcl -@@ -100,7 +100,7 @@ proc superpose_run { arrayname } { - # If user is match equivalent named residues/atoms then fit in the match fields - switch [GetValue $arrayname SUPERPOSE_MODE] \ - SSM { -- if { ![file exists [FindExecutable superpose]] } { -+ if { ![file exists [FindExecutable superpose-ccp4]] } { - WarningMessage "The program \"superpose\" is not on your path. - Check your installation for \"superpose\" program and \"ssm\" library." - return 0 diff --git a/sci-chemistry/ccp4i/files/6.1.3-rename-truncate.patch b/sci-chemistry/ccp4i/files/6.1.3-rename-truncate.patch deleted file mode 100644 index 9af60b7c5152..000000000000 --- a/sci-chemistry/ccp4i/files/6.1.3-rename-truncate.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/ccp4i/crank/plugins/prep/crank_prep.tcl b/ccp4i/crank/plugins/prep/crank_prep.tcl -index 7d05905..d01f1dc 100755 ---- a/ccp4i/crank/plugins/prep/crank_prep.tcl -+++ b/ccp4i/crank/plugins/prep/crank_prep.tcl -@@ -226,7 +226,7 @@ proc run_truncate { i j } { - set script "$script\n$labout" - set script "$script\nEND\n" - -- set run_command "truncate $command << \"$script\"" -+ set run_command "ftruncate $command << \"$script\"" - puts $run_command - catch {eval exec $run_command } output - puts $output -diff --git a/ccp4i/scripts/dtrek2mtz.script b/ccp4i/scripts/dtrek2mtz.script -index e74aa0d..a2a1adb 100755 ---- a/ccp4i/scripts/dtrek2mtz.script -+++ b/ccp4i/scripts/dtrek2mtz.script -@@ -36,7 +36,7 @@ - set HKL_TRUNCATE [GetTmpFileName -ext mtz] - - CreateComScript truncate truncate_script -- set cmd "[BinPath truncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\"" -+ set cmd "[BinPath ftruncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\"" - set status [Execute $cmd $truncate_script program_status report] - - HandleHarvestFile $HARVEST_MODE $HARVEST_PNAME $HARVEST_DNAME truncate -diff --git a/ccp4i/scripts/import.script b/ccp4i/scripts/import.script -index 90cba83..1c90c33 100755 ---- a/ccp4i/scripts/import.script -+++ b/ccp4i/scripts/import.script -@@ -144,7 +144,7 @@ if { $FORMAT == "MTZ" } { - - set truncatemtz [GetTmpFileName -ext mtz ] - CreateComScript truncate truncate_script -- set cmd "[BinPath truncate] HKLIN \"$tmpmtz\" HKLOUT \"$truncatemtz\"" -+ set cmd "[BinPath ftruncate] HKLIN \"$tmpmtz\" HKLOUT \"$truncatemtz\"" - set status [Execute $cmd $truncate_script program_status report] - - -diff --git a/ccp4i/scripts/import_scaled.script b/ccp4i/scripts/import_scaled.script -index dcc619b..7250513 100755 ---- a/ccp4i/scripts/import_scaled.script -+++ b/ccp4i/scripts/import_scaled.script -@@ -62,7 +62,7 @@ - - } else { - CreateComScript truncate truncate_script -- set cmd "[BinPath truncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\"" -+ set cmd "[BinPath ftruncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\"" - set status [Execute $cmd $truncate_script program_status report] - - HandleHarvestFile $HARVEST_MODE $HARVEST_PNAME $HARVEST_DNAME truncate -diff --git a/ccp4i/scripts/scala.script b/ccp4i/scripts/scala.script -index 6940ccd..bde10d6 100755 ---- a/ccp4i/scripts/scala.script -+++ b/ccp4i/scripts/scala.script -@@ -275,7 +275,7 @@ END" - - } else { - CreateComScript truncate truncate_script -- set cmd "[BinPath truncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\"" -+ set cmd "[BinPath ftruncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\"" - set status [Execute $cmd $truncate_script $LOG_FILE program_status report ] - } - -diff --git a/ccp4i/scripts/scalepack2mtz.script b/ccp4i/scripts/scalepack2mtz.script -index 986e06c..a1947a6 100755 ---- a/ccp4i/scripts/scalepack2mtz.script -+++ b/ccp4i/scripts/scalepack2mtz.script -@@ -35,7 +35,7 @@ - - set HKL_TRUNCATE [GetTmpFileName -ext mtz] - CreateComScript truncate truncate_script -- set cmd "[BinPath truncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\"" -+ set cmd "[BinPath ftruncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\"" - set status [Execute $cmd $truncate_script program_status report] - - HandleHarvestFile $HARVEST_MODE $HARVEST_PNAME $HARVEST_DNAME truncate -diff --git a/ccp4i/scripts/truncate.script b/ccp4i/scripts/truncate.script -index e0e09ce..2d448a2 100755 ---- a/ccp4i/scripts/truncate.script -+++ b/ccp4i/scripts/truncate.script -@@ -45,7 +45,7 @@ - - CreateComScript truncate truncate_script - -- set cmd "[BinPath truncate] HKLIN \"$HKLIN\"" -+ set cmd "[BinPath ftruncate] HKLIN \"$HKLIN\"" - if { ![StringSame $INPUT_DATA AMPLITUDES] } { - append cmd " HKLOUT \"$HKL_TRUNCATE\"" - } diff --git a/sci-chemistry/ccp4i/metadata.xml b/sci-chemistry/ccp4i/metadata.xml deleted file mode 100644 index 51fdedab1b38..000000000000 --- a/sci-chemistry/ccp4i/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> -</pkgmetadata> diff --git a/sci-chemistry/coot/coot-0.7.1-r1.ebuild b/sci-chemistry/coot/coot-0.7.1-r1.ebuild deleted file mode 100644 index 001145ee18ee..000000000000 --- a/sci-chemistry/coot/coot-0.7.1-r1.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 ) - -AUTOTOOLS_AUTORECONF="true" - -inherit autotools-utils python-single-r1 toolchain-funcs versionator - -MY_S2_PV=$(replace_version_separator 2 - ${PV}) -MY_S2_P=${PN}-${MY_S2_PV/pre1/pre-1} -MY_S_P=${MY_S2_P}-${PR/r/revision-} -MY_PV=${PV} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation" -HOMEPAGE="http://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/" -SRC_URI=" - http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/source/releases/${MY_P}.tar.gz - test? ( https://dev.gentoo.org/~jlec/distfiles/greg-data-${PV}.tar.gz )" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+openmp static-libs test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -SCIDEPS=" - >=sci-libs/ccp4-libs-6.1 - sci-libs/clipper - >=sci-libs/coot-data-2 - >=sci-libs/gsl-1.3 - >=sci-libs/mmdb-1.23:0 - sci-libs/ssm - sci-libs/monomer-db - sci-chemistry/reduce - sci-chemistry/refmac - sci-chemistry/probe" - -XDEPS=" - gnome-base/libgnomecanvas - gnome-base/librsvg:2 - media-libs/libpng - media-libs/freeglut - x11-libs/gtk+:2 - x11-libs/goocanvas:0 - x11-libs/gtkglext" - -SCHEMEDEPS=" - dev-scheme/net-http - dev-scheme/guile-gui - >=dev-scheme/guile-lib-0.1.6 - dev-scheme/guile-www - >=x11-libs/guile-gtk-2.1" - -RDEPEND=" - ${SCIDEPS} - ${XDEPS} - ${SCHEMEDEPS} - ${PYTHON_DEPS} - dev-python/pygtk:2[${PYTHON_USEDEP}] - >=dev-libs/gmp-4.2.2-r2 - >=net-misc/curl-7.19.6 - net-dns/libidn" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.4-r2 - dev-lang/swig - sys-devel/bc - test? ( dev-scheme/greg )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use openmp; then - tc-has-openmp || die "Please use an OPENMP capable compiler" - fi - python-single-r1_pkg_setup -} - -PATCHES=( - "${FILESDIR}"/${PN}-0.7-clipper-config.patch - "${FILESDIR}"/${PN}-0.7-goocanvas.patch - "${FILESDIR}"/${PN}-0.7-mmdb-config.patch - "${FILESDIR}"/${PN}-0.7-ssm.patch - ) - -src_prepare() { - sed \ - -e "s:AM_COOT_SYS_BUILD_TYPE:COOT_SYS_BUILD_TYPE=Gentoo-Linux-${EPYTHON}-gtk2 ; AC_MSG_RESULT([\$COOT_SYS_BUILD_TYPE]); AC_SUBST(COOT_SYS_BUILD_TYPE):g" \ - -i configure.in || die - - autotools-utils_src_prepare -} - -src_configure() { - # All the --with's are used to activate various parts. - # Yes, this is broken behavior. - local myeconfargs=( - --includedir='${prefix}/include/coot' - --with-goocanvas-prefix="${EPREFIX}/usr" - --with-guile - --with-python="${EPREFIX}/usr" - --with-guile-gtk - --with-gtk2 - --with-pygtk - $(use_enable openmp) - ) - autotools-utils_src_configure -} - -src_test() { - source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh" - mkdir "${T}"/coot_test - - export COOT_STANDARD_RESIDUES="${S}/standard-residues.pdb" - export COOT_SCHEME_DIR="${S}/scheme/" - export COOT_RESOURCES_FILE="${S}/cootrc" - export COOT_PIXMAPS_DIR="${S}/pixmaps/" - export COOT_DATA_DIR="${S}/" - export COOT_PYTHON_DIR="${S}/python/" - export PYTHONPATH="${COOT_PYTHON_DIR}:${PYTHONPATH}" - export PYTHONHOME="${EPREFIX}"/usr/ - export CCP4_SCR="${T}"/coot_test/ - export CLIBD_MON="${EPREFIX}/usr/share/ccp4/data/monomers/" - export SYMINFO="${S}/syminfo.lib" - - export COOT_TEST_DATA_DIR="${WORKDIR}"/greg-data - - cat > command-line-greg.scm <<- EOF - (use-modules (ice-9 greg)) - (set! greg-tools (list "greg-tests")) - (set! greg-debug #t) - (set! greg-verbose 5) - (let ((r (greg-test-run))) - (if r - (coot-real-exit 0) - (coot-real-exit 1))) - EOF - - einfo "Running test with following paths ..." - einfo "COOT_STANDARD_RESIDUES $COOT_STANDARD_RESIDUES" - einfo "COOT_SCHEME_DIR $COOT_SCHEME_DIR" - einfo "COOT_RESOURCES_FILE $COOT_RESOURCES_FILE" - einfo "COOT_PIXMAPS_DIR $COOT_PIXMAPS_DIR" - einfo "COOT_DATA_DIR $COOT_DATA_DIR" - einfo "COOT_PYTHON_DIR $COOT_PYTHON_DIR" - einfo "PYTHONPATH $PYTHONPATH" - einfo "PYTHONHOME $PYTHONHOME" - einfo "CCP4_SCR ${CCP4_SCR}" - einfo "CLIBD_MON ${CLIBD_MON}" - einfo "SYMINFO ${SYMINFO}" - - "${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die - "${S}"/src/coot-real --no-graphics --script python-tests/coot_unittest.py || die -} - -src_install() { - autotools-utils_src_install - insinto /usr/share/${PN} - doins syminfo.lib -} diff --git a/sci-chemistry/coot/coot-0.7.2.ebuild b/sci-chemistry/coot/coot-0.7.2.ebuild deleted file mode 100644 index 0e14d4464539..000000000000 --- a/sci-chemistry/coot/coot-0.7.2.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -AUTOTOOLS_AUTORECONF="true" - -inherit autotools-utils python-single-r1 toolchain-funcs versionator - -MY_S2_PV=$(replace_version_separator 2 - ${PV}) -MY_S2_P=${PN}-${MY_S2_PV/pre1/pre-1} -MY_S_P=${MY_S2_P}-${PR/r/revision-} -MY_PV=${PV} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation" -HOMEPAGE="http://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/" -SRC_URI=" - http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/source/releases/${MY_P}.tar.gz - test? ( https://dev.gentoo.org/~jlec/distfiles/greg-data-${PV}.tar.gz )" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="+openmp static-libs test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -SCIDEPS=" - >=sci-libs/ccp4-libs-6.1 - sci-libs/clipper - >=sci-libs/coot-data-2 - >=sci-libs/gsl-1.3 - >=sci-libs/mmdb-1.23:0 - sci-libs/ssm - sci-libs/monomer-db - sci-chemistry/reduce - sci-chemistry/refmac - sci-chemistry/probe" - -XDEPS=" - gnome-base/libgnomecanvas - gnome-base/librsvg:2 - media-libs/libpng - media-libs/freeglut - x11-libs/gtk+:2 - x11-libs/goocanvas:0 - x11-libs/gtkglext" - -SCHEMEDEPS=" - dev-scheme/net-http - dev-scheme/guile-gui - >=dev-scheme/guile-lib-0.1.6 - dev-scheme/guile-www - >=x11-libs/guile-gtk-2.1" - -RDEPEND=" - ${SCIDEPS} - ${XDEPS} - ${SCHEMEDEPS} - ${PYTHON_DEPS} - dev-python/pygtk:2[${PYTHON_USEDEP}] - >=dev-libs/gmp-4.2.2-r2 - >=net-misc/curl-7.19.6 - net-dns/libidn" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.4-r2 - dev-lang/swig - sys-devel/bc - test? ( dev-scheme/greg )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use openmp; then - tc-has-openmp || die "Please use an OPENMP capable compiler" - fi - python-single-r1_pkg_setup -} - -PATCHES=( - "${FILESDIR}"/${PN}-0.7-clipper-config.patch - "${FILESDIR}"/${PN}-0.7-goocanvas.patch - "${FILESDIR}"/${PN}-0.7-mmdb-config.patch - ) - -src_prepare() { - sed \ - -e "s:AM_COOT_SYS_BUILD_TYPE:COOT_SYS_BUILD_TYPE=Gentoo-Linux-${EPYTHON}-gtk2 ; AC_MSG_RESULT([\$COOT_SYS_BUILD_TYPE]); AC_SUBST(COOT_SYS_BUILD_TYPE):g" \ - -i configure.in || die - - autotools-utils_src_prepare -} - -src_configure() { - # All the --with's are used to activate various parts. - # Yes, this is broken behavior. - local myeconfargs=( - --includedir='${prefix}/include/coot' - --with-goocanvas-prefix="${EPREFIX}/usr" - --with-guile - --with-python="${EPREFIX}/usr" - --with-guile-gtk - --with-gtk2 - --with-pygtk - $(use_enable openmp) - ) - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile - cp "${S}"/src/coot_gtk2.py python/coot.py || die -} - -src_test() { - source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh" - mkdir "${T}"/coot_test - - export COOT_STANDARD_RESIDUES="${S}/standard-residues.pdb" - export COOT_SCHEME_DIR="${S}/scheme/" - export COOT_RESOURCES_FILE="${S}/cootrc" - export COOT_PIXMAPS_DIR="${S}/pixmaps/" - export COOT_DATA_DIR="${S}/" - export COOT_PYTHON_DIR="${S}/python/" - export PYTHONPATH="${COOT_PYTHON_DIR}:${PYTHONPATH}" - export PYTHONHOME="${EPREFIX}"/usr/ - export CCP4_SCR="${T}"/coot_test/ - export CLIBD_MON="${EPREFIX}/usr/share/ccp4/data/monomers/" - export SYMINFO="${S}/syminfo.lib" - - export COOT_TEST_DATA_DIR="${WORKDIR}"/greg-data - - cat > command-line-greg.scm <<- EOF - (use-modules (ice-9 greg)) - (set! greg-tools (list "greg-tests")) - (set! greg-debug #t) - (set! greg-verbose 5) - (let ((r (greg-test-run))) - (if r - (coot-real-exit 0) - (coot-real-exit 1))) - EOF - - einfo "Running test with following paths ..." - einfo "COOT_STANDARD_RESIDUES $COOT_STANDARD_RESIDUES" - einfo "COOT_SCHEME_DIR $COOT_SCHEME_DIR" - einfo "COOT_RESOURCES_FILE $COOT_RESOURCES_FILE" - einfo "COOT_PIXMAPS_DIR $COOT_PIXMAPS_DIR" - einfo "COOT_DATA_DIR $COOT_DATA_DIR" - einfo "COOT_PYTHON_DIR $COOT_PYTHON_DIR" - einfo "PYTHONPATH $PYTHONPATH" - einfo "PYTHONHOME $PYTHONHOME" - einfo "CCP4_SCR ${CCP4_SCR}" - einfo "CLIBD_MON ${CLIBD_MON}" - einfo "SYMINFO ${SYMINFO}" - - "${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die - "${S}"/src/coot-real --no-graphics --script python-tests/coot_unittest.py || die -} diff --git a/sci-chemistry/coot/coot-0.7.ebuild b/sci-chemistry/coot/coot-0.7.ebuild deleted file mode 100644 index f5cdfa54b525..000000000000 --- a/sci-chemistry/coot/coot-0.7.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -PYTHON_DEPEND="2" - -AUTOTOOLS_AUTORECONF="true" - -inherit autotools-utils python toolchain-funcs versionator - -MY_S2_PV=$(replace_version_separator 2 - ${PV}) -MY_S2_P=${PN}-${MY_S2_PV/pre1/pre-1} -MY_S_P=${MY_S2_P}-${PR/r/revision-} -MY_PV=${PV} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation" -HOMEPAGE="http://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/" -SRC_URI=" - http://www.biop.ox.ac.uk/coot/software/source/releases/${MY_P}.tar.gz - test? ( https://dev.gentoo.org/~jlec/distfiles/greg-data-${PV}.tar.gz )" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="+openmp static-libs test" - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -SCIDEPS=" - >=sci-libs/ccp4-libs-6.1 - sci-libs/clipper - >=sci-libs/coot-data-2 - >=sci-libs/gsl-1.3 - >=sci-libs/mmdb-1.23:0 - sci-libs/ssm - <sci-libs/monomer-db-1 - sci-chemistry/reduce - <sci-chemistry/refmac-5.6 - sci-chemistry/probe" - -XDEPS=" - gnome-base/libgnomecanvas - gnome-base/librsvg:2 - media-libs/libpng - media-libs/freeglut - x11-libs/gtk+:2 - x11-libs/goocanvas:0 - x11-libs/gtkglext" - -SCHEMEDEPS=" - dev-scheme/net-http - dev-scheme/guile-gui - >=dev-scheme/guile-lib-0.1.6 - dev-scheme/guile-www - >=x11-libs/guile-gtk-2.1" - -RDEPEND=" - ${SCIDEPS} - ${XDEPS} - ${SCHEMEDEPS} - dev-python/pygtk:2 - >=dev-libs/gmp-4.2.2-r2 - >=net-misc/curl-7.19.6 - net-dns/libidn" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.4-r2 - dev-lang/swig - sys-devel/bc - test? ( dev-scheme/greg )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use openmp; then - tc-has-openmp || die "Please use an OPENMP capable compiler" - fi - python_set_active_version 2 - python_pkg_setup -} - -PATCHES=( - "${FILESDIR}"/${P}-clipper-config.patch - "${FILESDIR}"/${P}-goocanvas.patch - "${FILESDIR}"/${P}-mmdb-config.patch - "${FILESDIR}"/${P}-ssm.patch - ) - -src_prepare() { - sed \ - -e "s:AM_COOT_SYS_BUILD_TYPE:COOT_SYS_BUILD_TYPE=Gentoo-Linux-$(PYTHON)-gtk2 ; AC_MSG_RESULT([\$COOT_SYS_BUILD_TYPE]); AC_SUBST(COOT_SYS_BUILD_TYPE):g" \ - -i configure.in || die - - autotools-utils_src_prepare -} - -src_configure() { - # All the --with's are used to activate various parts. - # Yes, this is broken behavior. - local myeconfargs=( - --includedir='${prefix}/include/coot' - --with-goocanvas-prefix="${EPREFIX}/usr" - --with-guile - --with-python="${EPREFIX}/usr" - --with-guile-gtk - --with-gtk2 - --with-pygtk - $(use_enable openmp) - ) - autotools-utils_src_configure -} - -src_test() { - source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh" - mkdir "${T}"/coot_test - - export COOT_STANDARD_RESIDUES="${S}/standard-residues.pdb" - export COOT_SCHEME_DIR="${S}/scheme/" - export COOT_RESOURCES_FILE="${S}/cootrc" - export COOT_PIXMAPS_DIR="${S}/pixmaps/" - export COOT_DATA_DIR="${S}/" - export COOT_PYTHON_DIR="${S}/python/" - export PYTHONPATH="${COOT_PYTHON_DIR}:${PYTHONPATH}" - export PYTHONHOME="${EPREFIX}"/usr/ - export CCP4_SCR="${T}"/coot_test/ - export CLIBD_MON="${EPREFIX}/usr/share/ccp4/data/monomers/" - export SYMINFO="${S}/syminfo.lib" - - export COOT_TEST_DATA_DIR="${WORKDIR}"/data/greg-data - - cat > command-line-greg.scm <<- EOF - (use-modules (ice-9 greg)) - (set! greg-tools (list "greg-tests")) - (set! greg-debug #t) - (set! greg-verbose 5) - (let ((r (greg-test-run))) - (if r - (coot-real-exit 0) - (coot-real-exit 1))) - EOF - - einfo "Running test with following paths ..." - einfo "COOT_STANDARD_RESIDUES $COOT_STANDARD_RESIDUES" - einfo "COOT_SCHEME_DIR $COOT_SCHEME_DIR" - einfo "COOT_RESOURCES_FILE $COOT_RESOURCES_FILE" - einfo "COOT_PIXMAPS_DIR $COOT_PIXMAPS_DIR" - einfo "COOT_DATA_DIR $COOT_DATA_DIR" - einfo "COOT_PYTHON_DIR $COOT_PYTHON_DIR" - einfo "PYTHONPATH $PYTHONPATH" - einfo "PYTHONHOME $PYTHONHOME" - einfo "CCP4_SCR ${CCP4_SCR}" - einfo "CLIBD_MON ${CLIBD_MON}" - einfo "SYMINFO ${SYMINFO}" - - "${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die - "${S}"/src/coot-real --no-graphics --script python-tests/coot_unittest.py || die -} diff --git a/sci-chemistry/imosflm/Manifest b/sci-chemistry/imosflm/Manifest deleted file mode 100644 index 2ce7d893b7fd..000000000000 --- a/sci-chemistry/imosflm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST imosflm-1.0.7.zip 941784 SHA256 b067261b4d7ef2f1f7581ddeaa08252d29f889acf89ce190eb0d8b30aa94b107 SHA512 f3163e1f71c5b1e24d6b3fbd5a040bbcebae25485d1258eef4b2725821f5f96c1260adb2bcc3ab57179d7b9b9e538ddf0494ab9b5be259b98d138fddacec8c77 WHIRLPOOL bd2b6bcdcc241fde41fe2ba99bd1e2f47bc444c46ee36a5b332d5c018b81a9d649378110a8bffa48ffc67a19b04ede7e61846b53a250e5fe3058ec0313fda80c diff --git a/sci-chemistry/imosflm/files/1.0.4-impl-dec.patch b/sci-chemistry/imosflm/files/1.0.4-impl-dec.patch deleted file mode 100644 index 5d0dd7010910..000000000000 --- a/sci-chemistry/imosflm/files/1.0.4-impl-dec.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/c/tkImageLoad.c b/c/tkImageLoad.c -index e7c46f0..1496a15 100755 ---- a/c/tkImageLoad.c -+++ b/c/tkImageLoad.c -@@ -12,6 +12,7 @@ - #include <tcl.h> - #include <tk.h> - #include <assert.h> -+#include <stdlib.h> - - #define HEADER_LINE_LENGTH 512 - #define BYTES_PER_PIXEL 2 diff --git a/sci-chemistry/imosflm/files/1.0.4-tk.patch b/sci-chemistry/imosflm/files/1.0.4-tk.patch deleted file mode 100644 index a90175194eb4..000000000000 --- a/sci-chemistry/imosflm/files/1.0.4-tk.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- c/tkImageLoad.c 2009-08-14 21:10:19.000000000 +0200 -+++ c/tkImageLoad.c.new 2009-08-14 21:10:55.000000000 +0200 -@@ -19,6 +19,7 @@ - //#define BLOCKED 1 - //#define UNBLOCKED 1 - #define IN_BLOCK_FLIP 1 -+#define USE_COMPOSITELESS_PHOTO_PUT_BLOCK - - /* *********************************************************************/ - ---- c/tkImageLoad.c 2009-08-14 21:13:29.000000000 +0200 -+++ c/tkImageLoad.c.new 2009-08-14 21:14:59.000000000 +0200 -@@ -272,9 +272,11 @@ - } - /* put the photo block into the image */ - #ifdef __alpha -- Tk_PhotoPutBlock(dp, &db, 0, 0, width, height); -+ Tk_PhotoPutBlock(dp, &db, 0, 0, width, height, -+ TK_PHOTO_COMPOSITE_OVERLAY); - #else -- Tk_PhotoPutBlock(dp, &db, 0, 0, width, height, TK_PHOTO_COMPOSITE_SET); -+ Tk_PhotoPutBlock(dp, &db, 0, 0, width, height, TK_PHOTO_COMPOSITE_SET, -+ TK_PHOTO_COMPOSITE_OVERLAY); - #endif - - /* Free the photo block's memory now it is finished with */ -@@ -417,9 +419,11 @@ - - /* put the photo block back into the image */ - #ifdef __alpha -- Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height); -+ Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height, -+ TK_PHOTO_COMPOSITE_OVERLAY); - #else -- Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height,TK_PHOTO_COMPOSITE_SET); -+ Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height,TK_PHOTO_COMPOSITE_SET, -+ TK_PHOTO_COMPOSITE_OVERLAY); - #endif - /* Free the photo block's memory now it is finished with */ - if (block.pixelPtr) { ---- c/tkImageLoad.c 2009-08-14 21:15:06.000000000 +0200 -+++ c/tkImageLoad.c.new 2009-08-14 21:16:53.000000000 +0200 -@@ -9,6 +9,7 @@ - \************************************************************************/ - - #include <stdio.h> -+#include <string.h> - #include <tcl.h> - #include <tk.h> - #include <assert.h> diff --git a/sci-chemistry/imosflm/files/1.0.7-libpng16.patch b/sci-chemistry/imosflm/files/1.0.7-libpng16.patch deleted file mode 100644 index 27efc6f36f4b..000000000000 --- a/sci-chemistry/imosflm/files/1.0.7-libpng16.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/467036 - ---- src/contrast.tcl -+++ src/contrast.tcl -@@ -3,7 +3,7 @@ - - package require palette - --image create photo ::img::pixel_count_v -data "iVBORw0KGgoAAAANSUhEUgAAAA4AAABCCAIAAAGft0AHAAAABGdBTUEAAYagMeiWXwAAASFJREFUKJGtVFEWhCAINJ9H4f4n4jD7YauAA1jGT2EwAxNyMXMppZZu3bv6Q3t3iH7ob3fOPz3wdLoi7y8V1SOZp0NE02Hm7quc6VSVaokFKzMD8qKUUd0tyEQ0z1DchNQaud+JCHclzeIDOUCle7EjcA/XPZU4Klb9y2GDY68LVe8YiAihmXT052G9SQ0+m4yN2J7EZqrvnZpheMdGRLnq5/ViddTusPeux9o5G7fdsskrV9ej8rw3I80LhNUUgqmvwCY8izozZcvo5tGt1owfoGJhoEVtgcXg2da2gJa0JYESseRJ8gvyOYSGlxUkScYFoBoJB+RZrR+H2sWx2vEQrnv0pa4HYkFqF7UHrefRdjE5zQQFAp/Nqwf8XNePZ+AHq5sOPlXtupMAAAAASUVORK5CYII=" -+image create photo ::img::pixel_count_v -data "iVBORw0KGgoAAAANSUhEUgAAAA4AAABCCAIAAAGft0AHAAAABGdBTUEAAYagMeiWXwAAASFJREFUeJytVFEWhCAINJ9H4f4n4jD7YauAA1jGT2EwAxNyMXMppZZu3bv6Q3t3iH7ob3fOPz3wdLoi7y8V1SOZp0NE02Hm7quc6VSVaokFKzMD8qKUUd0tyEQ0z1DchNQaud+JCHclzeIDOUCle7EjcA/XPZU4Klb9y2GDY68LVe8YiAihmXT052G9SQ0+m4yN2J7EZqrvnZpheMdGRLnq5/ViddTusPeux9o5G7fdsskrV9ej8rw3I80LhNUUgqmvwCY8izozZcvo5tGt1owfoGJhoEVtgcXg2da2gJa0JYESseRJ8gvyOYSGlxUkScYFoBoJB+RZrR+H2sWx2vEQrnv0pa4HYkFqF7UHrefRdjE5zQQFAp/Nqwf8XNePZ+AHq5sOPv4fGP4AAAAASUVORK5CYII=" - - class Contrast { - inherit Palette diff --git a/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild b/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild deleted file mode 100644 index e49667e50dc7..000000000000 --- a/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils multilib toolchain-funcs versionator - -MY_PV="$(delete_all_version_separators ${PV})" - -DESCRIPTION="A new GUI for the Mosflm crystallographic data processing tool" -HOMEPAGE="http://www.mrc-lmb.cam.ac.uk/harry/imosflm" -SRC_URI="${HOMEPAGE}/ver${MY_PV}/downloads/${P}.zip" - -LICENSE="ccp4" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - dev-lang/tcl:0= - >=dev-tcltk/itcl-3.3 - >=dev-tcltk/itk-3.3 - >=dev-tcltk/iwidgets-4 - >=dev-tcltk/tdom-0.8 - >=dev-tcltk/tkimg-1.3 - >=dev-tcltk/tktreectrl-2.1 - dev-tcltk/anigif - dev-tcltk/combobox - dev-tcltk/tablelist - >=sci-chemistry/mosflm-7.0.9" -DEPEND="app-arch/unzip" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/${PV}-libpng16.patch -} - -src_install(){ - rm -rf lib/{*.so,anigif,combobox} - - insinto /usr/$(get_libdir)/${PN} - doins -r "${S}"/{src,bitmaps,lib} - fperms 775 /usr/$(get_libdir)/${PN}/src/imosflm - - cat >> "${T}"/23imosflm <<- EOF - IMOSFLM_VERSION="${PV}" - EOF - - doenvd "${T}"/23imosflm - - make_wrapper imosflm /usr/$(get_libdir)/${PN}/src/imosflm -} diff --git a/sci-chemistry/imosflm/metadata.xml b/sci-chemistry/imosflm/metadata.xml deleted file mode 100644 index 51fdedab1b38..000000000000 --- a/sci-chemistry/imosflm/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> -</pkgmetadata> diff --git a/sci-chemistry/makecif/Manifest b/sci-chemistry/makecif/Manifest deleted file mode 100644 index b489a33454fd..000000000000 --- a/sci-chemistry/makecif/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST makecif-5.6.6.tar.gz 3797710 SHA256 fdcc1bee70583da3161f0d46eb792d965c04f08f0ad3033f730486550e859d1f SHA512 874c69d85b55ef22057c1113418218d7fd0a1e795f04673f3d64cd015230ab47ad8bdb0277ca9b389cc3edf397dc63c2c1cdd35837a86bc5d2a595d9ae534dbc WHIRLPOOL 5ecc1f7d06445d34e1d5d97ad98fd4c9d21db1e1611a9d89e25f0228a7b2cce5fa631b470687b3e6f7085c932cee6c5d8d4da2e6473406a22d63a26645f56be7 diff --git a/sci-chemistry/makecif/files/5.6.6-makefile.patch b/sci-chemistry/makecif/files/5.6.6-makefile.patch deleted file mode 100644 index 186abb92b7d8..000000000000 --- a/sci-chemistry/makecif/files/5.6.6-makefile.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/src/makefile b/src/makefile -index 6c8264a..acdec20 100755 ---- a/src/makefile -+++ b/src/makefile -@@ -22,6 +22,8 @@ MAKEDIC = $(MAKECIF)/dic/ - # setenv BLANC_FORT "f77 -O1" - # - -+all: makecif_all libcheck_all modcheck_all emin_all -+ - clean: - rm -f temp_makecif_path.fh - rm -f ../bin/* -@@ -118,7 +120,7 @@ makecif.o: makecif.f lib_com.fh crd_com.fh - $(BLANC_FORT) -c makecif.f - - mkcif: main_makecif.o make_lib11.o make_lib12.o make_lib2.o make_vdw.o make_CIF.o make_crd1.o make_crd2.o make_new1.o make_new2.o make_rst1.o make_rst2.o make_PDB.o makecif.o make_unix.o make_subr_2.o make_subr.o set_num.o vdw_flexible.o emin.o libcheck_min.o math_refmac.o iheap_sort.o cell_symm_subrs.o subnumrec.o mol2_file.o sdf_files.o libcheck.o -- $(BLANC_FORT) -o ../bin/makecif main_makecif.o makecif.o make_vdw.o make_CIF.o make_PDB.o make_crd1.o make_crd2.o make_new1.o make_new2.o make_rst1.o make_rst2.o make_unix.o make_subr_2.o make_subr.o make_lib11.o make_lib12.o make_lib2.o set_num.o vdw_flexible.o emin.o libcheck_min.o math_refmac.o iheap_sort.o cell_symm_subrs.o subnumrec.o mol2_file.o sdf_files.o libcheck.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/makecif main_makecif.o makecif.o make_vdw.o make_CIF.o make_PDB.o make_crd1.o make_crd2.o make_new1.o make_new2.o make_rst1.o make_rst2.o make_unix.o make_subr_2.o make_subr.o make_lib11.o make_lib12.o make_lib2.o set_num.o vdw_flexible.o emin.o libcheck_min.o math_refmac.o iheap_sort.o cell_symm_subrs.o subnumrec.o mol2_file.o sdf_files.o libcheck.o - # ------------- - libcheck.o: libcheck.f lib_com.fh crd_com.fh - $(BLANC_FORT) -c libcheck.f -@@ -130,7 +132,7 @@ main_libcheck.o: main_libcheck.f libcheck_version.fh - $(BLANC_FORT) -c main_libcheck.f - - lbcheck: main_libcheck.o make_subr_2.o make_subr.o make_lib11.o make_lib12.o make_lib2.o libcheck.o make_PDB.o make_CIF.o make_new1.o make_new2.o make_crd1.o make_crd2.o make_unix.o set_num.o vdw_flexible.o emin.o libcheck_min.o math_refmac.o iheap_sort.o cell_symm_subrs.o subnumrec.o mol2_file.o sdf_files.o -- $(BLANC_FORT) -o ../bin/libcheck main_libcheck.o libcheck.o make_PDB.o make_CIF.o make_new1.o make_new2.o make_crd1.o make_crd2.o make_lib11.o make_lib12.o make_lib2.o make_unix.o make_subr_2.o make_subr.o set_num.o vdw_flexible.o emin.o libcheck_min.o math_refmac.o iheap_sort.o cell_symm_subrs.o subnumrec.o mol2_file.o sdf_files.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/libcheck main_libcheck.o libcheck.o make_PDB.o make_CIF.o make_new1.o make_new2.o make_crd1.o make_crd2.o make_lib11.o make_lib12.o make_lib2.o make_unix.o make_subr_2.o make_subr.o set_num.o vdw_flexible.o emin.o libcheck_min.o math_refmac.o iheap_sort.o cell_symm_subrs.o subnumrec.o mol2_file.o sdf_files.o - # ------------ - - emin.o: emin.f crd_com.fh atom_com.fh -@@ -143,7 +145,7 @@ main_emin.o: main_emin.f - $(BLANC_FORT) -c main_emin.f - - emn: main_emin.o emin_new.o angle_subr.o make_unix.o make_CIF.o make_subr_2.o make_subr.o -- $(BLANC_FORT) -o ../bin/emin main_emin.o emin_new.o make_CIF.o angle_subr.o make_unix.o make_subr_2.o make_subr.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/emin main_emin.o emin_new.o make_CIF.o angle_subr.o make_unix.o make_subr_2.o make_subr.o - - # ------------- - -@@ -155,7 +157,7 @@ main_modcheck.o: main_modcheck.f - $(BLANC_FORT) -c main_modcheck.f - - mdcheck: main_modcheck.o modcheck.o mod_subr.o make_CIF.o make_unix.o make_subr_2.o make_subr.o -- $(BLANC_FORT) -o ../bin/modcheck main_modcheck.o make_CIF.o modcheck.o mod_subr.o make_unix.o make_subr_2.o make_subr.o -+ $(BLANC_FORT) ${LDFLAGS} -o ../bin/modcheck main_modcheck.o make_CIF.o modcheck.o mod_subr.o make_unix.o make_subr_2.o make_subr.o - - - # ====================================== diff --git a/sci-chemistry/makecif/makecif-5.6.6-r1.ebuild b/sci-chemistry/makecif/makecif-5.6.6-r1.ebuild deleted file mode 100644 index 509117f300af..000000000000 --- a/sci-chemistry/makecif/makecif-5.6.6-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils fortran-2 toolchain-funcs - -DESCRIPTION="PDB --> CIF convertor" -HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/makecif.html" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -SLOT="0" -KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -LICENSE="ccp4" -IUSE="" - -S="${WORKDIR}"/${PN} - -DEPEND="" -RDEPEND=" - !>=sci-chemistry/refmac-5.6 - sci-libs/monomer-db" - -src_prepare() { - epatch "${FILESDIR}"/${PV}-makefile.patch -} - -src_compile() { - emake -C src clean - emake \ - -C src \ - BLANC_FORT="$(tc-getFC) ${FFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin bin/* - dodoc readme -} diff --git a/sci-chemistry/makecif/makecif-5.6.6.ebuild b/sci-chemistry/makecif/makecif-5.6.6.ebuild deleted file mode 100644 index 3a5f70a8b259..000000000000 --- a/sci-chemistry/makecif/makecif-5.6.6.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils fortran-2 toolchain-funcs - -DESCRIPTION="PDB --> CIF convertor" -HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/makecif.html" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -LICENSE="ccp4" -IUSE="" - -S="${WORKDIR}"/${PN} - -DEPEND="" -RDEPEND=" - !>=sci-chemistry/refmac-5.6 - sci-libs/monomer-db" - -src_prepare() { - epatch "${FILESDIR}"/${PV}-makefile.patch -} - -src_compile() { - cd src && emake clean - emake \ - BLANC_FORT="$(tc-getFC) ${FFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin bin/* - dodoc readme -} diff --git a/sci-chemistry/makecif/metadata.xml b/sci-chemistry/makecif/metadata.xml deleted file mode 100644 index 993c1d1ffcda..000000000000 --- a/sci-chemistry/makecif/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> - <maintainer> - <email>jlec@gentoo.org</email> - </maintainer> - <longdescription> -PDB - CIF convertor -check and create correct structure description -create the list of restraints -create dictionary description of new ligands -rebuild missing atoms -create tree like structure -also the part of REFMAC -can use additional user's dictionary -</longdescription> -</pkgmetadata> diff --git a/sci-chemistry/molrep/Manifest b/sci-chemistry/molrep/Manifest deleted file mode 100644 index d91b8a448acd..000000000000 --- a/sci-chemistry/molrep/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST molrep-11.0.02.tar.gz 3594084 SHA256 6acb00bc91ad76027461ce6055eda72c8de34e5243449a31d5ede9e537e9adce SHA512 e22636e2d6b5558b66877960a64c0b990bb50d9e1b42016981b64e1311f83d5942fde7c1cd2dc8462ef1be814ce94ef566028079a7a091c9b3d7300f2d6ce03f WHIRLPOOL e507108a38be703e882ab3fd25e817c53c2d57b76fce578de3d308f10a85fce7a9febed39f748667a01c631b35787955d7d0290c944d4bfabfc936eab620daaf -DIST molrep-11.0.03.tar.gz 3643087 SHA256 f4c317713b0dddf0ca883734f0bfe27600b50f8d4dd354ea8ae8245e21ce4392 SHA512 d9ff351e3754871d100c41aa9b8af48e3588768320f5ed92e536fac5e24114ca5df6497103d0b077455fc4e30e2d3d085aeb63854eb88dc8e74259b4e1683dc8 WHIRLPOOL b16e128e3ca7f1734ca79f70decab3e262d47b6a37c49e46c4c7d51f3fd8093cd3a0f20e487caeb5e9aa0a37a9fd050588cad3e99ad46e1866d05ff4a8ed0bb6 diff --git a/sci-chemistry/molrep/files/10.2.35-respect-FLAGS.patch b/sci-chemistry/molrep/files/10.2.35-respect-FLAGS.patch deleted file mode 100644 index d81ec793b510..000000000000 --- a/sci-chemistry/molrep/files/10.2.35-respect-FLAGS.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- src/makefile 2009-02-27 16:51:46.492890717 +0100 -+++ src/makefile.new 2009-02-27 16:52:18.295619642 +0100 -@@ -5,8 +5,8 @@ - - BIN = $(MOLREP)/bin - --OBJS = main_molrep_mtz.o molrep.o molrep1.o molrep2.o molrep3.o molrep_prog.o molrep_prog1.o molrep_prog2.o molrep_subr.o molrep_dummy.o molrep_sym.o molrep_unix.o --OBJSL = main_molrep_mtz.o molrep.o molrep1.o molrep2.o molrep3.o molrep_prog.o molrep_prog1.o molrep_prog2.o molrep_subr.o molrep_sym.o molrep_unix.o -+OBJS = main_molrep_mtz.o molrep.o molrep1.o molrep2.o molrep3.o molrep_prog.o molrep_prog1.o molrep_prog2.o molrep_subr.o molrep_dummy.o molrep_sym_ccp4.o molrep_unix_ccp4.o -+OBJSL = main_molrep_mtz.o molrep.o molrep1.o molrep2.o molrep3.o molrep_prog.o molrep_prog1.o molrep_prog2.o molrep_subr.o molrep_sym_ccp4.o molrep_unix_ccp4.o - - - all: molrep -@@ -19,31 +19,31 @@ - # ----------------------------- - - molrep.o: molrep.f -- $(MR_FORT) -c molrep.f -+ $(MR_FORT) $(FFLAGS) -c molrep.f - molrep1.o: molrep1.f -- $(MR_FORT) -c molrep1.f -+ $(MR_FORT) $(FFLAGS) -c molrep1.f - molrep2.o: molrep2.f -- $(MR_FORT) -c molrep2.f -+ $(MR_FORT) $(FFLAGS) -c molrep2.f - molrep3.o: molrep3.f -- $(MR_FORT) -c molrep3.f -+ $(MR_FORT) $(FFLAGS) -c molrep3.f - molrep_prog.o: molrep_prog.f -- $(MR_FORT) -c molrep_prog.f -+ $(MR_FORT) $(FFLAGS) -c molrep_prog.f - molrep_prog1.o: molrep_prog1.f -- $(MR_FORT) -c molrep_prog1.f -+ $(MR_FORT) $(FFLAGS) -c molrep_prog1.f - molrep_prog2.o: molrep_prog2.f -- $(MR_FORT) -c molrep_prog2.f -+ $(MR_FORT) $(FFLAGS) -c molrep_prog2.f - molrep_subr.o: molrep_subr.f -- $(MR_FORT) -c molrep_subr.f --molrep_sym.o: molrep_sym.f -- $(MR_FORT) -c molrep_sym.f -+ $(MR_FORT) $(FFLAGS) -c molrep_subr.f -+molrep_sym_ccp4.o: molrep_sym.f -+ $(MR_FORT) $(FFLAGS) -c molrep_sym_ccp4.f - main_molrep_mtz.o: main_molrep_mtz.f molrep_version.fh molrep_keywords.fh -- $(MR_FORT) -c main_molrep_mtz.f --molrep_unix.o: molrep_unix.f -- $(MR_FORT) -c molrep_unix.f -+ $(MR_FORT) $(FFLAGS) -c main_molrep_mtz.f -+molrep_unix_ccp4.o: molrep_unix.f -+ $(MR_FORT) $(FFLAGS) -c molrep_unix_ccp4.f - molrep_dummy.o: molrep_dummy.f -- $(MR_FORT) -c molrep_dummy.f -+ $(MR_FORT) $(FFLAGS) -c molrep_dummy.f - - molrep: $(OBJS) -- $(MR_FORT) -o $(BIN)/molrep $(OBJSL) $(MR_LIBRARY) -+ $(MR_FORT) $(FFLAGS) $(LDFLAGS) -o $(BIN)/molrep $(OBJSL) $(MR_LIBRARY) - - # -------------------------------- - diff --git a/sci-chemistry/molrep/files/11.0.00-respect-FLAGS.patch b/sci-chemistry/molrep/files/11.0.00-respect-FLAGS.patch deleted file mode 100644 index c18b9a1e3f0d..000000000000 --- a/sci-chemistry/molrep/files/11.0.00-respect-FLAGS.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/makefile b/src/makefile -index 30d0de7..10dd68f 100755 ---- a/src/makefile -+++ b/src/makefile -@@ -46,6 +46,6 @@ molrep_dummy.o: molrep_dummy.f - $(MR_FORT) -c molrep_dummy.f - - molrep: $(OBJS) -- $(MR_FORT) -o $(BIN)/molrep $(OBJSL) $(MR_LIBRARY) -+ $(MR_FORT) $(LDFLAGS) -o $(BIN)/molrep $(OBJSL) $(MR_LIBRARY) - - # -------------------------------- diff --git a/sci-chemistry/molrep/files/11.0.00-test.patch b/sci-chemistry/molrep/files/11.0.00-test.patch deleted file mode 100644 index d90cfb8c7b35..000000000000 --- a/sci-chemistry/molrep/files/11.0.00-test.patch +++ /dev/null @@ -1,191 +0,0 @@ -diff --git a/molrep_check/em.bat b/molrep_check/em.bat -index 2f0f992..96ddd75 100755 ---- a/molrep_check/em.bat -+++ b/molrep_check/em.bat -@@ -8,6 +8,8 @@ $MR_TEST/molrep -m ../em/model.pdb -f ../em/pel.map -po out/ -ps scr/ -i <<stop - # -------------------------------- - _NMON 6 - stop -+echo $? -+[[ $? ]] || exit 1 - # -------------------------------- - # - # 2. Atomic model --> EM map -@@ -20,6 +22,7 @@ $MR_TEST/molrep -m ../em/model.pdb -f ../em/pel.map -po out/ -ps scr/ -i <<stop - _NMON 6 - _prf y - stop -+[[ $? ]] || exit 1 - # -------------------------------- - # - # 3. Atomic model --> EM map -@@ -36,6 +39,7 @@ _ncs 322 - _centre 0.500 0.490 0.490 - _angles 0.0 0.0 90.0 - stop -+[[ $? ]] || exit 1 - # -------------------------------- - # - cp out/molrep.pdb hexamer.pdb -@@ -52,6 +56,7 @@ $MR_TEST/molrep -mx hexamer.pdb -f ../em/pel.map -po out/ -ps scr/ -i <<stop - # -------------------------------- - _DOM s - stop -+[[ $? ]] || exit 1 - # -------------------------------- - # - # 5. EM --> X-ray -@@ -60,6 +65,7 @@ stop - $MR_TEST/molrep -f ../em/p2.cif -m ../em/pel.map -po out/ -ps scr/ -i <<stop - # -------------------------------- - stop -+[[ $? ]] || exit 1 - # -------------------------------- - # - # 6. Placing the model to a particular orientation and position. -@@ -72,4 +78,5 @@ $MR_TEST/molrep -f ../em/p2.cif -m ../em/pel.map -po out/ -ps scr/ -i <<stop - _fun s - _file_t ../em/tab - stop -+[[ $? ]] || exit 1 - #========================================== -diff --git a/molrep_check/mr.bat b/molrep_check/mr.bat -index 284a4cd..6e00695 100755 ---- a/molrep_check/mr.bat -+++ b/molrep_check/mr.bat -@@ -10,6 +10,7 @@ - $MR_TEST/molrep -f ../data/test.mtz -m ../data/test_mod.pdb -po out/ -ps scr/ -i <<stop - # -------------------------------- - stop -+[[ $? ]] || exit 1 - # - # ================================================================= - # -@@ -26,6 +27,7 @@ _nmon 2 - _COMPL .5 - _SIM .7 - stop -+[[ $? ]] || exit 1 - # - # ================================================================= - # -@@ -46,6 +48,7 @@ $MR_TEST/molrep -f ../data/test.cif -m ../data/test_mod.pdb -mx ../data/test_mod - # -------------------------------- - _NP 3 - stop -+[[ $? ]] || exit 1 - # - # ================================================================= - # -@@ -67,6 +70,7 @@ $MR_TEST/molrep -f ../data/test.cif -m ../data/test_mod.pdb -po out/ -ps scr/ -i - _NMON 2 - _NP 3 - stop -+[[ $? ]] || exit 1 - # - # ================================================================= - # -@@ -85,6 +89,7 @@ _NPT 3 - _NPTD 3 - _DYAD D - stop -+[[ $? ]] || exit 1 - # - # ================================================================= - # -@@ -103,6 +108,7 @@ _NP 3 - _NPT 10 - _NMR 3 - stop -+[[ $? ]] || exit 1 - # - # ================================================================= - # -@@ -118,6 +124,7 @@ _PRF Y - _compl 1. - _sim .2 - stop -+[[ $? ]] || exit 1 - # - # ================================================================= - # -@@ -136,6 +143,7 @@ _ph PH - _fom FOM - # - stop -+[[ $? ]] || exit 1 - # ================================================================= - # - # 9. use sequence -@@ -145,6 +153,7 @@ stop - $MR_TEST/molrep -f ../data/s100.mtz -m ../data/monomer.pdb -s ../data/s100.seq -po out/ -ps scr/ -i <<stop - # -------------------------------- - stop -+[[ $? ]] || exit 1 - # ================================================================= - # - # 10. Locked RF -@@ -157,6 +166,7 @@ _lock y - _file_tsrf ../data/srf.tab - _nsrf 1 - stop -+[[ $? ]] || exit 1 - # ================================================================= - # - # 11. Multi-monomer search using NCS, SELF = 'A' means to compute Self RF and -@@ -169,6 +179,7 @@ $MR_TEST/molrep -f ../data/s100.mtz -m ../data/monomer.pdb -m2 ../data/monomer.p - _self a - _nsrf 1 - stop -+[[ $? ]] || exit 1 - # ================================================================= - # - # 12. use pst -@@ -179,6 +190,7 @@ $MR_TEST/molrep -f ../data/pst.mtz -m ../data/model_pst.pdb -po out/ -ps scr/ -i - # -------------------------------- - # - stop -+[[ $? ]] || exit 1 - # ================================================================= - # - # 13. space group check -@@ -189,7 +201,8 @@ $MR_TEST/molrep -f ../data/test.mtz -m ../data/test_mod.pdb -po out/ -ps scr/ -i - # -------------------------------- - _sg all - # --stop -+s[[ $? ]] || exit 1 -+top - # ========================================================== - # - # 14. Example for finding HA position by MR solution. -@@ -206,6 +219,7 @@ _SIGFD SIGFD3 - # - _FUN d - stop -+[[ $? ]] || exit 1 - # ========================================================== - # - # 15. Example for HA search by multi-copy search -@@ -225,6 +239,7 @@ _diff h - _dyad y - _nmon 4 - stop -+[[ $? ]] || exit 1 - # ========================================================== - # - # 16. Example HA for search by translation function -@@ -242,6 +257,7 @@ _FUN t - _diff h - _nmon 4 - stop -+[[ $? ]] || exit 1 - # ========================================================== - # - # 17. Example for Self RF for Heavy Atom structure in derivative. -@@ -258,4 +274,5 @@ _SIGFD SIGFD3 - _FUN r - _diff h - stop -+[[ $? ]] || exit 1 - # ========================================================== diff --git a/sci-chemistry/molrep/files/11.0.03-EOR.patch b/sci-chemistry/molrep/files/11.0.03-EOR.patch deleted file mode 100644 index 430629e8dcc1..000000000000 --- a/sci-chemistry/molrep/files/11.0.03-EOR.patch +++ /dev/null @@ -1,16 +0,0 @@ - src/molrep.f | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/molrep.f b/src/molrep.f -index eac0cfc..94f74c6 100755 ---- a/src/molrep.f -+++ b/src/molrep.f -@@ -1257,7 +1257,7 @@ C CHECK_DENS_FILE( 2 ) - LEN1 = 1 - IF(LEN.GT.60) LEN1 = LEN - 59 - WRITE(LINE,'(''Input MODEL_2(fixed)_file:'',A)') -- * NAME2(LEN11:LEN) -+ * NAME2(LEN1:LEN) - CALL MSGDOC(MDoc,LINE) - - ENDIF diff --git a/sci-chemistry/molrep/molrep-11.0.02.ebuild b/sci-chemistry/molrep/molrep-11.0.02.ebuild deleted file mode 100644 index 51ff6cb26524..000000000000 --- a/sci-chemistry/molrep/molrep-11.0.02.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils fortran-2 multilib toolchain-funcs - -DESCRIPTION="molecular replacement program" -HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/molrep.html" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="ccp4" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - >=sci-libs/ccp4-libs-6.1.3 - sci-libs/mmdb - virtual/lapack" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}" - -src_prepare() { - epatch \ - "${FILESDIR}"/11.0.00-respect-FLAGS.patch \ - "${FILESDIR}"/11.0.00-test.patch -} - -src_compile() { - cd "${S}"/src - emake clean - emake \ - MR_FORT="$(tc-getFC) ${FFLAGS}" \ - FFLAGS="${FFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - MR_LIBRARY="-L${EPREFIX}/usr/$(get_libdir) -lccp4f -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb lapack) -lccif -lstdc++ -lm" -} - -src_test() { - export MR_TEST="${S}/bin/" - cd "${S}"/molrep_check/work - mkdir out scr - cp ../*.bat . - bash em.bat || die - bash mr.bat || die -} - -src_install() { - exeinto /usr/libexec/ccp4/bin/ - doexe bin/${PN} - dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN} - dodoc readme doc/${PN}.rtf -} diff --git a/sci-chemistry/molrep/molrep-11.0.03-r1.ebuild b/sci-chemistry/molrep/molrep-11.0.03-r1.ebuild deleted file mode 100644 index 3373bbba6f97..000000000000 --- a/sci-chemistry/molrep/molrep-11.0.03-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs - -DESCRIPTION="molecular replacement program" -HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/molrep.html" -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.gz" - -LICENSE="ccp4" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - >=sci-libs/ccp4-libs-6.1.3 - sci-libs/mmdb - virtual/lapack" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}" - -src_prepare() { - epatch \ - "${FILESDIR}"/11.0.00-respect-FLAGS.patch \ - "${FILESDIR}"/11.0.00-test.patch \ - "${FILESDIR}"/${PV}-EOR.patch - [[ $(tc-getFC) =~ gfortran ]] && append-fflags -fno-second-underscore -} - -src_compile() { - cd "${S}"/src - emake clean - emake \ - MR_FORT="$(tc-getFC) ${FFLAGS}" \ - FFLAGS="${FFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - MR_LIBRARY="-L${EPREFIX}/usr/$(get_libdir) -lccp4f -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb lapack) -lccif -lstdc++ -lm" -} - -src_test() { - export MR_TEST="${S}/bin/" - cd "${S}"/molrep_check/work - mkdir out scr - cp ../*.bat . - bash em.bat || die - bash mr.bat || die -} - -src_install() { - exeinto /usr/libexec/ccp4/bin/ - doexe bin/${PN} - dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN} - dodoc readme doc/${PN}.rtf -} diff --git a/sci-chemistry/mosflm/Manifest b/sci-chemistry/mosflm/Manifest deleted file mode 100644 index 80df134c833e..000000000000 --- a/sci-chemistry/mosflm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mosflm709.tgz 3324010 SHA256 d22b05211f274b50c284d4c14fcb456c52b13344e2a48d5f45855fe87f82f6d1 SHA512 aa85f8459f280e0e1d2d54041029ef072346ecef3ffcc7724eb524469e1b77dfbd95aac8b46f2b9682d605a4e5931d9c13f1162d5f3bcff08644db7e79a6316c WHIRLPOOL b3a82858a8d2a3162bc0fcfb3bf7fb7b01cfc6bca80b34643e7c6caae54b1ef1e2b24a58617ffe2b0423ca6626d51e31b49c0dba6a82ed5c61fa10d044e0d3b8 diff --git a/sci-chemistry/mosflm/files/7.0.6-Makefile.patch b/sci-chemistry/mosflm/files/7.0.6-Makefile.patch deleted file mode 100644 index a35232f6e8c0..000000000000 --- a/sci-chemistry/mosflm/files/7.0.6-Makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile 2008-10-17 16:15:30.000000000 +0200 -+++ Makefile.new 2009-02-20 21:52:34.000000000 +0100 -@@ -22,7 +22,7 @@ - CBFLIBS = cbf/lib/libcbf.a - JPGLIBS = jpg/libjpeg.a - --all: $(DPSLIBS) $(CBFLIBS) $(JPGLIBS) -- cd mosflm ; make -+all: dpslibs cbflibs -+ +make -C mosflm - - ########################################################################## - diff --git a/sci-chemistry/mosflm/files/7.0.6-impl-dec.patch b/sci-chemistry/mosflm/files/7.0.6-impl-dec.patch deleted file mode 100644 index da393eb93fe6..000000000000 --- a/sci-chemistry/mosflm/files/7.0.6-impl-dec.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/mosflm/bravais_fortran.c b/mosflm/bravais_fortran.c -index 3d68cad..800bd0e 100644 ---- a/mosflm/bravais_fortran.c -+++ b/mosflm/bravais_fortran.c -@@ -2,6 +2,7 @@ - #include <stdlib.h> - #include <math.h> - #include "../util/util.h" -+#include "../util/bravais.h" - - /* bravais_fortran_(): This routine converts array from FORTRAN program - to structure for call to bravais -diff --git a/mosflm/chelp.c b/mosflm/chelp.c -index b2aaefc..fa44ab0 100644 ---- a/mosflm/chelp.c -+++ b/mosflm/chelp.c -@@ -5,6 +5,7 @@ - /* modified for Linux by Joachim Meyer jmeyer@embl-heidelberg.de 1998.05.19 */ - - #include "chelp.h" -+#include <stdio.h> - - #if CALL_LIKE_HPUX - void chelp () -diff --git a/mosflm/pck.c b/mosflm/pck.c -index ec094fc..288671d 100644 ---- a/mosflm/pck.c -+++ b/mosflm/pck.c -@@ -17,6 +17,7 @@ - #include <math.h> - #include <ctype.h> - #include <string.h> -+#include <unistd.h> - - #define BYTE char - #define WORD short int diff --git a/sci-chemistry/mosflm/files/7.0.6-parallel.patch b/sci-chemistry/mosflm/files/7.0.6-parallel.patch deleted file mode 100644 index f735c7ce5cf7..000000000000 --- a/sci-chemistry/mosflm/files/7.0.6-parallel.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- cbf/Makefile 2009-08-31 09:35:06.000000000 +0200 -+++ cbf/Makefile.new 2009-08-31 10:44:46.000000000 +0200 -@@ -362,6 +362,8 @@ - $(EXAMPLES)/img.h \ - $(INCLUDE)/md5.h - -+OBJ = $(subst .c,.o,$(SOURCE)) -+ - # - # Compile the library and examples - # -@@ -379,11 +381,14 @@ - $(LIB): - mkdir $(LIB) - -+ -+.c.o: $(SOURCE) $(HEADERS) -+ $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $< -+ - # - # CBF library - # --$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) -- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) -+$(LIB)/libcbf.a: $(OBJ) $(COMMONDEP) - $(AR) cr $@ *.o - rm *.o - if [ -f $(RANLIB) ]; then $(RANLIB) $@ ; fi diff --git a/sci-chemistry/mosflm/files/7.0.7-parallel.patch b/sci-chemistry/mosflm/files/7.0.7-parallel.patch deleted file mode 100644 index df0a8b63273a..000000000000 --- a/sci-chemistry/mosflm/files/7.0.7-parallel.patch +++ /dev/null @@ -1,92 +0,0 @@ - Makefile | 21 ++++++++++----------- - cbf/Makefile | 9 +++++++-- - 2 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/Makefile b/Makefile -index 37f4c7e..51d4164 100644 ---- a/Makefile -+++ b/Makefile -@@ -22,8 +22,8 @@ DPSLIBS = lib/DPSLIB.a - CBFLIBS = cbf/lib/libcbf.a - JPGLIBS = jpg/libjpeg.a - --all: $(DPSLIBS) $(CBFLIBS) $(JPGLIBS) -- cd mosflm ; make -+all: $(DPSLIBS) -+ $(MAKE) -C mosflm - - ########################################################################## - # # -@@ -47,22 +47,21 @@ dpslibs: - - cbflibs: - rm -f `find ./cbf -name "*.a" -print` -- cd cbf ; make all ; if [ -f $(RANLIB) ]; \ -- then $(RANLIB) lib/libcbf.a; fi -+ $(MAKE) -C cbf all - - jpglibs: -- cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; make libjpeg.a -+ cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; $(MAKE) libjpeg.a - - ${DPSLIBS}: -- make dpslibs -+ $(MAKE) dpslibs - - ${CBFLIBS}: -- make cbflibs -+ $(MAKE) cbflibs - - ${JPGLIBS}: -- make jpglibs -+ $(MAKE) jpglibs - --libs: ${DPSLIBS} ${CBFLIBS} ${JPGLIBS} -+libs: ${DPSLIBS} ${CBFLIBS} - @echo "****************************************************************" - @echo " Making libraries for system ${HOSTTYPE}" - @echo "****************************************************************" -@@ -71,11 +70,11 @@ ipmosflm: libs - @echo "****************************************************************" - @echo " Making IPMOSFLM for system ${HOSTTYPE}" - @echo "****************************************************************" -- cd mosflm ; make ipmosflm -+ $(MAKE) -C mosflm ipmosflm - - force: - rm bin/ipmosflm -- make ipmosflm -+ $(MAKE) ipmosflm - - install: - @echo "the executable is in ${MOSHOME}/bin/ipmosflm" -diff --git a/cbf/Makefile b/cbf/Makefile -index e61497c..c3c94ac 100644 ---- a/cbf/Makefile -+++ b/cbf/Makefile -@@ -362,6 +362,8 @@ HEADERS = $(INCLUDE)/cbf.h \ - $(EXAMPLES)/img.h \ - $(INCLUDE)/md5.h - -+OBJ = $(subst .c,.o,$(SOURCE)) -+ - # - # Compile the library and examples - # -@@ -379,11 +381,14 @@ $(INSTALLDIR): - $(LIB): - mkdir $(LIB) - -+ -+.c.o: $(SOURCE) $(HEADERS) -+ $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $< -+ - # - # CBF library - # --$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) -- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) -+$(LIB)/libcbf.a: $(OBJ) $(COMMONDEP) - $(AR) cr $@ *.o - rm *.o - if [ -f $(RANLIB) ]; then $(RANLIB) $@ ; fi diff --git a/sci-chemistry/mosflm/files/7.0.9-parallel.patch b/sci-chemistry/mosflm/files/7.0.9-parallel.patch deleted file mode 100644 index 38c6fc45a5c0..000000000000 --- a/sci-chemistry/mosflm/files/7.0.9-parallel.patch +++ /dev/null @@ -1,92 +0,0 @@ - Makefile | 21 ++++++++++----------- - cbf/Makefile | 9 +++++++-- - 2 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/Makefile b/Makefile -index 3d2f543..2219d8d 100644 ---- a/Makefile -+++ b/Makefile -@@ -22,8 +22,8 @@ DPSLIBS = lib/DPSLIB.a - CBFLIBS = cbf/lib/libcbf.a - JPGLIBS = jpg/libjpeg.a - --all: $(DPSLIBS) $(CBFLIBS) $(JPGLIBS) -- cd mosflm ; make -+all: $(DPSLIBS) -+ $(MAKE) -C mosflm - - dpslibs: - @-find . -name "*a" -delete -@@ -32,22 +32,21 @@ dpslibs: - - cbflibs: - @-find ./cbf -name "*.a" -delete -- cd cbf ; make all ; if [ -f $(RANLIB) ]; \ -- then $(RANLIB) lib/libcbf.a; fi -+ $(MAKE) -C cbf all - - jpglibs: -- cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; make libjpeg.a -+ cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; $(MAKE) libjpeg.a - - ${DPSLIBS}: -- make dpslibs -+ $(MAKE) dpslibs - - ${CBFLIBS}: -- make cbflibs -+ $(MAKE) cbflibs - - ${JPGLIBS}: -- make jpglibs -+ $(MAKE) jpglibs - --libs: ${DPSLIBS} ${CBFLIBS} ${JPGLIBS} -+libs: ${DPSLIBS} ${CBFLIBS} - @echo "****************************************************************" - @echo " Making libraries for system ${HOSTTYPE}" - @echo "****************************************************************" -@@ -56,11 +55,11 @@ ipmosflm: libs - @echo "****************************************************************" - @echo " Making IPMOSFLM for system ${HOSTTYPE}" - @echo "****************************************************************" -- cd mosflm ; make ipmosflm -+ $(MAKE) -C mosflm ipmosflm - - force: - @-rm -f bin/ipmosflm -- make ipmosflm -+ $(MAKE) ipmosflm - - install: - @echo "the executable is in ${MOSHOME}/bin/ipmosflm" -diff --git a/cbf/Makefile b/cbf/Makefile -index e61497c..c3c94ac 100644 ---- a/cbf/Makefile -+++ b/cbf/Makefile -@@ -362,6 +362,8 @@ HEADERS = $(INCLUDE)/cbf.h \ - $(EXAMPLES)/img.h \ - $(INCLUDE)/md5.h - -+OBJ = $(subst .c,.o,$(SOURCE)) -+ - # - # Compile the library and examples - # -@@ -379,11 +381,14 @@ $(INSTALLDIR): - $(LIB): - mkdir $(LIB) - -+ -+.c.o: $(SOURCE) $(HEADERS) -+ $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $< -+ - # - # CBF library - # --$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) -- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) -+$(LIB)/libcbf.a: $(OBJ) $(COMMONDEP) - $(AR) cr $@ *.o - rm *.o - if [ -f $(RANLIB) ]; then $(RANLIB) $@ ; fi diff --git a/sci-chemistry/mosflm/files/mosflm-7.0.7-buffer-overflow.patch b/sci-chemistry/mosflm/files/mosflm-7.0.7-buffer-overflow.patch deleted file mode 100644 index 90158eb458d5..000000000000 --- a/sci-chemistry/mosflm/files/mosflm-7.0.7-buffer-overflow.patch +++ /dev/null @@ -1,16 +0,0 @@ - mosflm/pilatus_c.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/mosflm/pilatus_c.c b/mosflm/pilatus_c.c -index 1eaae26..cce5a02 100644 ---- a/mosflm/pilatus_c.c -+++ b/mosflm/pilatus_c.c -@@ -34,7 +34,7 @@ delete them later */ - int cbf_int[16]; - long cbf_int4[16]; - double cbf_double[16]; -- char cbf_char[16][24]; -+ char cbf_char[16][32]; - /* temporary from cbfwrap.c - pilatus doesn't have these, so we'll - delete them later */ - int id, index, iindex; diff --git a/sci-chemistry/mosflm/files/mosflm-7.0.7-impl-dec.patch b/sci-chemistry/mosflm/files/mosflm-7.0.7-impl-dec.patch deleted file mode 100644 index 32f251f8e00c..000000000000 --- a/sci-chemistry/mosflm/files/mosflm-7.0.7-impl-dec.patch +++ /dev/null @@ -1,29 +0,0 @@ - mosflm/mosflm_jpeg.c | 1 + - src/dps/index/ind_gen_direct.c | 2 ++ - 2 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/mosflm/mosflm_jpeg.c b/mosflm/mosflm_jpeg.c -index 2b32b2e..54684d0 100644 ---- a/mosflm/mosflm_jpeg.c -+++ b/mosflm/mosflm_jpeg.c -@@ -76,6 +76,7 @@ G. Winter - #include <fcntl.h> - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - #if (defined _MSC_VER) - /* no need to do this for __MINGW_ (Mingw gcc) this is just about unique!*/ - #define S_IRWXU S_IREAD|S_IWRITE|S_IEXEC -diff --git a/src/dps/index/ind_gen_direct.c b/src/dps/index/ind_gen_direct.c -index 6e143df..2eea61b 100644 ---- a/src/dps/index/ind_gen_direct.c -+++ b/src/dps/index/ind_gen_direct.c -@@ -41,6 +41,8 @@ - /* #include <malloc.h> */ - #include "util.h" - #include "ind_gen_direct.h" -+#include "ind_help.h" -+#include "ind_sort_merge.h" - /* char *strcat( char *, const char *); */ - - diff --git a/sci-chemistry/mosflm/files/mosflm-7.0.9-buffer-overflow.patch b/sci-chemistry/mosflm/files/mosflm-7.0.9-buffer-overflow.patch deleted file mode 100644 index bb4a16bf30fc..000000000000 --- a/sci-chemistry/mosflm/files/mosflm-7.0.9-buffer-overflow.patch +++ /dev/null @@ -1,16 +0,0 @@ - mosflm/pilatus_c.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/mosflm/pilatus_c.c b/mosflm/pilatus_c.c -index 4a85b26..9893e0c 100644 ---- a/mosflm/pilatus_c.c -+++ b/mosflm/pilatus_c.c -@@ -34,7 +34,7 @@ delete them later */ - int cbf_int[16] = {0}; - long cbf_int4[16] = {0}; - double cbf_double[16] = {0}; -- char cbf_char[16][24] = {' '}; -+ char cbf_char[16][32] = {' '}; - /* temporary from cbfwrap.c - pilatus doesn't have these, so we'll - delete them later */ - int id, index, iindex; diff --git a/sci-chemistry/mosflm/mosflm-7.0.9.ebuild b/sci-chemistry/mosflm/mosflm-7.0.9.ebuild deleted file mode 100644 index 3aa74ced3d94..000000000000 --- a/sci-chemistry/mosflm/mosflm-7.0.9.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils fortran-2 toolchain-funcs versionator - -MY_PV="$(delete_all_version_separators)" -MY_P="${PN}${MY_PV}" - -DESCRIPTION="A program for integrating single crystal diffraction data from area detectors" -HOMEPAGE="http://www.mrc-lmb.cam.ac.uk/harry/mosflm/" -SRC_URI="${HOMEPAGE}ver${MY_PV}/build-it-yourself/${MY_P}.tgz" - -SLOT="0" -LICENSE="ccp4" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - app-shells/tcsh - sci-libs/cbflib - sci-libs/ccp4-libs - sys-libs/ncurses - virtual/jpeg:0= - x11-libs/libxdl_view" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - sed \ - -e "s:../cbf/lib/libcbf.a:-lcbf -limg:g" \ - -e "s:../jpg/libjpeg.a:-ljpeg:g" \ - -i ${PN}/Makefile || die - - sed \ - -e '/jinclude.h/d' \ - -i mosflm/mosflm_jpeg.c || die - - cp DATETIME.C mosflm/datetime.c || die - - epatch \ - "${FILESDIR}"/${PV}-parallel.patch \ - "${FILESDIR}"/7.0.6-impl-dec.patch \ - "${FILESDIR}"/${P}-buffer-overflow.patch \ - "${FILESDIR}"/${PN}-7.0.7-impl-dec.patch - - rm -rf test.f {cbf,jpg}/*.{h,c} || die -} - -src_compile() { - emake \ - MOSHOME="${S}" \ - DPS="${S}" \ - FC=$(tc-getFC) \ - FLINK=$(tc-getFC) \ - CC=$(tc-getCC) \ - AR_FLAGS=vru \ - MOSLIBS="-lccp4f -lccp4c -lxdl_view $($(tc-getPKG_CONFIG) --libs ncurses) -lXt -lmmdb -lccif -lstdc++" \ - MCFLAGS="-O0 -fno-second-underscore" \ - MOSFLAGS="${FFLAGS} -fno-second-underscore" \ - FFLAGS="${FFLAGS} -fno-second-underscore" \ - CFLAGS="${CFLAGS}" \ - MOSCFLAGS="${CFLAGS}" \ - LFLAGS="${LDFLAGS}" -} - -src_install() { - exeinto /usr/libexec/ccp4/bin/ - doexe bin/ipmosflm - dosym ../libexec/ccp4/bin/ip${PN} /usr/bin/ip${PN} -} diff --git a/sci-chemistry/mrbump/Manifest b/sci-chemistry/mrbump/Manifest deleted file mode 100644 index f9887a6071b2..000000000000 --- a/sci-chemistry/mrbump/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mrbump-0.4.4.tar.gz 9220116 SHA256 499634815cf316ca273900252dab16b91f6421b0f85a548108258f9934dccd6a SHA512 3a39159d78c4310f5a04efc7bb10ed81f6f260baa65db3615d5065c94175e33de3dbe2073de057a699efe541d59674cc927699229a4af5e8102600caea4c03d3 WHIRLPOOL adb8c583b81cce8ec7e29f203b0a33de41f42c0fae77317671593f661db8c06c56106ed4fcfdeb503c9594c8802dc1dd1a0c7da290b7d3046e8f3d8d6911f60d diff --git a/sci-chemistry/mrbump/files/0.4.4-superpose.patch b/sci-chemistry/mrbump/files/0.4.4-superpose.patch deleted file mode 100644 index c9941e9ece2a..000000000000 --- a/sci-chemistry/mrbump/files/0.4.4-superpose.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- share/mrbump/include/mr/Ensemble.py 2008-07-28 16:40:47.000000000 +0200 -+++ share/mrbump/include/mr/Ensemble.py.new 2009-08-26 22:26:44.000000000 +0200 -@@ -29,7 +29,7 @@ - self.superposeEXE=os.path.join(os.environ['CBIN'], 'superpose.exe') - self.pdbsetEXE=os.path.join(os.environ['CBIN'], 'pdbset.exe') - else: -- self.superposeEXE=os.path.join(os.environ['CBIN'], 'superpose') -+ self.superposeEXE=os.path.join(os.environ['CBIN'], 'superpose-ccp4') - self.pdbsetEXE=os.path.join(os.environ['CBIN'], 'pdbset') - - self.SPxyz_template='' diff --git a/sci-chemistry/mrbump/mrbump-0.4.4.ebuild b/sci-chemistry/mrbump/mrbump-0.4.4.ebuild deleted file mode 100644 index 66ec9309e1cd..000000000000 --- a/sci-chemistry/mrbump/mrbump-0.4.4.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" - -PYTHON_DEPEND="2" - -inherit eutils multilib python - -DESCRIPTION="An automated scheme for Molecular Replacement" -HOMEPAGE="http://www.ccp4.ac.uk/MrBUMP" -SRC_URI="${HOMEPAGE}/release/${P}.tar.gz" - -LICENSE="ccp4" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="X perl" - -RDEPEND=">=sci-chemistry/ccp4-apps-6.1.3[X?] - || ( sci-biology/mafft - sci-biology/clustalw:2 - sci-biology/probcons - sci-biology/t-coffee ) - sci-biology/fasta - X? ( media-gfx/graphviz ) - perl? ( dev-perl/SOAP-Lite )" -DEPEND="${RDEPEND}" - -pkg_setup() { - python_set_active_version 2 -} - -src_unpack(){ - unpack ${A} - cd "${S}" - unpack ./"${PN}".tar.gz -} - -src_prepare() { - epatch "${FILESDIR}"/${PV}-superpose.patch - python_convert_shebangs 2 setup_lib/* -} - -src_install(){ - insinto /usr/$(get_libdir)/ccp4/ccp4i - doins -r ccp4i/{MrBUMP-ccp4i.tar.gz,MrBUMP/{help,scripts,tasks,templates}} || \ - die "failed to install interface" - - insinto /usr/share/${PN} - doins -r share/${PN}/{data,include} || die "failed to install mrbump data" - - dobin share/${PN}/bin/* || die "failed to install binaries" - - dodoc README.txt || die - dohtml html/mrbump_doc.html || die -} diff --git a/sci-chemistry/mustang/Manifest b/sci-chemistry/mustang/Manifest index 278238854069..f8d1b591405d 100644 --- a/sci-chemistry/mustang/Manifest +++ b/sci-chemistry/mustang/Manifest @@ -1 +1,2 @@ DIST mustang_v3.2.1.tgz 161216 SHA256 38f8ec10f15466a42ade770eb6c3ed0ed2449bb070a53b5e8d3125f2596b1556 SHA512 aee37bb77edbdc601cdc735db8602d0a3804065200df1b36b6956e74dfd5f85b554a655be1bfbe673aada1abd5e1aee1c0f59fb2ff0380bfcb725e38439d41ff WHIRLPOOL 521edce7648c28c067dae4462e432c8b5f2b9a60be4248ba78280067254fdfb9f584c18ce9afc5c99927f6227e1e650989cd7d65df1b3c6e7494d617b89a74fe +DIST mustang_v3.2.2.tgz 141940 SHA256 6fe274a93b54ba3c46e262fc6d7114bad239d1cbd2dadec8a92a7194328373a2 SHA512 cb862f860f3cdb3349743c6005a29acc14cde5269df9d61f1100ffdc9a22c1d8e3dd46771371557b823724e79783f8fcb7356c63c6f0c0a09aac09bee407a26d WHIRLPOOL 63e7b6f881274c20df59e85699b1f1a07506f0dd20082e898001c163fb02b60336c0ee6b629bf19f773f86b3479f4ae1344cf1ea6b7f6052d1407db3f05910bb diff --git a/sci-chemistry/mustang/files/mustang-3-gcc43.patch b/sci-chemistry/mustang/files/mustang-3-gcc43.patch deleted file mode 100644 index ef2818b92ed8..000000000000 --- a/sci-chemistry/mustang/files/mustang-3-gcc43.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -u MUSTANG_v.3.orig/src/ew_2.cpp MUSTANG_v.3/src/ew_2.cpp ---- MUSTANG_v.3.orig/src/ew_2.cpp 2008-01-15 11:18:34.000000000 -0700 -+++ MUSTANG_v.3/src/ew_2.cpp 2008-12-09 10:47:22.000000000 -0700 -@@ -36,6 +36,7 @@ - using std::ifstream; - - #include<math.h> -+#include <cstdlib> - #include "macros.h" - #include "globals.h" - #include "ew.h" -diff -u MUSTANG_v.3.orig/src/multiple_superposition.cpp MUSTANG_v.3/src/multiple_superposition.cpp ---- MUSTANG_v.3.orig/src/multiple_superposition.cpp 2008-01-15 11:18:34.000000000 -0700 -+++ MUSTANG_v.3/src/multiple_superposition.cpp 2008-12-09 10:49:00.000000000 -0700 -@@ -51,6 +51,7 @@ - #include "alloc_routines.h" - #include "de_alloc_routines.h" - #include <cmath> -+#include <cstdlib> - #define THRESH 0.0001 - - void MOVE_TO_CENTER_OF_GRAVITY( int NSTRUC , int NRES , float ***R , float **CMs ) -diff -u MUSTANG_v.3.orig/src/multiple_superposition.h MUSTANG_v.3/src/multiple_superposition.h ---- MUSTANG_v.3.orig/src/multiple_superposition.h 2008-01-15 11:18:34.000000000 -0700 -+++ MUSTANG_v.3/src/multiple_superposition.h 2008-12-09 10:48:11.000000000 -0700 -@@ -25,3 +25,4 @@ - #define MULT_SUPERPOSE - void M_SUPERPOSE( int , int , float***, float** , float*** ) ; - #endif -+#include <cstdlib> -diff -u MUSTANG_v.3.orig/src/pdb_ripper.h MUSTANG_v.3/src/pdb_ripper.h ---- MUSTANG_v.3.orig/src/pdb_ripper.h 2008-01-15 11:18:34.000000000 -0700 -+++ MUSTANG_v.3/src/pdb_ripper.h 2008-12-09 10:46:47.000000000 -0700 -@@ -29,4 +29,5 @@ - void PARSE_ENTIRE_PDB_STRUCTURE( char * , int ) ; - - #endif -+#include <cstdlib> - -diff -u MUSTANG_v.3.orig/src/progress_align.h MUSTANG_v.3/src/progress_align.h ---- MUSTANG_v.3.orig/src/progress_align.h 2008-01-15 11:18:34.000000000 -0700 -+++ MUSTANG_v.3/src/progress_align.h 2008-12-09 10:47:50.000000000 -0700 -@@ -25,3 +25,4 @@ - #define PROG_ALGN_H - void PROGRESSIVE_ALIGNMENT_USING_EXTENDED_EDGE_WEIGHTS() ; - #endif -+#include <cstdlib> -diff -u MUSTANG_v.3.orig/src/read_structures.h MUSTANG_v.3/src/read_structures.h ---- MUSTANG_v.3.orig/src/read_structures.h 2008-01-15 11:18:34.000000000 -0700 -+++ MUSTANG_v.3/src/read_structures.h 2008-12-09 10:46:22.000000000 -0700 -@@ -26,3 +26,4 @@ - void READ_STRUCTURES( char **paths ); - void READ_ENTIRE_PDBS( char **paths) ; - #endif -+#include <cstdlib> diff --git a/sci-chemistry/mustang/mustang-3.2.2.ebuild b/sci-chemistry/mustang/mustang-3.2.2.ebuild new file mode 100644 index 000000000000..fdc300fd2b0b --- /dev/null +++ b/sci-chemistry/mustang/mustang-3.2.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils toolchain-funcs + +MY_PN="MUSTANG" +SRC_P="${PN}_v${PV}" +MY_P="${MY_PN}_v${PV}" + +DESCRIPTION="MUltiple STructural AligNment AlGorithm" +HOMEPAGE="http://www.csse.monash.edu.au/~karun/Site/mustang.html" +SRC_URI="http://www.csse.monash.edu.au/~karun/${PN}/${PN}_v${PV}.tgz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.2.1-gcc-4.7.patch + sed -e 's:3.2.1:3.2.2:g' -i Makefile || die +} + +src_compile() { + emake \ + CPP=$(tc-getCXX) \ + CPPFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" +} + +src_test() { + ./bin/${P} -f ./data/test/test_zf-CCHH || die +} + +src_install() { + newbin bin/${P} ${PN} + doman man/${PN}.1 + dodoc README +} + +pkg_postinst() { + elog "If you use this program for an academic paper, please cite:" + elog "Arun S. Konagurthu, James C. Whisstock, Peter J. Stuckey, and Arthur M. Lesk" + elog "Proteins: Structure, Function, and Bioinformatics. 64(3):559-574, Aug. 2006" +} diff --git a/sci-chemistry/oasis/Manifest b/sci-chemistry/oasis/Manifest deleted file mode 100644 index e87a831c1fe3..000000000000 --- a/sci-chemistry/oasis/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST oasis4.0_Linux.zip 6714528 SHA256 56da70ce0c2750aaddf64ad2cd7852fc341d2022209484beb356b4e73dec61ba SHA512 b43b8315e8e3bc8531e11021605100f231635e2363256a19ed0f51015913221eb9e37b3891b9b1239bf83c9ada8f65a1bdc79ec5745201436f8c3b5019bd4bf7 WHIRLPOOL 24d337391997d036bd657ab22aecc77d36f7fa0af573d17433869a29640a8a10368c75ebee114071c577cc0cce34d838271147599d99e2c389088b8c6185f41b diff --git a/sci-chemistry/oasis/files/4.0-makefile.patch b/sci-chemistry/oasis/files/4.0-makefile.patch deleted file mode 100644 index f27a350a1fd2..000000000000 --- a/sci-chemistry/oasis/files/4.0-makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 1e9128f..eb9edaf 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -20,8 +20,8 @@ IRIX: - @ ${F77} -O2 -mips3 -nocpp -OPT:Olimit=1500 -w -rpath ${CCP4_LIB} -o oasis4-0 oasis4-0.f -L${CCP4_LIB}/src -lccp4f -lccp4c -lmmdb -lC -lm -L/usr/lib32 -lblas - @ ${F77} -O2 -mips3 -nocpp -OPT:Olimit=1500 -w -rpath ${CCP4_LIB} -o fnp2fp fnp2fp.f -L${CCP4_LIB}/src -lccp4f -lccp4c -lmmdb -lC -lm -L/usr/lib32 -lblas - Linux: -- @ ${F77} -O -w -fno-second-underscore -fno-globals -fno-automatic -o oasis4-0 oasis4-0.f -L${CCP4_LIB} -lccp4f -lccp4c -lmmdb -lstdc++ -lg2c -lm -L${CCP4_LIB} -- @ ${F77} -O -w -fno-second-underscore -fno-globals -fno-automatic -o fnp2fp fnp2fp.f -L${CCP4_LIB} -lccp4f -lccp4c -lmmdb -lstdc++ -lg2c -lm -L${CCP4_LIB} -+ ${F77} $(CFLAGS) $(LDFLAGS) -o oasis oasis4-0.f -L${CCP4_LIB} -lccp4f -lccp4c -lmmdb -lstdc++ -lm -L${CCP4_LIB} -+ ${F77} $(CFLAGS) $(LDFLAGS) -o fnp2fp fnp2fp.f -L${CCP4_LIB} -lccp4f -lccp4c -lmmdb -lstdc++ -lm -L${CCP4_LIB} - Darwin: - @ ${F77} -O2 -fno-second-underscore -o fnp2fp fnp2fp.f -L${CCP4_LIB} -lccp4f -lccp4c -lmmdb -lstdc++ -lgcc_s.10.5 -lSystem -lm - @ ${F77} -O2 -fno-second-underscore -o oasis4-0 oasis4-0.f -L${CCP4_LIB} -lccp4f -lccp4c -lmmdb -lstdc++ -lgcc_s.10.5 -lSystem -lm diff --git a/sci-chemistry/oasis/metadata.xml b/sci-chemistry/oasis/metadata.xml deleted file mode 100644 index 8412c2f3d312..000000000000 --- a/sci-chemistry/oasis/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> - <use> - <flag name="minimal">Restricts functionality on free software</flag> - </use> -</pkgmetadata> diff --git a/sci-chemistry/oasis/oasis-4.0-r3.ebuild b/sci-chemistry/oasis/oasis-4.0-r3.ebuild deleted file mode 100644 index 98c8aaef47b4..000000000000 --- a/sci-chemistry/oasis/oasis-4.0-r3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils fortran-2 multilib toolchain-funcs - -MY_P="${PN}${PV}_Linux" - -DESCRIPTION="A direct-method program for SAD/SIR phasing" -HOMEPAGE="http://cryst.iphy.ac.cn/Project/protein/protein-I.html" -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${MY_P}.zip" - -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -LICENSE="ccp4 oasis" -IUSE="examples +minimal" - -RDEPEND=" - sci-chemistry/ccp4-apps - sci-chemistry/pymol - sci-libs/mmdb:0 - sci-visualization/gnuplot - !minimal? ( - sci-chemistry/solve-resolve-bin - sci-chemistry/arp-warp-bin - )" -DEPEND="${RDEPEND} - sci-libs/ccp4-libs" - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - rm bin/{fnp2fp,gnuplot,oasis4-0,seq} || die - epatch "${FILESDIR}"/${PV}-makefile.patch -} - -src_compile() { - emake \ - -C src \ - F77="$(tc-getFC)" \ - CFLAGS="${FFLAGS}" \ - CCP4_LIB="${EPREFIX}/usr/$(get_libdir)" \ - Linux -} - -src_install() { - exeinto /usr/libexec/ccp4/bin/ - doexe src/{${PN},fnp2fp} - - exeinto /usr/$(get_libdir)/${PN} - doexe bin/*.*sh - - insinto /usr/share/doc/${PF}/html - doins bin/html/* - dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/${PN}/html - chmod 755 "${ED}"/usr/share/doc/${PF}/html/*.{*sh,awk} || die - - if use examples; then - insinto /usr/share/${PN} - doins -r examples - fi - - cat >> "${T}"/25oasis <<- EOF - oasisbin="${EPREFIX}/usr/$(get_libdir)/${PN}" - EOF - - doenvd "${T}"/25oasis -} diff --git a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild index 71a41ba76d7d..0331dc71a028 100644 --- a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild +++ b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild @@ -25,6 +25,9 @@ DEPEND="${RDEPEND} S="${WORKDIR}/openbabel-${PV}" src_prepare() { + sed \ + -e '/__GNUC__/s:== 4:>= 4:g' \ + -i include/openbabel/shared_ptr.h || die epatch \ "${FILESDIR}"/${P}-trunk_cmake.patch \ "${FILESDIR}"/${P}-bindings_only.patch @@ -32,14 +35,15 @@ src_prepare() { } src_configure() { - local mycmakeargs="${mycmakeargs} + local mycmakeargs=( -DCMAKE_INSTALL_RPATH= -DBINDINGS_ONLY=ON -DBABEL_SYSTEM_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libopenbabel.so" -DOB_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/openbabel/${PV}" -DLIB_INSTALL_DIR="${D}/${VENDOR_ARCH}" -DPERL_BINDINGS=ON - -DRUN_SWIG=ON" + -DRUN_SWIG=ON + ) cmake-utils_src_configure } diff --git a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild b/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild index 2650d1959a0d..114ace5e00a0 100644 --- a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild +++ b/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild @@ -45,11 +45,14 @@ src_prepare() { -outdir scripts/python \ scripts/openbabel-python.i \ || die "Regeneration of openbabel-python.cpp failed" + sed \ + -e '/__GNUC__/s:== 4:>= 4:g' \ + -i include/openbabel/shared_ptr.h || die } src_configure() { my_impl_src_configure() { - local mycmakeargs="${mycmakeargs} + local mycmakeargs=( -DCMAKE_INSTALL_RPATH= -DBINDINGS_ONLY=ON -DBABEL_SYSTEM_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libopenbabel.so" @@ -60,7 +63,8 @@ src_configure() { -DPYTHON_INCLUDE_DIR="${EPREFIX}/usr/include/${EPYTHON}" -DPYTHON_INCLUDE_PATH="${EPREFIX}/usr/include/${EPYTHON}" -DPYTHON_LIBRARY="${EPREFIX}/usr/$(get_libdir)/lib${EPYTHON}.so" - -DENABLE_TESTS=ON" + -DENABLE_TESTS=ON + ) cmake-utils_src_configure } diff --git a/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild b/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild new file mode 100644 index 000000000000..c7915328e1fc --- /dev/null +++ b/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" + +inherit cmake-utils eutils wxwidgets + +DESCRIPTION="Interconverts file formats used in molecular modeling" +HOMEPAGE="http://openbabel.sourceforge.net/" +SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc openmp test wxwidgets" + +RDEPEND=" + dev-cpp/eigen:3 + dev-libs/libxml2:2 + sci-libs/inchi + sys-libs/zlib + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" +DEPEND="${RDEPEND} + >=dev-util/cmake-2.4.8 + doc? ( app-doc/doxygen )" + +DOCS="AUTHORS ChangeLog NEWS README THANKS doc/*.inc doc/README* doc/*.mol2" + +PATCHES=( "${FILESDIR}"/${P}-test_lib_path.patch ) + +pkg_setup() { + if use openmp; then + if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then + ewarn "OpenMP is not available in your current selected gcc" + die "need openmp capable gcc" + fi + FORTRAN_NEED_OPENMP=1 + fi +} + +src_prepare() { + sed \ + -e '/__GNUC__/s:== 4:>= 4:g' \ + -i include/openbabel/shared_ptr.h || die + cmake-utils_src_prepare +} + +src_configure() { + need-wxwidgets unicode + local mycmakeargs=() + mycmakeargs+=( + -DOPENBABEL_USE_SYSTEM_INCHI=ON + $(cmake-utils_use_enable openmp OPENMP) + $(cmake-utils_use wxwidgets BUILD_GUI) + ) + + cmake-utils_src_configure +} + +src_install() { + dohtml doc/{*.html,*.png} + if use doc ; then + insinto /usr/share/doc/${PF}/API/html + doins doc/API/html/* + fi + + cmake-utils_src_install +} + +src_test() { + local mycmakeargs="" + mycmakeargs="${mycmakeargs} + -DOPENBABEL_USE_SYSTEM_INCHI=ON + -DPYTHON_EXECUTABLE=false + $(cmake-utils_use_enable openmp OPENMP) + $(cmake-utils_use wxwidgets BUILD_GUI) + $(cmake-utils_use_enable test TESTS)" + + cmake-utils_src_configure + cmake-utils_src_compile + cmake-utils_src_test -E py +} + +pkg_postinst() { + optfeature "perl support" sci-chemistry/openbabel-perl + optfeature "python support" sci-chemistry/openbabel-python +} diff --git a/sci-chemistry/pdb-extract/Manifest b/sci-chemistry/pdb-extract/Manifest deleted file mode 100644 index 9036c79e3e7c..000000000000 --- a/sci-chemistry/pdb-extract/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST pdb-extract-v3.004-prod-src.tar.gz 942450 SHA256 58bef2aba4869cdd16a79ddc588da5596a2ccd1f5c925f300b63b6d8299bb953 SHA512 4505fd615324982e741a3656d8a36ffc2cd6524c825d254e0a1ff44b3464aaf63cbdbe4f614a6ace6c0e56af8f452634152edadd0ed5305f0148856affa8cb60 WHIRLPOOL b7077431d75a31a9ac4ea41f7cb76874aa49626a19c1290126405a8cdac4d210f56929f9213512ae4f542286be5cbedc972642b9ef07a4e461ac969c6c0d965f -DIST pdb-extract-v3.11-prod-src.tar.gz 1016140 SHA256 cc56ab58e4b4f0914dcd61834cae673ade5b12688861ea5f0197a33f5939d131 SHA512 06ef4110f873d23bcf878877a8b9f714b895a5b269f8d33312387c0bcb569adb2b1d1577eebc30200d5f0d3648959450912911609dab3749e7d5eb4c84d7e12f WHIRLPOOL ea0e643e1d64f344fdd643348b0ce35143e29f27a64b9153d6645c8dbf914e193f700217c0caecb30ea300ae10f47ea09bed61811c3bb293ef63d9e45acf74d3 diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-Makefile.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.004-Makefile.patch deleted file mode 100644 index 3a6f5498ffba..000000000000 --- a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-Makefile.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- Makefile 2008-12-05 14:36:44.000000000 +0100 -+++ Makefile.new 2008-12-05 14:37:21.000000000 +0100 -@@ -19,13 +19,7 @@ - CHECKOUT_SCRIPT_MODULE = util - CHECKOUT_SCRIPT = checkout.sh - --LIBDIRS = cifobj-common-v4.1 \ -- tables-v8.0 \ -- regex-v2.2 \ -- cif-file-v1.0 \ -- misclib-v2.2 \ -- cifparse-obj-v7.0 \ -- $(EXTRACT) -+LIBDIRS = $(EXTRACT) - - all: compile - ---- pdb-extract-v3.0/Makefile 2008-12-05 14:42:58.000000000 +0100 -+++ pdb-extract-v3.0/Makefile.new 2008-12-05 14:42:15.510315392 +0100 -@@ -6,6 +6,7 @@ - - M_INCL_DIR = ../include - M_LIB_DIR = ../lib -+M_LIB_DIR_GENTOO = @GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR - M_BIN_DIR = ../bin - - PROJ_DIR = . -@@ -37,12 +38,12 @@ - include ../etc/Makefile.platform - - # Dependent libraries for the pdbml-parser --CIF_FILE_LIB = $(M_LIB_DIR)/cif-file.a --CIFPARSE_LIB = $(M_LIB_DIR)/cifparse-obj.a --CIF_TABLE_LIB = $(M_LIB_DIR)/cif-table-obj.a --CIFOBJ_COMMON_LIB = $(M_LIB_DIR)/cifobj-common.a --REGEX_LIB = $(M_LIB_DIR)/regex.a --MISCLIB_LIB = $(M_LIB_DIR)/misclib.a -+CIF_FILE_LIB = $(M_LIB_DIR_GENTOO)/cif-file.a -+CIFPARSE_LIB = $(M_LIB_DIR_GENTOO)/cifparse-obj.a -+CIF_TABLE_LIB = $(M_LIB_DIR_GENTOO)/tables.a -+CIFOBJ_COMMON_LIB = $(M_LIB_DIR_GENTOO)/common.a -+REGEX_LIB = $(M_LIB_DIR_GENTOO)/regex.a -+MISCLIB_LIB = $(M_LIB_DIR_GENTOO)/misclib.a - - ALL_DEP_LIBS = $(CIF_FILE_LIB) $(CIFPARSE_LIB) \ - $(CIF_TABLE_LIB) $(CIFOBJ_COMMON_LIB) $(REGEX_LIB) $(MISCLIB_LIB) diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-cflags-install.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.004-cflags-install.patch deleted file mode 100644 index cdf48e4784c6..000000000000 --- a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-cflags-install.patch +++ /dev/null @@ -1,199 +0,0 @@ -diff -Naur pdb-extract-v3.004-prod-src/Makefile pdb-extract-v3.004-prod-src.new/Makefile ---- pdb-extract-v3.004-prod-src/Makefile 2007-09-11 11:19:46.000000000 -0400 -+++ pdb-extract-v3.004-prod-src.new/Makefile 2009-12-03 21:34:10.000000000 -0500 -@@ -52,7 +52,7 @@ - echo "------------------------------------------------------------"; \ - echo "**** Making $$libdir ****"; \ - echo "------------------------------------------------------------"; \ -- (cd $$libdir && $(MAKE) -f $(MAKEFILE) "OPT=-O" install) || exit 1; \ -+ (cd $$libdir && $(MAKE) -f $(MAKEFILE) C_OPT="${CFLAGS}" CCC_OPT="${CXXFLAGS}" F_OPT="${FFLAGS}" LDFLAGS_OPT="${LDFLAGS}" install) || exit 1; \ - done - - beta: -diff -Naur pdb-extract-v3.004-prod-src/etc/make.platform.darwin3 pdb-extract-v3.004-prod-src.new/etc/make.platform.darwin3 ---- pdb-extract-v3.004-prod-src/etc/make.platform.darwin3 2007-09-11 11:19:46.000000000 -0400 -+++ pdb-extract-v3.004-prod-src.new/etc/make.platform.darwin3 2009-12-03 21:34:10.000000000 -0500 -@@ -91,7 +91,7 @@ - DEFINES=$(GDEFINES) $(LDEFINES) - - ## Global include directories --GINCLUDES= -+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj - - # Collect all include directories from global include directories and - # include directories specified in module makefile -@@ -159,7 +159,7 @@ - STATIC_LINKING= - - # Linker flags --LDFLAGS=$(ABI) -w $(STATIC_LINKING) -+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING) - - # Fortran linker - F77_LINKER=f77 -diff -Naur pdb-extract-v3.004-prod-src/etc/make.platform.darwin4 pdb-extract-v3.004-prod-src.new/etc/make.platform.darwin4 ---- pdb-extract-v3.004-prod-src/etc/make.platform.darwin4 2007-09-11 11:19:46.000000000 -0400 -+++ pdb-extract-v3.004-prod-src.new/etc/make.platform.darwin4 2009-12-03 21:34:10.000000000 -0500 -@@ -92,7 +92,7 @@ - DEFINES=$(GDEFINES) $(LDEFINES) - - ## Global include directories --GINCLUDES= -+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj - - # Collect all include directories from global include directories and - # include directories specified in module makefile -@@ -160,7 +160,7 @@ - STATIC_LINKING= - - # Linker flags --LDFLAGS=$(ABI) -w $(STATIC_LINKING) -+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING) - - # Fortran linker - F77_LINKER=f77 -diff -Naur pdb-extract-v3.004-prod-src/etc/make.platform.gnu3 pdb-extract-v3.004-prod-src.new/etc/make.platform.gnu3 ---- pdb-extract-v3.004-prod-src/etc/make.platform.gnu3 2007-09-11 11:19:46.000000000 -0400 -+++ pdb-extract-v3.004-prod-src.new/etc/make.platform.gnu3 2009-12-03 21:34:10.000000000 -0500 -@@ -6,6 +6,8 @@ - ## - ########################################################################## - -+LIBDIR=@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR -+ - #-----Lexer and Parser section-------------------------------------------# - - # Lexer executable -@@ -89,7 +91,7 @@ - DEFINES=$(GDEFINES) $(LDEFINES) - - ## Global include directories --GINCLUDES= -+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj - - # Collect all include directories from global include directories and - # include directories specified in module makefile -@@ -107,8 +109,8 @@ - C_WARNINGS=$(WARNINGS) - - # C compiler flags --CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) --CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \ -+CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) -+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \ - $(INCLUDES) - - ## C++ compiler -@@ -128,9 +130,9 @@ - EXT=C - - # C++ compiler flags --C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \ -+C++FLAGS=$(CCC_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \ - $(INCLUDES) --C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ -+C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ - $(DEFINES) $(INCLUDES) - # C++FLAGS_RELAXED should be set to avoid warnings reported by third party - # source code that is not maintained by PDB -@@ -144,7 +146,7 @@ - F77=f77 - - # Fortran compiler flags --FFLAGS=-O -u -+FFLAGS=$(F_OPT) - - # Additional Fortran libraries - F77LIBS= -@@ -154,11 +156,11 @@ - #-----Linkers section----------------------------------------------------# - - # Static linking option. If not defined, dynamic linking is used. --STATIC_LINKING=-static -+STATIC_LINKING= - - # Linker flags --LDFLAGS=$(ABI) -w $(STATIC_LINKING) --LDFLAGS_NO_STATIC=$(ABI) -w -+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING) -+LDFLAGS_NO_STATIC=$(LDFLAGS_OPT) $(ABI) -w - - # Fortran linker - F77_LINKER=f77 -diff -Naur pdb-extract-v3.004-prod-src/etc/make.platform.gnu4 pdb-extract-v3.004-prod-src.new/etc/make.platform.gnu4 ---- pdb-extract-v3.004-prod-src/etc/make.platform.gnu4 2007-09-11 11:19:46.000000000 -0400 -+++ pdb-extract-v3.004-prod-src.new/etc/make.platform.gnu4 2009-12-03 21:34:10.000000000 -0500 -@@ -6,6 +6,8 @@ - ## - ########################################################################## - -+LIBDIR=@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR -+ - #-----Lexer and Parser section-------------------------------------------# - - # Lexer executable -@@ -34,7 +36,7 @@ - - # WARNINGS_AS_ERRORS defines flags to instruct all compilers to treat all - # warnings as errors. --WARNINGS_AS_ERRORS=-Werror -+WARNINGS_AS_ERRORS= - - # ALL_WARNINGS defines flags to instruct all compilers to report all - # warnings. -@@ -90,7 +92,7 @@ - DEFINES=$(GDEFINES) $(LDEFINES) - - ## Global include directories --GINCLUDES= -+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj - - # Collect all include directories from global include directories and - # include directories specified in module makefile -@@ -108,8 +110,8 @@ - C_WARNINGS=$(WARNINGS) - - # C compiler flags --CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) --CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \ -+CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) -+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \ - $(INCLUDES) - - ## C++ compiler -@@ -129,9 +131,9 @@ - EXT=C - - # C++ compiler flags --C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \ -+C++FLAGS=$(CCC_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \ - $(INCLUDES) --C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ -+C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ - $(DEFINES) $(INCLUDES) - # C++FLAGS_RELAXED should be set to avoid warnings reported by third party - # source code that is not maintained by PDB -@@ -145,7 +147,7 @@ - F77=f77 - - # Fortran compiler flags --FFLAGS=-O -u -+FFLAGS=$(F_OPT) - - # Additional Fortran libraries - F77LIBS= -@@ -155,11 +157,11 @@ - #-----Linkers section----------------------------------------------------# - - # Static linking option. If not defined, dynamic linking is used. --STATIC_LINKING=-static -+STATIC_LINKING= - - # Linker flags --LDFLAGS=$(ABI) -w $(STATIC_LINKING) --LDFLAGS_NO_STATIC=$(ABI) -w -+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING) -+LDFLAGS_NO_STATIC=$(LDFLAGS_OPT) $(ABI) -w - - # Fortran linker - F77_LINKER=f77 diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-env.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.004-env.patch deleted file mode 100644 index 6506713742b6..000000000000 --- a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-env.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pdb-extract-v3.0/src/extract.C 2007-09-11 17:19:48.000000000 +0200 -+++ pdb-extract-v3.0/src/extract.C.new 2008-12-05 17:49:59.000000000 +0100 -@@ -1689,7 +1689,7 @@ - open_file_error(inpfile, "get_mmcif"); - } - -- (!strcmp_case(CCP4,"yes"))? temp = getenv("CCP4"): temp = getenv("PDB_EXTRACT"); -+ (!strcmp_case(CCP4,"yes"))? temp = getenv("CCP4"): temp = getenv("PDB_EXTRACT_ROOT"); - if(temp != NULL) { - strcpy(pdb_extract, ""); - strcpy(pdb_extract_sf, ""); diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-gcc-4.3.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.004-gcc-4.3.patch deleted file mode 100644 index 6907399c27df..000000000000 --- a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-gcc-4.3.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- cifobj-common-v4.1/src/GenString.C 2008-11-13 10:44:01.000000000 +0100 -+++ cifobj-common-v4.1/src/GenString.C.new 2008-11-13 10:43:54.000000000 +0100 -@@ -144,6 +144,7 @@ - #include <string> - #include <algorithm> - #include <sstream> -+#include <string.h> - - #include "GenString.h" - ---- tables-v8.0/src/ISTable.C 2007-09-11 17:19:47.000000000 +0200 -+++ tables-v8.0/src/ISTable.C.new 2008-11-13 10:48:18.000000000 +0100 -@@ -150,6 +150,7 @@ - #include <sstream> - #include <iostream> - #include <iomanip> -+#include <limits.h> - - #include "Exceptions.h" - #include "GenString.h" diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.11-cflags-install.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.11-cflags-install.patch deleted file mode 100644 index 7383811b5bfd..000000000000 --- a/sci-chemistry/pdb-extract/files/pdb-extract-3.11-cflags-install.patch +++ /dev/null @@ -1,207 +0,0 @@ - Makefile | 2 +- - etc/make.platform.darwin3 | 4 ++-- - etc/make.platform.darwin4 | 4 ++-- - etc/make.platform.gnu3 | 20 +++++++++++--------- - etc/make.platform.gnu4 | 20 +++++++++++--------- - 5 files changed, 27 insertions(+), 23 deletions(-) - -diff --git a/Makefile b/Makefile -index 627d256..72c7e59 100644 ---- a/Makefile -+++ b/Makefile -@@ -52,7 +52,7 @@ compile: - echo "------------------------------------------------------------"; \ - echo "**** Making $$libdir ****"; \ - echo "------------------------------------------------------------"; \ -- (cd $$libdir && $(MAKE) -f $(MAKEFILE) "OPT=-O" install) || exit 1; \ -+ (cd $$libdir && $(MAKE) -f $(MAKEFILE) C_OPT="${CFLAGS}" CCC_OPT="${CXXFLAGS}" F_OPT="${FFLAGS}" LDFLAGS_OPT="${LDFLAGS}" install) || exit 1; \ - done - - beta: -diff --git a/etc/make.platform.darwin3 b/etc/make.platform.darwin3 -index c5f7b06..4c1c97c 100644 ---- a/etc/make.platform.darwin3 -+++ b/etc/make.platform.darwin3 -@@ -91,7 +91,7 @@ GDEFINES=$(PLATFORM) $(COMPILER) - DEFINES=$(GDEFINES) $(LDEFINES) - - ## Global include directories --GINCLUDES= -+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj - - # Collect all include directories from global include directories and - # include directories specified in module makefile -@@ -159,7 +159,7 @@ F77LIBS= - STATIC_LINKING= - - # Linker flags --LDFLAGS=$(ABI) -w $(STATIC_LINKING) -+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING) - - # Fortran linker - F77_LINKER=f77 -diff --git a/etc/make.platform.darwin4 b/etc/make.platform.darwin4 -index 4619b34..f481fdb 100644 ---- a/etc/make.platform.darwin4 -+++ b/etc/make.platform.darwin4 -@@ -92,7 +92,7 @@ GDEFINES=$(PLATFORM) $(COMPILER) - DEFINES=$(GDEFINES) $(LDEFINES) - - ## Global include directories --GINCLUDES= -+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj - - # Collect all include directories from global include directories and - # include directories specified in module makefile -@@ -160,7 +160,7 @@ F77LIBS= - STATIC_LINKING= - - # Linker flags --LDFLAGS=$(ABI) -w $(STATIC_LINKING) -+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING) - - # Fortran linker - F77_LINKER=f77 -diff --git a/etc/make.platform.gnu3 b/etc/make.platform.gnu3 -index 7fd442e..9bec4dc 100644 ---- a/etc/make.platform.gnu3 -+++ b/etc/make.platform.gnu3 -@@ -6,6 +6,8 @@ - ## - ########################################################################## - -+LIBDIR=@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR -+ - #-----Lexer and Parser section-------------------------------------------# - - # Lexer executable -@@ -89,7 +91,7 @@ GDEFINES=$(PLATFORM) $(COMPILER) - DEFINES=$(GDEFINES) $(LDEFINES) - - ## Global include directories --GINCLUDES= -+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj - - # Collect all include directories from global include directories and - # include directories specified in module makefile -@@ -107,8 +109,8 @@ NON_ANSI_C_FLAG= - C_WARNINGS=$(WARNINGS) - - # C compiler flags --CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) --CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \ -+CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) -+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \ - $(INCLUDES) - - ## C++ compiler -@@ -128,9 +130,9 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECATED) - EXT=C - - # C++ compiler flags --C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \ -+C++FLAGS=$(CCC_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \ - $(INCLUDES) --C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ -+C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ - $(DEFINES) $(INCLUDES) - # C++FLAGS_RELAXED should be set to avoid warnings reported by third party - # source code that is not maintained by PDB -@@ -144,7 +146,7 @@ C++FLAGS_RELAXED=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) $(DEFINES) \ - F77=f77 - - # Fortran compiler flags --FFLAGS=-O -u -+FFLAGS=$(F_OPT) - - # Additional Fortran libraries - F77LIBS= -@@ -154,11 +156,11 @@ F77LIBS= - #-----Linkers section----------------------------------------------------# - - # Static linking option. If not defined, dynamic linking is used. --STATIC_LINKING=-static -+STATIC_LINKING= - - # Linker flags --LDFLAGS=$(ABI) -w $(STATIC_LINKING) --LDFLAGS_NO_STATIC=$(ABI) -w -+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING) -+LDFLAGS_NO_STATIC=$(LDFLAGS_OPT) $(ABI) -w - - # Fortran linker - F77_LINKER=f77 -diff --git a/etc/make.platform.gnu4 b/etc/make.platform.gnu4 -index 78a0007..bc85308 100644 ---- a/etc/make.platform.gnu4 -+++ b/etc/make.platform.gnu4 -@@ -6,6 +6,8 @@ - ## - ########################################################################## - -+LIBDIR=@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR -+ - #-----Lexer and Parser section-------------------------------------------# - - # Lexer executable -@@ -34,7 +36,7 @@ ABI= - - # WARNINGS_AS_ERRORS defines flags to instruct all compilers to treat all - # warnings as errors. --WARNINGS_AS_ERRORS=-Werror -+WARNINGS_AS_ERRORS= - - # ALL_WARNINGS defines flags to instruct all compilers to report all - # warnings. -@@ -90,7 +92,7 @@ GDEFINES=$(PLATFORM) $(COMPILER) - DEFINES=$(GDEFINES) $(LDEFINES) - - ## Global include directories --GINCLUDES= -+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj - - # Collect all include directories from global include directories and - # include directories specified in module makefile -@@ -108,8 +110,8 @@ NON_ANSI_C_FLAG= - C_WARNINGS=$(WARNINGS) - - # C compiler flags --CFLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) --CFLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES) -+CFLAGS=$(C_OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) -+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES) - - ## C++ compiler - ## This part defines C++ compiler information -@@ -128,9 +130,9 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECATED) - EXT=C - - # C++ compiler flags --C++FLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ -+C++FLAGS=$(CCC_OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ - $(DEFINES) $(INCLUDES) --C++FLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \ -+C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \ - $(C_PLUS_WARNINGS) $(DEFINES) $(INCLUDES) - - # C++FLAGS_RELAXED should be set to avoid warnings reported by third party -@@ -145,7 +147,7 @@ C++FLAGS_RELAXED=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \ - F77=f77 - - # Fortran compiler flags --FFLAGS=-O -u -+FFLAGS=$(F_OPT) - - # Additional Fortran libraries - F77LIBS= -@@ -158,8 +160,8 @@ F77LIBS= - STATIC_LINKING= - - # Linker flags --LDFLAGS=$(ABI) -w $(STATIC_LINKING) --LDFLAGS_NO_STATIC=$(ABI) -w -+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING) -+LDFLAGS_NO_STATIC=$(LDFLAGS_OPT) $(ABI) -w - - # Fortran linker - F77_LINKER=f77 diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch deleted file mode 100644 index 5284bd745d53..000000000000 --- a/sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch +++ /dev/null @@ -1,64 +0,0 @@ - common-v4.5/src/mapped_ptr_vector.C | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/common-v4.5/src/mapped_ptr_vector.C b/common-v4.5/src/mapped_ptr_vector.C -index d7c61f3..e20a236 100644 ---- a/common-v4.5/src/mapped_ptr_vector.C -+++ b/common-v4.5/src/mapped_ptr_vector.C -@@ -263,12 +263,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(T* inP, - _vector.push_back(inP); - - typename tIndex::value_type valuePair(inP->GetName(), -- make_pair(_vector.size() - 1, fileIndex)); -+ std::make_pair(_vector.size() - 1, fileIndex)); - - _index.insert(valuePair); - - _currentName = inP->GetName(); -- _currentIndices = make_pair(_vector.size() - 1, fileIndex); -+ _currentIndices = std::make_pair(_vector.size() - 1, fileIndex); - - } - -@@ -281,12 +281,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(const string& name, - _vector.push_back(NULL); - - typename tIndex::value_type valuePair(name, -- make_pair(_vector.size() - 1, fileIndex)); -+ std::make_pair(_vector.size() - 1, fileIndex)); - - _index.insert(valuePair); - - _currentName = name; -- _currentIndices = make_pair(_vector.size() - 1, fileIndex); -+ _currentIndices = std::make_pair(_vector.size() - 1, fileIndex); - } - - -@@ -454,7 +454,7 @@ void mapped_ptr_vector<T, StringCompareT>::erase(const string& name) - if (is_equal(_currentName, name, keyComp)) - { - _currentName.clear(); -- _currentIndices = make_pair(_vector.size(), (unsigned int)0); -+ _currentIndices = std::make_pair(_vector.size(), (unsigned int)0); - } - - } -@@ -539,7 +539,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic - if (_vector.empty()) - { - // Empty container. Return invalid index. -- return(make_pair(_vector.size(), (unsigned int)0)); -+ return(std::make_pair(_vector.size(), (unsigned int)0)); - } - - typename tIndex::key_compare keyComp = _index.key_comp(); -@@ -563,7 +563,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic - else - { - // Not found. Return invalid index. -- return(make_pair(_vector.size(), (unsigned int)0)); -+ return(std::make_pair(_vector.size(), (unsigned int)0)); - } - } - diff --git a/sci-chemistry/pdb-extract/pdb-extract-3.004-r2.ebuild b/sci-chemistry/pdb-extract/pdb-extract-3.004-r2.ebuild deleted file mode 100644 index 836d76f5c007..000000000000 --- a/sci-chemistry/pdb-extract/pdb-extract-3.004-r2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -inherit eutils toolchain-funcs multilib prefix - -MY_P="${PN}-v${PV}-prod-src" - -DESCRIPTION="Tools for extracting mmCIF data from structure determination applications" -HOMEPAGE="http://sw-tools.pdb.org/apps/PDB_EXTRACT/index.html" -SRC_URI="http://sw-tools.pdb.org/apps/PDB_EXTRACT/${MY_P}.tar.gz" - -LICENSE="PDB" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="!<app-text/html-xml-utils-5.3" -DEPEND="${RDEPEND} - >=sci-libs/cifparse-obj-7.025" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-cflags-install.patch \ - "${FILESDIR}"/${P}-gcc-4.3.patch \ - "${FILESDIR}"/${P}-Makefile.patch \ - "${FILESDIR}"/${P}-env.patch - - sed -i "s:GENTOOLIBDIR:$(get_libdir):g" \ - pdb-extract-v3.0/Makefile \ - || die "Failed to fix libdir" - - # Get rid of unneeded directories, to make sure we use system files - ebegin "Deleting redundant directories" - rm -rf cif-file-v1.0 cifobj-common-v4.1 cifparse-obj-v7.0 \ - misclib-v2.2 regex-v2.2 tables-v8.0 - eend - - sed -i \ - -e "s:^\(CCC=\).*:\1$(tc-getCXX):g" \ - -e "s:^\(CC=\).*:\1$(tc-getCC):g" \ - -e "s:^\(GINCLUDES=\).*:\1-I${EPREFIX}/usr/include/cifparse-obj:g" \ - -e "s:^\(LIBDIR=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \ - "${S}"/etc/make.* \ - || die "Failed to fix makefiles" - - eprefixify pdb-extract-v3.0/Makefile etc/* -} - -src_install() { - exeinto /usr/libexec/ccp4/bin - doexe bin/pdb_extract{,_sf} bin/extract \ - || die "failed to install binaries" - insinto /usr/include/rcsb - doins include/* || die "failed to install include files" - dodoc README* || die "failed to install docs" - insinto /usr/share/rcsb/ - doins -r pdb-extract-data || die "failed to install data files" - - cat >> "${T}"/envd <<- EOF - PDB_EXTRACT="${EPREFIX}/usr/share/rcsb/" - PDB_EXTRACT_ROOT="${EPREFIX}/usr/" - EOF - - newenvd "${T}"/envd 20pdb-extract \ - || die "failed to install env files" -} diff --git a/sci-chemistry/pdb-extract/pdb-extract-3.11.ebuild b/sci-chemistry/pdb-extract/pdb-extract-3.11.ebuild deleted file mode 100644 index 04351c8a125a..000000000000 --- a/sci-chemistry/pdb-extract/pdb-extract-3.11.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils toolchain-funcs multilib prefix - -MY_P="${PN}-v${PV}-prod-src" - -DESCRIPTION="Tools for extracting mmCIF data from structure determination applications" -HOMEPAGE="http://sw-tools.pdb.org/apps/PDB_EXTRACT/index.html" -SRC_URI="http://sw-tools.pdb.org/apps/PDB_EXTRACT/${MY_P}.tar.gz" - -LICENSE="PDB" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="!<app-text/html-xml-utils-5.3" -DEPEND="${RDEPEND} - >=sci-libs/cifparse-obj-7.025" - -S="${WORKDIR}/${MY_P}" - -MAKEOPTS+=" -j1" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-cflags-install.patch \ - "${FILESDIR}"/${P}-gcc-4.7.patch \ - "${FILESDIR}"/${PN}-3.004-env.patch - - sed -i \ - -e "s:^\(CCC=\).*:\1$(tc-getCXX):g" \ - -e "s:^\(CC=\).*:\1$(tc-getCC):g" \ - -e "s:^\(GINCLUDES=\).*:\1-I${EPREFIX}/usr/include/cifparse-obj:g" \ - -e "s:^\(LIBDIR=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \ - "${S}"/etc/make.* \ - || die "Failed to fix makefiles" - - eprefixify pdb-extract-v3.0/Makefile etc/* -} - -src_install() { - exeinto /usr/libexec/ccp4/bin - doexe bin/pdb_extract{,_sf} bin/extract - insinto /usr/include/rcsb - doins include/* - dodoc README* - insinto /usr/share/rcsb/ - doins -r pdb-extract-data - - cat >> "${T}"/envd <<- EOF - PDB_EXTRACT="${EPREFIX}/usr/share/rcsb/" - PDB_EXTRACT_ROOT="${EPREFIX}/usr/" - EOF - - newenvd "${T}"/envd 20pdb-extract -} diff --git a/sci-chemistry/phaser/Manifest b/sci-chemistry/phaser/Manifest deleted file mode 100644 index deb3ba972a75..000000000000 --- a/sci-chemistry/phaser/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ccp4-6.1.13-phaser-cctbx-src.tar.gz 22021353 SHA256 e6c4365cb34da5ce2dd5f1e74b8927258064016194446163418c8a3139a4b804 SHA512 cdf36572613a6e400af0f29da501ccfd2a9f1a7e2d89162aad3fe14929816b41790bb57ba1e77976b9046c6e06a29df2748999db93a2cd0a4d1fde95ac1f9e8b WHIRLPOOL 5aa1a1c6520be90ef02be0e9de9c111a9835cda05a3549c390f62ceef7e68c8392670d91941b823c0ee94f29e6aab9d34a61b90e8bd3d4820a83daa547463fdb diff --git a/sci-chemistry/phaser/files/phaser-2.1.4-chmod.patch b/sci-chemistry/phaser/files/phaser-2.1.4-chmod.patch deleted file mode 100644 index 5311cb332785..000000000000 --- a/sci-chemistry/phaser/files/phaser-2.1.4-chmod.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/cctbx/cctbx_sources/libtbx/libtbx/config.py b/lib/cctbx/cctbx_sources/libtbx/libtbx/config.py -index 3b1bd3a..8939a74 100755 ---- a/lib/cctbx/cctbx_sources/libtbx/libtbx/config.py -+++ b/lib/cctbx/cctbx_sources/libtbx/libtbx/config.py -@@ -802,8 +802,6 @@ class environment: - else: - action = self.write_bin_sh_dispatcher - ext = "" -- try: os.chmod(source_file, 0755) -- except OSError: pass - target_file_ext = target_file + ext - remove_or_rename(target_file_ext) - try: action(source_file, target_file_ext) diff --git a/sci-chemistry/phaser/metadata.xml b/sci-chemistry/phaser/metadata.xml deleted file mode 100644 index 6b4826474daa..000000000000 --- a/sci-chemistry/phaser/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> - <maintainer> - <email>jlec@gentoo.org</email> - <description>ccp4 maintainer</description> - </maintainer> -</pkgmetadata> diff --git a/sci-chemistry/phaser/phaser-2.1.4.ebuild b/sci-chemistry/phaser/phaser-2.1.4.ebuild deleted file mode 100644 index 86fa57f52603..000000000000 --- a/sci-chemistry/phaser/phaser-2.1.4.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils flag-o-matic python-single-r1 toolchain-funcs - -CCP4VER="6.1.13" - -DESCRIPTION="A program for phasing macromolecular crystal structures" -HOMEPAGE="http://www-structmed.cimr.cam.ac.uk/phaser" -SRC_URI="ftp://ftp.ccp4.ac.uk/ccp4/${CCP4VER}/ccp4-${CCP4VER}-${PN}-cctbx-src.tar.gz" - -LICENSE="|| ( phaser phaser-com ccp4 )" -SLOT="0" -#KEYWORDS="~amd64 ~x86" -KEYWORDS="" -IUSE="openmp" - -RDEPEND="" -DEPEND="${RDEPEND} - app-shells/tcsh" - -S="${WORKDIR}"/ccp4-${CCP4VER} - -src_prepare() { - epatch \ - "${FILESDIR}"/phaser-2.1.4-chmod.patch \ - "${FILESDIR}"/phaser-2.1.4-ldflags.patch - - use openmp && append-flags -fopenmp - - for i in ${CXXFLAGS}; do - OPTS="${OPTS} \"${i}\"," - done - - OPTS=${OPTS%,} - - sed -i \ - -e "s:opts = \[.*\]$:opts = \[${OPTS}\]:g" \ - "${S}"/lib/cctbx/cctbx_sources/libtbx/SConscript || die - - for i in ${LDFLAGS}; do - OPTSLD="${OPTSLD} \"${i}\"," - done - - sed -i \ - -e "s:env_etc.shlinkflags .* \"-shared\":env_etc.shlinkflags = \[ ${OPTSLD} \"-shared\"\]:g" \ - -e "s:\[\"-static:\[${OPTSLD} \"-static:g" \ - "${S}"/lib/cctbx/cctbx_sources/libtbx/SConscript || die - -} - -src_configure() { - local compiler - local mtype - local mversion - local nproc - - # Valid compilers are win32_cl, sunos_CC, unix_gcc, unix_ecc, - # unix_icc, unix_icpc, tru64_cxx, hp_ux11_aCC, irix_CC, - # darwin_c++, darwin_gcc. The build systems seems to prepend - # unix_ all by itself. Can this be derived from $(tc-getCC)? - compiler=$(expr match "$(tc-getCC)" '.*\([a-z]cc\)') - - # Breaks cross compilation. - mtype=$(src/${PN}/bin/machine_type) - mversion=$(src/${PN}/bin/machine_version) - - einfo "Creating build directory" - mkdir build - cd build - ln -sf "${S}/lib/cctbx/cctbx_sources/scons" scons - ln -sf "${S}/lib/cctbx/cctbx_sources/libtbx" libtbx - - einfo "Configuring phaser components" - $(PYTHON) "libtbx/configure.py" \ - --build=release \ - --compiler=${compiler} \ - --repository="${S}"/src/${PN}/source \ - --repository="${S}"/lib/cctbx/cctbx_sources \ - --static_libraries \ - ccp4io="${S}" \ - mmtbx \ - phaser || die "configure.py failed" -} - -src_compile() { - nproc=`echo "-j1 ${MAKEOPTS}" \ - | sed -e "s/.*\(-j\s*\|--jobs=\)\([0-9]\+\).*/\2/"` - - cd build - einfo "Setting up build environment" - source setpaths.sh - - einfo "Compiling phaser components" - libtbx.scons -j ${nproc} || die "libtbx.scons failed" -} - -src_install() { - dobin build/exe/phaser || die - - cat >> "${T}"/53${PN} <<- EOF - PHASER="${EPREFIX}/usr/bin" - PHASER_ENVIRONMENT="1" - PHASER_MTYPE="${mtype}" - PHASER_MVERSION="${mversion}" - PHASER_VERSION="${PV}" - EOF - - doenvd "${T}"/53${PN} || die -} diff --git a/sci-chemistry/pointless/Manifest b/sci-chemistry/pointless/Manifest deleted file mode 100644 index 911c44875112..000000000000 --- a/sci-chemistry/pointless/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST pointless-1.6.14.tar.gz 423657 SHA256 68f0c1f65239b1451310fe885c2b9d51fc558de7b43af1e584750e05dc5635d8 SHA512 9dd524a7c842edc01206450c52ca1a01e8e3ee6f9ff71742789943ee10e006b5452b0be3aa509dd16bb85f1b9c3d7954616a78ec2fef2daea7c0ab42cdaa42b9 WHIRLPOOL 5085afbd88713384039ef2c2b4b2f7fddd8f078dca9df54062b0415e970791868c61df98f4044b4e061077a73b4e129b6e5db34852d64cace48108db9c6ae50f -DIST pointless-1.6.2.tar.gz 412244 SHA256 5e09ca592ea565e8ace142fc0edff39d0ab723f4ac6e2cadd6ba571d667c80f6 SHA512 2e897a7302ba4d43da69c8ee91254b0632d8a0ae301140a144472f7e466078f0b1abd10362343d7d50d04bd86ae8b83265a20302f7aeae3dc8845f1581211ddd WHIRLPOOL 8953806f68684e882717673ec18263f0ac2093f3cb2cac573b20886f5f0d60c67b756f74bdb3555342bb3d287021b7c70b20c53f0e38e687a5914df935ae35cd diff --git a/sci-chemistry/pointless/files/1.5.1-gcc4.4.patch b/sci-chemistry/pointless/files/1.5.1-gcc4.4.patch deleted file mode 100644 index ca67dbd3f336..000000000000 --- a/sci-chemistry/pointless/files/1.5.1-gcc4.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/string_util.hh b/string_util.hh -index 66af6f3..047512b 100644 ---- a/string_util.hh -+++ b/string_util.hh -@@ -3,6 +3,7 @@ - - #include <string> - #include <vector> -+#include <stdio.h> - #include "range.hh" - - //====================================================================== diff --git a/sci-chemistry/pointless/metadata.xml b/sci-chemistry/pointless/metadata.xml deleted file mode 100644 index ae9ec7c5f6a4..000000000000 --- a/sci-chemistry/pointless/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> - <maintainer> - <email>jlec@gentoo.org</email> - </maintainer> -</pkgmetadata> diff --git a/sci-chemistry/pointless/pointless-1.6.14-r1.ebuild b/sci-chemistry/pointless/pointless-1.6.14-r1.ebuild deleted file mode 100644 index d983cb290242..000000000000 --- a/sci-chemistry/pointless/pointless-1.6.14-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils fortran-2 multilib python-single-r1 toolchain-funcs - -DESCRIPTION="Scores crystallographic Laue and space groups" -HOMEPAGE="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/pointless.html" -SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz" - -SLOT="0" -LICENSE="ccp4" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - sci-chemistry/ccp4-apps - >=sci-libs/ccp4-libs-6.1.3-r10 - sci-libs/clipper - sci-libs/fftw:2.1 - sci-libs/mmdb - >=sci-libs/cctbx-2010.03.29.2334-r3[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -S="${WORKDIR}" - -src_prepare() { - epatch "${FILESDIR}"/1.5.1-gcc4.4.patch -} - -src_compile() { - emake \ - -f Makefile.make \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - LFLAGS="${LDFLAGS}" \ - CLIB="${EPREFIX}/usr/$(get_libdir)" \ - CCTBX_VERSION=2010 \ - ICCP4=-I"${EPREFIX}/usr/include/ccp4" \ - ITBX="-I${EPREFIX}/usr/include" \ - ICLPR="-I${EPREFIX}/$(python_get_sitedir)/" \ - LTBX="-L${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \ - SLIB="-L${EPREFIX}/usr/$(get_libdir) -lgfortran" -} - -src_install() { - dobin pointless othercell -} diff --git a/sci-chemistry/pointless/pointless-1.6.14.ebuild b/sci-chemistry/pointless/pointless-1.6.14.ebuild deleted file mode 100644 index 158bde017aea..000000000000 --- a/sci-chemistry/pointless/pointless-1.6.14.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" - -PYTHON_DEPEND="2" - -inherit eutils fortran-2 multilib python toolchain-funcs - -DESCRIPTION="Scores crystallographic Laue and space groups" -HOMEPAGE="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/pointless.html" -SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz" - -SLOT="0" -LICENSE="ccp4" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND=" - sci-chemistry/ccp4-apps - >=sci-libs/ccp4-libs-6.1.3-r10 - sci-libs/clipper - sci-libs/fftw:2.1 - sci-libs/mmdb - >=sci-libs/cctbx-2010.03.29.2334-r3" -RDEPEND="${DEPEND}" - -S="${WORKDIR}" - -pkg_setup() { - fortran-2_pkg_setup - python_set_active_version 2 -} - -src_prepare() { - epatch "${FILESDIR}"/1.5.1-gcc4.4.patch -} - -src_compile() { - emake \ - -f Makefile.make \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - LFLAGS="${LDFLAGS}" \ - CLIB="${EPREFIX}/usr/$(get_libdir)" \ - CCTBX_VERSION=2010 \ - ICCP4=-I"${EPREFIX}/usr/include/ccp4" \ - ITBX="-I${EPREFIX}/usr/include" \ - ICLPR="-I${EPREFIX}/$(python_get_sitedir)/" \ - LTBX="-L${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \ - SLIB="-L${EPREFIX}/usr/$(get_libdir) -lgfortran" \ - || die -} - -src_install() { - dobin pointless othercell || die -} diff --git a/sci-chemistry/pointless/pointless-1.6.2.ebuild b/sci-chemistry/pointless/pointless-1.6.2.ebuild deleted file mode 100644 index 2b9f0ad4faa0..000000000000 --- a/sci-chemistry/pointless/pointless-1.6.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -PYTHON_DEPEND="2" - -inherit eutils fortran-2 multilib python toolchain-funcs - -DESCRIPTION="Scores crystallographic Laue and space groups" -HOMEPAGE="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/pointless.html" -SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz" - -SLOT="0" -LICENSE="ccp4" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND=" - sci-chemistry/ccp4-apps - >=sci-libs/ccp4-libs-6.1.3-r10 - sci-libs/clipper - sci-libs/fftw:2.1 - sci-libs/mmdb - >=sci-libs/cctbx-2010.03.29.2334-r3" -RDEPEND="${DEPEND}" - -S="${WORKDIR}" - -pkg_setup() { - fortran-2_pkg_setup - python_pkg_setup - python_set_active_version 2 -} - -src_prepare() { - epatch "${FILESDIR}"/1.5.1-gcc4.4.patch -} - -src_compile() { - emake \ - -f Makefile.make \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - LFLAGS="${LDFLAGS}" \ - CLIB="${EPREFIX}/usr/$(get_libdir)" \ - CCTBX_VERSION=2010 \ - ICCP4=-I"${EPREFIX}/usr/include/ccp4" \ - ITBX="-I${EPREFIX}/usr/include" \ - ICLPR="-I${EPREFIX}/$(python_get_sitedir)/" \ - LTBX="-L${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \ - SLIB="-L${EPREFIX}/usr/$(get_libdir) -lgfortran" -} - -src_install() { - dobin pointless othercell -} diff --git a/sci-chemistry/refmac/Manifest b/sci-chemistry/refmac/Manifest deleted file mode 100644 index ba3def103020..000000000000 --- a/sci-chemistry/refmac/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST refmac_5.5.0110.tar.gz 1326832 SHA256 1353fb1042586ec8fa37d0a90f274890d0ccc02377af5216200662338dfe08ca SHA512 7e7fd1a7d2d11ef5f2e08cae61da62ecfe6978730ce4ca80f8b00be9bdad5e7d0ad493e1b8d57d64f1393f2017a87b8342e2607b08bc4018def798038a111728 WHIRLPOOL 587260eebd2df3115ba01ee03c11ab773d7316100a09af1f259f7795a139f978d94c569b8e4ab85982c2eeda628e643376231bdca5311fc8c7d2de5b65a033ac -DIST test-framework.tar.gz 130933173 SHA256 df050a2a29da80518cb0616a0bbeb82298ea0721549348d15353bf0f66240605 SHA512 3ef8253f472c5a481f836291afb80746ad73858e130130b848851b6b5dc53ada3b78c9f853af1c46fa22f469f2ce2f3248f5f760950e118610922c0429a7da16 WHIRLPOOL 022c1b493ecd35e769b44d1e52a351b4883682ef9759626bac36e26cc61078d95de0ec2531ed706897c683c38727139fa7a13d06b64c597026817ed79612d16d diff --git a/sci-chemistry/refmac/files/5.5-test.log.patch b/sci-chemistry/refmac/files/5.5-test.log.patch deleted file mode 100644 index 61858be357a0..000000000000 --- a/sci-chemistry/refmac/files/5.5-test.log.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- test-framework/refmac5/test_refmac5.py 2009-06-29 15:45:37.000000000 +0200 -+++ test-framework/refmac5/test_refmac5.py.new 2009-06-29 15:48:05.000000000 +0200 -@@ -88,7 +88,8 @@ - 'make hydr no', - 'labin IP=IMEAN SIGIP=SIGIMEAN FREE=FreeR_flag', - 'labout FC=FC PHIC=PHIC'], -- working_directory = self.test_dir) -+ working_directory = self.test_dir, -+ log_file = 'test_twinned_refinement.log') - - self.assertEqual(status, 0) - -@@ -123,7 +124,8 @@ - 'weight auto', - 'ncyc 20', - 'labout FC=FC PHIC=PHIC'], -- working_directory = self.test_dir) -+ working_directory = self.test_dir, -+ log_file = 'test_4_domain_tls.log') - - self.assertEqual(status, 0) - -@@ -156,7 +158,8 @@ - 'anomalous form SE -9.9 3.9', - 'anomalous wavelength 0.97966', - 'labout FC=FC PHIC=PHIC'], -- working_directory = self.test_dir) -+ working_directory = self.test_dir, -+ log_file = 'test_sad_refinement.log') - - self.assertEqual(status, 0) - diff --git a/sci-chemistry/refmac/files/5.5.0110-allow-dynamic-linking.patch b/sci-chemistry/refmac/files/5.5.0110-allow-dynamic-linking.patch deleted file mode 100644 index 1efbaa04d9e6..000000000000 --- a/sci-chemistry/refmac/files/5.5.0110-allow-dynamic-linking.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/makefile b/makefile -index 66d4cee..5270677 100644 ---- a/makefile -+++ b/makefile -@@ -9,7 +9,7 @@ XFFLAGS = -fno-second-underscore -static - XCFLAGS = -DGFORTRAN -DPROTOTYPE - FFLAGS = $(FOPTIM) $(XFFLAGS) - CFLAGS = $(COPTIM) $(XCFLAGS) --CPPFLAGS = $(CFLAGS) -+CPPFLAGS = $(CXXFLAGS) $(XCFLAGS) - - LLIBCIF = - LLIBCCP = $(CLIB)/libccp4f.a $(CLIB)/libccp4c.a -diff --git a/makefile_refmac.inc1 b/makefile_refmac.inc1 -index 371d84d..557077f 100644 ---- a/makefile_refmac.inc1 -+++ b/makefile_refmac.inc1 -@@ -68,9 +68,7 @@ messy_pdb.o \ - bridge.o \ - i0.o \ - i1.o \ --chbevl.o \ --$(LLIBCIF) \ --$(LLIBLAPACK) -+chbevl.o - #$(LLIBCCP) \ - #crt0.o \ - #heavy.o \ -@@ -95,8 +93,7 @@ make_unix_ccp4.o \ - emin.o \ - libcheck_min.o \ - mol2_file.o \ --sdf_files.o \ --$(LLIBCCP) -+sdf_files.o - - SUBM = \ - main_makecif.o \ -@@ -116,9 +113,7 @@ make_rst2.o \ - make_PDB.o \ - makecif.o \ - make_unix_ccp4.o \ --make_vdw.o \ --$(LLIBCCP) \ --$(LLIBCIF) -+make_vdw.o - - SUBT = \ - tlsgroups.o \ -@@ -142,9 +137,7 @@ make_refmac_dummy.o \ - inout_routines.o \ - errwrt_1.o \ - linalgebra.o \ --subnumrec.o \ --$(LLIBCCP) \ --$(LLIBCIF) -+subnumrec.o - #-------------------------------------------------------------------------------- - - ed = echo 'g/^CMDW-5.0/s// /@w@q@' | tr "@" "\012" | ed -s -@@ -154,18 +147,19 @@ ed = echo 'g/^CMDW-5.0/s// /@w@q@' | tr "@" "\012" | ed -s - all: refmac libcheck makecif - - refmac: $(SUBR) -- $(FC) $(FFLAGS) $(LDFLAGF)-o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP) -+ $(FC) $(FFLAGS) $(LDFLAGS) -o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK) - - libcheck: $(SUBL) -- $(FC) $(FFLAGS) -o libcheck${VERSION} $(SUBL) -+ $(FC) $(FFLAGS) $(LDFLAGS) -o libcheck${VERSION} $(SUBL) $(LLIBCCP) - - makecif: $(SUBM) -- $(FC) $(FFLAGS) -o makecif${VERSION} $(SUBM) -+ $(FC) $(FFLAGS) $(LDFLAGS) -o makecif${VERSION} $(SUBM) $(LLIBCCP) $(LLIBCIF) - - tlsgroups: $(SUBT) -- $(FC) $(FFLAGS) -o tlsgroups${VERSION} $(SUBT) -+ $(FC) $(FFLAGS) $(LDFLAGS) -o tlsgroups${VERSION} $(SUBT) $(LLIBCCP) $(LLIBCIF) - - clean: - /bin/rm *.o - - bridge.o: bridge.cpp llhood.h covmat.h Gauss.h tabfunc.h -+ $(CXX) $(CXXFLAGS) -c bridge.cpp diff --git a/sci-chemistry/refmac/files/5.5.0110-gcc4.6.patch b/sci-chemistry/refmac/files/5.5.0110-gcc4.6.patch deleted file mode 100644 index 3969cc9c8586..000000000000 --- a/sci-chemistry/refmac/files/5.5.0110-gcc4.6.patch +++ /dev/null @@ -1,17 +0,0 @@ - hkon_secder_tch.f | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/hkon_secder_tch.f b/hkon_secder_tch.f -index 31794b0..86d2cdf 100644 ---- a/hkon_secder_tch.f -+++ b/hkon_secder_tch.f -@@ -3724,7 +3724,8 @@ c---External functions and subprutines - INTEGER NWORKSPACE - REAL*8 TOLER - REAL*8 WORKSPACE(300) -- REAL LSTLSQ,D2DF_WEIGHT -+ REAL*8 D2DF_WEIGHT -+ REAL LSTLSQ - C - INTEGER IBIN,IBIN_S - INTEGER I,J,K diff --git a/sci-chemistry/refmac/files/5.6.0110-allow-dynamic-linking.patch b/sci-chemistry/refmac/files/5.6.0110-allow-dynamic-linking.patch deleted file mode 100644 index 9998b759c664..000000000000 --- a/sci-chemistry/refmac/files/5.6.0110-allow-dynamic-linking.patch +++ /dev/null @@ -1,341 +0,0 @@ - makefile_refmac.inc1 | 215 ++++++++++++++++++++++++-------------------------- - 1 files changed, 104 insertions(+), 111 deletions(-) - -diff --git a/makefile_refmac.inc1 b/makefile_refmac.inc1 -index 0f8bd63..e59fbfb 100644 ---- a/makefile_refmac.inc1 -+++ b/makefile_refmac.inc1 -@@ -96,9 +96,7 @@ bridge.o \ - i0.o \ - i1.o \ - chbevl.o \ --make_unix_ccp4.o \ --$(LLIBCIF) \ --$(LLIBLAPACK) -+make_unix_ccp4.o - - - SUBL = \ -@@ -133,9 +131,7 @@ cell_symm_subrs.o \ - iheap_sort.o \ - linalgebra.o \ - math_refmac.o \ --subnumrec.o \ --$(LLIBLAPACK) \ --$(LLIBCCP) -+subnumrec.o - - SUB_FREE = \ - freer_twin.o \ -@@ -145,9 +141,7 @@ subnumrec.o \ - libT.o \ - iheap_sort.o \ - cell_symm_subrs.o \ --math_refmac.o \ --$(LLIBLAPACK) \ --$(LLIBCCP) -+math_refmac.o - - SUB_HEADER = header2matr.o - #-------------------------------------------------------------------------------- -@@ -185,41 +179,41 @@ rharvest_mod.o: rharvest_mod.f90 - twin77mod.o: twin77mod.f - $(FC) $(FFLAGS) -c twin77mod.f - --gibbs_gm_sampler.o: linalgebra_f90.f90 gibbs_gm_sampler.f90 -- $(FC) $(FFLAGS) -c linalgebra_f90.f90 gibbs_gm_sampler.f90 -+gibbs_gm_sampler.o: linalgebra_f90.o gibbs_gm_sampler.f90 -+ $(FC) $(FFLAGS) -c gibbs_gm_sampler.f90 - --max_with_twins.o: restr_files.f90 max_with_twins.f weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 max_with_twins.f -+max_with_twins.o: restr_files.o max_with_twins.f weights.o agreem.o -+ $(FC) $(FFLAGS) -c max_with_twins.f - --merohedr_twin.o: restr_files.f90 merohedr_twin.f -- $(FC) $(FFLAGS) -c restr_files.f90 merohedr_twin.f -+merohedr_twin.o: restr_files.o merohedr_twin.f -+ $(FC) $(FFLAGS) -c merohedr_twin.f - --ls_scaling_twin_save.o: restr_files.f90 ls_scaling_twin_save.f weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 ls_scaling_twin_save.f -+ls_scaling_twin_save.o: restr_files.o ls_scaling_twin_save.f weights.o agreem.o -+ $(FC) $(FFLAGS) -c ls_scaling_twin_save.f - --ml_params_refine.o: restr_files.f90 ml_params_refine.f weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 ml_params_refine.f -+ml_params_refine.o: restr_files.o ml_params_refine.f weights.o agreem.o -+ $(FC) $(FFLAGS) -c ml_params_refine.f - --optimise_solvent_all.o: optimise_solvent_all.f90 agreem.f90 -- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 agreem.f90 -+optimise_solvent_all.o: optimise_solvent_all.f90 agreem.o -+ $(FC) $(FFLAGS) -c optimise_solvent_all.f90 - --ncs_rest.o: ncs_rest_mod.f90 restr_files.f90 ncs_ncs_generate.f90 ncs_rest.f weights.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 ncs_ncs_generate.f90 weights.f90 ncs_rest.f -+ncs_rest.o: ncs_rest_mod.o restr_files.o ncs_ncs_generate.o ncs_rest.f weights.o -+ $(FC) $(FFLAGS) -c ncs_rest.f - --ncs_ncs_generate.o: ncs_ncs_generate.f90 align_refmac.f90 -- $(FC) $(FFLAGS) -c ncs_ncs_generate.f90 align_refmac.f90 -+ncs_ncs_generate.o: ncs_ncs_generate.f90 align_refmac.o -+ $(FC) $(FFLAGS) -c ncs_ncs_generate.f90 - --lsq_exp2.o: ncs_rest_mod.f90 restr_files.f90 dist_routines.f90 ncs_simil.f90 ridge.f90 local_tls.f90 lsq_exp2.f weights.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 dist_routines.f90 ncs_simil.f90 ridge.f90 local_tls.f90 lsq_exp2.f weights.f90 rharvest_mod.f90 -+lsq_exp2.o: ncs_rest_mod.o restr_files.o dist_routines.o ncs_simil.o ridge.o local_tls.o lsq_exp2.f weights.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c lsq_exp2.f - --vdw_and_contacts.o: ncs_rest_mod.f90 vdw_and_contacts.f local_tls.f90 ridge.f90 restr_files.f90 weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 ridge.f90 local_tls.f90 weights.f90 agreem.f90 vdw_and_contacts.f -+vdw_and_contacts.o: ncs_rest_mod.o vdw_and_contacts.f local_tls.o ridge.o restr_files.o weights.o agreem.o -+ $(FC) $(FFLAGS) -c vdw_and_contacts.f - - dist_routines.o: dist_routines.f90 - $(FC) $(FFLAGS) -c dist_routines.f90 - --ncs_simil.o: ncs_rest_mod.f90 ncs_simil.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 ncs_simil.f90 -+ncs_simil.o: ncs_rest_mod.o ncs_simil.f90 -+ $(FC) $(FFLAGS) -c ncs_simil.f90 - - ridge.o: ridge.f90 - $(FC) $(FFLAGS) -c ridge.f90 -@@ -227,140 +221,138 @@ ridge.o: ridge.f90 - align_refmac.o: align_refmac.f90 - $(FC) $(FFLAGS) -c align_refmac.f90 - --rigid_allocate.o: restr_files.f90 rigid_allocate.f agreem.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 agreem.f90 rigid_allocate.f -+rigid_allocate.o: restr_files.o rigid_allocate.f agreem.o -+ $(FC) $(FFLAGS) -c rigid_allocate.f - --tls_allocate.o: restr_files.f90 tls_allocate.f weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 tls_allocate.f -+tls_allocate.o: restr_files.o tls_allocate.f weights.o agreem.o -+ $(FC) $(FFLAGS) -c tls_allocate.f - --hkon_secder_tch.o: ridge.f90 gibbs_gm_sampler.f90 ncs_rest_mod.f90 hkon_secder_tch.f local_tls.f90 ncs_simil.f90 optimise_solvent_all.f90 \ -- restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c ridge.f90 gibbs_gm_sampler.f90 ncs_rest_mod.f90 restr_files.f90 optimise_solvent_all.f90 ncs_simil.f90 local_tls.f90 \ -- hkon_secder_tch.f weights.f90 agreem.f90 rharvest_mod.f90 -+hkon_secder_tch.o: ridge.o gibbs_gm_sampler.o ncs_rest_mod.o hkon_secder_tch.f local_tls.o ncs_simil.o optimise_solvent_all.o \ -+ restr_files.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c hkon_secder_tch.f - --oppro_allocate.o: ncs_rest_mod.f90 oppro_allocate.f filter_params.f90 optimise_solvent_all.f90 restr_files.f90 weights.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 optimise_solvent_all.f90 filter_params.f90 weights.f90 oppro_allocate.f -+oppro_allocate.o: ncs_rest_mod.o oppro_allocate.f filter_params.o optimise_solvent_all.o restr_files.o weights.o -+ $(FC) $(FFLAGS) -c oppro_allocate.f - --read_extra_restraints.o: restr_files.f90 read_extra_restraints.f weights.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 weights.f90 read_extra_restraints.f -+read_extra_restraints.o: restr_files.o read_extra_restraints.f weights.o -+ $(FC) $(FFLAGS) -c read_extra_restraints.f - --coords.o: coords.f90 atomf77mod.f -- $(FC) $(FFLAGS) -c atomf77mod.f coords.f90 -+coords.o: coords.f90 atomf77mod.o -+ $(FC) $(FFLAGS) -c coords.f90 - - --ls_scaling_double.o: ls_scaling_double.f weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c ls_scaling_double.f weights.f90 agreem.f90 -+ls_scaling_double.o: ls_scaling_double.f weights.o agreem.o -+ $(FC) $(FFLAGS) -c ls_scaling_double.f - --fast_hessian_tabulation.o: fast_hessian_tabulation.f weights.f90 -- $(FC) $(FFLAGS) -c fast_hessian_tabulation.f weights.f90 -+fast_hessian_tabulation.o: fast_hessian_tabulation.f weights.o -+ $(FC) $(FFLAGS) -c fast_hessian_tabulation.f - --calc_stats_twin.o: calc_stats_twin.f weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c calc_stats_twin.f weights.f90 agreem.f90 rharvest_mod.f90 -+calc_stats_twin.o: calc_stats_twin.f weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c calc_stats_twin.f - --refpre_twin.o: refpre_twin.f coords.f90 automorphism.f90 restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 coords.f90 automorphism.f90 weights.f90 agreem.f90 rharvest_mod.f90 refpre_twin.f -+refpre_twin.o: refpre_twin.f coords.o automorphism.o restr_files.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c refpre_twin.f - - --decide_twin_opers_0.o: restr_files.f90 decide_twin_opers_0.f -- $(FC) $(FFLAGS) -c restr_files.f90 decide_twin_opers_0.f -+decide_twin_opers_0.o: restr_files.o decide_twin_opers_0.f -+ $(FC) $(FFLAGS) -c decide_twin_opers_0.f - - automorphism.o: automorphism.f90 - $(FC) $(FFLAGS) -c automorphism.f90 - --mtz_write_twin.o: mtz_write_twin.f filter_params.f90 restr_files.f90 weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 filter_params.f90 weights.f90 agreem.f90 mtz_write_twin.f -+mtz_write_twin.o: mtz_write_twin.f filter_params.o restr_files.o weights.o agreem.o -+ $(FC) $(FFLAGS) -c mtz_write_twin.f - - filter_params.o: filter_params.f90 - $(FC) $(FFLAGS) -c filter_params.f90 - --rcard_tor1.o: ncs_rest_mod.f90 rcard_tor1.f filter_params.f90 local_tls.f90 ridge.f90 optimise_solvent_all.f90 restr_files.f90 weights.f90 \ -- agreem.f90 rharvest_mod.f90 ncs_constr.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 optimise_solvent_all.f90 filter_params.f90 local_tls.f90 ridge.f90 weights.f90 \ -- agreem.f90 rharvest_mod.f90 ncs_constr.f90 rcard_tor1.f -+rcard_tor1.o: ncs_rest_mod.o rcard_tor1.f filter_params.o local_tls.o ridge.o optimise_solvent_all.o restr_files.o weights.o \ -+ agreem.o rharvest_mod.o ncs_constr.o -+ $(FC) $(FFLAGS) -c rcard_tor1.f - --inout_routines.o: restr_files.f90 inout_routines.f -- $(FC) $(FFLAGS) -c restr_files.f90 inout_routines.f -+inout_routines.o: restr_files.o inout_routines.f -+ $(FC) $(FFLAGS) -c inout_routines.f - --local_tls.o: local_tls.f90 linalgebra_f90.f90 -- $(FC) $(FFLAGS) -c linalgebra_f90.f90 local_tls.f90 -+local_tls.o: local_tls.f90 linalgebra_f90.o -+ $(FC) $(FFLAGS) -c local_tls.f90 - - linalgebra_f90.o: linalgebra_f90.f90 - $(FC) $(FFLAGS) -c linalgebra_f90.f90 - --make_refmac_dummy.o: restr_files.f90 ncs_rest_mod.f90 make_refmac_dummy.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 ncs_rest_mod.f90 weights.f90 agreem.f90 rharvest_mod.f90 optimise_solvent_all.f90 make_refmac_dummy.f -+make_refmac_dummy.o: restr_files.o ncs_rest_mod.o make_refmac_dummy.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c make_refmac_dummy.f - --ml_scaling_double.o: ml_scaling_double.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ml_scaling_double.f -+ml_scaling_double.o: ml_scaling_double.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c ml_scaling_double.f - --refall_twin.o: refall_twin.f optimise_solvent_all.f90 restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 refall_twin.f -+refall_twin.o: refall_twin.f optimise_solvent_all.o restr_files.f90 weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c refall_twin.f - --rharvest_subr.o: ncs_rest_mod.f90 rharvest_subr.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 rharvest_subr.f -+rharvest_subr.o: ncs_rest_mod.o rharvest_subr.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c rharvest_subr.f - --solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90 -- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90 solvent_contr_mask.f -+solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o ncs_constr.o -+ $(FC) $(FFLAGS) -c solvent_contr_mask.f - --subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.f90 restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90 subag_scale_hessian.f -+subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.o restr_files.o weights.o agreem.o rharvest_mod.o ncs_constr.o -+ $(FC) $(FFLAGS) -c subag_scale_hessian.f - --aniso_ref_eigen.o: aniso_ref_eigen.f ncs_constr.f90 -- $(FC) $(FFLAGS) -c ncs_constr.f90 aniso_ref_eigen.f -+aniso_ref_eigen.o: aniso_ref_eigen.f ncs_constr.o -+ $(FC) $(FFLAGS) -c aniso_ref_eigen.f - --subcf_scale1.o: subcf_scale1.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 subcf_scale1.f -+subcf_scale1.o: subcf_scale1.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c subcf_scale1.f - --bvalue_routines.o: bvalue_routines.f90 restr_files.f90 atomf77mod.f -- $(FC) $(FFLAGS) -c restr_files.f90 atomf77mod.f bvalue_routines.f90 -+bvalue_routines.o: bvalue_routines.f90 restr_files.o atomf77mod.o -+ $(FC) $(FFLAGS) -c bvalue_routines.f90 - --newentry_idealise.o:: newentry_idealise.f weights.f90 -- $(FC) $(FFLAGS) -c newentry_idealise.f weights.f90 -+newentry_idealise.o:: newentry_idealise.f weights.o -+ $(FC) $(FFLAGS) -c newentry_idealise.f - --occupancy_only_refine.o: occupancy_only_refine.f agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c occupancy_only_refine.f agreem.f90 rharvest_mod.f90 -+occupancy_only_refine.o: occupancy_only_refine.f agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c occupancy_only_refine.f - --refmac_completeness.o: weights.f90 agreem.f90 rharvest_mod.f90 refmac_completeness.f90 -- $(FC) $(FFLAGS) -c weights.f90 agreem.f90 rharvest_mod.f90 refmac_completeness.f90 -+refmac_completeness.o: weights.o agreem.o rharvest_mod.o refmac_completeness.f90 -+ $(FC) $(FFLAGS) -c refmac_completeness.f90 - --refmac_xml.o: refmac_xml.f optimise_solvent_all.f90 restr_files.f90 bvalue_routines.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c bvalue_routines.f90 restr_files.f90 optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 refmac_xml.f -+refmac_xml.o: refmac_xml.f optimise_solvent_all.o restr_files.o bvalue_routines.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c refmac_xml.f - - hkl_pack.o: hkl_pack.f90 - $(FC) $(FFLAGS) -c hkl_pack.f90 - --extra_eigen.o: extra_eigen.f agreem.f90 ncs_constr.f90 -- $(FC) $(FFLAGS) -c extra_eigen.f agreem.f90 ncs_constr.f90 -+extra_eigen.o: extra_eigen.f agreem.o ncs_constr.o -+ $(FC) $(FFLAGS) -c extra_eigen.f - --subvag.o: subvag.f hkl_pack.f90 -- $(FC) $(FFLAGS) -c hkl_pack.f90 subvag.f -+subvag.o: subvag.f hkl_pack.o -+ $(FC) $(FFLAGS) -c subvag.f - --make_PDB.o: make_PDB.f ncs_constr.f90 -- $(FC) $(FFLAGS) -c ncs_constr.f90 make_PDB.f -+make_PDB.o: make_PDB.f ncs_constr.o -+ $(FC) $(FFLAGS) -c make_PDB.f - --make_CIF.o: make_CIF.f ncs_constr.f90 -- $(FC) $(FFLAGS) -c ncs_constr.f90 make_CIF.f -+make_CIF.o: make_CIF.f ncs_constr.o -+ $(FC) $(FFLAGS) -c make_CIF.f - - refmac: $(SUBR) -- $(FC) $(FFLAGS) -o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP) -+ $(FC) $(FFLAGS) $(LDFLAGS) -o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK) - --mol2_file.o: mol2_file.f odb_files.f90 -- $(FC) $(FFLAGS) -c odb_files.f90 mol2_file.f -+mol2_file.o: mol2_file.f odb_files.o -+ $(FC) $(FFLAGS) -c mol2_file.f - --odb_files.o: odb_files.f90 elements_module.f90 enerf77mod.f -- $(FC) $(FFLAGS) -c elements_module.f90 enerf77mod.f odb_files.f90 -+odb_files.o: odb_files.f90 elements_module.o enerf77mod.o -+ $(FC) $(FFLAGS) -c odb_files.f90 - - elements_module.o: elements_module.f90 - $(FC) $(FFLAGS) -c elements_module.f90 - --make_lib2.o: make_lib2.f odb_files.f90 -- $(FC) $(FFLAGS) -c odb_files.f90 make_lib2.f -+make_lib2.o: make_lib2.f odb_files.o -+ $(FC) $(FFLAGS) -c make_lib2.f - - pdb2libcheck.o: pdb2libcheck.f90 - $(FC) $(FFLAGS) -c pdb2libcheck.f90 - --libcheck.o: libcheck.f elements_module.f90 pdb2libcheck.f90 -- $(FC) $(FFLAGS) -c elements_module.f90 pdb2libcheck.f90 libcheck.f -+libcheck.o: libcheck.f elements_module.o pdb2libcheck.o -+ $(FC) $(FFLAGS) -c libcheck.f - - header2matr.o: header2matr.f90 - $(FC) $(FFLAGS) -c header2matr.f90 -@@ -369,16 +361,17 @@ freer_twin.o: freer_twin.f90 - $(FC) $(FFLAGS) -c freer_twin.f90 - - libcheck: $(SUBL) -- $(FC) $(FFLAGS) -o libcheck${VERSION} $(SUBL) -+ $(FC) $(FFLAGS) $(LDFLAGS) -o libcheck${VERSION} $(SUBL) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK) - - free_twin: $(SUB_FREE) -- $(FC) $(FFLAGS) -o FreeTwin${VERSION} $(SUB_FREE) -+ $(FC) $(FFLAGS) $(LDFLAGS) -o FreeTwin${VERSION} $(SUB_FREE) $(LLIBCCP) $(LLIBLAPACK) - - - header2matr: $(SUB_HEADER) -- $(FC) $(FFLAGS) -o header2matr${VERSION} $(SUB_HEADER) -+ $(FC) $(FFLAGS) $(LDFLAGS) -o header2matr${VERSION} $(SUB_HEADER) - - clean: - /bin/rm *.o *.mod - - bridge.o: bridge.cpp llhood.h covmat.h Gauss.h tabfunc.h -+ $(CXX) $(CXXFLAGS) -c bridge.cpp diff --git a/sci-chemistry/refmac/files/5.6.0116-allow-dynamic-linking.patch b/sci-chemistry/refmac/files/5.6.0116-allow-dynamic-linking.patch deleted file mode 100644 index 9998b759c664..000000000000 --- a/sci-chemistry/refmac/files/5.6.0116-allow-dynamic-linking.patch +++ /dev/null @@ -1,341 +0,0 @@ - makefile_refmac.inc1 | 215 ++++++++++++++++++++++++-------------------------- - 1 files changed, 104 insertions(+), 111 deletions(-) - -diff --git a/makefile_refmac.inc1 b/makefile_refmac.inc1 -index 0f8bd63..e59fbfb 100644 ---- a/makefile_refmac.inc1 -+++ b/makefile_refmac.inc1 -@@ -96,9 +96,7 @@ bridge.o \ - i0.o \ - i1.o \ - chbevl.o \ --make_unix_ccp4.o \ --$(LLIBCIF) \ --$(LLIBLAPACK) -+make_unix_ccp4.o - - - SUBL = \ -@@ -133,9 +131,7 @@ cell_symm_subrs.o \ - iheap_sort.o \ - linalgebra.o \ - math_refmac.o \ --subnumrec.o \ --$(LLIBLAPACK) \ --$(LLIBCCP) -+subnumrec.o - - SUB_FREE = \ - freer_twin.o \ -@@ -145,9 +141,7 @@ subnumrec.o \ - libT.o \ - iheap_sort.o \ - cell_symm_subrs.o \ --math_refmac.o \ --$(LLIBLAPACK) \ --$(LLIBCCP) -+math_refmac.o - - SUB_HEADER = header2matr.o - #-------------------------------------------------------------------------------- -@@ -185,41 +179,41 @@ rharvest_mod.o: rharvest_mod.f90 - twin77mod.o: twin77mod.f - $(FC) $(FFLAGS) -c twin77mod.f - --gibbs_gm_sampler.o: linalgebra_f90.f90 gibbs_gm_sampler.f90 -- $(FC) $(FFLAGS) -c linalgebra_f90.f90 gibbs_gm_sampler.f90 -+gibbs_gm_sampler.o: linalgebra_f90.o gibbs_gm_sampler.f90 -+ $(FC) $(FFLAGS) -c gibbs_gm_sampler.f90 - --max_with_twins.o: restr_files.f90 max_with_twins.f weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 max_with_twins.f -+max_with_twins.o: restr_files.o max_with_twins.f weights.o agreem.o -+ $(FC) $(FFLAGS) -c max_with_twins.f - --merohedr_twin.o: restr_files.f90 merohedr_twin.f -- $(FC) $(FFLAGS) -c restr_files.f90 merohedr_twin.f -+merohedr_twin.o: restr_files.o merohedr_twin.f -+ $(FC) $(FFLAGS) -c merohedr_twin.f - --ls_scaling_twin_save.o: restr_files.f90 ls_scaling_twin_save.f weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 ls_scaling_twin_save.f -+ls_scaling_twin_save.o: restr_files.o ls_scaling_twin_save.f weights.o agreem.o -+ $(FC) $(FFLAGS) -c ls_scaling_twin_save.f - --ml_params_refine.o: restr_files.f90 ml_params_refine.f weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 ml_params_refine.f -+ml_params_refine.o: restr_files.o ml_params_refine.f weights.o agreem.o -+ $(FC) $(FFLAGS) -c ml_params_refine.f - --optimise_solvent_all.o: optimise_solvent_all.f90 agreem.f90 -- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 agreem.f90 -+optimise_solvent_all.o: optimise_solvent_all.f90 agreem.o -+ $(FC) $(FFLAGS) -c optimise_solvent_all.f90 - --ncs_rest.o: ncs_rest_mod.f90 restr_files.f90 ncs_ncs_generate.f90 ncs_rest.f weights.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 ncs_ncs_generate.f90 weights.f90 ncs_rest.f -+ncs_rest.o: ncs_rest_mod.o restr_files.o ncs_ncs_generate.o ncs_rest.f weights.o -+ $(FC) $(FFLAGS) -c ncs_rest.f - --ncs_ncs_generate.o: ncs_ncs_generate.f90 align_refmac.f90 -- $(FC) $(FFLAGS) -c ncs_ncs_generate.f90 align_refmac.f90 -+ncs_ncs_generate.o: ncs_ncs_generate.f90 align_refmac.o -+ $(FC) $(FFLAGS) -c ncs_ncs_generate.f90 - --lsq_exp2.o: ncs_rest_mod.f90 restr_files.f90 dist_routines.f90 ncs_simil.f90 ridge.f90 local_tls.f90 lsq_exp2.f weights.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 dist_routines.f90 ncs_simil.f90 ridge.f90 local_tls.f90 lsq_exp2.f weights.f90 rharvest_mod.f90 -+lsq_exp2.o: ncs_rest_mod.o restr_files.o dist_routines.o ncs_simil.o ridge.o local_tls.o lsq_exp2.f weights.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c lsq_exp2.f - --vdw_and_contacts.o: ncs_rest_mod.f90 vdw_and_contacts.f local_tls.f90 ridge.f90 restr_files.f90 weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 ridge.f90 local_tls.f90 weights.f90 agreem.f90 vdw_and_contacts.f -+vdw_and_contacts.o: ncs_rest_mod.o vdw_and_contacts.f local_tls.o ridge.o restr_files.o weights.o agreem.o -+ $(FC) $(FFLAGS) -c vdw_and_contacts.f - - dist_routines.o: dist_routines.f90 - $(FC) $(FFLAGS) -c dist_routines.f90 - --ncs_simil.o: ncs_rest_mod.f90 ncs_simil.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 ncs_simil.f90 -+ncs_simil.o: ncs_rest_mod.o ncs_simil.f90 -+ $(FC) $(FFLAGS) -c ncs_simil.f90 - - ridge.o: ridge.f90 - $(FC) $(FFLAGS) -c ridge.f90 -@@ -227,140 +221,138 @@ ridge.o: ridge.f90 - align_refmac.o: align_refmac.f90 - $(FC) $(FFLAGS) -c align_refmac.f90 - --rigid_allocate.o: restr_files.f90 rigid_allocate.f agreem.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 agreem.f90 rigid_allocate.f -+rigid_allocate.o: restr_files.o rigid_allocate.f agreem.o -+ $(FC) $(FFLAGS) -c rigid_allocate.f - --tls_allocate.o: restr_files.f90 tls_allocate.f weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 tls_allocate.f -+tls_allocate.o: restr_files.o tls_allocate.f weights.o agreem.o -+ $(FC) $(FFLAGS) -c tls_allocate.f - --hkon_secder_tch.o: ridge.f90 gibbs_gm_sampler.f90 ncs_rest_mod.f90 hkon_secder_tch.f local_tls.f90 ncs_simil.f90 optimise_solvent_all.f90 \ -- restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c ridge.f90 gibbs_gm_sampler.f90 ncs_rest_mod.f90 restr_files.f90 optimise_solvent_all.f90 ncs_simil.f90 local_tls.f90 \ -- hkon_secder_tch.f weights.f90 agreem.f90 rharvest_mod.f90 -+hkon_secder_tch.o: ridge.o gibbs_gm_sampler.o ncs_rest_mod.o hkon_secder_tch.f local_tls.o ncs_simil.o optimise_solvent_all.o \ -+ restr_files.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c hkon_secder_tch.f - --oppro_allocate.o: ncs_rest_mod.f90 oppro_allocate.f filter_params.f90 optimise_solvent_all.f90 restr_files.f90 weights.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 optimise_solvent_all.f90 filter_params.f90 weights.f90 oppro_allocate.f -+oppro_allocate.o: ncs_rest_mod.o oppro_allocate.f filter_params.o optimise_solvent_all.o restr_files.o weights.o -+ $(FC) $(FFLAGS) -c oppro_allocate.f - --read_extra_restraints.o: restr_files.f90 read_extra_restraints.f weights.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 weights.f90 read_extra_restraints.f -+read_extra_restraints.o: restr_files.o read_extra_restraints.f weights.o -+ $(FC) $(FFLAGS) -c read_extra_restraints.f - --coords.o: coords.f90 atomf77mod.f -- $(FC) $(FFLAGS) -c atomf77mod.f coords.f90 -+coords.o: coords.f90 atomf77mod.o -+ $(FC) $(FFLAGS) -c coords.f90 - - --ls_scaling_double.o: ls_scaling_double.f weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c ls_scaling_double.f weights.f90 agreem.f90 -+ls_scaling_double.o: ls_scaling_double.f weights.o agreem.o -+ $(FC) $(FFLAGS) -c ls_scaling_double.f - --fast_hessian_tabulation.o: fast_hessian_tabulation.f weights.f90 -- $(FC) $(FFLAGS) -c fast_hessian_tabulation.f weights.f90 -+fast_hessian_tabulation.o: fast_hessian_tabulation.f weights.o -+ $(FC) $(FFLAGS) -c fast_hessian_tabulation.f - --calc_stats_twin.o: calc_stats_twin.f weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c calc_stats_twin.f weights.f90 agreem.f90 rharvest_mod.f90 -+calc_stats_twin.o: calc_stats_twin.f weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c calc_stats_twin.f - --refpre_twin.o: refpre_twin.f coords.f90 automorphism.f90 restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 coords.f90 automorphism.f90 weights.f90 agreem.f90 rharvest_mod.f90 refpre_twin.f -+refpre_twin.o: refpre_twin.f coords.o automorphism.o restr_files.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c refpre_twin.f - - --decide_twin_opers_0.o: restr_files.f90 decide_twin_opers_0.f -- $(FC) $(FFLAGS) -c restr_files.f90 decide_twin_opers_0.f -+decide_twin_opers_0.o: restr_files.o decide_twin_opers_0.f -+ $(FC) $(FFLAGS) -c decide_twin_opers_0.f - - automorphism.o: automorphism.f90 - $(FC) $(FFLAGS) -c automorphism.f90 - --mtz_write_twin.o: mtz_write_twin.f filter_params.f90 restr_files.f90 weights.f90 agreem.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 filter_params.f90 weights.f90 agreem.f90 mtz_write_twin.f -+mtz_write_twin.o: mtz_write_twin.f filter_params.o restr_files.o weights.o agreem.o -+ $(FC) $(FFLAGS) -c mtz_write_twin.f - - filter_params.o: filter_params.f90 - $(FC) $(FFLAGS) -c filter_params.f90 - --rcard_tor1.o: ncs_rest_mod.f90 rcard_tor1.f filter_params.f90 local_tls.f90 ridge.f90 optimise_solvent_all.f90 restr_files.f90 weights.f90 \ -- agreem.f90 rharvest_mod.f90 ncs_constr.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 optimise_solvent_all.f90 filter_params.f90 local_tls.f90 ridge.f90 weights.f90 \ -- agreem.f90 rharvest_mod.f90 ncs_constr.f90 rcard_tor1.f -+rcard_tor1.o: ncs_rest_mod.o rcard_tor1.f filter_params.o local_tls.o ridge.o optimise_solvent_all.o restr_files.o weights.o \ -+ agreem.o rharvest_mod.o ncs_constr.o -+ $(FC) $(FFLAGS) -c rcard_tor1.f - --inout_routines.o: restr_files.f90 inout_routines.f -- $(FC) $(FFLAGS) -c restr_files.f90 inout_routines.f -+inout_routines.o: restr_files.o inout_routines.f -+ $(FC) $(FFLAGS) -c inout_routines.f - --local_tls.o: local_tls.f90 linalgebra_f90.f90 -- $(FC) $(FFLAGS) -c linalgebra_f90.f90 local_tls.f90 -+local_tls.o: local_tls.f90 linalgebra_f90.o -+ $(FC) $(FFLAGS) -c local_tls.f90 - - linalgebra_f90.o: linalgebra_f90.f90 - $(FC) $(FFLAGS) -c linalgebra_f90.f90 - --make_refmac_dummy.o: restr_files.f90 ncs_rest_mod.f90 make_refmac_dummy.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 ncs_rest_mod.f90 weights.f90 agreem.f90 rharvest_mod.f90 optimise_solvent_all.f90 make_refmac_dummy.f -+make_refmac_dummy.o: restr_files.o ncs_rest_mod.o make_refmac_dummy.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c make_refmac_dummy.f - --ml_scaling_double.o: ml_scaling_double.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ml_scaling_double.f -+ml_scaling_double.o: ml_scaling_double.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c ml_scaling_double.f - --refall_twin.o: refall_twin.f optimise_solvent_all.f90 restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 refall_twin.f -+refall_twin.o: refall_twin.f optimise_solvent_all.o restr_files.f90 weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c refall_twin.f - --rharvest_subr.o: ncs_rest_mod.f90 rharvest_subr.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c ncs_rest_mod.f90 optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 rharvest_subr.f -+rharvest_subr.o: ncs_rest_mod.o rharvest_subr.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c rharvest_subr.f - --solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90 -- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90 solvent_contr_mask.f -+solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o ncs_constr.o -+ $(FC) $(FFLAGS) -c solvent_contr_mask.f - --subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.f90 restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90 -- $(FC) $(FFLAGS) -c restr_files.f90 optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90 subag_scale_hessian.f -+subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.o restr_files.o weights.o agreem.o rharvest_mod.o ncs_constr.o -+ $(FC) $(FFLAGS) -c subag_scale_hessian.f - --aniso_ref_eigen.o: aniso_ref_eigen.f ncs_constr.f90 -- $(FC) $(FFLAGS) -c ncs_constr.f90 aniso_ref_eigen.f -+aniso_ref_eigen.o: aniso_ref_eigen.f ncs_constr.o -+ $(FC) $(FFLAGS) -c aniso_ref_eigen.f - --subcf_scale1.o: subcf_scale1.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 subcf_scale1.f -+subcf_scale1.o: subcf_scale1.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c subcf_scale1.f - --bvalue_routines.o: bvalue_routines.f90 restr_files.f90 atomf77mod.f -- $(FC) $(FFLAGS) -c restr_files.f90 atomf77mod.f bvalue_routines.f90 -+bvalue_routines.o: bvalue_routines.f90 restr_files.o atomf77mod.o -+ $(FC) $(FFLAGS) -c bvalue_routines.f90 - --newentry_idealise.o:: newentry_idealise.f weights.f90 -- $(FC) $(FFLAGS) -c newentry_idealise.f weights.f90 -+newentry_idealise.o:: newentry_idealise.f weights.o -+ $(FC) $(FFLAGS) -c newentry_idealise.f - --occupancy_only_refine.o: occupancy_only_refine.f agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c occupancy_only_refine.f agreem.f90 rharvest_mod.f90 -+occupancy_only_refine.o: occupancy_only_refine.f agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c occupancy_only_refine.f - --refmac_completeness.o: weights.f90 agreem.f90 rharvest_mod.f90 refmac_completeness.f90 -- $(FC) $(FFLAGS) -c weights.f90 agreem.f90 rharvest_mod.f90 refmac_completeness.f90 -+refmac_completeness.o: weights.o agreem.o rharvest_mod.o refmac_completeness.f90 -+ $(FC) $(FFLAGS) -c refmac_completeness.f90 - --refmac_xml.o: refmac_xml.f optimise_solvent_all.f90 restr_files.f90 bvalue_routines.f90 weights.f90 agreem.f90 rharvest_mod.f90 -- $(FC) $(FFLAGS) -c bvalue_routines.f90 restr_files.f90 optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 refmac_xml.f -+refmac_xml.o: refmac_xml.f optimise_solvent_all.o restr_files.o bvalue_routines.o weights.o agreem.o rharvest_mod.o -+ $(FC) $(FFLAGS) -c refmac_xml.f - - hkl_pack.o: hkl_pack.f90 - $(FC) $(FFLAGS) -c hkl_pack.f90 - --extra_eigen.o: extra_eigen.f agreem.f90 ncs_constr.f90 -- $(FC) $(FFLAGS) -c extra_eigen.f agreem.f90 ncs_constr.f90 -+extra_eigen.o: extra_eigen.f agreem.o ncs_constr.o -+ $(FC) $(FFLAGS) -c extra_eigen.f - --subvag.o: subvag.f hkl_pack.f90 -- $(FC) $(FFLAGS) -c hkl_pack.f90 subvag.f -+subvag.o: subvag.f hkl_pack.o -+ $(FC) $(FFLAGS) -c subvag.f - --make_PDB.o: make_PDB.f ncs_constr.f90 -- $(FC) $(FFLAGS) -c ncs_constr.f90 make_PDB.f -+make_PDB.o: make_PDB.f ncs_constr.o -+ $(FC) $(FFLAGS) -c make_PDB.f - --make_CIF.o: make_CIF.f ncs_constr.f90 -- $(FC) $(FFLAGS) -c ncs_constr.f90 make_CIF.f -+make_CIF.o: make_CIF.f ncs_constr.o -+ $(FC) $(FFLAGS) -c make_CIF.f - - refmac: $(SUBR) -- $(FC) $(FFLAGS) -o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP) -+ $(FC) $(FFLAGS) $(LDFLAGS) -o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK) - --mol2_file.o: mol2_file.f odb_files.f90 -- $(FC) $(FFLAGS) -c odb_files.f90 mol2_file.f -+mol2_file.o: mol2_file.f odb_files.o -+ $(FC) $(FFLAGS) -c mol2_file.f - --odb_files.o: odb_files.f90 elements_module.f90 enerf77mod.f -- $(FC) $(FFLAGS) -c elements_module.f90 enerf77mod.f odb_files.f90 -+odb_files.o: odb_files.f90 elements_module.o enerf77mod.o -+ $(FC) $(FFLAGS) -c odb_files.f90 - - elements_module.o: elements_module.f90 - $(FC) $(FFLAGS) -c elements_module.f90 - --make_lib2.o: make_lib2.f odb_files.f90 -- $(FC) $(FFLAGS) -c odb_files.f90 make_lib2.f -+make_lib2.o: make_lib2.f odb_files.o -+ $(FC) $(FFLAGS) -c make_lib2.f - - pdb2libcheck.o: pdb2libcheck.f90 - $(FC) $(FFLAGS) -c pdb2libcheck.f90 - --libcheck.o: libcheck.f elements_module.f90 pdb2libcheck.f90 -- $(FC) $(FFLAGS) -c elements_module.f90 pdb2libcheck.f90 libcheck.f -+libcheck.o: libcheck.f elements_module.o pdb2libcheck.o -+ $(FC) $(FFLAGS) -c libcheck.f - - header2matr.o: header2matr.f90 - $(FC) $(FFLAGS) -c header2matr.f90 -@@ -369,16 +361,17 @@ freer_twin.o: freer_twin.f90 - $(FC) $(FFLAGS) -c freer_twin.f90 - - libcheck: $(SUBL) -- $(FC) $(FFLAGS) -o libcheck${VERSION} $(SUBL) -+ $(FC) $(FFLAGS) $(LDFLAGS) -o libcheck${VERSION} $(SUBL) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK) - - free_twin: $(SUB_FREE) -- $(FC) $(FFLAGS) -o FreeTwin${VERSION} $(SUB_FREE) -+ $(FC) $(FFLAGS) $(LDFLAGS) -o FreeTwin${VERSION} $(SUB_FREE) $(LLIBCCP) $(LLIBLAPACK) - - - header2matr: $(SUB_HEADER) -- $(FC) $(FFLAGS) -o header2matr${VERSION} $(SUB_HEADER) -+ $(FC) $(FFLAGS) $(LDFLAGS) -o header2matr${VERSION} $(SUB_HEADER) - - clean: - /bin/rm *.o *.mod - - bridge.o: bridge.cpp llhood.h covmat.h Gauss.h tabfunc.h -+ $(CXX) $(CXXFLAGS) -c bridge.cpp diff --git a/sci-chemistry/refmac/metadata.xml b/sci-chemistry/refmac/metadata.xml deleted file mode 100644 index c0432fefe855..000000000000 --- a/sci-chemistry/refmac/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> - <maintainer> - <email>jlec@gentoo.org</email> - <name>Justin Lecher (jlec)</name> - </maintainer> -</pkgmetadata> diff --git a/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild b/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild deleted file mode 100644 index eb8e87018219..000000000000 --- a/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils fortran-2 flag-o-matic toolchain-funcs versionator - -DESCRIPTION="Macromolecular crystallographic refinement program" -HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac" -SRC_URI=" - ${HOMEPAGE}/data/refmac_stable/refmac_${PV}.tar.gz - test? ( http://dev.gentooexperimental.org/~jlec/distfiles/test-framework.tar.gz )" - -SLOT="0" -LICENSE="ccp4" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND=" - sci-chemistry/makecif - >=sci-libs/ccp4-libs-6.1.3-r7 - sci-libs/mmdb - <sci-libs/monomer-db-1 - virtual/blas - virtual/lapack" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -FORTRAN_STANDARD="77 90" - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}"/${PV}-allow-dynamic-linking.patch - "${FILESDIR}"/${PV}-gcc4.6.patch - ) - -src_prepare() { - epatch ${PATCHES[@]} - - use test && epatch "${FILESDIR}"/$(get_version_component_range 1-2 ${PV})-test.log.patch - [[ ${FC} == *gfortran* ]] && \ - append-fflags -fno-second-underscore && \ - append-cflags -DGFORTRAN -DPROTOTYPE && \ - append-libs -lgfortran -lgfortranbegin -lstdc++ - [[ ${FC} == *ifort* ]] && \ - append-libs -lstdc++ -} - -src_compile() { - emake \ - FC=$(tc-getFC) \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - COPTIM="${CFLAGS}" \ - FOPTIM="${FFLAGS:- -O2}" \ - VERSION="" \ - XFFLAGS="" \ - XCFLAGS="" \ - LLIBCCP="-lccp4f -lccp4c -lccif $($(tc-getPKG_CONFIG) --libs mmdb)" \ - LLIBLAPACK="$($(tc-getPKG_CONFIG) --libs lapack blas)" \ - LLIBOTHERS="${LIBS}" \ - ${PN} libcheck -} - -src_test() { - einfo "Starting tests ..." - source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh" - export PATH="${WORKDIR}/test-framework/scripts:${S}:${PATH}" - export CCP4_TEST="${WORKDIR}"/test-framework - export CCP4_SCR="${T}" - ln -sf refmac "${S}"/refmac5 - sed '/^ANISOU/d' -i ${CCP4_TEST}/data/pdb/1vr7.pdb - ccp4-run-thorough-tests -v test_refmac5 || die -} - -src_install() { - exeinto /usr/libexec/ccp4/bin/ - doexe ${PN} - dosym refmac /usr/libexec/ccp4/bin/refmac5 - dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN} - dosym refmac /usr/bin/refmac5 - dodoc refmac_keywords.pdf bugs_and_features.pdf -} diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild b/sci-chemistry/relax/relax-4.0.0-r1.ebuild new file mode 100644 index 000000000000..b5950de01228 --- /dev/null +++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +WX_GTK_VER="3.0" + +inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx + +DESCRIPTION="Molecular dynamics by NMR data analysis" +HOMEPAGE="http://www.nmr-relax.com/" +SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + dev-python/Numdifftools[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}] + sci-chemistry/molmol + sci-chemistry/pymol[${PYTHON_USEDEP}] + sci-chemistry/vmd + >=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}] + >=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + sci-visualization/grace + sci-visualization/opendx + x11-libs/wxGTK:${WX_GTK_VER}[X]" +DEPEND="${RDEPEND} + media-gfx/pngcrush + test? ( ${RDEPEND} ) + " + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + rm -rf minfx bmrblib extern/numdifftools || die + tc-export CC + need-wxwidgets unicode +} + +src_compile() { + escons +} + +src_test() { + VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback" + virtualmake +} + +src_install() { + dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf} + + python_moduleinto ${PN} + python_domodule * + + rm ${PN} README || die + + make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@" +} diff --git a/sci-chemistry/scala/Manifest b/sci-chemistry/scala/Manifest deleted file mode 100644 index e03416a28733..000000000000 --- a/sci-chemistry/scala/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST scala-3.3.20.tar.gz 368628 SHA256 0efb108923a4d21fdc75d7ee92567e4bac4ae409f8798fbabd8142b5b026e976 SHA512 9f9812527013d87c80101333baf7ee646f6b3c665cdb477bb4e633c0a1fa57b31b6327913cf712e961c4484a9d9edf1aab5f3cfc66e6834aca1e970a4e0ca898 WHIRLPOOL 7d6082872a9f2f992186a2626dbf7ccd9f827b1322d1399b41ebc1b07267a46cfed5f7ea085403415c01eba4fc44e9d51983080537db04b227469d6871f8f1f9 diff --git a/sci-chemistry/scala/files/3.3.18-gcc4.6.patch b/sci-chemistry/scala/files/3.3.18-gcc4.6.patch deleted file mode 100644 index 0bb3d40d479a..000000000000 --- a/sci-chemistry/scala/files/3.3.18-gcc4.6.patch +++ /dev/null @@ -1,17 +0,0 @@ - scala.f | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/scala.f b/scala.f -index d7e1cbe..8ed6fd2 100644 ---- a/scala.f -+++ b/scala.f -@@ -3955,7 +3955,8 @@ c line buffer - character*40 key, value - character*200 realfilename - -- integer intfp, i2swap, lenstr -+ integer intfp, lenstr -+ integer*2 i2swap - external intfp, i2swap, lenstr - logical litend - external litend diff --git a/sci-chemistry/scala/files/Makefile.am b/sci-chemistry/scala/files/Makefile.am deleted file mode 100644 index 49fd61180ef0..000000000000 --- a/sci-chemistry/scala/files/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -LIBS = -lccp4f $(LAPACK_LIBS) - -bin_PROGRAMS = scala - -scala_SOURCES = scala.f - diff --git a/sci-chemistry/scala/files/configure.ac b/sci-chemistry/scala/files/configure.ac deleted file mode 100644 index 35c4c7fdd194..000000000000 --- a/sci-chemistry/scala/files/configure.ac +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.59) -AC_INIT(scala, https://bugs.gentoo.org/) -AC_CONFIG_SRCDIR([scala.f]) -AM_INIT_AUTOMAKE([foreign]) - -PKG_CHECK_MODULES([LAPACK],[lapack]) - -# Checks for programs. -AC_PROG_FC -AC_PROG_F77 -AC_OUTPUT([Makefile]) diff --git a/sci-chemistry/scala/metadata.xml b/sci-chemistry/scala/metadata.xml deleted file mode 100644 index 2c9359ab3513..000000000000 --- a/sci-chemistry/scala/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> - <maintainer> - <email>jlec@gentoo.org</email> - </maintainer> - <longdescription> -This program scales together multiple observations of reflections from -Xray difraction experiments, and merges multiple observations into an -average intensity. -</longdescription> -</pkgmetadata> diff --git a/sci-chemistry/scala/scala-3.3.20.ebuild b/sci-chemistry/scala/scala-3.3.20.ebuild deleted file mode 100644 index 3555cc29a9d1..000000000000 --- a/sci-chemistry/scala/scala-3.3.20.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit autotools fortran-2 - -DESCRIPTION="Scale together multiple observations of reflections" -HOMEPAGE="http://www.ccp4.ac.uk/dist/html/scala.html" -SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz" - -LICENSE="ccp4" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - !<sci-chemistry/ccp4-6.1.2 - !dev-lang/scala-bin - !dev-lang/scala - sci-libs/ccp4-libs - virtual/lapack" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - cp "${FILESDIR}"/{configure.ac,Makefile.am} "${S}" - eautoreconf -} - -src_install() { - exeinto /usr/libexec/ccp4/bin/ - doexe ${PN} - dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN} - dodoc ${PN}.doc - dohtml ${PN}.html -} diff --git a/sci-chemistry/sfcheck/Manifest b/sci-chemistry/sfcheck/Manifest deleted file mode 100644 index 77615cec106b..000000000000 --- a/sci-chemistry/sfcheck/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sfcheck-7.03.18.tar.gz 535707 SHA256 def9ceec86fc50f35b9a729e6f84b45a83560e2c6c20a5105647182e10313148 SHA512 256aa1690e0f5ca6aca0483a7d00c1deeb7b77701d950771a134532a658f7c3189bc6abec620ea6da2af200fc879ac9ff07ef7f4ba8614b6cd4e8455a11bed93 WHIRLPOOL 7b9f99f1a8387c5bc63bdab2078d3fcfab4146046429c56503760ca12a1898e944b5aa3c42b358d303206487e5d493bdcb77fe1795490779e7bd79b8b66a2d7a diff --git a/sci-chemistry/sfcheck/files/7.03.17-ldflags.patch b/sci-chemistry/sfcheck/files/7.03.17-ldflags.patch deleted file mode 100644 index 4163cb52ac1e..000000000000 --- a/sci-chemistry/sfcheck/files/7.03.17-ldflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/makefile b/src/makefile -index ab43d7d..37e469f 100755 ---- a/src/makefile -+++ b/src/makefile -@@ -60,6 +60,6 @@ main_sfcheck_ccp4.o: main_sfcheck_ccp4.f sfch_version.fh - $(MR_FORT) -c main_sfcheck_ccp4.f - - sfcheck: $(OBJS) -- $(MR_FORT) -o $(BIN)/sfcheck $(OBJSL) $(MR_LIBRARY) -+ $(MR_FORT) $(LDFLAGS) -o $(BIN)/sfcheck $(OBJSL) $(MR_LIBRARY) - - # ---------------------------------------- diff --git a/sci-chemistry/sfcheck/sfcheck-7.03.18-r1.ebuild b/sci-chemistry/sfcheck/sfcheck-7.03.18-r1.ebuild deleted file mode 100644 index e18673d0923e..000000000000 --- a/sci-chemistry/sfcheck/sfcheck-7.03.18-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils fortran-2 toolchain-funcs - -DESCRIPTION="Program for assessing the agreement between the atomic model and X-ray data or EM map" -HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/sfcheck.html" -#SRC_URI="http://www.ysbl.york.ac.uk/~alexei/downloads/sfcheck.tar.gz" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -SLOT="0" -LICENSE="ccp4" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="sci-libs/ccp4-libs" -DEPEND="${RDEPEND} - !<sci-chmistry/ccp4-apps-6.1.3" - -S="${WORKDIR}"/${PN} - -src_prepare() { - epatch "${FILESDIR}"/7.03.17-ldflags.patch - - emake -C src clean -} - -src_compile() { - MR_FORT="$(tc-getFC) ${FFLAGS}" \ - MR_LIBRARY="-lccp4f" \ - emake -C src all -} - -src_install() { - exeinto /usr/libexec/ccp4/bin/ - doexe bin/${PN} - dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN} - dodoc readme ${PN}.com.gz doc/${PN}* -} diff --git a/sci-chemistry/solve-resolve-bin/Manifest b/sci-chemistry/solve-resolve-bin/Manifest deleted file mode 100644 index 43fcf716e995..000000000000 --- a/sci-chemistry/solve-resolve-bin/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST solve-2.13-linux-64.tar.gz 74444830 SHA256 e03250bb550686fc6e5f59d4e885b83b88cd342dfb4975eb31ddf95d9515650e SHA512 8f20715c3fb73940f03ba8a4bb3528f89ba01520cacead001796609bc15259ab7ab7f2d4960ea97efc43029863bc31e630c9e93f528a233652928220dafe0b4d WHIRLPOOL 125efe76024148656f3bb357ad1bc78d17f51eb8268c83241f4da9a94356170d0259fe48fadf6bf1ffe4b10b57bb27ed79199063dc95d0eef8d9e22de653c84a -DIST solve-2.13-linux.tar.gz 71902534 SHA256 975466fe92d8f6256de20ea0b5101876f3e5a7e3093199946c9f4824236c79d3 SHA512 a3a779ada33bd189fc8c3e6fdc424ef9c032c5540138cce52e0c8dcf5a12847b1325402a2c1715ed4ab217f433169d3612c724f2d178ead576afc44ec4839c6a WHIRLPOOL 0fec411b795a107610e620586cba511a0cbf50400e0bdfef872b22ee05e3992fcc0a4b1cf1d84d450bbeb3838a7bc9633acd8f4cf97d5e4b7a01e6e7959ccd7c diff --git a/sci-chemistry/solve-resolve-bin/solve-resolve-bin-2.13.ebuild b/sci-chemistry/solve-resolve-bin/solve-resolve-bin-2.13.ebuild deleted file mode 100644 index 6deae178afdd..000000000000 --- a/sci-chemistry/solve-resolve-bin/solve-resolve-bin-2.13.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -DESCRIPTION="Automated crystallographic structure solution for MIR, SAD, and MAD" -HOMEPAGE="http://www.solve.lanl.gov/index.html" -SRC_URI=" - x86? ( https://solve.lanl.gov/pub/solve/${PV}/solve-${PV}-linux.tar.gz ) - amd64? ( https://solve.lanl.gov/pub/solve/${PV}/solve-${PV}-linux-64.tar.gz )" - -SLOT="0" -LICENSE="solve" -KEYWORDS="-* x86 amd64" -IUSE="examples" - -RDEPEND="sci-libs/ccp4-libs" -DEPEND="" - -RESTRICT="mirror" - -S="${WORKDIR}"/solve-${PV} - -QA_PREBUILT="opt/solve-resolve/bin/*" - -src_install(){ - local IN_PATH="/opt/solve-resolve/" - - exeinto ${IN_PATH}bin/ - doexe bin/* - - insinto ${IN_PATH}lib/ - doins -r lib/{*sym,sym*,hist*,*dat,segments,patterns} - - docinto html - dodoc -r lib/html/* - - sed \ - -e 's:/usr/local/lib/solve/:${EPREFIX}/opt/solve-resolve/lib/:' \ - -i lib/examples_solve/p9/solve* || die - if use examples; then - sed \ - -e 's:/usr/local/lib/resolve/:${EPREFIX}/opt/solve-resolve/lib/:' \ - -i lib/examples_resolve/{resolve.csh,prime_and_switch.csh} || die - insinto /usr/share/${PF}/ - doins -r lib/examples_*solve - fi - - cat >> "${T}"/20solve-resolve <<- EOF - CCP4_OPEN="UNKNOWN" - SYMOP="${EPREFIX}/usr/share/ccp4/data/symop.lib" - SYMINFO="${EPREFIX}/usr/share/ccp4/data/syminfo.lib" - SOLVEDIR="${EPREFIX}/${IN_PATH}lib/" - PATH="${EPREFIX}/${IN_PATH}bin" - EOF - - doenvd "${T}"/20solve-resolve -} - -pkg_postinst(){ - einfo "Get a valid license key from" - einfo "http://solve.lanl.gov/license.html" - einfo "and place it in" - einfo "${EPREFIX}${IN_PATH}lib/" -} diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild new file mode 100644 index 000000000000..b0352c5f7b5b --- /dev/null +++ b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER=3.0 + +inherit autotools eutils wxwidgets + +DESCRIPTION="Chemical 3D graphics program with GAMESS input builder" +HOMEPAGE="http://www.scl.ameslab.gov/MacMolPlt/" +SRC_URI="https://wxmacmolplt.googlecode.com/files/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="flash" + +RDEPEND=" + media-libs/glew + media-libs/mesa + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + flash? ( media-libs/ming )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + need-wxwidgets unicode + epatch "${FILESDIR}"/${P}-glew.patch + sed \ + -e "/^dist_doc_DATA/d" \ + -i Makefile.am || die "Failed to disable installation of LICENSE file" + eautoreconf +} + +src_configure() { + econf \ + --with-glew \ + $(use_with flash ming) +} + +src_install() { + default + doicon resources/${PN}.png + make_desktop_entry ${PN} wxMacMolPlt ${PN} "Science;DataVisualization;" +} diff --git a/sci-chemistry/xdsi/Manifest b/sci-chemistry/xdsi/Manifest deleted file mode 100644 index e33598d79364..000000000000 --- a/sci-chemistry/xdsi/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xdsi_0.92.tar.gz 886028 SHA256 416403f167d26b56965283b407783ea80927ace533df76e330b51ca37c9bb9e4 diff --git a/sci-chemistry/xdsi/files/0.92-gentoo.patch b/sci-chemistry/xdsi/files/0.92-gentoo.patch deleted file mode 100644 index f4a37ff1838d..000000000000 --- a/sci-chemistry/xdsi/files/0.92-gentoo.patch +++ /dev/null @@ -1,27 +0,0 @@ - xdsi | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/xdsi b/xdsi -index cbedee8..1037913 100755 ---- a/xdsi -+++ b/xdsi -@@ -20,8 +20,8 @@ - #################################################################### - # These are the only two things you should change# - --set Templates "/mydir/templates" --set initial "/mydir/SLS-2009" -+set Templates "GENTOOTEMPLATE" -+set initial "./" - - - #################################################################### -@@ -121,7 +121,7 @@ your system administrator." - } - - --CheckExecutables "kpdf gnuplot xds_par xdsstat xds-viewer-0.6 convert pointless ipmosflm VIEW" -+CheckExecutables "kpdf gnuplot xds_par xds-viewer convert pointless ipmosflm" - - #wm resizable . 0 0 - diff --git a/sci-chemistry/xdsi/metadata.xml b/sci-chemistry/xdsi/metadata.xml deleted file mode 100644 index 431fb2be13b4..000000000000 --- a/sci-chemistry/xdsi/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> - <maintainer> - <email>jlec@gentoo.org</email> - </maintainer> - <longdescription> -XDSi offers you the possibility to process all your datasets in a given directory with minimum effort. -* You just have to provide it with a resultdirectory and the directory where your frames are stored. -* All datasets consisting of more than 100 frames within the given directory and all its subdirectories will be processed. -* For each dataset a space group assignment is done using POINTLESS of the CCP4 software package -* Plots of the most informative statistics of INTEGRATE.LP, CORRECT.LP and XDSSTAT.LP are generated for each dataset -* A plot comparing Rmeas, I/sig and Completeness of all the processed datasets is generated -* You can also generate plots for datasets that have been processed using XDS without XDSi -</longdescription> -</pkgmetadata> diff --git a/sci-chemistry/xdsi/xdsi-0.92-r1.ebuild b/sci-chemistry/xdsi/xdsi-0.92-r1.ebuild deleted file mode 100644 index 6a6c9bb7ec8b..000000000000 --- a/sci-chemistry/xdsi/xdsi-0.92-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -DESCRIPTION="A crude interface for running the XDS" -HOMEPAGE="http://strucbio.biologie.uni-konstanz.de/xdswiki/index.php/Xdsi" -SRC_URI="ftp://turn5.biologie.uni-konstanz.de/pub/${PN}_${PV}.tar.gz" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - app-text/mupdf - dev-lang/tk - || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) - sci-chemistry/mosflm - sci-chemistry/pointless - sci-chemistry/xds-bin[smp] - sci-visualization/gnuplot - sci-visualization/xds-viewer" -# Need to clarified for licensing -# sci-chemistry/xdsstat-bin -DEPEND="" - -RESTRICT="mirror bindist" - -S="${WORKDIR}" - -src_prepare() { - epatch "${FILESDIR}"/${PV}-gentoo.patch - sed \ - -e "s:GENTOOTEMPLATE:${EPREFIX}/usr/share/${PN}/templates:g" \ - -e "s:kpdf:mupdf:g" \ - -e "s:xds-viewer-0.6:xds-viewer:g" \ - -i ${PN} || die -} - -src_install() { - dobin ${PN} - insinto /usr/share/${PN}/templates - doins templates/{*.INP,bohr*,fortran,pauli,info.png,*.pck,tablesf_xdsi} - dodoc templates/*.pdf -} - -pkg_postinst() { - elog "Documentation can be found here:" - elog "ftp://turn14.biologie.uni-konstanz.de/pub/xdsi/xdsi_doc_print.pdf" -} diff --git a/sci-chemistry/xia2/Manifest b/sci-chemistry/xia2/Manifest deleted file mode 100644 index 52cb6c13f104..000000000000 --- a/sci-chemistry/xia2/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST xia2-0.3.1.0.tar.bz2 3389906 SHA256 32f1866bc17b093cbf157ec7bc217e47d059957104b20c88ed1b5c3706fc7e28 SHA512 cd595147164e4a281431a1d5a7298588001bb11662b517a5f95366e7b0ba4fdb33adf88dd2672c8c2ee84f48356fccb7cbd07667d5f04417a1564c7ea9f878c5 WHIRLPOOL e5493526d3075a5c61ce582a3bf42e2b4a2a73d7a28b1c8df786f0bdf5c8b1eaee986a60f379559ba556f256057794211a6c1e812b785aa9fe3179357b24b0da -DIST xia2-0.3.1.6.tar.bz2 3464982 SHA256 fde814a763e6666a1618d01569c19d574f1bf71d754dc3960beeb13c35dd201f SHA512 d00ba2c42c88d01522859839cbee6a93662ed7f89fb146babffa1dd5d6af12ca72cc146157e0dc88bba1d6543f8509fc9027e1c42ed3ae15dd3e168ca18e1858 WHIRLPOOL ccedcbf910ec5bed637739f7519e14eb249b89ae6ccd83a632ab8571a3af62f1f168f8dfd88287fed9fe927b98230e083a0d2d4525f47bc49c4074375a46a796 -DIST xia2-0.3.1.7.tar.bz2 3650285 SHA256 54beb26396c4b6ecb343544c777c2505238385f2127482d035d2c47b24a7fcf1 SHA512 d25788e6564b0f8f4c8e6723347b7691277b01192ead8f37bc7e6d1cdfbee5b22a1329f4ff82d9287875df2de1358e738de08c6a4d19353ccb40c31343dce7bd WHIRLPOOL 1c7306a54a5262632e0319a289f57610badea3945b61653039c78772399557f895ea57e02bbff6804704df8a08f4aa35fce7746e9e03807143d0e395bcd93c75 -DIST xia2-0.3.3.1.tar.bz2 3074989 SHA256 f1bf94cd9305f768fea1b541ac53d66917126e92620263a96f9c23923ec829c4 SHA512 656abd51dc6764dee16423e2ea75f590e7a04046c5ac60ce013615c91b3fd41c0089351ceb948203643bff442753773aa639b036efc089ce26592b52b187f656 WHIRLPOOL f11a6bba359ce9f3095d2993fb331a8c70a44bc1ef31dc08663ee63372db995047d5e1b4693808a347eedeb487a1b799c4e080c05416786209f62e7b619ddec8 -DIST xia2-0.3.3.3.tar.bz2 2919316 SHA256 3cf09fcf9d2c0ea6d6cb8cf66a3c5af752b4345af6a882e2d398424cf3b4b0d3 SHA512 913b5a6e24c3c070cc36b404b987331d8de99756d0f598ef485ba5fef3b4bc42d17bf4b4e648d5c99f014872d554b94880a7542dfb9ab6969e272ec986127561 WHIRLPOOL 5f19e3b06df7d5a83d75296fe9c9956f5c0b995cd5d10f1adb66e519d9dbcdd73edcbec53acb90aede6f2955bbd88991d6283af9a3578ad26a686e8530bfdffa -DIST xia2-0.3.4.0.tar.bz2 21404771 SHA256 20afe3d24c35446ef8c8944974d684229f053d3916e96e46766d8eefa4c5fabf SHA512 7d2444cb2acfcd2d7ca4c37d5714e7c249ffc419e9d7e1dbb33ccf18adc07f05a2b043af5aee721c64639b991dbbfd356181630229e91e0f871489870f9a8d51 WHIRLPOOL 14759e436d42e4b5ae558616d297f41eb9a345b19df4a4d02d2cb3c61937320d9161343b126b393049319ab6e37dc3890566b1bd3f2bff1a29cd108931640a90 diff --git a/sci-chemistry/xia2/files/0.3.1.0-fix-syntax.patch b/sci-chemistry/xia2/files/0.3.1.0-fix-syntax.patch deleted file mode 100644 index 9d92af7e33ce..000000000000 --- a/sci-chemistry/xia2/files/0.3.1.0-fix-syntax.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/xia2-0.3.1.0/Applications/xia2find.py b/xia2-0.3.1.0/Applications/xia2find.py -index 1a3b0e2..e0b8a1e 100755 ---- a/xia2-0.3.1.0/Applications/xia2find.py -+++ b/xia2-0.3.1.0/Applications/xia2find.py -@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory - from Experts.FindImages import image2template_directory - - known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450', -- 'osc', 'cbf', 'mar2000']] -+ 'osc', 'cbf', 'mar2000'] - known_sweeps = { } - - def is_image_name(file): -diff --git a/xia2-0.3.1.0/Experts/DRStrategyExpert.py b/xia2-0.3.1.0/Experts/DRStrategyExpert.py -index 28b1dc3..dba3ef7 100644 ---- a/xia2-0.3.1.0/Experts/DRStrategyExpert.py -+++ b/xia2-0.3.1.0/Experts/DRStrategyExpert.py -@@ -48,24 +48,24 @@ strategy_dict = { - 'default':{ - 'score':1, - 'pipeline':{ -- 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'} -+ 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}, - 'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat', - 'pointless-1.1.0.4']}, - 'default':{ - 'score':2, - 'pipeline':{ -- 'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'} -+ 'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'}, - 'depends-on':['labelit.screen', 'mosflm', 'scala', 'reindex', - 'pointless-1.1.0.4']}, - 'mosaic':{ - 'score':1, - 'pipeline':{ -- 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'} -+ 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}, - 'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat', - 'pointless-1.1.0.4']}, - 'mosaic':{ - 'score':2, - 'pipeline':{ -- 'indexer':'xds', 'integrater':'xds', 'scaler':'xds'} -+ 'indexer':'xds', 'integrater':'xds', 'scaler':'xds'}, - 'depends-on':['xds', 'xscale']} - } -diff --git a/xia2core-0.3.1.0/Python/Examples/CCP4/Cad.py b/xia2core-0.3.1.0/Python/Examples/CCP4/Cad.py -index 88f9218..5fb6f2a 100644 ---- a/xia2core-0.3.1.0/Python/Examples/CCP4/Cad.py -+++ b/xia2core-0.3.1.0/Python/Examples/CCP4/Cad.py -@@ -49,8 +49,8 @@ def Cad(DriverType = None): - self.add_command_line(hklin) - - self.set_task('Rewriting reflections %s => %s' % -- ` (os.path.split(hklin)[-1], -- ` os.path.split(self.getHklout())[-1])) -+ (os.path.split(hklin)[-1], -+ os.path.split(self.getHklout())[-1])) - - self.start() - diff --git a/sci-chemistry/xia2/files/0.3.1.6-fix-syntax.patch b/sci-chemistry/xia2/files/0.3.1.6-fix-syntax.patch deleted file mode 100644 index 7770a53c4451..000000000000 --- a/sci-chemistry/xia2/files/0.3.1.6-fix-syntax.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/xia2-0.3.1.6/Applications/xia2find.py b/xia2-0.3.1.6/Applications/xia2find.py -index 1a3b0e2..e0b8a1e 100755 ---- a/xia2-0.3.1.6/Applications/xia2find.py -+++ b/xia2-0.3.1.6/Applications/xia2find.py -@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory - from Experts.FindImages import image2template_directory - - known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450', -- 'osc', 'cbf', 'mar2000']] -+ 'osc', 'cbf', 'mar2000'] - known_sweeps = { } - - def is_image_name(file): -diff --git a/xia2-0.3.1.6/Experts/DRStrategyExpert.py b/xia2-0.3.1.6/Experts/DRStrategyExpert.py -index 28b1dc3..dba3ef7 100644 ---- a/xia2-0.3.1.6/Experts/DRStrategyExpert.py -+++ b/xia2-0.3.1.6/Experts/DRStrategyExpert.py -@@ -48,24 +48,24 @@ strategy_dict = { - 'default':{ - 'score':1, - 'pipeline':{ -- 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'} -+ 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}, - 'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat', - 'pointless-1.1.0.4']}, - 'default':{ - 'score':2, - 'pipeline':{ -- 'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'} -+ 'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'}, - 'depends-on':['labelit.screen', 'mosflm', 'scala', 'reindex', - 'pointless-1.1.0.4']}, - 'mosaic':{ - 'score':1, - 'pipeline':{ -- 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'} -+ 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}, - 'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat', - 'pointless-1.1.0.4']}, - 'mosaic':{ - 'score':2, - 'pipeline':{ -- 'indexer':'xds', 'integrater':'xds', 'scaler':'xds'} -+ 'indexer':'xds', 'integrater':'xds', 'scaler':'xds'}, - 'depends-on':['xds', 'xscale']} - } -diff --git a/xia2core-0.3.1.6/Python/Examples/CCP4/Cad.py b/xia2core-0.3.1.6/Python/Examples/CCP4/Cad.py -index 88f9218..5fb6f2a 100644 ---- a/xia2core-0.3.1.6/Python/Examples/CCP4/Cad.py -+++ b/xia2core-0.3.1.6/Python/Examples/CCP4/Cad.py -@@ -49,8 +49,8 @@ def Cad(DriverType = None): - self.add_command_line(hklin) - - self.set_task('Rewriting reflections %s => %s' % -- ` (os.path.split(hklin)[-1], -- ` os.path.split(self.getHklout())[-1])) -+ (os.path.split(hklin)[-1], -+ os.path.split(self.getHklout())[-1])) - - self.start() - diff --git a/sci-chemistry/xia2/files/0.3.1.7-fix-syntax.patch b/sci-chemistry/xia2/files/0.3.1.7-fix-syntax.patch deleted file mode 100644 index ec8ada48aad1..000000000000 --- a/sci-chemistry/xia2/files/0.3.1.7-fix-syntax.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/xia2-0.3.1.7/Applications/xia2find.py b/xia2-0.3.1.7/Applications/xia2find.py -index 1a3b0e2..e0b8a1e 100755 ---- a/xia2-0.3.1.7/Applications/xia2find.py -+++ b/xia2-0.3.1.7/Applications/xia2find.py -@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory - from Experts.FindImages import image2template_directory - - known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450', -- 'osc', 'cbf', 'mar2000']] -+ 'osc', 'cbf', 'mar2000'] - known_sweeps = { } - - def is_image_name(file): -diff --git a/xia2-0.3.1.7/Experts/DRStrategyExpert.py b/xia2-0.3.1.7/Experts/DRStrategyExpert.py -index 28b1dc3..dba3ef7 100644 ---- a/xia2-0.3.1.7/Experts/DRStrategyExpert.py -+++ b/xia2-0.3.1.7/Experts/DRStrategyExpert.py -@@ -48,24 +48,24 @@ strategy_dict = { - 'default':{ - 'score':1, - 'pipeline':{ -- 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'} -+ 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}, - 'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat', - 'pointless-1.1.0.4']}, - 'default':{ - 'score':2, - 'pipeline':{ -- 'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'} -+ 'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'}, - 'depends-on':['labelit.screen', 'mosflm', 'scala', 'reindex', - 'pointless-1.1.0.4']}, - 'mosaic':{ - 'score':1, - 'pipeline':{ -- 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'} -+ 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}, - 'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat', - 'pointless-1.1.0.4']}, - 'mosaic':{ - 'score':2, - 'pipeline':{ -- 'indexer':'xds', 'integrater':'xds', 'scaler':'xds'} -+ 'indexer':'xds', 'integrater':'xds', 'scaler':'xds'}, - 'depends-on':['xds', 'xscale']} - } -diff --git a/xia2core-0.3.1.7/Python/Examples/CCP4/Cad.py b/xia2core-0.3.1.7/Python/Examples/CCP4/Cad.py -index 88f9218..5fb6f2a 100644 ---- a/xia2core-0.3.1.7/Python/Examples/CCP4/Cad.py -+++ b/xia2core-0.3.1.7/Python/Examples/CCP4/Cad.py -@@ -49,8 +49,8 @@ def Cad(DriverType = None): - self.add_command_line(hklin) - - self.set_task('Rewriting reflections %s => %s' % -- ` (os.path.split(hklin)[-1], -- ` os.path.split(self.getHklout())[-1])) -+ (os.path.split(hklin)[-1], -+ os.path.split(self.getHklout())[-1])) - - self.start() - diff --git a/sci-chemistry/xia2/files/0.3.3.1-fix-syntax.patch b/sci-chemistry/xia2/files/0.3.3.1-fix-syntax.patch deleted file mode 100644 index 36cf6bb60d1d..000000000000 --- a/sci-chemistry/xia2/files/0.3.3.1-fix-syntax.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/xia2-0.3.3.0/Applications/xia2find.py b/xia2-0.3.3.0/Applications/xia2find.py -index 1a3b0e2..e0b8a1e 100755 ---- a/xia2-0.3.3.1/Applications/xia2find.py -+++ b/xia2-0.3.3.1/Applications/xia2find.py -@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory - from Experts.FindImages import image2template_directory - - known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450', -- 'osc', 'cbf', 'mar2000']] -+ 'osc', 'cbf', 'mar2000'] - known_sweeps = { } - - def is_image_name(file): -diff --git a/xia2-0.3.3.0/Experts/DRStrategyExpert.py b/xia2-0.3.3.0/Experts/DRStrategyExpert.py -index 28b1dc3..dba3ef7 100644 ---- a/xia2-0.3.3.1/Experts/DRStrategyExpert.py -+++ b/xia2-0.3.3.1/Experts/DRStrategyExpert.py -@@ -48,24 +48,24 @@ strategy_dict = { - 'default':{ - 'score':1, - 'pipeline':{ -- 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'} -+ 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}, - 'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat', - 'pointless-1.1.0.4']}, - 'default':{ - 'score':2, - 'pipeline':{ -- 'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'} -+ 'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'}, - 'depends-on':['labelit.screen', 'mosflm', 'scala', 'reindex', - 'pointless-1.1.0.4']}, - 'mosaic':{ - 'score':1, - 'pipeline':{ -- 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'} -+ 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}, - 'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat', - 'pointless-1.1.0.4']}, - 'mosaic':{ - 'score':2, - 'pipeline':{ -- 'indexer':'xds', 'integrater':'xds', 'scaler':'xds'} -+ 'indexer':'xds', 'integrater':'xds', 'scaler':'xds'}, - 'depends-on':['xds', 'xscale']} - } -diff --git a/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py b/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py -index 88f9218..5fb6f2a 100644 ---- a/xia2core-0.3.3.1/Python/Examples/CCP4/Cad.py -+++ b/xia2core-0.3.3.1/Python/Examples/CCP4/Cad.py -@@ -49,8 +49,8 @@ def Cad(DriverType = None): - self.add_command_line(hklin) - - self.set_task('Rewriting reflections %s => %s' % -- ` (os.path.split(hklin)[-1], -- ` os.path.split(self.getHklout())[-1])) -+ (os.path.split(hklin)[-1], -+ os.path.split(self.getHklout())[-1])) - - self.start() - diff --git a/sci-chemistry/xia2/files/0.3.3.3-fix-syntax.patch b/sci-chemistry/xia2/files/0.3.3.3-fix-syntax.patch deleted file mode 100644 index 53cacbb5c681..000000000000 --- a/sci-chemistry/xia2/files/0.3.3.3-fix-syntax.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/xia2-0.3.3.0/Applications/xia2find.py b/xia2-0.3.3.0/Applications/xia2find.py -index 1a3b0e2..e0b8a1e 100755 ---- a/xia2-0.3.3.3/Applications/xia2find.py -+++ b/xia2-0.3.3.3/Applications/xia2find.py -@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory - from Experts.FindImages import image2template_directory - - known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450', -- 'osc', 'cbf', 'mar2000']] -+ 'osc', 'cbf', 'mar2000'] - known_sweeps = { } - - def is_image_name(file): -diff --git a/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py b/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py -index 88f9218..5fb6f2a 100644 ---- a/xia2core-0.3.3.3/Python/Examples/CCP4/Cad.py -+++ b/xia2core-0.3.3.3/Python/Examples/CCP4/Cad.py -@@ -49,8 +49,8 @@ def Cad(DriverType = None): - self.add_command_line(hklin) - - self.set_task('Rewriting reflections %s => %s' % -- ` (os.path.split(hklin)[-1], -- ` os.path.split(self.getHklout())[-1])) -+ (os.path.split(hklin)[-1], -+ os.path.split(self.getHklout())[-1])) - - self.start() - diff --git a/sci-chemistry/xia2/files/0.3.4.0-fix-syntax.patch b/sci-chemistry/xia2/files/0.3.4.0-fix-syntax.patch deleted file mode 100644 index 9ba4c94495ea..000000000000 --- a/sci-chemistry/xia2/files/0.3.4.0-fix-syntax.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/xia2-0.3.3.0/Applications/xia2find.py b/xia2-0.3.3.0/Applications/xia2find.py -index 1a3b0e2..e0b8a1e 100755 ---- a/xia2-0.3.4.0/Applications/xia2find.py -+++ b/xia2-0.3.4.0/Applications/xia2find.py -@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory - from Experts.FindImages import image2template_directory - - known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450', -- 'osc', 'cbf', 'mar2000']] -+ 'osc', 'cbf', 'mar2000'] - known_sweeps = { } - - def is_image_name(file): -diff --git a/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py b/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py -index 88f9218..5fb6f2a 100644 ---- a/xia2core-0.3.4.0/Python/Examples/CCP4/Cad.py -+++ b/xia2core-0.3.4.0/Python/Examples/CCP4/Cad.py -@@ -49,8 +49,8 @@ def Cad(DriverType = None): - self.add_command_line(hklin) - - self.set_task('Rewriting reflections %s => %s' % -- ` (os.path.split(hklin)[-1], -- ` os.path.split(self.getHklout())[-1])) -+ (os.path.split(hklin)[-1], -+ os.path.split(self.getHklout())[-1])) - - self.start() - diff --git a/sci-chemistry/xia2/xia2-0.3.1.0.ebuild b/sci-chemistry/xia2/xia2-0.3.1.0.ebuild deleted file mode 100644 index 33b3d841acfa..000000000000 --- a/sci-chemistry/xia2/xia2-0.3.1.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" - -inherit eutils python - -DESCRIPTION="An automated data reduction system for crystallography" -HOMEPAGE="http://www.ccp4.ac.uk/xia/" -SRC_URI="http://www.ccp4.ac.uk/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=sci-chemistry/ccp4-apps-6.1.2 - sci-chemistry/mosflm - sci-chemistry/pointless - >=sci-libs/ccp4-libs-6.1.2 - sci-libs/cctbx" -DEPEND="${RDEPEND}" - -src_prepare() { - find . -name '*.bat' | xargs rm || die - - epatch "${FILESDIR}"/${PV}-fix-syntax.patch -} - -src_install() { - rm -rf ${P}/binaries ${PN}core-${PV}/Test || die - - insinto /usr/share/ccp4/XIAROOT/ - doins -r * || die - - # Set programs executable -# fperms cannot handle wildcards - chmod 755 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die - chmod 644 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die - - cat >> "${T}"/23XIA <<- EOF - XIA2_HOME="${EPREFIX}"/usr/share/ccp4/XIAROOT - XIA2CORE_ROOT="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2core-${PV} - XIA2_ROOT="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2-${PV} - PATH="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications - EOF - - doenvd "${T}"/23XIA -} - -pkg_postinst() { - python_mod_optimize /usr/share/ccp4/XIAROOT -} - -pkg_postrm() { - python_mod_cleanup /usr/share/ccp4/XIAROOT -} diff --git a/sci-chemistry/xia2/xia2-0.3.1.6.ebuild b/sci-chemistry/xia2/xia2-0.3.1.6.ebuild deleted file mode 100644 index 537735e1351f..000000000000 --- a/sci-chemistry/xia2/xia2-0.3.1.6.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" - -PYTHON_DEPEND="2" - -inherit eutils python - -DESCRIPTION="An automated data reduction system for crystallography" -HOMEPAGE="http://www.ccp4.ac.uk/xia/" -SRC_URI="http://www.ccp4.ac.uk/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - >=sci-chemistry/ccp4-apps-6.1.2 - sci-chemistry/mosflm - sci-chemistry/pointless - >=sci-libs/ccp4-libs-6.1.2 - sci-libs/cctbx" -DEPEND="${RDEPEND}" - -pkg_setup() { - python_set_active_version 2 -} - -src_prepare() { - find . -name '*.bat' -delete || die - - epatch "${FILESDIR}"/${PV}-fix-syntax.patch - python_convert_shebangs -r $(python_get_version) . -} - -src_install() { - rm -rf ${P}/binaries ${PN}core-${PV}/Test || die - - insinto /usr/share/ccp4/XIAROOT/ - doins -r * || die - - # Set programs executable -# fperms cannot handle wildcards - chmod 755 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die - chmod 644 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die - - cat >> "${T}"/23XIA <<- EOF - XIA2_HOME="${EPREFIX}"/usr/share/ccp4/XIAROOT - XIA2CORE_ROOT="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2core-${PV} - XIA2_ROOT="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2-${PV} - PATH="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications - EOF - - doenvd "${T}"/23XIA -} - -pkg_postinst() { - python_mod_optimize /usr/share/ccp4/XIAROOT -} - -pkg_postrm() { - python_mod_cleanup /usr/share/ccp4/XIAROOT -} diff --git a/sci-chemistry/xia2/xia2-0.3.1.7.ebuild b/sci-chemistry/xia2/xia2-0.3.1.7.ebuild deleted file mode 100644 index 16fbf797d1b4..000000000000 --- a/sci-chemistry/xia2/xia2-0.3.1.7.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" - -PYTHON_DEPEND="2" - -inherit eutils python - -DESCRIPTION="An automated data reduction system for crystallography" -HOMEPAGE="http://www.ccp4.ac.uk/xia/" -SRC_URI="http://www.ccp4.ac.uk/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - >=sci-chemistry/ccp4-apps-6.1.2 - sci-chemistry/mosflm - sci-chemistry/pointless - >=sci-libs/ccp4-libs-6.1.2 - sci-libs/cctbx" -DEPEND="${RDEPEND}" - -pkg_setup() { - python_set_active_version 2 -} - -src_prepare() { - find . -name '*.bat' -delete || die - - epatch "${FILESDIR}"/${PV}-fix-syntax.patch - python_convert_shebangs -r $(python_get_version) . -} - -src_install() { - rm -rf ${P}/binaries ${PN}core-${PV}/Test || die - - insinto /usr/share/ccp4/XIAROOT/ - doins -r * || die - - # Set programs executable -# fperms cannot handle wildcards - chmod 755 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die - chmod 644 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die - - cat >> "${T}"/23XIA <<- EOF - XIA2_HOME="${EPREFIX}"/usr/share/ccp4/XIAROOT - XIA2CORE_ROOT="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2core-${PV} - XIA2_ROOT="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2-${PV} - PATH="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications - EOF - - doenvd "${T}"/23XIA -} - -pkg_postinst() { - python_mod_optimize /usr/share/ccp4/XIAROOT -} - -pkg_postrm() { - python_mod_cleanup /usr/share/ccp4/XIAROOT -} diff --git a/sci-chemistry/xia2/xia2-0.3.3.1.ebuild b/sci-chemistry/xia2/xia2-0.3.3.1.ebuild deleted file mode 100644 index 26fb7d0d4c83..000000000000 --- a/sci-chemistry/xia2/xia2-0.3.3.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -PYTHON_DEPEND="2" - -inherit eutils python - -DESCRIPTION="An automated data reduction system for crystallography" -HOMEPAGE="http://www.ccp4.ac.uk/xia/" -SRC_URI="http://www.ccp4.ac.uk/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - >=sci-chemistry/ccp4-apps-6.1.2 - sci-chemistry/mosflm - sci-chemistry/pointless - >=sci-libs/ccp4-libs-6.1.2 - sci-libs/cctbx" -DEPEND="${RDEPEND}" - -pkg_setup() { - python_set_active_version 2 -} - -src_prepare() { - find . -name '*.bat' -delete || die - - epatch "${FILESDIR}"/${PV}-fix-syntax.patch - python_convert_shebangs -r $(python_get_version) . -} - -src_install() { - rm -rf ${P}/binaries ${PN}core-${PV}/Test || die - - insinto /usr/share/ccp4/XIAROOT/ - doins -r * || die - - # Set programs executable -# fperms cannot handle wildcards - chmod 755 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die - chmod 644 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die - - cat >> "${T}"/23XIA <<- EOF - XIA2_HOME="${EPREFIX}/usr/share/ccp4/XIAROOT" - XIA2CORE_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2core-${PV}" - XIA2_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}" - PATH="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications" - EOF - - doenvd "${T}"/23XIA -} - -pkg_postinst() { - python_mod_optimize /usr/share/ccp4/XIAROOT - echo "" - elog "In order to use the package, you need to" - elog "\t source ${EPREFIX}/etc/profile" - echo "" -} - -pkg_postrm() { - python_mod_cleanup /usr/share/ccp4/XIAROOT -} diff --git a/sci-chemistry/xia2/xia2-0.3.3.3.ebuild b/sci-chemistry/xia2/xia2-0.3.3.3.ebuild deleted file mode 100644 index 60778aa75fb9..000000000000 --- a/sci-chemistry/xia2/xia2-0.3.3.3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -PYTHON_DEPEND="2" - -inherit eutils python - -DESCRIPTION="An automated data reduction system for crystallography" -HOMEPAGE="http://www.ccp4.ac.uk/xia/" -SRC_URI="http://www.ccp4.ac.uk/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - >=sci-chemistry/ccp4-apps-6.1.2 - sci-chemistry/mosflm - sci-chemistry/pointless - >=sci-libs/ccp4-libs-6.1.2 - sci-libs/cctbx" -DEPEND="${RDEPEND}" - -pkg_setup() { - python_set_active_version 2 -} - -src_prepare() { - find . -name '*.bat' -delete || die - - epatch "${FILESDIR}"/${PV}-fix-syntax.patch - python_convert_shebangs -r $(python_get_version) . -} - -src_install() { - rm -rf ${P}/binaries ${PN}core-${PV}/Test || die - - insinto /usr/share/ccp4/XIAROOT/ - doins -r * || die - - # Set programs executable -# fperms cannot handle wildcards - chmod 755 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die - chmod 644 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die - - cat >> "${T}"/23XIA <<- EOF - XIA2_HOME="${EPREFIX}/usr/share/ccp4/XIAROOT" - XIA2CORE_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2core-${PV}" - XIA2_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}" - PATH="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications" - EOF - - doenvd "${T}"/23XIA -} - -pkg_postinst() { - python_mod_optimize /usr/share/ccp4/XIAROOT - echo "" - elog "In order to use the package, you need to" - elog "\t source ${EPREFIX}/etc/profile" - echo "" -} - -pkg_postrm() { - python_mod_cleanup /usr/share/ccp4/XIAROOT -} diff --git a/sci-chemistry/xia2/xia2-0.3.4.0.ebuild b/sci-chemistry/xia2/xia2-0.3.4.0.ebuild deleted file mode 100644 index 1d27abd355dc..000000000000 --- a/sci-chemistry/xia2/xia2-0.3.4.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -PYTHON_DEPEND="2" - -inherit eutils python - -DESCRIPTION="An automated data reduction system for crystallography" -HOMEPAGE="http://www.ccp4.ac.uk/xia/" -SRC_URI="http://www.ccp4.ac.uk/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - >=sci-chemistry/ccp4-apps-6.1.2 - sci-chemistry/mosflm - sci-chemistry/pointless - >=sci-libs/ccp4-libs-6.1.2 - sci-libs/cctbx" -DEPEND="${RDEPEND}" - -pkg_setup() { - python_set_active_version 2 -} - -src_prepare() { - find . -name '*.bat' -delete || die - - epatch "${FILESDIR}"/${PV}-fix-syntax.patch - python_convert_shebangs -r $(python_get_version) . -} - -src_install() { - rm -rf ${P}/binaries ${PN}core-${PV}/Test || die - - insinto /usr/share/ccp4/XIAROOT/ - doins -r * || die - - # Set programs executable -# fperms cannot handle wildcards - chmod 755 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die - chmod 644 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die - - cat >> "${T}"/23XIA <<- EOF - XIA2_HOME="${EPREFIX}/usr/share/ccp4/XIAROOT" - XIA2CORE_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2core-${PV}" - XIA2_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}" - PATH="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications" - EOF - - doenvd "${T}"/23XIA -} - -pkg_postinst() { - python_mod_optimize /usr/share/ccp4/XIAROOT - echo "" - elog "In order to use the package, you need to" - elog "\t source ${EPREFIX}/etc/profile" - echo "" -} - -pkg_postrm() { - python_mod_cleanup /usr/share/ccp4/XIAROOT -} diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest index be018d6fb1da..25e6a47e4af4 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -1 +1,2 @@ DIST gazebo-6.1.0.tar.bz2 50795925 SHA256 0460f1c706f609b6ff0e61a71bdd3cac2d55d714147edc01609b5226e7fb2904 SHA512 ae41b53b0f33e81fe5b3baaaca8649e98c5b99c4701650414b0686f9a327d89e00c674e806cb9537aabfd933c9819d668e45b18e964d383d99325c5ddcdcf7ef WHIRLPOOL bfab23edc9c68ca02aefa4a20206bfdf2973cc5ee7750f4c017543979dca10434d9e38dad8836510b292dc67b97aa0514229c8b5fd9f73897075525e45a5bd74 +DIST gazebo-6.5.1.tar.bz2 50828358 SHA256 96260aa23f1a1f24bc116f8e359d31f3bc65011033977cb7fb2c64d574321908 SHA512 3d72da5c6b577e4a44b9cef32df64cb2329f04b498f7a21d3e733b52a93db35dd2f2f67c5d114624de15d5f054fd7c92ab11617f27beb1a39d8505deab70e5d6 WHIRLPOOL cc6c913919bf8aa0df363bb53fb265a22e69052536044b55b2ffbac9d7a419dae5c796415abd1d0dc7a92363f8005e171b6e303eafbe756241c27b1531b0879b diff --git a/sci-electronics/gazebo/gazebo-6.5.1.ebuild b/sci-electronics/gazebo/gazebo-6.5.1.ebuild new file mode 100644 index 000000000000..aa5a3fae0ddf --- /dev/null +++ b/sci-electronics/gazebo/gazebo-6.5.1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils versionator vcs-snapshot flag-o-matic + +DESCRIPTION="A 3D multiple robot simulator with dynamics" +HOMEPAGE="http://gazebosim.org/" +SRC_URI="http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cpu_flags_x86_sse2 libav test" + +RDEPEND=" + >=dev-libs/protobuf-2.3.0 + virtual/opengl + media-libs/openal + net-misc/curl + dev-libs/tinyxml + dev-libs/libtar + dev-cpp/tbb + >=dev-games/ogre-1.7.4 + sci-libs/libccd + libav? ( >=media-video/libav-9:0= ) + !libav? ( >=media-video/ffmpeg-2.6:0= ) + sci-libs/gts + >=sci-physics/bullet-2.82 + >=dev-libs/sdformat-3.1.1 + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-libs/boost:=[threads] + sci-libs/gdal + virtual/libusb:1 + dev-libs/libspnav + media-libs/freeimage + sci-libs/hdf5:= + sys-apps/util-linux + media-gfx/graphviz + sci-libs/ignition-math:2= +" +DEPEND="${RDEPEND} + dev-qt/qttest:4 + app-text/ronn + virtual/pkgconfig + test? ( dev-libs/libxslt ) +" +CMAKE_BUILD_TYPE=RelWithDebInfo +PATCHES=( + "${FILESDIR}/ffmpeg29.patch" +) + +src_configure() { + # doesnt build without it + append-cxxflags "-std=c++11" + # doesnt build with as-needed either + append-ldflags "-Wl,--no-as-needed" + + local mycmakeargs=( + "-DUSE_UPSTREAM_CFLAGS=OFF" + "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" + "-DUSE_HOST_CFLAGS=FALSE" + "-DENABLE_TESTS_COMPILATION=$(usex test TRUE FALSE)" + "-DENABLE_SCREEN_TESTS=FALSE" + ) + cmake-utils_src_configure +} diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 8d9fa05c8088..37addfdbdc6e 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -1,2 +1,3 @@ -DIST kicad-2013-05-18-BZR4017-stable-UBUNTU_12.04_full_with_components_doc.tgz 280828915 SHA256 48c91acb9d4f45c7eebbcf4d602841896f11f22bb00721c62d351dd7241efd0b SHA512 8c4b81077c7e23bae6ad6a167fca7e34c006fc6a2a28457ddc276bef94ab43f6bf29f460a9ed5d9e564ef144a106ee82362b3cead3ca64b1361466d8d390619d WHIRLPOOL ed51fdc7ee287d65f4002250e79652d791d2aebe2fc872e1b853cfeccd287bf548346824ffc9afb599ff21721e972db7a5b3c134c662e883cd7d1e5c5b6c5abe -DIST kicad-sources-stable_2013-05-18_BZR4017.zip 15025159 SHA256 cb9ca0d19e5ea8ca45c731eeddbd8a242eb696e619ee98af91f2c7a0095b393d SHA512 747e4719a426646cf38b9951d28aea32085d672371426b44d9f9a575b55e051925ae3fd6c98aea6fa2c21c2c6a6a2f6cc2da461c882b854d033f5d1ce58384ba WHIRLPOOL 69dbeed6da6d1400207c048a49008d6b0876df184d64c520b82e7e82e3826a04ada5563551f1498244ee4d67ec7731f81285a604e671ee73f6518f211ecb8ef0 +DIST kicad-4.0.0-rc1.tar.xz 10951000 SHA256 62c2e95a2d6b8a3cf30bb91146c3d2b1c0df0cbfc070b6e54bcfdf0da2df6973 SHA512 f158906b85e3c4032086c4a75563d47f75f183bc354e1f2fa55e157083005b51829c141e14171dea9092b9b24b6b5ff1c71e3ae485dd1d2d44fe7e63179c1ffa WHIRLPOOL 755fde28cf45196bb60ffb6af7bc0acb92148310ad74807ef71404c418557bc2c6243f41e9040c0217dc970061df09a4092e2a5e52e016888660e4998153c95a +DIST kicad-4.0.0_rc1-i18n.tar.gz 1959024 SHA256 5fbd037e4a76a83ed6be7554ab1add98f7d93dce0db5fea6a0bcd58ef61486bd SHA512 85c2db5d193cd4d1521eb9f454a13892680cb5340c3b86b264bceb36ce0c996f818b64c3edd9dae3ff51046c97ba33702649a1083a36f27a80d316f64465f630 WHIRLPOOL 8141fb59822fdda2bf46a9b8af7fe75d6557a1c3f384e5e2b03e58c5e4c9eca4f167a262f2ed9fd3479c64a8730ff1ba3f46f6cb72c680df9c6d6173ca611ada +DIST kicad-4.0.0_rc1-library.tar.gz 87967616 SHA256 09a9e184e19b6072efdc00fabb65e3c0d498858c17f5fa5ce8d255b21eab3db4 SHA512 f611015a8760d3c9cf26fd99a043d69fa75d398fb287af7e6fe7cfbd70d3ff1aa67abcedeffa00fef60434e3944ac6b59fa4ac9ea50097d910fbabcb6f288165 WHIRLPOOL 83585bbc772da122139dfa643c4045bfef207ea8dbc4a83a5458be6227ff976fe9c48cea2388f9ec0b20e7c697579701b75231b852161b33a9c51ddef480c6f4 diff --git a/sci-electronics/kicad/files/kicad-desktop-file.patch b/sci-electronics/kicad/files/kicad-desktop-file.patch deleted file mode 100644 index 7f982f7fa77f..000000000000 --- a/sci-electronics/kicad/files/kicad-desktop-file.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cacd01f36db6277111a35fe60ad4762ee3b002e1 Mon Sep 17 00:00:00 2001 -From: Denis Dupeyron <calchan@gentoo.org> -Date: Thu, 18 Apr 2013 15:17:36 -0600 -Subject: [PATCH] Fix desktop category and semicolon - ---- - resources/linux/mime/applications/eeschema.desktop | 2 +- - resources/linux/mime/applications/kicad.desktop | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/resources/linux/mime/applications/eeschema.desktop b/resources/linux/mime/applications/eeschema.desktop -index 3042eae..0ed616c 100644 ---- a/resources/linux/mime/applications/eeschema.desktop -+++ b/resources/linux/mime/applications/eeschema.desktop -@@ -1,5 +1,5 @@ - [Desktop Entry] --Categories=Development;Electronics -+Categories=Electronics; - Comment=Design an electronic schematic - Comment[fr]=Dessiner des schémas électroniques - Exec=eeschema -diff --git a/resources/linux/mime/applications/kicad.desktop b/resources/linux/mime/applications/kicad.desktop -index 1d7645b..3a23e34 100644 ---- a/resources/linux/mime/applications/kicad.desktop -+++ b/resources/linux/mime/applications/kicad.desktop -@@ -1,5 +1,5 @@ - [Desktop Entry] --Categories=Development;Electronics -+Categories=Electronics; - Comment=Design a printed circuit board - Comment[fr]=Concevoir un circuit imprimé - Exec=kicad --- -1.8.2.1 - diff --git a/sci-electronics/kicad/files/kicad-missing-doc.patch b/sci-electronics/kicad/files/kicad-missing-doc.patch deleted file mode 100644 index 3b9f9666e861..000000000000 --- a/sci-electronics/kicad/files/kicad-missing-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 096b02e38c5e86902d5403fcb14313be8dd70fb3 Mon Sep 17 00:00:00 2001 -From: Denis Dupeyron <calchan@gentoo.org> -Date: Thu, 18 Apr 2013 08:11:28 -0600 -Subject: [PATCH] Add missing documentation - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9e6e29a..1069a5f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -415,7 +415,7 @@ add_custom_target(uninstall - #================================================ - # Installation parameters - #================================================ --install(FILES INSTALL.txt -+install(FILES AUTHORS.txt CHANGELOG.txt README.txt - DESTINATION ${KICAD_DOCS} - COMPONENT resources) - --- -1.8.2.1 - diff --git a/sci-electronics/kicad/files/kicad-native-boost.patch b/sci-electronics/kicad/files/kicad-native-boost.patch deleted file mode 100644 index 595d5f32216b..000000000000 --- a/sci-electronics/kicad/files/kicad-native-boost.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 50a62d296e803b75ae46c964173e8b2be0661618 Mon Sep 17 00:00:00 2001 -From: Denis Dupeyron <calchan@gentoo.org> -Date: Thu, 18 Apr 2013 08:01:43 -0600 -Subject: [PATCH] Use native Boost - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e3c6ae2..9e6e29a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -260,8 +260,8 @@ check_find_package_result(OPENGL_FOUND "OpenGL") - # kicad now includes needed boost files. - # the two next lines can be uncommented to use the native boost lib. - # but this is not a good idea --#find_package(Boost 1.36 QUIET) --#check_find_package_result(Boost_FOUND "Boost") -+find_package(Boost 1.36 QUIET) -+check_find_package_result(Boost_FOUND "Boost") - - ########################## - # Find wxWidgets library # --- -1.8.2.1 - diff --git a/sci-electronics/kicad/files/kicad-scripts.patch b/sci-electronics/kicad/files/kicad-scripts.patch deleted file mode 100644 index 9f46157915c7..000000000000 --- a/sci-electronics/kicad/files/kicad-scripts.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 065491b83fb7f82606150aa89e70ac99738992e0 Mon Sep 17 00:00:00 2001 -From: Denis Dupeyron <calchan@gentoo.org> -Date: Wed, 5 Jun 2013 14:03:07 -0600 -Subject: [PATCH] Fix install location of scripts directory - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 59fe7c3..3f3bb14 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -428,7 +428,7 @@ install(FILES resources/freeroute.jnlp - ### - if(UNIX) - install(DIRECTORY scripts -- DESTINATION ${KICAD_DOCS} -+ DESTINATION ${KICAD_DATA} - COMPONENT resources - PATTERN ".svn" EXCLUDE) - endif() --- -1.8.2.1 - diff --git a/sci-electronics/kicad/kicad-20130518.ebuild b/sci-electronics/kicad/kicad-20130518.ebuild deleted file mode 100644 index 4b7a080b6a92..000000000000 --- a/sci-electronics/kicad/kicad-20130518.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -#TODO: -# - python and wxpython scripting - -EAPI="5" - -WX_GTK_VER="2.8" - -inherit eutils unpacker cmake-utils wxwidgets fdo-mime gnome2-utils - -DESCRIPTION="Electronic Schematic and PCB design tools" -HOMEPAGE="http://www.kicad-pcb.org" - -RELEASE_DATE="2013-05-18" -BZR_REV="4017" -UBUNTU_VER="12.04" -BASE_SRC_URI="http://iut-tice.ujf-grenoble.fr/cao" -SRC_URI="${BASE_SRC_URI}/${PN}-sources-stable_${RELEASE_DATE}_BZR${BZR_REV}.zip - ${BASE_SRC_URI}/${PN}-${RELEASE_DATE}-BZR${BZR_REV}-stable-UBUNTU_${UBUNTU_VER}_full_with_components_doc.tgz" - -LICENSE="GPL-2 kicad-doc" -SLOT="0" - -KEYWORDS="~amd64 ~x86" - -IUSE="debug" -LANGS="de en es fr hu it ja pl pt ru zh_CN" -for lang in ${LANGS} ; do - IUSE="${IUSE} linguas_${lang}" -done - -CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[gnome,opengl,X] - dev-python/wxpython:${WX_GTK_VER}[opengl]" -DEPEND="${CDEPEND} - >=dev-util/cmake-2.6.4 - >=dev-libs/boost-1.49[python] - app-doc/doxygen" -RDEPEND="${CDEPEND} - sys-libs/zlib - sci-electronics/electronics-menu" - -S="${WORKDIR}/stable_${RELEASE_DATE}_BZR${BZR_REV}" - -src_prepare() { - epatch "${FILESDIR}/${PN}-native-boost.patch" - epatch "${FILESDIR}/${PN}-desktop-file.patch" - epatch "${FILESDIR}/${PN}-scripts.patch" - epatch "${FILESDIR}/${PN}-missing-doc.patch" - rm -f resources/linux/mime/applications/eeschema.desktop -} - -src_configure() { - need-wxwidgets unicode - - mycmakeargs="${mycmakeargs} - -DKICAD_STABLE_VERSION=ON - -DKICAD_wxUSE_UNICODE=ON - -DKICAD_DOCS=/usr/share/doc/${PN} - -DKICAD_HELP=/usr/share/doc/${PN}" - -# -DKICAD_SCRIPTING=ON -# -DKICAD_SCRIPTING_MODULES=ON -# -DKICAD_SCRIPTING_WXPYTHON=ON - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile all doxygen-docs -} - -src_install() { - cmake-utils_src_install - - insinto /usr/share/${PN} - doins -r "${WORKDIR}/${PN}/share/library" - doins -r "${WORKDIR}/${PN}/share/modules" - - insinto /usr/share/doc/${PN} - doins -r "${WORKDIR}/${PN}/doc/contrib" - - insinto /usr/share/doc/${PN}/help - for lang in $LANGS ; do - if [[ -d "${WORKDIR}/${PN}/doc/help/${lang}" ]] ; then - use linguas_$lang && doins -r "${WORKDIR}/${PN}/doc/help/${lang}" - fi - done - - insinto /usr/share/doc/${PN}/tutorials - for lang in $LANGS ; do - if [[ -d "${WORKDIR}/${PN}/doc/tutorials/${lang}" ]] ; then - use linguas_$lang && doins -r "${WORKDIR}/${PN}/doc/tutorials/${lang}" - fi - done - - local dev_doc="/usr/share/doc/${PN}/development" - insinto ${dev_doc} - doins HOW_TO_CONTRIBUTE.txt notes_about_pcbnew_new_file_format.odt TODO.txt uncrustify.cfg - doins "${WORKDIR}/${PN}/doc/help/file_formats/file_formats.pdf" - cd Documentation - doins -r * - - docompress -x \ - ${dev_doc}/GUI_Translation_HOWTO.odt \ - ${dev_doc}/notes_about_pcbnew_new_file_format.odt \ - ${dev_doc}/uncrustify.cfg - ${dev_doc}/file_formats.pdf -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update - - elog "You may want to emerge media-gfx/wings if you want to create 3D models of components." -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} diff --git a/sci-electronics/kicad/kicad-4.0.0_rc1.ebuild b/sci-electronics/kicad/kicad-4.0.0_rc1.ebuild new file mode 100644 index 000000000000..38b4b2299741 --- /dev/null +++ b/sci-electronics/kicad/kicad-4.0.0_rc1.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +PYTHON_COMPAT=( python2_7 ) + +WX_GTK_VER="3.0" + +inherit cmake-utils fdo-mime flag-o-matic gnome2-utils python-single-r1 vcs-snapshot wxwidgets versionator + +DESCRIPTION="Electronic Schematic and PCB design tools." +HOMEPAGE="http://www.kicad-pcb.org" + +SERIES=$(get_version_component_range 1-2) +MY_PV=$(replace_version_separator 3 '-') + +LIB_REVISION="bd0ec6a20c7cc0556093f60eac723e4505947784" +DOC_REVISION="0d0ed7b9de3afbba5d51fb6d7a25834000ed1099" +I18N_REVISION="bf793d30d64f4e75ea7a109ea434c1a27926b158" + +SRC_URI="https://launchpad.net/${PN}/${SERIES}/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz + !minimal? ( https://github.com/KiCad/${PN}-library/tarball/${LIB_REVISION} -> ${P}-library.tar.gz ) + i18n? ( https://github.com/KiCad/${PN}-i18n/tarball/${I18N_REVISION} -> ${P}-i18n.tar.gz )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc examples github i18n minimal python webkit" +LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh_CN" +for lang in ${LANGS} ; do + IUSE="${IUSE} linguas_${lang}" +done +unset lang + +REQUIRED_USE=" + github? ( webkit ) + python? ( ${PYTHON_REQUIRED_USE} )" + +CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?] + python? ( + dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) + >=dev-libs/boost-1.56[context,nls,threads,python?] + github? ( dev-libs/openssl:0 ) + media-libs/glew + media-libs/freeglut + media-libs/mesa + sys-libs/zlib + x11-libs/cairo" +DEPEND="${CDEPEND} + app-arch/xz-utils + doc? ( app-doc/doxygen ) + i18n? ( >=sys-devel/gettext-0.18 ) + python? ( dev-lang/swig:0 ) + app-text/dos2unix" +RDEPEND="${CDEPEND} + sci-electronics/electronics-menu" + +S="${WORKDIR}/${PN}-${MY_PV}" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + # remove all the non unix file endings + find "${S}" -type f -name "*.desktop" | xargs -n1 dos2unix || die "dos2unix failed" + + # Handle optional minimal install. + if use minimal; then + # remove tempaltes as they are not needed to run binaries + sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die "sed failed" + else + # create a link to the parts library in the main project folder + ln -s "${WORKDIR}/${P}-library" "${S}/${PN}-library" || die "ln failed" + # add the libraries directory to cmake as a subproject to build + sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-library )" -i CMakeLists.txt || die "sed failed" + # remove duplicate uninstall directions for the library module + sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die "sed failed" + fi + + # Add internationalization for the GUI + if use i18n; then + # create a link to the translations library in the main project folder + ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die "ln failed" + # Remove unused languages. Project generates only languages specified in the + # file in LINGUAS in the subproject folder. By default all languages are added + # so we sed out the unused ones based on the user linguas_* settings. + local lang + for lang in ${LANGS}; do + if ! use linguas_${lang}; then + sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die "sed failed" + fi + done + # cmakelists does not respect our build dir variables, so make it point to the right location + sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i ${PN}-i18n/CMakeLists.txt || die "sed failed" + # we also make from the master project so the source dir is understood incorretly, replace that too + sed "s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i ${PN}-i18n/CMakeLists.txt || die "sed failed" + # add the translations directory to cmake as a subproject to build + sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-i18n )" -i CMakeLists.txt || die "sed failed" + # remove duplicate uninstall directions for the translation module + sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die "sed failed" + fi + + # Install examples in the right place if requested + if use examples; then + # install demos into the examples folder too + sed -e 's:${KICAD_DATA}/demos:${KICAD_DOCS}/examples:' -i CMakeLists.txt || die "sed failed" + else + # remove additional demos/examples as its not strictly required to run the binaries + sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die "sed failed" + fi + + # Add important missing doc files + sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die "sed failed" +} + +src_configure() { + need-wxwidgets unicode + + local mycmakeargs=( + -DPYTHON_DEST="$(python_get_sitedir)" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DKICAD_DOCS="/usr/share/doc/${PF}" + -DKICAD_HELP="/usr/share/doc/${PF}/help" + -DwxUSE_UNICODE=ON + -DKICAD_SKIP_BOOST=ON + $(cmake-utils_use github BUILD_GITHUB_PLUGIN) + $(cmake-utils_use python KICAD_SCRIPTING) + $(cmake-utils_use python KICAD_SCRIPTING_MODULES) + $(cmake-utils_use python KICAD_SCRIPTING_WXPYTHON) + $(cmake-utils_use webkit KICAD_USE_WEBKIT) + $(usex i18n "-DKICAD_I18N_UNIX_STRICT_PATH=1" "") + ) + if use debug; then + append-cxxflags "-DDEBUG" + append-cflags "-DDEBUG" + fi + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + if use doc; then + doxygen Doxyfile || die "doxygen failed" + fi +} + +src_install() { + cmake-utils_src_install + use python && python_optimize + if use doc ; then + dodoc uncrustify.cfg + cd Documentation || die "cd failed" + dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/. + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + gnome2_icon_cache_update + + if use minimal ; then + ewarn "If the schematic and/or board editors complain about missing libraries when you" + ewarn "open old projects, you will have to take one or more of the following actions :" + ewarn "- Install the missing libraries manually." + ewarn "- Remove the libraries from the 'Libs and Dir' preferences." + ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences." + ewarn "- Emerge ${PN} without the 'minimal' USE flag." + fi + elog "" + elog "You may want to emerge media-gfx/wings if you want to create 3D models of components." +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + gnome2_icon_cache_update +} diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml index 62924d2393a6..43e97e38a917 100644 --- a/sci-electronics/kicad/metadata.xml +++ b/sci-electronics/kicad/metadata.xml @@ -1,9 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <herd>proxy-maintainers</herd> <maintainer> - <email>maintainer-needed@gentoo.org</email> + <email>zoltan@sinustrom.info</email> + <name>Zoltan Puskas</name> + <description>Proxied maintainer. Assign bugs to him.</description> </maintainer> + <use> + <flag name="github">Add github support into PCB editor</flag> + <flag name="i18n">Allow GUI internationalization through linguas_* use flags</flag> + <flag name="minimal">Build only binaries without parts library and examples</flag> + <flag name="python">Enable python scripting support</flag> + </use> <longdescription> Kicad is an open source (GPL) software for the creation of electronic schematic diagrams and printed circuit board artwork. diff --git a/sci-geosciences/bt747/bt747-2.0.3.ebuild b/sci-geosciences/bt747/bt747-2.0.3.ebuild index d025a512858a..c9f289f67b11 100644 --- a/sci-geosciences/bt747/bt747-2.0.3.ebuild +++ b/sci-geosciences/bt747/bt747-2.0.3.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/BT747_${PV}_full.zip" LICENSE="GPL-3" SLOT="1" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" COMMON_DEP=" diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild index b36f1f9b46f9..c8b1e329dcb6 100644 --- a/sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild +++ b/sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild @@ -15,10 +15,9 @@ LICENSE="MIT" KEYWORDS="~amd64 ~x86" IUSE="postgres" - RDEPEND=" >=sci-libs/gdal-2.0.0 - >=sci-geosciences/grass-7.0.1[gdal] + >=sci-geosciences/grass-7.0.1-r3 " DEPEND="${RDEPEND} dev-libs/expat @@ -37,9 +36,9 @@ src_prepare() { src_configure() { econf \ - --with-grass="${ROOT}/usr/$(get_libdir)/grass70" \ - --with-gdal="${ROOT}/usr/bin/gdal-config" \ - $(use_with postgres postgres-includes "${ROOT}/usr/include/postgresql") + --with-grass="/usr/$(get_libdir)/grass70" \ + --with-gdal="/usr/bin/gdal-config" \ + $(use_with postgres postgres-includes "/usr/include/postgresql") } src_install() { @@ -48,4 +47,4 @@ src_install() { GRASSTABLES_DIR="${D}$(gdal-config --prefix)/share/gdal/grass" \ AUTOLOAD_DIR="${D}/usr/$(get_libdir)/gdalplugins" \ install -}
\ No newline at end of file +} diff --git a/sci-geosciences/gdal-grass/metadata.xml b/sci-geosciences/gdal-grass/metadata.xml index 152a2cd2fe5d..cbf80664b811 100644 --- a/sci-geosciences/gdal-grass/metadata.xml +++ b/sci-geosciences/gdal-grass/metadata.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>sci-geosciences</herd> -<herd>proxy-maintainers</herd><maintainer> - <email>wraeth@wraeth.id.au</email> - <name>Sam Jorna</name> - <description>Proxy maintainer - assign bugs to him</description> - </maintainer> - <use> - <flag name="postgres">Include support for <pkg>dev-db/postgresql</pkg></flag> - </use> + <herd>sci-geosciences</herd> + <herd>proxy-maintainers</herd> + <maintainer> + <email>wraeth@wraeth.id.au</email> + <name>Sam Jorna</name> + <description>Proxy maintainer - assign bugs to him</description> + </maintainer> + <use> + <flag name="postgres">Include support for <pkg>dev-db/postgresql</pkg></flag> + </use> </pkgmetadata> - diff --git a/sci-geosciences/gmapcatcher/metadata.xml b/sci-geosciences/gmapcatcher/metadata.xml index 1168f85ccde5..6ae14181fa74 100644 --- a/sci-geosciences/gmapcatcher/metadata.xml +++ b/sci-geosciences/gmapcatcher/metadata.xml @@ -7,10 +7,5 @@ <name>Denis M.</name> <description>Maintainer, assign bugs to him</description> </maintainer> - <maintainer> - <email>mrueg@gentoo.org</email> - <name>Manuel Rüger</name> - <description>Proxy-Maintainer, CC him on bugs</description> - </maintainer> </pkgmetadata> diff --git a/sci-geosciences/grass/grass-7.0.1-r1.ebuild b/sci-geosciences/grass/grass-7.0.1-r1.ebuild deleted file mode 100644 index 797d5cd947aa..000000000000 --- a/sci-geosciences/grass/grass-7.0.1-r1.ebuild +++ /dev/null @@ -1,263 +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="sqlite(-)?" -WANT_AUTOCONF="2.1" - -inherit eutils gnome2 multilib python-single-r1 versionator wxwidgets autotools - -MY_PM=${PN}$(get_version_component_range 1-2 ${PV}) -MY_PM=${MY_PM/.} -MY_P=${P/_rc/RC} - -DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" -HOMEPAGE="http://grass.osgeo.org/" -SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="7" -KEYWORDS="~amd64 ~x86" -IUSE="X blas cxx fftw gdal geos lapack mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype" - -RDEPEND="${PYTHON_DEPS} - >=app-admin/eselect-1.2 - media-libs/libprojectm - sci-libs/proj - sci-libs/xdrfile - sys-libs/gdbm - sys-libs/ncurses:0= - sys-libs/zlib - fftw? ( sci-libs/fftw:3.0 ) - gdal? ( sci-libs/gdal ) - geos? ( sci-libs/geos ) - blas? ( virtual/blas - sci-libs/cblas-reference ) - lapack? ( virtual/lapack ) - mysql? ( virtual/mysql ) - netcdf? ( sci-libs/netcdf ) - odbc? ( dev-db/unixODBC ) - opencl? ( virtual/opencl ) - opengl? ( virtual/opengl ) - png? ( media-libs/libpng:0= ) - postgres? ( >=dev-db/postgresql-8.4:= ) - readline? ( sys-libs/readline:0= ) - sqlite? ( dev-db/sqlite:3 ) - tiff? ( media-libs/tiff:0= ) - truetype? ( media-libs/freetype:2 ) - X? ( - >=dev-python/wxpython-2.8.10.1:2.8[cairo,opengl?] - x11-libs/cairo[X,opengl?] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXp - x11-libs/libXpm - x11-libs/libXt - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/flex - sys-devel/gettext - sys-devel/bison - X? ( - dev-lang/swig - x11-proto/xextproto - x11-proto/xproto - )" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - opengl? ( X )" - -pkg_setup() { - if use lapack; then - local mylapack - mylapack=$(eselect lapack show) || die - if [[ -z "${mylapack/.*reference.*/}" ]] && \ - [[ -z "${mylapack/.*atlas.*/}" ]]; then - ewarn "You need to set lapack to atlas or reference. Do:" - ewarn " eselect lapack set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - if use blas; then - local myblas - myblas=$(eselect blas show) || die - if [[ -z "${myblas/.*reference.*/}" ]] && \ - [[ -z "${myblas/.*atlas.*/}" ]]; then - ewarn "You need to set blas to atlas or reference. Do:" - ewarn " eselect blas set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - # Fix undefined reference to errno in lib/raster/open.c - # see http://trac.osgeo.org/grass/changeset/66398 - epatch "${FILESDIR}/${P}"-include-errno.patch - - # Fix undeclared variable if OSG is disabled - epatch "${FILESDIR}/${P}"-declare-inespg.patch - - # Bug #563490 - epatch "${FILESDIR}/${PV}"-sec-format.patch - - # Fix unversioned python calls - local pyver=${EPYTHON/python/} - sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die - sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die - - epatch_user - eautoconf - - python_fix_shebang "${S}" -} - -src_configure() { - if use X; then - WX_BUILD=yes - WX_GTK_VER=2.8 - need-wxwidgets unicode - fi - - econf \ - --enable-shared \ - --disable-w11 \ - $(use_with cxx) \ - $(use_with tiff) \ - $(use_with png) \ - $(use_with postgres) \ - $(use_with mysql) \ - $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \ - $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/mysql") \ - $(use_with sqlite) \ - $(use_with opengl) \ - $(use_with odbc) \ - $(use_with fftw) \ - $(use_with blas) \ - $(use_with lapack) \ - $(use_with X cairo) \ - $(use_with truetype freetype) \ - $(use_with truetype freetype-includes "${ROOT}usr/include/freetype2") \ - $(use_with nls) \ - $(use_with readline) \ - --without-opendwg \ - --with-regex \ - $(use_with threads pthread) \ - $(use_with openmp) \ - $(use_with opencl) \ - $(use_with gdal gdal "${ROOT}usr/bin/gdal-config") \ - --without-liblas \ - $(use_with X wxwidgets "${WX_CONFIG}") \ - $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \ - $(use_with geos geos "${ROOT}usr/bin/geos-config") \ - --with-proj-includes="${ROOT}usr/include/libprojectM" \ - --with-proj-libs="${ROOT}usr/$(get_libdir)" \ - --with-proj-share="${ROOT}usr/share/proj/" \ - $(use_with X x) -} - -src_compile() { - # we don't want to link against embedded mysql lib - emake CC="$(tc-getCC)" MYSQLDLIB="" -} - -src_install() { - emake DESTDIR="${D}" \ - INST_DIR="${D}usr/${MY_PM}" \ - prefix="${D}usr" BINDIR="${D}usr/bin" \ - PREFIX="${D}usr/" \ - install - - pushd "${D}usr/${MY_PM}" &> /dev/null - - # fix docs - dodoc AUTHORS CHANGES - dohtml -r docs/html/* - rm -rf docs/ || die - rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die - - # manuals - dodir /usr/share/man/man1 - rm -rf man/ || die - - # translations - if use nls; then - dodir /usr/share/locale/ - mv locale/* "${D}usr/share/locale/" || die - rm -rf locale/ || die - # pt_BR is broken - mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die - fi - - popd &> /dev/null - - # place libraries where they belong - mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die - - # place header files where they belong - mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die - # make rules are not required on installed system - rm -rf "${D}usr/include/Make" || die - - # mv remaining gisbase stuff to libdir - mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die - - # get proper folder for grass path in script - local gisbase - gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}" - sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \ - -i "${D}usr/bin/${MY_PM}" || die - - # get proper fonts path for fontcap - sed -i \ - -e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \ - "${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die - - # set proper python interpreter - sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die - - if use X; then - local GUI="-gui" - [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" - make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" - doicon gui/icons/${PN}-48x48.png - fi - - # install .pc file so other apps know where to look for grass - insinto /usr/$(get_libdir)/pkgconfig/ - doins grass.pc - - # fix weird +x on tcl scripts - find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \; -} - -pkg_postinst() { - if use X; then - fdo-mime_desktop_database_update - gnome2_icon_cache_update - fi -} - -pkg_postrm() { - if use X; then - fdo-mime_desktop_database_update - gnome2_icon_cache_update - fi -} diff --git a/sci-geosciences/grass/grass-7.0.1-r2.ebuild b/sci-geosciences/grass/grass-7.0.1-r3.ebuild index 00834479f768..e4dd7e6afeaa 100644 --- a/sci-geosciences/grass/grass-7.0.1-r2.ebuild +++ b/sci-geosciences/grass/grass-7.0.1-r3.ebuild @@ -20,19 +20,19 @@ SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="7" -KEYWORDS="~amd64 ~x86" -IUSE="X blas cxx fftw gdal geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype" RDEPEND="${PYTHON_DEPS} >=app-admin/eselect-1.2 media-libs/libprojectm sci-libs/proj sci-libs/xdrfile + sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sys-libs/zlib fftw? ( sci-libs/fftw:3.0 ) - gdal? ( sci-libs/gdal ) geos? ( sci-libs/geos ) blas? ( virtual/blas sci-libs/cblas-reference ) @@ -80,6 +80,12 @@ REQUIRED_USE=" ${PYTHON_REQUIRED_USE} opengl? ( X )" +PATCHES=( + "${FILESDIR}/${P}"-include-errno.patch + "${FILESDIR}/${P}"-declare-inespg.patch + "${FILESDIR}/${PV}"-sec-format.patch +) + pkg_setup() { if use lapack; then local mylapack @@ -109,21 +115,16 @@ pkg_setup() { } src_prepare() { - # Fix undefined reference to errno in lib/raster/open.c - # see http://trac.osgeo.org/grass/changeset/66398 - epatch "${FILESDIR}/${P}"-include-errno.patch - - # Fix undeclared variable if OSG is disabled - epatch "${FILESDIR}/${P}"-declare-inespg.patch - - # Bug #563490 - epatch "${FILESDIR}/${PV}"-sec-format.patch - # Fix unversioned python calls local pyver=${EPYTHON/python/} sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die + # fix header being unconditionally included + # see upstream https://trac.osgeo.org/grass/ticket/2779 + sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \ + -i "${S}/vector/v.external/main.c" || die "failed to sed main.c" + epatch_user eautoconf @@ -137,6 +138,8 @@ src_configure() { need-wxwidgets unicode fi + use opencl && addwrite "${ROOT}dev/dri/renderD128" + econf \ --enable-shared \ --disable-w11 \ @@ -163,7 +166,7 @@ src_configure() { $(use_with threads pthread) \ $(use_with openmp) \ $(use_with opencl) \ - $(use_with gdal gdal "${ROOT}usr/bin/gdal-config") \ + --with-gdal="${ROOT}usr/bin/gdal-config" \ $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \ $(use_with X wxwidgets "${WX_CONFIG}") \ $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \ @@ -261,4 +264,4 @@ pkg_postrm() { fdo-mime_desktop_database_update gnome2_icon_cache_update fi -} +}
\ No newline at end of file diff --git a/sci-geosciences/laszip/laszip-2.2.0.ebuild b/sci-geosciences/laszip/laszip-2.2.0.ebuild index 0003ae67553e..996478149680 100644 --- a/sci-geosciences/laszip/laszip-2.2.0.ebuild +++ b/sci-geosciences/laszip/laszip-2.2.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/LASzip/LASzip/releases/download/v${PV}/${PN}-src-${P SLOT="0" LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" S="${WORKDIR}/${PN}-src-${PV}" diff --git a/sci-geosciences/laszip/metadata.xml b/sci-geosciences/laszip/metadata.xml index 8f8bdb10ea21..de7129f265d7 100644 --- a/sci-geosciences/laszip/metadata.xml +++ b/sci-geosciences/laszip/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>sci-geosciences</herd> @@ -8,8 +8,11 @@ <name>Sam Jorna</name> <description>Proxy maintainer - assign bugs to him</description> </maintainer> -<longdescription lang="en"> + <longdescription lang="en"> An open-source utility for compressing LAS-stored LiDAR information in a lossless format. -</longdescription> + </longdescription> + <upstream> + <remote-id type="github">LASzip/LASzip</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-geosciences/liblas/liblas-1.8.0.ebuild b/sci-geosciences/liblas/liblas-1.8.0.ebuild index 3c31b096baa8..7434d76534ed 100644 --- a/sci-geosciences/liblas/liblas-1.8.0.ebuild +++ b/sci-geosciences/liblas/liblas-1.8.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/${PN}/libLAS-${PV}.tar.bz2" SLOT="0" LICENSE="BSD" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="gdal geotiff" REQUIRED_USE="gdal? ( geotiff )" diff --git a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1-r1.ebuild b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1-r1.ebuild new file mode 100644 index 000000000000..c2fcdd74f1b6 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" +inherit cmake-utils wxwidgets + +MY_PN="BR24radar_pi" + +DESCRIPTION="Navico (Simrad, Lowrance) Broadband BR24/3G/4G Radar Plugin for OpenCPN" +HOMEPAGE="http://opencpn-navico-radar-plugin.github.io/" +SRC_URI=" + https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz +" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + x11-libs/wxGTK:${WX_GTK_VER} + >=sci-geosciences/opencpn-4.0.0 + sys-devel/gettext +" + +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + need-wxwidgets unicode + cmake-utils_src_prepare +} diff --git a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0-r1.ebuild b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0-r1.ebuild new file mode 100644 index 000000000000..09df1ecbdcf2 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" +inherit cmake-utils wxwidgets + +MY_PN="climatology_pi" + +DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)" +HOMEPAGE="http://opencpn.org/ocpn/downloadplugins" +SRC_URI=" + https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${P}-CL-DATA.tar.xz +" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + x11-libs/wxGTK:${WX_GTK_VER} + >=sci-geosciences/opencpn-4.0.0 + sys-devel/gettext +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + need-wxwidgets unicode + cmake-utils_src_prepare +} + +src_install() { + cmake-utils_src_install + insinto "/usr/share/opencpn/plugins/${MY_PN}/data/" + doins "${S}"/{,../}data/* +} diff --git a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0-r1.ebuild b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0-r1.ebuild new file mode 100644 index 000000000000..5957f28d358c --- /dev/null +++ b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" +inherit cmake-utils wxwidgets + +MY_PN="launcher_pi" + +DESCRIPTION="Launcher Plugin for OpenCPN" +HOMEPAGE="http://opencpn.org/ocpn/downloadplugins" +SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=sci-geosciences/opencpn-4.0.0 + sys-devel/gettext + x11-libs/wxGTK:${WX_GTK_VER} +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + need-wxwidgets unicode + cmake-utils_src_prepare +} diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2018-r1.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2018-r1.ebuild new file mode 100644 index 000000000000..56b8f1bb5f5f --- /dev/null +++ b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2018-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" +inherit cmake-utils wxwidgets + +MY_PN="LogbookKonni-1.2" + +DESCRIPTION="Logbook Plugin for OpenCPN" +HOMEPAGE="http://opencpn.org/ocpn/downloadplugins" +SRC_URI="https://github.com/delatbabel/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip +" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=sci-geosciences/opencpn-4.0.0 + sys-devel/gettext + x11-libs/wxGTK:${WX_GTK_VER} +" +DEPEND=" + app-arch/zip + ${RDEPEND} +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + need-wxwidgets unicode + cmake-utils_src_prepare +} + +src_install() { + # install layouts as zip + cmake-utils_src_install + cd "$WORKDIR" + zip -r "$D"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts +} + +pkg_postinst() { + elog "Installation of logbook layouts" + elog "*******************************" + elog "" + elog "The default layouts zip file has been installed to:" + elog "/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip" + elog "" + elog "After starting OpenCPN, go to Options->Plugins->Logbook->Settings," + elog "click the install button and choose the above mentioned zip file" + elog "" +} diff --git a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1-r1.ebuild b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1-r1.ebuild new file mode 100644 index 000000000000..fb7700965fac --- /dev/null +++ b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" +inherit cmake-utils wxwidgets + +MY_PN="objsearch_pi" + +DESCRIPTION="Chart Object Search Plugin for OpenCPN" +HOMEPAGE="http://opencpn.org/ocpn/downloadplugins" +SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=sci-geosciences/opencpn-4.0.0 + sys-devel/gettext + x11-libs/wxGTK:${WX_GTK_VER} +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + need-wxwidgets unicode + cmake-utils_src_prepare +} diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0-r1.ebuild b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0-r1.ebuild new file mode 100644 index 000000000000..f77bf74df919 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" +inherit cmake-utils wxwidgets + +MY_PN="ocpndebugger_pi" + +DESCRIPTION="NMEA-data and plugin-API Debugger Plugin for OpenCPN" +HOMEPAGE="http://opencpn.org/ocpn/downloadplugins" +SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=sci-geosciences/opencpn-4.0.0 + sys-devel/gettext + x11-libs/wxGTK:${WX_GTK_VER} +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + need-wxwidgets unicode + cmake-utils_src_prepare +} diff --git a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5-r1.ebuild b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5-r1.ebuild new file mode 100644 index 000000000000..c27861a00692 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" +inherit cmake-utils wxwidgets + +MY_PN="statusbar_pi" + +DESCRIPTION="Statusbar Plugin for OpenCPN" +HOMEPAGE="http://opencpn.org/ocpn/downloadplugins" +SRC_URI=" + https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz +" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=sci-geosciences/opencpn-4.0.0 + sys-devel/gettext + x11-libs/wxGTK:${WX_GTK_VER} +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + need-wxwidgets unicode + cmake-utils_src_prepare +} diff --git a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3-r1.ebuild b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3-r1.ebuild new file mode 100644 index 000000000000..5000a860c147 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" +inherit cmake-utils wxwidgets + +MY_PN="weatherfax_pi" + +DESCRIPTION="Weatherfax Plugin for OpenCPN" +HOMEPAGE="http://opencpn.org/ocpn/downloadplugins" +SRC_URI=" + https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz +" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=sci-geosciences/opencpn-4.0.0 + sys-devel/gettext + x11-libs/wxGTK:${WX_GTK_VER} +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + need-wxwidgets unicode + cmake-utils_src_prepare +} diff --git a/sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0-r1.ebuild b/sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0-r1.ebuild new file mode 100644 index 000000000000..6614ed26e1fa --- /dev/null +++ b/sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" +inherit cmake-utils wxwidgets + +MY_PN="wmm_pi" + +DESCRIPTION="World Magnetic Model Plugin for OpenCPN" +HOMEPAGE="http://opencpn.org/ocpn/downloadplugins" +SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=sci-geosciences/opencpn-4.0.0 + sys-devel/gettext + x11-libs/wxGTK:${WX_GTK_VER} +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + need-wxwidgets unicode + cmake-utils_src_prepare +} diff --git a/sci-geosciences/opencpn/opencpn-4.0.0-r1.ebuild b/sci-geosciences/opencpn/opencpn-4.0.0-r1.ebuild new file mode 100644 index 000000000000..84b98419af01 --- /dev/null +++ b/sci-geosciences/opencpn/opencpn-4.0.0-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# TODO: add plugins + +## wmm_pi, World Magnetic Model (https://github.com/nohal/wmm_pi, GPL-2+) +#WMM_PLUGIN_PV="1.0" +#WMM_PLUGIN_PN="wmm_pi" +#WMM_PLUGIN_P="${WMM_PLUGIN_PN}-${WMM_PLUGIN_PV}" +#WMM_PLUGIN_URI="https://github.com/nohal/${WMM_PLUGIN_PN}/archive/${WMM_PLUGIN_PN}-v${WMM_PLUGIN_PV}.tar.gz" +#WMM_PLUGIN_WD="${WORKDIR}/plugins/${WMM_PLUGIN_PN}" + +WX_GTK_VER="3.0" +inherit cmake-utils wxwidgets + +DESCRIPTION="a free, open source software for marine navigation" +HOMEPAGE="http://opencpn.org/" +SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz +doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${PV}.orig.tar.xz ) +" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc gps opengl" + +RDEPEND=" + app-arch/bzip2 + dev-libs/tinyxml + media-libs/freetype:2 + media-libs/portaudio + sys-libs/zlib + opengl? ( virtual/opengl ) + x11-libs/gtk+:2 + x11-libs/wxGTK:${WX_GTK_VER}[X] + gps? ( >=sci-geosciences/gpsd-2.96-r1 ) +" +DEPEND="${RDEPEND} + sys-devel/gettext" + +S="${WORKDIR}/OpenCPN-${PV}" + +src_configure() { + need-wxwidgets unicode + local mycmakeargs=( + $(cmake-utils_use_use gps GPSD) + -DUSE_S57=ON + -DUSE_GARMINHOST=ON + ) + + cmake-utils_src_configure +} + +src_install() { + if use doc; then + dohtml -r "${S}"/../${PN}/doc/* + fi + cmake-utils_src_install +} + +pkg_postinst() { + if use doc; then + einfo "Documentation is available at file:///usr/share/doc/${P}/html/help_en_US.html" + fi +} diff --git a/sci-libs/balbes-db/Manifest b/sci-libs/balbes-db/Manifest deleted file mode 100644 index 86fed7e6ab9e..000000000000 --- a/sci-libs/balbes-db/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ccp4-6.1.3-balbesdb-10-11-08.tar.gz 600856059 SHA256 5606fc5e131138b56fa3a1afce014225a6c07826b99587f132f6c337585f4f0d SHA512 5b7f3b3465312da72ff4816c96244252a6f0bf039fde8ff772ea683e6317053d903cdc2b3b86b78e8edbb1c766d1b3676048ac4e7d4d0db29ed7bf62dfb00ab2 WHIRLPOOL 9a01610c9767aece4c9cc052a8aa2fd5dff9c9967f11688f5e6e206a82e2714751e086a7ddbe6a99da23b70163c7b096f57d281eebe53b8dd7cdb18faed23d63 diff --git a/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild b/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild deleted file mode 100644 index bd973c5120d7..000000000000 --- a/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P="ccp4-${PV}" - -SRC="ftp://ftp.ccp4.ac.uk/ccp4" -VERSION="10-11-08" - -DESCRIPTION="The database for the BALBES automated crystallographic molecular replacement pipeline" -HOMEPAGE="http://www.ysbl.york.ac.uk/~fei/balbes/" -SRC_URI="${SRC}/${PV}/${MY_P}-${PN/-/}-${VERSION}.tar.gz" - -LICENSE="ccp4" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="" - -RDEPEND=" - >=dev-python/pyxml-0.8.4 - sci-libs/monomer-db" -DEPEND="${RDEPEND}" -RESTRICT="binchecks strip" - -S="${WORKDIR}/${MY_P}" - -src_install() { - dodir /usr/share/balbes/BALBES_0.0.1 - rm -rf share/balbes/BALBES_0.0.1/dic || die - # We don't want to wait around to copy all this, or suck up double - # the disk space - einfo "Installing files, which can take some time ..." - mv "${S}"/share/balbes/BALBES_0.0.1/* "${ED}"/usr/share/balbes/BALBES_0.0.1/ || die - # db files shouldn't be executable - find "${ED}"/usr/share/balbes/BALBES_0.0.1/ \ - -type f \ - -exec chmod 664 '{}' \; || die - dosym ../../ccp4/data/monomers /usr/share/balbes/BALBES_0.0.1/dic - - cat >> "${T}"/20balbes <<- EOF - BALBES_ROOT="${EPREFIX}/usr/share/balbes/BALBES_0.0.1/" - EOF - - doenvd "${T}"/20balbes -} diff --git a/sci-libs/balbes-db/metadata.xml b/sci-libs/balbes-db/metadata.xml deleted file mode 100644 index 51fdedab1b38..000000000000 --- a/sci-libs/balbes-db/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> -</pkgmetadata> diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest deleted file mode 100644 index 9d3fe2806365..000000000000 --- a/sci-libs/ccp4-libs/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ccp4-6.1.3-core-src.tar.gz 242134076 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 SHA512 413eba806107ebcdbd93e9122275463709133d9b2a9ce44ae57a6c2350465a47ba66ad9875237aead74f5d422c0104f58f728ab37a757b10d82cde92af444c20 WHIRLPOOL faebf8ee7920013bc3d0e83565207dca1f31ba0b5c92fe1eae4b740f70ff2031d95787fa0d545b09c853d25657c08973527e43de02fddc086988123ca2a6339c diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r16.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r16.ebuild deleted file mode 100644 index dcd741637048..000000000000 --- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r16.ebuild +++ /dev/null @@ -1,359 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils fortran-2 gnuconfig multilib python-single-r1 toolchain-funcs - -SRC="ftp://ftp.ccp4.ac.uk/ccp4" - -#UPDATE="04_03_09" -#PATCHDATE="090511" - -MY_P="${P/-libs}" - -PATCH_TOT="0" - -DESCRIPTION="Protein X-ray crystallography toolkit - Libraries" -HOMEPAGE="http://www.ccp4.ac.uk/" -SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz" -# patch tarball from upstream - [[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz" -# patches created by us - [[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} https://dev.gentoo.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2" - -for i in $(seq $PATCH_TOT); do - NAME="PATCH${i}[1]" - SRC_URI="${SRC_URI} - ${SRC}/${PV}/patches/${!NAME}" -done - -LICENSE="ccp4" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="minimal" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - !<sci-chemistry/ccp4-6.1.3 - !<sci-chemistry/ccp4-apps-${PV}-r10 - app-shells/tcsh - dev-lang/tcl:0 - >=sci-libs/cbflib-0.9.2.2 - sci-libs/fftw:2.1 - sci-libs/mmdb:0 - sci-libs/monomer-db - sci-libs/ssm - virtual/jpeg:0= - virtual/lapack - virtual/blas" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -MAKEOPTS+=" -j1" - -pkg_setup() { - fortran-2_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - tc-export PKG_CONFIG RANLIB AR - - sed \ - -e "/^AR/s:ar:$(tc-getAR):g" \ - -i lib/src/Makefile.in src/Makefile.in src/ccp4mapwish_/Makefile.in lib/ccif/Makefile.in || die - - einfo "Applying upstream patches ..." - for patch in $(seq $PATCH_TOT); do - base="PATCH${patch}" - dir=$(eval echo \${${base}[0]}) - p=$(eval echo \${${base}[1]}) - pushd "${dir}" >& /dev/null - ccp_patch "${DISTDIR}/${p}" - popd >& /dev/null - done - einfo "Done." - echo - - [[ -n ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch - - einfo "Applying Gentoo patches ..." - # fix buffer overflows wrt bug 339706 - ccp_patch "${FILESDIR}"/${PV}-overflows.patch - - # it tries to create libdir, bindir etc on live system in configure - ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch - - # gerror_ gets defined twice on ppc if you're using gfortran/g95 - ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch - - # make creation of libccif.so smooth - ccp_patch "${FILESDIR}"/${PV}-ccif-shared.patch - - # lets try to build libmmdb seperatly - ccp_patch "${FILESDIR}"/${PV}-dont-build-mmdb.patch - - # unbundle libjpeg and cbflib - ccp_patch "${FILESDIR}"/${PV}-unbundle-libs-ng2.patch - - # Fix missing DESTIDR - # not installing during build - ccp_patch "${FILESDIR}"/${PV}-noinstall.patch - sed \ - -e '/SHARE_INST/s:$(libdir):$(DESTDIR)/$(libdir):g' \ - -i configure || die - - # Fix upstreams code - ccp_patch "${FILESDIR}"/${PV}-impl-dec.patch - - # use pkg-config to detect BLAS/LAPACK - ccp_patch "${FILESDIR}"/${PV}-lapack.patch - - # proto type changing in version 0.9.2.2 - ccp_patch "${FILESDIR}"/${PV}-cbf.patch - - # proto type changing in version 0.9.2.2 - ccp_patch "${FILESDIR}"/${PV}-no-pypath.patch - - ccp_patch "${FILESDIR}"/${P}-force.patch - - ccp_patch "${FILESDIR}"/${P}-format-security.patch - - einfo "Done." # done applying Gentoo patches - echo - - # not needed, we have it extra - rm -rf src/rapper/{libxml2,gc7.0} || die - - sed \ - -e "s:/usr:${EPREFIX}/usr:g" \ - -e 's:-Wl,-rpath,$CLIB::g' \ - -e 's: -rpath $CLIB::g' \ - -e 's: -I${srcdir}/include/cpp_c_headers::g' \ - -e 's:sleep 1:sleep .2:g' \ - -i configure || die - - gnuconfig_update - - for i in lib/DiffractionImage src/rapper src/pisa; do - pushd ${i} > /dev/null - sed 's:-g::g' -i configure* || die - [[ -f configure.in ]] && mv configure.{in,ac} - eautoreconf - popd > /dev/null - done - - ## unbundle libssm - sed -e '/libdir/s:ssm::g' -i Makefile.in || die - find ./lib/src/mmdb ./lib/ssm ./lib/clipper ./lib/fftw lib/lapack -delete || die -} - -src_configure() { - rm -rf lib/DiffractionImage/{jpg,CBFlib} || die - - # Build system is broken if we set LDFLAGS - userldflags="${LDFLAGS}" - export SHARED_LIB_FLAGS="${LDFLAGS}" - unset LDFLAGS - - # GENTOO_OSNAME can be one of: - # irix irix64 sunos sunos64 aix hpux osf1 linux freebsd - # linux_compaq_compilers linux_intel_compilers generic Darwin - # ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers - if [[ "$(tc-getFC)" = "ifort" ]]; then - if use ia64; then - GENTOO_OSNAME="ia64_linux_intel" - else - # Should be valid for x86, maybe amd64 - GENTOO_OSNAME="linux_intel_compilers" - fi - else - # Should be valid for x86 and amd64, at least - GENTOO_OSNAME="linux" - fi - - # Sets up env - ln -s \ - ccp4.setup-bash \ - "${S}"/include/ccp4.setup || die - - # We agree to the license by emerging this, set in LICENSE - sed -i \ - -e "s~^\(^agreed=\).*~\1yes~g" \ - "${S}"/configure || die - - # Fix up variables -- need to reset CCP4_MASTER at install-time - sed -i \ - -e "s~^\(setenv CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \ - -e "s~^\(export CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \ - -e "s~^\(.*export CBIN=.*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \ - -e "s~^\(.*setenv CBIN .*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \ - -e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1${EPREFIX}/usr/bin~g" \ - "${S}"/include/ccp4.setup* || die - - # Set up variables for build - source "${S}"/include/ccp4.setup-sh - - export CC=$(tc-getCC) - export CXX=$(tc-getCXX) - export COPTIM=${CFLAGS} - export CXXOPTIM=${CXXFLAGS} - # Default to -O2 if FFLAGS is unset - export FC=$(tc-getFC) - export FOPTIM=${FFLAGS:- -O2} - - export SHARE_LIB="\ - $(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L../ccif/ -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \ - $(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb) $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm" - - # Can't use econf, configure rejects unknown options like --prefix - ./configure \ - --onlylibs \ - --with-shared-libs \ - --with-fftw="${EPREFIX}/usr" \ - --with-warnings \ - --disable-cctbx \ - --disable-clipper \ - --disable-ssm \ - --tmpdir="${TMPDIR}" \ - --bindir="${EPREFIX}/usr/libexec/ccp4/bin/" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - ${GENTOO_OSNAME} || die "configure failed" -} - -src_compile() { - emake DESTDIR="${D}" onlylib -} - -src_install() { - # Set up variables for build - source "${S}"/include/ccp4.setup-sh - - emake \ - DESTDIR="${D}" \ - includedir="${EPREFIX}/usr/include" \ - library_includedir="${EPREFIX}/usr/include" \ - install - - sed \ - -e "330,1000d" \ - -i "${S}"/include/ccp4.setup-sh || die - - sed \ - -e "378,1000d" \ - -i "${S}"/include/ccp4.setup-csh || die - - sed \ - -e "s:-${PV/-r*/}::g" \ - -e "s:^\(.*export CCP4_MASTER=\).*:\1${EPREFIX}/usr:g" \ - -e "s:^\(.*setenv CCP4_MASTER\).*:\1 ${EPREFIX}/usr:g" \ - -e "s:^\(.*export CCP4=\).*CCP4_MASTER.*:\1${EPREFIX}/usr:g" \ - -e "s:^\(.*setenv CCP4\).*CCP4_MASTER.*:\1 ${EPREFIX}/usr:g" \ - -e "s:^\(.*export CCP4_SCR=\).*:\1${EPREFIX}/tmp:g" \ - -e "s:^\(.*setenv CCP4_SCR \).*:\1${EPREFIX}/tmp:g" \ - -e "s:^\(.*export BINSORT_SCR=\).*:\1${EPREFIX}/tmp:g" \ - -e "s:^\(.*setenv BINSORT_SCR \).*:\1${EPREFIX}/tmp:g" \ - -e "s:^\(.*export CCP4I_TOP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \ - -e "s:^\(.*setenv CCP4I_TOP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \ - -e "s:^\(.*export CCP4I_TCLTK=\).*:\1${EPREFIX}/usr/bin:g" \ - -e "s:^\(.*setenv CCP4I_TCLTK \).*:\1${EPREFIX}/usr/bin:g" \ - -e "s:^\(.*export CCP4I_HELP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \ - -e "s:^\(.*setenv CCP4I_HELP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \ - -e "s:^\(.*export CBIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \ - -e "s:^\(.*setenv CBIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \ - -e "s:^\(.*export CCP4_BIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \ - -e "s:^\(.*setenv CCP4_BIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \ - -e "s:^\(.*export CLIBD_MON=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \ - -e "s:^\(.*setenv CLIBD_MON \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \ - -e "s:^\(.*export CLIBD=\).*:\1${EPREFIX}/usr/share/ccp4/data:g" \ - -e "s:^\(.*setenv CLIBD \).*:\1${EPREFIX}/usr/share/ccp4/data:g" \ - -e "s:^\(.*export CCP4_LIB=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \ - -e "s:^\(.*setenv CCP4_LIB \).*:\1${EPREFIX}/usr/$(get_libdir):g" \ - -e "s:^\(.*export CCP4_BROWSER=\).*:\1firefox:g" \ - -e "s:^\(.*setenv CCP4_BROWSER \).*:\1firefox:g" \ - -e "s:^\(.*export MANPATH=\).*:\1\${MANPATH}:g" \ - -e "s:^\(.*setenv MANPATH \).*:\1\${MANPATH}:g" \ - -e "s:^\(.*export DBCCP4I_TOP=\).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \ - -e "s:^\(.*setenv DBCCP4I_TOP \).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \ - -e "s:^\(.*export MOLREPLIB=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \ - -e "s:^\(.*setenv MOLREPLIB \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \ - -e "s:^\(.*export CDOC=\).*:\1${EPREFIX}/usr/share/doc:g" \ - -e "s:^\(.*setenv CDOC \).*:\1${EPREFIX}/usr/share/doc:g" \ - -e "s:^\(.*export CEXAM=\).*:\1${EPREFIX}/usr/share/doc/examples:g" \ - -e "s:^\(.*setenv CEXAM \).*:\1${EPREFIX}/usr/share/doc/examples:g" \ - -e "s:^\(.*export CINCL=\).*:\1${EPREFIX}/usr/share/ccp4/include:g" \ - -e "s:^\(.*setenv CINCL \).*:\1${EPREFIX}/usr/share/ccp4/include:g" \ - -e "s:\$CLIB/font84.dat:\"${EPREFIX}/usr/$(get_libdir)/font84.dat\":g" \ - -e "s:\$CLIB/cif_mmdic.lib:\"${EPREFIX}/usr/$(get_libdir)/cif_mmdic.lib\":g" \ - -e '/# .*LD_LIBRARY_PATH specifies/,/^$/d' \ - -e '/CLIB=/d' \ - -e '/CLIB /d' \ - -e '/CLIBS=/d' \ - -e '/CLIBS /d' \ - -e "/alias/d" \ - -e "/CCP4_HELPDIR/d" \ - -e "/IMOSFLM_VERSION/d" \ - -i "${S}"/include/ccp4.setup* || die - - # Don't check for updates on every sourcing of /etc/profile - sed -i \ - -e "s:\(eval python.*\):#\1:g" \ - "${S}"/include/ccp4.setup* || die - - # Libs - for file in "${S}"/lib/*; do - if [[ -d ${file} ]]; then - continue - elif [[ -x ${file} ]]; then - dolib.so ${file} - else - insinto /usr/$(get_libdir) - doins ${file} - fi - done - - prune_libtool_files - - sed \ - -e 's:test "LD_LIBRARY_PATH":test "$LD_LIBRARY_PATH":g' \ - -i "${S}"/include/ccp4.setup-sh || die - - if ! use minimal; then - # Setup scripts - insinto /etc/profile.d - newins "${S}"/include/ccp4.setup-csh 40ccp4.setup.csh - newins "${S}"/include/ccp4.setup-sh 40ccp4.setup.sh - - # Data - insinto /usr/share/ccp4/data/ - doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures} - - # Environment files, setup scripts, etc. - rm -rf "${S}"/include/{ccp4.setup*,COPYING,cpp_c_headers} || die - insinto /usr/share/ccp4/ - doins -r "${S}"/include - fi - - rm -f "${S}"/include/ccp4.setup* || die - - dodoc "${S}"/lib/data/*.doc - newdoc "${S}"/lib/data/README DATA-README -} - -pkg_postinst() { - einfo "The Web browser defaults to firefox. Change CCP4_BROWSER" - einfo "in ${EPREFIX}/etc/profile.d/40ccp4.setup* to modify this." -} - -# Epatch wrapper for bulk patching -ccp_patch() { - EPATCH_SINGLE_MSG=" ${1##*/} ..." epatch ${1} -} diff --git a/sci-libs/ccp4-libs/files/6.0.2-ppc-double-define-gerror.patch b/sci-libs/ccp4-libs/files/6.0.2-ppc-double-define-gerror.patch deleted file mode 100644 index a77d9494a05c..000000000000 --- a/sci-libs/ccp4-libs/files/6.0.2-ppc-double-define-gerror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ccp4-6.0.1.orig/lib/src/library_f.c 2006-06-12 07:06:22.000000000 -0700 -+++ ccp4-6.0.1/lib/src/library_f.c 2006-06-12 07:21:56.000000000 -0700 -@@ -716,7 +716,7 @@ - - #endif /* end of apple xlf support */ - --#if ( defined (__linux__) && defined (_CALL_SYSV) ) -+#if ( defined (__linux__) && defined (_CALL_SYSV) && ! defined(G95) && ! defined (GFORTRAN) ) - /* linuxppc xlf support */ - void gerror_ (str, Lstr) - char *str; diff --git a/sci-libs/ccp4-libs/files/6.1.3-cbf.patch b/sci-libs/ccp4-libs/files/6.1.3-cbf.patch deleted file mode 100644 index 6930fcad766a..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-cbf.patch +++ /dev/null @@ -1,16 +0,0 @@ - lib/DiffractionImage/DiffractionImageCBF.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lib/DiffractionImage/DiffractionImageCBF.cpp b/lib/DiffractionImage/DiffractionImageCBF.cpp -index 69b32b0..3ffee26 100755 ---- a/lib/DiffractionImage/DiffractionImageCBF.cpp -+++ b/lib/DiffractionImage/DiffractionImageCBF.cpp -@@ -62,7 +62,7 @@ namespace DI - int* tmpimg; - tmpimg=new int[height*width]; - test= cbf_decompress_byte_offset ((void *)tmpimg,sizeof(int),sign, -- nelements,&nread,0,32,sign,ccbbff,0, -+ nelements,&nread,0,0,32,sign,ccbbff,0, - byte_ord.c_str(),2,(size_t) width, - (size_t) height,1,(size_t) padding); - for(int i=0;i<height*width;i++) diff --git a/sci-libs/ccp4-libs/files/6.1.3-ccif-shared.patch b/sci-libs/ccp4-libs/files/6.1.3-ccif-shared.patch deleted file mode 100644 index ca18d75bc840..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-ccif-shared.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- configure 2009-08-04 22:35:34.000000000 +0200 -+++ configure.new 2009-08-04 22:54:32.000000000 +0200 -@@ -3136,8 +3136,8 @@ - fi - ( touch /tmp/$$.cache_file 2>/dev/null && \ - cat /dev/null > /tmp/$$.cache_file && \ -- ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --cache-file=/tmp/$$.cache_file ) || \ -- ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif -+ ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --cache-file=/tmp/$$.cache_file --enable-shared-lib ) || \ -+ ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --enable-shared-lib - rm -f /tmp/$$.cache_file - if [ "X$LIBFOPTIM" != "X" ]; then - FOPTIM=$FOPTIM_save ---- lib/ccif/configure 2009-08-04 22:35:37.000000000 +0200 -+++ lib/ccif/configure.new 2009-08-04 23:05:44.000000000 +0200 -@@ -5568,7 +5568,7 @@ - enable_shared_lib=no - ;; - -- i?86-unknown-linux | i?86-pc-linux-gnu ) -+ i?86-unknown-linux | i?86-pc-linux-gnu | x86_64-unknown-linux-gnu) - if test $enable_shared_lib = yes ; then - - SO_LOC_VAR='LD_LIBRARY_PATH' -@@ -5585,7 +5585,7 @@ - else - SHARED_LIB_PATH='LD_LIBRARY_PATH=`pwd`' - fi -- SHARED_LIB_CMD='$(CC) $(SHARED_LIB_FLAGS) -shared -Wl,-soname -Wl,$(SHARED_LIB_NAME) '"$SHARED_LIB_RESTRICT"' ${LOBJS} $(RX_LFLAG) -o $(SHARED_LIB_NAME)' -+ SHARED_LIB_CMD='$(CC) $(SHARED_LIB_FLAGS) -shared -Wl,-soname -Wl,$(SHARED_LIB_NAME) '"$SHARED_LIB_RESTRICT"' ${LOBJS} $(RX_LFLAG) -o $(SHARED_LIB_NAME) -lm' - # SHARED_LIB_EXPORTS_CMD='cp libccif-universal-ld.lis $(SHARED_LIB_EXPORTS)' - SHARED_LIB_EXPORTS_CMD='' - fi diff --git a/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch b/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch deleted file mode 100644 index b3147ad81bbf..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in -index c23f488..b32dd1e 100755 ---- a/lib/src/Makefile.in -+++ b/lib/src/Makefile.in -@@ -176,7 +176,7 @@ $(mmdbsrcdir)/mmdb_sbase0.h $(mmdbsrcdir)/hybrid_36.h - - ##### Makefile targets ###### - --all: fsplit $(LMMDB) $(LC) $(LF) $(SCRIPT_MODULES) -+all: fsplit $(LC) $(LF) $(SCRIPT_MODULES) - # maybe create shared library - $(SHARE_LIB) - -@@ -717,10 +717,8 @@ uninstall-mmdbHEADERS: - done - - install : all install-ccp4HEADERS install-mmdbHEADERS -- $(INSTALL_DATA) `pwd`/$(LMMDB) $(libdir)/$(LMMDB) - $(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC) - $(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF) -- $(RANLIB) $(libdir)/$(LMMDB) - $(RANLIB) $(libdir)/$(LC) - $(RANLIB) $(libdir)/$(LF) - $(SHARE_INST) diff --git a/sci-libs/ccp4-libs/files/6.1.3-dont-make-dirs-in-configure.patch b/sci-libs/ccp4-libs/files/6.1.3-dont-make-dirs-in-configure.patch deleted file mode 100644 index 583697cea0a1..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-dont-make-dirs-in-configure.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- ccp4-6.0.99e.orig/configure 2008-07-31 10:37:22.000000000 -0700 -+++ ccp4-6.0.99e/configure 2008-07-31 10:39:18.000000000 -0700 -@@ -643,45 +643,45 @@ - # echo "! Beware -- the $system installation isn't properly tested." ; } - syswarn='echo; echo "! Beware -- the $system installation is not properly tested."' - --if test -z "$onlylibs" ; then -- for i in CCP4_SCR BINSORT_SCR; do -- if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -- else -- eval echo "! No directory \$$i and can\'t create it." -- echo " Check the value of $i." -- badvar=1 -- fi -- done -- -- for i in libdir bindir includedir; do -- if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -- else -- eval echo "! No directory \$$i and can\'t create it." -- echo " Check the argument of --$i." -- badvar=1 -- fi -- done -- -- for i in $dotsrc $dotunsupp $dotunsuppsrc $dotdeprec $dotdeprecsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do -- if test -d $i || mkdir $i; then : -- else -- eval echo "! No directory $i and can\'t create it." -- badvar=1 -- fi -- done --else -- # Kludge to fool the "Makefile" target in the top-level CCP4 -- # Makefile into not trying to remake src/Makefile.in -- for i in $srcdir/src $srcdir/lib/src ; do -- if test -d $i || mkdir $i; then -- if ! test -f $i/Makefile.in ; then -- echo -- echo "onlylibs: making dummy file $i/Makefile.in" -- touch $i/Makefile.in -- fi -- fi -- done --fi -+#if test -z "$onlylibs" ; then -+# for i in CCP4_SCR BINSORT_SCR; do -+# if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -+# else -+# eval echo "! No directory \$$i and can\'t create it." -+# echo " Check the value of $i." -+# badvar=1 -+# fi -+# done -+# -+# for i in libdir bindir includedir; do -+# if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : -+# else -+# eval echo "! No directory \$$i and can\'t create it." -+# echo " Check the argument of --$i." -+# badvar=1 -+# fi -+# done -+# -+# for i in $dotsrc $dotunsupp $dotunsuppsrc $dotdeprec $dotdeprecsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do -+# if test -d $i || mkdir $i; then : -+# else -+# eval echo "! No directory $i and can\'t create it." -+# badvar=1 -+# fi -+# done -+#else -+# # Kludge to fool the "Makefile" target in the top-level CCP4 -+# # Makefile into not trying to remake src/Makefile.in -+# for i in $srcdir/src $srcdir/lib/src ; do -+# if test -d $i || mkdir $i; then -+# if ! test -f $i/Makefile.in ; then -+# echo -+# echo "onlylibs: making dummy file $i/Makefile.in" -+# touch $i/Makefile.in -+# fi -+# fi -+# done -+#fi - - ### sanity checks - diff --git a/sci-libs/ccp4-libs/files/6.1.3-glibc2.10.patch b/sci-libs/ccp4-libs/files/6.1.3-glibc2.10.patch deleted file mode 100644 index 6e3997647955..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-glibc2.10.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- lib/ccif/configure.in 2009-06-10 13:52:59.000000000 +0200 -+++ lib/ccif/configure.in.new 2009-06-10 14:04:31.000000000 +0200 -@@ -363,7 +363,7 @@ - fi - SHARED_LIB_CMD='$(LD) $(SHARED_LIB_FLAGS) -shared -soname $(SHARED_LIB_NAME) \\\ - --whole-archive '"$SHARED_LIB_RESTRICT"' $L \\\ -- $(RX_LFLAG) -o $(SHARED_LIB_NAME)' -+ $(RX_LFLAG) -o $(SHARED_LIB_NAME) -lm' - SHARED_LIB_EXPORTS_CMD='cp libccif-universal-ld.lis $(SHARED_LIB_EXPORTS)' - fi - ;; ---- lib/ccif/configure 2009-06-10 14:26:58.000000000 +0200 -+++ lib/ccif/configure.new 2009-06-10 14:43:31.000000000 +0200 -@@ -1807,7 +1807,7 @@ - SHARED_LIB_CMD='$(LD) $(SHARED_LIB_CFLAGS) -shared -soname \\\ - $(SHARED_LIB_NAME) \\\ - --whole-archive $L \\\ -- -o $(SHARED_LIB_NAME)' -+ -o $(SHARED_LIB_NAME) -lm' - SHARED_LIB_EXPORTS_CMD='' - fi - ;; diff --git a/sci-libs/ccp4-libs/files/6.1.3-impl-dec.patch b/sci-libs/ccp4-libs/files/6.1.3-impl-dec.patch deleted file mode 100644 index 8bfa7db8cbff..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-impl-dec.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff --git a/lib/DiffractionImage/Bruker/FRM_LIB.c b/lib/DiffractionImage/Bruker/FRM_LIB.c -index bfda882..f821e04 100755 ---- a/lib/DiffractionImage/Bruker/FRM_LIB.c -+++ b/lib/DiffractionImage/Bruker/FRM_LIB.c -@@ -38,6 +38,8 @@ FRM_LIB: Routines for reading, writing, and handling frame files. - #include "sys/types.h" /* _open, etc. */ - #include "sys/stat.h" /* _open, etc. */ - -+#include <unistd.h> -+ - #ifndef _MSC_VER - int min(int a, int b) - { -diff --git a/lib/DiffractionImage/MAR/mar300_header.c b/lib/DiffractionImage/MAR/mar300_header.c -index 1a933de..1c40c32 100755 ---- a/lib/DiffractionImage/MAR/mar300_header.c -+++ b/lib/DiffractionImage/MAR/mar300_header.c -@@ -23,6 +23,9 @@ - */ - #include "mar300_header.h" - -+#include <sys/types.h> -+#include <unistd.h> -+ - /* - * Local functions - */ -diff --git a/lib/DiffractionImage/MAR/mar345_header.c b/lib/DiffractionImage/MAR/mar345_header.c -index a8351ea..16d0f7b 100755 ---- a/lib/DiffractionImage/MAR/mar345_header.c -+++ b/lib/DiffractionImage/MAR/mar345_header.c -@@ -32,6 +32,9 @@ - */ - #include "mar345_header.h" - -+#include <sys/types.h> -+#include <unistd.h> -+ - /* - * Definitions - */ -diff --git a/lib/DiffractionImage/MAR/nb_header.c b/lib/DiffractionImage/MAR/nb_header.c -index 07f2741..6364ca4 100755 ---- a/lib/DiffractionImage/MAR/nb_header.c -+++ b/lib/DiffractionImage/MAR/nb_header.c -@@ -20,6 +20,8 @@ - #include <io.h> - #endif - -+#include <sys/types.h> -+#include <unistd.h> - /* - * mar software include files - */ -diff --git a/lib/DiffractionImage/MAR/swap.c b/lib/DiffractionImage/MAR/swap.c -index 443bb8c..0d96b3f 100755 ---- a/lib/DiffractionImage/MAR/swap.c -+++ b/lib/DiffractionImage/MAR/swap.c -@@ -10,6 +10,9 @@ - * - **********************************************************************/ - -+#define _XOPEN_SOURCE -+#include <unistd.h> -+ - void swaplong(); - void swapshort(); - -diff --git a/lib/ccif/f_interface.c b/lib/ccif/f_interface.c -index 0f6a6b7..a09dc48 100755 ---- a/lib/ccif/f_interface.c -+++ b/lib/ccif/f_interface.c -@@ -25,6 +25,7 @@ - ********************************************************************/ - - #include "stdpccts.h" -+#include <sys/mman.h> - - /* This file is terribly organised, and badly needs re-doing. There is probably - * scope for splitting this into three modules: -diff --git a/lib/src/ccp4_general_f.c b/lib/src/ccp4_general_f.c -index 8b5d04f..74ee3f7 100755 ---- a/lib/src/ccp4_general_f.c -+++ b/lib/src/ccp4_general_f.c -@@ -26,6 +26,7 @@ - #include <string.h> - #include <stdlib.h> - #include <math.h> -+#include <time.h> - #include "ccp4_errno.h" - #include "ccp4_fortran.h" - #include "ccp4_parser.h" -diff --git a/lib/src/ccp4_program.c b/lib/src/ccp4_program.c -index 3e83d4d..bb3e975 100755 ---- a/lib/src/ccp4_program.c -+++ b/lib/src/ccp4_program.c -@@ -25,6 +25,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <time.h> - #include "ccp4_program.h" - #include "ccp4_parser.h" - #include "ccp4_utils.h" -diff --git a/lib/src/fsplit.c b/lib/src/fsplit.c -index ee8af24..c6fb3cd 100755 ---- a/lib/src/fsplit.c -+++ b/lib/src/fsplit.c -@@ -50,6 +50,7 @@ static char sccsid[] = "@(#)fsplit.c 5.5 (Berkeley) 3/12/91"; - #include <string.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <unistd.h> - - /* - * usage: fsplit [-e efile] ... [file] -diff --git a/src/clipper_progs/src/pirate/compress42.c b/src/clipper_progs/src/pirate/compress42.c -index ea52e96..30dbd56 100755 ---- a/src/clipper_progs/src/pirate/compress42.c -+++ b/src/clipper_progs/src/pirate/compress42.c -@@ -142,6 +142,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <errno.h> -+#include <unistd.h> - - #ifdef DIRENT - # include <dirent.h> -diff --git a/src/mtz2cif_/mtz2cif.c b/src/mtz2cif_/mtz2cif.c -index e224430..c7b82f4 100755 ---- a/src/mtz2cif_/mtz2cif.c -+++ b/src/mtz2cif_/mtz2cif.c -@@ -28,6 +28,7 @@ - #include "cmtzlib.h" - #include "ccp4_parser.h" - #include "ccp4_general.h" -+#include "ccp4_program.h" - #include "csymlib.h" - #include "mtz2cif_lib.h" - diff --git a/sci-libs/ccp4-libs/files/6.1.3-lapack.patch b/sci-libs/ccp4-libs/files/6.1.3-lapack.patch deleted file mode 100644 index 0463b3719525..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-lapack.patch +++ /dev/null @@ -1,597 +0,0 @@ -diff --git a/configure b/configure -index 833f483..bcfa62d 100755 ---- a/configure -+++ b/configure -@@ -3226,574 +3226,14 @@ else - echo - echo "Warning: this option has not been extensively tested!" - echo "Please report problems to ccp4@ccp4.ac.uk" -- # Search for vendor LAPACK/BLAS first -- if test ! "$with_netlib_lapack" ; then -- # Initialise variables to blank -- lapackdir= -- XLAPACK_LIB= -- # Possible directories to check for vendor or pre-existing LAPACK or -- # BLAS - add to these if you want to test others -- trydirs="`echo $LD_LIBRARY_PATH |sed -e s/:/\ /g` /lib /usr/lib /usr/local/lib" -- # Possible library names -- # These are the names like xxxx where the library will be libxxxx.a -- # or libxxxx.so -- echo -- echo "Guessing names for native/vendor LAPACK and/or BLAS libraries" -- echo "on this system" -- case $system in -- linux | linux64 | linux32 ) -- # linux users will usually have them in /usr/lib but don't call it -- trylapack="lapack" -- tryblas="blas" -- # if code is non_shared then this can lead to problems. both blas and lapack -- # need to be resolved even if they are not called! -- if test "$non_shared" = yes; then -- echo "You are compiling linux non_shared. This sometimes causes problems " -- echo " so checking for requirements." -- echo "Checking: try to link library against test program" -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF -- PROGRAM TESTLINK --C A bit of scala code to test the linking -- real bf(3), bnorm --c -- integer maxbmt -- parameter (maxbmt = 2) -- double precision B(maxbmt,maxbmt), eigval(maxbmt), -- $ eigvec(maxbmt,maxbmt), w(5*maxbmt) -- integer m, ia, ix, istat --c -- B(1,1) = 1.00 -- B(1,2) = 1.00 -- B(2,1) = 1.00 -- B(2,2) = 1.00 --c -- m = maxbmt -- ia = maxbmt -- ix = maxbmt -- call dsyev('N', 'L', m, B, ia, eigval, w, 5*maxbmt, istat) -- end --EOF -- #firstly test without -lblas -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack" -- echo $test_compile -- if { (eval $test_compile >& /dev/null ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- echo "... only -llapack needed" -- XLAPACK_LIB="-llapack" -- # Set the next two variables so that configure -- # doesn't try to build netlib libraries -- LAPACKLIB="lapack" -- noblas=yes -- trylapack= -- tryblas= -- else -- echo "more than just -llapack needed...." -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack -lblas" -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- echo "...-llapack and -lblas were needed" -- XLAPACK_LIB="-llapack -lblas" -- # Set the next two variables so that configure -- # doesn't try to build netlib libraries -- LAPACKLIB="lapack blas" -- noblas=no -- trylapack= -- tryblas= -- else -- echo "....could not find either lapack or blas." -- fi -- fi -- fi -- # add 64 bit libs -- case $system in -- linux64 ) trydirs="/usr/lib64 ${trydirs}" ;; -- esac -- -- ;; -- osf1) -- # OSF1 has dxml (old version) and cxml -- # which should have both lapack and blas -- trylapack="dxml cxml" -- tryblas= -- trydirs="${trydirs} /usr/shlib" -- ;; -- irix) -- # Additional search paths for IRIX -- trydirs="${trydirs} /usr/lib32" -- # SCSL should have both LAPACK and BLAS -- trylapack="scs" -- tryblas="blas" -- ;; -- irix64) -- # Additional search paths for IRIX64 -- trydirs="${trydirs} /usr/lib64" -- # SCSL should have both LAPACK and BLAS -- trylapack="scs" -- tryblas="blas" -- # Extra compiler flags? -- #XLAPACKFLAGS="-OPT:IEEE_NaN_inf=ON" -- ;; -- aix) -- # Additional search paths for AIX -- trydirs="${trydirs}" -- # AIX might have ESSL library - blas only I think -- trylapack= -- tryblas="essl" -- ;; -- hpux) -- # Additional search paths for HPUX -- trydirs="${trydirs} /opt/fortran/lib /opt/fortran/lib/pa2.0 /opt/mlib/lib/pa2.0" -- # HPUX should have both LAPACK (part of mlib) and BLAS -- trylapack="lapack" -- tryblas="blas" -- # Extra compiler flags? -- # +U77 required for ETIME function - this is already in XFFLAGS -- #XLAPACKFLAGS="+U77" -- ;; -- -- sunos | sunos64) -- # Sun has libraries with BLAS and LAPACK invoked using -- # -xlic_lib=sunperf -- trylapack= -- tryblas= -- echo "SunOs can use the Sun Performance Library (if installed)" -- echo "which has both BLAS and LAPACK 3.0" -- echo -- echo "Looking for a valid library to use..." -- echo -- # Loop over the possible library names -- try_libs="sunperf" -- for testlib in $try_libs -- do -- if test ! "$XLAPACK_LIB" ; then -- # Try running a test compile to see if this a valid library -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF --c Test fortran program to link against library -- PROGRAM TESTLINK -- IMPLICIT NONE -- INTEGER A -- A = 1 -- STOP -- END --EOF -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -dalign -xlic_lib=$testlib" -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- echo "... -xlic_lib=$testlib is okay" -- XLAPACK_LIB="-dalign -xlic_lib=$testlib" -- # Set the next two variables so that configure -- # doesn't try to build netlib libraries -- LAPACKLIB="$testlib" -- noblas=yes -- else -- # Compilation failed -- echo "... cannot use -xlic_lib=$testlib" -- fi -- # End of test for testlib -- fi -- # End of loop over possible lib names -- done -- # Report if no suitable library was found -- if test ! "$XLAPACK_LIB" ; then -- echo -- echo "No suitable LAPACK library was found." -- echo "This may be because the Sun Performance Library is not" -- echo "installed on your system" -- echo "Contact your system administrator or Sun vendor" -- fi -- ;; -- Darwin | Darwin32 | Darwin64 ) -- # Darwin has libraries with BLAS and LAPACK invoked using -- # -framework vecLib -- echo "Darwin can use the vecLib Library (if installed)" -- echo "which has both BLAS and LAPACK 3.0" -- echo -- # This is a special case so try running a test compile -- echo "Checking: try to link library against test program" -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF --c Test fortran program to link against library -- PROGRAM TESTLINK -- IMPLICIT NONE -- INTEGER A -- A = 1 -- STOP -- END --EOF -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -framework vecLib" -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- echo "... -framework vecLib is okay" -- XLAPACK_LIB="-framework vecLib" -- # Set the next two variables so that configure -- # doesn't try to build netlib libraries -- LAPACKLIB="vecLib" -- noblas=yes -- else --#alternative linking for vecLib libraries -- case `uname -sr` in -- *Darwin\ 7.* ) test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -lcc_dynamic -Wl,-framework -Wl,vecLib" ;; -- * ) test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -Wl,-framework -Wl,vecLib" ;; -- esac -- -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- echo "... -framework vecLib is okay" -- XLAPACK_LIB="-Wl,-framework -Wl,vecLib" -- # Set the next two variables so that configure -- # doesn't try to build netlib libraries -- LAPACKLIB="-Wl,-framework -Wl,vecLib" -- noblas=yes -- else -- # Compilation failed -- echo "... cannot use -framework vecLib" -- echo -- fi -- fi -- trylapack= -- tryblas= --# try the fink installation -- trydirs="${trydirs} /sw" -- ;; -- Darwin_ibm_compilers ) -- # Darwin has libraries with BLAS and LAPACK invoked using -- # -framework vecLib -- echo "Darwin can use the vecLib Library (if installed)" -- echo "which has both BLAS and LAPACK 3.0" -- echo -- # This is a special case so try running a test compile -- echo "Checking: try to link library against test program" -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF --c Test fortran program to link against library -- PROGRAM TESTLINK -- IMPLICIT NONE -- INTEGER A -- A = 1 -- STOP -- END --EOF -- case `uname -sr` in -- Darwin\ 8* ) -- XLAPACK_LIB="-L/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A -lLAPACK -lBLAS" -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f $XLAPACK_LIB" -- ;; -- Darwin\ 7* ) -- XLAPACK_LIB="-L/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A -lLAPACK -lBLAS" -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -lcc_dynamic $XLAPACK_LIB" -- ;; -- *) -- XLAPACK_LIB="/System/Library/Frameworks/vecLib.Framework/Versions/Current/VecLib" -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f $XLAPACK_LIB" -- esac -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- echo "... -framework vecLib is okay" -- # Set the next two variables so that configure -- # doesn't try to build netlib libraries -- LAPACKLIB="vecLib" -- noblas=yes -- else -- # Compilation failed -- XLAPACK_LIB="" -- echo "... cannot use -framework vecLib" -- echo -- fi -- trylapack= -- tryblas= --# try the fink installation -- trydirs="${trydirs} /sw" -- ;; -- -- Darwin_intel_compilers) -- # Darwin has libraries with BLAS and LAPACK invoked using -- # -F vecLib -- echo "Darwin can use the vecLib Library (if installed)" -- echo "which has both BLAS and LAPACK 3.0" -- echo -- # This is a special case so try running a test compile -- echo "Checking: try to link library against test program" -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF --c Test fortran program to link against library -- PROGRAM TESTLINK -- IMPLICIT NONE -- INTEGER A -- A = 1 -- STOP -- END --EOF -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -Wl,-framework -Wl,vecLib" -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- # Compilation was okay -- # doesn't try to build netlib libraries -- XLAPACK_LIB="-F /System/Library/Frameworks -Qoption,ld,-framework -Qoption,ld,vecLib" -- LAPACKLIB="vecLib" -- noblas=yes -- else -- # Compilation failed -- echo "... cannot use -framework vecLib" -- echo -- fi -- trylapack= -- tryblas= --# try the fink installation -- trydirs="${trydirs} /sw" -- ;; -- --# linux_ia64_sgi_altix) --# SGI Japan -- ia64_linux_intel) -- # Additional search paths for Linux/IA64 -- trydirs="${trydirs} /opt/scsl/lib /usr/lib /usr/local/lib" -- # SCSL and MKL should have both LAPACK and BLAS -- trylapack="mkl_lapack scs lapack" -- tryblas="mkl scs blas" -- ;; -- linux_ibm_compilers ) -- trylapack="lapack" -- tryblas="blas" -- ;; -- linux64_ibm_compilers ) -- trydirs="/usr/lib64 ${trydirs}" -- trylapack="lapack" -- tryblas="blas" -- ;; -- linux_intel_compilers ) -- trydirs="/usr/lib64 ${trydirs}" -- trylapack="mkl_lapack lapack" -- tryblas="mkl blas" -- ;; -- *) -- echo "The guesses for this system may not be correct - please" -- echo "e-mail ccp4@ccp4.ac.uk if you have any extra information" -- echo -- # Default guess is just libblas -- trylapack="lapack" -- tryblas="blas" -- ;; -- esac -- # -- # Search for LAPACK libraries -- # -- # Write out what the guesses are -- if test "$trylapack" ; then -- echo "Possible LAPACK library names for this system:" -- for libname in $trylapack -- do -- echo " lib$libname" -- done -- # Possible library name extensions -- tryexts="a so dylib" -- # Now loop over all the possibilities and see if anything -- # turns up -- echo -- echo "Searching for libraries with LAPACK and BLAS:" -- for testdir in $trydirs -- do -- for testlib in $trylapack -- do -- for ext in $tryexts -- do -- if test ! "$LAPACKLIB"; then -- if test -s "$testdir/lib$testlib.$ext" ; then -- echo "...found LAPACK library: $testdir/lib$testlib.$ext" -- # Now try and link to a test program -- # This is really for IRIX where libraries can be -- # o32 or n32 -- echo " Testing: try to link library against test program" -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF --c Test fortran program to link against library -- PROGRAM TESTLINK -- IMPLICIT NONE -- INTEGER A -- A = 1 -- STOP -- END --EOF -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib" -- test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS" -- echo $test_compile -- if { (eval $test_compile ) 2>&1; } && test -s testlink ; then -- have_lapack=yes -- else --# cover clapack option -- echo $test_ccompile -- if { (eval $test_ccompile ) 2>&1; } && test -s testlink ; then -- have_lapack=yes -- fi -- fi -- if test x$have_lapack = xyes ; then -- # This one is okay -- LAPACKLIB="$testlib" -- LAPACKDIR="$testdir" -- echo "Link ok - using lib$LAPACKLIB from $LAPACKDIR" -- # -- XLAPACK_LIB="-L$LAPACKDIR -l$LAPACKLIB" -- # -- # Test to see if we need BLAS too -- # Do this by trying to compile a test program -- # Use the LSAME test for now -- echo -- echo " * Checking whether we need a separate BLAS library *" -- echo " Testing: try linking library against test program" -- cd lib/lapack/test -- if test -f testlsame ; then -- rm -f testsame testlsame.o -- fi -- test_compile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB" -- test_ccompile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB $XLDFLAGS" -- echo $test_compile -- if { ( eval $test_compile) 2>&1;} && test -s testlsame ; then -- have_blas=yes -- else --#cblas route -- echo $test_ccompile -- if { ( eval $test_ccompile) 2>&1;} && test -s testlsame ; then -- have_blas=yes -- fi -- fi -- if test x$have_blas = xyes ; then -- echo "Test program okay - additional separate BLAS not required" -- noblas=yes -- else -- echo "Test program failed - need a separate BLAS library" -- fi -- cd ../../.. -- else -- # Keep looking -- echo " link failed - cannot use lib$testlib" -- fi -- fi -- fi -- done -- done -- if test ! "$LAPACKLIB"; then -- echo "...nothing in $testdir" -- fi -- done -- fi -- -- # If LAPACKLIB hasn't been set at this point then no LAPACK library -- # was found -- if test ! "$LAPACKLIB" ; then -- echo -- echo "No pre-existing LAPACK library found - NetLib LAPACK will be built instead" -- make_lapack=lapacklib -- fi -- # Look for possible BLAS -- if test ! "$noblas" ; then -- if test "$tryblas" ; then -- echo -- echo "Possible BLAS library names for this system:" -- for libname in $tryblas -- do -- echo " lib$libname" -- done -- # Possible library name extensions -- tryexts="a so" -- # Now loop over all the possibilities and see if anything -- # turns up -- echo -- echo "Searching for libraries with BLAS:" -- for testdir in $trydirs -- do -- for testlib in $tryblas -- do -- for ext in $tryexts -- do -- if test ! "$BLASLIB"; then -- if test -s "$testdir/lib$testlib.$ext" ; then -- echo "...found BLAS library: $testdir/lib$testlib.$ext" -- # Now try and link to a test program -- # This is really for IRIX where libraries can be -- # o32 or n32 -- echo " Testing: try to link library against test program" -- if test -f testlink.f || test -f testlink ; then -- rm -f testlink* -- fi -- cat > testlink.f <<EOF --c Test fortran program to link against library -- PROGRAM TESTLINK -- IMPLICIT NONE -- INTEGER A -- A = 1 -- STOP -- END --EOF -- test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib" -- test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS" -- echo $test_compile -- if { ( eval $test_compile) 2>&1;} && test -s testlink ; then -- have_blas=yes -- else -- echo $test_ccompile -- if { ( eval $test_compile) 2>&1;} && test -s testlink ; then -- have_blas=yes -- fi -- fi -- if test x$have_blas = xyes ; then -- # This one is okay -- BLASLIB="$testlib" -- BLASDIR="$testdir" -- BLASEXT="$ext" -- echo "Link ok - using lib$BLASLIB from $BLASDIR" -- XLAPACK_LIB="$XLAPACK_LIB -L$BLASDIR -l$BLASLIB" -- else -- # Keep looking -- echo " link failed - cannot use lib$testlib" -- fi -- fi -- fi -- done -- done -- if test ! "$BLASLIB"; then -- echo "...nothing in $testdir" -- fi -- done -- fi -- # Do we need to build BLAS too? -- if test ! "$BLASLIB" ; then -- echo -- echo "No pre-existing BLAS library was found - NetLib BLAS will be built instead" -- echo "This may result in poorer performance of the LAPACK routines" -- make_blas=blaslib -- BLASLIB=blas -- BLASDIR="$srcdir/lib/lapack" -- BLASEXT="a" -- fi -- fi -+ # gentoo is clever -+ make_blas= -+ make_lapack= -+ BLASLIB=$(${PKG_CONFIG} --libs lapack) -+ LAPACKLIB=$(${PKG_CONFIG} --libs lapack) -+ XLAPACK_LIB="${BLASLIB} ${LAPACKLIB}" -+ XFFLAGS_LAPACK="$(${PKG_CONFIG} --cflags lapack blas)" - # Otherwise force building of NetLib BLAS and LAPACK libs -- else -- echo -- echo "! Force building of NetLib BLAS and LAPACK..." -- make_blas=blaslib -- make_lapack=lapacklib -- BLASLIB=blas -- BLASDIR="$srcdir/lib/lapack" -- BLASEXT="a" -- fi - # need to know if we the lapack library was linked using the C or - # fortran linker - if test -f testlink.f || test -f testlink || test -f testlink.c ; then -@@ -3916,8 +3356,8 @@ RANLIB = ${RANLIB} - INSTALL_DATA = ${INSTALL_DATA} - libdir = $libdir - # --BLASLIB = lib${BLASLIB}.${BLASEXT} --LAPACKLIB = liblapack.a -+BLASLIB = ${BLASLIB} -+LAPACKLIB = ${LAPACKLIB} - # - # These variables define targets in the main Makefile - blaslib = ${make_blas} diff --git a/sci-libs/ccp4-libs/files/6.1.3-link-proberly.patch b/sci-libs/ccp4-libs/files/6.1.3-link-proberly.patch deleted file mode 100644 index 24a0a2d8e4a2..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-link-proberly.patch +++ /dev/null @@ -1,230 +0,0 @@ ---- lib/src/Makefile.in 2009-03-02 17:53:15.000000000 +0100 -+++ lib/src/Makefile.in.new 2009-03-02 17:52:09.000000000 +0100 -@@ -172,9 +172,8 @@ - - ##### Makefile targets ###### - --all: fsplit $(LMMDB) $(LC) $(LF) $(SCRIPT_MODULES) -+all: fsplit $(LMMDB) LMMDB_SO $(LC) LC_SO $(LF) LF_SO $(SCRIPT_MODULES) - # maybe create shared library -- $(SHARE_LIB) - - $(LC) : $(CORELIBOBJS) $(CGENERALOBJS) $(CUCOBJS) $(CMTZOBJS) $(CMAPOBJS) $(CSYMOBJS) - $(AR) $(LC) $? -@@ -186,6 +185,27 @@ - $(AR) $(LF) $(FINTERFACEOBJS) - $(RANLIB) $@ - -+LMMDB_SO : -+ $(CC) $(COPTIM) -shared -Wl,-soname,libmmdb.so.0 -o libmmdb.so.0.0.0 \ -+ $(MMDBOBJS) && \ -+ ln -sf libmmdb.so.0.0.0 libmmdb.so.0 && \ -+ ln -sf libmmdb.so.0.0.0 libmmdb.so -+ -+LC_SO : -+ $(CC) $(COPTIM) -shared -Wl,-soname,libccp4c.so.0 -o libccp4c.so.0.0.0 \ -+ $(CORELIBOBJS) $(CGENERALOBJS) $(CUCOBJS) $(CMTZOBJS) $(CMAPOBJS) $(CSYMOBJS) && \ -+ ln -sf libccp4c.so.0.0.0 libccp4c.so.0 && \ -+ ln -sf libccp4c.so.0.0.0 libccp4c.so -+ -+LF_SO : -+ $(FC) $(FOPTIM) -shared -Wl,-soname,libccp4f.so.0 -o libccp4f.so.0.0.0 \ -+ parser.dir/*.o ccplib.dir/*.o lgglib.dir/*.o plot84lib.dir/*.o \ -+ libhtml.dir/*.o pxxml.dir/*.o rwbrook.dir/*.o cciflib.dir/*.o \ -+ harvlib.dir/*.o keyparse.dir/*.o dna_output.dir/*.o plotsubs.dir/*.o \ -+ modlib.dir/*.o fftlib.dir/*.o unix.dir/*.o pack_f.o pack_c.o $(FINTERFACEOBJS) && \ -+ ln -sf libccp4f.so.0.0.0 libccp4f.so.0 && \ -+ ln -sf libccp4f.so.0.0.0 libccp4f.so -+ - # cmtz library only - - cmtz: $(LCMTZ) -@@ -339,9 +356,7 @@ - fi - cd parser.dir && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f parser.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done - parser : parser.o - $(RANLIB) $(LF) - -@@ -351,9 +366,7 @@ - echo ' END' >> ccplib.dir/ccplib.$F - cd ccplib.dir && $(fsplit_dir)/fsplit $(srcdir)/ccplib.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f ccplib.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done - ccplib : ccplib.o - $(RANLIB) $(LF) - -@@ -364,9 +377,7 @@ - @$(SETFLAGS) ; \ - cd lgglib.dir && $(fsplit_dir)/fsplit $(srcdir)/lgglib.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- eval $(FC) -c $${lgglib_FLAGS-"$(FFLAGS)"} $(SHARED_LIB_FFLAGS) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f lgglib.dir/*.o -+ eval $(FC) -c $${lgglib_FLAGS-"$(FFLAGS)"} $(SHARED_LIB_FFLAGS) $$i; done - lgglib : lgglib.o - $(RANLIB) $(LF) - -@@ -376,9 +387,7 @@ - echo ' END' >> plot84lib.dir/plot84lib.$F - cd plot84lib.dir && $(fsplit_dir)/fsplit $(srcdir)/plot84lib.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f plot84lib.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done - plot84lib : plot84lib.o - $(RANLIB) $(LF) - -@@ -388,9 +397,7 @@ - echo ' END' >> libhtml.dir/libhtml.$F - cd libhtml.dir && $(fsplit_dir)/fsplit $(srcdir)/libhtml.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f libhtml.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done - libhtml : libhtml.o - $(RANLIB) $(LF) - -@@ -400,9 +407,7 @@ - echo ' END' >> pxxml.dir/pxxml.$F - cd pxxml.dir && $(fsplit_dir)/fsplit $(srcdir)/pxxml.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f pxxml.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done - pxxml : pxxml.o - $(RANLIB) $(LF) - -@@ -412,9 +417,7 @@ - echo ' END' >> rwbrook.dir/rwbrook.$F - cd rwbrook.dir && $(fsplit_dir)/fsplit $(srcdir)/rwbrook.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f rwbrook.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done - rwbrook : rwbrook.o - $(RANLIB) $(LF) - -@@ -424,9 +427,7 @@ - echo ' END' >> cciflib.dir/cciflib.$F - cd cciflib.dir && $(fsplit_dir)/fsplit $(srcdir)/cciflib.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f cciflib.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done - cciflib : cciflib.o - $(RANLIB) $(LF) - -@@ -440,9 +441,7 @@ - && $(AR) ../$(LF) *.o ; else \ - cd harvlib.dir && $(fsplit_dir)/fsplit $(srcdir)/harv_dummy.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done\ -- && $(AR) ../$(LF) *.o ; fi -- rm -f harvlib.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done; fi - harvlib : harvlib.o - $(RANLIB) $(LF) - -@@ -452,9 +451,7 @@ - echo ' END' >> keyparse.dir/keyparse.$F - cd keyparse.dir && $(fsplit_dir)/fsplit $(srcdir)/keyparse.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f keyparse.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done - keyparse : keyparse.o - $(RANLIB) $(LF) - -@@ -464,9 +461,7 @@ - echo ' END' >> dna_output.dir/dna_output.$F - cd dna_output.dir && $(fsplit_dir)/fsplit $(srcdir)/dna_output.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -I$(srcdir) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f dna_output.dir/*.o -+ $(FC) -I$(srcdir) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done - dna_output : dna_output.o - $(RANLIB) $(LF) - -@@ -474,10 +469,9 @@ - # for ipdisp. May be useful but could be moved. - $(LF)(pack_c.o): $(srcdir)/pack_c.c $(srcdir)/pack_c.h - $(CC) $(CFLAGS) $(SHARED_LIB_CFLAGS) -I$(srcdir) -c $(srcdir)/pack_c.c -- $(AR) $(LF) pack_c.o && rm pack_c.o -+ $(AR) $(LF) pack_c.o - $(LF)(pack_f.o): $(srcdir)/pack_f.f -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $(srcdir)/pack_f.$(F) && $(AR) $(LF) pack_f.o \ -- && rm pack_f.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $(srcdir)/pack_f.$(F) && $(AR) $(LF) pack_f.o - pack: $(LF)(pack_c.o) $(LF)(pack_f.o) - $(RANLIB) $(LF) - -@@ -488,9 +482,7 @@ - echo ' END' >> sorting_main.dir/sorting_main.$F - cd sorting_main.dir && $(fsplit_dir)/fsplit $(srcdir)/sorting_main.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f sorting_main.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done - sorting_main : sorting_main.o - $(RANLIB) $(LF) - -@@ -500,9 +492,7 @@ - echo ' END' >> plotsubs.dir/plotsubs.$F - cd plotsubs.dir && $(fsplit_dir)/fsplit $(srcdir)/plotsubs.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f plotsubs.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done - plotsubs : plotsubs.o - $(RANLIB) $(LF) - -@@ -512,9 +502,7 @@ - echo ' END' >> modlib.dir/modlib.$F - cd modlib.dir && $(fsplit_dir)/fsplit $(srcdir)/modlib.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f modlib.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done - modlib : modlib.o - $(RANLIB) $(LF) - -@@ -524,9 +512,7 @@ - echo ' END' >> fftlib.dir/fftlib.$F - cd fftlib.dir && $(fsplit_dir)/fsplit $(srcdir)/fftlib.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done \ -- && $(AR) ../$(LF) *.o -- rm -f fftlib.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done - fftlib : fftlib.o - $(RANLIB) $(LF) - -@@ -541,9 +527,7 @@ - echo ' END' >> unix.dir/unix.f - cd unix.dir && $(fsplit_dir)/fsplit ../unix.f >/dev/null && $(RMEMPTY) && \ - for i in `pwd`/*.$F; do \ -- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ -- && $(AR) ../$(LF) *.o -- rm -f unix.dir/*.o -+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done - unix : unix.o - $(RANLIB) $(LF) - diff --git a/sci-libs/ccp4-libs/files/6.1.3-no-pypath.patch b/sci-libs/ccp4-libs/files/6.1.3-no-pypath.patch deleted file mode 100644 index 6a0cb5be7c3d..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-no-pypath.patch +++ /dev/null @@ -1,87 +0,0 @@ - include/ccp4.setup-bash | 8 -------- - include/ccp4.setup-csh | 11 ----------- - include/ccp4.setup-sh | 8 -------- - include/ccp4.setup-zsh | 10 ---------- - 4 files changed, 37 deletions(-) - -diff --git a/include/ccp4.setup-bash b/include/ccp4.setup-bash -index 3a67791..80aef23 100755 ---- a/include/ccp4.setup-bash -+++ b/include/ccp4.setup-bash -@@ -185,14 +185,6 @@ else - fi - fi - --#Python path for the subprocess fixed module -- --if [ $ccp4_first_in_path -eq 1 ]; then -- setenv PYTHONPATH ${CCP4}/share/python:${PYTHONPATH} --else -- setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/python --fi -- - ### PLOT_COMMAND PRINT_COMMAND for the XCCPJIFFY programs to compile ### - setenv PLOT_COMMAND 'lp -s -dmicrolaser' - setenv PRINT_COMMAND 'lp -s -denscript' -diff --git a/include/ccp4.setup-csh b/include/ccp4.setup-csh -index 10d3ab8..72cc479 100755 ---- a/include/ccp4.setup-csh -+++ b/include/ccp4.setup-csh -@@ -177,17 +177,6 @@ else - endif - endif - --#Python path for the subprocess fixed module --if (${?PYTHONPATH}) then -- if ($ccp4_first_in_path) then -- setenv PYTHONPATH ${CCP4}/share/python:${PYTHONPATH} -- else -- setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/python -- endif --else -- setenv PYTHONPATH ${CCP4}/share/python --endif -- - ### PLOT_COMMAND PRINT_COMMAND for the XCCPJIFFY programs to compile ### - setenv PLOT_COMMAND 'lp -s -dmicrolaser' - setenv PRINT_COMMAND 'lp -s -denscript' -diff --git a/include/ccp4.setup-sh b/include/ccp4.setup-sh -index 2298bba..44643ab 100755 ---- a/include/ccp4.setup-sh -+++ b/include/ccp4.setup-sh -@@ -225,14 +225,6 @@ test -r $CCP4/include/ccp4.msg && cat $CCP4/include/ccp4.msg - - ################### EXPERIENCED USERS STOP HERE ##################### - --#Python path for the subprocess fixed module -- --if test $ccp4_first_in_path -eq 1; then -- export PYTHONPATH=${CCP4}/share/python:${PYTHONPATH} --else -- export PYTHONPATH=${PYTHONPATH}:${CCP4}/share/python --fi -- - ################### THE REST SHOULDN'T NEED EDITING ##################### - - ### dbCCP4i database handler setup ### -diff --git a/include/ccp4.setup-zsh b/include/ccp4.setup-zsh -index 660b35b..e453db9 100755 ---- a/include/ccp4.setup-zsh -+++ b/include/ccp4.setup-zsh -@@ -154,16 +154,6 @@ export CCP4_BIN=$CBIN - CLASSPATH=$CBIN:$CLASSPATH # edit this if necessary - export CLASSPATH - --#Python path for the subprocess fixed module -- --if ($ccp4_first_in_path) then -- PYTHONPATH=${CCP4}/share/python:${PYTHONPATH} -- export PYTHONPATH --else -- PYTHONPATH=${PYTHONPATH}:${CCP4}/share/python -- export PYTHONPATH --fi -- - ### PLOT_COMMAND PRINT_COMMAND for the XCCPJIFFY programs to compile ### - export PLOT_COMMAND='lpr' - export PRINT_COMMAND='lpr' diff --git a/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch b/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch deleted file mode 100644 index c1479f2b1155..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index ac552fe..fab1a87 100755 ---- a/Makefile.in -+++ b/Makefile.in -@@ -30,8 +30,7 @@ lapacklib : FORCE - - cciflib : FORCE - if test -n "$(ccifdir)"; then cd $(ccifdir); \ -- $(MAKE) $(MFLAGS) $(MVARS); else true; fi; \ -- $(MAKE) install -+ $(MAKE) $(MFLAGS) $(MVARS); else true; fi - - cctbx: FORCE - if test -n "$(cctbxdir)"; then cd $(top_srcdir)/$(cctbxdir); \ -@@ -40,8 +39,7 @@ cctbx: FORCE - libdir : FORCE lapacklib cciflib libccp4 clipper ssm diffractionImg - - libccp4: FORCE -- cd lib/src; $(MAKE) $(MFLAGS) $(MVARS) ; \ -- $(MAKE) install -+ cd lib/src; $(MAKE) $(MFLAGS) $(MVARS) - - share : FORCE - cd share; $(MAKE) $(MFLAGS) $(MVARS) -@@ -51,18 +49,15 @@ ccp4i : FORCE - - clipper: FORCE fftw - if test -n "$(clipperdir)"; then cd $(top_srcdir)/lib/clipper/clipper; \ -- $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi ; \ -- $(MAKE) install -+ $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi - - diffractionImg: - if test -n "$(diffimdir)"; then cd $(top_srcdir)/$(diffimdir); \ -- $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi ; \ -- $(MAKE) install -+ $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi - - ssm: - if test -n "$(ssmdir)"; then cd $(top_srcdir)/$(ssmdir); \ -- $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi ; \ -- $(MAKE) install -+ $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi - - fftw: FORCE - if test -n "$(fftwdir)"; then cd $(top_srcdir)/lib/fftw; \ -@@ -79,7 +74,7 @@ unsupported : FORCE libdir - $(MAKE) $(MFLAGS) $(MVARS); else true; fi - - datadir : FORCE libdir -- cd lib/data; $(MAKE) $(MFLAGS) $(MVARS) -+ cd lib/data; $(MAKE) $(MFLAGS) $(MVARS) font84.dat - - xwindir : FORCE libdir - if test -f x-windows/Makefile; then cd x-windows; \ -diff --git a/lib/ccif/Makefile.in b/lib/ccif/Makefile.in -index 975f1d9..75eda9f 100755 ---- a/lib/ccif/Makefile.in -+++ b/lib/ccif/Makefile.in -@@ -371,11 +371,11 @@ condition.h condition_list.h: $(srcdir)/condition.list $(srcdir)/condition.awk - # - - install : all -- $(INSTALL_DATA) `pwd`/$L $(libdir)/$L -- $(INSTALL_DATA) `pwd`/$(CIFMMLIB) $(libdir)/$(CIFMMLIB) -- $(RANLIB) $(libdir)/$L -+ $(RANLIB) $L -+ $(INSTALL_DATA) `pwd`/$L $(DESTDIR)/$(libdir)/$L -+ $(INSTALL_DATA) `pwd`/$(CIFMMLIB) $(DESTDIR)$(libdir)/$(CIFMMLIB) - if (test -f $(SHARED_LIB_NAME)); then \ -- $(INSTALL_DATA) `pwd`/$(SHARED_LIB_NAME) $(libdir)/$(SHARED_LIB_NAME); \ -+ $(INSTALL_DATA) `pwd`/$(SHARED_LIB_NAME) $(DESTDIR)/$(libdir)/$(SHARED_LIB_NAME); \ - fi - - uninstall : -diff --git a/lib/data/Makefile.in b/lib/data/Makefile.in -index cc25c5c..017502d 100755 ---- a/lib/data/Makefile.in -+++ b/lib/data/Makefile.in -@@ -30,9 +30,9 @@ font84.dat : fontpack $(srcdir)/font84.ascii - - install : all - -rm -f font84.dat -- test -f font84.ascii || $(LNS) $(srcdir)/font84.ascii . -- ./fontpack -- $(INSTALL) `pwd`/font84.dat $(libdir)/font84.dat -+ test -f font84.ascii || $(LNS) $(DESTDIR)/$(srcdir)/font84.ascii . -+ LD_LIBRARY_PATH="../src:../ccif" ./fontpack -+ $(INSTALL) `pwd`/font84.dat $(DESTDIR)/$(libdir)/font84.dat - - uninstall : - -rm -f $(libdir)/font84.dat -diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in -index b32dd1e..6aa107d 100755 ---- a/lib/src/Makefile.in -+++ b/lib/src/Makefile.in -@@ -685,7 +685,7 @@ testlib : $(srcdir)/testlib.f $(LF) - # - - install-ccp4HEADERS: $(ccp4_HEADERS) -- if test ! -d $(DESTDIR)$(includedir)/ccp4; then mkdir $(DESTDIR)$(includedir)/ccp4; fi -+ if test ! -d $(DESTDIR)$(includedir)/ccp4; then mkdir -p $(DESTDIR)$(includedir)/ccp4; fi - @list='$(ccp4_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -@@ -716,11 +716,11 @@ uninstall-mmdbHEADERS: - rm -f $(DESTDIR)$(includedir)/mmdb/$$f; \ - done - --install : all install-ccp4HEADERS install-mmdbHEADERS -- $(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC) -- $(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF) -- $(RANLIB) $(libdir)/$(LC) -- $(RANLIB) $(libdir)/$(LF) -+install : all install-ccp4HEADERS -+ $(RANLIB) $(LC) -+ $(RANLIB) $(LF) -+ $(INSTALL_DATA) `pwd`/$(LC) $(DESTDIR)/$(libdir)/$(LC) -+ $(INSTALL_DATA) `pwd`/$(LF) $(DESTDIR)/$(libdir)/$(LF) - $(SHARE_INST) - - uninstall : uninstall-ccp4HEADERS uninstall-mmdbHEADERS -diff --git a/lib/ssm/Makefile.in b/lib/ssm/Makefile.in -index 27d3aa2..0a14fe5 100755 ---- a/lib/ssm/Makefile.in -+++ b/lib/ssm/Makefile.in -@@ -375,12 +375,12 @@ distclean-libtool: - uninstall-info-am: - install-library_includeHEADERS: $(library_include_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(library_includedir)" || $(mkdir_p) "$(DESTDIR)$(library_includedir)" -+ test -z "$(library_includedir)" || $(mkdir_p) "$(DESTDIR)$(library_includedir)/ssm" - @list='$(library_include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(library_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(library_includedir)/$$f'"; \ -- $(library_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(library_includedir)/$$f"; \ -+ echo " $(library_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(library_includedir)/ssm/$$f'"; \ -+ $(library_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(library_includedir)/ssm/$$f"; \ - done - - uninstall-library_includeHEADERS: diff --git a/sci-libs/ccp4-libs/files/6.1.3-overflows.patch b/sci-libs/ccp4-libs/files/6.1.3-overflows.patch deleted file mode 100644 index 0e3c941d1cc2..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-overflows.patch +++ /dev/null @@ -1,35 +0,0 @@ -Fix overflows and array subscript above array bounds - -http://bugs.gentoo.org/show_bug.cgi?id=339706 - ---- ccp4-6.1.3/lib/ccif/f_interface.c -+++ ccp4-6.1.3/lib/ccif/f_interface.c -@@ -926,7 +926,7 @@ - #endif - - { -- char logname_c[81]; -+ char logname_c[MAXFLEN]; - size_t Length; - int unit; - CIF_FILE_LIST file_list_entry; -@@ -4064,7 +4064,7 @@ - #endif - - { -- char lognam_c[81], *blknam_c; -+ char lognam_c[MAXFLEN], *blknam_c; - size_t loglen, blklen; - int i, j, new; - ---- ccp4-6.1.3/lib/src/ccp4_diskio_f.c -+++ ccp4-6.1.3/lib/src/ccp4_diskio_f.c -@@ -705,7 +705,7 @@ - log_name = strdup("diskio.dft"); - if (!(file_name = getenv(log_name))) - file_name = log_name; -- for ( *istrm = 1; *istrm == MAXFILES; *istrm++) -+ for ( *istrm = 1; *istrm < MAXFILES; *istrm++) - if (!strcmp(file_name,_ioChannels[*istrm]->iobj->name)) break; - } - if (*istrm != MAXFILES) { diff --git a/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs-ng.patch b/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs-ng.patch deleted file mode 100644 index 4271d5b76aec..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs-ng.patch +++ /dev/null @@ -1,367 +0,0 @@ -diff --git a/lib/DiffractionImage/DiffractionImageCBF.cpp b/lib/DiffractionImage/DiffractionImageCBF.cpp -index 69b32b0..602e35f 100755 ---- a/lib/DiffractionImage/DiffractionImageCBF.cpp -+++ b/lib/DiffractionImage/DiffractionImageCBF.cpp -@@ -6,10 +6,10 @@ - // images. - - #include "DiffractionImage.h" --#include "cbf.h" --#include "cbf_simple.h" --#include "cbf_string.h" --#include "cbf_byte_offset.h" -+#include <cbflib/cbf.h> -+#include <cbflib/cbf_simple.h> -+#include <cbflib/cbf_string.h> -+#include <cbflib/cbf_byte_offset.h> - - - using namespace std; -diff --git a/lib/DiffractionImage/MAR/Makefile.am b/lib/DiffractionImage/MAR/Makefile.am -index fedb7ac..89a048e 100755 ---- a/lib/DiffractionImage/MAR/Makefile.am -+++ b/lib/DiffractionImage/MAR/Makefile.am -@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = gnu - - noinst_LTLIBRARIES = libmar.la - --AM_CPPFLAGS =-I../CBFlib/src -I../CBFlib/include -+AM_CPPFLAGS = - - libmar_la_SOURCES = mar300_header.c \ - mar345_header.c \ -@@ -12,4 +12,3 @@ libmar_la_SOURCES = mar300_header.c \ - utils.c \ - pck.c - --libmar_la_LDFLAGS = -static -diff --git a/lib/DiffractionImage/MAR/marcif.c b/lib/DiffractionImage/MAR/marcif.c -index d3f4212..2c37108 100755 ---- a/lib/DiffractionImage/MAR/marcif.c -+++ b/lib/DiffractionImage/MAR/marcif.c -@@ -31,8 +31,7 @@ - #include "marcif_header.h" - #include "mar345_header.h" - --#include <cbf.h> --#include <img.h> -+#include <cbflib/cbf.h> - - #define printe(x) printf("%s: %s: %s\n",prg,f,x) - #undef cbf_failnez -diff --git a/lib/DiffractionImage/Makefile.am b/lib/DiffractionImage/Makefile.am -index 189a1d7..6652576 100755 ---- a/lib/DiffractionImage/Makefile.am -+++ b/lib/DiffractionImage/Makefile.am -@@ -1,7 +1,9 @@ - AUTOMAKE_OPTIONS = gnu --SUBDIRS = CBFlib Bruker MAR Rigaku jpg -+SUBDIRS = Bruker MAR Rigaku - --AM_CPPFLAGS =-I./MAR -I./CBFlib/src -I./CBFlib/include -I./jpg -+SYSLIBS = -ljpeg -lcbf -+ -+AM_CPPFLAGS =-I./MAR - lib_LTLIBRARIES = libDiffImage.la - - if WANT_PYTHONMOD -@@ -35,48 +37,56 @@ libDiffImage_la_SOURCES = DiffractionImageJpeg.cpp \ - Profile.cpp \ - Peak.cpp \ - dps_peaksearch_cn.c --libDiffImage_la_LDFLAGS = -static -+libDiffImage_la_LDFLAGS = -shared $(SHARED_LIB_FLAGS) -+libDiffImage_la_LIBADD = $(SYSLIBS) \ -+ ./MAR/libmar.la ./Bruker/libbruker.la \ -+ ./Rigaku/librigaku.la - --libDiffractionImage_la_DEPENDENCIES= libDiffImage.la ./CBFlib/src/libcbf.la \ -+libDiffractionImage_la_DEPENDENCIES= libDiffImage.la \ - ./Bruker/libbruker.la ./MAR/libmar.la \ -- ./Rigaku/librigaku.la ./jpg/libjpeg.la -+ ./Rigaku/librigaku.la - libDiffractionImage_la_SOURCES = DiffractionImageTclInterface.cpp --libDiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \ -- ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \ -- --no-whole-archive -rpath '$(libdir)' -+libDiffractionImage_la_LDFLAGS = -shared --whole-archive $(SHARED_LIB_FLAGS) -+libDiffractionImage_la_LIBADD = $(SYSLIBS) -ltcl \ -+ libDiffImage.la \ -+ ./Bruker/libbruker.la \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la - --lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \ -+lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la \ - ./Bruker/libbruker.la ./MAR/libmar.la \ -- ./Rigaku/librigaku.la ./jpg/libjpeg.la -+ ./Rigaku/librigaku.la - lib_DiffractionImage_la_SOURCES = DiffractionImagePythonInterface.cpp --lib_DiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \ -- ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \ -- --no-whole-archive -rpath '$(libdir)' -+lib_DiffractionImage_la_LDFLAGS = -shared --whole-archive $(SHARED_LIB_FLAGS) -+lib_DiffractionImage_la_LIBADD = libDiffImage.la @PYLIB@ $(SYSLIBS) \ -+ ./Bruker/libbruker.la \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la - --libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \ -+libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la \ - ./Bruker/libbruker.la ./MAR/libmar.la \ -- ./Rigaku/librigaku.la ./jpg/libjpeg.la -+ ./Rigaku/librigaku.la - libDiffractionImaJ_la_SOURCES = DiffractionImageJavaInterface.cpp --libDiffractionImaJ_la_LDFLAGS = -shared --whole-archive libDiffImage.la \ -- ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \ -- --no-whole-archive -rpath '$(libdir)' -+libDiffractionImaJ_la_LDFLAGS = -shared --whole-archive $(SHARED_LIB_FLAGS) -+libDiffractionImaJ_la_LIBADD = libDiffImage.la \ -+ ./Bruker/libbruker.la $(SYSLIBS) \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la - - bin_PROGRAMS = automask diffdump printpeaks diff2jpeg --automask_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la -+automask_LDADD = libDiffImage.la ./Bruker/libbruker.la \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la $(SYSLIBS) - automask_SOURCES = automask.cpp --diffdump_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la -+automask_LDFLAGS = $(SHARED_LIB_FLAGS) -+diffdump_LDADD = libDiffImage.la ./Bruker/libbruker.la $(SYSLIBS) \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la - diffdump_SOURCES = diffdump.cpp --printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la -+diffdump_LDFLAGS = $(SHARED_LIB_FLAGS) -+printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la $(SYSLIBS) - printpeaks_SOURCES = printpeaks.cpp --diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la -+printpeaks_LDFLAGS = $(SHARED_LIB_FLAGS) -+diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la $(SYSLIBS) - diff2jpeg_SOURCES = diff2jpeg.cpp -+diff2jpeg_LDFLAGS = $(SHARED_LIB_FLAGS) - - install-data-local: - @INSTALL_DATA@ doc/DiffractionImage.doc ${CDOC} -diff --git a/lib/DiffractionImage/configure b/lib/DiffractionImage/configure -index 3fb5784..fdf9683 100755 ---- a/lib/DiffractionImage/configure -+++ b/lib/DiffractionImage/configure -@@ -21768,7 +21768,7 @@ _ACEOF - fi - - --ac_config_files="$ac_config_files Makefile CBFlib/Makefile CBFlib/src/Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile jpg/Makefile" -+ac_config_files="$ac_config_files Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile " - - - cat >confcache <<\_ACEOF -@@ -22407,12 +22407,9 @@ do - case $ac_config_target in - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -- "CBFlib/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/Makefile" ;; -- "CBFlib/src/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/src/Makefile" ;; - "MAR/Makefile") CONFIG_FILES="$CONFIG_FILES MAR/Makefile" ;; - "Rigaku/Makefile") CONFIG_FILES="$CONFIG_FILES Rigaku/Makefile" ;; - "Bruker/Makefile") CONFIG_FILES="$CONFIG_FILES Bruker/Makefile" ;; -- "jpg/Makefile") CONFIG_FILES="$CONFIG_FILES jpg/Makefile" ;; - - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -diff --git a/lib/DiffractionImage/configure.in b/lib/DiffractionImage/configure.in -index 7f54b4b..16efc64 100755 ---- a/lib/DiffractionImage/configure.in -+++ b/lib/DiffractionImage/configure.in -@@ -21,6 +21,8 @@ if test -n "${PYTHON}" ; then - HAVE_PYTHON=1 - CPPFLAGS="${CPPFLAGS} -I${PYTHON_PREFIX}/include/python${PYTHON_VER}" - ]) -+ PYLIB="-lpython${PYTHON_VER}" -+ AC_SUBST(PYLIB) - fi - AC_CHECK_HEADER([tcl.h], [HAVE_TCL=1]) - -@@ -65,11 +67,8 @@ AM_CONDITIONAL([WANT_JAVA], test z${HAVE_JAVA} != z) - AC_CHECK_LIB([m], [sqrt]) - - AC_CONFIG_FILES([Makefile -- CBFlib/Makefile -- CBFlib/src/Makefile - MAR/Makefile - Rigaku/Makefile -- Bruker/Makefile -- jpg/Makefile]) -+ Bruker/Makefile]) - - AC_OUTPUT -diff --git a/lib/ssm/Makefile.am b/lib/ssm/Makefile.am -index e9554e1..a3ba33d 100755 ---- a/lib/ssm/Makefile.am -+++ b/lib/ssm/Makefile.am -@@ -1,7 +1,11 @@ -+ACLOCAL_AMFLAGS = -I macros - #libtool - lib_LTLIBRARIES = libssm.la -+libssm_la_LDFLAGS = -shared $(SHARED_LIB_FLAGS) -+libssm_la_CFLAGS = @MMDB_CFLAGS@ - libssm_la_SOURCES = ssm_superpose.cpp ss_csia.cpp ss_vxedge.cpp \ - ssm_align.cpp ss_graph.cpp -+libssm_la_LIBADD = @MMDB_LIBS@ - - #non libtool - #lib_LIBRARIES = libssm.a -@@ -16,12 +20,10 @@ superpose_SOURCES = superpose.cpp - - bin_PROGRAMS = superpose - --INCLUDES = $(MMDB_CXXFLAGS) -- --AM_LDFLAGS = $(MMDB_LIBS) -+INCLUDES = @MMDB_CFLAGS@ - - EXTRA_DIST = macros/mmdb.m4 - --superpose_LDADD = libssm.la -+superpose_LDADD = libssm.la @MMDB_LIBS@ - - libssm_a_AR = $(AR) $(AR_FLAGS) -diff --git a/lib/ssm/configure.ac b/lib/ssm/configure.ac -index 783cb46..d637d11 100755 ---- a/lib/ssm/configure.ac -+++ b/lib/ssm/configure.ac -@@ -28,31 +28,10 @@ AC_ARG_ENABLE(debug, - [ac_cv_enable_debug=no ] ) - - dnl Optional: Check for MMDB. --AM_PATH_MMDB(, -- [ if test "x$mmdb_prefix" != x ; then -- if test "x$ac_MMDB_CXXFLAGS" != x ; then -- case "$ac_MMDB_CXXFLAGS" in -- *src/mmdb ) -- ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#src/mmdb#src#g` -- ;; -- *include/mmdb ) -- ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#include/mmdb#lib#g` -- ;; -- *) -- esac -- MMDB_CXXFLAGS="$ac_MMDB_CXXFLAGS" -- MMDB_LIBS=`echo "$ac_MMDB_LDOPTS -lmmdb" | sed s#-I#-L#` -- AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS]) -- else -- MMDB_CXXFLAGS="-I$mmdb_prefix/lib/src/mmdb -I$mmdb_prefix/include/mmdb" -- MMDB_LIBS="-L$mmdb_prefix/lib/src -L$mmdb_prefix/lib -lmmdb" -- AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS]) -- fi -- else -- AC_MSG_WARN([mmdb not found]) -- fi -- ] --) -+ -+PKG_CHECK_MODULES([MMDB],[mmdb]) -+AC_SUBST([MMDB_CFLAGS]) -+AC_SUBST([MMDB_LIBS]) - - # Checks for typedefs, structures, and compiler characteristics. - # -@@ -67,6 +46,7 @@ AC_CHECK_FUNCS([floor pow rint sqrt]) - # test for function in m - AC_CHECK_LIB([m], [sqrt]) - -+ - AC_SUBST(AR_FLAGS) - AC_SUBST(superpose_LDFLAGS) - AM_CONDITIONAL(DEBUG, test "$ac_cv_enable_debug" = yes) -diff --git a/src/pisa/Makefile.am b/src/pisa/Makefile.am -index 094fd6b..922a131 100755 ---- a/src/pisa/Makefile.am -+++ b/src/pisa/Makefile.am -@@ -1,3 +1,4 @@ -+ACLOCAL_AMFLAGS = -I macros - SUBDIRS = molref pisastore sbase - - pkgdatadir = $(datadir)/pisa -@@ -20,8 +21,8 @@ pisa.cpp pisa_lists.cpp seq_superpose.cpp - - bin_PROGRAMS = pisa - --INCLUDES = $(MMDB_CXXFLAGS) $(SSM_CXXFLAGS) -+INCLUDES = @MMDB_CFLAGS@ $(SSM_CXXFLAGS) - --pisa_LDADD = $(SSM_LIBS) $(MMDB_LIBS) -+pisa_LDADD = $(SSM_LIBS) @MMDB_LIBS@ - - EXTRA_DIST = macros/mmdb.m4 macros/ssm.m4 pisa.cfg.in -diff --git a/src/pisa/configure.ac b/src/pisa/configure.ac -index 81afdda..4f99df6 100755 ---- a/src/pisa/configure.ac -+++ b/src/pisa/configure.ac -@@ -32,35 +32,13 @@ AC_CHECK_FUNCS([floor pow rint sqrt]) - AC_CHECK_LIB([m], [sqrt]) - - dnl Optional: Check for MMDB. --AM_PATH_MMDB(, -- [ if test "x$mmdb_prefix" != x ; then -- if test "x$ac_MMDB_CXXFLAGS" != x && test "x$ac_MMDB_LDOPTS" = x ; then -- case "$ac_MMDB_CXXFLAGS" in -- *src/mmdb ) -- ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#src/mmdb#src#g` -- ;; -- *include/mmdb ) -- ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#include/mmdb#lib#g` -- ;; -- *) -- esac -- MMDB_CXXFLAGS="$ac_MMDB_CXXFLAGS" -- MMDB_LIBS=`echo "$ac_MMDB_LDOPTS -lmmdb" | sed s#-I#-L#` -- AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS]) -- else -- MMDB_CXXFLAGS="-I$mmdb_prefix/src -I$mmdb_prefix/src/mmdb -I$mmdb_prefix/include -I$mmdb_prefix/include/mmdb" -- MMDB_LIBS="-L$mmdb_prefix/src -L$mmdb_prefix/lib -lmmdb" -- AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS]) -- fi -- else -- AC_MSG_ERROR([mmdb not found]) -- fi -- ] --) -+PKG_CHECK_MODULES([MMDB],[mmdb]) -+AC_SUBST([MMDB_CFLAGS]) -+AC_SUBST([MMDB_LIBS]) - - ac_saved_CXXFLAGS=$CXXFLAGS - ac_saved_LIBS=$LIBS --CXXFLAGS="$CXXFLAGS $MMDB_CXXFLAGS" -+CXXFLAGS="$CXXFLAGS $MMDB_CFLAGS" - LIBS="$MMDB_LIBS $LIBS" - AM_PATH_SSM(, - [ if test "x$ssm_prefix" != x ; then -diff --git a/src/rapper/Makefile.am b/src/rapper/Makefile.am -index e78b10d..486b931 100755 ---- a/src/rapper/Makefile.am -+++ b/src/rapper/Makefile.am -@@ -1,3 +1,3 @@ --SUBDIRS = libxml2 gc7.0 LOOP data -+SUBDIRS = LOOP data - - EXTRA_DIST = -diff --git a/src/rapper/configure.ac b/src/rapper/configure.ac -index 5e4ef69..11b63ec 100755 ---- a/src/rapper/configure.ac -+++ b/src/rapper/configure.ac -@@ -48,6 +48,6 @@ AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno) - - AC_SUBST(rapper_LDFLAGS) - --AC_CONFIG_SUBDIRS([gc7.0 libxml2]) -+#AC_CONFIG_SUBDIRS([gc7.0 libxml2]) - #AC_OUTPUT(Makefile LOOP/Makefile LOOP/python/Makefile data/Makefile) - AC_OUTPUT(Makefile LOOP/Makefile data/Makefile) diff --git a/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs-ng2.patch b/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs-ng2.patch deleted file mode 100644 index c787df903dfc..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs-ng2.patch +++ /dev/null @@ -1,395 +0,0 @@ - lib/DiffractionImage/DiffractionImageCBF.cpp | 8 ++-- - lib/DiffractionImage/MAR/Makefile.am | 3 +- - lib/DiffractionImage/MAR/marcif.c | 3 +- - lib/DiffractionImage/Makefile.am | 68 +++++++++++++++----------- - lib/DiffractionImage/configure | 5 +-- - lib/DiffractionImage/configure.in | 7 +-- - lib/src/Makefile.in | 2 +- - lib/ssm/Makefile.am | 10 ++-- - lib/ssm/configure.ac | 30 ++--------- - src/pisa/Makefile.am | 5 +- - src/pisa/configure.ac | 30 ++---------- - src/rapper/Makefile.am | 2 +- - src/rapper/configure.ac | 2 +- - 13 files changed, 70 insertions(+), 105 deletions(-) - -diff --git a/lib/DiffractionImage/DiffractionImageCBF.cpp b/lib/DiffractionImage/DiffractionImageCBF.cpp -index 69b32b0..602e35f 100755 ---- a/lib/DiffractionImage/DiffractionImageCBF.cpp -+++ b/lib/DiffractionImage/DiffractionImageCBF.cpp -@@ -6,10 +6,10 @@ - // images. - - #include "DiffractionImage.h" --#include "cbf.h" --#include "cbf_simple.h" --#include "cbf_string.h" --#include "cbf_byte_offset.h" -+#include <cbflib/cbf.h> -+#include <cbflib/cbf_simple.h> -+#include <cbflib/cbf_string.h> -+#include <cbflib/cbf_byte_offset.h> - - - using namespace std; -diff --git a/lib/DiffractionImage/MAR/Makefile.am b/lib/DiffractionImage/MAR/Makefile.am -index fedb7ac..89a048e 100755 ---- a/lib/DiffractionImage/MAR/Makefile.am -+++ b/lib/DiffractionImage/MAR/Makefile.am -@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = gnu - - noinst_LTLIBRARIES = libmar.la - --AM_CPPFLAGS =-I../CBFlib/src -I../CBFlib/include -+AM_CPPFLAGS = - - libmar_la_SOURCES = mar300_header.c \ - mar345_header.c \ -@@ -12,4 +12,3 @@ libmar_la_SOURCES = mar300_header.c \ - utils.c \ - pck.c - --libmar_la_LDFLAGS = -static -diff --git a/lib/DiffractionImage/MAR/marcif.c b/lib/DiffractionImage/MAR/marcif.c -index d3f4212..2c37108 100755 ---- a/lib/DiffractionImage/MAR/marcif.c -+++ b/lib/DiffractionImage/MAR/marcif.c -@@ -31,8 +31,7 @@ - #include "marcif_header.h" - #include "mar345_header.h" - --#include <cbf.h> --#include <img.h> -+#include <cbflib/cbf.h> - - #define printe(x) printf("%s: %s: %s\n",prg,f,x) - #undef cbf_failnez -diff --git a/lib/DiffractionImage/Makefile.am b/lib/DiffractionImage/Makefile.am -index 189a1d7..6652576 100755 ---- a/lib/DiffractionImage/Makefile.am -+++ b/lib/DiffractionImage/Makefile.am -@@ -1,7 +1,9 @@ - AUTOMAKE_OPTIONS = gnu --SUBDIRS = CBFlib Bruker MAR Rigaku jpg -+SUBDIRS = Bruker MAR Rigaku - --AM_CPPFLAGS =-I./MAR -I./CBFlib/src -I./CBFlib/include -I./jpg -+SYSLIBS = -ljpeg -lcbf -+ -+AM_CPPFLAGS =-I./MAR - lib_LTLIBRARIES = libDiffImage.la - - if WANT_PYTHONMOD -@@ -35,48 +37,56 @@ libDiffImage_la_SOURCES = DiffractionImageJpeg.cpp \ - Profile.cpp \ - Peak.cpp \ - dps_peaksearch_cn.c --libDiffImage_la_LDFLAGS = -static -+libDiffImage_la_LDFLAGS = -shared $(SHARED_LIB_FLAGS) -+libDiffImage_la_LIBADD = $(SYSLIBS) \ -+ ./MAR/libmar.la ./Bruker/libbruker.la \ -+ ./Rigaku/librigaku.la - --libDiffractionImage_la_DEPENDENCIES= libDiffImage.la ./CBFlib/src/libcbf.la \ -+libDiffractionImage_la_DEPENDENCIES= libDiffImage.la \ - ./Bruker/libbruker.la ./MAR/libmar.la \ -- ./Rigaku/librigaku.la ./jpg/libjpeg.la -+ ./Rigaku/librigaku.la - libDiffractionImage_la_SOURCES = DiffractionImageTclInterface.cpp --libDiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \ -- ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \ -- --no-whole-archive -rpath '$(libdir)' -+libDiffractionImage_la_LDFLAGS = -shared --whole-archive $(SHARED_LIB_FLAGS) -+libDiffractionImage_la_LIBADD = $(SYSLIBS) -ltcl \ -+ libDiffImage.la \ -+ ./Bruker/libbruker.la \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la - --lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \ -+lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la \ - ./Bruker/libbruker.la ./MAR/libmar.la \ -- ./Rigaku/librigaku.la ./jpg/libjpeg.la -+ ./Rigaku/librigaku.la - lib_DiffractionImage_la_SOURCES = DiffractionImagePythonInterface.cpp --lib_DiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \ -- ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \ -- --no-whole-archive -rpath '$(libdir)' -+lib_DiffractionImage_la_LDFLAGS = -shared --whole-archive $(SHARED_LIB_FLAGS) -+lib_DiffractionImage_la_LIBADD = libDiffImage.la @PYLIB@ $(SYSLIBS) \ -+ ./Bruker/libbruker.la \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la - --libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \ -+libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la \ - ./Bruker/libbruker.la ./MAR/libmar.la \ -- ./Rigaku/librigaku.la ./jpg/libjpeg.la -+ ./Rigaku/librigaku.la - libDiffractionImaJ_la_SOURCES = DiffractionImageJavaInterface.cpp --libDiffractionImaJ_la_LDFLAGS = -shared --whole-archive libDiffImage.la \ -- ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \ -- --no-whole-archive -rpath '$(libdir)' -+libDiffractionImaJ_la_LDFLAGS = -shared --whole-archive $(SHARED_LIB_FLAGS) -+libDiffractionImaJ_la_LIBADD = libDiffImage.la \ -+ ./Bruker/libbruker.la $(SYSLIBS) \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la - - bin_PROGRAMS = automask diffdump printpeaks diff2jpeg --automask_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la -+automask_LDADD = libDiffImage.la ./Bruker/libbruker.la \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la $(SYSLIBS) - automask_SOURCES = automask.cpp --diffdump_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la -+automask_LDFLAGS = $(SHARED_LIB_FLAGS) -+diffdump_LDADD = libDiffImage.la ./Bruker/libbruker.la $(SYSLIBS) \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la - diffdump_SOURCES = diffdump.cpp --printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la -+diffdump_LDFLAGS = $(SHARED_LIB_FLAGS) -+printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la $(SYSLIBS) - printpeaks_SOURCES = printpeaks.cpp --diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la -+printpeaks_LDFLAGS = $(SHARED_LIB_FLAGS) -+diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la $(SYSLIBS) - diff2jpeg_SOURCES = diff2jpeg.cpp -+diff2jpeg_LDFLAGS = $(SHARED_LIB_FLAGS) - - install-data-local: - @INSTALL_DATA@ doc/DiffractionImage.doc ${CDOC} -diff --git a/lib/DiffractionImage/configure b/lib/DiffractionImage/configure -index 3fb5784..fdf9683 100755 ---- a/lib/DiffractionImage/configure -+++ b/lib/DiffractionImage/configure -@@ -21768,7 +21768,7 @@ _ACEOF - fi - - --ac_config_files="$ac_config_files Makefile CBFlib/Makefile CBFlib/src/Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile jpg/Makefile" -+ac_config_files="$ac_config_files Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile " - - - cat >confcache <<\_ACEOF -@@ -22407,12 +22407,9 @@ do - case $ac_config_target in - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -- "CBFlib/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/Makefile" ;; -- "CBFlib/src/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/src/Makefile" ;; - "MAR/Makefile") CONFIG_FILES="$CONFIG_FILES MAR/Makefile" ;; - "Rigaku/Makefile") CONFIG_FILES="$CONFIG_FILES Rigaku/Makefile" ;; - "Bruker/Makefile") CONFIG_FILES="$CONFIG_FILES Bruker/Makefile" ;; -- "jpg/Makefile") CONFIG_FILES="$CONFIG_FILES jpg/Makefile" ;; - - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -diff --git a/lib/DiffractionImage/configure.in b/lib/DiffractionImage/configure.in -index 7f54b4b..16efc64 100755 ---- a/lib/DiffractionImage/configure.in -+++ b/lib/DiffractionImage/configure.in -@@ -21,6 +21,8 @@ if test -n "${PYTHON}" ; then - HAVE_PYTHON=1 - CPPFLAGS="${CPPFLAGS} -I${PYTHON_PREFIX}/include/python${PYTHON_VER}" - ]) -+ PYLIB="-lpython${PYTHON_VER}" -+ AC_SUBST(PYLIB) - fi - AC_CHECK_HEADER([tcl.h], [HAVE_TCL=1]) - -@@ -65,11 +67,8 @@ AM_CONDITIONAL([WANT_JAVA], test z${HAVE_JAVA} != z) - AC_CHECK_LIB([m], [sqrt]) - - AC_CONFIG_FILES([Makefile -- CBFlib/Makefile -- CBFlib/src/Makefile - MAR/Makefile - Rigaku/Makefile -- Bruker/Makefile -- jpg/Makefile]) -+ Bruker/Makefile]) - - AC_OUTPUT -diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in -index c23f488..9579b3b 100755 ---- a/lib/src/Makefile.in -+++ b/lib/src/Makefile.in -@@ -659,7 +659,7 @@ csymlib.o: $(srcdir)/csymlib.c $(srcdir)/csymlib.h - csymlib_f.o: $(srcdir)/csymlib_f.c $(srcdir)/csymlib.h - ccp4_unitcell.o: $(srcdir)/ccp4_unitcell.c $(srcdir)/ccp4_unitcell.h - ccp4_unitcell_f.o: $(srcdir)/ccp4_unitcell_f.c $(srcdir)/ccp4_unitcell.h --hybrid_36_f.o: $(srcdir)/hybrid_36_f.c $(mmdbsrcdir)/hybrid_36.h -+hybrid_36_f.o: $(srcdir)/hybrid_36_f.c - cvecmat.o: $(srcdir)/cvecmat.c $(srcdir)/cvecmat.h - cmtzlib_python_wrap.o: $(srcdir)/cmtzlib_python_wrap.c $(srcdir)/mtzdata.h - cmaplib_python_wrap.o: $(srcdir)/cmaplib_python_wrap.c -diff --git a/lib/ssm/Makefile.am b/lib/ssm/Makefile.am -index e9554e1..a3ba33d 100755 ---- a/lib/ssm/Makefile.am -+++ b/lib/ssm/Makefile.am -@@ -1,7 +1,11 @@ -+ACLOCAL_AMFLAGS = -I macros - #libtool - lib_LTLIBRARIES = libssm.la -+libssm_la_LDFLAGS = -shared $(SHARED_LIB_FLAGS) -+libssm_la_CFLAGS = @MMDB_CFLAGS@ - libssm_la_SOURCES = ssm_superpose.cpp ss_csia.cpp ss_vxedge.cpp \ - ssm_align.cpp ss_graph.cpp -+libssm_la_LIBADD = @MMDB_LIBS@ - - #non libtool - #lib_LIBRARIES = libssm.a -@@ -16,12 +20,10 @@ superpose_SOURCES = superpose.cpp - - bin_PROGRAMS = superpose - --INCLUDES = $(MMDB_CXXFLAGS) -- --AM_LDFLAGS = $(MMDB_LIBS) -+INCLUDES = @MMDB_CFLAGS@ - - EXTRA_DIST = macros/mmdb.m4 - --superpose_LDADD = libssm.la -+superpose_LDADD = libssm.la @MMDB_LIBS@ - - libssm_a_AR = $(AR) $(AR_FLAGS) -diff --git a/lib/ssm/configure.ac b/lib/ssm/configure.ac -index 783cb46..d637d11 100755 ---- a/lib/ssm/configure.ac -+++ b/lib/ssm/configure.ac -@@ -28,31 +28,10 @@ AC_ARG_ENABLE(debug, - [ac_cv_enable_debug=no ] ) - - dnl Optional: Check for MMDB. --AM_PATH_MMDB(, -- [ if test "x$mmdb_prefix" != x ; then -- if test "x$ac_MMDB_CXXFLAGS" != x ; then -- case "$ac_MMDB_CXXFLAGS" in -- *src/mmdb ) -- ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#src/mmdb#src#g` -- ;; -- *include/mmdb ) -- ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#include/mmdb#lib#g` -- ;; -- *) -- esac -- MMDB_CXXFLAGS="$ac_MMDB_CXXFLAGS" -- MMDB_LIBS=`echo "$ac_MMDB_LDOPTS -lmmdb" | sed s#-I#-L#` -- AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS]) -- else -- MMDB_CXXFLAGS="-I$mmdb_prefix/lib/src/mmdb -I$mmdb_prefix/include/mmdb" -- MMDB_LIBS="-L$mmdb_prefix/lib/src -L$mmdb_prefix/lib -lmmdb" -- AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS]) -- fi -- else -- AC_MSG_WARN([mmdb not found]) -- fi -- ] --) -+ -+PKG_CHECK_MODULES([MMDB],[mmdb]) -+AC_SUBST([MMDB_CFLAGS]) -+AC_SUBST([MMDB_LIBS]) - - # Checks for typedefs, structures, and compiler characteristics. - # -@@ -67,6 +46,7 @@ AC_CHECK_FUNCS([floor pow rint sqrt]) - # test for function in m - AC_CHECK_LIB([m], [sqrt]) - -+ - AC_SUBST(AR_FLAGS) - AC_SUBST(superpose_LDFLAGS) - AM_CONDITIONAL(DEBUG, test "$ac_cv_enable_debug" = yes) -diff --git a/src/pisa/Makefile.am b/src/pisa/Makefile.am -index 094fd6b..922a131 100755 ---- a/src/pisa/Makefile.am -+++ b/src/pisa/Makefile.am -@@ -1,3 +1,4 @@ -+ACLOCAL_AMFLAGS = -I macros - SUBDIRS = molref pisastore sbase - - pkgdatadir = $(datadir)/pisa -@@ -20,8 +21,8 @@ pisa.cpp pisa_lists.cpp seq_superpose.cpp - - bin_PROGRAMS = pisa - --INCLUDES = $(MMDB_CXXFLAGS) $(SSM_CXXFLAGS) -+INCLUDES = @MMDB_CFLAGS@ $(SSM_CXXFLAGS) - --pisa_LDADD = $(SSM_LIBS) $(MMDB_LIBS) -+pisa_LDADD = $(SSM_LIBS) @MMDB_LIBS@ - - EXTRA_DIST = macros/mmdb.m4 macros/ssm.m4 pisa.cfg.in -diff --git a/src/pisa/configure.ac b/src/pisa/configure.ac -index 81afdda..4f99df6 100755 ---- a/src/pisa/configure.ac -+++ b/src/pisa/configure.ac -@@ -32,35 +32,13 @@ AC_CHECK_FUNCS([floor pow rint sqrt]) - AC_CHECK_LIB([m], [sqrt]) - - dnl Optional: Check for MMDB. --AM_PATH_MMDB(, -- [ if test "x$mmdb_prefix" != x ; then -- if test "x$ac_MMDB_CXXFLAGS" != x && test "x$ac_MMDB_LDOPTS" = x ; then -- case "$ac_MMDB_CXXFLAGS" in -- *src/mmdb ) -- ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#src/mmdb#src#g` -- ;; -- *include/mmdb ) -- ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#include/mmdb#lib#g` -- ;; -- *) -- esac -- MMDB_CXXFLAGS="$ac_MMDB_CXXFLAGS" -- MMDB_LIBS=`echo "$ac_MMDB_LDOPTS -lmmdb" | sed s#-I#-L#` -- AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS]) -- else -- MMDB_CXXFLAGS="-I$mmdb_prefix/src -I$mmdb_prefix/src/mmdb -I$mmdb_prefix/include -I$mmdb_prefix/include/mmdb" -- MMDB_LIBS="-L$mmdb_prefix/src -L$mmdb_prefix/lib -lmmdb" -- AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS]) -- fi -- else -- AC_MSG_ERROR([mmdb not found]) -- fi -- ] --) -+PKG_CHECK_MODULES([MMDB],[mmdb]) -+AC_SUBST([MMDB_CFLAGS]) -+AC_SUBST([MMDB_LIBS]) - - ac_saved_CXXFLAGS=$CXXFLAGS - ac_saved_LIBS=$LIBS --CXXFLAGS="$CXXFLAGS $MMDB_CXXFLAGS" -+CXXFLAGS="$CXXFLAGS $MMDB_CFLAGS" - LIBS="$MMDB_LIBS $LIBS" - AM_PATH_SSM(, - [ if test "x$ssm_prefix" != x ; then -diff --git a/src/rapper/Makefile.am b/src/rapper/Makefile.am -index e78b10d..486b931 100755 ---- a/src/rapper/Makefile.am -+++ b/src/rapper/Makefile.am -@@ -1,3 +1,3 @@ --SUBDIRS = libxml2 gc7.0 LOOP data -+SUBDIRS = LOOP data - - EXTRA_DIST = -diff --git a/src/rapper/configure.ac b/src/rapper/configure.ac -index 5e4ef69..11b63ec 100755 ---- a/src/rapper/configure.ac -+++ b/src/rapper/configure.ac -@@ -48,6 +48,6 @@ AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno) - - AC_SUBST(rapper_LDFLAGS) - --AC_CONFIG_SUBDIRS([gc7.0 libxml2]) -+#AC_CONFIG_SUBDIRS([gc7.0 libxml2]) - #AC_OUTPUT(Makefile LOOP/Makefile LOOP/python/Makefile data/Makefile) - AC_OUTPUT(Makefile LOOP/Makefile data/Makefile) diff --git a/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs.patch b/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs.patch deleted file mode 100644 index 96978320163b..000000000000 --- a/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs.patch +++ /dev/null @@ -1,203 +0,0 @@ -diff --git a/lib/DiffractionImage/DiffractionImageCBF.cpp b/lib/DiffractionImage/DiffractionImageCBF.cpp -index 69b32b0..602e35f 100755 ---- a/lib/DiffractionImage/DiffractionImageCBF.cpp -+++ b/lib/DiffractionImage/DiffractionImageCBF.cpp -@@ -6,10 +6,10 @@ - // images. - - #include "DiffractionImage.h" --#include "cbf.h" --#include "cbf_simple.h" --#include "cbf_string.h" --#include "cbf_byte_offset.h" -+#include <cbflib/cbf.h> -+#include <cbflib/cbf_simple.h> -+#include <cbflib/cbf_string.h> -+#include <cbflib/cbf_byte_offset.h> - - - using namespace std; -diff --git a/lib/DiffractionImage/MAR/Makefile.in b/lib/DiffractionImage/MAR/Makefile.in -index 4264696..00c4d8d 100755 ---- a/lib/DiffractionImage/MAR/Makefile.in -+++ b/lib/DiffractionImage/MAR/Makefile.in -@@ -174,7 +174,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = gnu - noinst_LTLIBRARIES = libmar.la --AM_CPPFLAGS = -I../CBFlib/src -I../CBFlib/include -+AM_CPPFLAGS = - libmar_la_SOURCES = mar300_header.c \ - mar345_header.c \ - marcif.c \ -diff --git a/lib/DiffractionImage/MAR/marcif.c b/lib/DiffractionImage/MAR/marcif.c -index d3f4212..2c37108 100755 ---- a/lib/DiffractionImage/MAR/marcif.c -+++ b/lib/DiffractionImage/MAR/marcif.c -@@ -31,8 +31,7 @@ - #include "marcif_header.h" - #include "mar345_header.h" - --#include <cbf.h> --#include <img.h> -+#include <cbflib/cbf.h> - - #define printe(x) printf("%s: %s: %s\n",prg,f,x) - #undef cbf_failnez -diff --git a/lib/DiffractionImage/Makefile.in b/lib/DiffractionImage/Makefile.in -index 8197956..807cf25 100755 ---- a/lib/DiffractionImage/Makefile.in -+++ b/lib/DiffractionImage/Makefile.in -@@ -106,23 +106,19 @@ PROGRAMS = $(bin_PROGRAMS) - am_automask_OBJECTS = automask.$(OBJEXT) - automask_OBJECTS = $(am_automask_OBJECTS) - automask_DEPENDENCIES = libDiffImage.la ./Bruker/libbruker.la \ -- ./CBFlib/src/libcbf.la ./MAR/libmar.la ./Rigaku/librigaku.la \ -- ./jpg/libjpeg.la -+ ./MAR/libmar.la ./Rigaku/librigaku.la - am_diff2jpeg_OBJECTS = diff2jpeg.$(OBJEXT) - diff2jpeg_OBJECTS = $(am_diff2jpeg_OBJECTS) - diff2jpeg_DEPENDENCIES = libDiffImage.la ./Bruker/libbruker.la \ -- ./CBFlib/src/libcbf.la ./MAR/libmar.la ./Rigaku/librigaku.la \ -- ./jpg/libjpeg.la -+ ./MAR/libmar.la ./Rigaku/librigaku.la - am_diffdump_OBJECTS = diffdump.$(OBJEXT) - diffdump_OBJECTS = $(am_diffdump_OBJECTS) - diffdump_DEPENDENCIES = libDiffImage.la ./Bruker/libbruker.la \ -- ./CBFlib/src/libcbf.la ./MAR/libmar.la ./Rigaku/librigaku.la \ -- ./jpg/libjpeg.la -+ ./MAR/libmar.la ./Rigaku/librigaku.la - am_printpeaks_OBJECTS = printpeaks.$(OBJEXT) - printpeaks_OBJECTS = $(am_printpeaks_OBJECTS) - printpeaks_DEPENDENCIES = libDiffImage.la ./Bruker/libbruker.la \ -- ./CBFlib/src/libcbf.la ./MAR/libmar.la ./Rigaku/librigaku.la \ -- ./jpg/libjpeg.la -+ ./MAR/libmar.la ./Rigaku/librigaku.la - DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -284,8 +280,8 @@ target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = gnu --SUBDIRS = CBFlib Bruker MAR Rigaku jpg --AM_CPPFLAGS = -I./MAR -I./CBFlib/src -I./CBFlib/include -I./jpg -+SUBDIRS = Bruker MAR Rigaku -+AM_CPPFLAGS = -I./MAR - lib_LTLIBRARIES = libDiffImage.la $(am__append_1) $(am__append_2) \ - $(am__append_3) - libDiffImage_la_SOURCES = DiffractionImageJpeg.cpp \ -@@ -311,50 +307,50 @@ libDiffImage_la_SOURCES = DiffractionImageJpeg.cpp \ - dps_peaksearch_cn.c - - libDiffImage_la_LDFLAGS = -static --libDiffractionImage_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \ -+libDiffractionImage_la_DEPENDENCIES = libDiffImage.la \ - ./Bruker/libbruker.la ./MAR/libmar.la \ -- ./Rigaku/librigaku.la ./jpg/libjpeg.la -+ ./Rigaku/librigaku.la - - libDiffractionImage_la_SOURCES = DiffractionImageTclInterface.cpp - libDiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \ -- ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \ -+ -lcbf ./Bruker/libbruker.la \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg \ - --no-whole-archive -rpath '$(libdir)' - --lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \ -+lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la \ - ./Bruker/libbruker.la ./MAR/libmar.la \ -- ./Rigaku/librigaku.la ./jpg/libjpeg.la -+ ./Rigaku/librigaku.la - - lib_DiffractionImage_la_SOURCES = DiffractionImagePythonInterface.cpp - lib_DiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \ -- ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \ -+ -lcbf ./Bruker/libbruker.la \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg \ - --no-whole-archive -rpath '$(libdir)' - --libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \ -+libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la \ - ./Bruker/libbruker.la ./MAR/libmar.la \ -- ./Rigaku/librigaku.la ./jpg/libjpeg.la -+ ./Rigaku/librigaku.la - - libDiffractionImaJ_la_SOURCES = DiffractionImageJavaInterface.cpp - libDiffractionImaJ_la_LDFLAGS = -shared --whole-archive libDiffImage.la \ -- ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \ -+ -lcbf ./Bruker/libbruker.la \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg \ - --no-whole-archive -rpath '$(libdir)' - --automask_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la -+automask_LDADD = libDiffImage.la ./Bruker/libbruker.la -lcbf \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg - - automask_SOURCES = automask.cpp --diffdump_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la -+diffdump_LDADD = libDiffImage.la ./Bruker/libbruker.la -lcbf \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg - - diffdump_SOURCES = diffdump.cpp --printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la -+printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la -lcbf \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg - - printpeaks_SOURCES = printpeaks.cpp --diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ -- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la -+diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la -lcbf \ -+ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg - - diff2jpeg_SOURCES = diff2jpeg.cpp - all: all-recursive -diff --git a/lib/DiffractionImage/configure b/lib/DiffractionImage/configure -index 3fb5784..fdf9683 100755 ---- a/lib/DiffractionImage/configure -+++ b/lib/DiffractionImage/configure -@@ -21768,7 +21768,7 @@ _ACEOF - fi - - --ac_config_files="$ac_config_files Makefile CBFlib/Makefile CBFlib/src/Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile jpg/Makefile" -+ac_config_files="$ac_config_files Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile " - - - cat >confcache <<\_ACEOF -@@ -22407,12 +22407,9 @@ do - case $ac_config_target in - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -- "CBFlib/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/Makefile" ;; -- "CBFlib/src/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/src/Makefile" ;; - "MAR/Makefile") CONFIG_FILES="$CONFIG_FILES MAR/Makefile" ;; - "Rigaku/Makefile") CONFIG_FILES="$CONFIG_FILES Rigaku/Makefile" ;; - "Bruker/Makefile") CONFIG_FILES="$CONFIG_FILES Bruker/Makefile" ;; -- "jpg/Makefile") CONFIG_FILES="$CONFIG_FILES jpg/Makefile" ;; - - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -diff --git a/lib/DiffractionImage/configure.in b/lib/DiffractionImage/configure.in -index 7f54b4b..69b10e1 100755 ---- a/lib/DiffractionImage/configure.in -+++ b/lib/DiffractionImage/configure.in -@@ -65,11 +65,8 @@ AM_CONDITIONAL([WANT_JAVA], test z${HAVE_JAVA} != z) - AC_CHECK_LIB([m], [sqrt]) - - AC_CONFIG_FILES([Makefile -- CBFlib/Makefile -- CBFlib/src/Makefile - MAR/Makefile - Rigaku/Makefile -- Bruker/Makefile -- jpg/Makefile]) -+ Bruker/Makefile]) - - AC_OUTPUT diff --git a/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-force.patch b/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-force.patch deleted file mode 100644 index 367d53e3e4f6..000000000000 --- a/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-force.patch +++ /dev/null @@ -1,16 +0,0 @@ - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 60033eb..13ddbd0 100755 ---- a/Makefile.in -+++ b/Makefile.in -@@ -53,7 +53,7 @@ clipper: FORCE fftw - - diffractionImg: - if test -n "$(diffimdir)"; then cd $(top_srcdir)/$(diffimdir); \ -- $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi -+ $(MAKE) $(MFLAGS) $(MVARS); fi - - ssm: - if test -n "$(ssmdir)"; then cd $(top_srcdir)/$(ssmdir); \ diff --git a/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-format-security.patch b/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-format-security.patch deleted file mode 100644 index caf62bb652e2..000000000000 --- a/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-format-security.patch +++ /dev/null @@ -1,16 +0,0 @@ - lib/DiffractionImage/DiffractionImagePythonInterface.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/DiffractionImage/DiffractionImagePythonInterface.cpp b/lib/DiffractionImage/DiffractionImagePythonInterface.cpp -index f729fc5..4c24e82 100755 ---- a/lib/DiffractionImage/DiffractionImagePythonInterface.cpp -+++ b/lib/DiffractionImage/DiffractionImagePythonInterface.cpp -@@ -867,7 +867,7 @@ SWIG_Python_AddErrorMsg(const char* mesg) - Py_DECREF(old_str); - Py_DECREF(value); - } else { -- PyErr_Format(PyExc_RuntimeError, mesg); -+ PyErr_Format(PyExc_RuntimeError, "%s", mesg); - } - } - diff --git a/sci-libs/ccp4-libs/metadata.xml b/sci-libs/ccp4-libs/metadata.xml deleted file mode 100644 index c0432fefe855..000000000000 --- a/sci-libs/ccp4-libs/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-chemistry</herd> - <maintainer> - <email>jlec@gentoo.org</email> - <name>Justin Lecher (jlec)</name> - </maintainer> -</pkgmetadata> diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild index c00c31bef51f..c53cc773c56e 100644 --- a/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild +++ b/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://cci.lbl.gov/cctbx_build/results/${MY_PV}/${PN}_bundle.tar.gz -> LICENSE="cctbx-2.0" SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="+minimal openmp threads" REQUIRED_USE=" diff --git a/sci-libs/cctbx/metadata.xml b/sci-libs/cctbx/metadata.xml index a67e722f24cd..a29137496a26 100644 --- a/sci-libs/cctbx/metadata.xml +++ b/sci-libs/cctbx/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>sci-chemistry</herd> diff --git a/sci-libs/clipper/clipper-2.1.20140911.ebuild b/sci-libs/clipper/clipper-2.1.20140911.ebuild index ee35ee192e07..2fbb6cf84459 100644 --- a/sci-libs/clipper/clipper-2.1.20140911.ebuild +++ b/sci-libs/clipper/clipper-2.1.20140911.ebuild @@ -19,7 +19,7 @@ SRC_URI="ftp://ftp.ccp4.ac.uk/opensource/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="fortran static-libs test" RDEPEND=" diff --git a/sci-libs/clipper/clipper-2.1_p100511-r1.ebuild b/sci-libs/clipper/clipper-2.1_p100511-r1.ebuild deleted file mode 100644 index 1757c6960b83..000000000000 --- a/sci-libs/clipper/clipper-2.1_p100511-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils eutils flag-o-matic - -MY_PV=${PV/_p/-} -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Object-oriented libraries for crystallographic data and crystallographic computation" -HOMEPAGE="http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper.html" -SRC_URI="http://www.ysbl.york.ac.uk/~cowtan/clipper/${MY_P}-ac.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="debug static-libs" - -RDEPEND=" - sci-libs/ccp4-libs - sci-libs/fftw - sci-libs/mmdb" -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${PN}-2.1 - -PATCHES=( - "${FILESDIR}"/20091215-missing-var.patch - "${FILESDIR}"/${PV}-makefile.patch - "${FILESDIR}"/${P}-outofsourcebuild.patch - ) - -src_configure() { - # Recommended on ccp4bb/coot ML to fix crashes when calculating maps - # on 64-bit systems - append-flags -fno-strict-aliasing - - local myeconfargs=( - --enable-ccp4 - --enable-cif - --enable-cns - --enable-contrib - --enable-minimol - --enable-mmdb - --enable-phs - --with-mmdb="${EPREFIX}/usr" - $(use_enable debug) - ) - autotools-utils_src_configure -} - -src_test() { - emake -C "${AUTOTOOLS_BUILD_DIR}"/examples check -} diff --git a/sci-libs/coot-data/coot-data-2-r1.ebuild b/sci-libs/coot-data/coot-data-2-r1.ebuild deleted file mode 100644 index 1640d461d019..000000000000 --- a/sci-libs/coot-data/coot-data-2-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -DESCRIPTION="Data for the Crystallographic Object-Oriented Toolkit" -HOMEPAGE="http://www.biop.ox.ac.uk/coot/" -#SRC_URI="http://lmb.bioch.ox.ac.uk/coot/software/dependencies/reference-structures.tar.gz" -SRC_URI="mirror://gentoo/reference-structures-${PV}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="" - -RESTRICT="binchecks strip" - -S="${WORKDIR}" - -src_install() { - insinto /usr/share/coot - doins -r reference-structures - - # Coot looks in the wrong spot for the monomer library - # Listens to ccp4's CCP4_LIB rather than CLIBD_MON - cat >> "${T}"/coot <<- EOF - COOT_REFMAC_LIB_DIR="${EPREFIX}/usr/share/ccp4/" - COOT_REF_STRUCTS="${EPREFIX}/usr/share/coot/reference-structures/" - EOF - - newenvd "${T}"/coot 20coot -} diff --git a/sci-libs/coot-data/coot-data-2.ebuild b/sci-libs/coot-data/coot-data-2.ebuild deleted file mode 100644 index 2b7d33178adb..000000000000 --- a/sci-libs/coot-data/coot-data-2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" - -DESCRIPTION="Data for the Crystallographic Object-Oriented Toolkit" -HOMEPAGE="http://www.biop.ox.ac.uk/coot/" -#SRC_URI="http://www.ysbl.york.ac.uk/~emsley/software/extras/reference-structures.tar.gz" -SRC_URI="mirror://gentoo/reference-structures-${PV}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="" - -RESTRICT="binchecks strip" - -S="${WORKDIR}" - -src_install() { - insinto /usr/share/coot - doins -r reference-structures || die - - # Coot looks in the wrong spot for the monomer library - # Listens to ccp4's CCP4_LIB rather than CLIBD_MON - cat >> "${T}"/coot <<- EOF - COOT_REFMAC_LIB_DIR="${EPREFIX}/usr/share/ccp4/" - COOT_REF_STRUCTS="${EPREFIX}/usr/share/coot/reference-structures/" - EOF - - newenvd "${T}"/coot 20coot || die -} diff --git a/sci-libs/gts/gts-20121130.ebuild b/sci-libs/gts/gts-20121130.ebuild index 636bc656d718..9fbd8c448980 100644 --- a/sci-libs/gts/gts-20121130.ebuild +++ b/sci-libs/gts/gts-20121130.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://gts.sourceforge.net/tarballs/${MYP}.tar.gz" SLOT="0" LICENSE="LGPL-2" -KEYWORDS="amd64 hppa ~ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux" IUSE="doc examples static-libs test" RDEPEND="dev-libs/glib:2" diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest index 9b996f98e346..4ca66acaa656 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -1,2 +1,3 @@ DIST libindi_0.9.9.tar.gz 1275689 SHA256 720b9096baef1489fd7d7d4a236177863a7f7cec86809f21d291b0d9758e4039 SHA512 b905f59252b09cfb79d7b882ce7af8f4bd14d0b22cbff090962cfdd031c78454e5b63e930fc95a2356de5a60355afa3f83b4fa1298db9e7507778d3287df48cd WHIRLPOOL 691b17e6e0a85383b7a34db7e188150ff304579850b2e9389f9ef7c1534a0610b833aa79d12eebc4294d073c3eb3322fb9a3584f9e23a182c8ab7bdf03461b9a DIST libindi_1.0.0.tar.gz 1324146 SHA256 15cac006d2ae40214458eec560c52519d724f1e23e0f4641d9154d79a797c638 SHA512 37cf881e2006966f544f970948d001a8f1f0c466537c0bf130af019c929a067ada8a422cc33ff2fc20010ab84968bd01aa3ba10b168ed21f5938e654913f9d90 WHIRLPOOL 420a19c14354dc6a02823df608ba532ce8b7f8dfd158e124b0ca0a7497373e6d159308708bd91946fa459b4c5a58301e1298aceab58ff922f41317aabe75476d +DIST libindi_1.1.0.tar.gz 1374132 SHA256 1ca093b551580e238ac605f156535feebc6c0f9b18d7911ed44a9186f9a446af SHA512 c97767f3919d7ca9b7a3b35cda13127ecbbc6c03cf863755bad6f7f03b934b40bf857523ea7bbc22f0dcb2304d837161c295e4f769a3724240ad9539ac4158a7 WHIRLPOOL 82d8c5562b2cf31a78344d691db13b053fc966f4ce54968035da69e28a3c36ba11c759fb2c1d8695368dfb4eff5d71bb080847bf927d12b055e13fbe53a94800 diff --git a/sci-libs/indilib/indilib-1.1.0.ebuild b/sci-libs/indilib/indilib-1.1.0.ebuild new file mode 100644 index 000000000000..b3f527f6051b --- /dev/null +++ b/sci-libs/indilib/indilib-1.1.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MY_PN="lib${PN/lib/}" + +inherit cmake-utils udev + +DESCRIPTION="INDI Astronomical Control Protocol library" +HOMEPAGE="http://www.indilib.org/" +SRC_URI="mirror://sourceforge/${PN/lib/}/${MY_PN}_${PV}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0/1" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND=" + sci-libs/cfitsio + sci-libs/libnova + sci-libs/gsl + sys-libs/zlib + virtual/jpeg:0 + virtual/libusb:0 +" +DEPEND="${RDEPEND} + sys-kernel/linux-headers +" + +DOCS=( AUTHORS ChangeLog README TODO ) + +S=${WORKDIR}/${MY_PN}_${PV} + +src_configure() { + local mycmakeargs=( + -DUDEVRULES_INSTALL_DIR="$(get_udevdir)" + ) + + cmake-utils_src_configure +} diff --git a/sci-libs/itpp/Manifest b/sci-libs/itpp/Manifest index 9cead3b0979a..880b00c66489 100644 --- a/sci-libs/itpp/Manifest +++ b/sci-libs/itpp/Manifest @@ -1,3 +1 @@ -DIST itpp-4.2.tar.bz2 1050157 SHA256 732c7de212dddfd8669ef3e4d164d5d9a2f81302f3921ddd0176cfa8c49c556c SHA512 319296c5d929201fcdfb32ad59b3304d3620d921c1d08feb1d138fecb37305f71f825b4fc45d563ba817eb6ac92fb9223c32d4260013ef1d30a2e1e8edf52a2f WHIRLPOOL 4af9e5326b9a94013c173d650ac5c92105e21731ef6398e707808219831158bd995060a860d31d6874a56b96123bb5e646600f45ee6f4fb185d3e9c1b349ddc7 -DIST itpp-4.3.0.tar.bz2 1196432 SHA256 009b38929eef60be12abd6f516da535d9ea01872cd4b8ec537cfe40311ad5f64 SHA512 e2ad944cdb1325676465920d692577f86885252f9e9eb068084b0edaca17dffd33793e5c502572c21f77b47f8d8f45522ea6a945eb5548553305ab23904a04fa WHIRLPOOL 87a823313363806e894297f23b20bb0cdc11e72cf3388d25cf57c27820793f7c5c41e4a593a954dc431d2f473052defc5bedbdc9e547830d5ceb54f31cb0e6b0 DIST itpp-4.3.1.tar.bz2 1289687 SHA256 50717621c5dfb5ed22f8492f8af32b17776e6e06641dfe3a3a8f82c8d353b877 SHA512 b46d048fa7f33e80d2291a5e38e205c159791ea200f92c70d69e8ad8447ac2f0c847fece566a99af739853a1643cb16e226b4200c8bf115417f324e6d38c66bd WHIRLPOOL e4791babcdb9e874a29b8f628af000e93fc316a7da0199713e7b840317d1b1109e4350c7582a3f88db3fe8be03ff8ee93b40712b77f61faa155acc668f39c0e0 diff --git a/sci-libs/itpp/files/itpp-4.0.6-gcc44.patch b/sci-libs/itpp/files/itpp-4.0.6-gcc44.patch deleted file mode 100644 index 6514363a4b48..000000000000 --- a/sci-libs/itpp/files/itpp-4.0.6-gcc44.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -ur itpp-4.0.6.orig/itpp/base/timing.cpp itpp-4.0.6/itpp/base/timing.cpp ---- itpp-4.0.6.orig/itpp/base/timing.cpp 2008-10-08 14:52:24.000000000 +0300 -+++ itpp-4.0.6/itpp/base/timing.cpp 2009-07-30 10:32:45.000000000 +0300 -@@ -27,6 +27,8 @@ - * ------------------------------------------------------------------------- - */ - -+#include <cstdio> -+ - #ifndef _MSC_VER - # include <itpp/config.h> - #else -diff -ur itpp-4.0.6.orig/itpp/base/vec.cpp itpp-4.0.6/itpp/base/vec.cpp ---- itpp-4.0.6.orig/itpp/base/vec.cpp 2008-10-08 14:52:24.000000000 +0300 -+++ itpp-4.0.6/itpp/base/vec.cpp 2009-07-30 10:35:45.000000000 +0300 -@@ -27,6 +27,8 @@ - * ------------------------------------------------------------------------- - */ - -+#include <cstdio> -+ - #include <itpp/base/vec.h> - #include <itpp/base/converters.h> - #include <limits> -diff -ur itpp-4.0.6.orig/itpp/fixed/cfix.cpp itpp-4.0.6/itpp/fixed/cfix.cpp ---- itpp-4.0.6.orig/itpp/fixed/cfix.cpp 2008-10-08 14:52:24.000000000 +0300 -+++ itpp-4.0.6/itpp/fixed/cfix.cpp 2009-07-30 10:37:21.000000000 +0300 -@@ -27,6 +27,8 @@ - * ------------------------------------------------------------------------- - */ - -+#include <cstdio> -+ - #include <itpp/fixed/cfix.h> - #include <itpp/base/itassert.h> - #include <iostream> -diff -ur itpp-4.0.6.orig/itpp/fixed/fix.cpp itpp-4.0.6/itpp/fixed/fix.cpp ---- itpp-4.0.6.orig/itpp/fixed/fix.cpp 2008-10-08 14:52:24.000000000 +0300 -+++ itpp-4.0.6/itpp/fixed/fix.cpp 2009-07-30 10:37:39.000000000 +0300 -@@ -27,6 +27,8 @@ - * ------------------------------------------------------------------------- - */ - -+#include <cstdio> -+ - #include <itpp/fixed/fix.h> - #include <itpp/base/itassert.h> - #include <iostream> -diff -ur itpp-4.0.6.orig/itpp/fixed/fixed.cpp itpp-4.0.6/itpp/fixed/fixed.cpp ---- itpp-4.0.6.orig/itpp/fixed/fixed.cpp 2008-10-08 14:52:24.000000000 +0300 -+++ itpp-4.0.6/itpp/fixed/fixed.cpp 2009-07-30 10:37:03.000000000 +0300 -@@ -27,6 +27,8 @@ - * ------------------------------------------------------------------------- - */ - -+#include <cstdio> -+ - #include <itpp/fixed/fixed.h> - - diff --git a/sci-libs/itpp/files/itpp-4.0.7-fastica-fix-endless-loop.patch b/sci-libs/itpp/files/itpp-4.0.7-fastica-fix-endless-loop.patch deleted file mode 100644 index 8d232a421d64..000000000000 --- a/sci-libs/itpp/files/itpp-4.0.7-fastica-fix-endless-loop.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -ru libitpp-4.0.7/itpp/signal/fastica.cpp libitpp-4.0.7.patched/itpp/signal/fastica.cpp ---- libitpp-4.0.7/itpp/signal/fastica.cpp 2009-12-27 01:38:47.000000000 +0100 -+++ libitpp-4.0.7.patched/itpp/signal/fastica.cpp 2010-07-08 16:32:04.000000000 +0200 -@@ -90,7 +90,7 @@ - static mat mpower(const mat A, const double y); - static ivec getSamples(const int max, const double percentage); - static vec sumcol(const mat A); --static void fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W); -+static bool fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W); - /*! @} */ - - namespace itpp -@@ -124,7 +124,7 @@ - } - - // Call main function --void Fast_ICA::separate(void) -+bool Fast_ICA::separate(void) - { - - int Dim = numOfIC; -@@ -159,13 +159,14 @@ - - } - -+ bool result = true; - if (PCAonly == false) { - - Dim = whitesig.rows(); - - if (numOfIC > Dim) numOfIC = Dim; - -- fpica(whitesig, whiteningMatrix, dewhiteningMatrix, approach, numOfIC, g, finetune, a1, a2, mu, stabilization, epsilon, maxNumIterations, maxFineTune, initState, guess, sampleSize, A, W); -+ result = fpica(whitesig, whiteningMatrix, dewhiteningMatrix, approach, numOfIC, g, finetune, a1, a2, mu, stabilization, epsilon, maxNumIterations, maxFineTune, initState, guess, sampleSize, A, W); - - icasig = W * mixedSig; - -@@ -174,6 +175,7 @@ - else { // PCA only : returns E as IcaSig - icasig = VecPr; - } -+ return result; - } - - void Fast_ICA::set_approach(int in_approach) { approach = in_approach; if (approach == FICA_APPROACH_DEFL) finetune = true; } -@@ -437,7 +439,7 @@ - - } - --static void fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W) -+static bool fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W) - { - - int vectorSize = X.rows(); -@@ -511,7 +513,7 @@ - A = dewhiteningMatrix * B; - W = transpose(B) * whiteningMatrix; - -- return; -+ return false; - } - - B = B * mpower(transpose(B) * B , -0.5); -@@ -769,7 +771,7 @@ - - } // IF round - -- break; -+ return false; - - } // IF numFailures > failureLimit - -@@ -990,5 +992,5 @@ - } // While round <= numOfIC - - } // ELSE Deflation -- -+ return true; - } // FPICA -diff -ru libitpp-4.0.7/itpp/signal/fastica.h libitpp-4.0.7.patched/itpp/signal/fastica.h ---- libitpp-4.0.7/itpp/signal/fastica.h 2009-12-27 01:38:47.000000000 +0100 -+++ libitpp-4.0.7.patched/itpp/signal/fastica.h 2010-07-08 16:24:37.000000000 +0200 -@@ -134,8 +134,9 @@ - \brief Explicit launch of main FastICA function - - Explicit launch of the Fast_ICA algorithm. -+ \returns true if algorithm converged and false otherwise - */ -- void separate(void); -+ bool separate(void); - - /*! - \brief Set approach : FICA_APPROACH_DEFL or FICA_APPROACH_SYMM (default) diff --git a/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch b/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch deleted file mode 100644 index f383d6fda591..000000000000 --- a/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch +++ /dev/null @@ -1,16 +0,0 @@ - configure.ac | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4f06171..a1e8448 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,6 +27,8 @@ AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_AUX_DIR([build-aux]) - AM_INIT_AUTOMAKE([-Wall -Werror]) - -+AM_PROG_AR -+ - # Shared library versioning - GENERIC_LIBRARY_VERSION="7:0:0" - # | | | diff --git a/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch b/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch deleted file mode 100644 index a852abc5cc4c..000000000000 --- a/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ru itpp-4.2/itpp/signal/fastica.cpp itpp-4.2.new//itpp/signal/fastica.cpp ---- itpp-4.2/itpp/signal/fastica.cpp 2011-06-07 17:47:32.261000884 +0200 -+++ itpp-4.2.new//itpp/signal/fastica.cpp 2011-06-07 17:31:25.757000915 +0200 -@@ -147,6 +147,9 @@ - - whitenv(mixedSigC, E, diag(D), whitesig, whiteningMatrix, dewhiteningMatrix); - -+ Dim = whitesig.rows(); -+ -+ if (numOfIC > Dim) numOfIC = Dim; - - ivec NcFirst = to_ivec(zeros(numOfIC)); - vec NcVp = D; -@@ -161,10 +164,6 @@ - bool result = true; - if (PCAonly == false) { - -- Dim = whitesig.rows(); -- -- if (numOfIC > Dim) numOfIC = Dim; -- - result = fpica(whitesig, whiteningMatrix, dewhiteningMatrix, approach, numOfIC, g, finetune, a1, a2, mu, stabilization, epsilon, maxNumIterations, maxFineTune, initState, guess, sampleSize, A, W); - - icasig = W * mixedSig; -Nur in itpp-4.2/itpp/signal: fastica.cpp.orig. -Nur in itpp-4.2/itpp/signal: fastica.h.orig. diff --git a/sci-libs/itpp/files/itpp-4.2-pkg-config.patch b/sci-libs/itpp/files/itpp-4.2-pkg-config.patch deleted file mode 100644 index 5a18952707bb..000000000000 --- a/sci-libs/itpp/files/itpp-4.2-pkg-config.patch +++ /dev/null @@ -1,27 +0,0 @@ - configure.ac | 2 +- - itpp.pc.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4f06171..d3d7b76 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -322,7 +322,7 @@ test "x$FFT_LIBS" != x && LIBS="$FFT_LIBS $LIBS" - CPPFLAGS="`echo \"$CPPFLAGS\" | sed -e 's/ */ /g' -e 's/^ //' -e 's/ $//'`" - LDFLAGS="`echo \"$LDFLAGS\" | sed -e 's/ */ /g' -e 's/^ //' -e 's/ $//'`" - LIBS="`echo \"$LIBS\" | sed -e 's/ */ /g' -e 's/^ //' -e 's/ $//'`" --LDLIBS="`echo \"$LDFLAGS $LIBS\" | sed -e 's/^ //' -e 's/ $//'`" -+LDLIBS="`echo \"$LIBS\" | sed -e 's/^ //' -e 's/ $//'`" - - if test $enable_explicit_deps = yes; then - EXPLICIT_LIBS=" $LDLIBS" # the leading space is important here... -diff --git a/itpp.pc.in b/itpp.pc.in -index 4018865..48a9543 100644 ---- a/itpp.pc.in -+++ b/itpp.pc.in -@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@ - URL: http://itpp.sourceforge.net/ - Libs: -L${libdir} -l@PACKAGE@@EXPLICIT_LIBS@ - Libs.private:@PRIVATE_LIBS@ --Cflags: -I${includedir} @CXXFLAGS_OPT@ -+Cflags: -I${includedir} diff --git a/sci-libs/itpp/files/itpp-4.2-test-fftw.patch b/sci-libs/itpp/files/itpp-4.2-test-fftw.patch deleted file mode 100644 index b7bb11dcc4ff..000000000000 --- a/sci-libs/itpp/files/itpp-4.2-test-fftw.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- itpp/branches/itpp-4-2/tests/Makefile.am 2010/09/21 18:23:47 1807 -+++ itpp/branches/itpp-4-2/tests/Makefile.am 2010/12/30 23:47:09 1837 -@@ -20,9 +20,9 @@ - - OPTIM_TESTS = newton_search_test - --SIGNAL_TESTS = filter_test source_test window_test -+SIGNAL_TESTS = filter_test source_test - SIGNAL_LAP_TESTS = fastica_test poly_test --SIGNAL_FFT_TESTS = freq_filt_test sigfun_test transforms_test -+SIGNAL_FFT_TESTS = freq_filt_test sigfun_test transforms_test window_test - SIGNAL_LAP_FFT_TESTS = filter_design_test - - STAT_TESTS = histogram_test diff --git a/sci-libs/itpp/itpp-4.2-r1.ebuild b/sci-libs/itpp/itpp-4.2-r1.ebuild deleted file mode 100644 index a438f035b0bb..000000000000 --- a/sci-libs/itpp/itpp-4.2-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -AUTOTOOLS_AUTORECONF=yes - -inherit autotools-utils flag-o-matic toolchain-funcs - -DESCRIPTION="C++ library of mathematical, signal processing and communication" -HOMEPAGE="http://itpp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="blas debug doc fftw lapack minimal static-libs" - -RDEPEND=" - blas? ( virtual/blas lapack? ( virtual/lapack ) ) - !minimal? ( fftw? ( >=sci-libs/fftw-3 ) )" -DEPEND="${RDEPEND} - blas? ( virtual/pkgconfig ) - doc? ( app-doc/doxygen virtual/latex-base ) - lapack? ( virtual/pkgconfig )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0.7-fastica-fix-endless-loop.patch - "${FILESDIR}"/${P}-fastica-correct-dim.patch - "${FILESDIR}"/${P}-test-fftw.patch - ) - -src_prepare() { - # turn off performance critical debug code - use debug || append-cppflags -DNDEBUG - sed \ - -e 's:-pipe::g' \ - -e 's:-Werror::g' \ - -i configure* || die - autotools-utils_src_prepare -} - -src_configure() { - local blasconf="no" - use blas && blasconf="$($(tc-getPKG_CONFIG) --libs blas)" - local lapackconf="no" - use lapack && lapackconf="$($(tc-getPKG_CONFIG) --libs blas lapack)" - - local myeconfargs=( - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --enable-shared - $(use_enable doc html-doc) - $(use_enable debug) - $(use_enable !minimal comm) - $(use_enable !minimal fixed) - $(use_enable !minimal optim) - $(use_enable !minimal protocol) - $(use_enable !minimal signal) - $(use_enable !minimal srccode) - $(use_with fftw fft) - --with-blas="${blasconf}" - --with-lapack="${lapackconf}" - ) - autotools-utils_src_configure -} diff --git a/sci-libs/itpp/itpp-4.2-r2.ebuild b/sci-libs/itpp/itpp-4.2-r2.ebuild deleted file mode 100644 index ee3ea76abd01..000000000000 --- a/sci-libs/itpp/itpp-4.2-r2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -AUTOTOOLS_AUTORECONF=yes - -inherit autotools-utils flag-o-matic toolchain-funcs - -DESCRIPTION="C++ library of mathematical, signal processing and communication" -HOMEPAGE="http://itpp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="blas debug doc fftw lapack minimal static-libs" - -RDEPEND=" - blas? ( virtual/blas lapack? ( virtual/lapack ) ) - !minimal? ( fftw? ( >=sci-libs/fftw-3 ) )" -DEPEND="${RDEPEND} - >=sys-devel/automake-1.11.1 - blas? ( virtual/pkgconfig ) - doc? ( app-doc/doxygen virtual/latex-base ) - lapack? ( virtual/pkgconfig )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0.7-fastica-fix-endless-loop.patch - "${FILESDIR}"/${P}-fastica-correct-dim.patch - "${FILESDIR}"/${P}-test-fftw.patch - "${FILESDIR}"/${P}-automake-1.12.patch - "${FILESDIR}"/${P}-pkg-config.patch - ) - -src_prepare() { - # turn off performance critical debug code - use debug || append-cppflags -DNDEBUG - sed \ - -e 's:-pipe::g' \ - -e 's:-Werror::g' \ - -i configure* || die - autotools-utils_src_prepare -} - -src_configure() { - local blasconf="no" - use blas && blasconf="$($(tc-getPKG_CONFIG) --libs blas)" - local lapackconf="no" - use lapack && lapackconf="$($(tc-getPKG_CONFIG) --libs blas lapack)" - - local myeconfargs=( - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --enable-shared - $(use_enable doc html-doc) - $(use_enable debug) - $(use_enable !minimal comm) - $(use_enable !minimal fixed) - $(use_enable !minimal optim) - $(use_enable !minimal protocol) - $(use_enable !minimal signal) - $(use_enable !minimal srccode) - $(use_with fftw fft) - --with-blas="${blasconf}" - --with-lapack="${lapackconf}" - ) - autotools-utils_src_configure -} diff --git a/sci-libs/itpp/itpp-4.3.0.ebuild b/sci-libs/itpp/itpp-4.3.0.ebuild deleted file mode 100644 index db31a1c1c38b..000000000000 --- a/sci-libs/itpp/itpp-4.3.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="C++ library of mathematical, signal processing and communication" -HOMEPAGE="http://itpp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc" - -RDEPEND=" - virtual/blas - virtual/lapack - >=sci-libs/fftw-3" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen virtual/latex-base )" - -DOCS=(ChangeLog NEWS AUTHORS README) - -src_prepare() { - # gentoo redefines the CMAKE_BUILD_TYPE - sed -i \ - -e 's/CMAKE_BUILD_TYPE STREQUAL Release/NOT CMAKE_BUILD_TYPE STREQUAL Debug/' \ - CMakeLists.txt || die - # respect gentoo doc dir - sed -i \ - -e "s:share/doc/itpp:share/doc/${PF}:" \ - itpp/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DBLA_VENDOR=Generic - $(cmake-utils_use doc HTML_DOCS) - ) - cmake-utils_src_configure -} diff --git a/sci-libs/itpp/itpp-4.3.1-r1.ebuild b/sci-libs/itpp/itpp-4.3.1-r1.ebuild index e97f4fa094d9..de62b66f940c 100644 --- a/sci-libs/itpp/itpp-4.3.1-r1.ebuild +++ b/sci-libs/itpp/itpp-4.3.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" SLOT="0" LICENSE="GPL-3" -KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="doc" RDEPEND=" diff --git a/sci-libs/itpp/itpp-4.3.1.ebuild b/sci-libs/itpp/itpp-4.3.1.ebuild deleted file mode 100644 index 38ce5e1194bc..000000000000 --- a/sci-libs/itpp/itpp-4.3.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="C++ library of mathematical, signal processing and communication" -HOMEPAGE="http://itpp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc" - -RDEPEND=" - virtual/blas - virtual/lapack - >=sci-libs/fftw-3" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen virtual/latex-base )" - -DOCS=(ChangeLog NEWS AUTHORS README) - -src_prepare() { - # gentoo redefines the CMAKE_BUILD_TYPE - sed -i \ - -e 's/CMAKE_BUILD_TYPE STREQUAL Release/NOT CMAKE_BUILD_TYPE STREQUAL Debug/' \ - CMakeLists.txt || die - # respect gentoo doc dir - sed -i \ - -e "s:share/doc/itpp:share/doc/${PF}:" \ - itpp/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DBLA_VENDOR=Generic - $(cmake-utils_use doc HTML_DOCS) - ) - cmake-utils_src_configure -} diff --git a/sci-libs/libccp4/libccp4-6.4.6.ebuild b/sci-libs/libccp4/libccp4-6.4.6.ebuild index 0011f0f57e3d..272fd4393ccc 100644 --- a/sci-libs/libccp4/libccp4-6.4.6.ebuild +++ b/sci-libs/libccp4/libccp4-6.4.6.ebuild @@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.ccp4.ac.uk/opensource/${P}.tar.gz" SLOT="0" LICENSE="GPL-3 LGPL-3" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="fortran static-libs" RDEPEND="sci-libs/mmdb:2" diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch new file mode 100644 index 000000000000..d5d40246a2f8 --- /dev/null +++ b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch @@ -0,0 +1,16 @@ + include/MultiMatrix.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/MultiMatrix.h b/include/MultiMatrix.h +index 2d54db5..e95ce4c 100755 +--- a/include/MultiMatrix.h ++++ b/include/MultiMatrix.h +@@ -1225,7 +1225,7 @@ template<class T,size_t N> struct new_trait_<T,N,N> { typedef MultiMatrix<T,N> v + #endif + //LCM_SUPPRESS_VIEWS + +- template<size_t N, template<size_t> class CheckClass =LCM_CheckBoundsDefault> ++ template<size_t N, template<size_t> class CheckClass> + class Indexer<N,CheckClass>::permuted_iterator : public ::std::iterator< ::std::bidirectional_iterator_tag,size_t> + { + private: diff --git a/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild b/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild index 84ec50c0b9d3..e4b2694e46e2 100644 --- a/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild +++ b/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild @@ -34,6 +34,7 @@ PATCHES=( "${FILESDIR}"/3.2.1-gcc4.6.patch "${FILESDIR}"/3.2.1-gcc4.7.patch "${FILESDIR}"/3.9.0-atlas.patch + "${FILESDIR}"/${P}-gcc5.2.patch ) AUTOTOOLS_IN_SOURCE_BUILD=1 diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest index acee23000d33..4cf23af44119 100644 --- a/sci-libs/mathgl/Manifest +++ b/sci-libs/mathgl/Manifest @@ -1,3 +1,4 @@ DIST STIX_font.tgz 2450541 SHA256 6408290fd4a5267637a88507344a8f07b908ce72f46ef93d09e068fedb67e8fe SHA512 c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5 WHIRLPOOL 912a280ad550040c961a84fe48cfa2bd9bbcbad6c539b6126b4cbb5f9673ddd4ad5cc9e0d053fcb20cc6c12e1203aeaa3a05cf07360b16e2e7cbb13c0c42cc1e DIST mathgl-2.1.3.1.tar.gz 5269355 SHA256 a8cb5a156b6d2828105c14c8996023df34d69c202d461a4dca1f38836d966caa SHA512 c38a4c8286f456f37b3cb928d0c6842829e24727ddc373ebce37843a2c946c2f5efbec801ed1ef46c96176bf26350a24bfbaef2e6970e75728b67c77245e5bfc WHIRLPOOL 3d4d7886e98306e0b466c3cf4f5887a5e76172627679350cee108a4fd51642384faa2c14a6375d8ebd427938f5dff3665877a8afaa09439668dd3a98686970b6 DIST mathgl-2.1.3.tar.gz 5269347 SHA256 b091f1b91927d2b649b06785b737b0606a2d9c6b09f7ddb5a70b981c8c0af31b SHA512 aeac7a7da6846e5d4dd8a8b829bfcff359581ad1bb11c15f24824bb0ecbd9b042aab34d1ffead64a53c0ef15194a9c29d161456f7418ab18e1003d1fe2f37e73 WHIRLPOOL 9318207b12319399fb845195e96b0cf79353f1a5f9195543889b26522e56a57a7fa653e421a8591691264d9c49f78d50f684f74088e4f19eb698c91389a8b117 +DIST mathgl-2.3.3.tar.gz 20888708 SHA256 324fb8155223251f28afd3c7074d6930f09bb7a60c122c3e06af228a448d4fc9 SHA512 8cc08d547004fdeb8e049cd0e5dbdc40dc97e2178fc96c45caf26e4a5c86eb0059c80a14c0b4c079235602cebb2f8bb79640e8b075b6b262b993f28f775997d2 WHIRLPOOL e6bb68538188e440b6f64770b6d61e579a8050201b3e2bd627e6bbf190d9b962792f5469f1a2070e389289ce0367b0b458b6b0ddbde9a7479b1a03c59ffab942 diff --git a/sci-libs/mathgl/mathgl-2.3.3.ebuild b/sci-libs/mathgl/mathgl-2.3.3.ebuild new file mode 100644 index 000000000000..fcf734c115e9 --- /dev/null +++ b/sci-libs/mathgl/mathgl-2.3.3.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +WX_GTK_VER=3.0 + +inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic + +DESCRIPTION="Math Graphics Library" +HOMEPAGE="http://mathgl.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf + png python qt4 qt5 static-libs threads wxwidgets zlib" + +LANGS="ru" +for l in ${LANGS}; do + IUSE+=" linguas_${l}" +done + +RDEPEND=" + !sci-visualization/udav + virtual/opengl + fltk? ( x11-libs/fltk:1 ) + gif? ( media-libs/giflib ) + glut? ( media-libs/freeglut ) + gsl? ( sci-libs/gsl ) + hdf? ( sci-libs/hdf ) + hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) + jpeg? ( virtual/jpeg:0 ) + lua? ( >=dev-lang/lua-5.1:0 ) + octave? ( >=sci-mathematics/octave-3.4.0 ) + openmp? ( sys-cluster/openmpi ) + pdf? ( media-libs/libharu ) + png? ( media-libs/libpng:0 ) + python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} ) + qt4? ( dev-qt/qtgui:4 ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) + zlib? ( sys-libs/zlib )" + +DEPEND="${RDEPEND} + doc? ( app-text/texi2html virtual/texi2dvi ) + octave? ( dev-lang/swig ) + python? ( dev-lang/swig )" + +REQUIRED_USE=" + mpi? ( hdf5 ) + openmp? ( !threads ) + png? ( zlib ) + pdf? ( png ) + python? ( ${PYTHON_REQUIRED_USE} )" + +pkg_setup() { + use mpi && export CC=mpicc CXX=mpicxx + use python && python-single-r1_pkg_setup +} + +src_unpack() { + unpack ${A} + [[ -d "${S}"/fonts ]] || mkdir "${S}"/fonts + cd "${S}"/fonts || die + unpack STIX_font.tgz +} + +src_prepare() { + # fix for location of hdf headers + sed -i -e 's:hdf/::g' src/data_io.cpp || die + # bored of reporting bad libdir upstream + sed -i \ + -e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \ + {src,widgets}/CMakeLists.txt || die + echo "" > lang/install.m || die + # fix desktop file + sed -i -e 's/.png//' udav/udav.desktop || die + # prevent sandbox violation + sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die + sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die + + use python && append-cppflags -I"$(${EPYTHON} -c 'import numpy; print(numpy.get_include())')" + use wxwidgets && need-wxwidgets unicode +} + +src_configure() { + local mycmakeargs=( + # No clue about this option: + # option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'") + -DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include" + -DMGL_LIB_INSTALL_DIR="$(get_libdir)" + $(cmake-utils_use doc enable-all-docs) + $(cmake-utils_use fltk enable-fltk) + $(cmake-utils_use gif enable-gif) + $(cmake-utils_use glut enable-glut) + $(cmake-utils_use gsl enable-gsl) + $(cmake-utils_use hdf enable-hdf4) + $(cmake-utils_use hdf5 enable-hdf5_18) + $(cmake-utils_use jpeg enable-jpeg) + $(cmake-utils_use lua enable-lua) + $(cmake-utils_use mpi enable-mpi) + $(cmake-utils_use octave enable-octave) + $(cmake-utils_use opengl enable-opengl) + $(cmake-utils_use openmp enable-openmp) + $(cmake-utils_use pdf enable-pdf) + $(cmake-utils_use png enable-png) + $(cmake-utils_use qt4 enable-qt4) + $(cmake-utils_use qt5 enable-qt5) + $(cmake-utils_use threads enable-pthread) + $(cmake-utils_use python enable-python) + $(cmake-utils_use wxwidgets enable-wx) + $(cmake-utils_use zlib enable-zlib) + ) + cmake-utils_src_configure + # to whoever cares: TODO: do for multiple python ABI + if use python; then + sed -i \ + -e "s:--prefix=\(.*\) :--prefix=\$ENV{DESTDIR}\1 :" \ + "${CMAKE_BUILD_DIR}"/lang/cmake_install.cmake || die + fi +} + +src_install() { + cmake-utils_src_install + dodoc README* *.txt AUTHORS + use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a + if use qt4 ; then + local lang + insinto /usr/share/udav + for lang in ${LANGS} ; do + use linguas_${lang} && doins udav/udav_${lang}.qm + done + fi + if use octave ; then + insinto /usr/share/${PN}/octave + doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz + fi + use python && python_optimize +} + +pkg_postinst() { + if use octave; then + octave <<-EOF + pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz + EOF + fi +} + +pkg_prerm() { + if use octave; then + octave <<-EOF + pkg uninstall ${PN} + EOF + fi +} diff --git a/sci-libs/mmdb/mmdb-1.24.ebuild b/sci-libs/mmdb/mmdb-1.24.ebuild deleted file mode 100644 index f44a3ae67ee1..000000000000 --- a/sci-libs/mmdb/mmdb-1.24.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit autotools-utils - -DESCRIPTION="The Coordinate Library, designed to assist CCP4 developers in working with coordinate files" -HOMEPAGE="https://launchpad.net/mmdb/" -SRC_URI=" - http://www.ysbl.york.ac.uk/~emsley/software/${P}.tar.gz - https://launchpad.net/mmdb/1.23/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-3" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="static-libs" - -DEPEND="!<sci-libs/ccp4-libs-6.1.3" -RDEPEND="" - -src_install() { - autotools-utils_src_install - - # create missing mmdb.pc - cat >> "${T}"/mmdb.pc <<- EOF - prefix=${EPREFIX}/usr - exec_prefix=${EPREFIX}/usr - libdir=${EPREFIX}/usr/$(get_libdir) - includedir=${EPREFIX}/usr/include/mmdb - - Name: ${PN} - Description: Macromolecular coordinate library - Version: ${PV} - Requires: - Conflicts: - Libs: -L"${EPREFIX}/usr/$(get_libdir)" -lmmdb - Cflags: -I"${EPREFIX}/usr/include/mmdb" - - EOF - - insinto /usr/$(get_libdir)/pkgconfig - doins "${T}"/mmdb.pc -} diff --git a/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild b/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild index 8cae49d97a8c..6389827c63ee 100644 --- a/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild +++ b/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild @@ -15,7 +15,4 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="static-libs" -DEPEND="!<sci-libs/ccp4-libs-6.1.3" -RDEPEND="" - PATCHES=( "${FILESDIR}"/${P}-include-path.patch ) diff --git a/sci-libs/mmdb/mmdb-1.25.5.ebuild b/sci-libs/mmdb/mmdb-1.25.5.ebuild deleted file mode 100644 index 9be8cec5a894..000000000000 --- a/sci-libs/mmdb/mmdb-1.25.5.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 - -inherit autotools-utils - -DESCRIPTION="The Coordinate Library, designed to assist CCP4 developers in working with coordinate files" -HOMEPAGE="https://launchpad.net/mmdb/" -SRC_URI="ftp://ftp.ccp4.ac.uk/opensource/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="static-libs" - -DEPEND="!<sci-libs/ccp4-libs-6.1.3" -RDEPEND="" diff --git a/sci-libs/monomer-db/monomer-db-0.090729.ebuild b/sci-libs/monomer-db/monomer-db-0.090729.ebuild deleted file mode 100644 index 6513cbc0404c..000000000000 --- a/sci-libs/monomer-db/monomer-db-0.090729.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -DESCRIPTION="Monomer library used for macromolecular structure building and refinement" -HOMEPAGE="http://www.ccp4.ac.uk/" -# SRC_URI="http://www.ysbl.york.ac.uk/~garib/refmac/data/refmac_dictionary.tar.gz" -SRC_URI="https://dev.gentoo.org/~jlec/science-dist/${P}.tar.gz" - -LICENSE="ccp4" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="!<sci-chemistry/ccp4-6.1.3" -DEPEND="${RDEPEND}" - -RESTRICT="binchecks strip" - -S="${WORKDIR}"/dic - -src_install() { - insinto /usr/share/ccp4/data/monomers/ - for i in {a..z} {1..9} *list *.cif *.txt; do - doins -r ${i} - done - docinto html - dodoc *.html -} diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest index 25e28a6aa862..022e61da0c95 100644 --- a/sci-libs/plplot/Manifest +++ b/sci-libs/plplot/Manifest @@ -1,2 +1,3 @@ DIST plplot-5.10.0.tar.gz 14766687 SHA256 d4e930b8b9d43cd1663408986218d61f166de7cbc9ef5bed111b0bdea934f9d5 SHA512 92a1880dc544694a19aa5a3f6f592df5b63ea65827f11804f0b1bdb1d123546abb213c1af4950c18b50e0e0fb9b40bb3311e7f21e681237df6008fee9873b11e WHIRLPOOL 52b726925a6fa89e2e097a1a7578b8b0004bfac6a841019144785861a467e4d7c812bf4301e7a747d2edab47ef5b0d481c7732f5b0c9b4ff5dae6be6cd3e17ba DIST plplot-5.11.0.tar.gz 15892751 SHA256 bfa8434e6e1e7139a5651203ec1256c8581e2fac3122f907f7d8d25ed3bd5f7e SHA512 048157b95f65858d97ca6dba15d45dcdaee11892076a949cc3de8536abcaeca88eb8fa43a0520deffeee55eba43ef8cdf86b748a1e74b86d0340b995461d704d WHIRLPOOL 904061ad556856cb2386925dc9c907a12d753de32546023c867ce77498435a0b501d36f06ca08d85adcd15cb3b93b0192fb8a58036b8faa6ce2d2b23d2cc8e43 +DIST plplot-5.11.1.tar.gz 15445404 SHA256 289dff828c440121e57b70538b3f0fb4056dc47159bc1819ea444321f2ff1c4c SHA512 663da681a2e1ab2cb551e028485a55dfa111d8828187e84a50f5605c3346288ebd07a0e20ff4c50f00efc4f52be84bc100602de42e5713868ad32fdb431b80fd WHIRLPOOL 21e11c496b89060d00c9b0e513a0fb4833713f021d1fa63ea9210198713324e6efc3a1a28a218a75acd1fa5752ee4058465575481c27cfaec1cb91c52db40864 diff --git a/sci-libs/plplot/plplot-5.11.1.ebuild b/sci-libs/plplot/plplot-5.11.1.ebuild new file mode 100644 index 000000000000..77f2d4152528 --- /dev/null +++ b/sci-libs/plplot/plplot-5.11.1.ebuild @@ -0,0 +1,250 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +WX_GTK_VER="3.0" +FORTRAN_NEEDED=fortran +PYTHON_COMPAT=( python2_7 ) +VIRTUALX_REQUIRED=test + +inherit eutils fortran-2 cmake-utils python-single-r1 toolchain-funcs \ + virtualx wxwidgets java-pkg-opt-2 multilib + +DESCRIPTION="Multi-language scientific plotting library" +HOMEPAGE="http://plplot.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0/12" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="ada cairo cxx doc +dynamic examples fortran gd java jpeg latex lua + ocaml octave pdf pdl png python qhull qt4 shapefile svg tcl test + threads tk truetype wxwidgets X" + +RDEPEND=" + ada? ( virtual/gnat:* ) + cairo? ( x11-libs/cairo:0=[svg?,X?] ) + gd? ( media-libs/gd:2=[jpeg?,png?] ) + java? ( >=virtual/jre-1.5:* ) + latex? ( + app-text/ghostscript-gpl + virtual/latex-base + ) + lua? ( dev-lang/lua:0= ) + ocaml? ( + dev-lang/ocaml + dev-ml/camlidl + cairo? ( dev-ml/cairo-ocaml[gtk] ) + ) + octave? ( sci-mathematics/octave:0= ) + pdf? ( media-libs/libharu:0= ) + pdl? ( + dev-perl/PDL + dev-perl/XML-DOM + ) + python? ( + dev-python/numpy[${PYTHON_USEDEP}] + qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) + ) + qhull? ( media-libs/qhull:0= ) + qt4? ( + dev-qt/qtgui:4= + dev-qt/qtsvg:4= + ) + shapefile? ( sci-libs/shapelib:0= ) + tcl? ( + dev-lang/tcl:0= + dev-tcltk/itcl:0= + tk? ( + dev-lang/tk:0= + dev-tcltk/itk + ) + ) + truetype? ( + media-fonts/freefont + media-libs/lasi:0= + gd? ( media-libs/gd:2=[truetype] ) + ) + wxwidgets? ( + x11-libs/wxGTK:${WX_GTK_VER}=[X] + x11-libs/agg:0=[truetype?] + ) + X? ( + x11-libs/libX11:0= + x11-libs/libXau:0= + x11-libs/libXdmcp:0= + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + java? ( + >=virtual/jdk-1.5 + dev-lang/swig + ) + ocaml? ( dev-ml/findlib ) + octave? ( >=dev-lang/swig-2.0.12 ) + python? ( dev-lang/swig ) + test? ( + media-fonts/font-misc-misc + media-fonts/font-cursor-misc + )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )" + +PATCHES=( + "${FILESDIR}"/${PN}-5.9.6-python.patch + "${FILESDIR}"/${PN}-5.11.0-ocaml.patch + "${FILESDIR}"/${PN}-5.11.0-octave.patch + "${FILESDIR}"/${PN}-5.11.0-multiarch.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + use wxwidgets && need-wxwidgets unicode + cmake-utils_src_prepare + # avoid installing license + sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die + # prexify hard-coded /usr/include in cmake modules + sed -i \ + -e "s:/usr/include:${EPREFIX}/usr/include:g" \ + -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ + -e "s:/usr/share:${EPREFIX}/usr/share:g" \ + cmake/modules/*.cmake || die + # change default install directories for doc and examples + sed -i \ + -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \ + $(find "${S}" -name CMakeLists.txt) || die + sed -i \ + -e 's:${VERSION}::g' \ + -e "s:doc/\${PACKAGE}:doc/${PF}:" \ + cmake/modules/instdirs.cmake || die + java-utils-2_src_prepare +} + +src_configure() { + # don't build doc, it brings a whole lot of horrible dependencies + + # -DPLPLOT_USE_QT5=ON + # Not recomended by upstream, check next release + + local mycmakeargs=( + -DPLD_plmeta=ON + -DPLD_cgm=ON + -DTEST_DYNDRIVERS=OFF + -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" + -DENABLE_d=OFF + -DBUILD_DVI=OFF + -DDOX_DOC=OFF + -DBUILD_DOC=OFF + -DUSE_RPATH=OFF + -DPLD_wxpng=OFF + $(cmake-utils_use doc PREBUILT_DOC) + $(cmake-utils_use_build test) + $(cmake-utils_use_has python NUMPY) + $(cmake-utils_use_has shapefile SHAPELIB) + $(cmake-utils_use_with truetype FREETYPE) + $(cmake-utils_use_enable ada) + $(cmake-utils_use_enable cxx) + $(cmake-utils_use_enable dynamic DYNDRIVERS) + $(cmake-utils_use_enable fortran f77) + $(cmake-utils_use_enable java) + $(cmake-utils_use_enable lua) + $(cmake-utils_use_enable ocaml) + $(cmake-utils_use_enable octave) + $(cmake-utils_use_enable pdl) + $(cmake-utils_use_enable python) + $(cmake-utils_use_enable qt4 qt) + $(cmake-utils_use_enable tcl) + $(cmake-utils_use_enable tcl itcl) + $(cmake-utils_use_enable tk) + $(cmake-utils_use_enable tk itk) + $(cmake-utils_use_enable wxwidgets) + $(cmake-utils_use threads PL_HAVE_PTHREAD) + $(cmake-utils_use qhull PL_HAVE_QHULL) + $(cmake-utils_use qt4 PLD_aqt) + $(cmake-utils_use qt4 PLD_bmpqt) + $(cmake-utils_use qt4 PLD_epsqt) + $(cmake-utils_use qt4 PLD_extqt) + $(cmake-utils_use qt4 PLD_jpgqt) + $(cmake-utils_use qt4 PLD_memqt) + $(cmake-utils_use qt4 PLD_pdfqt) + $(cmake-utils_use qt4 PLD_pngqt) + $(cmake-utils_use qt4 PLD_ppmqt) + $(cmake-utils_use qt4 PLD_svgqt) + $(cmake-utils_use qt4 PLD_qtwidget) + $(cmake-utils_use qt4 PLD_tiffqt) + $(cmake-utils_use cairo PLD_extcairo) + $(cmake-utils_use cairo PLD_memcairo) + $(cmake-utils_use cairo PLD_pdfcairo) + $(cmake-utils_use cairo PLD_pngcairo) + $(cmake-utils_use cairo PLD_pscairo) + $(cmake-utils_use cairo PLD_svgcairo) + $(cmake-utils_use cairo PLD_wincairo) + $(cmake-utils_use cairo PLD_xcairo) + $(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON") + $(cmake-utils_use tk PLD_ntk) + $(cmake-utils_use tk PLD_tk) + $(cmake-utils_use tk PLD_tkwin) + $(cmake-utils_use gd PLD_gif) + $(cmake-utils_use gd PLD_jpeg) + $(cmake-utils_use gd PLD_png) + $(cmake-utils_use pdf PLD_pdf) + $(cmake-utils_use latex PLD_ps) + $(cmake-utils_use latex PLD_pstex) + $(cmake-utils_use truetype PLD_psttf) + $(cmake-utils_use svg PLD_svg) + $(cmake-utils_use wxwidgets PLD_wxwidgets) + $(cmake-utils_use X PLD_xwin) + ) + + [[ $(tc-getFC) != *g77 ]] && \ + mycmakeargs+=( + $(cmake-utils_use_enable fortran f95) + ) + + use truetype && mycmakeargs+=( + -DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont" + ) + use shapefile && mycmakeargs+=( + -DSHAPELIB_INCLUDE_DIR="${EPREFIX}/usr/include/libshp" + ) + use ocaml && mycmakeargs+=( + -DOCAML_INSTALL_DIR="$(ocamlc -where)" + ) + use python && mycmakeargs+=( + $(cmake-utils_use_enable qt4 pyqt4) + ) + + cmake-utils_src_configure + + # clean up bloated pkg-config files (help linking properly on prefix) + sed -i \ + -e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \ + -e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \ + -e "s:${LDFLAGS}::g" \ + "${BUILD_DIR}"/pkgcfg/*pc || die +} + +src_test() { + VIRTUALX_COMMAND=cmake-utils_src_test virtualmake +} + +src_install() { + cmake-utils_src_install + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + else + rm -r "${ED}"/usr/share/doc/${PF}/examples || die + fi + if use java; then + rm -r "${ED}"/usr/share/java "${ED}"/usr/$(get_libdir)/jni || die + java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar + java-pkg_doso "${BUILD_DIR}"/bindings/java/plplotjavac_wrap.so + fi +} diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest index 8d17e7b63417..1cab6fb7beec 100644 --- a/sci-libs/rtabmap/Manifest +++ b/sci-libs/rtabmap/Manifest @@ -1 +1,2 @@ +DIST rtabmap-0.10.10.tar.gz 17111390 SHA256 9c0a2c31b56f9e7162ae032da6c55b8781788b00ffdb2f474d8fd6fa870d7ffc SHA512 3267d60d0ad3554ebd543304c782f09f363dd0e77280e6ccbf459c569a5037efe41f7d981f4e64263329dd777f8ec6d9a3d56bfc8b94b48c11d008cc6c695aef WHIRLPOOL e12f0b3c7f9c22b07d3ba56860ec25e4b47a13bae3ebc2793243d17a0e11e2053515efb0cd37a2f7e4eb959aeba7f3ce2fa4a39e26ecb5349f0d4dbe3dd7be25 DIST rtabmap-0.10.5.tar.gz 16975400 SHA256 2c783d7a3c872b084bde18466863fda6d8c8247ff279dbee40f1d3da69b1667a SHA512 a144387d6cbe4ad9b656216c269505768a60408ae9486b41d85c8ed0f8a1212b8f598d392c147d042f8b3ade57974b2b8ae6e5ec8c47e6a18f11d53ce8a086e9 WHIRLPOOL 76faf97da79a5c7693b6ca41422c92d5bb47b6c1cc6ccec6658df2721ad1219ba41be3a6c15bf3c9f9d7c7b9e384141d04c1c996fe604edab2b3e03506c7f8c5 diff --git a/sci-libs/rtabmap/rtabmap-0.10.10.ebuild b/sci-libs/rtabmap/rtabmap-0.10.10.ebuild new file mode 100644 index 000000000000..8fdd4089e4cf --- /dev/null +++ b/sci-libs/rtabmap/rtabmap-0.10.10.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/introlab/rtabmap" +fi + +inherit ${SCM} cmake-utils multilib + +if [ "${PV#9999}" != "${PV}" ] ; then + KEYWORDS="" + SRC_URI="" +else + KEYWORDS="~amd64" + SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)" +HOMEPAGE="http://introlab.github.io/rtabmap/" +LICENSE="BSD" +SLOT="0" +IUSE="ieee1394 openni2 qt4 qt5" + +RDEPEND=" + media-libs/opencv:= + sci-libs/pcl[openni,vtk] + sci-libs/vtk + sys-libs/zlib + ieee1394? ( media-libs/libdc1394 ) + openni2? ( dev-libs/OpenNI2 ) + !qt5? ( + qt4? ( + dev-qt/qtgui:4 + dev-qt/qtsvg:4 + dev-qt/qtcore:4 + media-libs/opencv[-qt5(-)] + ) + ) + qt5? ( + dev-qt/qtwidgets:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + media-libs/opencv[qt5(-)] + ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + "-DWITH_QT=$(usex qt4 ON "$(usex qt5 ON OFF)")" + "-DRTABMAP_QT_VERSION=$(usex qt5 5 4)" + "-DWITH_DC1394=$(usex ieee1394 ON OFF)" + "-DWITH_OPENNI2=$(usex openni2 ON OFF)" + ) + cmake-utils_src_configure +} diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest index 53817b256160..0b3e52981326 100644 --- a/sci-libs/scipy/Manifest +++ b/sci-libs/scipy/Manifest @@ -2,3 +2,6 @@ DIST scipy-0.15.1-html.zip 24956050 SHA256 c27d3656ffed1b988890cf192c692f646b00d DIST scipy-0.15.1-ref.pdf 18313446 SHA256 d96046ddbc91383fb37e3ae2bbdc6945e0c2fc70fa230e0bcda0789e6025ca7e SHA512 9ca6a656e454058273f5153d84acbca42f4ea9b99d0dbfde4a019cbb3ef7e87c4068660bc787506ca749024d45efaea7254614486d56b114c762fc8a69c3b496 WHIRLPOOL b907a6011671b0e0919d48b3e4587fd09cad3f2b463a302e1c9be22facec5f2d599b1eb9497a0cf1e3a0125b3beda0b1e00e7ca2cd40453c49a2df368b9c794e DIST scipy-0.15.1.tar.gz 11401878 SHA256 a212cbc3b79e9a563aa45fc5c517b3499198bd7eb7e7be1e047568a5f48c259a SHA512 fff4412d850c431a1b4e6ee3b17958ee5ab3beb81e6cb8a8e7d56d368751eaa8781d7c3e69d932dc002d718fddc66a72098acfe74cfe29ec80b24e6736317275 WHIRLPOOL 31f2f6ca33be1945bedf41f84cf62831c9b22f4d7079d2b0b7b21706b17eb4ab5f3a948be645bcb86a35f3a714e4f277bd66261d02d20d8aeb5077b2095c952f DIST scipy-0.16.0.tar.gz 18137295 SHA256 92592f40097098f3fdbe7f5855d535b29bb16719c2bb59c728bce5e7a28790e0 SHA512 943f21a2798db124b7e1fb9257064b725702cc6656a90ae10dda285c36166c378304c7d44a571b5ab4ef6819e995ea42e947417e16b2a665dd6db4a460adbd89 WHIRLPOOL ba99d1ea46522814e9181c8991cede8b8a8f4a00b39d3fffc5fa570a52d4ef57044e9af4bb37ea24e733ec6af226e2787a4e88360c53d7bd67a505446725c62f +DIST scipy-0.16.1-html.zip 33158474 SHA256 4183a170f10537f343b0bb6d77abb3c8a6abc3ebfb7e36d90713d852f1e3e5c5 SHA512 47b1ebd43b58ada7f4fd772e2a94c25d8ee2b03d808743ac386c7fbcc8a1daa3082906156ba421b1dd91ce2fb4f0114639ea124caac7522d919507029fee6c1a WHIRLPOOL 5289e9ebf32be6ea9c75c022913bcf303743efc3ad010a394c186ea9ecf1f0155ce658b6595d264531c46d27b4e7a9d760ab906698cd18e5fae9c123f08494d2 +DIST scipy-0.16.1-ref.pdf 33916573 SHA256 4fb994f7706142bb519183bbeca665422b68bd7835e074847c81b75e1c3cd755 SHA512 eaf7221c2dcb2cf0bcddcaf6064e52f3d1542edaf0238fa96ae62e27911b275a3bc7ee624fe655b0abd00055312f18582d49cafdccf339f7c38aa93ca5badea9 WHIRLPOOL b8703c52e42fdd34b54496a755327fca8a6fe03fbc500497e961a13bbb84dee58b29b7158ba44c5bc317c85103bcf4778381640fb8f1f8e719b1d886fa74fb9e +DIST scipy-0.16.1.tar.gz 12221561 SHA256 ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260 SHA512 1761a943a0629179fd546fe3754b16101ca86b98eb0539b73614ea65bce24055ca898f295683eb3f3f63402ebbbb9248aa2a9f6a1d7d6cdf5e1e7486b15c1a8b WHIRLPOOL 3a3924a41cfb407b0fd91e7dfa2d29a8f6ee7694681fdfe58aefab0e1272e6c1e20c814344abc4ab7cbbbb7a8de7f5867819cee73ca624d8cbdcb5db456a8025 diff --git a/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch b/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch new file mode 100644 index 000000000000..791d67f32531 --- /dev/null +++ b/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch @@ -0,0 +1,30 @@ +From 1f5ccd5447ed2796bb8e9506cfbfdb4a82cccfc0 Mon Sep 17 00:00:00 2001 +From: Ralf Gommers <ralf.gommers@gmail.com> +Date: Sat, 24 Oct 2015 18:17:04 +0200 +Subject: [PATCH] TST: fix issue with a ctypes test for integrate on Fedora. + Closes gh-5370 + +--- + scipy/integrate/tests/test_quadpack.py | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/scipy/integrate/tests/test_quadpack.py b/scipy/integrate/tests/test_quadpack.py +index c3a417c..f384c77 100644 +--- a/scipy/integrate/tests/test_quadpack.py ++++ b/scipy/integrate/tests/test_quadpack.py +@@ -42,7 +42,14 @@ def setUp(self): + file = 'libm.dylib' + else: + file = 'libm.so' +- self.lib = ctypes.CDLL(file) ++ ++ try: ++ self.lib = ctypes.CDLL(file) ++ except OSError: ++ # This test doesn't work on some Linux platforms (Fedora for ++ # example) that put an ld script in libm.so - see gh-5370 ++ self.skipTest("Ctypes can't import libm.so") ++ + restype = ctypes.c_double + argtypes = (ctypes.c_double,) + for name in ['sin', 'cos', 'tan']: diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild b/sci-libs/scipy/scipy-0.16.1.ebuild new file mode 100644 index 000000000000..07d973074f97 --- /dev/null +++ b/sci-libs/scipy/scipy-0.16.1.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +DOC_PV=${PV} + +inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs + +DESCRIPTION="Scientific algorithms library for Python" +HOMEPAGE="https://www.scipy.org/" +SRC_URI=" + mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz + doc? ( + https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip + https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf + )" + +LICENSE="BSD LGPL-2" +SLOT="0" +IUSE="doc sparse test" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" + +CDEPEND=" + >=dev-python/numpy-1.6.2[lapack,${PYTHON_USEDEP}] + sci-libs/arpack:0= + virtual/cblas + virtual/lapack + sparse? ( sci-libs/umfpack:0= )" +DEPEND="${CDEPEND} + dev-lang/swig + >=dev-python/cython-0.22[${PYTHON_USEDEP}] + virtual/pkgconfig + doc? ( app-arch/unzip ) + test? ( dev-python/nose[${PYTHON_USEDEP}] ) + " + +RDEPEND="${CDEPEND} + virtual/python-imaging[${PYTHON_USEDEP}]" + +DOCS=( HACKING.rst.txt THANKS.txt ) + +DISTUTILS_IN_SOURCE_BUILD=1 + +src_unpack() { + unpack ${P}.tar.gz + if use doc; then + unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die + fi +} + +pc_incdir() { + $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ + sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' +} + +pc_libdir() { + $(tc-getPKG_CONFIG) --libs-only-L $@ | \ + sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' +} + +pc_libs() { + $(tc-getPKG_CONFIG) --libs-only-l $@ | \ + sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ + -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ + | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' +} + +python_prepare_all() { + # scipy automatically detects libraries by default + export {FFTW,FFTW3,UMFPACK}=None + use sparse && unset UMFPACK + # the missing symbols are in -lpythonX.Y, but since the version can + # differ, we just introduce the same scaryness as on Linux/ELF + [[ ${CHOST} == *-darwin* ]] \ + && append-ldflags -bundle "-undefined dynamic_lookup" \ + || append-ldflags -shared + [[ -z ${FC} ]] && export FC="$(tc-getFC)" + # hack to force F77 to be FC until bug #278772 is fixed + [[ -z ${F77} ]] && export F77="$(tc-getFC)" + export F90="${FC}" + export SCIPY_FCONFIG="config_fc --noopt --noarch" + append-fflags -fPIC + + local libdir="${EPREFIX}"/usr/$(get_libdir) + cat >> site.cfg <<-EOF + [blas] + include_dirs = $(pc_incdir cblas) + library_dirs = $(pc_libdir cblas blas):${libdir} + blas_libs = $(pc_libs cblas blas) + [lapack] + library_dirs = $(pc_libdir lapack):${libdir} + lapack_libs = $(pc_libs lapack) + EOF + + # Drop hashes to force rebuild of cython based .c code + rm cythonize.dat || die + + local PATCHES=( + "${FILESDIR}"/${PN}-0.12.0-blitz.patch + "${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch + "${FILESDIR}"/${P}-glibc-2.22-backport.patch + ) + distutils-r1_python_prepare_all +} + +python_compile() { + ${EPYTHON} tools/cythonize.py || die + distutils-r1_python_compile ${SCIPY_FCONFIG} +} + +python_test() { + # fails with bdist_egg. should it be fixed in distutils-r1 eclass? + distutils_install_for_testing ${SCIPY_FCONFIG} + cd "${TEST_DIR}" || die "no ${TEST_DIR} available" + "${PYTHON}" -c \ + 'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \ + || die + # https://github.com/scipy/scipy/issues/5426 + "${EPYTHON}" -c \ + "import scipy, sys; r = scipy.test('fast', verbose=2, raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \ + || die "Tests fail with ${EPYTHON}" +# "${EPYTHON}" -c \ +# "import scipy, sys; r = scipy.test('fast',verbose=2); sys.exit(0 if r.wasSuccessful() else 1)" \ +# || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + if use doc; then + dodoc "${DISTDIR}"/${PN}*pdf + docinto html + dodoc -r "${WORKDIR}"/html/. + fi + distutils-r1_python_install_all +} + +python_install() { + distutils-r1_python_install ${SCIPY_FCONFIG} +} + +pkg_postinst() { + elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER" + elog "to your prefered image viewer. Example:" + elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc" +} diff --git a/sci-libs/scipy/scipy-9999.ebuild b/sci-libs/scipy/scipy-9999.ebuild new file mode 100644 index 000000000000..43f0f3e41f3f --- /dev/null +++ b/sci-libs/scipy/scipy-9999.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +DOC_PV=${PV} + +inherit eutils fortran-2 distutils-r1 flag-o-matic git-r3 multilib toolchain-funcs + +DESCRIPTION="Scientific algorithms library for Python" +HOMEPAGE="https://www.scipy.org/" +EGIT_REPO_URI="https://github.com/scipy/scipy.git" + +LICENSE="BSD LGPL-2" +SLOT="0" +KEYWORDS="" +IUSE="sparse test" + +CDEPEND=" + >=dev-python/numpy-1.6.2[lapack,${PYTHON_USEDEP}] + sci-libs/arpack:0= + virtual/cblas + virtual/lapack + sparse? ( sci-libs/umfpack:0= )" +DEPEND="${CDEPEND} + dev-lang/swig + >=dev-python/cython-0.22[${PYTHON_USEDEP}] + virtual/pkgconfig + test? ( dev-python/nose[${PYTHON_USEDEP}] ) + " + +RDEPEND="${CDEPEND} + virtual/python-imaging[${PYTHON_USEDEP}]" + +DOCS=( HACKING.rst.txt THANKS.txt ) + +DISTUTILS_IN_SOURCE_BUILD=1 + +pc_incdir() { + $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ + sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' +} + +pc_libdir() { + $(tc-getPKG_CONFIG) --libs-only-L $@ | \ + sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' +} + +pc_libs() { + $(tc-getPKG_CONFIG) --libs-only-l $@ | \ + sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ + -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ + | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' +} + +python_prepare_all() { + # scipy automatically detects libraries by default + export {FFTW,FFTW3,UMFPACK}=None + use sparse && unset UMFPACK + # the missing symbols are in -lpythonX.Y, but since the version can + # differ, we just introduce the same scaryness as on Linux/ELF + [[ ${CHOST} == *-darwin* ]] \ + && append-ldflags -bundle "-undefined dynamic_lookup" \ + || append-ldflags -shared + [[ -z ${FC} ]] && export FC="$(tc-getFC)" + # hack to force F77 to be FC until bug #278772 is fixed + [[ -z ${F77} ]] && export F77="$(tc-getFC)" + export F90="${FC}" + export SCIPY_FCONFIG="config_fc --noopt --noarch" + append-fflags -fPIC + + local libdir="${EPREFIX}"/usr/$(get_libdir) + cat >> site.cfg <<-EOF + [blas] + include_dirs = $(pc_incdir cblas) + library_dirs = $(pc_libdir cblas blas):${libdir} + blas_libs = $(pc_libs cblas blas) + [lapack] + library_dirs = $(pc_libdir lapack):${libdir} + lapack_libs = $(pc_libs lapack) + EOF + + local PATCHES=( + "${FILESDIR}"/${PN}-0.12.0-blitz.patch + "${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch + ) + distutils-r1_python_prepare_all +} + +python_compile() { + ${EPYTHON} tools/cythonize.py || die + distutils-r1_python_compile ${SCIPY_FCONFIG} +} + +python_test() { + # fails with bdist_egg. should it be fixed in distutils-r1 eclass? + distutils_install_for_testing ${SCIPY_FCONFIG} + cd "${TEST_DIR}" || die "no ${TEST_DIR} available" + "${PYTHON}" -c \ + 'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \ + || die + "${EPYTHON}" -c \ + "import scipy, sys; r = scipy.test('fast',verbose=2); sys.exit(0 if r.wasSuccessful() else 1)" \ + || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + if use doc; then + dodoc "${DISTDIR}"/${PN}*pdf + docinto html + dodoc -r "${WORKDIR}"/html/. + fi + distutils-r1_python_install_all +} + +python_install() { + distutils-r1_python_install ${SCIPY_FCONFIG} +} + +pkg_postinst() { + elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER" + elog "to your prefered image viewer. Example:" + elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc" +} diff --git a/sci-libs/ssm/ssm-1.1.ebuild b/sci-libs/ssm/ssm-1.1.ebuild deleted file mode 100644 index d247077313dd..000000000000 --- a/sci-libs/ssm/ssm-1.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools eutils - -DESCRIPTION="A macromolecular coordinate superposition library" -HOMEPAGE="https://launchpad.net/ssm" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -DEPEND=">=sci-libs/mmdb-1.23:0" -RDEPEND="${DEPEND} - !<sci-libs/ccp4-libs-6.1.3-r10" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-mmdb.patch \ - "${FILESDIR}"/${P}-pc.patch - eautoreconf -} - -src_configure() { - econf $(use_enable static-libs static) -} diff --git a/sci-libs/xdrfile/xdrfile-1.1.1.ebuild b/sci-libs/xdrfile/xdrfile-1.1.1.ebuild index 187ea5f25686..d07446f45fe3 100644 --- a/sci-libs/xdrfile/xdrfile-1.1.1.ebuild +++ b/sci-libs/xdrfile/xdrfile-1.1.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.gromacs.org/pub/contrib/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="fortran static-libs" src_configure() { diff --git a/sci-mathematics/rw/metadata.xml b/sci-mathematics/rw/metadata.xml index 29dcd6cef151..2487e63df046 100644 --- a/sci-mathematics/rw/metadata.xml +++ b/sci-mathematics/rw/metadata.xml @@ -10,7 +10,7 @@ </maintainer> <maintainer> - <email>francois.bissey@canterbury.ac.nz</email> + <email>fbissey@slingshot.co.nz</email> <name>François Bissey</name> </maintainer> diff --git a/sci-misc/mendeleydesktop/Manifest b/sci-misc/mendeleydesktop/Manifest index 4fab589987fb..ead00aeac72c 100644 --- a/sci-misc/mendeleydesktop/Manifest +++ b/sci-misc/mendeleydesktop/Manifest @@ -1,2 +1,2 @@ -DIST mendeleydesktop-1.15-linux-i486.tar.bz2 33156877 SHA256 c23baa0511798fd9fb61e4b9802b4e5f9423bf466bedfda8a93bfec958b268ce SHA512 8d3c29645af78b1c99628306466e0def2d66429ee4fb489f7d389941f773e2c75b364dae21cc8c4b85284d35e8e60f1463ac38c2b451db55cab6ba8b2e4e58ca WHIRLPOOL 60b6f8ea2531bf22ee419f9f051d1c9d0ef955f1f3ca4aaa3f1ec86e22b6ce79c50fe93441b490da1ba3dbf602173ee9b32e9c2f7f42eb7ff6a079d118abf903 -DIST mendeleydesktop-1.15-linux-x86_64.tar.bz2 33038240 SHA256 c70e6c8847bc547dd963310e664232ddad440e75a8cd845f4a9da380c9c842fa SHA512 3f9e820e74de76fc97d093188eafa7bf39ff92a5d8f2c3b7315c1120b544cfd4980435f92da4f383f099198e6bb85903a10f188183c13ba02382024cc104406f WHIRLPOOL 70f32709443455fcd32963f5066eb1da922dea57dea3bb649e93f9fae759d6a0d67a2c620712391ceb19cdc6cfeaf6cb394f04003779052834cf5ed60274d5f4 +DIST mendeleydesktop-1.15.1-linux-i486.tar.bz2 33159407 SHA256 d1d14909f284dd7e91539f2636fb6e27b40f3e0cda5a7cc6e13c6e3c76ea5f49 SHA512 c7521de46e8dd36ba4f66a3e8ea0038d1b9afd9d2735a9bd5ecdab2e22d370302fd6000fb99486eec4c6e2a301770a2d542a2ce188e8ccd45d346d4740ddc554 WHIRLPOOL 1c60a4e169f3ced0acf9f4774e965295445ed753e6bebed60a7c775a028fa70d13f9bee7235d6f4c38368476f5461d0c294e8c7b26f39bb9112e1e3a68b1aa61 +DIST mendeleydesktop-1.15.1-linux-x86_64.tar.bz2 32948303 SHA256 dfdba32f082d51f43ccce465690fad93ddbb9c6349a87aba7da34030d7a5a3f0 SHA512 c90bdf7b7130c226e65ab23919ef26f92d4a289629c9e5e5cc4fe9cd56dcb76c0af8e34b2f7339ddb8b29af1a2e29b43c08d717ecd4f28c984d30fc1c3f696ae WHIRLPOOL 8d2ea4cf728f210664401af550acd43e7debd87f15cf2519b58aeac9f9440e97c3647b08bf548c53101fde842d50ad6a22368ef8f73173d6daf6049310c9c45a diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.15.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.15.1.ebuild index 34b00514635e..34b00514635e 100644 --- a/sci-misc/mendeleydesktop/mendeleydesktop-1.15.ebuild +++ b/sci-misc/mendeleydesktop/mendeleydesktop-1.15.1.ebuild diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest index 8d361b7e12e1..6db6fd569950 100644 --- a/sci-physics/lammps/Manifest +++ b/sci-physics/lammps/Manifest @@ -2,11 +2,10 @@ DIST lammps-10Aug15.tar.gz 87890369 SHA256 450a765f94b70a6f38637854f1d7496dca98d DIST lammps-10Feb15.tar.gz 62912048 SHA256 59373e9b5592f7b697a144bbce1fb742726e03536b7bb355dac7a9e013ddf9b8 SHA512 a7804377a23f03f338bdaf443439dffcdc52293b4c45e6369b340a1107510fed0b8a198e3b5afcff2e04e109985b52ee62e7b28276697bae37ac6f783d1ab9f2 WHIRLPOOL 09f29cadf8b072d388abe45ec219341d2a14a6c9cc9e4010a0f7945e930e9984738f7837748d117ab95ca76ce0c8d9160fe88dcec17e8d21b81f385dec8f7005 DIST lammps-11Sep15.tar.gz 87274144 SHA256 79a40bc395a9052345cf1c7caa8da69f6ec0603e0be09503b060c51672a9734f SHA512 a478470d6e90c870dad606649009c085451d3890632dfc05a84890ff9d69e8465eff52d4853b4dc4a82ebcb15074c8f2fd07bbde132404a01c1c5df0867ee3f2 WHIRLPOOL 21225df1baadd02dbdc9f0b7aea6a2323ac1a1ac177453b67d5387b87a711e505395d17efada9ca5d079d919842da69c6d41d9a3a6ec6375d8526c3ed32f8ad3 DIST lammps-15May15.tar.gz 63835027 SHA256 0233ea98c7d77d31bd0a538bb674c0ee8f000f1d0ee1b8c049072873192aa228 SHA512 a23c16b98117590b15ca7662b878fb2f76ec41399c329c98deb48e28a0ffce293443269513a96c2503389894b598787b19dadc210d4b4dbc6a7432caf633e7d1 WHIRLPOOL 4c4edfd772bbf534e42fc43e1feaf3b8f76e74c58ec1e985e3c29ee0d8e64aa8c501b8e45e078643409c320a1d834b0d5eb699e7d1ec29df06be0126d12492f1 -DIST lammps-18Aug15.tar.gz 87893731 SHA256 513237934cda7c1e026f4983096fd53cb510fadee12c55b13b4735086155245a SHA512 5816509f5b988dbe74c9f40a9faa42b3bcf260388dfe70703a1544517acd3f868d3bc398fb4c2fa7713d24409075d44ad80b8e91a25a28db783c2605aff30977 WHIRLPOOL 7022f3aabadffdfa2ef4c8219589e46fba2572d9ed4b52591f6516a61d4895b39d637d88535ba83881db5d48661e34ca6ff2f22a6819dbec015af979721a0f53 -DIST lammps-21Aug15.tar.gz 87096749 SHA256 46f68e7b61e50ab3e790c53cadd82fde7c7aa58aa73e8a3257f24facff2ed0a4 SHA512 b1dd90890c43a6cf55a57a61279dcc4c10fdedb4ad90f225a06c0e93eb139d30f2d56baa233c081b38adeeb0a8419a0315ccc4b0fa15c3ffbf7db626ca261e9d WHIRLPOOL a1d7d4ab30f9ecca3fd64216e729fef6fa1b3f7a6698b9eaf104bcbfa03a66862cd8c5882e94f73e841064d94bf030aaf569ebb457d89fbd345b391f9cee6822 DIST lammps-22Oct15.tar.gz 87938562 SHA256 8376b52e8eef4d1c3628c15ff358ecf74303e308566f41fd055701f6af3b6484 SHA512 cbe61420cccd11cd444423214802dfd2d1b2b1b28511a53dbf22e993fa3592404e8dda29fcb7bcd4e6e2d1e2251ddc6f020d48bafa66c8fceaa27d4af2e21640 WHIRLPOOL 11d09b18ff742d6ac4fcb400df93d7ac29144ee554f7241e58da80d039a99ef23b4b81709170ed12215693de97b6b48c9a6967d7d0539fd7f2f172a1e0a83661 +DIST lammps-23Oct15.tar.gz 87933918 SHA256 3500cdeb22344c7f3a040834a232d6c5ddb9f601820794441fcc24dadedc49b6 SHA512 a26d214b3e7c47d63cf00a364753a829d1c8f0cf4f8b73e829a4463650303d6905b6c942df5890387413b44496c8615b286296b34df9181e54806bb2f361b39a WHIRLPOOL 9a2d6e8fb57f1af2969345d9b250ed1244d2e40c97d5e2994c0ef6225ca265b490809848faa7cdc29a3eaa7c51a6223320039863f6c382a1a51da6f474e52088 DIST lammps-24Sep15.tar.gz 87307191 SHA256 e03cdeb2b3b6107d98969febea26575c85590603ab4f79d26efc46bac6d6cc60 SHA512 356dd556f845cec456865062375120c0898cef1870617d80b31b0e8e964585140120b21f891cd9b40ecde7aaf43beb34d7b15396830e08273624a9b14da551e4 WHIRLPOOL 667b8aaf927d268c569a192c835b7dbdc80a0f25abb1f2c96007517ea218a69b2816dde4ebe28ca82974d01472c0e1126b67e89a19fb3ef49e4020f3d9c69fba -DIST lammps-29Aug15.tar.gz 87253305 SHA256 fff69b47c40936d4ccd90a8443ce5bb1bcf4cb449ae06a5822c1b11a2ab2dd67 SHA512 991c56608a3288ebdcd2fb0857c595d42047b5ed0780b6d4ddb98388627499727b6c04fe0eff3e7221238dba2a8601f0b4b4067b5aa5ec2f356b4ee13f6c129c WHIRLPOOL 88da74fa65aeb187330439417512d516fe8adf4a5df4be48fdafafa198e8c4d657ecce7f04f749d77cb2f8a7881ac47f4604cf6bc8eb3ca8b2cbc7988d866a87 +DIST lammps-26Oct15.tar.gz 89265403 SHA256 c69356b3056881cbbb7eb659eb9cd4fc9d86e7f010502fe47c91ed865cbabea7 SHA512 738cd9fb7b11cb1e7304814ac4463d534f0a5dda1c70cc483d3c19b038c15cd61a2c03c6972cccc69afbe42d88bf01ef33d0972bba9516a840026891fc3f144a WHIRLPOOL c7c7882e32b026cdba0d5bceb1ecfa4127e77edeb9d567760e19d6103109fdf9cefe79a17fd6e3291d04347984cfdb1a999136ead0be20f0173a73e53f106d95 DIST lammps-4Sep15.tar.gz 87259558 SHA256 8652c801e4ce8b6b7d42a6c71f76b68a6e741dc8efb8d7d3dad36b624fe8f150 SHA512 ee730c8bd96e14931192a68c12e4ebde301cc3525b20816d051059f155b70c6edcea7dc2ed911e0b89685d751cd5a74b4bb5eedd6c16a042a2191bf8a9665fc9 WHIRLPOOL 271ac0d74e03d3e3e118a8b2385d98ce3f566ead67f1c329a219c265f886dc267b11be17c2caa52749ebac212bbc7456fba2d0d6ec69cd25815316e601b3360a DIST lammps-5Oct15.tar.gz 88451532 SHA256 a76f92ae05b99f9257abf7d79d9365c5743fa5a16b941a5e40f74036c5879211 SHA512 e0a034778cd5e3b9a27c9fc6257f1f7a6a9161732cd83bac2c4b0f82c39d5a6a385bb4640322478bfbe9467afb28b998cd19108b3d4a21e369b80c39a486e065 WHIRLPOOL 291e7820d4736421aeda9a1295854bd7b52d8ca3f14900e9394373410ee5db02ad6ab53991cf4dc8e73328b24fa44659d10693aca7cb48301227299ad622ce31 DIST lammps-9Sep15.tar.gz 87275742 SHA256 c783be8bf2c2fbef75522b09b4420006d94104f2a60b82f55f7bc255c6163079 SHA512 60fa8c818c72c3c236095c7aa23c2ec30cc3370b6dc14d0c1d9e347772e70c96dab43019092eb93f2327377f1b4cc642416be65d156b1faf934bfa805d228bcf WHIRLPOOL 4a9dbb0f1b493177614646dcef124c723a3b6171d0894fee8b34e9fff7d0962ada0a2a27564338fef6551aaff322f4b50784b98c250555173cba5478cc60e9af diff --git a/sci-physics/lammps/lammps-20150829.ebuild b/sci-physics/lammps/lammps-20150829.ebuild deleted file mode 100644 index 1a244c83975e..000000000000 --- a/sci-physics/lammps/lammps-20150829.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3} ) - -inherit eutils flag-o-matic fortran-2 multilib python-r1 - -convert_month() { - case $1 in - 01) echo Jan - ;; - 02) echo Feb - ;; - 03) echo Mar - ;; - 04) echo Apr - ;; - 05) echo May - ;; - 06) echo Jun - ;; - 07) echo Jul - ;; - 08) echo Aug - ;; - 09) echo Sep - ;; - 10) echo Oct - ;; - 11) echo Nov - ;; - 12) echo Dec - ;; - *) echo unknown - ;; - esac -} - -MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2} - -DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator" -HOMEPAGE="http://lammps.sandia.gov/" -SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples gzip lammps-memalign mpi python static-libs" - -DEPEND=" - mpi? ( - virtual/blas - virtual/lapack - virtual/mpi - ) - gzip? ( app-arch/gzip ) - sci-libs/voro++ - python? ( ${PYTHON_DEPS} ) - " -RDEPEND="${DEPEND}" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -lmp_emake() { - local LAMMPS_INCLUDEFLAGS - LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')" - LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN=64' '')" - - # The lammps makefile uses CC to indicate the C++ compiler. - emake \ - ARCHIVE=$(tc-getAR) \ - CC=$(usex mpi "mpic++" "$(tc-getCXX)") \ - F90=$(usex mpi "mpif90" "$(tc-getFC)") \ - LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \ - CCFLAGS="${CXXFLAGS}" \ - F90FLAGS="${FCFLAGS}" \ - LINKFLAGS="${LDFLAGS}" \ - LMP_INC="${LAMMPS_INCLUDEFLAGS}" \ - MPI_INC=$(usex mpi "" "-I../STUBS") \ - MPI_PATH=$(usex mpi "" "-L../STUBS") \ - MPI_LIB=$(usex mpi "" "-lmpi_stubs") \ - user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\ - "$@" -} - -lmp_activate_packages() { - # Build packages - lmp_emake -C src yes-asphere - lmp_emake -C src yes-body - lmp_emake -C src yes-class2 - lmp_emake -C src yes-colloid - lmp_emake -C src yes-coreshell - lmp_emake -C src yes-dipole - lmp_emake -C src yes-fld - #lmp_emake -C src yes-gpu - lmp_emake -C src yes-granular - # Need OpenKIM external dependency. - #lmp_emake -C src yes-kim - # Need Kokkos external dependency. - #lmp_emake -C src yes-kokkos - lmp_emake -C src yes-kspace - lmp_emake -C src yes-manybody - lmp_emake -C src yes-mc - lmp_emake -C src yes-meam - lmp_emake -C src yes-misc - lmp_emake -C src yes-molecule - #lmp_emake -C src yes-mpiio - lmp_emake -C src yes-opt - lmp_emake -C src yes-peri - lmp_emake -C src yes-poems - lmp_emake -C src yes-qeq - lmp_emake -C src yes-reax - lmp_emake -C src yes-replica - lmp_emake -C src yes-rigid - lmp_emake -C src yes-shock - lmp_emake -C src yes-snap - lmp_emake -C src yes-srd - lmp_emake -C src yes-voronoi - lmp_emake -C src yes-xtc - - if use mpi; then - lmp_emake -C src yes-user-atc - fi - lmp_emake -C src yes-user-eff - lmp_emake -C src yes-user-fep - use mpi && lmp_emake -C src yes-user-lb - lmp_emake -C src yes-user-phonon - lmp_emake -C src yes-user-sph -} - -lmp_build_packages() { - lmp_emake -C lib/meam -j1 -f Makefile.gfortran - lmp_emake -C lib/poems -f Makefile.g++ - lmp_emake -C lib/reax -j1 -f Makefile.gfortran - use mpi && lmp_emake -C lib/atc -f Makefile.g++ -} - -lmp_clean_packages() { - lmp_emake -C lib/meam -f Makefile.gfortran clean - lmp_emake -C lib/poems -f Makefile.g++ clean - lmp_emake -C lib/reax -f Makefile.gfortran clean - use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean -} - -src_prepare() { - # Fix inconsistent use of SHFLAGS. - sed -i \ - -e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \ - -e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \ - lib/voronoi/Makefile.lammps || die - - # Fix missing .so name. - sed -i \ - -e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \ - src/MAKE/Makefile.serial || die - - # Fix makefile in tools. - sed -i \ - -e 's:g++:$(CXX) $(CXXFLAGS):' \ - -e 's:gcc:$(CC) $(CCFLAGS):' \ - -e 's:ifort:$(FC) $(FCFLAGS):' \ - tools/Makefile || die - - # Patch python. - epatch "${FILESDIR}/lammps-python3.patch" - epatch "${FILESDIR}/python-shebang.patch" -} - -src_compile() { - # Fix atc... - append-cxxflags -I../../src - - # Acticate packages. - elog "Activating lammps packages..." - lmp_activate_packages - - # Compile stubs for serial version. - use mpi || lmp_emake -C src mpi-stubs - - elog "Building packages..." - lmp_build_packages - - if use static-libs; then - # Build static library. - elog "Building static library..." - lmp_emake -C src mode=lib serial - fi - - # Clean out packages (that's not done by the build system with the clean - # target), so we can rebuild the packages with -fPIC. - elog "Cleaning packages..." - lmp_clean_packages - - # The build system does not rebuild the packages with -fPIC, adding flag - # manually. - append-cxxflags -fPIC - append-fflags -fPIC - - # Compile stubs for serial version. - use mpi || lmp_emake -C src mpi-stubs - - elog "Building packages..." - lmp_build_packages - - # Build shared library. - elog "Building shared library..." - lmp_emake -C src mode=shlib serial - - # Compile main executable. The shared library is always built, and - # mode=shexe is simply a way to re-use the object files built in the - # "shlib" step when linking the executable. The executable is not actually - # using the shared library. If we have built the static library, then we - # link that into the executable. - elog "Linking executable..." - if use static-libs; then - lmp_emake -C src mode=exe serial - else - lmp_emake -C src mode=shexe serial - fi - - # Compile tools. - elog "Building tools..." - lmp_emake -C tools binary2txt chain data2xmovie micelle2d -} - -src_install() { - use static-libs && newlib.a src/liblammps_serial.a liblammps.a - newlib.so src/liblammps_serial.so liblammps.so.0.0.0 - dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so - dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0 - newbin src/lmp_serial lmp - dobin tools/binary2txt - dobin tools/chain - dobin tools/data2xmovie - dobin tools/micelle2d - # Don't forget to add header files of optional packages as they are added - # to this ebuild. There may also be .mod files from Fortran based - # packages. - insinto "/usr/include/${PN}" - doins -r src/*.h lib/meam/*.mod - - local LAMMPS_POTENTIALS="usr/share/${PN}/potentials" - insinto "/${LAMMPS_POTENTIALS}" - doins potentials/* - echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps - doenvd 99lammps - - # Install python script. - use python && python_foreach_impl python_domodule python/lammps.py - - if use examples; then - local LAMMPS_EXAMPLES="/usr/share/${PN}/examples" - insinto "${LAMMPS_EXAMPLES}" - doins -r examples/* - fi - - dodoc README - if use doc; then - dodoc doc/Manual.pdf - dohtml -r doc/* - fi -} diff --git a/sci-physics/lammps/lammps-20150818.ebuild b/sci-physics/lammps/lammps-20151023.ebuild index 1a244c83975e..39fd77910e55 100644 --- a/sci-physics/lammps/lammps-20150818.ebuild +++ b/sci-physics/lammps/lammps-20151023.ebuild @@ -9,34 +9,8 @@ PYTHON_COMPAT=( python{2_7,3_3} ) inherit eutils flag-o-matic fortran-2 multilib python-r1 convert_month() { - case $1 in - 01) echo Jan - ;; - 02) echo Feb - ;; - 03) echo Mar - ;; - 04) echo Apr - ;; - 05) echo May - ;; - 06) echo Jun - ;; - 07) echo Jul - ;; - 08) echo Aug - ;; - 09) echo Sep - ;; - 10) echo Oct - ;; - 11) echo Nov - ;; - 12) echo Dec - ;; - *) echo unknown - ;; - esac + local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ) + echo ${months[${1#0}]} } MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2} @@ -167,7 +141,7 @@ src_prepare() { tools/Makefile || die # Patch python. - epatch "${FILESDIR}/lammps-python3.patch" + epatch "${FILESDIR}/lammps-python3-r1.patch" epatch "${FILESDIR}/python-shebang.patch" } diff --git a/sci-physics/lammps/lammps-20150821.ebuild b/sci-physics/lammps/lammps-20151026.ebuild index 1a244c83975e..55f834d0c882 100644 --- a/sci-physics/lammps/lammps-20150821.ebuild +++ b/sci-physics/lammps/lammps-20151026.ebuild @@ -4,39 +4,13 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) inherit eutils flag-o-matic fortran-2 multilib python-r1 convert_month() { - case $1 in - 01) echo Jan - ;; - 02) echo Feb - ;; - 03) echo Mar - ;; - 04) echo Apr - ;; - 05) echo May - ;; - 06) echo Jun - ;; - 07) echo Jul - ;; - 08) echo Aug - ;; - 09) echo Sep - ;; - 10) echo Oct - ;; - 11) echo Nov - ;; - 12) echo Dec - ;; - *) echo unknown - ;; - esac + local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ) + echo ${months[${1#0}]} } MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2} @@ -73,64 +47,36 @@ lmp_emake() { # The lammps makefile uses CC to indicate the C++ compiler. emake \ - ARCHIVE=$(tc-getAR) \ - CC=$(usex mpi "mpic++" "$(tc-getCXX)") \ - F90=$(usex mpi "mpif90" "$(tc-getFC)") \ - LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \ + ARCHIVE="$(tc-getAR)" \ + CC="$(usex mpi "mpic++" "$(tc-getCXX)")" \ + F90="$(usex mpi "mpif90" "$(tc-getFC)")" \ + LINK="$(usex mpi "mpic++" "$(tc-getCXX)")" \ CCFLAGS="${CXXFLAGS}" \ F90FLAGS="${FCFLAGS}" \ LINKFLAGS="${LDFLAGS}" \ LMP_INC="${LAMMPS_INCLUDEFLAGS}" \ - MPI_INC=$(usex mpi "" "-I../STUBS") \ - MPI_PATH=$(usex mpi "" "-L../STUBS") \ - MPI_LIB=$(usex mpi "" "-lmpi_stubs") \ + MPI_INC="$(usex mpi "" "-I../STUBS")" \ + MPI_PATH="$(usex mpi "" "-L../STUBS")" \ + MPI_LIB="$(usex mpi "" "-lmpi_stubs")" \ user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\ "$@" } lmp_activate_packages() { # Build packages - lmp_emake -C src yes-asphere - lmp_emake -C src yes-body - lmp_emake -C src yes-class2 - lmp_emake -C src yes-colloid - lmp_emake -C src yes-coreshell - lmp_emake -C src yes-dipole - lmp_emake -C src yes-fld - #lmp_emake -C src yes-gpu - lmp_emake -C src yes-granular - # Need OpenKIM external dependency. - #lmp_emake -C src yes-kim - # Need Kokkos external dependency. - #lmp_emake -C src yes-kokkos - lmp_emake -C src yes-kspace - lmp_emake -C src yes-manybody - lmp_emake -C src yes-mc - lmp_emake -C src yes-meam - lmp_emake -C src yes-misc - lmp_emake -C src yes-molecule - #lmp_emake -C src yes-mpiio - lmp_emake -C src yes-opt - lmp_emake -C src yes-peri - lmp_emake -C src yes-poems - lmp_emake -C src yes-qeq - lmp_emake -C src yes-reax - lmp_emake -C src yes-replica - lmp_emake -C src yes-rigid - lmp_emake -C src yes-shock - lmp_emake -C src yes-snap - lmp_emake -C src yes-srd - lmp_emake -C src yes-voronoi - lmp_emake -C src yes-xtc - - if use mpi; then - lmp_emake -C src yes-user-atc - fi - lmp_emake -C src yes-user-eff - lmp_emake -C src yes-user-fep - use mpi && lmp_emake -C src yes-user-lb - lmp_emake -C src yes-user-phonon - lmp_emake -C src yes-user-sph + local packages=( yes-asphere yes-body yes-class2 yes-colloid \ + yes-coreshell yes-dipole yes-fld yes-granular yes-kspace \ + yes-manybody yes-mc yes-meam yes-misc \ + $(usex mpi "yes-user-atc" "") \ + yes-molecule yes-opt yes-peri yes-poems yes-qeq yes-reax \ + yes-replica yes-rigid yes-shock yes-snap yes-srd \ + yes-user-eff yes-user-fep \ + $(usex mpi "yes-user-lb" "") \ + yes-user-phonon yes-user-sph yes-voronoi yes-xtc ) + + for p in ${packages[@]}; do + lmp_emake -C src ${p} + done } lmp_build_packages() { @@ -167,7 +113,7 @@ src_prepare() { tools/Makefile || die # Patch python. - epatch "${FILESDIR}/lammps-python3.patch" + epatch "${FILESDIR}/lammps-python3-r1.patch" epatch "${FILESDIR}/python-shebang.patch" } diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index 3bf0accc7be1..2104a382d18e 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -1,3 +1,4 @@ DIST root_v5.34.26.source.tar.gz 75171961 SHA256 c1fd2a249bb7210914b42e35dba4f1262cfa46b79ef7a41f73d7f08f8c54a643 SHA512 f5da5e20d1763608a32d78c48581e574a3f51aef47ecf6987a4064d1fb3234dfc9f626e041a17213f881f52f807ed6a6da60bf1d24951fa7dc2cadd94f8dd8b4 WHIRLPOOL 77b48b815c971642da68b71732a0ea3372648634281be634037b13cb58488f7075ec8bfc9a684e55d85cd9b038f229be29b19a15dfc829f0ce63a5f17241c23c DIST root_v5.34.32.source.tar.gz 75170203 SHA256 939c7592802a54b6cbc593efb6e51699bf52e92baf6d6b20f486aaa08480fc5f SHA512 6485f2bb544947173e1feb2cfb41d6a176020027f1193d9388700a797ba4badbf497022e6129fdc4879e709460bf1efabf3e51c51840f0c781fa12e631419afc WHIRLPOOL 695147a519415b99e73fdad1cd61bb1944e292628236b5a7cbf1835174c950fa9cb068431a8164f24663323163012ea652db84d082f9f1eb1fcae79489575d9e DIST root_v6.02.05.source.tar.gz 99121880 SHA256 7a5d4af171ba3b8a736c462b2041f8f35bd4c1d3b6a22c32a3ebd3ffe144ae60 SHA512 b30bc4aafe294ee069ee4c884ff70c983539a48eda586cd1938d00d4688f10e94a435640965b89c6d100fdd998453a4c1ae2109d5f1427f23865a868c561d684 WHIRLPOOL de363835fa00ffa0ff6e596b3c92b59ed59378bac3a344c066f7603d6104058203f76181d4c15478fd9066aedbe6a514257d5796feedb2d5d0d789b263e92955 +DIST root_v6.04.06.source.tar.gz 99180724 SHA256 6deac9cd71fe2d7a48ea2bcbd793639222c4743275dbc946c158295b1e1fe330 SHA512 ac96ac998ed4894587b7d286d79bcbea7b33f15764cc2513ae089e86c584e2dcb064cd135d44a4bfd2bede368eb772ccbffcd6bf426857a1236f5d7e9f5ce6fd WHIRLPOOL 7ffca036917d798ade31e1a22e9518d567e4267af5d1db555ea0e82c1bc2c7a1f665c8cd76d3ce6511507ab7befea4881580259c6142f1e668edafbcbc5e496e diff --git a/sci-physics/root/files/root-6.04.06-prop-flags.patch b/sci-physics/root/files/root-6.04.06-prop-flags.patch new file mode 100644 index 000000000000..90db15e21f6d --- /dev/null +++ b/sci-physics/root/files/root-6.04.06-prop-flags.patch @@ -0,0 +1,22 @@ + config/Makefile.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/config/Makefile.in b/config/Makefile.in +index 9243c90..a23a4d2 100644 +--- a/config/Makefile.in ++++ b/config/Makefile.in +@@ -64,11 +64,11 @@ HOST := @host@ + USECONFIG := @useconfig@ + MKLIBOPTIONS := @mkliboption@ + +-EXTRA_CFLAGS := -Iinclude @cflags@ ++EXTRA_CFLAGS := -Iinclude @cflags@ $(CFLAGS) + USERCONF_CFLAGS:= @usercflags@ +-EXTRA_CXXFLAGS := -Iinclude @cflags@ ++EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS) + USERCONF_CXXFLAGS:= @usercxxflags@ +-EXTRA_LDFLAGS := @ldflags@ ++EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) + WERROR := @werror@ + WINRTDEBUG := @winrtdebug@ + CTORSINITARRAY := @ctorsinitarray@ diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml index 86bcf98fb8e9..d8e9e6fa2227 100644 --- a/sci-physics/root/metadata.xml +++ b/sci-physics/root/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> -</maintainer> -<herd>sci-physics</herd> -<longdescription lang="en"> + <maintainer> + <email>bircoph@gentoo.org</email> + <name>Andrew Savchenko</name> + </maintainer> + <herd>sci-physics</herd> + <longdescription lang="en"> ROOT Object Oriented Technologies is an object oriented data analysis framework written in C++ by the CERN. Widely used in high energy physics, but also in other data analysis applications. It @@ -14,20 +14,21 @@ statistics, serialization, optimization, linear algebra, graphics, GUI toolkit, and a complete visualization framework. </longdescription> -<use> - <flag name="c++11"> Build ROOT using the C++11 standard</flag> - <flag name="c++14"> Build ROOT using the C++14 standard</flag> - <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag> - <flag name="gdml">Enable GDML writer and reader</flag> - <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag> - <flag name="http">Enable http server support including but not limited to fastcgi support</flag> - <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag> - <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag> - <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag> - <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag> - <flag name="reflex">Build the reflection database for the C++ interpreter</flag> - <flag name="shadow">Enable shadow authentication in rootd and proofd</flag> - <flag name="table">Build libTable contrib library</flag> - <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag> -</use> + <use> + <flag name="c++11"> Build ROOT using the C++11 standard</flag> + <flag name="c++14"> Build ROOT using the C++14 standard</flag> + <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag> + <flag name="gdml">Enable GDML writer and reader</flag> + <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag> + <flag name="http">Enable http server support including but not limited to fastcgi support</flag> + <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag> + <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag> + <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag> + <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag> + <flag name="reflex">Build the reflection database for the C++ interpreter</flag> + <flag name="shadow">Enable shadow authentication in rootd and proofd</flag> + <flag name="table">Build libTable contrib library</flag> + <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag> + <flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag> + </use> </pkgmetadata> diff --git a/sci-physics/root/root-6.04.06.ebuild b/sci-physics/root/root-6.04.06.ebuild new file mode 100644 index 000000000000..1ccb466fdb7b --- /dev/null +++ b/sci-physics/root/root-6.04.06.ebuild @@ -0,0 +1,489 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \ + toolchain-funcs user versionator + +DESCRIPTION="C++ data analysis framework and interpreter from CERN" +HOMEPAGE="http://root.cern.ch/" +SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz" +DOC_URI="ftp://root.cern.ch/${PN}/doc" + +SLOT="0/$(get_version_component_range 1-3 ${PV})" +LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+X afs avahi doc emacs examples fits fftw gdml geocad + graphviz http kerberos ldap +math +memstat mpi mysql odbc + +opengl openmp oracle postgres prefix pythia6 pythia8 + python qt4 R shadow sqlite ssl table +tiff xinetd xml xrootd" + +# TODO: add support for: davix +# TODO: ROOT-6 supports x32 ABI, but half of its dependencies doesn't +# TODO: unbundle: cling, vdt + +REQUIRED_USE=" + !X? ( !opengl !qt4 !tiff ) + mpi? ( math !openmp ) + openmp? ( math !mpi ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +CDEPEND=" + app-arch/xz-utils:0= + >=dev-lang/cfortran-4.4-r2 + dev-libs/libpcre:3= + media-fonts/dejavu + media-libs/freetype:2= + media-libs/libpng:0= + >=sys-devel/clang-3.4:= + sys-libs/ncurses:= + sys-libs/zlib:0= + X? ( + media-libs/ftgl:0= + media-libs/glew:0= + x11-libs/libX11:0= + x11-libs/libXext:0= + x11-libs/libXpm:0= + || ( + media-libs/libafterimage:0=[gif,jpeg,png,tiff?] + >=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff?] + ) + opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= ) + qt4? ( + dev-qt/qtgui:4= + dev-qt/qtopengl:4= + dev-qt/qt3support:4= + dev-qt/qtsvg:4= + dev-qt/qtwebkit:4= + dev-qt/qtxmlpatterns:4= + ) + x11-libs/libXft:0= + ) + afs? ( net-fs/openafs ) + avahi? ( net-dns/avahi:0= ) + emacs? ( virtual/emacs ) + fits? ( sci-libs/cfitsio:0= ) + fftw? ( sci-libs/fftw:3.0= ) + geocad? ( <sci-libs/opencascade-6.8.0:= ) + graphviz? ( media-gfx/graphviz:0= ) + http? ( dev-libs/fcgi:0= ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap:0= ) + math? ( + sci-libs/gsl:0= + sci-mathematics/unuran:0= + mpi? ( virtual/mpi ) + ) + mysql? ( virtual/mysql ) + odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) ) + oracle? ( dev-db/oracle-instantclient-basic:0= ) + postgres? ( dev-db/postgresql:= ) + pythia6? ( sci-physics/pythia:6= ) + pythia8? ( >=sci-physics/pythia-8.1.80:8= ) + python? ( ${PYTHON_DEPS} ) + R? ( dev-lang/R ) + shadow? ( virtual/shadow ) + sqlite? ( dev-db/sqlite:3= ) + ssl? ( dev-libs/openssl:0= ) + xml? ( dev-libs/libxml2:2= ) + xrootd? ( >=net-libs/xrootd-3.3.5:0= ) +" + +# TODO: ruby is not yet ported to ROOT-6, reenable when (if?) ready +# ruby? ( +# dev-lang/ruby:= +# dev-ruby/rubygems:= +# ) + +DEPEND="${CDEPEND} + virtual/pkgconfig" + +RDEPEND="${CDEPEND} + xinetd? ( sys-apps/xinetd )" + +PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )" + +# install stuff in ${P} and not ${PF} for easier tracking in root-docs +DOC_DIR="/usr/share/doc/${P}" + +OC_UNSUPPORTED="6.8.0" + +die_compiler() { + eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities" + die "Need one of the following C++$1 capable compilers:\n"\ + " >=sys-devel/gcc[cxx]-$2\n"\ + " >=sys-devel/clang-$3\n"\ + " >=dev-lang/icc-$4" +} + +# check compiler to satisfy minimal versions +# $1 - std version +# $2 - g++ +# $3 - clang++ +# $4 - icc/icpc +check_compiler() { + local ver + case "$(tc-getCXX)" in + *clang++*) + ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')" + ;; + *g++*) + ver="$(gcc-version)" + ;; + *icc*|*icpc*) + ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')" + eerror "ROOT-6 is known not to build with ICC." + eerror "Please report any isuses upstream." + ;; + *) + ewarn "You are using an unsupported compiler." + ewarn "Please report any issues upstream." + return 0 + ;; + esac + version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}" +} + +pkg_setup() { + fortran-2_pkg_setup + use python && python-single-r1_pkg_setup + echo + elog "There are extra options on packages not yet in Gentoo:" + elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite," + elog "HDFS, Monalisa, MaxDB/SapDB, SRP." + elog "You can use the env variable EXTRA_ECONF variable for this." + elog "For example, for SRP, you would set: " + elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\"" + echo + + enewgroup rootd + enewuser rootd -1 -1 /var/spool/rootd rootd + + if use math; then + if use openmp; then + if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! tc-has-openmp; then + ewarn "You are using a g++ without OpenMP capabilities" + die "Need an OpenMP capable compiler" + else + export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1 + fi + elif use mpi; then + export USE_MPI=1 USE_PARALLEL_MINUIT2=1 + fi + fi + + # c++11 support is mandatory + check_compiler "11" "4.8" "3.4" "13" + + # Active version of opencascade may be >= $OC_UNSUPPORTED, + # so we need to eselect proper version (it must exist due to DEPEND requirement) + if use geocad; then + oc_current=$(eselect opencascade show) + # Proceed only if active version is unsupported + if version_is_at_least "${OC_UNSUPPORTED}" "${oc_current}"; then + local -a vlist + vlist=( $(version_sort $(eselect opencascade list | awk '/^ / { print $2 }')) ) + local i + # search for higehr version < $OC_UNSUPPORTED + # list is sorted acsending, so loop backwards + for (( i=$(( ${#vlist[@]} -1 )); i>=0; i-- )); do + version_is_at_least "${OC_UNSUPPORTED}" "${vlist[i]}" || break + done + [[ $i == "-1" ]] && die "No suitable opencascade eselect slot is available (<${OC_UNSUPPORTED})" + + einfo "Switching opencascade to supported slot: ${oc_current} -> ${vlist[i]}" + eselect opencascade set ${vlist[i]} > /dev/null || die "eselect opencascade set ${vlist[i]} failed!" + else + # forget it, effectively disabling eselect cleanup + unset oc_current + fi + fi +} + +src_prepare() { + # Second version of makepch is required in order to generate + # PCH file appropriate for Gentoo include headers layout. + # This can be done only at install stage, when files are placed + # as appropriate. Premature modification of makepch.sh will + # broke build process, however. + #cp "etc/dictpch/makepch.sh" "etc/dictpch/makepch-gentoo.sh" || die + + epatch \ + "${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \ + "${FILESDIR}"/${PN}-5.32.00-afs.patch \ + "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \ + "${FILESDIR}"/${PN}-5.32.00-chklib64.patch \ + "${FILESDIR}"/${PN}-5.34.13-unuran.patch \ + "${FILESDIR}"/${PN}-6.00.01-dotfont.patch \ + "${FILESDIR}"/${PN}-6.00.01-llvm.patch \ + "${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \ + "${FILESDIR}"/${P}-prop-flags.patch + # "${FILESDIR}"/${PN}-6.02.05-xrootd4.patch + # "${FILESDIR}"/${PN}-6.02.05-dictpch.patch \ + + # make sure we use system libs and headers + rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die + rm -r graf2d/asimage/src/libAfterImage || die + rm -r graf3d/ftgl/{inc,src} || die + rm -r graf2d/freetype/src || die + rm -r graf3d/glew/{inc,src} || die + rm -r core/pcre/src || die + rm -r math/unuran/src/unuran-*.tar.gz || die + LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \ + xargs -0 rm || die + rm -r core/lzma/src/*.tar.gz || die + rm graf3d/gl/{inc,src}/gl2ps.* || die + sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \ + graf3d/gl/Module.mk || die + + # In Gentoo, libPythia6 is called libpythia6 + # iodbc is in /usr/include/iodbc + # pg_config.h is checked instead of libpq-fe.h + sed -i \ + -e 's:libPythia6:libpythia6:g' \ + -e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \ + -e 's:libpq-fe.h:pg_config.h:' \ + configure || die "adjusting configure for Gentoo failed" + + # prefixify the configure script + sed -i \ + -e 's:/usr:${EPREFIX}/usr:g' \ + configure || die "prefixify configure failed" + + # CSS should use local images + sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed" + + # QTDIR only used for qt3 in gentoo, and configure looks for it. + unset QTDIR +} + +# NB: ROOT uses bundled LLVM, because it is patched and API-incompatible with +# system LLVM. +# NB: As of 6.00.0.1 cmake is not ready as it can't fully replace configure, +# e.g. for afs and geocad. + +src_configure() { + local -a myconf + # Some compilers need special care + case "$(tc-getCXX)" in + *clang++*) + myconf=( + --with-clang + --with-f77="$(tc-getFC)" + ) + ;; + *icc*|*icpc*) + # For icc we need to provide architecture manually + # and not to tamper with tc-get* + use x86 && myconf=( linuxicc ) + use amd64 && myconf=( linuxx8664icc ) + ;; + *) # gcc goes here too + myconf=( + --with-cc="$(tc-getCC)" + --with-cxx="$(tc-getCXX)" + --with-f77="$(tc-getFC)" + --with-ld="$(tc-getCXX)" + ) + ;; + esac + + # the configure script is not the standard autotools + myconf+=( + --prefix="${EPREFIX}/usr" + --etcdir="${EPREFIX}/etc/root" + --libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" + --docdir="${EPREFIX}${DOC_DIR}" + --tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials" + --testdir="${EPREFIX}${DOC_DIR}/examples/tests" + --disable-builtin-afterimage + --disable-builtin-ftgl + --disable-builtin-freetype + --disable-builtin-glew + --disable-builtin-lzma + --disable-builtin-pcre + --disable-builtin-zlib + --disable-werror + --enable-explicitlink + --enable-shared + --enable-soversion + --fail-on-missing + --nohowto + --with-afs-shared=yes + --with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" + # Invalid option '-mtune=native'. Try ./configure --help + # --cflags=\"${CFLAGS}\" + # --cxxflags=\"${CXXFLAGS}\" + $(use_enable X x11) + $(use_enable X asimage) + $(use_enable X xft) + $(use_enable afs) + $(use_enable avahi bonjour) + $(use_enable fits fitsio) + $(use_enable fftw fftw3) + $(use_enable gdml) + $(use_enable geocad) + $(use_enable graphviz gviz) + $(use_enable http) + $(use_enable kerberos krb5) + $(use_enable ldap) + $(use_enable math genvector) + $(use_enable math gsl-shared) + $(use_enable math mathmore) + $(use_enable math minuit2) + $(use_enable math roofit) + $(use_enable math tmva) + $(use_enable math vc) + $(use_enable math vdt) + $(use_enable math unuran) + $(use_enable memstat) + $(use_enable mysql) + $(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "") + $(use_enable odbc) + $(use_enable opengl) + $(use_enable oracle) + $(use_enable postgres pgsql) + $(use_enable prefix rpath) + $(use_enable pythia6) + $(use_enable pythia8) + $(use_enable python) + $(use_enable qt4 qt) + $(use_enable qt4 qtgsi) + $(use_enable R r) + $(use_enable shadow shadowpw) + $(use_enable sqlite) + $(use_enable ssl) + $(use_enable table) + $(use_enable tiff astiff) + $(use_enable xml) + $(use_enable xrootd) + ${EXTRA_ECONF} + ) + + # usex can't be used here, because pg_config may be not + # installed with USE="-postgres" + use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir) ) + + einfo "Configuring with ${myconf[@]}" + ./configure ${myconf[@]} || die "configure failed" +} + +src_compile() { + emake \ + OPT="${CXXFLAGS}" \ + F77OPT="${FFLAGS}" \ + ROOTSYS="${S}" \ + LD_LIBRARY_PATH="${S}/lib" + use emacs && elisp-compile build/misc/*.el +} + +daemon_install() { + local daemons="rootd proofd" + dodir /var/spool/rootd + fowners rootd:rootd /var/spool/rootd + dodir /var/spool/rootd/{pub,tmp} + fperms 1777 /var/spool/rootd/{pub,tmp} + + local i + for i in ${daemons}; do + newinitd "${FILESDIR}"/${i}.initd ${i} + newconfd "${FILESDIR}"/${i}.confd ${i} + done + if use xinetd; then + insinto /etc/xinetd + doins "${S}"/etc/daemons/{rootd,proofd}.xinetd + fi +} + +desktop_install() { + cd "${S}" + echo "Icon=root-system-bin" >> etc/root.desktop + domenu etc/root.desktop + doicon build/package/debian/root-system-bin.png + + insinto /usr/share/icons/hicolor/48x48/mimetypes + doins build/package/debian/application-x-root.png + + insinto /usr/share/icons/hicolor/48x48/apps + doicon build/package/debian/root-system-bin.xpm +} + +cleanup_install() { + # Cleanup of files either already distributed or unused on Gentoo + pushd "${ED}" > /dev/null + rm usr/share/root/fonts/LICENSE || die + rm etc/root/proof/*.sample || die + rm -r etc/root/daemons || die + # these should be in PATH + mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die + rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die + use examples || rm -r ${DOC_DIR#/}/examples || die + + # clean hardcoded sandbox paths + #rm etc/root/dictpch/allCppflags.txt.tmp || die + #sed -i "s|${S}/||" etc/root/cling/llvm/Config/llvm-config.h || die + # regenerate pch for Gentoo headers layout + #rm "etc/root/allDict.cxx.pch" || die + #sed -i 's|etc/dictpch|etc/root/dictpch|' etc/root/dictpch/allLinkDefs.h || die + #sed -i 's|etc/cling|etc/root/cling|' etc/root/dictpch/allHeaders.h || die + #sed -i "s|ROOTDIR_TEMPLATE|${ED}|" etc/root/dictpch/makepch-gentoo.sh || die + #etc/root/dictpch/makepch-gentoo.sh etc/root/allDict.cxx.pch || die "PCH generation failed" +} + +src_install() { + ROOTSYS="${S}" emake DESTDIR="${D}" install + insinto "${DOC_DIR}" + doins README.md + + echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root + use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root + + if use python; then + echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root + python_optimize "${D}/usr/$(get_libdir)/root" + fi + use emacs && elisp-install ${PN} build/misc/*.{el,elc} + if use examples; then + # these should really be taken care of by the root make install + insinto ${DOC_DIR}/examples/tutorials/tmva + doins -r tmva/test + fi + doenvd 99root + + # The build system installs Emacs support unconditionally in the wrong + # directory. Remove it and call elisp-install in case of USE=emacs. + rm -r "${ED}"/usr/share/emacs || die + + daemon_install + desktop_install + cleanup_install + + # do not copress files used by ROOT's CLI (.credit, .demo, .license) + docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials} + # needed for .license command to work + cat > "${DOC_DIR}/LICENSE" <<- EOF + Please visit + https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html + for the full license test + EOF +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + # restort opencascade eselect slot + if use geocad && [[ -n ${oc_current} ]]; then + einfo "Switching to user set slot: $(eselect opencascade show) -> ${oc_current}" + eselect opencascade set ${oc_current} > /dev/null || eerror "eselect opencascade set ${vlist[i]} failed!" + unset oc_current + fi +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest index ecba3567ba07..61fb665a81b2 100644 --- a/sci-visualization/kst/Manifest +++ b/sci-visualization/kst/Manifest @@ -1,2 +1 @@ -DIST Kst-2.0.7.tar.gz 11706657 SHA256 0ef0e1e85fa90472447eb53ee560970635532d2013d200d99ebdd105bd2eecee SHA512 d68968b9d161b74c42da87a3e5d9a2ade14e4c13e61526a0ef1e53538334b806d7f28ce3717e5a8ff85802b94aa2d7551422b873df5f180782994409ebc7ce17 WHIRLPOOL 654e054ceee5bb40de3a07d1a073c7192902616b018d355faa53770ed965eaf2dc83447f828af323401099a419ba2bfabfaacf77053e2ed4c79c123586683d3d DIST Kst-2.0.8.tar.gz 14527129 SHA256 cefbfd3e3710771985e08f02a397ef8ab407168fa8415d2c3c5740c031af18c6 SHA512 81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb WHIRLPOOL d143cd2c88e7dcff1aeb53375272cf4b7a60f546a9c8dbd76bf8c9933575ab6fbb5f7e5f82f793dbde19d523af9314eeb8efecb8e82f30b3846ebf9d222d27d1 diff --git a/sci-visualization/kst/files/kst-2.0.7-cfitsio-includes.patch b/sci-visualization/kst/files/kst-2.0.7-cfitsio-includes.patch deleted file mode 100644 index 57238f8964eb..000000000000 --- a/sci-visualization/kst/files/kst-2.0.7-cfitsio-includes.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/datasources/lfiio/lfiio.h b/src/datasources/lfiio/lfiio.h -index bb6493c..8ed748c 100644 ---- a/src/datasources/lfiio/lfiio.h -+++ b/src/datasources/lfiio/lfiio.h -@@ -18,7 +18,7 @@ - - #include <datasource.h> - #include <dataplugin.h> --#include <libcfitsio0/fitsio.h> -+#include <fitsio.h> - - class LFIIOSource : public Kst::DataSource { - Q_OBJECT -diff --git a/src/datasources/planckIDEF/planckIDEF.h b/src/datasources/planckIDEF/planckIDEF.h -index 7fb226f..6e6d82f 100644 ---- a/src/datasources/planckIDEF/planckIDEF.h -+++ b/src/datasources/planckIDEF/planckIDEF.h -@@ -16,7 +16,7 @@ - - #include <datasource.h> - #include <dataplugin.h> --#include <libcfitsio0/fitsio.h> -+#include <fitsio.h> - - typedef struct { - QString file; diff --git a/sci-visualization/kst/kst-2.0.7.ebuild b/sci-visualization/kst/kst-2.0.7.ebuild deleted file mode 100644 index 8c1b5dff72e2..000000000000 --- a/sci-visualization/kst/kst-2.0.7.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=4 - -CMAKE_USE_DIR=${S}/cmake -MY_PN="Kst" -inherit cmake-utils multilib - -DESCRIPTION="Fast real-time large-dataset viewing and plotting tool for KDE4" -HOMEPAGE="https://kst.kde.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="GPL-2 LGPL-2 FDL-1.2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +qt4 qt5 test" - -REQUIRED_USE="^^ ( qt4 qt5 )" - -RESTRICT="test" - -RDEPEND=" - qt4? ( - dev-qt/qtcore:4 - || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 ) - dev-qt/qtopengl:4 - dev-qt/qtsvg:4 - ) - qt5? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/designer:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - sci-libs/cfitsio - sci-libs/getdata - sci-libs/gsl - sci-libs/netcdf-cxx:3 -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:4 ) -" - -DOCS=( AUTHORS ChangeLog ) -PATCHES=( "${FILESDIR}/${PN}-2.0.7-cfitsio-includes.patch" ) - -src_configure() { - local mycmakeargs=( - -Dkst_install_libdir=$(get_libdir) - -Dkst_pch=OFF - -Dkst_release=$(usex debug OFF ON) - -Dkst_rpath=OFF - -Dkst_svnversion=OFF - $(cmake-utils_use test kst_test) - $(cmake-utils_use qt5 kst_qt5) - ) - cmake-utils_src_configure -} diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild index c67def266af6..d86db33d977a 100644 --- a/sec-policy/selinux-base/selinux-base-9999.ebuild +++ b/sec-policy/selinux-base/selinux-base-9999.ebuild @@ -20,7 +20,7 @@ else KEYWORDS="~amd64 ~x86" fi -IUSE="+peer_perms +open_perms +ubac +unconfined doc" +IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined" DESCRIPTION="Gentoo base policy for SELinux" HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/" @@ -36,10 +36,6 @@ DEPEND="${RDEPEND} S=${WORKDIR}/ -#src_unpack() { -# git-2_src_unpack -#} - src_prepare() { if [[ ${PV} != 9999* ]]; then # Apply the gentoo patches to the policy. These patches are only necessary @@ -64,12 +60,12 @@ src_configure() { if ! use peer_perms; then sed -i -e '/network_peer_controls/d' \ - "${S}/refpolicy/policy/policy_capabilities" + "${S}/refpolicy/policy/policy_capabilities" || die fi if ! use open_perms; then sed -i -e '/open_perms/d' \ - "${S}/refpolicy/policy/policy_capabilities" + "${S}/refpolicy/policy/policy_capabilities" || die fi if ! use ubac; then @@ -77,20 +73,25 @@ src_configure() { || die "Failed to disable User Based Access Control" fi - echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" + if use systemd; then + sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \ + || die "Failed to enable SystemD" + fi + + echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die # Prepare initial configuration - cd "${S}/refpolicy"; + cd "${S}/refpolicy" || die make conf || die "Make conf failed" # Setup the policies based on the types delivered by the end user. # These types can be "targeted", "strict", "mcs" and "mls". for i in ${POLICY_TYPES}; do - cp -a "${S}/refpolicy" "${S}/${i}" - cd "${S}/${i}"; + cp -a "${S}/refpolicy" "${S}/${i}" || die + cd "${S}/${i}" || die #cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf" - sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" + sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \ "${S}/${i}/build.conf" || die "build.conf setup failed." @@ -120,10 +121,10 @@ src_compile() { [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs" for i in ${POLICY_TYPES}; do - cd "${S}/${i}" - emake base || die "${i} compile failed" + cd "${S}/${i}" || die + emake base if use doc; then - make html || die + emake html fi done } @@ -132,7 +133,7 @@ src_install() { [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs" for i in ${POLICY_TYPES}; do - cd "${S}/${i}" + cd "${S}/${i}" || die make DESTDIR="${D}" install \ || die "${i} install failed." @@ -140,9 +141,9 @@ src_install() { make DESTDIR="${D}" install-headers \ || die "${i} headers install failed." - echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" + echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die - echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" + echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die # libsemanage won't make this on its own keepdir "/etc/selinux/${i}/policy" @@ -164,5 +165,5 @@ src_install() { doins "${FILESDIR}/config" insinto /usr/share/portage/config/sets - doins "${FILESDIR}/selinux.conf" || die "failed to install selinux-rebuild portage set" + doins "${FILESDIR}/selinux.conf" } diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 70008b2c9a26..c7e1fc38e917 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,8 +1,3 @@ -DIST busybox-1.20.2.tar.bz2 2186738 SHA256 eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd WHIRLPOOL aa8fec92d0ac8bb246dea7353537d425a5fecfa0bb807d0e291c7351e8289b84aab83303c45b75f9b7a98cd10177e210511064f0709425c2f84b069fe6a06420 DIST busybox-1.21.0.tar.bz2 2200841 SHA256 eb9d268627783297f5f459cb9bd61a94e395dc7cb3647e10ec186e0159aa36ed SHA512 ddafded24881f03db550d9793585bb5442c70f2a60a5d9770126f50981dadfe95fc0b280f83d5b8a8ce21c86bb7ce64e9f1a606cea140fb2f2599a21de55ba31 WHIRLPOOL d50378bb823dd59e8a607ed6a72d4890f4e5ad3304f1ddba9f7f3d49b5ab820acc9daa2b3c4619f8b147dec085c53c3c6f4b4ebe4c60b431299031d2af00a4d3 -DIST busybox-1.21.1.tar.bz2 2201917 SHA256 cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303 SHA512 b1dd626e1c111214ebd9b933ce2465c943fd8a0a515b6962a31f3a76276ff7992c21b7f96eeb9baeb861a5e734689054e6df5dd6414c753c37084e2d705810e1 WHIRLPOOL 8ec0d9c23d8e2eb28e7f8e88f076908cf6a3f7b64aabd0a7a1af2200064a5337c82fdac9450726236e0632faa202ea08396ca5c35e5334c2128a307adbdd736c -DIST busybox-1.22.0.tar.bz2 2218120 SHA256 92f00cd391b7d5fa2215c8450abe2ba15f9d16c226e8855fb21b6c9a5b723a53 SHA512 75d00fbad703d942c5a6882bda0c66fde32fb480ee9693c8da8107c2088ec5c95aad8eb3dbb2feceed095e133916fea27136328b7a1eba47e3b63bf50bc40a66 WHIRLPOOL 055aba8e8d116f664f61458f32c31c08bfdb0db97934eb00af02098981e25665aff16e9a371234a6859e4954d1568603a99ca7d6925cd42a27e7dae30523514f -DIST busybox-1.22.1.tar.bz2 2218650 SHA256 ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b SHA512 3e99fe373d638f714c3a61e1b02493d85ca532f472df038f7557db518ded38347072882ed568852941be7aac46fc34007257b4287375335ff5a09b60b295ce80 WHIRLPOOL 8f022480960b81d673772bdda857b5b3860edd893a833a64f5184ec6816b6b0f328079ca67ec1ba1d288a7c4b805b39c6038f0d385884762a396a86ccea7b0c8 -DIST busybox-1.23.0.tar.bz2 2253001 SHA256 483ab594dd962ddbb332fd24e36ffdd6e36ac2182fbff055c56e1ca49fda09e4 SHA512 02c8f9dd9e47ad67b417fa58ba952bbdda6e79bad5399fba3d8217803053c2fd045228bd76d56e97d40c98296841dc66e4fa829887c05378a83bdeabafeb7f72 WHIRLPOOL 01d68487d4d3cff4fb807970446f42db1dec3309fdd3fb0402f138eee28dc0885dba324b5b12b417effd4fad87581a32da09a0e9f7c050377025a52ecce2308b DIST busybox-1.23.1.tar.bz2 2252635 SHA256 300f1db0a7ca4ecee8f8d8027aba250b903372e8339b7d9123d37c1e900473bf SHA512 60849c220dde596c4197f16dd844573b24dd46c8544345a2d5a2b1976fa0ac340d22fbc97f5a1437b7de1c04f4e16aa07b3d62bc77eb83b2467582a50ed4b362 WHIRLPOOL 7cd25e42e74663849b094df699a72deaf02b1088064a511341f76aaa419c936557bbafd54523c6818082dfd4e17605f06ee51abed238ef57a56a9be12c910f99 DIST busybox-1.23.2.tar.bz2 2252786 SHA256 05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a SHA512 209c8ef26e40ccb81510f6b663202b080f9bbecac7faf386bbabf7e36a43d63b15dd6ce9f7a84c1ccc5345c524999812251da1e113ef9faadc6af1fedd24c7c9 WHIRLPOOL a0396f7f49ae702f1617e72d5d4646aceec4eba67219c7125bd8d0926d1acb1ef41ea15a7406c3cf5e5e0d8925cc75910ed5128e5fbdd257b80e2cb4f7a048a2 diff --git a/sys-apps/busybox/busybox-1.20.2.ebuild b/sys-apps/busybox/busybox-1.20.2.ebuild deleted file mode 100644 index 465f436de71c..000000000000 --- a/sys-apps/busybox/busybox-1.20.2.ebuild +++ /dev/null @@ -1,291 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -################################################################################ -# BUSYBOX ALTERNATE CONFIG MINI-HOWTO -# -# Busybox can be modified in many different ways. Here's a few ways to do it: -# -# (1) Emerge busybox with FEATURES=keepwork so the work directory won't -# get erased afterwards. Add a definition like ROOT=/my/root/path to the -# start of the line if you're installing to somewhere else than the root -# directory. This command will save the default configuration to -# ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not -# defined), and it will tell you that it has done this. Note the location -# where the config file was saved. -# -# FEATURES=keepwork USE=savedconfig emerge busybox -# -# (2) Go to the work directory and change the configuration of busybox using its -# menuconfig feature. -# -# cd /var/tmp/portage/busybox*/work/busybox-* -# make menuconfig -# -# (3) Save your configuration to the default location and copy it to the -# one of the locations listed in /usr/portage/eclass/savedconfig.eclass -# -# (4) Emerge busybox with USE=savedconfig to use the configuration file you -# just generated. -# -################################################################################ -# -# (1) Alternatively skip the above steps and simply emerge busybox without -# USE=savedconfig. -# -# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF} -# -# (3) Remerge busybox as using USE=savedconfig. -# -################################################################################ - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${PN} - EGIT_REPO_URI="git://busybox.net/busybox.git" - inherit git-2 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static systemd" -RESTRICT="test" - -RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - case $1 in - y) sed -i -e "s:.*\<CONFIG_$2\>.*set:CONFIG_$2=y:g" .config;; - n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;; - *) use $1 \ - && busybox_config_option y $2 \ - || busybox_config_option n $2 - return 0 - ;; - esac - einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...) -} - -src_prepare() { - unset KBUILD_OUTPUT #88088 - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - # patches go here! - epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch - epatch "${FILESDIR}"/${PN}-1.20.0-udhcpc6-ipv6.patch - epatch "${FILESDIR}"/${P}-*.patch - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 oldconfig > /dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 allyesconfig > /dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option n HUSH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - fi - - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with <linux-2.6.23 - busybox_config_option n FEATURE_MOUNT_NFS - - # default a bunch of uncommon options to off - local opt - for opt in \ - ADD_SHELL \ - BEEP BOOTCHARTD \ - CRONTAB \ - DC DEVFSD DNSD DPKG{,_DEB} \ - FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ - FEATURE_DEVFS \ - HOSTID HUSH \ - INETD INOTIFYD IPCALC \ - LOCALE_SUPPORT LOGNAME LPD \ - MAKEMIME MKFS_MINIX MSH \ - OD \ - RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ - SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ - TASKSET TCPSVD \ - RPM RPM2CPIO \ - UDPSVD UUDECODE UUENCODE - do - busybox_config_option n ${opt} - done - - emake -j1 oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.rc.1 mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.21.1.ebuild b/sys-apps/busybox/busybox-1.21.1.ebuild deleted file mode 100644 index 7db94ece64a5..000000000000 --- a/sys-apps/busybox/busybox-1.21.1.ebuild +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${PN} - EGIT_REPO_URI="git://busybox.net/busybox.git" - inherit git-2 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) - shift - done -} - -busybox_config_enabled() { - local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) - case ${val} in - "") return 1 ;; - y) return 0 ;; - *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; - esac -} - -src_prepare() { - unset KBUILD_OUTPUT #88088 - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - # patches go here! - epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch - epatch "${FILESDIR}"/${P}-*.patch - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 oldconfig > /dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 allyesconfig > /dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option n HUSH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - fi - - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with <linux-2.6.23 - busybox_config_option n FEATURE_MOUNT_NFS - - # default a bunch of uncommon options to off - local opt - for opt in \ - ADD_SHELL \ - BEEP BOOTCHARTD \ - CRONTAB \ - DC DEVFSD DNSD DPKG{,_DEB} \ - FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ - FEATURE_DEVFS \ - HOSTID HUSH \ - INETD INOTIFYD IPCALC \ - LOCALE_SUPPORT LOGNAME LPD \ - MAKEMIME MKFS_MINIX MSH \ - OD \ - RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ - SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ - TASKSET TCPSVD \ - RPM RPM2CPIO \ - UDPSVD UUDECODE UUENCODE - do - busybox_config_option n ${opt} - done - - emake -j1 oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.rc.1 mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.22.0.ebuild b/sys-apps/busybox/busybox-1.22.0.ebuild deleted file mode 100644 index 82f62c91a3b1..000000000000 --- a/sys-apps/busybox/busybox-1.22.0.ebuild +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${PN} - EGIT_REPO_URI="git://busybox.net/busybox.git" - inherit git-2 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) - shift - done -} - -busybox_config_enabled() { - local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) - case ${val} in - "") return 1 ;; - y) return 0 ;; - *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; - esac -} - -src_prepare() { - unset KBUILD_OUTPUT #88088 - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - # patches go here! - epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch - epatch "${FILESDIR}"/${P}-*.patch - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 oldconfig > /dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 allyesconfig > /dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option n HUSH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - fi - - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with <linux-2.6.23 - busybox_config_option n FEATURE_MOUNT_NFS - - # default a bunch of uncommon options to off - local opt - for opt in \ - ADD_SHELL \ - BEEP BOOTCHARTD \ - CRONTAB \ - DC DEVFSD DNSD DPKG{,_DEB} \ - FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ - FEATURE_DEVFS \ - HOSTID HUSH \ - INETD INOTIFYD IPCALC \ - LOCALE_SUPPORT LOGNAME LPD \ - MAKEMIME MKFS_MINIX MSH \ - OD \ - RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ - SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ - TASKSET TCPSVD \ - RPM RPM2CPIO \ - UDPSVD UUDECODE UUENCODE - do - busybox_config_option n ${opt} - done - - emake -j1 oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.rc.1 mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.22.1-r1.ebuild b/sys-apps/busybox/busybox-1.22.1-r1.ebuild deleted file mode 100644 index d6d5bfa41449..000000000000 --- a/sys-apps/busybox/busybox-1.22.1-r1.ebuild +++ /dev/null @@ -1,300 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${PN} - EGIT_REPO_URI="git://busybox.net/busybox.git" - inherit git-2 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) - shift - done -} - -busybox_config_enabled() { - local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) - case ${val} in - "") return 1 ;; - y) return 0 ;; - *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; - esac -} - -src_prepare() { - unset KBUILD_OUTPUT #88088 - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - # patches go here! - epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch - epatch "${FILESDIR}"/${P}-*.patch - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 -s oldconfig >/dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 -s defconfig >/dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 -s oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option n HUSH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - busybox_config_option n UDHCPC6 - fi - - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - busybox_config_option $(usex debug y n) TFTP_DEBUG - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with <linux-2.6.23 - busybox_config_option n FEATURE_MOUNT_NFS - - # default a bunch of uncommon options to off - local opt - for opt in \ - ADD_SHELL \ - BEEP BOOTCHARTD \ - CRONTAB \ - DC DEVFSD DNSD DPKG{,_DEB} \ - FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ - FEATURE_DEVFS \ - HOSTID HUSH \ - INETD INOTIFYD IPCALC \ - LOCALE_SUPPORT LOGNAME LPD \ - MAKEMIME MKFS_MINIX MSH \ - OD \ - RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ - SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ - TASKSET TCPSVD \ - RPM RPM2CPIO \ - UDPSVD UUDECODE UUENCODE - do - busybox_config_option n ${opt} - done - - emake -j1 oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.rc.1 mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.22.1.ebuild b/sys-apps/busybox/busybox-1.22.1.ebuild deleted file mode 100644 index 9d6a3e71acc5..000000000000 --- a/sys-apps/busybox/busybox-1.22.1.ebuild +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${PN} - EGIT_REPO_URI="git://busybox.net/busybox.git" - inherit git-2 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) - shift - done -} - -busybox_config_enabled() { - local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) - case ${val} in - "") return 1 ;; - y) return 0 ;; - *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; - esac -} - -src_prepare() { - unset KBUILD_OUTPUT #88088 - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - # patches go here! - epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch - epatch "${FILESDIR}"/${P}-*.patch - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 oldconfig > /dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 allyesconfig > /dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option n HUSH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - fi - - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with <linux-2.6.23 - busybox_config_option n FEATURE_MOUNT_NFS - - # default a bunch of uncommon options to off - local opt - for opt in \ - ADD_SHELL \ - BEEP BOOTCHARTD \ - CRONTAB \ - DC DEVFSD DNSD DPKG{,_DEB} \ - FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ - FEATURE_DEVFS \ - HOSTID HUSH \ - INETD INOTIFYD IPCALC \ - LOCALE_SUPPORT LOGNAME LPD \ - MAKEMIME MKFS_MINIX MSH \ - OD \ - RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ - SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ - TASKSET TCPSVD \ - RPM RPM2CPIO \ - UDPSVD UUDECODE UUENCODE - do - busybox_config_option n ${opt} - done - - emake -j1 oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.rc.1 mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.23.0-r1.ebuild b/sys-apps/busybox/busybox-1.23.0-r1.ebuild deleted file mode 100644 index e413eeeaceac..000000000000 --- a/sys-apps/busybox/busybox-1.23.0-r1.ebuild +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${PN} - EGIT_REPO_URI="git://busybox.net/busybox.git" - inherit git-2 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${COMMON_DEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" -RDEPEND="${COMMON_DEPEND} -mdev? ( !<sys-apps/openrc-0.13 )" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) - shift - done -} - -busybox_config_enabled() { - local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) - case ${val} in - "") return 1 ;; - y) return 0 ;; - *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; - esac -} - -src_prepare() { - unset KBUILD_OUTPUT #88088 - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - # patches go here! - epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch -# epatch "${FILESDIR}"/${P}-*.patch - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 -s oldconfig >/dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 -s allyesconfig >/dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 -s oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option n HUSH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - busybox_config_option n UDHCPC6 - fi - - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - busybox_config_option $(usex debug y n) TFTP_DEBUG - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with <linux-2.6.23 - busybox_config_option n FEATURE_MOUNT_NFS - - # default a bunch of uncommon options to off - local opt - for opt in \ - ADD_SHELL \ - BEEP BOOTCHARTD \ - CRONTAB \ - DC DEVFSD DNSD DPKG{,_DEB} \ - FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ - FEATURE_DEVFS \ - HOSTID HUSH \ - INETD INOTIFYD IPCALC \ - LOCALE_SUPPORT LOGNAME LPD \ - MAKEMIME MKFS_MINIX MSH \ - OD \ - RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ - SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ - TASKSET TCPSVD \ - RPM RPM2CPIO \ - UDPSVD UUDECODE UUENCODE - do - busybox_config_option n ${opt} - done - - emake -j1 oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.initd mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/coreutils/coreutils-8.20.ebuild b/sys-apps/coreutils/coreutils-8.20.ebuild index 48946b218753..96434764771c 100644 --- a/sys-apps/coreutils/coreutils-8.20.ebuild +++ b/sys-apps/coreutils/coreutils-8.20.ebuild @@ -34,7 +34,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 - !<sci-chemistry/ccp4-6.1.1" +" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) app-arch/xz-utils" diff --git a/sys-apps/coreutils/coreutils-8.21.ebuild b/sys-apps/coreutils/coreutils-8.21.ebuild index 92fccdf5c8ae..fdaa4c2de1cb 100644 --- a/sys-apps/coreutils/coreutils-8.21.ebuild +++ b/sys-apps/coreutils/coreutils-8.21.ebuild @@ -36,7 +36,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 - !<sci-chemistry/ccp4-6.1.1" +" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) app-arch/xz-utils" diff --git a/sys-apps/coreutils/coreutils-8.22-r1.ebuild b/sys-apps/coreutils/coreutils-8.22-r1.ebuild index 940d49ea1f3a..78fcad4daacc 100644 --- a/sys-apps/coreutils/coreutils-8.22-r1.ebuild +++ b/sys-apps/coreutils/coreutils-8.22-r1.ebuild @@ -34,7 +34,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 - !<sci-chemistry/ccp4-6.1.1" +" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) app-arch/xz-utils" diff --git a/sys-apps/coreutils/coreutils-8.22.ebuild b/sys-apps/coreutils/coreutils-8.22.ebuild index 5f3370ca2ed1..d570dee30b43 100644 --- a/sys-apps/coreutils/coreutils-8.22.ebuild +++ b/sys-apps/coreutils/coreutils-8.22.ebuild @@ -34,7 +34,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 - !<sci-chemistry/ccp4-6.1.1" +" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) app-arch/xz-utils" diff --git a/sys-apps/coreutils/coreutils-8.23.ebuild b/sys-apps/coreutils/coreutils-8.23.ebuild index 9d7ebab1a069..bfb0c9bc167c 100644 --- a/sys-apps/coreutils/coreutils-8.23.ebuild +++ b/sys-apps/coreutils/coreutils-8.23.ebuild @@ -40,7 +40,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 - !<sci-chemistry/ccp4-6.1.1" +" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) app-arch/xz-utils" diff --git a/sys-apps/coreutils/coreutils-8.24.ebuild b/sys-apps/coreutils/coreutils-8.24.ebuild index f5f6bd0d946e..5b88e1c96f5f 100644 --- a/sys-apps/coreutils/coreutils-8.24.ebuild +++ b/sys-apps/coreutils/coreutils-8.24.ebuild @@ -40,7 +40,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 - !<sci-chemistry/ccp4-6.1.1" +" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) app-arch/xz-utils" diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest index 66009d68e445..8c996664b90a 100644 --- a/sys-apps/elfix/Manifest +++ b/sys-apps/elfix/Manifest @@ -1,3 +1,3 @@ DIST elfix-0.8.4.tar.gz 374742 SHA256 374be66da3dddef485bbb5e95bfcab6fd0c2db478255bddd10079730ada5260b SHA512 10aacc3fff33c934e2d4487d174a2b0cec10ffb7a35fc72b160c786f82f0355f3a2dea716bc7fb929d2919cc32a26844f37f9d73064b755098bdaa72e8075bda WHIRLPOOL b04e099f188c0b76d8c07abd76559c1313854aa83a03ad69afb72674d93cde6ce538ae10d0fea3be5495937e72a4b98fdd36efbb2e3aa8ff23c1d9f7f943c1ae DIST elfix-0.9.0.tar.gz 372014 SHA256 8b547d987edb2f7dc23ddf30f959d7d051a9ed49810f983b8fe6c489fe731cf0 SHA512 fd9bab90d745f77429c902acd2a14f615132731b3c38929dce764f1e5f7ee8f6478a6fef7ce0cb38e7ebd9181ba57965ff0c97da5e01d0fbf2cfb940ed691ebf WHIRLPOOL c09fa2193b990a506cae17f370ec10fa6302e17d2a165e42eceb88644f8a92e297c839ad788204e213d8205695b65557a7dcef5f6417177c434c8d0a34bd5eb7 -DIST elfix-0.9.1.tar.gz 398588 SHA256 0368d07bfdad4a14f039929a30d85a612dcd9d22ac87211f8e59d452bac23625 SHA512 28fdde7841263cee766434b5eda1a4151999526aa3a1acaacd2e6355502df4b56db9faf64ce81bdc89606d366d0a6dd28c5c135290fe7f0285cee480f6002527 WHIRLPOOL cd7dc6e191d97836f4b8859b73777e3b4b6fce5d290087400327f87a621e9879f5c233eef51bef981398d0d00ecc753f222655108994d25a4e0503799569ec82 +DIST elfix-0.9.2.tar.gz 398758 SHA256 1a50ec57d6f5d1b25dcaaaf15f82849774e9e4e7e263cee3aa4936c5e3d6f071 SHA512 a7be30722abe7249ec42024d33b2bda00524cfb85da66b4511c5056efbdbfae1d3c2b42048bcf4d5cb7c0ae675f763b74a834d93a25b541ebac42fddcd2c6cf9 WHIRLPOOL aead1a63612ea187dc00aa52ee2c18431036176aae2e0e08d3138ced751f28947ee8045dd63dae67f89946d5b64e705a6b6d45b884d3d9da1d7e6e03b37ed700 diff --git a/sys-apps/elfix/elfix-0.9.1.ebuild b/sys-apps/elfix/elfix-0.9.2.ebuild index f303c412cd30..079965458c15 100644 --- a/sys-apps/elfix/elfix-0.9.1.ebuild +++ b/sys-apps/elfix/elfix-0.9.2.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-2 else SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86" fi DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo" diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index 9bd956abcea4..416d1e37ea7f 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -1,2 +1,3 @@ DIST grep-2.21-heap_buffer_overrun.patch 3302 SHA256 4bc7e744fd34b268a798daf6a5aa85f55c141747149fa7b015eefbf9318ed478 SHA512 eaea33238f179b17dd152ed27a07c211646d9572be250eb7997c25ea0c8de232d21d8bc1b1e865b26545e6817e5c116e18d9115fb497d39426ac8212839f0f82 WHIRLPOOL 5ead7c22c8fe98289322a03685e9fc04e834a01144c55c9ea3b1970fa61b400ce669e6947cb3564fbbba5c7ddf079fd30e66352e4f6eed888e8fe883e369e601 DIST grep-2.21.tar.xz 1261548 SHA256 5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de SHA512 bc894325f89d37413c773d4812cb24180560037ccc8d72c015462043ef3479ea7eefd62557e3a9d191d6d94c68262563d3c68e634acd4e77ba56e96c92805dfd WHIRLPOOL 2272286c10695a51eecafcc5ca8986adb5486d4494b284904f588717c6fb06de37933faa5f62eabf0ecc856334b3a1179b864dedc06f223047471168d2d86bb0 +DIST grep-2.22.tar.xz 1297864 SHA256 ca91d22f017bfcb503d4bc3b44295491c89a33a3df0c3d8b8614f2d3831836eb SHA512 c0756e4aa360cc29b3123384eef654743df108cc606372142c79893a09a0c8053b03d048768e972221e0ed96f378b8564f848f9acc180fca499f0494fbe9113c WHIRLPOOL 612c72fd61605a4f4e6052980db72ff2e6dfa6d0a975186ebd8f9101ab4b62caf31c5a634318156df6407e44456edf74ea1070d489da0625fee1dc029b978404 diff --git a/sys-apps/grep/grep-2.22.ebuild b/sys-apps/grep/grep-2.22.ebuild new file mode 100644 index 000000000000..c1392f6ec08b --- /dev/null +++ b/sys-apps/grep/grep-2.22.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="GNU regular expression matcher" +HOMEPAGE="https://www.gnu.org/software/grep/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + mirror://gentoo/${P}.tar.xz" + +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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls pcre static" + +LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + nls? ( virtual/libintl ) + virtual/libiconv" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + static? ( ${LIB_DEPEND} )" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +src_prepare() { + sed -i \ + -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \ + src/egrep.sh || die #523898 +} + +src_configure() { + use static && append-ldflags -static + # Always use pkg-config to get lib info for pcre. + export ac_cv_search_pcre_compile=$( + usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" '' + ) + econf \ + --bindir="${EPREFIX}"/bin \ + $(use_enable nls) \ + $(use_enable pcre perl-regexp) +} diff --git a/sys-apps/kmod/kmod-21.ebuild b/sys-apps/kmod/kmod-21.ebuild index ee2b045a4bfd..5f04701d8cc7 100644 --- a/sys-apps/kmod/kmod-21.ebuild +++ b/sys-apps/kmod/kmod-21.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then inherit autotools git-2 else SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86" inherit libtool fi diff --git a/sys-apps/lomoco/metadata.xml b/sys-apps/lomoco/metadata.xml index a11c7e26e88e..56244816bc20 100644 --- a/sys-apps/lomoco/metadata.xml +++ b/sys-apps/lomoco/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>anton.bugs@gmail.com</email> + <email>blshkv@pentoo.ch</email> <name>Anton Bolshakov</name> <description>Proxy maintainer. Assign bugs to him</description> </maintainer> diff --git a/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild b/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild index 720265d75c48..063c1a157711 100644 --- a/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild +++ b/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild @@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND="app-eselect/eselect-awk" DEPEND="${RDEPEND}" diff --git a/sys-apps/rng-tools/rng-tools-5-r2.ebuild b/sys-apps/rng-tools/rng-tools-5-r2.ebuild index 38a6dad4546f..f04175e91c69 100644 --- a/sys-apps/rng-tools/rng-tools-5-r2.ebuild +++ b/sys-apps/rng-tools/rng-tools-5-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~x86" +KEYWORDS="~alpha amd64 ~arm ~ia64 ppc x86" IUSE="selinux" DEPEND="dev-libs/libgcrypt:0 diff --git a/sys-apps/systemd/files/228-noclean-tmp.patch b/sys-apps/systemd/files/228-noclean-tmp.patch new file mode 100644 index 000000000000..769aa04ccf6e --- /dev/null +++ b/sys-apps/systemd/files/228-noclean-tmp.patch @@ -0,0 +1,28 @@ +From b23c098d5787e06770872b19f83fffa14d8a7d14 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Fri, 25 Sep 2015 10:26:18 -0400 +Subject: [PATCH] tmpfiles: Disable cleaning of /tmp and /var/tmp + +Bug: https://bugs.gentoo.org/490676 +--- + tmpfiles.d/tmp.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf +index 6bbd1aa..a361062 100644 +--- a/tmpfiles.d/tmp.conf ++++ b/tmpfiles.d/tmp.conf +@@ -8,8 +8,8 @@ + # See tmpfiles.d(5) for details + + # Clear tmp directories separately, to make them easier to override +-q /tmp 1777 root root 10d +-q /var/tmp 1777 root root 30d ++q /tmp 1777 root root ++q /var/tmp 1777 root root + + # Exclude namespace mountpoints created with PrivateTmp=yes + x /tmp/systemd-private-%b-* +-- +2.4.10 + diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 72c65e09e428..c196654d81c6 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -145,7 +145,7 @@ src_prepare() { # Bug 463376 sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch" - epatch "${FILESDIR}/226-noclean-tmp.patch" + epatch "${FILESDIR}/228-noclean-tmp.patch" epatch_user eautoreconf } diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 435eed7bf2af..888f6a4ac807 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -2,4 +2,5 @@ DIST util-linux-2.24.1.tar.xz 3543692 SHA256 835eb6232cfab0118ef2e4fd649de0ba9f5 DIST util-linux-2.24.2.tar.xz 3586580 SHA256 1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0 SHA512 a0c03876ef19fa09e434e3e5362fb3f3e0a254b3b39a623ac7a9a207d06afce00366792244ed0fac86931f8340c046620660f33c3444a07a12037182fc191240 WHIRLPOOL 4b8185e1832145c050a8aa0761ae017d846ed58cd7e07710e4c32bf92a8f6e530bddb56dab70c8025eddb4cafafed79e658b0aced3a190b61b508078a438a9ed DIST util-linux-2.25.2.tar.xz 3703644 SHA256 e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 SHA512 cf8c5bde78f844425150c2a81bdecb87aa57bcd5cebd177a78160835627f58037fa2cfe4db26fd8f35eedb3beb499a91492a297a27d065465e2ea0c6218dc387 WHIRLPOOL dd1685f2e694bf3de95acc3ba3170d231426c18c3395a867c815bbd3ab5ee0f07567b49d0ae083ce669c89db711e39fd2b990bc7321985ec2279d78816ec5258 DIST util-linux-2.26.2.tar.xz 3863868 SHA256 0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666 SHA512 1cb8e2f32882b3f496d31c250a45cfb61bedb79f7a2802b358c23134d4257fa9bc9cde8888cfa1aaba12109f82b93345c6dc0bec2d11629ffa084f2a4476a91b WHIRLPOOL 699ff057f9930fe53f44090817c64ffe089345e7aba4c836e18cd3d2088881add805640b0e41b8d60bc08e3632be919025417feb9c2ddda454c87821a59122ed +DIST util-linux-2.27.1.tar.xz 3964512 SHA256 0a818fcdede99aec43ffe6ca5b5388bff80d162f2f7bd4541dca94fecb87a290 SHA512 a450a0c2d26a6deaf5e53b8f6bddf59409aefb1f0aaf07393f68a418408fbc62c5da353c8ba53c7cac8ea6e3dddfad59161753d888c31f5ccea445e81accbad8 WHIRLPOOL b0641f013762a667efcb2fabe6e3e09dd09252835d841e25cde506aca3a74876ad34f8130f3227683c7e8f19359205c4014dfcd9055d860ae6e3e54621478639 DIST util-linux-2.27.tar.xz 3968872 SHA256 fcbf04e3ef8377fc8369af7f9afee341c5eef9b02dd5a7ce71532d0957e86dc7 SHA512 06ee17f4801fd3e35fb4cf3717722ea3f709e3dd9f9153510c399742a5cfca341e3a3a400d35a091b74f0de3636e62c7a14b7dd91d63482b7b98b1991aa6fa3c WHIRLPOOL da19c56dfe424c59bc982096f08c02d864718f030bbad79661968f1da972ea10e0eacaa2477cda45ec9a3c688d220740ca2c8823918dae5139a943f6c9d8e2a4 diff --git a/sys-apps/util-linux/util-linux-2.26.2.ebuild b/sys-apps/util-linux/util-linux-2.26.2.ebuild index 86d06c333447..02aa34536b4f 100644 --- a/sys-apps/util-linux/util-linux-2.26.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.26.2.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-2 autotools EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" else - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" fi diff --git a/sys-apps/util-linux/util-linux-2.27.1.ebuild b/sys-apps/util-linux/util-linux-2.27.1.ebuild new file mode 100644 index 000000000000..95c5785af85e --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.27.1.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) + +inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + python-single-r1 multilib-minimal systemd + +MY_PV=${PV/_/-} +MY_P=${PN}-${MY_PV} + +if [[ ${PV} == 9999 ]] ; then + inherit git-2 autotools + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" + SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" +fi + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/" + +LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" +SLOT="0" +IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode" + +RDEPEND="!sys-process/schedutils + !sys-apps/setarch + !<sys-apps/sysvinit-2.88-r7 + !sys-block/eject + !<sys-libs/e2fsprogs-libs-1.41.8 + !<sys-fs/e2fsprogs-1.41.8 + !<app-shells/bash-completion-1.3-r2 + caps? ( sys-libs/libcap-ng ) + cramfs? ( sys-libs/zlib ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) + pam? ( sys-libs/pam ) + python? ( ${PYTHON_DEPS} ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + slang? ( sys-libs/slang ) + systemd? ( sys-apps/systemd ) + udev? ( virtual/libudev:= ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20150406-r2 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] + )" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( sys-devel/bc ) + virtual/os-headers" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} == 9999 ]] ; then + po/update-potfiles + eautoreconf + fi + elibtoolize +} + +lfs_fallocate_test() { + # Make sure we can use fallocate with LFS #300307 + cat <<-EOF > "${T}"/fallocate.${ABI}.c + #define _GNU_SOURCE + #include <fcntl.h> + main() { return fallocate(0, 0, 0, 0); } + EOF + append-lfs-flags + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ + || export ac_cv_func_fallocate=no + rm -f "${T}"/fallocate.${ABI}.c +} + +multilib_src_configure() { + lfs_fallocate_test + # The scanf test in a run-time test which fails while cross-compiling. + # Blindly assume a POSIX setup since we require libmount, and libmount + # itself fails when the scanf test fails. #531856 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 + ECONF_SOURCE=${S} \ + econf \ + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \ + --docdir='${datarootdir}'/doc/${PF} \ + $(multilib_native_use_enable nls) \ + --enable-agetty \ + --with-bashcompletiondir="$(get_bashcompdir)" \ + --enable-bash-completion \ + $(multilib_native_use_enable caps setpriv) \ + --disable-chfn-chsh \ + $(multilib_native_use_enable cramfs) \ + $(multilib_native_use_enable fdformat) \ + --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \ + --disable-kill \ + --disable-login \ + $(multilib_native_use_enable tty-helpers mesg) \ + --disable-nologin \ + --enable-partx \ + $(multilib_native_use_with python) \ + --enable-raw \ + --enable-rename \ + --disable-reset \ + --enable-schedutils \ + --disable-su \ + $(multilib_native_use_enable tty-helpers wall) \ + $(multilib_native_use_enable tty-helpers write) \ + $(multilib_native_use_enable suid makeinstall-chown) \ + $(multilib_native_use_enable suid makeinstall-setuid) \ + $(use_with selinux) \ + $(multilib_native_use_with slang) \ + $(use_enable static-libs static) \ + $(multilib_native_use_with systemd) \ + --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \ + $(multilib_native_use_with udev) \ + $(tc-has-tls || echo --disable-tls) +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + # build libraries only + emake -f Makefile -f - mylibs \ + <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' + fi +} + +multilib_src_test() { + multilib_is_native_abi && emake check +} + +multilib_src_install() { + if multilib_is_native_abi; then + default + else + emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ + install-pkgconfigDATA install-uuidincHEADERS \ + install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ + install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS + fi + + if multilib_is_native_abi; then + # need the libs in / + gen_usr_ldscript -a blkid mount smartcols uuid + + use python && python_optimize + fi +} + +multilib_src_install_all() { + dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + + # e2fsprogs-libs didnt install .la files, and .pc work fine + prune_libtool_files +} + +pkg_postinst() { + if ! use tty-helpers; then + elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." + fi + + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "The agetty util now clears the terminal by default. You" + elog "might want to add --noclear to your /etc/inittab lines." + fi +} diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index ee2ab6a9764f..95c5785af85e 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -90,13 +90,9 @@ multilib_src_configure() { tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 - # We manually set --libdir to the default since on prefix, econf will set it to - # a value which the configure script does not recognize. This makes it set the - # usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25 ECONF_SOURCE=${S} \ econf \ --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \ - --libdir='${prefix}/'"$(get_libdir)" \ --docdir='${datarootdir}'/doc/${PF} \ $(multilib_native_use_enable nls) \ --enable-agetty \ diff --git a/sys-auth/oath-toolkit/Manifest b/sys-auth/oath-toolkit/Manifest index 684132144488..a836879abfc9 100644 --- a/sys-auth/oath-toolkit/Manifest +++ b/sys-auth/oath-toolkit/Manifest @@ -1 +1,2 @@ DIST oath-toolkit-2.4.1.tar.gz 4136649 SHA256 9bfa42cbc100eb6c43d2bf83e3badc51d9e6f4950a92e07513ae586d0c5e9b24 SHA512 2a3440d5c97afef00dacd235d5471e8bf68086dfdb20234a894e7534d75670808fef444fe1062525800bc5ffe368898302e6cf250cd76b7238cd602d7d05e89b WHIRLPOOL f74dc524a6845054f0d3126ac3a5555ca4ac8e5e70e108abc603622e8e73795e6cba81f3d39debca22a22c7c0f7aba133ec975acfbf8cf64a0b919f0ee1a802c +DIST oath-toolkit-2.6.1.tar.gz 4238966 SHA256 9c57831907bc26eadcdf90ba1827d0bd962dd1f737362e817a1dd6d6ec036f79 SHA512 59feadbc06d11a52bf5879493227c40358fc1f4f17ec3ff92e3a313e47b92f3154396fa3ff38ef163852b32c8bfcef1f59753b614d0138478b8f7e7971f55e62 WHIRLPOOL 4c32514c265f430272d255eb6557f3b3d434c1700d4f6a5c3607808ba761d182dde679f9248b486f9e3c45d402d902bf4863b630d3415529303b2013aabe0223 diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.4.1.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.4.1.ebuild index a41e3dd4ffac..131b04b3cd9e 100644 --- a/sys-auth/oath-toolkit/oath-toolkit-2.4.1.ebuild +++ b/sys-auth/oath-toolkit/oath-toolkit-2.4.1.ebuild @@ -25,6 +25,10 @@ src_prepare() { sed -i -r \ -e '/TESTS/s,test-vc-list-files-(git|cvs).sh,,g' \ gl/tests/Makefile.am + # disable portability warnings, caused by gtk-doc.make + sed -i \ + -e '/AM_INIT_AUTOMAKE/ s:-Wall:\0 -Wno-portability:' \ + {liboath,libpskc}/configure.ac eautoreconf default } diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.1.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.1.ebuild new file mode 100644 index 000000000000..131b04b3cd9e --- /dev/null +++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +EAPI=5 + +inherit pam eutils autotools +DESCRIPTION="Toolkit for using one-time password authentication with HOTP/TOTP algorithms" +HOMEPAGE="http://www.nongnu.org/oath-toolkit/ http://gitorious.org/oath-toolkit/" +SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz" +LICENSE="GPL-3 LGPL-2.1" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="pam pskc test" + +RDEPEND=" + pam? ( virtual/pam ) + pskc? ( dev-libs/xmlsec )" +DEPEND="${RDEPEND} + test? ( dev-libs/libxml2 ) + dev-util/gtk-doc-am" + +src_prepare() { + # These tests need git/cvs and don't reflect anything in the final app + sed -i -r \ + -e '/TESTS/s,test-vc-list-files-(git|cvs).sh,,g' \ + gl/tests/Makefile.am + # disable portability warnings, caused by gtk-doc.make + sed -i \ + -e '/AM_INIT_AUTOMAKE/ s:-Wall:\0 -Wno-portability:' \ + {liboath,libpskc}/configure.ac + eautoreconf + default +} + +src_configure() { + econf \ + $(use_enable test xmltest ) \ + $(use_enable pam) \ + $(use_with pam pam-dir $(getpam_mod_dir)) \ + $(use_enable pskc) +} + +src_install() { + default + if use pam; then + newdoc pam_oath/README README.pam + fi + if use pskc; then + doman pskctool/pskctool.1 + fi +} + +src_test() { + # without keep-going, it will bail out after the first testsuite failure, + # skipping the other testsuites. as they are mostly independant, this sucks. + emake --keep-going check + [ $? -ne 0 ] && die "At least one testsuite failed" +} diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild index 34b33e3ee4d8..53bf0ef9fb62 100644 --- a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild @@ -19,7 +19,6 @@ IUSE="debug slp" DEPEND="slp? ( net-libs/openslp )" RDEPEND="${DEPEND} - virtual/udev sys-fs/lsscsi sys-apps/util-linux" @@ -79,13 +78,12 @@ src_install() { insinto /etc/iscsi newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example + # udev pieces insinto /lib/udev/rules.d doins "${FILESDIR}"/99-iscsi.rules - insopts -m0755 - insinto /etc/udev/scripts - doins "${FILESDIR}"/iscsidev.sh - insopts -m0644 + exeinto /etc/udev/scripts + doexe "${FILESDIR}"/iscsidev.sh newconfd "${FILESDIR}"/iscsid-conf.d iscsid newinitd "${FILESDIR}"/iscsid-init.d iscsid diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default new file mode 100644 index 000000000000..d9b2d0b8db7d --- /dev/null +++ b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default @@ -0,0 +1,21 @@ +# Here you can set custom bootoptions for the SystemRescueCD +# +# You can add for example in a space separated list: +# setkmap=xx: which defines the keymap to load (example: setkmap=de) +# dostartx: load the X.Org graphical environment and launch Xfce +# docache: causes the iso file to be fully loaded into memory +# this requires 400MB of memory to cache everything +# doload=xxx: loads needed kernel modules (example: doload=3c59x,e1000) +# noload=xxx: prevents loading kernel modules +# nomodeset: do not load the Kernel-Mode-Setting video driver +# +# Example: +# SRCD_BOOTOPTIONS="setkmap=de docache dostartx" +# +# For all available bootoptions see: +# http://www.sysresccd.org/Sysresccd-manual-en_Booting_the_CD-ROM +# +# Note: +# After changing this, you must update your grub configuration file, to take effect + +SRCD_BOOTOPTIONS="" diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub new file mode 100644 index 000000000000..b69f29888c9a --- /dev/null +++ b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub @@ -0,0 +1,65 @@ +#!/bin/sh +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +. /usr/share/grub/grub-mkconfig_lib + +if [ -r /etc/default/systemrescuecd ] ; then + . /etc/default/systemrescuecd +fi + +# srcd = path of newest link to iso of systemrescuecd, created by the ebuild +# of systemrescuecd-x86 +srcd="/usr/share/systemrescuecd/systemrescuecd-x86-newest.iso" + +longname="SystemRescueCD" +bootops=")" + +if [ ! -z "${SRCD_BOOTOPTIONS}" ]; then + bootops=" with bootoptions)" +fi + +if [ -f "${srcd}" ]; then + + device=$(${grub_probe} --target=device "${srcd}") + path=$(make_system_path_relative_to_its_root "${srcd}") + grub_string=$(prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab) + + gettext_printf "Found %s on %s\n" "${longname}" "${device}" >&2 + onstr=$(gettext_printf "(on %s)" "${device}") + + cat << EOF +submenu "${longname}" --class submenu { + menuentry "${longname} (32bit standard${bootops}" --class rescue { +${grub_string} + set isofile=${srcd} + loopback loop \${isofile} + linux (loop)/isolinux/rescue32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} + initrd (loop)/isolinux/initram.igz + } + menuentry "${longname} (64bit standard${bootops}" --class rescue { +${grub_string} + set isofile=${srcd} + loopback loop \${isofile} + linux (loop)/isolinux/rescue64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} + initrd (loop)/isolinux/initram.igz + } + menuentry "${longname} (32bit alternative${bootops}" --class rescue { +${grub_string} + set isofile=${srcd} + loopback loop \${isofile} + linux (loop)/isolinux/altker32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} + initrd (loop)/isolinux/initram.igz + } + menuentry "${longname} (64bit alternative${bootops}" --class rescue { +${grub_string} + set isofile=${srcd} + loopback loop \${isofile} + linux (loop)/isolinux/altker64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} + initrd (loop)/isolinux/initram.igz + } +} +EOF + +fi diff --git a/sys-boot/systemrescuecd-x86-grub/metadata.xml b/sys-boot/systemrescuecd-x86-grub/metadata.xml new file mode 100644 index 000000000000..5a7f238e595b --- /dev/null +++ b/sys-boot/systemrescuecd-x86-grub/metadata.xml @@ -0,0 +1,17 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>gentoobugs@milaw.biz</email> + <name>Michael Lange</name> + <description>Accepts only mails from Gentoo's Bugzilla</description> + </maintainer> + <maintainer> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> + </maintainer> + <longdescription> + This package adds menu entries in GRUB for the SystemRescueCD. You can + add custom bootoptions for SystemRescueCD in a special config file. + </longdescription> +</pkgmetadata> diff --git a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild new file mode 100644 index 000000000000..32f5706c0b58 --- /dev/null +++ b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="Grub menu entries for the .iso image of systemrescuecd-x86" +HOMEPAGE="http://www.sysresccd.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT=0 +KEYWORDS="~amd64 ~x86" +IUSE="" + +S=${WORKDIR} + +RDEPEND="app-admin/systemrescuecd-x86 + sys-boot/grub" + +src_install() { + exeinto /etc/grub.d + newexe "${FILESDIR}"/systemrescuecd.grub 39_systemrescuecd + + insinto /etc/default + newins "${FILESDIR}"/systemrescuecd.default systemrescuecd +} + +pkg_postinst() { + elog "To add the menu entries for systemrescuecd to grub, you should now run" + elog " grub-mkconfig -o /boot/grub/grub.cfg" + elog "You can set custom bootoptions in /etc/default/systemrescuecd" +} diff --git a/sys-cluster/libdlm/libdlm-3.2.0.ebuild b/sys-cluster/libdlm/libdlm-3.2.0.ebuild index ba68041fe9e0..7218e0f402e5 100644 --- a/sys-cluster/libdlm/libdlm-3.2.0.ebuild +++ b/sys-cluster/libdlm/libdlm-3.2.0.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~hppa ~x86" +KEYWORDS="amd64 ~hppa x86" IUSE="static-libs" RDEPEND=" diff --git a/sys-cluster/nova/nova-2015.1.1-r3.ebuild b/sys-cluster/nova/nova-2015.1.1-r3.ebuild index 71c40c861bd2..0d738928522e 100644 --- a/sys-cluster/nova/nova-2015.1.1-r3.ebuild +++ b/sys-cluster/nova/nova-2015.1.1-r3.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 eutils linux-info multilib user -DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python" +DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system)" HOMEPAGE="https://launchpad.net/nova" SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz" diff --git a/sys-cluster/nova/nova-2015.1.2.ebuild b/sys-cluster/nova/nova-2015.1.2.ebuild index a7c01895b6eb..598ac281fcc6 100644 --- a/sys-cluster/nova/nova-2015.1.2.ebuild +++ b/sys-cluster/nova/nova-2015.1.2.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 eutils linux-info multilib user -DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python" +DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system)" HOMEPAGE="https://launchpad.net/nova" SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz" diff --git a/sys-cluster/nova/nova-2015.1.9999.ebuild b/sys-cluster/nova/nova-2015.1.9999.ebuild index 4ea159cc9884..d19aca4b4d09 100644 --- a/sys-cluster/nova/nova-2015.1.9999.ebuild +++ b/sys-cluster/nova/nova-2015.1.9999.ebuild @@ -5,9 +5,9 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 eutils git-2 linux-info multilib user +inherit distutils-r1 eutils git-r3 linux-info multilib user -DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python" +DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system)" HOMEPAGE="https://launchpad.net/nova" EGIT_REPO_URI="https://github.com/openstack/nova.git" EGIT_BRANCH="stable/kilo" diff --git a/sys-cluster/nova/nova-2015.2.9999.ebuild b/sys-cluster/nova/nova-2015.2.9999.ebuild index 1d514cc3a88c..1a23f0844a0c 100644 --- a/sys-cluster/nova/nova-2015.2.9999.ebuild +++ b/sys-cluster/nova/nova-2015.2.9999.ebuild @@ -5,9 +5,9 @@ EAPI=5 PYTHON_COMPAT=( python2_7 python3_4 ) -inherit distutils-r1 eutils git-2 linux-info multilib user +inherit distutils-r1 eutils git-r3 linux-info multilib user -DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python" +DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system)" HOMEPAGE="https://launchpad.net/nova" SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/nova/liberty/nova.conf.sample -> liberty-nova.conf.sample" EGIT_REPO_URI="https://github.com/openstack/nova.git" diff --git a/sys-cluster/swift/swift-2.3.0-r1.ebuild b/sys-cluster/swift/swift-2.3.0-r1.ebuild index 102fe94ff4be..285996a1b6de 100644 --- a/sys-cluster/swift/swift-2.3.0-r1.ebuild +++ b/sys-cluster/swift/swift-2.3.0-r1.ebuild @@ -38,7 +38,10 @@ DEPEND=" )" RDEPEND=" - >=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}] + || ( + >=dev-python/dnspython-1.9.4:0[${PYTHON_USEDEP}] + virtual/dnspython[${PYTHON_USEDEP}] + ) >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}] !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}] >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}] diff --git a/sys-cluster/swift/swift-2.5.0.ebuild b/sys-cluster/swift/swift-2.5.0-r1.ebuild index a5018b981c3a..b67b7554da6c 100644 --- a/sys-cluster/swift/swift-2.5.0.ebuild +++ b/sys-cluster/swift/swift-2.5.0-r1.ebuild @@ -40,7 +40,7 @@ DEPEND=" RDEPEND=" ${CDEPEND} - >=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}] + virtual/dnspython[${PYTHON_USEDEP}] >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}] !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}] >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}] diff --git a/sys-devel/clang/clang-2.8-r3.ebuild b/sys-devel/clang/clang-2.8-r3.ebuild index 3a4b53a1fcc0..ac9afdee1640 100644 --- a/sys-devel/clang/clang-2.8-r3.ebuild +++ b/sys-devel/clang/clang-2.8-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -156,7 +156,7 @@ src_install() { install-scan-view() { insinto "$(python_get_sitedir)"/clang doins Reporter.py Resources ScanView.py startfile.py - touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py + touch "${D}"/"$(python_get_sitedir)"/clang/__init__.py } python_execute_function install-scan-view fi diff --git a/sys-devel/clang/clang-2.9-r1.ebuild b/sys-devel/clang/clang-2.9-r1.ebuild index b53bf23b279f..e0b24139a9cf 100644 --- a/sys-devel/clang/clang-2.9-r1.ebuild +++ b/sys-devel/clang/clang-2.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -145,7 +145,7 @@ src_install() { install-scan-view() { insinto "$(python_get_sitedir)"/clang doins Reporter.py Resources ScanView.py startfile.py - touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py + touch "${D}"/"$(python_get_sitedir)"/clang/__init__.py } python_execute_function install-scan-view fi diff --git a/sys-devel/clang/clang-3.0-r4.ebuild b/sys-devel/clang/clang-3.0-r4.ebuild index 3834aa49c83c..dfd288b9bd8e 100644 --- a/sys-devel/clang/clang-3.0-r4.ebuild +++ b/sys-devel/clang/clang-3.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -163,7 +163,7 @@ src_install() { install-scan-view() { insinto "$(python_get_sitedir)"/clang doins Reporter.py Resources ScanView.py startfile.py - touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py + touch "${D}"/"$(python_get_sitedir)"/clang/__init__.py } python_execute_function install-scan-view fi diff --git a/sys-devel/clang/clang-3.1-r5.ebuild b/sys-devel/clang/clang-3.1-r5.ebuild index f98c99723b5f..34f3243e11bd 100644 --- a/sys-devel/clang/clang-3.1-r5.ebuild +++ b/sys-devel/clang/clang-3.1-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -163,7 +163,7 @@ src_install() { install-scan-view() { insinto "$(python_get_sitedir)"/clang doins Reporter.py Resources ScanView.py startfile.py - touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py + touch "${D}"/"$(python_get_sitedir)"/clang/__init__.py } python_execute_function install-scan-view fi diff --git a/sys-devel/clang/metadata.xml b/sys-devel/clang/metadata.xml index 466ad974778a..8c2afb8a2ace 100644 --- a/sys-devel/clang/metadata.xml +++ b/sys-devel/clang/metadata.xml @@ -28,8 +28,8 @@ A simple and hackable code base A single unified parser for C, Objective C, C++, and Objective C++ Conformance with C/C++/ObjC and their variants</longdescription> <use> - <flag name='multitarget'>Build all host targets (default: host only)</flag> - <flag name='static-analyzer'>Install the Clang static analyzer</flag> - <flag name='system-cxx-headers'>By default, clang++ searchs for C++ headers in a series of hardcoded paths. Enabling this flag will force it to use the active gcc profile ones</flag> + <flag name="multitarget">Build all host targets (default: host only)</flag> + <flag name="static-analyzer">Install the Clang static analyzer</flag> + <flag name="system-cxx-headers">By default, clang++ searchs for C++ headers in a series of hardcoded paths. Enabling this flag will force it to use the active gcc profile ones</flag> </use> </pkgmetadata> diff --git a/sys-devel/distcc/distcc-3.1-r10.ebuild b/sys-devel/distcc/distcc-3.1-r10.ebuild index f700ea22274e..23d17939d465 100644 --- a/sys-devel/distcc/distcc-3.1-r10.ebuild +++ b/sys-devel/distcc/distcc-3.1-r10.ebuild @@ -130,12 +130,12 @@ src_install() { newins "doc/example/xinetd" distcc fi - rm -rf "${D}/etc/default" || die - rm -f "${D}/etc/distcc/clients.allow" || die - rm -f "${D}/etc/distcc/commands.allow.sh" || die + rm -rf "${ED}/etc/default" || die + rm -f "${ED}/etc/distcc/clients.allow" || die + rm -f "${ED}/etc/distcc/commands.allow.sh" || die python_fix_shebang "${ED}" - python_optimize "${ED}"/$(python_get_sitedir) + python_optimize } pkg_postinst() { diff --git a/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild index 4969f7c1a1ab..6a4295705c67 100644 --- a/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild +++ b/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="avahi crossdev gnome gssapi gtk hardened ipv6 selinux xinetd" RESTRICT="test" diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index ee59deb9b7db..658465e5dc01 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -73,16 +73,16 @@ DIST gcc-4.9.2-patches-1.6.tar.bz2 25006 SHA256 0c7219d375be35b16d0bc5e323a1e40b DIST gcc-4.9.2-piepatches-v0.6.2.tar.bz2 14278 SHA256 f8876b172c2b4c5936b2cb18d3f092bfda8891bcdedcb569b63272a8530d81d0 SHA512 3f2d48743abba258ee6e298fc085f38d54c7b4cf4d431fe2efb83f718bdac3be916e67a3273aff1573db076decefbf4de3c4f706e102e6aafbce2371256048d8 WHIRLPOOL 76bbecad6d23793139040446721a5fb4711a9e272cf12545c51dd85c2d900e09e34dc0c260b80ad190a8072b475d779f5c6dd6b7891124bc4963b366f40989d3 DIST gcc-4.9.2-uclibc-patches-1.0.tar.bz2 2540 SHA256 3ca63cba5edb01367352fcd558890a838630deb4c30f82f4c7e8074ad75e57fc SHA512 69f6f80e23efee0b937fca0f2056e17b4fe643817d2394bbfd16cbb453d74c76a0bb8727815f689a795897d9cd5e06ecc74d3d9ad45175fe837ad008eee09706 WHIRLPOOL 3946513e83960fe891267e103e434cae0616cd45b5e7eaff5f4f671741c1445941cf80b7497231cf50f137941c01859dbbac0a95745fb7ae663a3ee512bd7162 DIST gcc-4.9.2.tar.bz2 89939747 SHA256 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd SHA512 e96cba06d572dbe7f382a2b00fd9297dcf9f9219d46a9ad0bd904dc36d5e7db3335e422640b79a27fed6fde91b0731732b94a0e2fbcd47344d6779f8ba1f4f9c WHIRLPOOL c4afdd0ec98e6f903044f1d3061fd96cf1e9bcbe2f90c388f5bc9ff8b2493b94367e84fdff7c2075ba37e2f950ecf2dba7c11786c653c2c7e86a5e8ff7d98e85 -DIST gcc-4.9.3-patches-1.3.tar.bz2 23643 SHA256 a686a3097b6075fd40e25cde70ad881f22758565112395f03890c2f455f6b998 SHA512 d75960e64a52e0cea60eec863b7caaa434a07c25d410f78d9580f9890406aff5a648a61e718b2b812b4c5fc798ccbb82e9a16f05bc991af69f5a311795100ab9 WHIRLPOOL f98dbd2b587d292e0589b7dfe3a9d9ac5a2eb9b964bb7d1da75b5d958b11d5155b7604b6c1006def09c66045a8fc23379496bd0fd7909629d0e004ecf60aed66 -DIST gcc-4.9.3-piepatches-v0.6.3.tar.bz2 14388 SHA256 268fd94cf905c9a9b95a259378c54a50763d1e13cc833cb0fc84ba33f0da78c4 SHA512 7e08934c729d06b578c420dcc845cb5fe274cb3f1f6eea8ba83a5031f0ba5f2c811e6b8fe5c2a72682030a71bf4134fd0e0d151452145899a7ae0318ebaf058a WHIRLPOOL 8f8d20c70061cd446d7c39d0f638c15ffaa64bc1cabc0f14c3f3632c76e432a3c4794cdb33799cacee754530876543902f53bca4465fca7d51c73f07eded9fe3 +DIST gcc-4.9.3-patches-1.4.tar.bz2 24588 SHA256 f18a7b586feed90bddb5b74b06da30ba7fdeb46a6f653e041d7264045fabc62b SHA512 79abba42fef65bf2e8173a2fbdf5b14a33cdbcae3fa3fb59ea8abc7efb3a8d3962e53f6a460ad07936eface3e587adb0d5e60f6cdfcc7b69c8586db83db4173e WHIRLPOOL 7a808548f30f9b7f9bd4a3bbaed546ea478ca2145d01892a44cb068d961b569416730a89119fa5cfd1f744c2896572b0c45044334f27b5f2b5cec139f32196ac +DIST gcc-4.9.3-piepatches-v0.6.4.tar.bz2 14431 SHA256 012c3025ac2e14781ff25028c0b1d42a07f510b125006116e268bcd90fb6c9db SHA512 3bbeacbca5e8ef6ab0b1d58add42f5e8e82328afe024666f9585b5398c8722e7d012abfd2009a98ad47b1f1b26afaf421402a9e7719a5662516b32dcbe5608be WHIRLPOOL 9e68d981aed42ece2f481f62efc078ad370ac780e96ba39c4273c8675d552b845cd52c588bd41839868f430b0a532789858914f4ef32a1bc187e2983264ebfd3 DIST gcc-4.9.3-uclibc-patches-1.0.tar.bz2 2515 SHA256 dd19904d4ab005ef142056228f326e75b3d4d79b8056189a505129b5940a575c SHA512 825092620a3c554ef06219fd1152c3677f1456315563b9e65282a73096e75600389e93298ed76cad41ce3eeecc6a7009ca722585b93c04095bd2d0a06c4404e6 WHIRLPOOL 0c184a5cc74f80a61f354ee85bc5a0f5b44d93bc9fa2e1892fbfe899958cfa5263b8b72cc4f905bc69bd1cc90cf870a6056c4003ec493b815646a72a0fe2e44e DIST gcc-4.9.3.tar.bz2 90006707 SHA256 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e SHA512 9ac57377a6975fc7adac704ec81355262b9f537def6955576753b87715470a20ee6a2a3144a79cc8fcba3443f7b44c7337d79d704b522d053f54f79aa6b442df WHIRLPOOL 085e4cc1825b031652cbe9e098671f761acfeca64c6cc9b8ad2a8961c13fcac9e02b4538b44dc38181a355266f2c55c99ce5a1bff3f2860b870285cf3f0e84a5 DIST gcc-5.1.0-patches-1.2.tar.bz2 23076 SHA256 151ac719599fd7b8bd9663e2f105fdd4a082411729c81fd38efb0f9724bf6b7d SHA512 eb509e25c0f4fe2d1b3d8dd191efbbd9336c899d1615d057bf68390ecbbf3e208e9ef8a89c0d225961fa9adff9577c6bfe84362b2b871fa59636a0c9d0799d44 WHIRLPOOL 1882b9b4de8ec49a38e0d3222fdae75a5c73c1e846e7fe88b2cea75a64359f6787881ee7126a338d604673a0c2214384600d2746f723017fe4c87d0421909582 DIST gcc-5.1.0-piepatches-v0.6.4.tar.bz2 14504 SHA256 9006fedb3b6c7eb92cd7eb7e65ac6d7d15b390086b75c53ef663cb647bc50689 SHA512 1b633bf017fb24047538e46a39ff85235849cc6f7394bb1798193f971746ab598a343ee997bbc2663dfa7860016fa1aff4e1a70e3f52465edf6a77b57327cfc0 WHIRLPOOL a2441860443a4a7436fe1a61d161a94d6037b92ac76ee558115020c91774b8bf126771cce45d946123c7a40f3eb8d4da13563f90f4564b78bcbbe42b64469084 DIST gcc-5.1.0-uclibc-patches-1.0.tar.bz2 2531 SHA256 1e8557d6b9952ff3e16d16b11b8e5dbae33bd37539d24d771436a7dc3a6e948f SHA512 e90aa58111368d5e6fbeb4818ecf5485ea4cefe5f3c4906c207c977b93e2b182f26987e955d03f988f59e5f056cdd71dde65f50ddb9909f8d1fac92383a3a6cf WHIRLPOOL bc04762db9b1324bd837c1e3fe440f787a7e38dae0e7eee099eefadda6a927f894246586608520a11fab138ffc825084b9d03e6e2065f8860accc2d3c803d778 DIST gcc-5.1.0.tar.bz2 94954411 SHA256 b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad SHA512 30f6a94d3adb25bc51fcaddf32a6c41429f569eeb9ed64330445b1296f99998fbfa03277b375be4f7b2b80f519910ef88e4149db7cd9031e2c61a49f501bde94 WHIRLPOOL c824ab1b4a801d11ca184ab93b3d7ec195dc0d869204cda08d6239b22832b597431f7eac3e22ffb1f13c2e4a6ef85edb3a954ad5b7754c447aa3fa6fccc21e63 -DIST gcc-5.2.0-patches-1.2.tar.bz2 22422 SHA256 5226c0a7dab2c51e712a33a731faf1bb7c225b5781cb862987d39ef9e5a0eec0 SHA512 d90ae0c8d020ade65fdc29f50bda554454fca68633a2fb93e5fc573f696d6eb14cb15fe0492ebd8644a4c8ed6382a09ea9799db71ae8c2ab276fdf09bb456234 WHIRLPOOL 4d6a3902a18b28c794d85bcd1e6791338e1bcff3b677911ff60ab31c8ecd1a3e7d2885c0ac04e83f85d6aa62ac481d065cf4273e7e1d5a01381ea4751e94707a -DIST gcc-5.2.0-piepatches-v0.6.4.tar.bz2 14482 SHA256 439297c8cd4d0511036d41b909dd45d55b60a61d029b7903431d6873a0cc248c SHA512 af2f8e436909eb87c90869e4d28376ac24b3d1edd7cd8e6ecaeb81ebe53aa585c4f04f288755ef122724594ee33a29cac4ca2233be971f6d959a99ad38b0d9b7 WHIRLPOOL 8269f23bf9ca82081097892fb3181f71180fea0029ac9595969e178c0afd7b1179c43f1fb7d35a45851cfc5ff003fc4bc20063e4e6de507d3c99926b971faa3c +DIST gcc-5.2.0-patches-1.3.tar.bz2 23374 SHA256 00b9118ebe2e8492ef3c58d9c17ff825390eb3fbd5d07f4c67636a8777f7a7ac SHA512 8f81634de21a6f1e6b734586d8bdd8df395e7ea0d27f035d19c7dce2283a27de2c17c3f06f05b6194c5cae7381449befa37fefb31c1c961c9893dec1b02617ef WHIRLPOOL 9bb6c824c1f8c73a4c344c59fae1f48a8e91513a43793e3dfcff35ed62a5f1156869f1e85da7cd81dcd2360ce339c7bdc9ecbd1a2475ca9f57b7f6123667d6d2 +DIST gcc-5.2.0-piepatches-v0.6.5.tar.bz2 14538 SHA256 b9595a324e798af026818803cd5f315f15ccb4914d35c995ab28232e6ba6cdc6 SHA512 0b3f97a8bbf269cb9c2114db030fa07b20c3266bb7fe3a4442d099497459e28a6f3ba00561c7675b0078b313cfdec56df00dac96bd9f8d0467a40d7fe6dd56a4 WHIRLPOOL d7dc26c102831d51e4005026f4f59d185a76d66bd6e14ba81b50c1639d638c8e213c1c17682074dd486d815d7ed2d9611f91d405f1719ffd82b20c9c9ed74f56 DIST gcc-5.2.0-uclibc-patches-1.0.tar.bz2 2540 SHA256 ea39ee6ec3453039884c5e2bdfadc5a2848c8e7e72b5e4e54987a75808efac5d SHA512 50ff10d7dd1830a82fe7b35d28b626ab78a6c30c719a8a4940acf04b64269f5a6e3aa71bb3ea5a2aec17f898c10f30b4a29570ce23d3b996c52b4bc5c451f8eb WHIRLPOOL b200b0dca6485e2485d64cc4fd6896be0aee2727ee4a524b4411cf5d8b22fe5788615ecb162f5dd263822c1cdecf0959ea134ad10a19750ee78874e24b518a47 DIST gcc-5.2.0.tar.bz2 95221552 SHA256 5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad SHA512 844120349ec04465dcea52d8ec747f1cbbc9d76a39fe3d8ef5e6b93614e63d718862d60d0a1c1cbf59ffc7815562287d0a2e536a6b220cebcd0b8de4ba35e715 WHIRLPOOL 17cb8627c970d58b2526b01125a4578602bd3b5ba92b66395ffd9b4c6823eb412ea9d8a2995603d645d0f69d000e6e3f626b1467c4c31185a887cacf3a71429b DIST gdc-0.24-src.tar.bz2 1012099 SHA256 cc6a97c76c9e6db31e76ff97014d24b3d43e21f018a3c6218e3fb2a4500fc79a SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686 WHIRLPOOL 22322b0c3e2d67b3b37bd7fa92a29c593688f934d4ffd62b9cc87eb63a44a4f8bbc9d75cadf11209c73bdc9942c9b4430036629d0eefcd04de9055c502b85f12 diff --git a/sys-devel/gcc/gcc-4.9.3.ebuild b/sys-devel/gcc/gcc-4.9.3.ebuild index 5d2355ce6ec0..fb820a77f9ae 100644 --- a/sys-devel/gcc/gcc-4.9.3.ebuild +++ b/sys-devel/gcc/gcc-4.9.3.ebuild @@ -4,11 +4,11 @@ EAPI="4" -PATCH_VER="1.3" +PATCH_VER="1.4" UCLIBC_VER="1.0" # Hardened gcc 4 stuff -PIE_VER="0.6.3" +PIE_VER="0.6.4" SPECS_VER="0.2.0" SPECS_GCC_VER="4.4.3" # arch/libc configurations known to be stable with {PIE,SSP}-by-default @@ -22,7 +22,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm" inherit eutils toolchain -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" RDEPEND="" DEPEND="${RDEPEND} diff --git a/sys-devel/gcc/gcc-5.2.0.ebuild b/sys-devel/gcc/gcc-5.2.0.ebuild index 732716f91b06..6bc19a819df9 100644 --- a/sys-devel/gcc/gcc-5.2.0.ebuild +++ b/sys-devel/gcc/gcc-5.2.0.ebuild @@ -4,11 +4,11 @@ EAPI="4" -PATCH_VER="1.2" +PATCH_VER="1.3" UCLIBC_VER="1.0" # Hardened gcc 4 stuff -PIE_VER="0.6.4" +PIE_VER="0.6.5" SPECS_VER="0.2.0" SPECS_GCC_VER="4.4.3" # arch/libc configurations known to be stable with {PIE,SSP}-by-default diff --git a/sys-devel/kgcc64/kgcc64-4.9.3.ebuild b/sys-devel/kgcc64/kgcc64-4.9.3.ebuild index 52d8d573d1a6..c0c49e08a1bc 100644 --- a/sys-devel/kgcc64/kgcc64-4.9.3.ebuild +++ b/sys-devel/kgcc64/kgcc64-4.9.3.ebuild @@ -24,7 +24,7 @@ inherit eutils toolchain DESCRIPTION="64bit kernel compiler" # Works on mips and sparc; all other archs, refer to bug #228115 -KEYWORDS="~hppa ~mips" +KEYWORDS="hppa ~mips" RDEPEND=">=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch new file mode 100644 index 000000000000..943a8407f123 --- /dev/null +++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch @@ -0,0 +1,16 @@ +diff -Naur llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake +--- llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake 2015-07-30 06:28:50.000000000 +0200 ++++ llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake 2015-10-27 17:10:47.365847079 +0100 +@@ -209,12 +209,6 @@ + test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu") + test_target_arch(mips64 "" "-mips64r2" "-mabi=n64") + endif() +- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm") +- test_target_arch(arm "" "-march=armv7-a") +- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch32") +- test_target_arch(aarch32 "" "-march=armv8-a") +- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch64") +- test_target_arch(aarch64 "" "-march=armv8-a") + endif() + set(COMPILER_RT_OS_SUFFIX "") + endif() diff --git a/sys-devel/llvm/llvm-3.7.0-r2.ebuild b/sys-devel/llvm/llvm-3.7.0-r2.ebuild index c63f3705f197..8856b56b9cbe 100644 --- a/sys-devel/llvm/llvm-3.7.0-r2.ebuild +++ b/sys-devel/llvm/llvm-3.7.0-r2.ebuild @@ -181,6 +181,10 @@ src_prepare() { epatch "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch + # Do not force -march flags on arm platforms + # https://bugs.gentoo.org/show_bug.cgi?id=562706 + epatch "${FILESDIR}"/cmake/${P}-compiler_rt_arm_march_flags.patch + # Make it possible to override CLANG_LIBDIR_SUFFIX # (that is used only to find LLVMgold.so) # https://llvm.org/bugs/show_bug.cgi?id=23793 diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest index e341564a78bd..97fb6672af56 100644 --- a/sys-fs/aufs3/Manifest +++ b/sys-fs/aufs3/Manifest @@ -7,3 +7,4 @@ DIST aufs3-standalone-3_p20150525.tar.xz 2988108 SHA256 117be76206e67425c4144174 DIST aufs3-standalone-3_p20150608.tar.xz 3015460 SHA256 cdf92d07f45becfeb70ea3314e554ea9c8766a2815c3aa6c8d634b5307c76d5d SHA512 4d29d2d4908cd7a4471bc3efe5c23e57d41765937c700eee8593a5c07d7e84e12e6093ef4338b6bd4e9e6f0e44674557a659fd5fa5257a79b381385d208c2209 WHIRLPOOL ccf68e64eb5bc1893c2e5d50c6fc3eaf4e71fd06949ae16e4343734dca39f7f016ab0a08796d444efe55947a8645193979c0dccce702d8c38e46207bfde4f1ad DIST aufs3-standalone-3_p20150622.tar.xz 3063280 SHA256 2fa44f9df9d58df7a5251ebd2cec206fa90ca8e110c1f657df18e62adb170517 SHA512 fe7a62249130d68f72b14f21b57e5d6db402f56637afc876068d916e78884d08476c804ac58ef06eeb9e13e0a2e1cb75ac782f83054f1c06cb85c74a3c48ba01 WHIRLPOOL 7f85a5324d51e148c97109357c13fcab76121d25ee006211d2212f9c6d352330be110569848c8ca96421bc4582025c73030329d7e501837e4d18cafd6002f153 DIST aufs3-standalone-3_p20151012.tar.xz 3122148 SHA256 f54f1f19bec26f653939e00b30007a465a1f555356ec3886f2a5970276494d0e SHA512 fcf251f358c0dfb66387744d1a1339b2bbcc979c7cc86d01068d108abd6a765c69ecce56cc182d385006febf5abf093fb2c2af77e4cc149134ac413a26b4118f WHIRLPOOL 06be7483792bceea58b26d733c1eed6f69ddd81cd49617550c3414e1800964690b69c1ee9f12b1d48887d051d6b0488a009a56aec0df7cbcc5625ca27f9043f8 +DIST aufs3-standalone-3_p20151102.tar.xz 3139016 SHA256 8d43e3c3c744ddfd250321d7a43ac98c77ff93d2775674f3c7a71183260702fb SHA512 0c0f261dc295d7b33560796f7baef761d802eac4de6b09be9a8f41689f3458149c271025e45d053fb188f56b6b2d6e5a02e159b0fefef090cbb0b44cfad78c4a WHIRLPOOL 1bcd9292362b27c564b5450c84b5f22bb16b2498b34507a78bf30df25c034bce4112ddec688f632f39cd935f1dd15dcf7f18213dc0d13a63aed1e2873da2d89b diff --git a/sys-fs/aufs3/aufs3-3_p20151102.ebuild b/sys-fs/aufs3/aufs3-3_p20151102.ebuild new file mode 100644 index 000000000000..9930d1ec65b1 --- /dev/null +++ b/sys-fs/aufs3/aufs3-3_p20151102.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs + +AUFS_VERSION="${PV%%_p*}" +# highest branch version +PATCH_MAX_VER=19 +# highest supported version +KERN_MAX_VER=20 +# lowest supported version +KERN_MIN_VER=14 + +DESCRIPTION="An entirely re-designed and re-implemented Unionfs" +HOMEPAGE="http://aufs.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs" + +DEPEND=" + dev-util/patchutils + dev-vcs/git" +RDEPEND=" + sys-fs/aufs-util + !sys-fs/aufs + !sys-fs/aufs2 + !sys-fs/aufs4" + +S="${WORKDIR}"/${PN}-standalone + +MODULE_NAMES="aufs(misc:${S})" + +pkg_setup() { + CONFIG_CHECK+=" !AUFS_FS" + use inotify && CONFIG_CHECK+=" ~FSNOTIFY" + use nfs && CONFIG_CHECK+=" EXPORTFS" + use fuse && CONFIG_CHECK+=" ~FUSE_FS" + use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS" + use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources" + + # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system + [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return + + get_version + kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade." + kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" + + linux-mod_pkg_setup + + if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then + PATCH_BRANCH="x-rcN" + elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then + PATCH_BRANCH="${KV_MINOR}".21+ + elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then + PATCH_BRANCH="${KV_MINOR}".1+ + else + PATCH_BRANCH="${KV_MINOR}" + fi + + case ${KV_EXTRA} in + "") + elog "It seems you are using vanilla-sources with aufs3" + elog "Please use sys-kernel/aufs-sources with USE=vanilla" + elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" + ;; + "-gentoo") + elog "It seems you are using gentoo-sources with aufs3" + elog "Please use sys-kernel/aufs-sources" + elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" + ;; + esac + + pushd "${T}" &> /dev/null + unpack ${A} + cd ${PN}-standalone || die + local module_branch=origin/${PN}.${PATCH_BRANCH} + einfo "Using ${module_branch} as patch source" + git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die + combinediff ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch + combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch + if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then + if use kernel-patch; then + cd ${KV_DIR} + ewarn "Patching your kernel..." + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null + epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch + ewarn "You need to compile your kernel with the applied patch" + ewarn "to be able to load and use the aufs kernel module" + else + eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" + eerror "Either enable the kernel-patch useflag to do it with this ebuild" + eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand" + die "missing kernel patch, please apply it first" + fi + fi + popd &> /dev/null + export PKG_SETUP_HAS_BEEN_RAN=1 +} + +set_config() { + for option in $*; do + grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" + sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die + done +} + +src_prepare() { + local module_branch=origin/${PN}.${PATCH_BRANCH} + + einfo "Using for module creation branch ${module_branch}" + git checkout -q -b local-gentoo ${module_branch} || die + + # All config options to off + sed "s:= y:=:g" -i config.mk || die + + set_config RDU BRANCH_MAX_127 SBILIST + + use debug && set_config DEBUG + use fuse && set_config BR_FUSE POLL + use hfs && set_config BR_HFSPLUS + use inotify && set_config HNOTIFY HFSNOTIFY + use nfs && set_config EXPORT + use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64 + use ramfs && set_config BR_RAMFS + + if use pax_kernel; then + if kernel_is ge 3 11; then + epatch "${FILESDIR}"/pax-3.11.patch + else + epatch "${FILESDIR}"/pax-3.patch + fi + fi + + sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die +} + +src_compile() { + local ARCH=x86 + + emake \ + CC=$(tc-getCC) \ + LD=$(tc-getLD) \ + LDFLAGS="$(raw-ldflags)" \ + ARCH=$(tc-arch-kernel) \ + CONFIG_AUFS_FS=m \ + KDIR="${KV_OUT_DIR}" +} + +src_install() { + linux-mod_src_install + + insinto /usr/share/doc/${PF} + + use doc && doins -r Documentation + + use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch + + dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_pkg_postinst + linux-mod_pkg_postinst +} diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest index 86af950287ea..af4295d3b7d3 100644 --- a/sys-fs/aufs4/Manifest +++ b/sys-fs/aufs4/Manifest @@ -8,3 +8,4 @@ DIST aufs4-standalone-0_pre20150622.tar.xz 543932 SHA256 28de7f6968c62a48b78f4b6 DIST aufs4-standalone-0_pre20150629.tar.xz 547808 SHA256 7c1d9a815c73e8cb1c9f909eee8f6945486c8e8feeea9cae4b3865b6032f17e5 SHA512 b7c734fb83515790b58a81b904acb286ef52124e0799dad1c7900dc8af3e0dc6f2875ba86805f1f39b8d04ce6660bf0c0307e4bbc1b58f2ca6171ead5e668a94 WHIRLPOOL b39f2cdeffd20b636c4a3aa5ec8e87cd6b1c8bdfdab071d1cabf53e10629beebffc919abf5fc90915ec0c14f4b4c45a510bbd303765564348a0e2d1688ddf79b DIST aufs4-standalone-0_pre20150928.tar.xz 649700 SHA256 614a7d36577d9c432deba647ae925a05f05468fcf9af54c84c553ee9f4b4ccb8 SHA512 69182e8ef0cd8bb251bd579e18aea1fdc5b38d16f9bd8a7dd23eaf84ae86bb24dd011871f90a0d0c1434a6136b9dcc70ed07b6f8301344d13083cd6a755c75ba WHIRLPOOL b43eb05904917f74ea38bd148543552dc1d40eb590cf5059a884dcba909e76943cb9e2d1b873300701ffbc6061beeb3efb76f8014e08a8742c48c38cd6c5fe53 DIST aufs4-standalone-0_pre20151012.tar.xz 651492 SHA256 3cb564a71a4d4fe4f16c9412b5c714645739beea9471db421d76f1af2af86d83 SHA512 abf1833a4902dc95cce203607cd715b6794b13e064c073139bc06facfd86ceb817d00d7bed0f5420d8f8f7c9205524a8ffc9431dc1c0d2da1e73393b7d89d33d WHIRLPOOL a8cb9e8fc4449dbc54e1bfab1c9acb61e7dc31c33c62d8a2e2feb407bc6d4a2ceb502fd85ac7519af1e9b028603525ee26763438e04736fee138420796c13e90 +DIST aufs4-standalone-0_pre20151102.tar.xz 677588 SHA256 5e0aa085e42dacc45991e49e485bf4f20cb911c71c8d5363ef2986733cb3d9ef SHA512 b4973078f31c50bb58afeb4fc5216a34d31b1dd4de60a5dd172962935becad60820146e22e39e88fc16a4c7a74e21923f02a77d6b0d8cd8aeef946806ed97932 WHIRLPOOL e04651079f1f04a74c330786ff3bbe72c367657ad8d0351ce251a4287ddee65231df410436f86474e6418b3e848eaa370f930376a2a1ad9fe57280b4d75be4cb diff --git a/sys-fs/aufs4/aufs4-0_pre20151102.ebuild b/sys-fs/aufs4/aufs4-0_pre20151102.ebuild new file mode 100644 index 000000000000..e9d57d6b5a63 --- /dev/null +++ b/sys-fs/aufs4/aufs4-0_pre20151102.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs + +AUFS_VERSION="${PV%%_p*}" +# highest branch version +PATCH_MAX_VER=2 +# highest supported version +KERN_MAX_VER=3 +# lowest supported version +KERN_MIN_VER=0 + +DESCRIPTION="An entirely re-designed and re-implemented Unionfs" +HOMEPAGE="http://aufs.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs" + +DEPEND=" + dev-util/patchutils + dev-vcs/git" +RDEPEND=" + sys-fs/aufs-util + !sys-fs/aufs + !sys-fs/aufs2 + !sys-fs/aufs3" + +S="${WORKDIR}"/${PN}-standalone + +MODULE_NAMES="aufs(misc:${S})" + +pkg_setup() { + CONFIG_CHECK+=" !AUFS_FS" + use inotify && CONFIG_CHECK+=" ~FSNOTIFY" + use nfs && CONFIG_CHECK+=" EXPORTFS" + use fuse && CONFIG_CHECK+=" ~FUSE_FS" + use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS" + use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources" + + # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system + [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return + + get_version + kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade." + kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new" + + linux-mod_pkg_setup + + if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then + PATCH_BRANCH="x-rcN" + else + PATCH_BRANCH="${KV_MINOR}" + fi + + case ${KV_EXTRA} in + "") + elog "It seems you are using vanilla-sources with aufs4" + elog "Please use sys-kernel/aufs-sources with USE=vanilla" + elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade" + ;; + "-gentoo") + elog "It seems you are using gentoo-sources with aufs4" + elog "Please use sys-kernel/aufs-sources" + elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade" + ;; + esac + + pushd "${T}" &> /dev/null + unpack ${A} + cd ${PN}-standalone || die + local module_branch=origin/${PN}.${PATCH_BRANCH} + einfo "Using ${module_branch} as patch source" + git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die + combinediff ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch + combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch + if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then + if use kernel-patch; then + cd ${KV_DIR} + ewarn "Patching your kernel..." + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null + epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch + ewarn "You need to compile your kernel with the applied patch" + ewarn "to be able to load and use the aufs kernel module" + else + eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" + eerror "Either enable the kernel-patch useflag to do it with this ebuild" + eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand" + die "missing kernel patch, please apply it first" + fi + fi + popd &> /dev/null + export PKG_SETUP_HAS_BEEN_RAN=1 +} + +set_config() { + for option in $*; do + grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" + sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die + done +} + +src_prepare() { + local module_branch=origin/${PN}.${PATCH_BRANCH} + + einfo "Using for module creation branch ${module_branch}" + git checkout -q -b local-gentoo ${module_branch} || die + + # All config options to off + sed "s:= y:=:g" -i config.mk || die + + set_config RDU BRANCH_MAX_127 SBILIST + + use debug && set_config DEBUG + use fuse && set_config BR_FUSE POLL + use hfs && set_config BR_HFSPLUS + use inotify && set_config HNOTIFY HFSNOTIFY + use nfs && set_config EXPORT + use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64 + use ramfs && set_config BR_RAMFS + + if use pax_kernel; then + epatch "${FILESDIR}"/pax-4.patch + fi + + sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die +} + +src_compile() { + local ARCH=x86 + + emake \ + CC=$(tc-getCC) \ + LD=$(tc-getLD) \ + LDFLAGS="$(raw-ldflags)" \ + ARCH=$(tc-arch-kernel) \ + CONFIG_AUFS_FS=m \ + KDIR="${KV_OUT_DIR}" +} + +src_install() { + linux-mod_src_install + + insinto /usr/share/doc/${PF} + + use doc && doins -r Documentation + + use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch + + dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_pkg_postinst + linux-mod_pkg_postinst +} diff --git a/sys-fs/bedup/Manifest b/sys-fs/bedup/Manifest index 039529ae1354..31aa2a22265d 100644 --- a/sys-fs/bedup/Manifest +++ b/sys-fs/bedup/Manifest @@ -1 +1,2 @@ +DIST bedup-0.10.0.tar.gz 48058 SHA256 088b31821d8b770d6127ffd7a55e6d5cf21d43b36763e984030d16b677f52fe4 SHA512 6389f4f6d81062ebd3707a620f334278f7bb55449e1de6f0d56a3d2e87d7e2f1694fdfaf2f0b318487fd25db0344b704f297aa4410fac838a9f0ed7891cdcd62 WHIRLPOOL 14a6ed728eb1dfcca47b55b448711bd5c74ed83f7151eed49f10e8f1f06385b1660f2a4bbd85d512ed7574cc2ee2d9f581a8cc7fcba4f8b5c64ccc2632824e35 DIST bedup-0.9.0_p20140413.tar.gz 48620 SHA256 f9c380074e3f13e42447c04a0fd5c1abca444487cf6ccb6400f09dcca14f90a6 SHA512 9a730dff2b2af239a6386d860881989de50f7a4fb6ae5b402c6dfe828308bbf4ccc2b6f616fdfc2b445fe23fbfcc302163b320813b50fa27940e578b5145345c WHIRLPOOL af4827f4514acc8380f312a72bb3208614f1f529e7373bca3bb610315e0474c9d7c7cbda1338d7019316e708f17ba73e71539092065041df588fd449f7639b54 diff --git a/sys-fs/bedup/bedup-0.10.0.ebuild b/sys-fs/bedup/bedup-0.10.0.ebuild new file mode 100644 index 000000000000..da05f0fc09d1 --- /dev/null +++ b/sys-fs/bedup/bedup-0.10.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{3_3,3_4} ) + +inherit distutils-r1 vcs-snapshot + +DESCRIPTION="Btrfs file de-duplication tool" +HOMEPAGE="https://github.com/g2p/bedup" +SRC_URI="https://github.com/g2p/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# we need btrfs-progs with includes installed. +DEPEND=">=dev-python/cffi-0.5:=[${PYTHON_USEDEP}] + >=sys-fs/btrfs-progs-0.20_rc1_p358" +RDEPEND="${DEPEND} + dev-python/alembic[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-0.8.2[sqlite,${PYTHON_USEDEP}]" diff --git a/sys-fs/bedup/bedup-9999.ebuild b/sys-fs/bedup/bedup-9999.ebuild index 9f4323451a29..b5ae24edd7dd 100644 --- a/sys-fs/bedup/bedup-9999.ebuild +++ b/sys-fs/bedup/bedup-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_COMPAT=( python{3_3,3_4} ) #if LIVE EGIT_REPO_URI="git://github.com/g2p/bedup.git @@ -12,11 +12,12 @@ EGIT_REPO_URI="git://github.com/g2p/bedup.git inherit git-r3 #endif -inherit distutils-r1 +inherit distutils-r1 vcs-snapshot DESCRIPTION="Btrfs file de-duplication tool" HOMEPAGE="https://github.com/g2p/bedup" -SRC_URI="https://github.com/g2p/${PN}/archive/v${PV}.tar.gz" +SRC_URI="https://github.com/g2p/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" @@ -27,12 +28,13 @@ IUSE="" DEPEND=">=dev-python/cffi-0.5:=[${PYTHON_USEDEP}] >=sys-fs/btrfs-progs-0.20_rc1_p358" RDEPEND="${DEPEND} - <dev-python/alembic-0.7[${PYTHON_USEDEP}] - dev-python/contextlib2[${PYTHON_USEDEP}] + dev-python/alembic[${PYTHON_USEDEP}] dev-python/pyxdg[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-0.8.2[sqlite,${PYTHON_USEDEP}]" #if LIVE SRC_URI= KEYWORDS= + +src_unpack() { git-r3_src_unpack; } #endif diff --git a/sys-fs/cloudfuse/metadata.xml b/sys-fs/cloudfuse/metadata.xml index a60ef5cec63b..59186a95942a 100644 --- a/sys-fs/cloudfuse/metadata.xml +++ b/sys-fs/cloudfuse/metadata.xml @@ -2,12 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer status="active"> - <email>erikmack@gmail.com</email> + <email>stasibear@gentoo.org</email> <name>Erik Mackdanz</name> </maintainer> - <maintainer status="active"> - <email>alunduil@gentoo.org</email> - </maintainer> <longdescription> Cloudfuse is a FUSE application which provides access to Rackspace's Cloud Files. The README claims that diff --git a/sys-fs/exfat-utils/exfat-utils-1.2.1.ebuild b/sys-fs/exfat-utils/exfat-utils-1.2.1.ebuild index 6db7bfda3d39..266ad5390d0b 100644 --- a/sys-fs/exfat-utils/exfat-utils-1.2.1.ebuild +++ b/sys-fs/exfat-utils/exfat-utils-1.2.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz" # COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux" src_install() { emake DESTDIR="${D}" install diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest index 86edca3848b4..8f7ec4b615db 100644 --- a/sys-fs/iprutils/Manifest +++ b/sys-fs/iprutils/Manifest @@ -1,2 +1,3 @@ DIST iprutils-2.4.7.tar.gz 467671 SHA256 bb3a729b35824428d9a7d4db0a25d5ec89ff1dfcc13dd3c62fe254dc56408dd0 SHA512 9e6fd37cb72ce1d092b02f1cdfeb9e97962007327f92f4d9dd2a755489dab3a5d51a459d2f256d8453de74935a5cee8f25f71a820d82347ae67aa72a89043a91 WHIRLPOOL 190a906a91114f56b434e9efb657f9b3ba8a6b145715934f20919dc18521ee696604403134d35a5196c0d8d823c32b5f9e08aaa40bacddebeb42e5dae7ceab02 DIST iprutils-2.4.8.tar.gz 474447 SHA256 fbd118344b5f7e0acfdadff8093043dee70ad88b58cb3d8ea53e005a3d2b5a17 SHA512 08086058d80b46a58d7d35676645160c7058e88e7d7e61fac36a8565b6ad3a42b0f6e1fe3238de7017ec2b53f1aa93b427bb7113c0c0b21fb148f22fc5a2b6a5 WHIRLPOOL 5f06cd2fab55cac77c212d3693bf3bcea41f1747d6e63c4a24d16ab781da2067163b0e21dfb83eb8cca767bc7458491a0b48b2d859c5e8ea46a59defad5347b9 +DIST iprutils-2.4.9.tar.gz 478916 SHA256 569fc9334a7815e1c871eed06961e0216d6d8f2e9411c7d417906ee3520375dc SHA512 0edfa74cc3559427e3b63bf39084013c9a594359c244b9c7bf0eed642a161caa73574371da1051a74caece80159f2c7c46aa296a0910b85145f99f9f1b10dcec WHIRLPOOL 1f16c8f838f7bf3fe2ac7b1fe9e548bf8e81c4f797cb76273fd35636f11fa965c67540bdf59c60069795bc6a2d88bfbc357348c837f849001018e970501e7e31 diff --git a/sys-fs/iprutils/iprutils-2.4.9.ebuild b/sys-fs/iprutils/iprutils-2.4.9.ebuild new file mode 100644 index 000000000000..62a3755b7bf0 --- /dev/null +++ b/sys-fs/iprutils/iprutils-2.4.9.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools bash-completion-r1 eutils toolchain-funcs + +DESCRIPTION="IBM's tools for support of the ipr SCSI controller" +SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz" +HOMEPAGE="http://sourceforge.net/projects/iprdd/" + +SLOT="0" +LICENSE="IBM" +KEYWORDS="~ppc ~ppc64" +IUSE="static-libs" + +IPRUTILS_DEPEND=" + >=sys-libs/ncurses-5.4-r5:= + >=sys-apps/pciutils-2.1.11-r1 +" +RDEPEND=" + ${IPRUTILS_DEPEND} + virtual/logger + virtual/udev +" +DEPEND=" + ${IPRUTILS_DEPEND} + virtual/pkgconfig +" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.4.8-tinfo.patch + + eautoreconf +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_install () { + emake DESTDIR="${D}" \ + bashcompdir=$(get_bashcompdir) install + + newinitd "${FILESDIR}"/iprinit-r1 iprinit + newinitd "${FILESDIR}"/iprupdate-r1 iprupdate + newinitd "${FILESDIR}"/iprdump-r1 iprdump + + prune_libtool_files +} diff --git a/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild new file mode 100644 index 000000000000..e3eb6e5d4a01 --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic + +DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" +HOMEPAGE="https://sources.redhat.com/lvm2/" +SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz + ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" +REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) + systemd? ( udev ) + clvm? ( !systemd )" + +DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) + readline? ( sys-libs/readline:0= ) + udev? ( >=virtual/libudev-208:=[static-libs?] )" +# /run is now required for locking during early boot. /var cannot be assumed to +# be available -- thus, pull in recent enough baselayout for /run. +# This version of LVM is incompatible with cryptsetup <1.1.2. +RDEPEND="${DEPEND_COMMON} + >=sys-apps/baselayout-2.2 + !<sys-apps/openrc-0.11 + !<sys-fs/cryptsetup-1.1.2 + !!sys-fs/clvm + !!sys-fs/lvm-user + >=sys-apps/util-linux-2.16 + lvm2create_initrd? ( sys-apps/makedev ) + thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" +# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check +# USE 'static' currently only works with eudev, bug 520450 +DEPEND="${DEPEND_COMMON} + virtual/pkgconfig + >=sys-devel/binutils-2.20.1-r1 + static? ( + selinux? ( sys-libs/libselinux[static-libs] ) + udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) + >=sys-apps/util-linux-2.16[static-libs] + )" + +S=${WORKDIR}/${PN/lvm/LVM}.${PV} + +pkg_setup() { + local CONFIG_CHECK="~SYSVIPC" + + if use udev; then + local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" + if linux_config_exists; then + local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) + if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then + ewarn "It's recommended to set an empty value to the following kernel config option:" + ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" + fi + fi + fi + + check_extra_config + + # 1. Genkernel no longer copies /sbin/lvm blindly. + if use static; then + elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" + elog "their static versions. If you need the static binaries," + elog "you must append .static to the filename!" + fi +} + +src_prepare() { + # Gentoo specific modification(s): + epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch + + sed -i \ + -e "1iAR = $(tc-getAR)" \ + -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ + make.tmpl.in || die #444082 + + sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212 + + if use udev && ! use device-mapper-only; then + sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 + elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in" + elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad" + elog "if it was previously disabled." + fi + + sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 + + # For upstream -- review and forward: + epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch + epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch + epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 + epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 + epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed + epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905 + epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid + epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450 + + # Without thin-privision-tools, there is nothing to install for target install_man7: + use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; } + + eautoreconf +} + +src_configure() { + filter-flags -flto + local myconf + local buildmode + + myconf="${myconf} $(use_enable !device-mapper-only dmeventd)" + myconf="${myconf} $(use_enable !device-mapper-only cmdlib)" + myconf="${myconf} $(use_enable !device-mapper-only applib)" + myconf="${myconf} $(use_enable !device-mapper-only fsadm)" + myconf="${myconf} $(use_enable !device-mapper-only lvmetad)" + use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs" + + # Most of this package does weird stuff. + # The build options are tristate, and --without is NOT supported + # options: 'none', 'internal', 'shared' + if use static; then + buildmode="internal" + # This only causes the .static versions to become available + myconf="${myconf} --enable-static_link" + else + buildmode="shared" + fi + dmbuildmode=$(use !device-mapper-only && echo internal || echo none) + + # dmeventd requires mirrors to be internal, and snapshot available + # so we cannot disable them + myconf="${myconf} --with-mirrors=${dmbuildmode}" + myconf="${myconf} --with-snapshots=${dmbuildmode}" + if use thin; then + myconf="${myconf} --with-thin=internal --with-cache=internal" + local texec + for texec in check dump repair restore; do + myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}" + myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}" + done + else + myconf="${myconf} --with-thin=none --with-cache=none" + fi + + if use lvm1; then + myconf="${myconf} --with-lvm1=${buildmode}" + else + myconf="${myconf} --with-lvm1=none" + fi + + # disable O_DIRECT support on hppa, breaks pv detection (#99532) + use hppa && myconf="${myconf} --disable-o_direct" + + if use clvm; then + myconf="${myconf} --with-cluster=${buildmode}" + # 4-state! Make sure we get it right, per bug 210879 + # Valid options are: none, cman, gulm, all + # + # 2009/02: + # gulm is removed now, now dual-state: + # cman, none + # all still exists, but is not needed + # + # 2009/07: + # TODO: add corosync and re-enable ALL + local clvmd="" + use cman && clvmd="cman" + #clvmd="${clvmd/cmangulm/all}" + [ -z "${clvmd}" ] && clvmd="none" + myconf="${myconf} --with-clvmd=${clvmd}" + myconf="${myconf} --with-pool=${buildmode}" + else + myconf="${myconf} --with-clvmd=none --with-cluster=none" + fi + + econf \ + $(use_enable readline) \ + $(use_enable selinux) \ + --enable-pkgconfig \ + --with-confdir="${EPREFIX}"/etc \ + --exec-prefix="${EPREFIX}" \ + --sbindir="${EPREFIX}/sbin" \ + --with-staticdir="${EPREFIX}"/sbin \ + --libdir="${EPREFIX}/$(get_libdir)" \ + --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \ + --with-default-dm-run-dir=/run \ + --with-default-run-dir=/run/lvm \ + --with-default-locking-dir=/run/lock/lvm \ + --with-default-pid-dir=/run \ + $(use_enable udev udev_rules) \ + $(use_enable udev udev_sync) \ + $(use_with udev udevdir "$(get_udevdir)"/rules.d) \ + $(use_enable systemd udev-systemd-background-jobs) \ + "$(systemd_with_unitdir)" \ + ${myconf} \ + CLDFLAGS="${LDFLAGS}" +} + +src_compile() { + pushd include >/dev/null + emake + popd >/dev/null + + if use device-mapper-only ; then + emake device-mapper + else + emake + emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat + fi +} + +src_install() { + local inst + INSTALL_TARGETS="install install_tmpfiles_configuration" + # install systemd related files only when requested, bug #522430 + use systemd && INSTALL_TARGETS="${INSTALL_TARGETS} install_systemd_units install_systemd_generators" + use device-mapper-only && INSTALL_TARGETS="install_device-mapper" + for inst in ${INSTALL_TARGETS}; do + emake DESTDIR="${D}" ${inst} + done + + newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper + newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper + + if use !device-mapper-only ; then + newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd + newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm + newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm + + newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring + newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad + fi + + if use clvm; then + newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd + newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd + fi + + if use static-libs; then + dolib.a libdm/ioctl/libdevmapper.a + dolib.a libdaemon/client/libdaemonclient.a #462908 + #gen_usr_ldscript libdevmapper.so + dolib.a daemons/dmeventd/libdevmapper-event.a + #gen_usr_ldscript libdevmapper-event.so + else + rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a + fi + + if use lvm2create_initrd; then + dosbin scripts/lvm2create_initrd/lvm2create_initrd + doman scripts/lvm2create_initrd/lvm2create_initrd.8 + newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd + fi + + insinto /etc + doins "${FILESDIR}"/dmtab + + dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf +} + +pkg_postinst() { + ewarn "Make sure the \"lvm\" init script is in the runlevels:" + ewarn "# rc-update add lvm boot" + ewarn + ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" + ewarn "to enable lvm autoactivation and metadata caching." +} + +src_test() { + einfo "Tests are disabled because of device-node mucking, if you want to" + einfo "run tests, compile the package and see ${S}/tests" +} diff --git a/sys-fs/lvm2/lvm2-2.02.116.ebuild b/sys-fs/lvm2/lvm2-2.02.116.ebuild index b715b839874b..145d71fd5b38 100644 --- a/sys-fs/lvm2/lvm2-2.02.116.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.116.ebuild @@ -12,7 +12,7 @@ SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) systemd? ( udev ) diff --git a/sys-fs/quota/quota-4.02.ebuild b/sys-fs/quota/quota-4.02.ebuild index 46f418c497df..a32694f650b8 100644 --- a/sys-fs/quota/quota-4.02.ebuild +++ b/sys-fs/quota/quota-4.02.ebuild @@ -18,7 +18,7 @@ IUSE="ldap netlink nls rpc tcpd" RDEPEND="ldap? ( >=net-nds/openldap-2.3.35 ) netlink? ( sys-apps/dbus - dev-libs/libnl:1.1 + dev-libs/libnl:3 ) rpc? ( net-nds/rpcbind ) tcpd? ( sys-apps/tcp-wrappers )" diff --git a/sys-fs/static-dev/static-dev-0.1.ebuild b/sys-fs/static-dev/static-dev-0.1.ebuild index cdafd459eeec..099adc31aa16 100644 --- a/sys-fs/static-dev/static-dev-0.1.ebuild +++ b/sys-fs/static-dev/static-dev-0.1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI="5" + DESCRIPTION="A skeleton, statically managed /dev" HOMEPAGE="https://bugs.gentoo.org/107875" SRC_URI="" @@ -12,6 +14,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" IUSE="" RDEPEND="sys-apps/makedev" +DEPEND="${RDEPEND}" abort() { echo @@ -20,10 +23,17 @@ abort() { die "Cannot install on udev/devfs tmpfs." } -pkg_preinst() { +pkg_pretend() { + if [[ ${MERGE_TYPE} == "buildonly" ]] ; then + # User is just compiling which is fine -- all our checks are merge-time. + return + fi + + # We want to not clobber udev (tmpfs) or older devfs setups. if [[ -d ${ROOT}/dev/.udev || -c ${ROOT}/dev/.devfs ]] ; then abort fi + # We also want to not clobber newer devtmpfs setups. if [[ ${ROOT} == "/" ]] && \ ! awk '$2 == "/dev" && $3 == "devtmpfs" { exit 1 }' /proc/mounts ; then abort diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest index bb29e7e1284d..6702691d8d40 100644 --- a/sys-fs/xfsdump/Manifest +++ b/sys-fs/xfsdump/Manifest @@ -1,4 +1,3 @@ -DIST xfsdump-3.0.6.tar.gz 789635 SHA256 d6aa8040f7fe7c4dcb41190b7530c36177b084134e92a2c01e309ff4c18a1829 SHA512 2dbb255575f83e144e54d024ad46e8246fa24b20aad2c67052b66a9879ddda3b49546ec5daaa8eb9cf44f5293a313814a131faf49f6a1e76aca435da3da3d5bf WHIRLPOOL 5ff53fcba183cbf9f27631241e5065e0ee6e6ca19bba6f881698238df1a03ba0fc6b7a6084403a87cc7a7962f21611f404e8598a945c7f32eb57d40abe49abbc -DIST xfsdump-3.1.2.tar.gz 831511 SHA256 dc3065b9aeb00de078b8a54ae3f46c71d43d4c4ad4c69ec77343182e881fa4d8 SHA512 23a295ec17002284852f83583a9a66600f2c94742f9c0372db6193e38a53142f71ab3c46fb6d48f0caa9a2737712e217c9adf798edfbd172403d6c372fc63b02 WHIRLPOOL 4854f65496a47a96b5bd00353e31ae816a3898d5aef314b0e16b148da291acf2b123ae4182c8e4791b992bc83a9d32d40d6874b69920d36953935a473c425bef DIST xfsdump-3.1.3.tar.gz 826922 SHA256 f02138a5d96e06c506ac8cb6e4fedeb0bf7d7cf8b9747f262d0735b885dbf8fa SHA512 18f5ce7e249b317247012246fd7c5980f62cc46a5718adc80a3137be4f2d7c47edd7d1286e31fbae9c0629a49fc13482308e37950c5122165929088e467865b9 WHIRLPOOL cb80202e16c14ac279ffc698acf1ad3b1fe7365a451d05bba5ec5410b6cdcaf06f7f1986f374130cc40d0a43ccb0eedb2ed433a3e41c6701e9c94c247d821207 DIST xfsdump-3.1.4.tar.gz 848188 SHA256 570eafd0721515bdd79cb0e295b701d49cdf81e71a0a0ff0df6d4c5cc1960943 SHA512 e82885ad6b3f1d81c1cdeff56714b73651e1c74eb4ce71574875ec0bb69b3fe707b40f85f0766b21ba589d13364ecfc0bad657a9b15c428cf821f926c3d66b25 WHIRLPOOL 5677000929f260b391743207a865c7529b788db46806a62c62bb6917025194913609cc804ead23314988f44853abc57f3c86ee22d2bde365697a35b0a7e3b607 +DIST xfsdump-3.1.5.tar.gz 848863 SHA256 2f1fad1754c94163a2401e69fa09ef06f587f780239a131e7ec0a14a3a3959e3 SHA512 107d23e3d1a84aaef0ef4c0f541f37a860ccbef996e0886a6f56f01c7998451210b127289c21ec71e9ef5db7d124d479b41017e9e3d5c2d9c68b2dbbfd316620 WHIRLPOOL ed7d6c11c4354540d8accb8c0d4955fc039bdead3c2f854e609756d14a856b862884adc1dba059ed28fa57ece76c8be3f073b8058c59dbac807a7af9fbbf482d diff --git a/sys-fs/xfsdump/files/xfsdump-3.0.6-path-overflow.patch b/sys-fs/xfsdump/files/xfsdump-3.0.6-path-overflow.patch deleted file mode 100644 index a6d9f6b82233..000000000000 --- a/sys-fs/xfsdump/files/xfsdump-3.0.6-path-overflow.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://bugs.gentoo.org/370949 - -From 435bad87388821684bb3cd2a33c42787cf970017 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 6 Nov 2011 00:44:57 -0400 -Subject: [PATCH] path: fix 1 byte overflow with empty lists - -If pap->pa_cnt is 0, then the local buffer is allocated as 1 byte, -but the code then writes two bytes to it '/' and '\0'. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - common/path.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/common/path.c b/common/path.c -index 66320de..ca24f6a 100644 ---- a/common/path.c -+++ b/common/path.c -@@ -285,6 +285,8 @@ pa_gen( pa_t *pap ) - for ( i = 0 ; i < pap->pa_cnt ; i++ ) { - sz += strlen( pap->pa_array[ i ] ) + 1; - } -+ if ( i == 0 ) -+ sz++; - sz++; - - retp = ( char * )malloc( sz ); --- -1.7.6.1 - diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.5-config-platform.patch b/sys-fs/xfsdump/files/xfsdump-3.1.5-config-platform.patch new file mode 100644 index 000000000000..1c8c855b37b4 --- /dev/null +++ b/sys-fs/xfsdump/files/xfsdump-3.1.5-config-platform.patch @@ -0,0 +1,26 @@ +a few xfsprogs defs are still used in the code base. +these are copied from the platform_defs.h.in file. + +--- include/config.h.in ++++ include/config.h.in +@@ -21,4 +21,20 @@ + #endif + #include <locale.h> + ++#define IRIX_DEV_BITSMAJOR 14 ++#define IRIX_DEV_BITSMINOR 18 ++#define IRIX_DEV_MAXMAJ 0x1ff ++#define IRIX_DEV_MAXMIN 0x3ffff ++#define IRIX_DEV_MAJOR(dev) ((int)(((unsigned)(dev) >> IRIX_DEV_BITSMINOR) \ ++ & IRIX_DEV_MAXMAJ)) ++#define IRIX_DEV_MINOR(dev) ((int)((dev) & IRIX_DEV_MAXMIN)) ++#define IRIX_MKDEV(major,minor) ((xfs_dev_t)(((major) << IRIX_DEV_BITSMINOR) \ ++ | (minor&IRIX_DEV_MAXMIN))) ++#define IRIX_DEV_TO_KDEVT(dev) makedev(IRIX_DEV_MAJOR(dev),IRIX_DEV_MINOR(dev)) ++ ++#ifndef min ++#define min(a,b) (((a)<(b))?(a):(b)) ++#define max(a,b) (((a)>(b))?(a):(b)) ++#endif ++ + #endif /* __CONFIG_H__ */ diff --git a/sys-fs/xfsdump/xfsdump-3.1.2.ebuild b/sys-fs/xfsdump/xfsdump-3.1.2.ebuild deleted file mode 100644 index e196a818eb1e..000000000000 --- a/sys-fs/xfsdump/xfsdump-3.1.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit multilib eutils - -DESCRIPTION="xfs dump/restore utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs" -SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz - ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86" -IUSE="" - -RDEPEND="sys-fs/e2fsprogs - !<sys-fs/xfsprogs-3 - sys-apps/dmapi - >=sys-apps/attr-2.4.19" -DEPEND="${RDEPEND} - sys-devel/gettext" - -src_prepare() { - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - include/builddefs.in \ - || die - epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115 - epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881 -} - -src_configure() { - unset PLATFORM #184564 - export OPTIMIZER=${CFLAGS} - export DEBUG=-DNDEBUG - - econf \ - --libdir=/$(get_libdir) \ - --libexecdir=/usr/$(get_libdir) \ - --sbindir=/sbin -} diff --git a/sys-fs/xfsdump/xfsdump-3.0.6.ebuild b/sys-fs/xfsdump/xfsdump-3.1.5.ebuild index 4f3c2e86c2f8..b64e028716d5 100644 --- a/sys-fs/xfsdump/xfsdump-3.0.6.ebuild +++ b/sys-fs/xfsdump/xfsdump-3.1.5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="2" +EAPI="5" inherit multilib eutils @@ -13,11 +13,11 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86" IUSE="" RDEPEND="sys-fs/e2fsprogs - !<sys-fs/xfsprogs-3 + >=sys-fs/xfsprogs-3.2.0 sys-apps/dmapi >=sys-apps/attr-2.4.19" DEPEND="${RDEPEND} @@ -30,7 +30,19 @@ src_prepare() { || die epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115 epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881 - epatch "${FILESDIR}"/${PN}-3.0.6-path-overflow.patch #370949 + + # The release when used with xfsprogs-4.2+ is ... a mess. + epatch "${FILESDIR}"/${P}-config-platform.patch + find -type f -name '*.c' -exec sed -i \ + -e '1i#include "config.h"' \ + -e '1i#include <assert.h>' \ + -e '1i#include <fcntl.h>' \ + -e '1i#include <stdarg.h>' \ + -e '1i#include <stdlib.h>' \ + -e '1i#include <string.h>' \ + -e '1i#include <unistd.h>' \ + -e '1i#include <sys/wait.h>' \ + {} + || die } src_configure() { @@ -39,12 +51,7 @@ src_configure() { export DEBUG=-DNDEBUG econf \ - --libdir=/$(get_libdir) \ - --libexecdir=/usr/$(get_libdir) \ - --sbindir=/sbin -} - -src_install() { - emake DIST_ROOT="${D}" install || die - prepalldocs + --libdir="${EPREFIX}/$(get_libdir)" \ + --libexecdir="${EPREFIX}/usr/$(get_libdir)" \ + --sbindir="${EPREFIX}/sbin" } diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest index 1f30d4a6c698..40511d9644ba 100644 --- a/sys-kernel/aufs-sources/Manifest +++ b/sys-kernel/aufs-sources/Manifest @@ -1,51 +1,30 @@ -DIST aufs-sources-3.18.1+_p20150622.tar.xz 167804 SHA256 39fce606f62e4791ae78bbd83a9a727946e61afc2af865b20b0bdcf0e107dd5e SHA512 8ea52f0ef542b99afe6ecfa462663d19a589538fbb0f827cfec6b1e680be63c7822e5720199a9abb689876a2739ed601a8e36622395bdac0e31072e00bc94c99 WHIRLPOOL 3abd335909f0923fd71bbeb4ac250a06a2a0d3ffe741c33b72c977e78b8ae5b3acf2d269469d2c397f5e5d4ac797a993027ada8a53be4fc24cea2c6e71bff89a -DIST aufs-sources-3.18.1+_p20150629.tar.xz 167804 SHA256 39fce606f62e4791ae78bbd83a9a727946e61afc2af865b20b0bdcf0e107dd5e SHA512 8ea52f0ef542b99afe6ecfa462663d19a589538fbb0f827cfec6b1e680be63c7822e5720199a9abb689876a2739ed601a8e36622395bdac0e31072e00bc94c99 WHIRLPOOL 3abd335909f0923fd71bbeb4ac250a06a2a0d3ffe741c33b72c977e78b8ae5b3acf2d269469d2c397f5e5d4ac797a993027ada8a53be4fc24cea2c6e71bff89a +DIST aufs-sources-3.18.1+_p20151012.tar.xz 167524 SHA256 842dba4854436f7a40d535c040257d883f1636e79d8360d67d1aa0d55ccd025f SHA512 a4526b4ad6a7fb4baf6c7937ad3c3dcdb55015a2ced414ea14e69941973fb694c5fe57bf95e9edf8a9a301e02f4983b1dd3dd7325d2bad74d66cac3fc7d75c93 WHIRLPOOL 0b3527f4be171a2eed36847804c337fd4f27748e467158c4e86be192a75ea365a9d4766ce20d6fd356606c292564d7e8a7ae843a7f8218f8761bfdd1aab56fbc DIST aufs-sources-4.0_p20150518.tar.xz 166024 SHA256 da653585bfd610bbc874b9f51c76777511a9b15eb662917f653af1ef8d255936 SHA512 b7e7f681b8125c98f6ea28482243edeb16952ac0ba53ebb7992a0988d54066dd288bac732cce7b6f89485407fb69f6bce164f9bdd09f15b446acba1c28c2905b WHIRLPOOL ed3eeb9658d87714268b0f03bf1de80aedef697f51a80407211b68beed5af8efca77d14de0dbcc9873f30b71fc4b026c6270b6c75ac0fd7e22ec89432867d17a DIST aufs-sources-4.0_p20150629.tar.xz 166624 SHA256 af28e0752a1f9c0edf34519b58ed4aaea9e3538a3041110061d1fa55e25acfca SHA512 c68c077bf399d188c72f8c2c6ca4ce634fa710b84296275529f1a8a20c3c923ca7d418cd564d66651b5dbc3544bc556f763a5c3687e3fede55e36b13223a2bec WHIRLPOOL e3590e5da82ae5252c1e318dd775d950a14c3ac0f6235552cef0943f304361299ed33731e7365f6ef586e02e7d23be5dfdc613b40f48a042655b2a110638ca3e -DIST aufs-sources-4.1_p20150629.tar.xz 166912 SHA256 b9927b15bfc6be7b72206529402b33ceb32b72fd36c84e28f34fb73218575cd0 SHA512 6514479c83e04fe22c7d753bc351e77e9d84cc012eb590e0e463f639bd1ac4dd5cecc0f5b6046d7f721a4a90b6f492e015faadc392af2664f4bcfa9a860bec56 WHIRLPOOL e68b9da85b2abc7b6b42777e23d49c93e550e2cdd330a140f4471888e0bab5dafb5cddf2b1263b12a74098ef3d817f3270b92898137948ae76152104db5d8621 -DIST aufs-sources-4.1_p20150928.tar.xz 166712 SHA256 56b6b9c40a32eab3402444ca136d01e5ee8d00438d8679b730ce97912749bcae SHA512 c88ec4cb67293f392fbfd496e3bfed0836cc2bfbc53ab4f3af0e6929181e9f60d9dca30bfa10d3e7806edacdcb0a819ba2f83d48f9f08bedc06f27146a9e4a15 WHIRLPOOL 96cdbf312cbce9d484b59ec852d31726c7c79dec68c90137f0459b5f481f56c488d63a6756538c494df065e21e70c5c87650108f7213374bba066e16972796fc DIST aufs-sources-4.1_p20151012.tar.xz 166736 SHA256 05c5f7e565d58b98db443752c1f7b085be2ea6b3328a7ad43ad764c72c58c9be SHA512 95f43145dea8b2068319453450de434b44b1d07b947b1ca795e7ca44e8d2c5bfb619aeb1fc8eb2085351a4a078c30b5641716def5703c9e651613f4761404d78 WHIRLPOOL 05ea5374ff905113ffbda7b17964f82ea7f2a5df0126af887cb7524d68661c8e381d094c02e2592ae4ab7c97f553d866be988adf1c938fe1acf1eca253e03db4 -DIST aufs-sources-4.2_p20150928.tar.xz 166932 SHA256 fc04eaf2973ae8ba3e7bf9d68ee58a24c30a6c97e50c6666ec335b39a14438cc SHA512 2c539d77d2af8541991f19f52b8186a68484453874c864bb67163680409bd22a98e902f3a719cf0f0b583978f2bda3d4b97fe78bdcc3ebbdb7f152c13a3b8d14 WHIRLPOOL e65cbf9d55909d0e5dc28c96fb96bc51d20a210579fdebb7387d5ebf3bf66274872717a3e17b80033a799e01d5892228b41728a5cf49914f15d2cb8a8fc2715c DIST aufs-sources-4.2_p20151012.tar.xz 166928 SHA256 2f3b5c79bc28a9b609cd7def95420af033ea016eb8f11c0675c40a4b7dd03055 SHA512 cd17fd9baee5cb1186df59131c861f96901fef6d87696c61743d454b15a33d9383dbe69de8d6f520072063891cc6813e4489e6a177079c6f6ad903a6f6d856e5 WHIRLPOOL 6a9814d33a80576bd6f302384ed6f37eed74d64be30389e61f2b060c1e3b0784c4116b1318a60d116c961bf2782fadefbb784a965c4e5e1c440c7e2b66af779c DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831 DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8 -DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebebf424f778eb08fa359bc SHA512 a27e3530cd3028041445cf8c5f49ad7827a7cf2b511de28851d2b09c28347cf2be667a7494bd698939c007fb77595699c1f61fb76249ae87658e1d12e855d2a1 WHIRLPOOL 953d8e6eed10971ed67a4573449b9a536ad693a2130153a6fc7cc9ea3e2daea21ca002c8df80126f7e318f75bec82c3f6e99fe43155817e2e2a52b5949dc5d2d -DIST deblob-check-4.1 674781 SHA256 54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33 WHIRLPOOL d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0 -DIST genpatches-3.18-17.base.tar.xz 489076 SHA256 46ec429229380585e73dfde06e11868d5f3b2212720c0ab57f6023eff0a2e4ba SHA512 af269677d88a2e3a1feb66c26c5a12d967f41606e486903858f982d1cbfbb57a54c26585b6765592337fdb424aa13b714b1bbeec1520e263d64518be3d766476 WHIRLPOOL 74ed70843cb81b493fa86fe334430a7d43d88df3c5c58075a33cea762f8126dece50338ceca9114843c6703836cfd85a7ff2e000e75d2e4fe227010041563bfd -DIST genpatches-3.18-17.experimental.tar.xz 61604 SHA256 efd6d02daf759fb77ebd7f6654ba933bce007abc414ed67f3667115dd6c15bd9 SHA512 95abf4e05ec31944a2ff520cfce68753656c966e575b5e23823753bb25da5f1c7f169d908f58df81db7dd75f9dbf1b1060dfb9c6349eabb2d1273086fbb09912 WHIRLPOOL b89d32886fccd7c5be7f65df647f75918e8f0aa3eddd4baccb6b06da5fedb00c04516a600bf48530ee4821dee416580b695bea677607b7ce905156ac0300134f -DIST genpatches-3.18-17.extras.tar.xz 16184 SHA256 cadde114f6229bbb92092ae76a0dbba11b4c4841bd0daa8f8520e6e64308254f SHA512 8637aaad4c901937cea64317a85416e328fae1802ddb51b638d68f9a1746b5ad136d6b398105056c047c5d9d5437f5f3ab763a8be3581625e5bc4be16a84a0b5 WHIRLPOOL 2b340ace5325ddbf4149337c8cb1d387c846de061c18269fc1ed207c138e2c4ceaf6cac85a4d969ac0f5433993f7617386494ae4a7bd2281d92ec5852a91f04d -DIST genpatches-3.18-20.base.tar.xz 604232 SHA256 94272b175e3d21f31c2b54cd425461f94e3a51f106e2cfb1c9cbbd80f2ad6b95 SHA512 3148d43f393833016489cfb2c1e2e65a559251eea083a1ac7d0b4ce0c422a102c433fd7d9d14a58aee968874df95f8170c0941e9d6469033f760737e3f2ec545 WHIRLPOOL 88a3020a65c60beedc73e4524a585f282b997f7a945497ffa7668b13db6b5f6a989d60d77855af56e5ce21d659f7d615976610b6688080e169c3726521ebf8bc -DIST genpatches-3.18-20.experimental.tar.xz 61632 SHA256 32daadb53fb41765769d4434b576a840e534ce8f27cbee9243a5e192d729d9e0 SHA512 d312040611fdd6d1c7cba3b05d2935bca20c7bb3b8ef7ef99778e3425b22e511bb559627546bea50dae7dd68ef1fab645140dec5372db5b89355454acd3718ae WHIRLPOOL 89aca68b23cf3fee89db746e9c8ec52a6221d08ac8d30a4803712625268ca4c587d252b3830140efc49ceb7d57dd0b78114710e9a5fe7934ac49cc3944087da2 -DIST genpatches-3.18-20.extras.tar.xz 16176 SHA256 9bf1da691b63936b577a8e80d0faa531cf11192bcb466672fd9810bd27d6225d SHA512 39f484c780edd8e6b52c3b431bf24976cde78b9a188836c5df436c752b25cc23ae17796892162da2577ad301a9495843302bcae1ebb8e3f301ff3ec3a0d8e112 WHIRLPOOL 44124899803ab18031f5ac7f70ea3dc297980d1d31f9329f8813c94becc104f90e0678b9cda077cabc797fbb6980448391b0ac32e1740ec75dacf1623f44181f +DIST genpatches-3.18-22.base.tar.xz 651380 SHA256 9c866ac44e0c716a5292c3ec907fc52edfce1a32d75cbc63e51f2adbd10067d0 SHA512 d1183150a2ee641714dc85c873713936d862688d4314a6906a25943bbfb34566fe5d0e838d61eba2fc369a657aa762f6276a2a31a5c4e2e9429db4330a0fa03a WHIRLPOOL 22d358be0bfd836ded82b5fc347f5bc266186ee0374120f2def7e6d8c4e87c43ab364eb64c6b141ee8d0705912ebc12f5525694c7d6fcbc9da38c0012ed09da2 +DIST genpatches-3.18-22.experimental.tar.xz 61604 SHA256 a216f6a678d83ca91283adddaef52face5980718cc7eae9d8764f782422771c8 SHA512 aa2819419490a7ea0ac06179c07a2139e671877b4a5109c019c8931f21069e4d313c75279b679a76ead8381bc1f709a77b8eb19da27f3d5e8d4d4fb97a0ae5c3 WHIRLPOOL fb4364fc476edac40019c1215c5ba94e29ffd003aae37cb8bb642008e2f0a853ec174c4495699a2c7984dd190d895aeab17cae3ab6c6045ff497c07716a46939 +DIST genpatches-3.18-22.extras.tar.xz 16196 SHA256 deeab880c0705b9a02492e2e73152614b7c7dd9f213303fd5284ee07debf0416 SHA512 5ba6d42c5973daa52a54bc77f3f13312d9c6f496e002ab2ad613a08f18ee64dad39472ec0cdb0e545b2c95aee0d69fd30c38877d15f266768a22fabb8a06e2a3 WHIRLPOOL 84092c11122198958498e26d3c4fccbf06451ff9c880510f763968644d03c30160f01090c2bc5b411cb813715083682b90b750401ffd7c8f011ae24f203e90c0 DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee DIST genpatches-4.0-11.experimental.tar.xz 61632 SHA256 cedb08c7d68cf62038aa6f8db3999a7d6daf434a08d0c811308affd5d18667d4 SHA512 cfe5281678acc938ba0c906ef58a654889a71da5238fbff13e5e78f328dc07485345deea6080abf1380a8a3ec5314691b8f5a35ae0cf627e6ebb38ba66860e38 WHIRLPOOL 5bfd4de5098fe5cd05bc7184a5797f9b310a848b2d96e04b83986f45d3961abaf6cfb76b801b9031c0b46c2c072578b59b98781c8c432b7ec0989449f8098a04 DIST genpatches-4.0-11.extras.tar.xz 16288 SHA256 84b7509ecc82f7ff1b90959b88e9e0ad77544610d5a95aacfb88b7200b9aced1 SHA512 95354b1a2dce8d93a50cc1e1e79ea807134eb050c7a76921ada26f5bfa210963a16c9af7bda0b75894201a1e82929859f6dfa5c23cf63fe4586e4264eef85c7f WHIRLPOOL 4ebc929d8e39c0967b99d558f68e5454e6ffc771273b7e9637d8d0ba477c67ee490e0a443a8aa4fdcc74f3aab59cf8e9c159f2a3b152b33fb9a8f395a67b0085 DIST genpatches-4.0-6.base.tar.xz 118672 SHA256 228c38e1e691fc3b3862a5de627c71ba9bcf1aafd10317a9ece83a13e041ed24 SHA512 02c3cbe7982173121f03ca9424e5fa04b27f985c2f81b7469559eda4d8824e4bb348a0b9b341a9e34c7803ea341161ff306aee5d6cb73617e01fe7aad327e05f WHIRLPOOL 685c62001c6e29efbf800471ed95f8413368c6dc194689c04dea44c5b9148e09d3d79e026f91a2054a84a991bd741dc8de08838c3cd9b9c94fb8dc981db9e953 DIST genpatches-4.0-6.experimental.tar.xz 61620 SHA256 ea7359c8a3e4e8c53ccfa0573158f080e4ed2a458f6de654097cf21134c0910d SHA512 69b0f51e43c2a5712fd8eff3f8292fe31109e33a24b51bb0e637d15bbf2329767896d6c56f3f178ad6e9d1f69ebe6875108941f18a4a10747405be385e47ce86 WHIRLPOOL 657758e5a8b7a9c764f1d8a875be71ee079907aa6ab79c90ae2632c4ab8445a86ad97cb3ef70e424a6bd62d4c937de577cf44a10aeea4a41d8dd6d1bcf803952 DIST genpatches-4.0-6.extras.tar.xz 16280 SHA256 205c87c3d133a57d6ca42e2ce107cf64cbedd64fd356c601ca0af29248af5c1e SHA512 61cea7f5a8919418bbea96599f7decf804d97d9e6b8729e7e5dc4f077d54c86db7b0087f70b87183420798f16c1036242f1b857ff2598edf0902ff4fa6bd2890 WHIRLPOOL fde8c4c909a26d7bf2d00e35d1ee45e03c4710871f0a2cffdfbcd1109aac0b4f3215bf0ef5dc6562e9fb9d7447c1330f91a08ffa78912b3857cd3ddab5d10a3b -DIST genpatches-4.0-7.base.tar.xz 159536 SHA256 9d1e84cb5133489f76aa3ee4ffdc6a28331bed0c6557e383bdf288ec9461ff3c SHA512 49f29bc5b8d0953431dbd1c2c0b5fa0ae0eaad6ed744cddc5e8eeb3a6dc7aeb2231d9f491149fd0e9a4a9c10bfd336746a0b544b96d9212bc401091ee586eb46 WHIRLPOOL 355dfcdf5eb508cd840e506b32f3a9a39ef885bfc605b271574cc906492ad7a82c3f3511bbc519a912c56ad2cd0ab11d51a45602f20b03bc6441a11adc53d9d1 -DIST genpatches-4.0-7.experimental.tar.xz 61636 SHA256 419952353e98ed36dcdb9a45fe73b52449ec6b6d969dbf228f4dfc2da880f261 SHA512 1dcb8ede976b65304f3550aa55fb5cd0881861bc3507658f3e1927754ec37956e656ff053d546e5edd4f4ba63fbeca50f4a5c766229d5d05e5a69a4f2002f8b4 WHIRLPOOL 881f738f577ac15b977e3d3fa7e2abae427df196a0b33e96bb457ba36118e912e84bb8e36ee0baa67ab92ccfbffdcc2265cbae3034d618e25ab9b25db0791388 -DIST genpatches-4.0-7.extras.tar.xz 16276 SHA256 911ccb197f2c9514d8b4eacbdb7c059d709f64cb97632eae85cda99d61596ba4 SHA512 ce94b88735fde37b1337f111c91da0610b14b22ce5ac68bb082170acf23b8875cc1d2e7bc8354959a91bcbf10dee9fdd81d0cd173e21e8bd8d6f2ba157a737d9 WHIRLPOOL b8d32b09e5b9ec7af8307398fef31f5569c738dfdfc1832060e998f9fb5baa31cbb84eadab28b82d50fb7e6acbb381c55271128de4c5bc14febbb7dc4b1d1534 -DIST genpatches-4.1-10.base.tar.xz 210140 SHA256 d0ac2a9175fe72d0ddf23307a9c8d06102f48220886468e4c19c92855024d829 SHA512 fadf51efbda55e959cd4636e88c2a159ed967156acbe719b15056e9e56cf01652b0ac6b515203d4821853939fe8dc4dfb6e075e55530489d5a96e44e6dfe1be7 WHIRLPOOL e384c68de2b4a4e23934cdaba6f8d02942931ea721b1730bd6e99e02547c28f6219bb6a38425c5c04bd1ee13afbf091dcb9eedadc2aca2246e05e465c07cb974 -DIST genpatches-4.1-10.experimental.tar.xz 215988 SHA256 b4ab62875339a60623db576533638e12342815ba93091d16dca7a975c10ebf4c SHA512 e51eadd26e1db63ec558fa0f4a83b8e5fb40902c9e7c96e269b4102d048b9f90defc071f42faa058605af047790bc410b2186d6c06a5fd2b8f6fe957da8cfc96 WHIRLPOOL 3061975198673a38775b78004dcdf088fd01fdc2ce784aead81425d25f6b831267e9840fee56db96253a09290ab09d01bd4fcb916b8fbe654ac32027c702d4bc -DIST genpatches-4.1-10.extras.tar.xz 16184 SHA256 5d4492d3d535b3904fe917532b52d314bd52566832acdb1d01362e03472945da SHA512 da4163afcc52c5385ff3869105afdc0bdd021e1967b6461d3ced62bfb22ae5e9f31a4493d93ce6ab33fdb23b92df6eaef14007bc53d77de63e76802e9d65c77a WHIRLPOOL 24318d0cd07b3c3cd7d752e3619883ffcf63cec3ec7b90ba5f327bbd204e1cb2e3a7cd91c8607a988e13a23ccff25cfe8b484b8596bfe6cbf365f18e7de180e8 -DIST genpatches-4.1-12.base.tar.xz 266104 SHA256 d99620d6fa052732357a9b050a878d6ed7f1f3b03c1ae59d99132db8244829cc SHA512 4128fd323a7451692b512b249226f25ed5a0d5aebdf48832495d3d72351ccf61b7d7ecbccdd85915eff023fcb9fcbb408a1c01f2bb58535434153ca00d5ef0a3 WHIRLPOOL 2c9d9f8c989a319fb1b06ff8f2e29feeabed05c41546eb91a0bfa5bf2d586a7ef39c01d1e100519c844e419c92ece745b7192f3e3839c2fcf9dd08d971143c35 -DIST genpatches-4.1-12.experimental.tar.xz 215960 SHA256 8d0659bda61873ce16612e919b7ba6ccb8b5b9b5362ab218a886bf2ccb2684c8 SHA512 b1392299fed208e973eed70174f55ab6e70c0f5c7cbe5e29a12dc27ca9fdb09448314fd3a32b1d4abfa529065d76e7ddbc66cc60019b1d9c66d1b96d0d146dd9 WHIRLPOOL 4e7189dae91ffcf37d70dd9d2547a8e2092cece356e004e9282d5c0aa3d5d992cb7423496ef9f28503e687052b21468e456f83772989a023fe0f8d33a2bdf00a -DIST genpatches-4.1-12.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3 -DIST genpatches-4.1-14.base.tar.xz 311648 SHA256 e3a959d79834266bd4760d806598b7e9b982823e9b177219f0e385482380aa25 SHA512 b2626d0b45da547a293ba233a4c33c30aa4f7b9ff1d2c3a3aea664f9d99e272b5c9aeba6abc63f27930771b9c282184501c62a987985e23c53471ca5feb260d2 WHIRLPOOL 5db2f30fe0f30cd1161cfbd7d7a8a7cb6815ece833874e303782bf28afc25d11568d48372816e9736d39c781635d5ba91b3f80817552485ddf1c945c40aec01a -DIST genpatches-4.1-14.experimental.tar.xz 215988 SHA256 3b58f4e8e4867bb7eac7acc78954824f79d0e4260ab5b21d73d30ee617287708 SHA512 bed868ee20616194dfd314705234348f1a860a2163c886470a16e387940a48dfa78e1cd0e2a6b4a827b9c664fa37586d0a52925ad7502e2ca4e15e94fd33c2b3 WHIRLPOOL 2ff84c87619e2dea27886d1bf7e94753187e2f1b07c71b4b5ebbbaa3ead391c0d3a14431a67b3707ceda05d26b86598f1bfbe1beadb63285614e77b3e76102af -DIST genpatches-4.1-14.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd -DIST genpatches-4.2-3.base.tar.xz 44600 SHA256 ba1a0d8d9e1a139da388d44085a1011d760231467cef4ea9a87633673560e3dc SHA512 60367b50a40c60e6659cf11db99d4124b86fd7afa1bb8e5c3aac38b3025015f56f880e34250d1267ec4f295da38f656708ed2c6b46aa5b56f72503ed34b0e8c3 WHIRLPOOL 6dc72908e0ea0b4084d919f1049169fbe98153f85ae1bc87f3c3eef061b3cbefd427d87fef541299cf0bc48faea79b4a39e5dfb94dfdeedb4be7f53248ff3f9f -DIST genpatches-4.2-3.experimental.tar.xz 216620 SHA256 b038447b1d8129229469dfa3898b42374233ee00c65ea4728abaf632657f431d SHA512 17c13d9669596a34a85a844e38886099ff717248183104e3b02c438de4f1916886afea9db985b5c56170917901611331ef5038777eed2a4019811f98a75d399c WHIRLPOOL 9547278a329049d20a73e31e6bd5d6bf0270a2b3c7c02ce51163f4f91da18d74820f782e2c7ff66cd1e7f4075e088013def679568043d800c89c601a1cc4cce2 -DIST genpatches-4.2-3.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3 -DIST genpatches-4.2-4.base.tar.xz 44440 SHA256 439b89a4722bbc9c1ae72a17917d8923aa3447a16420674f12d22d6579571057 SHA512 526655ca30663fa2937ed784bcba1f89d3ffe8b5e9fe6e6134c40d42d698465bc6e266d73f1f35836b9ad94030aa4bbcef35aacd7145026bb158fe78f117a1b7 WHIRLPOOL 84bc29d2fcb171645f442eb13827764e1532451be808d9eba5393d81fe21ddfccc3167a027a31a334b9185f96b4b07507ee01643adcff60a7dac21bfe4f1e371 -DIST genpatches-4.2-4.experimental.tar.xz 161676 SHA256 55687ed45c227be95df64f8bdeee322a3262424af4c72307c80aa0213971ac0a SHA512 722caebf457c370e0d75ea2c8f3861500f1f910a09c1e10b5c34847b94313e698f8abe4d2b5a604d35b5b8f324bd87b20b078904b80a16dd704e4d113a977a49 WHIRLPOOL d5c9d808d9aa340e912272f0d0b0e58b8f39c8a6c75b2b7294609dde43140397e0325d178815bd19425a2e885cf23e9c8b5cb889bcb84b6c4b6a1625f669daf5 -DIST genpatches-4.2-4.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3 -DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f -DIST genpatches-4.2-6.experimental.tar.xz 216008 SHA256 ce3ab8bec66d7e9bcf1ecd6f6e9925f8863869e09073cb76e6f4e1d9b6b65eb5 SHA512 1dec060dab9c942b154ea468e0cebae16a5a63844be3576a1300a1263e1b38e45b230faa2dabe020c0c32431b4c2025b38dd8fe866eef102359d81a3fd23f66f WHIRLPOOL 53396343aad281e3cdf36dbe4c0714723688b7e6a9938b8a8efdb1d6cf447e075f7d6cf503b5cef922f2a03ee2d85661011d0fba68c5a4a66853862bc5e1f378 -DIST genpatches-4.2-6.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd +DIST genpatches-4.1-16.base.tar.xz 390916 SHA256 c36edc8f56a26e0ae74fa28e9a50d02d8196f5d29447d6d2cdbf17ad71f70902 SHA512 981c4589a2f448a8c58276590eae9db25e716e0df584f4e431e7d29e69714695078112e30b84179038879071dcb94adb0753a94bcc3cf3e4c3a676244543f0aa WHIRLPOOL 6f3bf0ec325a1d7363315fd7828da31901916c497cbb8adb212e515ee7fae1179f276116f9e484fb23f2200e2fa61ad315baa8de1c073c5412dd1ff3ce624cf9 +DIST genpatches-4.1-16.experimental.tar.xz 215996 SHA256 0840ccdcad7c4b03cd4fd54940e3ca31d0d738184abe1c9340d5d0f9c3943009 SHA512 95b8bc22413b24627ac1906830a345689c7e98a77beb1405e9a6c5b97f48c4fa7dbd15a2ffe66f24ef9dd8617a83a4913a26acbcb387f4a0add6d5f37c3343a9 WHIRLPOOL b19fbda05c354c17df10a8fe3e482798926e6631c5b5f96685e2d99cc016f10c37fbe5aef633c8a77bc427d045b02390815469f5aa2850dd76d5cb374a916cc0 +DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6 +DIST genpatches-4.2-7.base.tar.xz 177852 SHA256 7f7528ef582219a6d5aee348b09c8523f7b6d5b80eed2d7c6d0a804dffb11440 SHA512 657a7316aaf139820898f0136f5eb0011d38a439f55257567c70074f65f78ab67b316132fa0cf3a19990c8decc49ebf13ed8b4be4788df66e51dd45ac307da31 WHIRLPOOL a6cb9ab193d124f524e84ec427bcd397cc8ac0327743f8ad69d5b61b2d91c4187eefdcc3c48aacae28f10553fb19eec82a48f988eba22845c658159d9f529d0a +DIST genpatches-4.2-7.experimental.tar.xz 215956 SHA256 be585b9619c5828dca83243f5a3f74c7b5cd7bf775164c89a3eed808665795b5 SHA512 f555c5f870683de39c268ec7b5444340e1eeaadd2b48dc727c4bcc1a06a77643c9d058feb4d41276e0119132ea3c4fd09bb8b3171508fa48cd1a64643cfc6d5d WHIRLPOOL 02860073cf626b8c98e3aaa7df9c7138c8fec8387d58f6781d450c6f671dadf1ca8b329ca8768f9187a155b1fd7dd6a570de75d96973ee42e13e9a6fc0f2762b +DIST genpatches-4.2-7.extras.tar.xz 16180 SHA256 2a280c94254b721cacb423e683593fc800fd645fe54dc568b845cf02887932b9 SHA512 9af37fd4762c658001b2726534c0bbedf033d29a76017ee53d2ded37282bcb709bb4b33864fd0fb69e107955c98cc37cd82cfe0dab1cdff1ea88f68f87aa2ed9 WHIRLPOOL 2c516cdf55f6dcb613e873a69c968c0b2e18f779baf7f12d0bdc77de09c17205819b014772d10dd25bd1cf1feb1fb3397561b520c6b8261649407663095f2e42 +DIST genpatches-4.2-8.base.tar.xz 191276 SHA256 395dc09c285606e830be9b002eec8968394ec2ac67eaec6673c0703196e708d8 SHA512 216d8c9be1c3ed1fcc612e3739bf7186e996b6fca8ce3d08be4ea9da16f7d4f63a01d6e8606a83d2743f94ffe1640da9f2c1d588fddab51e0f25b090141a353d WHIRLPOOL fdb58098517642e5ec075218b612f765b559b6c850bfd678d3eb7fb0479bd175c6eb01896e552525eb6025a93e72ce204fa57c77f96a028ac0f93bc0c59d13c0 +DIST genpatches-4.2-8.experimental.tar.xz 216032 SHA256 53f431427f4deb72e5495159f8f56902a5470b0f230ab549cd6a21380d757ffd SHA512 3c8233427efa0c181ddc8044d7d5ce3ad914b7df84381af8816b75545d8512777c786710422dfb1006277dd0e5fd69a18404e2d83cd361431853e3f900906db1 WHIRLPOOL eaa9d7697a391f90bcd04293545adbc21cff4c5ae82ee96e00c2cae12720ea9d9679c75988bf24f2eb9ca4f7e9aaa2bee36d3f7208edaa84fc1236a55b418bc9 +DIST genpatches-4.2-8.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6 DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8 diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.20.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.20.ebuild deleted file mode 100644 index 6e81c675b93c..000000000000 --- a/sys-kernel/aufs-sources/aufs-sources-3.18.20.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="20" -K_DEBLOB_AVAILABLE="1" -UNIPATCH_STRICTORDER=1 -inherit kernel-2 eutils readme.gentoo -detect_version -detect_arch - -AUFS_VERSION=3.18.1+_p20150629 -AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" -# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar -AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" - -KEYWORDS="~amd64 ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" -IUSE="deblob experimental module vanilla" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support" -SRC_URI=" - ${KERNEL_URI} - ${ARCH_URI} - ${AUFS_URI} - !vanilla? ( ${GENPATCHES_URI} ) - " - -PDEPEND="=sys-fs/aufs-util-3*" - -README_GENTOO_SUFFIX="-r1" - -src_unpack() { - if use vanilla; then - unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT - ewarn "You are using USE=vanilla" - ewarn "This will drop all support from the gentoo kernel security team" - fi - - UNIPATCH_LIST=" - "${WORKDIR}"/aufs3-kbuild.patch - "${WORKDIR}"/aufs3-base.patch - "${WORKDIR}"/aufs3-mmap.patch" - - use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch" - - unpack ${AUFS_TARBALL} - - einfo "Using aufs3 version: ${AUFS_VERSION}" - - kernel-2_src_unpack -} - -src_prepare() { - if ! use module; then - sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die - cp -rf "${WORKDIR}"/{Documentation,fs} . || die -} - -src_install() { - kernel-2_src_install - dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch - docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch - readme.gentoo_create_doc -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - has_version sys-fs/aufs-util || \ - elog "In order to use aufs FS you need to install sys-fs/aufs-util" - - readme.gentoo_pkg_postinst -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.16.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.22.ebuild index bdbf5cc98ff2..fc2d3b3970ee 100644 --- a/sys-kernel/aufs-sources/aufs-sources-3.18.16.ebuild +++ b/sys-kernel/aufs-sources/aufs-sources-3.18.22.ebuild @@ -6,14 +6,14 @@ EAPI=5 ETYPE="sources" K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="17" +K_GENPATCHES_VER="22" K_DEBLOB_AVAILABLE="1" UNIPATCH_STRICTORDER=1 inherit kernel-2 eutils readme.gentoo detect_version detect_arch -AUFS_VERSION=3.18.1+_p20150622 +AUFS_VERSION=3.18.1+_p20151012 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" diff --git a/sys-kernel/aufs-sources/aufs-sources-4.0.5.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.0.5.ebuild deleted file mode 100644 index 9d083b9483d2..000000000000 --- a/sys-kernel/aufs-sources/aufs-sources-4.0.5.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="7" -K_DEBLOB_AVAILABLE="1" -UNIPATCH_STRICTORDER=1 -inherit kernel-2 eutils readme.gentoo -detect_version -detect_arch - -AUFS_VERSION=4.0_p20150518 -AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" -# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar -AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" - -KEYWORDS="~amd64 ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" -IUSE="deblob experimental module vanilla" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support" -SRC_URI=" - ${KERNEL_URI} - ${ARCH_URI} - ${AUFS_URI} - !vanilla? ( ${GENPATCHES_URI} ) - " - -PDEPEND="=sys-fs/aufs-util-4*" - -README_GENTOO_SUFFIX="-r1" - -src_unpack() { - if use vanilla; then - unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT - ewarn "You are using USE=vanilla" - ewarn "This will drop all support from the gentoo kernel security team" - fi - - UNIPATCH_LIST=" - "${WORKDIR}"/aufs4-kbuild.patch - "${WORKDIR}"/aufs4-base.patch - "${WORKDIR}"/aufs4-mmap.patch" - - use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch" - - unpack ${AUFS_TARBALL} - - einfo "Using aufs4 version: ${AUFS_VERSION}" - - kernel-2_src_unpack -} - -src_prepare() { - if ! use module; then - sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die - cp -rf "${WORKDIR}"/{Documentation,fs} . || die -} - -src_install() { - kernel-2_src_install - dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch - docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch - readme.gentoo_create_doc -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - has_version sys-fs/aufs-util || \ - elog "In order to use aufs FS you need to install sys-fs/aufs-util" - - readme.gentoo_pkg_postinst -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.9-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.12.ebuild index 389ea8b4d417..0e6da31766e3 100644 --- a/sys-kernel/aufs-sources/aufs-sources-4.1.9-r1.ebuild +++ b/sys-kernel/aufs-sources/aufs-sources-4.1.12.ebuild @@ -6,7 +6,7 @@ EAPI=5 ETYPE="sources" K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="14" +K_GENPATCHES_VER="16" K_DEBLOB_AVAILABLE="0" UNIPATCH_STRICTORDER=1 inherit kernel-2 eutils readme.gentoo diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.6.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.6.ebuild deleted file mode 100644 index 4b2684610212..000000000000 --- a/sys-kernel/aufs-sources/aufs-sources-4.1.6.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="10" -K_DEBLOB_AVAILABLE="1" -UNIPATCH_STRICTORDER=1 -inherit kernel-2 eutils readme.gentoo -detect_version -detect_arch - -AUFS_VERSION=4.1_p20150629 -AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" -# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar -AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" - -KEYWORDS="~amd64 ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" -IUSE="deblob experimental module vanilla" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support" -SRC_URI=" - ${KERNEL_URI} - ${ARCH_URI} - ${AUFS_URI} - !vanilla? ( ${GENPATCHES_URI} ) - " - -PDEPEND="=sys-fs/aufs-util-4*" - -README_GENTOO_SUFFIX="-r1" - -src_unpack() { - if use vanilla; then - unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT - ewarn "You are using USE=vanilla" - ewarn "This will drop all support from the gentoo kernel security team" - fi - - UNIPATCH_LIST=" - "${WORKDIR}"/aufs4-kbuild.patch - "${WORKDIR}"/aufs4-base.patch - "${WORKDIR}"/aufs4-mmap.patch" - - use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch" - - unpack ${AUFS_TARBALL} - - einfo "Using aufs4 version: ${AUFS_VERSION}" - - kernel-2_src_unpack -} - -src_prepare() { - if ! use module; then - sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die - cp -rf "${WORKDIR}"/{Documentation,fs} . || die -} - -src_install() { - kernel-2_src_install - dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch - docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch - readme.gentoo_create_doc -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - has_version sys-fs/aufs-util || \ - elog "In order to use aufs FS you need to install sys-fs/aufs-util" - - readme.gentoo_pkg_postinst -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.8.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.8.ebuild deleted file mode 100644 index 6002d857768e..000000000000 --- a/sys-kernel/aufs-sources/aufs-sources-4.1.8.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="12" -K_DEBLOB_AVAILABLE="0" -UNIPATCH_STRICTORDER=1 -inherit kernel-2 eutils readme.gentoo -detect_version -detect_arch - -AUFS_VERSION=4.1_p20150928 -AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" -# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar -AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" - -KEYWORDS="~amd64 ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" -IUSE="deblob experimental module vanilla" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support" -SRC_URI=" - ${KERNEL_URI} - ${ARCH_URI} - ${AUFS_URI} - !vanilla? ( ${GENPATCHES_URI} ) - " - -PDEPEND="=sys-fs/aufs-util-4*" - -README_GENTOO_SUFFIX="-r1" - -src_unpack() { - if use vanilla; then - unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT - ewarn "You are using USE=vanilla" - ewarn "This will drop all support from the gentoo kernel security team" - fi - - UNIPATCH_LIST=" - "${WORKDIR}"/aufs4-kbuild.patch - "${WORKDIR}"/aufs4-base.patch - "${WORKDIR}"/aufs4-mmap.patch" - - use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch" - - unpack ${AUFS_TARBALL} - - einfo "Using aufs4 version: ${AUFS_VERSION}" - - kernel-2_src_unpack -} - -src_prepare() { - if ! use module; then - sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die - cp -rf "${WORKDIR}"/{Documentation,fs} . || die -} - -src_install() { - kernel-2_src_install - dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch - docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch - readme.gentoo_create_doc -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - has_version sys-fs/aufs-util || \ - elog "In order to use aufs FS you need to install sys-fs/aufs-util" - - readme.gentoo_pkg_postinst -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/aufs-sources/aufs-sources-4.2.2.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.2.2.ebuild deleted file mode 100644 index d092675a2f89..000000000000 --- a/sys-kernel/aufs-sources/aufs-sources-4.2.2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="4" -K_DEBLOB_AVAILABLE="0" -UNIPATCH_STRICTORDER=1 -inherit kernel-2 eutils readme.gentoo -detect_version -detect_arch - -AUFS_VERSION=4.2_p20150928 -AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" -# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar -AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" - -KEYWORDS="~amd64 ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" -IUSE="deblob experimental module vanilla" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support" -SRC_URI=" - ${KERNEL_URI} - ${ARCH_URI} - ${AUFS_URI} - !vanilla? ( ${GENPATCHES_URI} ) - " - -PDEPEND="=sys-fs/aufs-util-4*" - -README_GENTOO_SUFFIX="-r1" - -src_unpack() { - if use vanilla; then - unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT - ewarn "You are using USE=vanilla" - ewarn "This will drop all support from the gentoo kernel security team" - fi - - UNIPATCH_LIST=" - "${WORKDIR}"/aufs4-kbuild.patch - "${WORKDIR}"/aufs4-base.patch - "${WORKDIR}"/aufs4-mmap.patch" - - use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch" - - unpack ${AUFS_TARBALL} - - einfo "Using aufs4 version: ${AUFS_VERSION}" - - kernel-2_src_unpack -} - -src_prepare() { - if ! use module; then - sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die - cp -rf "${WORKDIR}"/{Documentation,fs} . || die -} - -src_install() { - kernel-2_src_install - dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch - docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch - readme.gentoo_create_doc -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - has_version sys-fs/aufs-util || \ - elog "In order to use aufs FS you need to install sys-fs/aufs-util" - - readme.gentoo_pkg_postinst -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/aufs-sources/aufs-sources-4.2.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.2.4.ebuild index bff0187fd00a..80259813e572 100644 --- a/sys-kernel/aufs-sources/aufs-sources-4.2.3.ebuild +++ b/sys-kernel/aufs-sources/aufs-sources-4.2.4.ebuild @@ -6,7 +6,7 @@ EAPI=5 ETYPE="sources" K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="6" +K_GENPATCHES_VER="7" K_DEBLOB_AVAILABLE="0" UNIPATCH_STRICTORDER=1 inherit kernel-2 eutils readme.gentoo diff --git a/sys-kernel/aufs-sources/aufs-sources-4.2.1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.2.5.ebuild index 2848dd670b4d..e3b514f56f64 100644 --- a/sys-kernel/aufs-sources/aufs-sources-4.2.1.ebuild +++ b/sys-kernel/aufs-sources/aufs-sources-4.2.5.ebuild @@ -6,14 +6,14 @@ EAPI=5 ETYPE="sources" K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="3" +K_GENPATCHES_VER="8" K_DEBLOB_AVAILABLE="0" UNIPATCH_STRICTORDER=1 inherit kernel-2 eutils readme.gentoo detect_version detect_arch -AUFS_VERSION=4.2_p20150928 +AUFS_VERSION=4.2_p20151012 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index b465edf67261..c5c5a961dcff 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -1,73 +1,25 @@ -DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9 -DIST deblob-3.12 120320 SHA256 1d767acd3f461bcaa7ebef744dce1ca3eefde1cd41fde4c69a449e2470ab8c0e SHA512 61073cb763e3e0c21a84c0ee888087fbbf37b667ce0efbbc6c2ebc46ccae8460553511e347cf23d3c3603eec64df738ad4552a1b527453c7d795b8f90c4cf678 WHIRLPOOL c64cc566944ac241149a2a517da069185830be5b8ee25168b2b6b942bcf24fe3f2c0fe487b51a5b7e73e2910af2cabd7167cd1497ab7272c865d1eb3e68e4efe -DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831 DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8 -DIST deblob-check-3.10 612122 SHA256 5a9552abac85cab9715a958785a3f901937fa135d85452647a16398181909c12 SHA512 c52917e9de8211f66a1e6805282dd727f1ec86701f76cbf16d0909ec212a9429c0994e0993db95b57934b17d9d91b08b4fa29f80c501397a5acce84bf4e1aed9 WHIRLPOOL d1c591fe7e229f9638945dd14f7dd16617ecff224b4cf2a6a3dd58913c23f7eb67496c26235d1d4637607bc9c9d260d990a0935b6b5bf2332f15e8ed58269856 -DIST deblob-check-3.12 612300 SHA256 f29e34b141113ef9f71bf963b0e09bfe64e46db485ae1174bd212fed45a82ed3 SHA512 5835725eecbb9c23740e80bf5a6bb826bf49244e8a90b82ba3e2eaabeb8199aaceb1b63b8615f9e4770d846a5218eddcd091e7ec4568f74f963eb177051e8da5 WHIRLPOOL 615b95b11a9c9514c94a064e6b5019d36faae384c55ba30da1014ce3676731042939331074ccb3e7136458d54f3a5ad1f88aeb8ea45fb6310734c9f455ddb750 -DIST deblob-check-3.14 613905 SHA256 4c69ea1c225b1a84c41e75392dcaa94f77dd8e647aff3afe52f1ab16ac99c5e5 SHA512 4dd7e785727ce29d78f5f68431fcb6ea9dfda5221dc8e699f40d13e3c85411707b13c288d23f8baa6b3c47f5a67ac58da0a7f1a51c4d9fdda82a7428ead88cf4 WHIRLPOOL de1b67955662f072193f58b7e7dbd98c6680958c2d65632bfb831dc0681945a4d1c27abe978e6ee687ae8f48773eb71c2f9026f461377b28235e7f7e39832a67 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebebf424f778eb08fa359bc SHA512 a27e3530cd3028041445cf8c5f49ad7827a7cf2b511de28851d2b09c28347cf2be667a7494bd698939c007fb77595699c1f61fb76249ae87658e1d12e855d2a1 WHIRLPOOL 953d8e6eed10971ed67a4573449b9a536ad693a2130153a6fc7cc9ea3e2daea21ca002c8df80126f7e318f75bec82c3f6e99fe43155817e2e2a52b5949dc5d2d -DIST genpatches-3.10-88.base.tar.xz 1217916 SHA256 b4037ba6e57270215f951e56f8961058a52d421cdd8ac932b95eb0fb7f5447db SHA512 2b01cc729ceedb77b5daeadd34705a5221ac9ad8fd1f920ce10b85739a5b3c67de3b76366982c8eb216932abbcb4040d4909b6f2908a3633997617987cfe2dd1 WHIRLPOOL 515def87c16a3e28dda0816695d6d8d3981232c31bc4f01df9607c9f4aabf950ad675cdc7cea1bb09e3a41101afb2bb9c48b28ae1957e3e8c206c1cb2efab052 -DIST genpatches-3.10-88.experimental.tar.xz 60188 SHA256 d779f799a398f07377f1d7cc140b3f07b43b3afdb13f94c8ef4366ba47c9f78c SHA512 abd1d1d6b4fa175c8a0e70bd57690f674e8b588e22ed18459e5433e9065336b165e404eb320dfd3e62b78978a9961c2f011aa9d758f9bdbe27b87ef008210a11 WHIRLPOOL 1667a6d965a315b7bc2b31f6d6fbad65c8c3bb66ce978c97562ad8255815eaee2b895a5bd5a8a8dbe0505e29763b8553a70ae10c7d75d853bd2af97ea3b957aa -DIST genpatches-3.10-88.extras.tar.xz 17844 SHA256 3caee8fd80d824dbe855f52524a70c8911baf8996626eb48b82391956f39c58b SHA512 7fdd240c093e1837816358f98328cbeffdbafde8f3dedd9f31dee39d4f491cc3764dbdb30549477eb820e16ace063d6958d6fe487f4b184b96f6799ed959b95f WHIRLPOOL 9ab75dde01eb128f586d192d70cc308353f1a2cda67d949af6d955c2bbd34c4b09b0e8e1cc1c1909daca6b0006d706380806d209ba8baa4422b8edb107355778 -DIST genpatches-3.10-92.base.tar.xz 1264772 SHA256 85914172a3d7399f2f055a7f4a5547f97b8fdb215af9783a447511a152a3a9b5 SHA512 8f98ade2bae7b7cb034702d9938f105da801278f9f31dc2d8a23b65428719eb40d368f3e616b57518bcdebed76e5f278043e7401a60d64c02c6ad90fe669c46f WHIRLPOOL 81c1ddcf5f8218929bf67a31be9a141d0d1b4890bc6248704a54fa1c87357fb6e1c1131180ca7f4026d2f464a7fcac84d001ee7242356218c031bd07500f33d6 -DIST genpatches-3.10-92.experimental.tar.xz 60184 SHA256 8028875798adecee5c5419ae58fef9f2c222c42b63b1bbb884a69a38b7e00a59 SHA512 1727952b1c8c9e94bc84c1d4d02f3946a8aa99498016f3258399cb08f22fd0f69245240c2252934377de30c87f755df3af19b46e9500f6b0532bc1f64be44bfa WHIRLPOOL c3e539d142cf6559ffd2aec7b9ad87bf874f5936395d5895293065d0ed63176daeacf592d1e1820e6a2f5a09c8a00d04c88026bbdf11e01c8dce7d2e3455b2d9 -DIST genpatches-3.10-92.extras.tar.xz 17836 SHA256 c0530ffe58e5b4f654224b09cde9af2b8aaa1d1644f18355c3c855b16847f2bd SHA512 709263ecc2be794c7c2e6f314625d9cf4920e6b52348160191f2589bead14a28ac8c1ec812a1fd21d86fa77acde037e9be42b49c4833e04590efa6c634ce404c WHIRLPOOL 0b3a830a1e304c39bafd28c25569051d8c3eaf79c0717aed2c4b824ab8a6a7faa284c464ee7b590ff25fb1df2f7571eea7e858827fc4cf85dda0c2216a345a23 -DIST genpatches-3.10-93.base.tar.xz 1266844 SHA256 93de9b4e9a1856c4157cbcd2aa1ca35495bea6dfa7d0f65a7f4a3d1c29d9692b SHA512 763160e4a27c9988332cb58d5744c58995f12f293b1a54c20901b1cfecbc090074430f3cefceb36231cfbf82ccf0c94ede1069de854ea2be4551dfcb63371957 WHIRLPOOL 2cd25964424d6df195fb797536b33c6a8e893dee7b9a8ac294902dba3bc5375ebf7cdab4f4404eb234793595c46625ddd2b2c35cc8865fa8a01dfe82ae84859e -DIST genpatches-3.10-93.experimental.tar.xz 60176 SHA256 b8e4734cbd4c6d66695ecbcd4a4fde144f3101cb200fd95ff926fc6fc3e470f9 SHA512 9c099063b47726f922726084a60e0ea813f1f0ca3d4abc8ad64062ef2e5e9dd045856b31c110b8524ff44d693bb5e1fe48c87cb550f59933ef96b5042bea845e WHIRLPOOL 3856ab3d1e85e917121e485e690bbcf3457d67f3d37585f510773a081ddb9a730a31a8bb9a1c6a35b0caac3ec2ff080ace78dea69ef9af68987024f4a064436d -DIST genpatches-3.10-93.extras.tar.xz 17836 SHA256 d879d631a860c5d88b8c796ee052036e53b9393f91762279a3e3a34dc86f285b SHA512 bf11729b5af329b8f29834b56a14e582ef6ae270b3704ce3ef5b12c58e678471e3dd5f71205a1f5dcb9b425aef1cf1f63328f1468c3e06dea7b0206c864aa5d1 WHIRLPOOL 3d961cee4a5d2e1e4d51e815d8272afbcf9981bdd74d1806889c5eb4416596c469fd65deab2bedaf8f5c991e44dbc5cc210f44d3bb7995652cd4115dce10cbfa -DIST genpatches-3.10-94.base.tar.xz 1271184 SHA256 406b38143a37d12be8f1165546456f436b9c96ff0cae6b40f4a71ffef5a1d4eb SHA512 cd618401e2cf185827c378e0ac9b37106caa000700119895bd782e517e4d8cd0e6b22d7274200f14717d44e5621051ed4f00c4fe5b0c20c70f990c1418124c1d WHIRLPOOL b63cde9874147c6c530a2e7f4d5a49ab8f411b5dba5a42f23f2f4e4f002548fb96769a6d2446c69bbf0722a037f930d9ac1fe09fbdde373d45cbc741294e8b72 -DIST genpatches-3.10-94.experimental.tar.xz 60168 SHA256 777ffb284913e97046245b26f3fb1ad06fa8c1284c351d72bb0dad1e6e1ee4a0 SHA512 a7f9a6350aff59d35a440a8728fe2f7b4282f4b857cd8628851e83ac877753fc8d2b30a014a40e269cd81ecb5b9b1968a8a70ef07e6b4226cd38dc7800309019 WHIRLPOOL 1a1436fcc5b703a67155401ccb78326cd28d887af73d436c97ec6f08732caea964deebb4b5f13ab69c064f23104ffc7c522d9dde1caf7db3441a24418b120132 -DIST genpatches-3.10-94.extras.tar.xz 17848 SHA256 1bea69dafacbf91f819c753fe7193800422f0e389e8e0792034fbfe8b01713b5 SHA512 6b22676ff4388ee5638c9587ff125c55cc3b4f1f3eb6bf2fc7c50b73428546d770b7223aa11051f879a6fc86fda2b40cc7ce2d77b52ca2d9b0b04124e53e2cdb WHIRLPOOL 66d3cb81ed54e0b35684c539b4b2b31b1dffe18324499a04dd0b84f8763893c3be6b0110c0184643565b470c7843c448ef7c8e6f1ae1e6e6bef9eeca37e26ad0 -DIST genpatches-3.10-95.base.tar.xz 1284756 SHA256 aef21ca9662ab60728b05f028346cdbc7fc9ed0d07ad7e9c8f5d8d341242859a SHA512 308c97eb8f196e136cbdca5ee22fd9538048b0c7b5b3a75ee465be95f77046bac24fadeb78f4181b58f8c441a220a1d77c95ac281ba2dfcce047274475353a1e WHIRLPOOL dcc971cad6eefb922aa2479f9461817ec881666971bfadeec8f61ea724939a89a3a8379ce2b440f7993eeb40ad369d5fe2be9bc7a1d2ee4a5b842458cb65aa82 -DIST genpatches-3.10-95.experimental.tar.xz 60180 SHA256 480f41bd269bfa73cdf1ce325d5723fa1e4c0cdf5fd81f3b39de388d73df4e37 SHA512 3fe8eb14736ba06247f9eee9b17493e4099054f2d9608b80d22b25f7e6e2dbb480bccfd78447ec699f46236cb1ff079aa5b50cdc81ba261174783f06a569d7cb WHIRLPOOL fb94803708fd183c045764bf317a2cb5acbd5e6d28b279d2909b166cd7136b7d126374afe497968e97c3aa76b35310c9e7f1705f1465e17cd9ecd7188fe0ce00 -DIST genpatches-3.10-95.extras.tar.xz 17840 SHA256 ad5b28336aabad8e933d7ceffdbfe6c5f420ebaa299f541e41ee17e945cdb082 SHA512 59abf2f8445f4c40b0f29dee7ef5be45ffe18923b6d168506ca6211ed4c2fbb344240305052f253c86d6d48bef1cf5b076e676192158b7bf05b98590cc4ea80a WHIRLPOOL d6c34e0eb46c66400337c96bf015f321867265055337ac7f9cb32b5777df3807ad5adc219bc621a8f5d30c16c5695da83869796fbb934020aa5f6dedac6f638d -DIST genpatches-3.10-96.base.tar.xz 1296660 SHA256 651c8d7cfb9297afc44b249df991870fe86badcf94d0f8f83a02dbf3c319cfc0 SHA512 321438deda1d22ce81272984c2192370c681b9ceb577f18d7f96be5fcf4cd67942cd69ce5878f5623118a4c95be94dd794191553e869a0c420e5a2512499b7ac WHIRLPOOL 6ff4e9405e6785ce32bb724d1e6d374e3a4c58626455065a0e52963d8489dfe69c01746145d4c451c2e5b78cb841283bb55a8d42d728cdf7534dd0ab78d8280d -DIST genpatches-3.10-96.experimental.tar.xz 60164 SHA256 8c5277a8458a1f7c61c600f1e27057d4adadfc4285109a94d640ce4e4dc789bb SHA512 993de0ccc46406f27e63ca321c6ee10b593f6d8edfd2fb30863533ec8f94a7e10f4deb0ebc557bebf5dc65046e6c22edd9f561b978b1ff7ab442d6acfe1e6057 WHIRLPOOL 71aac37fa833c1ac12f44f48aed51cf5a691aeaed62993ff6f4393830d5f469251802b3286e48b30355134d1f6a7e70221260523648de4f03b824e66222c043a -DIST genpatches-3.10-96.extras.tar.xz 17836 SHA256 281c9fdc7b705489e1ad19a056bf2b19c5e18f675590053c43c5a6181093720c SHA512 63c13990349849f57d956a624bb0fdbc2c5c09bf05a509cb0dd5e9b3ecf2cbba2b74d69d3e6d737947746fe04b0029772c9a79e11390dc83fc65d5990136f3a3 WHIRLPOOL d1f7f451b6271f25c2689265125b77ece1543ef7a1a4196fa706cb36cfae610aecdaf10d5d0f4dcda49811d4e499af0b5a9936dc297a05c68a736fa1d8e61c22 -DIST genpatches-3.12-43.base.tar.xz 1364580 SHA256 2d83b0b0ed5946542676467d99d9d0f0879c8da9ab16a9b602548bc3fa9b5fbd SHA512 40d77097db66868b0281c556e25edf24924a8ea4dc6b0a297f38730f41e55a9b4937bc68c614d2279875e78bff0c9dff2a6c4192fc2a847ac3b1d3927af25acc WHIRLPOOL 34ef24dca012870ff9129113147457fdbb5009bccc2ea4dbb0f601bb88b36fbf037c2d12c646c3ac38e7413278e1ae316bc2a1fdbbecdbc8255bb32a8dac3ed2 -DIST genpatches-3.12-43.experimental.tar.xz 46536 SHA256 a66c108185ec4524e212f273c01b1d3dc84da9e15e08f570be0da899067ce567 SHA512 1d739c625e13b1c48554746572d0e2f2bb141a2d9742a683ff342a770792fbd8a1764d322c987a8a0f091c5a0834f7f980f4e2676b34bff05bd2b7a2ddf36373 WHIRLPOOL 3e9601ef0e9903fff4b363564f8e300becc78f82337ed84effa806dd1067de3359ba21596af782d2292e5979445e74a885c456df61306ed2cc8da008008a3be1 -DIST genpatches-3.12-43.extras.tar.xz 18236 SHA256 928d2d472b3fcedc711b2134de4294a9a8906eff3344baa26bc9ef276067a180 SHA512 6096d64e1d8f88fd4570c50d7f04265173dc136feab79477549d1ccea6d99226c756e195a2a1fd5cd245888566ef8b005f3fd40e83076e0c83b1b8d5edba8b26 WHIRLPOOL aa44f5b80524a6dce660f0d13513d0d01dcb0a23f3c0e9cd6d110c989aa0e7cfaf77d02d1034838bf02b666d7b608a54fee956141d7b2527590381d0ac40dc25 -DIST genpatches-3.12-44.base.tar.xz 1444756 SHA256 b7ee32a2439bfa7318b1b42ceb2590098a061fe0eff563ad84126a3f672699f8 SHA512 74c929166b1399b80e3b00ee7573f8808c9abdf401b9c9d2a20565f82ac70e176d05dfb2127a2baab87a244f9783603defb6f19a2ec36c9aeab109456c5d3a97 WHIRLPOOL 58924c96b06194c90f09cad60221488e28b74977ed2713d6e29736102a8e90f70e6c3f29094317c66d2f08a077c1b7c5d109dac195b79cdfcc220042e04b5021 -DIST genpatches-3.12-44.experimental.tar.xz 46524 SHA256 58ecdc367450ffd0b6e7efecf0d98e292916fa92db079c46c27308e4b76f8e83 SHA512 61611fec8d4b9b25c7f9538f29d332b550ac47c708beb3083459c1b519d8198fa40091fccee529c1819dea3186104006264ca34ba2d9cd755302ea4394a0ebd6 WHIRLPOOL 19eac3c35333dfd33fa26b15ab8904ae116dae37e15ad43cb5be635ab77f929fac614365804d30655188e53b3899565985e358fccf8211406650876fc7257541 -DIST genpatches-3.12-44.extras.tar.xz 18232 SHA256 b1007266063f8a9d2e15877a440cf32b023d24f0db7dbf6cd4283e57363fd717 SHA512 bb62811238a0e43f46871f76d32ec28eb9aed6b47d3a72dd4efdf16b81a7bf350dd5b2965e71cac224d222a1a5e55eb46cd66e3f9de91d90d92f43235be99eca WHIRLPOOL 21e9c4c9c023d4cf2aa56245df600a6ba173a8ca842a1f8eb3e9a08b285fbe3a8fc315c04556c2cebbf6ebba09d6144e9e6239b6c32848199d8785263da26d6f -DIST genpatches-3.12-45.base.tar.xz 1453664 SHA256 ec4d9bcce9b1210e68a0bb24af280eb1e969e8b0179138647fcbdf44a3572fab SHA512 a18cbd4359fb410b10ec3bf579ff77f931f6f86b1d29d7be61204ef0984d34870810942ff395456578efba76d73ab8416d51e7eb2edf3ced4be5a00d8a4967ab WHIRLPOOL c3795f46cee61c54f46a66b7e3dd1d1232035ad6d745f19598bfa4a69aef297b89b11bd7d845fa75247bcc723d7f52d5501a3281c95c8a4b80dee6104b72dd61 -DIST genpatches-3.12-45.experimental.tar.xz 46536 SHA256 10a2fad4f699cfed49f8a5e3b0e5685a12328ffe06cd90c97fdf92d7bf7f33a3 SHA512 6dd0e76110fcdd50e48c85f6e777ffc63a55a434be59c92c33318fe331a4f04561c9e526dd015bae84ab5b5df0101389e764b3f77b164a59b8b46f22fa2a3ae9 WHIRLPOOL 59f60478fea7af16e373cc3e4166391d97cd1c5198d736844f5f692fea8c4456f87db1b37475508b1aa185bafbe08b9b685bc8235c8439eef488c49525af8316 -DIST genpatches-3.12-45.extras.tar.xz 18244 SHA256 976054b5555a797b073b302e723ed6823b0e35b354d469dd7516f312d290f98a SHA512 77da50d1f74455ce5c38d5eeabb54dc9de936b3cdfd9dc3666f93cdcbfb546b32ad1dbcc0798c08c538389997182f87afa8d009ab26c6872a4c32a4d5b76a734 WHIRLPOOL 38eccba1cdee6da7ee00f332d740c0046f4cefe3d629e15f13acf4b3740ccbfe8c52029df2d1286e4510ba9f459dc738a75877b73b40b0b98d13d607295325fc +DIST genpatches-3.10-97.base.tar.xz 1299308 SHA256 d5407d2f91744519c407e1f74773e1861cf1ce46d82d5c0353333035a86e8189 SHA512 2a91d0772002a079691ba1c0810fd3ac38e4b893a4da28c53b62bba790d402e36389275dbbc8df6d0bd76634cdfc319a6221da2a1bf07abf0657fc419084d141 WHIRLPOOL b2a5a758695fdd6fa78926cd3eff3f7d3b074fb0d3ac35a51393662d6724f0abc2fd21647096a8a0a9805bde706314d085169ff10d8999af73d55934d4b66359 +DIST genpatches-3.10-97.experimental.tar.xz 60148 SHA256 c0d7145c053c8165b8a0036c3d6d823300319ac7d7766d0c2c431b7f2f558a13 SHA512 b9d78f88ef57cd4ba43dec4b9dab1ea72c39947e1de5369060cb044b9d5eaa4ed81731d3f26280d5f7fb47d84c4c439c2024f870f5324bff09a32538fa15e072 WHIRLPOOL ca93d5351300ca4166b20021ed14c31ced9c9743fbdcc0b676a43c1853d3e868209fb747f31a0e1a9eb5f4dce8a9e3ae3299dfbb312a35e1459e268a8e300306 +DIST genpatches-3.10-97.extras.tar.xz 17832 SHA256 6eb6942f08071bd467bdb13218975f1670c385a21cfa41226454ea4b4f03036c SHA512 240549a6ea1d6f119a563de6676628d8c0a3207f7be685a8a7903a04d0bfce639d02858896b4dda95cf0fba48bb22d0feadbc176c5f00bbaebdd5edc68c0b87c WHIRLPOOL 19ff955983a322086feaeeecb3c664f13b6ee1faaecb6745bbff0e6f2acb1937ea7212cd23869146e0a5c59ca83370a61437b691fc5ba8224d2d2cc69cb70a39 DIST genpatches-3.12-46.base.tar.xz 1477068 SHA256 62f8e7101afdf671a51e3beb9b01f8c06cc3df6b12274fdbfdb1bacf2d3f2952 SHA512 8464d356a7267f41a5d4b8eaae24b3ba391d51157adb3b5b7d6bd626b1569e5c565f4383e138bd3d939d4a2bc3dfde349f74c2b421365205d98132cb79442612 WHIRLPOOL 50aa1c4ccb5bf46e54ef1cbf699c7af27f00252325b09bf25e8f9cead1faf346a94bce29e4cc556e7eb3e339b627e8fd321acc320221a8a208fcff4493eaaa29 DIST genpatches-3.12-46.experimental.tar.xz 46524 SHA256 48069be9b5b0a4ba7f1da5dc046770e2e36a52951bd6815a00907cd721881b25 SHA512 6daf5d04d5cf569eb5b0bedd5feee8f3869938ceb9093f109f82ec8e4fed5349a5dfd445f89a9f5c5459b2524bc4d00707c4fbfa449783ef63a65204755546e3 WHIRLPOOL e51be15d4756dcc8ec59179809584bc1232ff20148a1bb2143947138a8591311a7bc7162b29ea3db81c0781551a186b7650f597ad850864b1ffd2f7dc975b00f DIST genpatches-3.12-46.extras.tar.xz 18240 SHA256 7cf508f807c15884428573ec210eeefb53470504bfef2eca8357e60d82cbfc4c SHA512 11736da85ec15ae89dff6c850ea730fe5ca62bfa24d864df3d7c832fb20fc4321485306124b516037b3121e1b8c5a47bc0610f17767867babc9f8cab4ee599e0 WHIRLPOOL c5164b37852f78ef0297c70a41f984ff6647eced6e980f7718d924622f28c8ccb325b32cc04f0cb14b01fde029ed09f0b2b6d0ed41126140061e010aa4e95405 -DIST genpatches-3.14-54.base.tar.xz 1000384 SHA256 31496c9d1175b58ddea2e7e832cc0a1d6485754b0876bf10395de151b113bc26 SHA512 8c41346830512bedf1efa20914aa4c0a5895a78a8442e7f6749845986518a01bf0ef4d8759887b8368735c7c3cf5537717bd31ea9b2bd02c30204358a2e1adfa WHIRLPOOL 7aac6195994ca15659a7c8d73ae23fdcc0391f1a0260f795ec7c10833ef3dba90caf7fe1a8b1debcf314739515d180635e3a37721943083181a4784a8f38a30b -DIST genpatches-3.14-54.experimental.tar.xz 60308 SHA256 d65996f339e190d74e5ec1279b7e7e50712a75c36a83d71fa030c6a91cf402d9 SHA512 a51652a814070674c106bbff39acf2a65b6f011b676a7963138ea9279fb0dfc35842efea5fbf5d02e57db53a20535edf62afdb433a31282226b3fcfb10d525f3 WHIRLPOOL a6696e0271df7ae8c4c16c1fb9450b8e3383c330967ba131e988569d67481c1d7a124094573e1522a01df8bcae0453f1a722456c637efe0531fd96b0b34e97df -DIST genpatches-3.14-54.extras.tar.xz 18268 SHA256 082caa7769237e2105c3aedcc3be569809cdaa3dfa7a99107aaddc7f5830d5ef SHA512 8b238352a15587c7ce44ae90311b5cb7e49e05abfda5af2a777757306464316527527c2f47d81f4689acc9998d3059a3e7854b38b9ce2929de2383cdfd321d65 WHIRLPOOL d7c633218de7299be91eb3c01f5e3c5a00d348dc00612de52381ae3c4385717d9424670e8e2e0c2de94b032c50af732371f090c7189915877d6e7ef0e6896945 -DIST genpatches-3.14-57.base.tar.xz 1045724 SHA256 0b68357d14cddc6349711a57b66730c45dccfc4c4598626ffc07f0949f37d286 SHA512 0610c4367e139f9b6af7ef1f5ada82ceb17cf6c53f2b2e7a95e4b44f99a279a4fe29fd1dbc597e09512c5b9c5a23ebc6091c9e62d695507044cd68adc9ae863b WHIRLPOOL 0b19e424203d24b291d5b6941b9c39800b90eac54677d2f079040eec6577c454522f83840a6e5ebd5a72743ac5f7122dc38debeaf85e757792e845355b0b32cb -DIST genpatches-3.14-57.experimental.tar.xz 60308 SHA256 f3d49287f18f19dfdbb45c1f51d42ee63912a98568605561bfea52968f38a2b8 SHA512 781a83eb21cfa3798fe0c458e607c006cf69c7b3c3574d05e6100b5442b4b57f7b878732cdbcbca4db081aa6834c7cb7a730bbd620bb69c6f29b28e3d2ecca9a WHIRLPOOL c87d6a60449670fcaa5189be5e673e2de8dc8ea343129769fa5d33f90dda217a6d1501e7cd853f9ce6ddc836378d1514e74c7d628d98d8b0731bf205bf26b5a4 -DIST genpatches-3.14-57.extras.tar.xz 18252 SHA256 c7fab5340d2c59c203ee6b84749396b851ad5273ed9826a6305bd36823576f54 SHA512 d4d4e451713064dbc612bd33d4a8b815fe9c77a483a47eda0a35f30f159c4c538f9a7a751df2185ac7d336b80bd1297c8609980757447a3f0e3cd7491d619337 WHIRLPOOL 936d0c3a6ae981cd08d03c17d0673bbe3d706544c6bafb33a23ae1348d0fdb7ef8522333357a3b28bc5004a3062634782bda900057d8e264dbfb84f6ae032927 -DIST genpatches-3.14-58.base.tar.xz 1049500 SHA256 e39936f18642b1ff5ae8aea779176c85aa744594f92ba1c02a371364c769ca11 SHA512 1061a233ba42ec880de32099c0a94b772f57cbe5b26ff162ca89be62271ba56b340d20f35143df9a546f93deaf2b5cc6491bd3fa078ec4f1ddff90d49e71cab4 WHIRLPOOL 9b65cac5d4341419a8ee4058a14199e5f2cd58018be13e42f5f885cea7d12342c77281458287fd61176bb258617d1cd5222d9ac9d6cb906a125a723bf7de185c -DIST genpatches-3.14-58.experimental.tar.xz 60308 SHA256 8ba27a67947f2c67a1552b036bffba7edd6c5fd7f9aa8807ef28268426696fd3 SHA512 cf1c273dd41c3a7351cbb6c7b3f7026b9bd890b48e92f6ebfa4b455a2321ba8de8221bb091e70107bc3de82e039240ef21c7a49ddfb1c3aa1ee3395ad057b92d WHIRLPOOL 220a59400138e8c56f7a25d6ea3f39ee9123de3adfdae74fb0847e53cfaca3e3c9137025c31faaf3c39bf6d4ea37c5b939d81ec6e98376083460a39c530b0157 -DIST genpatches-3.14-58.extras.tar.xz 18252 SHA256 de10705e4f7f9035bdee22b320dc2c988f8700e222d63a78b34336eed5e533b2 SHA512 df1bda02acc817f5bd2c5e812b25180117dda66180fc0c57b217158850d24fd959d1578042417caf11eeffe3a1ed4108061c53a1113867d3bd6c5dc310fe0f90 WHIRLPOOL bfdf157b050d511abf0b478f0478658e0d20137cfead706a0c8c71ee9ea0332b1f034532cf6445910ce43cec520c96d6f6ea76ed003b4d6a8df50850e56a7397 -DIST genpatches-3.14-59.base.tar.xz 1055796 SHA256 2671651a80698e9b29a4fd9a86ecc4579ba91f38b45def5a67b87452ea74a3e5 SHA512 75e4116bb4f3669293875daf3016019934d44ceed74388fdb0062eecd285bea77853aca90e109dd4fcd61aca39707831a3c682ff9af753fa077eeb575b934799 WHIRLPOOL a4249a09d8c4f4e36ac1af377539fc8f6aa16590ee330e1bf2c8e0b07d5aee1582b7327f0b8d23d49d61d9c837da9dffa09d8f6d7c9e365f5891dfb35f98bfd6 -DIST genpatches-3.14-59.experimental.tar.xz 60288 SHA256 374ab6d18959cfbbd914e264e7cdbdf29460db3d1796715ada59715a5890b884 SHA512 214539be58c8c2961ab8a6406aaa8b93b162da83ad1ddeb0f8de04e1f37528941b760f10bba15c6f9a297d32501a094bc49d0b207723ef200a63ceeb3499641d WHIRLPOOL 48618bc6f448f4dd31785630e1491bf1700e640fea4cd9ad440b8a3747d0ad3ab7a56cbb4bd13d8daa16898f91779486cf5c49a129ab6b4f65901d8c178f8e04 -DIST genpatches-3.14-59.extras.tar.xz 18260 SHA256 90809798b05d89806c5b723b1ecdd7361bfeb6bafd9eb934f7d3c7fe5c75f9c6 SHA512 c430c40e95ad3accd31b46f03ba6945c3a5058f82b3386e06f76080270437d41c5a8705e67c8505506dc388ac04397df192e71b1ce5a39780a6d898200b2aa3a WHIRLPOOL 98048e7de376c0e24bce29d30b6b5561b5189190159a3575c35010498de67d1de25e3ea11d2cf292ce71fb1cb8264cd7d379543b43eb48718de20386216c66d4 -DIST genpatches-3.14-60.base.tar.xz 1080052 SHA256 a1983df5b2064e3dd6f6bf020ea1b2c107e806dfe354d29fecba4382b437c2bb SHA512 b56dadfff7dc2d1191fbad0c16d8e91206d55470bc241a99ce5c11c7b5f713f0c6f33871464f693385e97726a689935ef271ac771244baec9a517a61507830ea WHIRLPOOL 90d73ae372375cf4f2caf0064d4f60700dfbb70e7a34e435018b2fac8c865e8f428206d9a01acb7bb6c544482bb28371e00b1146535ba3bf44117ed333fe217b -DIST genpatches-3.14-60.experimental.tar.xz 60280 SHA256 a8b2b6de84dc66028fb4195164d8a5086ab4e0201419a2b7bc9b591792013f08 SHA512 15329d3945d7721b8289b9fe4e3f04dc6446ca53b44c1332b7be3018dd1d8ea4e509198a9ff568d8c61c0d1b9b748323e6111086e4b881273b5186747b9cba04 WHIRLPOOL 0e46224baee6b1997090988034ba75cdd4be9be8121a196ed39a8d15ad1fd27ecf027af8abc22fb98f84da5279f9392adb9e24c6890db151ba8015bd7916e399 -DIST genpatches-3.14-60.extras.tar.xz 18256 SHA256 98f631421c5faa472fd4f9054d173ca94dd57dde04c282dee6250d6f28f2514d SHA512 89aae299eab84e795fef89805f1dec933aa3931d185af24acab9ccb4e83a89b6c74302f94fc68caa85bb6e4eb614b582d0f253ecb6f4c687b5be49fb74a81162 WHIRLPOOL 311149588a2d807b4284402f06901c8e13f6f84437bc62650a88d959b17ff9bf9e67756e634e74b2877899d2ae225312de2f635a17a958e409bd690c170ad1c0 -DIST genpatches-3.14-61.base.tar.xz 1100096 SHA256 a9eab9851be9259f389e2f7ff8871db08c6b15a347c2407bdf62ba0716fef8e5 SHA512 3de6d1c01f4f810de18e7222b43c9f6d0c402551296647ae8d2716aea3273e5330d71f04f0bb5f0a845d88696b1933675f3faf066c4b13a242f467a2c47899d4 WHIRLPOOL 026c06e358c367f2ff593b5587923568db017b86a59d1b08a40b9449c025762323a712c4a31c411a6f66348b9214a62db920dbf793d0812fe79ea7c360e660de -DIST genpatches-3.14-61.experimental.tar.xz 60300 SHA256 3d040583729ce21e060b5607d9bf68d6f8b1f0fa24812f300617da06c3ac2233 SHA512 b55f55b4716568c89e2db9b27f5a3d54eaeb2ede7fad54af151b2199b98bdbc41400c64ce2bf98bc6dca3d18dfd648e8497c392a103aaaf63f57b9ede9c5cab3 WHIRLPOOL eceba0e0a34388c47bb226457e8febe5f250f15c29e11a0d99648ce7a680ba4c1f0fd781ff995baa2f87b08e96ffac1eb7c2a9f971d5187900bf56ffbf291e73 -DIST genpatches-3.14-61.extras.tar.xz 18256 SHA256 627dceba56ace4abb03ae50a86f765e5ad4ceed587fd319250edf6b1d5ff8ef2 SHA512 78dfe5594a25f5732de1dcf8d4d3dc642450155c1a5dfcd8a96d2f13d05fe2135af01204ce609f238c81ca769d50fb060ba4a08afdd11b0fbb0c693d4486145d WHIRLPOOL 2e549a0dff4567d52eb63e86b101bd8ec885841af69a724c081def528631a725a6f0d46f2e3fd6ea82980fb37953f29ec27c5d8b79f8855aeb46de1f1a361606 +DIST genpatches-3.14-62.base.tar.xz 1104664 SHA256 d7790182dab0aba591fc5e9bed4f1dc4420a3b484ce3cf8af57769318d1a3229 SHA512 8cc76af4175f2e9d54ac1c7255b870df250ff3b28ac7000b32ce7b3348830f7072f13a8b25b0b6ab7fe49ca3ad5c6aeba62a899e43869a97677dfec017b32b02 WHIRLPOOL c77640e5fd36af50d78f49f00de79c2c986c99b8997d42c9a4888a0c6afc9f10833a87ec7acf5a4e228f483d35aeae9f767fb8f27fbfbfaa1b06d0443fc6d593 +DIST genpatches-3.14-62.experimental.tar.xz 60300 SHA256 564892b993deadbb2d47f936d924d7d1e6891de329b5bd04d2b3ecb126690401 SHA512 942d099b41c4e041570e23ae97006fcc5c6dafefe42d9d694c373b9a5398ff5b7c20f58edc8d339a6ef56cce240cc47f07958f59208165233e39ab573f611717 WHIRLPOOL bd7f6519d20137f18e086871a8dfd7cd06ddd7b9170badee7a31496cb6fa0669723a433ef7c159e037c15b3f31ccf0744afe6a76cb680bf8e9a1faf6df14b842 +DIST genpatches-3.14-62.extras.tar.xz 18252 SHA256 6702160c63ae9de7eb95279ffbe3e5b08fcc6d016803f18e3c09183f1ce309ba SHA512 8fe48eaecf72c257a6642a51dcabe8a0b76e5dd352dca0ff99ff4098db59151f622357beb14830aca7a7f16132b41f8b35d337933f38d8ce1c60531487b3d843 WHIRLPOOL e9e9790a84b432bb90b50e27a369cdd6777b5df67cc5175c4542ff6c15cb8ff7ba650b7046756dcade77742c595b8f9037f49c28e82ecb623742ed3073d74f1e DIST genpatches-3.18-21.base.tar.xz 632956 SHA256 f657997b05dc52e215c22fde16cb227895d072ac2716d25481654849a9e373f1 SHA512 f1dac401caf1cd6282fc47670ad9e3540855542d7eee77f27231bdb9679d3da07b7b09f675ce5998aa777024817546ba8747c7d75aa45cbeb2789dbabf5c5602 WHIRLPOOL 26d19e9302ffd72123c897f7012ae6d81cbab7a7d1b498d10b6aef27fd5e7f4d466fb510c6e72ef3c5f855eb9c88e80f8adbf436e80d52dcbcf1ac1f3e1bf684 DIST genpatches-3.18-21.experimental.tar.xz 61600 SHA256 ebee995e505d68dcf95f39986b73185b353cc64627b048f230e755195a910094 SHA512 d7866e7948e8d6c83a452f99ca50ed06951f68b7552d9dc182c5686d43abe3dc76e3773c8325a87b65e8bf1fa4c09db75fc1af27b7837bb60918e82273cc17e4 WHIRLPOOL 01f897a369a036624364de57b1ea213b8bbe1b1e9bea792e45e0e5b921c3cff0a88174c3284359466059e3dc3793a51ea92a1aa4a5c7b0dd79d98e99693ccd80 DIST genpatches-3.18-21.extras.tar.xz 16192 SHA256 76e21081cdcb3c1b38632ec5375b456287ed572c1a3cb64cc036471a4ae4f726 SHA512 c1e98a5d2350b07a5d939863386027765c8820e32a45a9c68201beb6de811aadcd32c82ef8ef0627290f6fef7ad5751418b2aa7ab4e2d8f3e5b6683e40fbc80a WHIRLPOOL b39979d760f0695fb2632bf7fbed16070e24efa03992c0575bbd13185ab33f0e2d05e35071e9f352f0eaa83e15015550229c33df2294beebe2ef6d24fa2b755e DIST genpatches-3.18-22.base.tar.xz 651380 SHA256 9c866ac44e0c716a5292c3ec907fc52edfce1a32d75cbc63e51f2adbd10067d0 SHA512 d1183150a2ee641714dc85c873713936d862688d4314a6906a25943bbfb34566fe5d0e838d61eba2fc369a657aa762f6276a2a31a5c4e2e9429db4330a0fa03a WHIRLPOOL 22d358be0bfd836ded82b5fc347f5bc266186ee0374120f2def7e6d8c4e87c43ab364eb64c6b141ee8d0705912ebc12f5525694c7d6fcbc9da38c0012ed09da2 DIST genpatches-3.18-22.experimental.tar.xz 61604 SHA256 a216f6a678d83ca91283adddaef52face5980718cc7eae9d8764f782422771c8 SHA512 aa2819419490a7ea0ac06179c07a2139e671877b4a5109c019c8931f21069e4d313c75279b679a76ead8381bc1f709a77b8eb19da27f3d5e8d4d4fb97a0ae5c3 WHIRLPOOL fb4364fc476edac40019c1215c5ba94e29ffd003aae37cb8bb642008e2f0a853ec174c4495699a2c7984dd190d895aeab17cae3ab6c6045ff497c07716a46939 DIST genpatches-3.18-22.extras.tar.xz 16196 SHA256 deeab880c0705b9a02492e2e73152614b7c7dd9f213303fd5284ee07debf0416 SHA512 5ba6d42c5973daa52a54bc77f3f13312d9c6f496e002ab2ad613a08f18ee64dad39472ec0cdb0e545b2c95aee0d69fd30c38877d15f266768a22fabb8a06e2a3 WHIRLPOOL 84092c11122198958498e26d3c4fccbf06451ff9c880510f763968644d03c30160f01090c2bc5b411cb813715083682b90b750401ffd7c8f011ae24f203e90c0 -DIST genpatches-3.4-90.base.tar.xz 1325696 SHA256 77764d0afc0e3a9db3b4e3314c86505ed8703834f8364fabf7bc21004d14425b SHA512 df2583e5a939a2ae9a2fade243b128ad3b1d4f7370407bca15ad1dca2defde271ede16daa8c01f844053af5da7a5cfbb7ea04839fe93a4a21fe87d1d8551374f WHIRLPOOL 17050e7e73b15106fb1831290a685810e65e41a345669e401ab324a3fa27576d02cb17e22b3f8c36961b501b31254cef82d849cac005504b8feb5b4113d9cbc3 -DIST genpatches-3.4-90.extras.tar.xz 18236 SHA256 787d5a43bbadfcb40ac5f7aed21aca6bba239bcf495b0d051380f675487ecb42 SHA512 9917f83e64c0705e0c810723ada2f14109d29cee03576027fb234229796c024d8092abbb91406e2ff9594e9e1840f718885e9e0ff294cdb2bfb0ef76fbcfde0d WHIRLPOOL 255b4f46bd3f0685f6903eb04be187dfa3f821318c7bb8ae48fb17c35eabd88d0f14684f6031326cea4935246acd0766abe6e7363f1a527af686c7fa965cf9d3 -DIST genpatches-3.4-91.base.tar.xz 1363016 SHA256 14bf3a56d4444ae5a9c307c2bbf2cccda44b5bb8f7c460ef9711b858bc8475b0 SHA512 f28f86bb302313b13c2de08d227e0bd0ca93ab5dd2071b6c0797c9b7e29f84b7abe2266c93bba15789a51d6d77c70b749105b5d4a1f7053b041ebd9eb5a80df5 WHIRLPOOL 8535d191d5482773a6d9aa8d45a6b8614b3ba936fc043e7ae5d52ee676ff89a65457c531bb14ce2ea447cb26083efc50c6748c04412b7d6b1a1c76d1d52a2ed6 -DIST genpatches-3.4-91.extras.tar.xz 18236 SHA256 34a52d49b677ca2f528e47e08af64bf4b9e8b036710806ebc31ba31bd612dd1e SHA512 04571d1f872a7dae516c8d20c99639039393f23f961650e4ed63d7cab72ca99b227bc0aafb82143c69890fb084fb51bb28367ad9b59a64c79702078fff9bd208 WHIRLPOOL e70a665250cd5999f3b4906fc8ea8637ef703441aa6e51a06771f0cd906a16b83181bb317375fc3c604676bbf490336a6969e8748a81d4c5628107bbc38439af -DIST genpatches-3.4-92.base.tar.xz 1396616 SHA256 690030c86258fa1111aac6d1dbc011023537e4becee793d4351307d965290612 SHA512 af321be89ca243ed5920c12482afc7ed0b7e694b4154a2f83b4f35a432dda90fb5b1fc2bae91b99861d56c70cccd2bfb304b7b52e99b94a4bf3b87dd0980d53b WHIRLPOOL 180749b1314707344c0db11edc0a57640741d1f610145b863bd0ded5f2bfb165b2bd454623899c146fe45927a12bf4e9a6c6c1e6323920c7721d42e791e9a284 -DIST genpatches-3.4-92.extras.tar.xz 18240 SHA256 db4f7be2ce243c490895d551506486b7d56407c9f55fc2930202f0601d48317b SHA512 8ed85c0a62d0d7f13256dd959ac029d5dfbd2bb25911bced52e23e0d5b8fca196c305efc7cfe31cb4c39dd99040e05064aa9456a6c97b00692efe489aa93f698 WHIRLPOOL 76d9a84c6dc7e6188a8aa92defe05db81a362b6a15e525e249b16a610b688089e4f84c81ed82fb88757cc162b5f7ddf6b5dbb193e50fd09f28e4d0fa0af42cdf +DIST genpatches-3.18-23.base.tar.xz 723664 SHA256 e2b851168cb14811a7cbbdf7cf6c6285948353729ff8a6d5d243607fcc0eff8a SHA512 7cf09b223927d656d19466bcfe2f4284301a409b0b680f21f2e949ba973706b5042eaa65378e1034ac1377cd887af5330dcb210262907bcb725d6601c61264cf WHIRLPOOL 4ed8f9c163f3cea84e7923066ea7002710980250362e18e231f0421872b212d7777a6d1f1273945784b0d720182044b842478b939af20f137e0bb9e26fff91d0 +DIST genpatches-3.18-23.experimental.tar.xz 61600 SHA256 f6335db1e0d3a35489ba7632669c47548414389d28fb25838457cea30375c430 SHA512 20b2fa1bd461fb1b7de7c7faa85533d2baa4681ae8a5144fcd9d8ccc34fe6643b491d9f419d4d4d25a5f81398d03af5cfbcce33e7ed18a185072ba11a39f3ebd WHIRLPOOL 62c73dd6833ab3cfd7c0999c68d910340c2652705f6cf075ada82a2db5efb37132255068833454d38bb91472e5ed06bb35ec945fa433ef6ac6f714da45073d75 +DIST genpatches-3.18-23.extras.tar.xz 16200 SHA256 c055d6c67161b7497cd6fb98d6143676efa506a06fd7d77c7db527f648cdbb29 SHA512 898c991f77e578ee4d8280038d65f446a309e154d26410741f4f6d6935e4c5c294d0befa4a627b248c109273725c5ca4a489ede6a8eae4c567a7725589fe6f20 WHIRLPOOL 47754319b9a2179c1ddec78647ab13b5ad862b7677a028fc307205d1c3c29d291da322c465d053938019f72efcd25311d5762fe55769ea87318de330a84a5a58 DIST genpatches-3.4-93.base.tar.xz 1412220 SHA256 dce2f6bce8058560fb4f005729a29fee9c6846147bca986b8b44d1554b78f0eb SHA512 0f0cf52185a8a49f639a1f9d3ff302a72fd7cbf4403f7f5626c9f39c3f4e2e5ea69f402df429b0b3341655d9b7a4779b738f5d5fc6ecde3799861e0b6efb8cf4 WHIRLPOOL ac2b82b6e749b945b79d2c21dc3081eaf399aafef80a3fc49ee71dc1f7ee753bf406d6e93bf2142ee4b25447e0304800de0adb9911274dc37172a9a9c63d624f DIST genpatches-3.4-93.extras.tar.xz 18236 SHA256 c59bbc018e3c7e71fb655c5e33cbbcc3077dedee08553c287624b175c83d0811 SHA512 61e74164a8de8646d4d0c1cd1592eaeb8f5747f0e03557a78349d8cd2df7e924f012ae4904e14210ab56eb3f1f04e8610818ee05e4b5a51b325a42ded9876e66 WHIRLPOOL 42876d70dadac671875e7dc129020ed04c91ea99f40972cf87554accbe1d5e1651cca02f5e16e30654dabdfc1d15771eab8908a64376402c3b1639164b10258f DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee @@ -76,39 +28,18 @@ DIST genpatches-4.0-11.extras.tar.xz 16288 SHA256 84b7509ecc82f7ff1b90959b88e9e0 DIST genpatches-4.0-6.base.tar.xz 118672 SHA256 228c38e1e691fc3b3862a5de627c71ba9bcf1aafd10317a9ece83a13e041ed24 SHA512 02c3cbe7982173121f03ca9424e5fa04b27f985c2f81b7469559eda4d8824e4bb348a0b9b341a9e34c7803ea341161ff306aee5d6cb73617e01fe7aad327e05f WHIRLPOOL 685c62001c6e29efbf800471ed95f8413368c6dc194689c04dea44c5b9148e09d3d79e026f91a2054a84a991bd741dc8de08838c3cd9b9c94fb8dc981db9e953 DIST genpatches-4.0-6.experimental.tar.xz 61620 SHA256 ea7359c8a3e4e8c53ccfa0573158f080e4ed2a458f6de654097cf21134c0910d SHA512 69b0f51e43c2a5712fd8eff3f8292fe31109e33a24b51bb0e637d15bbf2329767896d6c56f3f178ad6e9d1f69ebe6875108941f18a4a10747405be385e47ce86 WHIRLPOOL 657758e5a8b7a9c764f1d8a875be71ee079907aa6ab79c90ae2632c4ab8445a86ad97cb3ef70e424a6bd62d4c937de577cf44a10aeea4a41d8dd6d1bcf803952 DIST genpatches-4.0-6.extras.tar.xz 16280 SHA256 205c87c3d133a57d6ca42e2ce107cf64cbedd64fd356c601ca0af29248af5c1e SHA512 61cea7f5a8919418bbea96599f7decf804d97d9e6b8729e7e5dc4f077d54c86db7b0087f70b87183420798f16c1036242f1b857ff2598edf0902ff4fa6bd2890 WHIRLPOOL fde8c4c909a26d7bf2d00e35d1ee45e03c4710871f0a2cffdfbcd1109aac0b4f3215bf0ef5dc6562e9fb9d7447c1330f91a08ffa78912b3857cd3ddab5d10a3b -DIST genpatches-4.0-7.base.tar.xz 159536 SHA256 9d1e84cb5133489f76aa3ee4ffdc6a28331bed0c6557e383bdf288ec9461ff3c SHA512 49f29bc5b8d0953431dbd1c2c0b5fa0ae0eaad6ed744cddc5e8eeb3a6dc7aeb2231d9f491149fd0e9a4a9c10bfd336746a0b544b96d9212bc401091ee586eb46 WHIRLPOOL 355dfcdf5eb508cd840e506b32f3a9a39ef885bfc605b271574cc906492ad7a82c3f3511bbc519a912c56ad2cd0ab11d51a45602f20b03bc6441a11adc53d9d1 -DIST genpatches-4.0-7.experimental.tar.xz 61636 SHA256 419952353e98ed36dcdb9a45fe73b52449ec6b6d969dbf228f4dfc2da880f261 SHA512 1dcb8ede976b65304f3550aa55fb5cd0881861bc3507658f3e1927754ec37956e656ff053d546e5edd4f4ba63fbeca50f4a5c766229d5d05e5a69a4f2002f8b4 WHIRLPOOL 881f738f577ac15b977e3d3fa7e2abae427df196a0b33e96bb457ba36118e912e84bb8e36ee0baa67ab92ccfbffdcc2265cbae3034d618e25ab9b25db0791388 -DIST genpatches-4.0-7.extras.tar.xz 16276 SHA256 911ccb197f2c9514d8b4eacbdb7c059d709f64cb97632eae85cda99d61596ba4 SHA512 ce94b88735fde37b1337f111c91da0610b14b22ce5ac68bb082170acf23b8875cc1d2e7bc8354959a91bcbf10dee9fdd81d0cd173e21e8bd8d6f2ba157a737d9 WHIRLPOOL b8d32b09e5b9ec7af8307398fef31f5569c738dfdfc1832060e998f9fb5baa31cbb84eadab28b82d50fb7e6acbb381c55271128de4c5bc14febbb7dc4b1d1534 -DIST genpatches-4.1-10.base.tar.xz 210140 SHA256 d0ac2a9175fe72d0ddf23307a9c8d06102f48220886468e4c19c92855024d829 SHA512 fadf51efbda55e959cd4636e88c2a159ed967156acbe719b15056e9e56cf01652b0ac6b515203d4821853939fe8dc4dfb6e075e55530489d5a96e44e6dfe1be7 WHIRLPOOL e384c68de2b4a4e23934cdaba6f8d02942931ea721b1730bd6e99e02547c28f6219bb6a38425c5c04bd1ee13afbf091dcb9eedadc2aca2246e05e465c07cb974 -DIST genpatches-4.1-10.experimental.tar.xz 215988 SHA256 b4ab62875339a60623db576533638e12342815ba93091d16dca7a975c10ebf4c SHA512 e51eadd26e1db63ec558fa0f4a83b8e5fb40902c9e7c96e269b4102d048b9f90defc071f42faa058605af047790bc410b2186d6c06a5fd2b8f6fe957da8cfc96 WHIRLPOOL 3061975198673a38775b78004dcdf088fd01fdc2ce784aead81425d25f6b831267e9840fee56db96253a09290ab09d01bd4fcb916b8fbe654ac32027c702d4bc -DIST genpatches-4.1-10.extras.tar.xz 16184 SHA256 5d4492d3d535b3904fe917532b52d314bd52566832acdb1d01362e03472945da SHA512 da4163afcc52c5385ff3869105afdc0bdd021e1967b6461d3ced62bfb22ae5e9f31a4493d93ce6ab33fdb23b92df6eaef14007bc53d77de63e76802e9d65c77a WHIRLPOOL 24318d0cd07b3c3cd7d752e3619883ffcf63cec3ec7b90ba5f327bbd204e1cb2e3a7cd91c8607a988e13a23ccff25cfe8b484b8596bfe6cbf365f18e7de180e8 -DIST genpatches-4.1-11.base.tar.xz 233284 SHA256 4189cfd2c7d1a1d7f28c8a596ad36741ce087c7c4cfbe0d5d20a0ee889328d18 SHA512 e5944edf832070d6072ab8efc242165afcfb689874687196c96389c6176ca9772e72e82836aba40ad05840536acae6efd6e72890efd692d903018d47489a90f8 WHIRLPOOL 13cb400b330443025f77dee6c710ca9886991a7032fa3ff925d53ed4fc03d07ece5647dca65de1a149073362db1d7a0b374a21d980eafcae09a4b01584c64cb6 -DIST genpatches-4.1-11.experimental.tar.xz 215988 SHA256 6d1c5a4af77c2d81d05c27903e2d15f18beada25a335674ea372762ea6aaff8f SHA512 7504f4b3d0ee47b9b2d720258b6873cfed9b28e04aa9860857e3ec0ad6ef6f36304312c4cc907efd9b2ca6adcedd265ed1f1ba446d6da4eed7c096d7038d9245 WHIRLPOOL 199055e5305141b850dae96d6eab64e7f6870e1eba9d667a9f042d7652adb4485dcd2c30192dffa3d16c994f4d11b5cbc08bd0e4ebca97f51d85e3b1365fc1f9 -DIST genpatches-4.1-11.extras.tar.xz 16168 SHA256 be4078adaac6d679a563709dc7528b92587a463877c28d7c49117b5ddd842fe1 SHA512 9a561564511e3a15648f88f1b230e8985e33b3dac92a082cd8d4a5ccf0da8f8eb030fde59f6a0c5664c478751f710e2f2f8f3cf4b13293329444ed702c70732c WHIRLPOOL 46a021f1801aae12167bfb5378ee62cb058a13b18d48c006b9e7fc4a086803c8c509070cee059c5eb817abec317285f7e1157f6f286ed53a4ce7ad761c7d2e36 -DIST genpatches-4.1-12.base.tar.xz 266104 SHA256 d99620d6fa052732357a9b050a878d6ed7f1f3b03c1ae59d99132db8244829cc SHA512 4128fd323a7451692b512b249226f25ed5a0d5aebdf48832495d3d72351ccf61b7d7ecbccdd85915eff023fcb9fcbb408a1c01f2bb58535434153ca00d5ef0a3 WHIRLPOOL 2c9d9f8c989a319fb1b06ff8f2e29feeabed05c41546eb91a0bfa5bf2d586a7ef39c01d1e100519c844e419c92ece745b7192f3e3839c2fcf9dd08d971143c35 -DIST genpatches-4.1-12.experimental.tar.xz 215960 SHA256 8d0659bda61873ce16612e919b7ba6ccb8b5b9b5362ab218a886bf2ccb2684c8 SHA512 b1392299fed208e973eed70174f55ab6e70c0f5c7cbe5e29a12dc27ca9fdb09448314fd3a32b1d4abfa529065d76e7ddbc66cc60019b1d9c66d1b96d0d146dd9 WHIRLPOOL 4e7189dae91ffcf37d70dd9d2547a8e2092cece356e004e9282d5c0aa3d5d992cb7423496ef9f28503e687052b21468e456f83772989a023fe0f8d33a2bdf00a -DIST genpatches-4.1-12.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3 -DIST genpatches-4.1-14.base.tar.xz 311648 SHA256 e3a959d79834266bd4760d806598b7e9b982823e9b177219f0e385482380aa25 SHA512 b2626d0b45da547a293ba233a4c33c30aa4f7b9ff1d2c3a3aea664f9d99e272b5c9aeba6abc63f27930771b9c282184501c62a987985e23c53471ca5feb260d2 WHIRLPOOL 5db2f30fe0f30cd1161cfbd7d7a8a7cb6815ece833874e303782bf28afc25d11568d48372816e9736d39c781635d5ba91b3f80817552485ddf1c945c40aec01a -DIST genpatches-4.1-14.experimental.tar.xz 215988 SHA256 3b58f4e8e4867bb7eac7acc78954824f79d0e4260ab5b21d73d30ee617287708 SHA512 bed868ee20616194dfd314705234348f1a860a2163c886470a16e387940a48dfa78e1cd0e2a6b4a827b9c664fa37586d0a52925ad7502e2ca4e15e94fd33c2b3 WHIRLPOOL 2ff84c87619e2dea27886d1bf7e94753187e2f1b07c71b4b5ebbbaa3ead391c0d3a14431a67b3707ceda05d26b86598f1bfbe1beadb63285614e77b3e76102af -DIST genpatches-4.1-14.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd -DIST genpatches-4.2-1.base.tar.xz 3836 SHA256 c89ed0e0b4cf32d16023c4df67e047ee663fdd4bfe84375d373e594c787780c3 SHA512 8b028fdd8b93be92ed457c5722b584d4648220fd86440f3fead1a55ee254d4a4d808f09367929683a4bc58439aa274778aaa7f3ed0e14e3d8a5bb1b497a84644 WHIRLPOOL c1b6c8098339e72a248aabaff0e92d1e8fa5170a443b4beae62e3ec8c1235ba1bb7c1ae06a92b0041ef63c8c463a01f62313bed0f66d66e5d7d7721b4b3f0b49 -DIST genpatches-4.2-1.experimental.tar.xz 161668 SHA256 ff7f476b7b75be0779195dd1d7d01ab326b572def562b2741353751d59d43724 SHA512 ec2483b0df034d1d28a0bfc26395fe10fa7a1358f2fbc68d8d0217d3a1e3176bc15ef41c268d3b18b362198a85b44dcb59dfb6aac544e262407516103e9e8a90 WHIRLPOOL fd66c1f678937efe852a68473eb9e8635ed2f24068cb8720466dc76abac32bb1d9e3eacc1f70b92d4b02402e6ec5af3a5639fff1e30f4c435a4dbf384110d25d -DIST genpatches-4.2-1.extras.tar.xz 16180 SHA256 a26b453b708e1463b361fa7d49c4ef3e7c4ebcc5d6ae2dfafa1e966d5cf78608 SHA512 cf3dcd49dea36cdc30be17bdbcb929263310bff7907bebc5aa884511b50abcde5d68815013b038fa542f86c3ee2f9d86094b28bc2481261de26e2c8e4f08779c WHIRLPOOL 9e8b6e5977ff574d2b15df42dd05eb77e57306df8135a263226a6924426b08920b31bcc78235e3e974c0bc6f820652abab7eef03694f67cfebb80570d6158d95 -DIST genpatches-4.2-2.base.tar.xz 4384 SHA256 f38d37d15378eecca3e1d74d7dca66ba2200d66e87b7f5a68f716cbb61faf5f1 SHA512 9c754e1bf9cc39635f98a9ac5656c030612d72e0f4d4680b6f619a176e660e3c90594fbe0d9759abb5c9402e4649bd1fcd3e3f55b7d132d1b3d0277e17c65ffc WHIRLPOOL 05df0d6ed05927ee2f6f7b86091f9c10cc932250ecbd12064a46a590943d6d4d0dee4e57d3ba07a4f75fc939f6f14feee5177447bed63349f1b9ef8f109617d6 -DIST genpatches-4.2-2.experimental.tar.xz 161712 SHA256 760c2851a96a385298edc817e873a51ec46edb63e9a6a1361912c5f28fb0a371 SHA512 0b1fa56cb667f0c073ea622aa195ac7784c6ace7a0f1fe09a402e8dc9e11a5cc737a2695eaa41e409972beb6ad71353be87b5f2e771bb464e026a20ea3103c95 WHIRLPOOL 468bd993e750ceafe0115ac9a06d49f9f97add5c9bd11e3343b2319bc8bbf9f0cf988b6afcbeab0bf3f00299405b44347d46c2a4e35869eb03ae951a9a967743 -DIST genpatches-4.2-2.extras.tar.xz 16168 SHA256 be4078adaac6d679a563709dc7528b92587a463877c28d7c49117b5ddd842fe1 SHA512 9a561564511e3a15648f88f1b230e8985e33b3dac92a082cd8d4a5ccf0da8f8eb030fde59f6a0c5664c478751f710e2f2f8f3cf4b13293329444ed702c70732c WHIRLPOOL 46a021f1801aae12167bfb5378ee62cb058a13b18d48c006b9e7fc4a086803c8c509070cee059c5eb817abec317285f7e1157f6f286ed53a4ce7ad761c7d2e36 -DIST genpatches-4.2-3.base.tar.xz 44600 SHA256 ba1a0d8d9e1a139da388d44085a1011d760231467cef4ea9a87633673560e3dc SHA512 60367b50a40c60e6659cf11db99d4124b86fd7afa1bb8e5c3aac38b3025015f56f880e34250d1267ec4f295da38f656708ed2c6b46aa5b56f72503ed34b0e8c3 WHIRLPOOL 6dc72908e0ea0b4084d919f1049169fbe98153f85ae1bc87f3c3eef061b3cbefd427d87fef541299cf0bc48faea79b4a39e5dfb94dfdeedb4be7f53248ff3f9f -DIST genpatches-4.2-3.experimental.tar.xz 216620 SHA256 b038447b1d8129229469dfa3898b42374233ee00c65ea4728abaf632657f431d SHA512 17c13d9669596a34a85a844e38886099ff717248183104e3b02c438de4f1916886afea9db985b5c56170917901611331ef5038777eed2a4019811f98a75d399c WHIRLPOOL 9547278a329049d20a73e31e6bd5d6bf0270a2b3c7c02ce51163f4f91da18d74820f782e2c7ff66cd1e7f4075e088013def679568043d800c89c601a1cc4cce2 -DIST genpatches-4.2-3.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3 -DIST genpatches-4.2-5.base.tar.xz 87104 SHA256 e05455d88ad940a71a73dab090900d76c03b858d3e59aa0479b546be0efe6b67 SHA512 7689caf2bcc558ae2f3857bc0ae152e664b00e440da27aa11ee5c4a4f09b73deb967e7703b93d7d640fccd4f867691145f567944d9dcd5ec5f4a626ac255f603 WHIRLPOOL d963fd0e5e14960ddcbcec98253446d6ed0b70fb4a0f3506346547a4d60a5a18ba628e88b809371bc7b545fa4ef37de6503545295b770c78a46d231dc6e34b59 -DIST genpatches-4.2-5.experimental.tar.xz 216004 SHA256 33b4a2fec7233a19ec0b95f02104ee5871cc3b2f9fa172e04d608153cd706228 SHA512 0d745905c5dec9ec479e2b7a8bace60941eb9f2c8bfa8d7ffae2ee697e11a6ff3482b1eb934b14a458c534f58a94773cd6dc419e89b120e81da54e0ccbb46307 WHIRLPOOL dff64ad62e3c555a65963ca42f1b2803e663c927eb2394ba3b3d2fa21c0937ddc9bac694295b6ef22d3b0b070b985d2b2088a11632ac432d1e59d08509128502 -DIST genpatches-4.2-5.extras.tar.xz 16184 SHA256 39b8e65faed938ba3002c6113815f65a73ed2270a0b7f323a051780ee5728e69 SHA512 6745ce29d2f2398d8acfdd9b0171f117c078acd16b77dd041c8c02e51e3b387e669e2e10903dc72b6814ccd78c7e087fbd681325f598c2a1d7bf7acf8c9b434b WHIRLPOOL 4cec746f0dd4f6843d16f8e2dcd35466bb8847197497ebdfd47a86d335c3fedf148c08d01a3cf0e0c13e4d812c6585dcf5bd137476bb9ead0fb3ea28f84bc709 -DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f -DIST genpatches-4.2-6.experimental.tar.xz 216008 SHA256 ce3ab8bec66d7e9bcf1ecd6f6e9925f8863869e09073cb76e6f4e1d9b6b65eb5 SHA512 1dec060dab9c942b154ea468e0cebae16a5a63844be3576a1300a1263e1b38e45b230faa2dabe020c0c32431b4c2025b38dd8fe866eef102359d81a3fd23f66f WHIRLPOOL 53396343aad281e3cdf36dbe4c0714723688b7e6a9938b8a8efdb1d6cf447e075f7d6cf503b5cef922f2a03ee2d85661011d0fba68c5a4a66853862bc5e1f378 -DIST genpatches-4.2-6.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd +DIST genpatches-4.1-16.base.tar.xz 390916 SHA256 c36edc8f56a26e0ae74fa28e9a50d02d8196f5d29447d6d2cdbf17ad71f70902 SHA512 981c4589a2f448a8c58276590eae9db25e716e0df584f4e431e7d29e69714695078112e30b84179038879071dcb94adb0753a94bcc3cf3e4c3a676244543f0aa WHIRLPOOL 6f3bf0ec325a1d7363315fd7828da31901916c497cbb8adb212e515ee7fae1179f276116f9e484fb23f2200e2fa61ad315baa8de1c073c5412dd1ff3ce624cf9 +DIST genpatches-4.1-16.experimental.tar.xz 215996 SHA256 0840ccdcad7c4b03cd4fd54940e3ca31d0d738184abe1c9340d5d0f9c3943009 SHA512 95b8bc22413b24627ac1906830a345689c7e98a77beb1405e9a6c5b97f48c4fa7dbd15a2ffe66f24ef9dd8617a83a4913a26acbcb387f4a0add6d5f37c3343a9 WHIRLPOOL b19fbda05c354c17df10a8fe3e482798926e6631c5b5f96685e2d99cc016f10c37fbe5aef633c8a77bc427d045b02390815469f5aa2850dd76d5cb374a916cc0 +DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6 DIST genpatches-4.2-7.base.tar.xz 177852 SHA256 7f7528ef582219a6d5aee348b09c8523f7b6d5b80eed2d7c6d0a804dffb11440 SHA512 657a7316aaf139820898f0136f5eb0011d38a439f55257567c70074f65f78ab67b316132fa0cf3a19990c8decc49ebf13ed8b4be4788df66e51dd45ac307da31 WHIRLPOOL a6cb9ab193d124f524e84ec427bcd397cc8ac0327743f8ad69d5b61b2d91c4187eefdcc3c48aacae28f10553fb19eec82a48f988eba22845c658159d9f529d0a DIST genpatches-4.2-7.experimental.tar.xz 215956 SHA256 be585b9619c5828dca83243f5a3f74c7b5cd7bf775164c89a3eed808665795b5 SHA512 f555c5f870683de39c268ec7b5444340e1eeaadd2b48dc727c4bcc1a06a77643c9d058feb4d41276e0119132ea3c4fd09bb8b3171508fa48cd1a64643cfc6d5d WHIRLPOOL 02860073cf626b8c98e3aaa7df9c7138c8fec8387d58f6781d450c6f671dadf1ca8b329ca8768f9187a155b1fd7dd6a570de75d96973ee42e13e9a6fc0f2762b DIST genpatches-4.2-7.extras.tar.xz 16180 SHA256 2a280c94254b721cacb423e683593fc800fd645fe54dc568b845cf02887932b9 SHA512 9af37fd4762c658001b2726534c0bbedf033d29a76017ee53d2ded37282bcb709bb4b33864fd0fb69e107955c98cc37cd82cfe0dab1cdff1ea88f68f87aa2ed9 WHIRLPOOL 2c516cdf55f6dcb613e873a69c968c0b2e18f779baf7f12d0bdc77de09c17205819b014772d10dd25bd1cf1feb1fb3397561b520c6b8261649407663095f2e42 +DIST genpatches-4.2-8.base.tar.xz 191276 SHA256 395dc09c285606e830be9b002eec8968394ec2ac67eaec6673c0703196e708d8 SHA512 216d8c9be1c3ed1fcc612e3739bf7186e996b6fca8ce3d08be4ea9da16f7d4f63a01d6e8606a83d2743f94ffe1640da9f2c1d588fddab51e0f25b090141a353d WHIRLPOOL fdb58098517642e5ec075218b612f765b559b6c850bfd678d3eb7fb0479bd175c6eb01896e552525eb6025a93e72ce204fa57c77f96a028ac0f93bc0c59d13c0 +DIST genpatches-4.2-8.experimental.tar.xz 216032 SHA256 53f431427f4deb72e5495159f8f56902a5470b0f230ab549cd6a21380d757ffd SHA512 3c8233427efa0c181ddc8044d7d5ce3ad914b7df84381af8816b75545d8512777c786710422dfb1006277dd0e5fd69a18404e2d83cd361431853e3f900906db1 WHIRLPOOL eaa9d7697a391f90bcd04293545adbc21cff4c5ae82ee96e00c2cae12720ea9d9679c75988bf24f2eb9ca4f7e9aaa2bee36d3f7208edaa84fc1236a55b418bc9 +DIST genpatches-4.2-8.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6 +DIST genpatches-4.3-1.base.tar.xz 3464 SHA256 7a4fa6450f306844cbe767c69e0f26cd9363803840e5147c27bc78fa1b20d739 SHA512 a37d673a6daf0956cd5a9284c1772112b726187b2e83293cf1c41b64988eeb3ed27be41394fa18b9ce2dc2c2f07a974f39d74a0d9de406d76d5c8e960bafbe94 WHIRLPOOL 95289c547af7c6ef0c2bf2af323782044c45191b1055e032aeff2652ee2d51779abcb2caea23634dbeaf375397ca4b9ec6b4bb11e3074cac37787b047db0e958 +DIST genpatches-4.3-1.experimental.tar.xz 4904 SHA256 e36a9856c8bef942c21f8211a23b54522cd270e98e7bb3facdd562f19e579a0a SHA512 1690d38ebdd12d9593931b6fe7467cfb3cbe160a65c955fa82fccce2a9f57b6818efb39ef01ce97274aa6c8d0596c2d651f293b67abba5556fba7c7495658cd1 WHIRLPOOL 42414daeecba5d9cbc1fe46a3e438c3ef82ebae317a38c9d8b78ad723376550dbf3b83b102a9a0f7f893ed624a62bfeb80a49566bf13803805ae3dd3050e5afe +DIST genpatches-4.3-1.extras.tar.xz 16288 SHA256 41cf40be254f6204a0dcfbb0051309bf506a9306e6c637058fc23dbecbe37c00 SHA512 6cedca7ab7e3971751077dbebb84d6cdd711600db7ea19a6e110ebc71a6281dc9db3d195b6f4e553bafd74d3dd1a252308c85e13de76879e3b6becd1b64ad2ff WHIRLPOOL 129068f0912b07e64b8087e90a4f8758673f89f61d9d6ff69962168ad183efe27f9a657bcac85e44db62ee690b86eadc131282200e9d657b47402b3bbc95b96b DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41 @@ -117,3 +48,4 @@ DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019 DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8 DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0 +DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935 diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.87.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.87.ebuild deleted file mode 100644 index f01aae8265b9..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.87.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="92" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.88.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.88.ebuild deleted file mode 100644 index ecb65c6be92d..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.88.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="93" -K_DEBLOB_AVAILABLE="0" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.89.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.89.ebuild deleted file mode 100644 index f192e4d19ee4..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.89.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="94" -K_DEBLOB_AVAILABLE="0" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.90.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.90.ebuild deleted file mode 100644 index 0f933457bcba..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.90.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="95" -K_DEBLOB_AVAILABLE="0" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.91.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.91.ebuild deleted file mode 100644 index 50c9d496a76b..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.91.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="96" -K_DEBLOB_AVAILABLE="0" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.82.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.92.ebuild index 78a04a700d95..28b1e89d4a99 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.82.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-3.10.92.ebuild @@ -5,15 +5,15 @@ EAPI="5" ETYPE="sources" K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="88" -K_DEBLOB_AVAILABLE="1" +K_GENPATCHES_VER="97" +K_DEBLOB_AVAILABLE="0" inherit kernel-2 detect_version detect_arch KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" +IUSE="experimental" DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.44.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.44.ebuild deleted file mode 100644 index 0101b257c60a..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.44.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="43" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.47.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.47.ebuild deleted file mode 100644 index 27c347fa8c5c..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.47.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="44" -K_DEBLOB_AVAILABLE="0" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.48.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.48.ebuild deleted file mode 100644 index ed85821dfa7b..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.48.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="45" -K_DEBLOB_AVAILABLE="0" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.49.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.49.ebuild index 8146df2ad268..cd170b0d27ee 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.49.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-3.12.49.ebuild @@ -11,9 +11,9 @@ inherit kernel-2 detect_version detect_arch -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" +IUSE="experimental" DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.51.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.51.ebuild deleted file mode 100644 index 00ccf4fafa2f..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.51.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="57" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.52.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.52.ebuild deleted file mode 100644 index d3b5b4b36fd6..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.52.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="58" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.53.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.53.ebuild deleted file mode 100644 index 39fc51445c89..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.53.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="59" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.54.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.54.ebuild deleted file mode 100644 index 184456b7c5da..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.54.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="60" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.55.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.55.ebuild deleted file mode 100644 index 5192001958e5..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.55.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="61" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.48.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.56.ebuild index 5f89b953a839..10ae47f390a5 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.48.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-3.14.56.ebuild @@ -5,15 +5,15 @@ EAPI="5" ETYPE="sources" K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="54" -K_DEBLOB_AVAILABLE="1" +K_GENPATCHES_VER="62" +K_DEBLOB_AVAILABLE="0" inherit kernel-2 detect_version detect_arch KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" +IUSE="experimental" DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.23.ebuild index 1729de9c9972..f756341928bd 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.2.1.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-3.18.23.ebuild @@ -5,17 +5,15 @@ EAPI="5" ETYPE="sources" K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="3" -K_DEBLOB_AVAILABLE="0" -K_KDBUS_AVAILABLE="1" - +K_GENPATCHES_VER="23" +K_DEBLOB_AVAILABLE="1" inherit kernel-2 detect_version detect_arch KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" +IUSE="deblob experimental" DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.4.107.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.4.107.ebuild deleted file mode 100644 index 4e84124e45f1..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.4.107.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="90" -K_DEBLOB_AVAILABLE="0" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.4.108.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.4.108.ebuild deleted file mode 100644 index 502a8f23e9ba..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.4.108.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="91" -K_DEBLOB_AVAILABLE="0" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.4.109.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.4.109.ebuild deleted file mode 100644 index 241d575f9e7c..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.4.109.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="92" -K_DEBLOB_AVAILABLE="0" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild deleted file mode 100644 index 9e630c18884e..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="7" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="alpha amd64 arm ~arm64 -hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="deblob experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.0.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.0.9.ebuild index faa87bbbec09..899f58628f37 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.0.9.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.0.9.ebuild @@ -11,7 +11,7 @@ inherit kernel-2 detect_version detect_arch -KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm ~arm64 -hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" IUSE="deblob experimental" diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.12.ebuild index 59e15edded96..05bbf8524a46 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.1.6.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.1.12.ebuild @@ -5,7 +5,7 @@ EAPI="5" ETYPE="sources" K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="10" +K_GENPATCHES_VER="16" K_DEBLOB_AVAILABLE="0" K_KDBUS_AVAILABLE="1" diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.7.ebuild deleted file mode 100644 index 1738cd3a40f5..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.1.7.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="11" -K_DEBLOB_AVAILABLE="0" -K_KDBUS_AVAILABLE="1" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.8.ebuild deleted file mode 100644 index ed32522c2143..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.1.8.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="12" -K_DEBLOB_AVAILABLE="0" -K_KDBUS_AVAILABLE="1" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.9-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.9-r1.ebuild deleted file mode 100644 index 31dff263ad43..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.1.9-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="14" -K_DEBLOB_AVAILABLE="0" -K_KDBUS_AVAILABLE="1" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.2.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.2.2.ebuild deleted file mode 100644 index d4101ec35f36..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.2.2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="5" -K_DEBLOB_AVAILABLE="0" -K_KDBUS_AVAILABLE="1" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.2.3.ebuild deleted file mode 100644 index b52a6667b6c4..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.2.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="6" -K_DEBLOB_AVAILABLE="0" -K_KDBUS_AVAILABLE="1" - -inherit kernel-2 -detect_version -detect_arch - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" -IUSE="experimental" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.0-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.2.5.ebuild index a6b9217ffcf6..ec701fcbaca9 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.2.0-r1.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.2.5.ebuild @@ -5,7 +5,7 @@ EAPI="5" ETYPE="sources" K_WANT_GENPATCHES="base extras experimental" -K_GENPATCHES_VER="2" +K_GENPATCHES_VER="8" K_DEBLOB_AVAILABLE="0" K_KDBUS_AVAILABLE="1" diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.3.0.ebuild index 749b11c14eb6..89354dac4d1f 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.2.0.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.3.0.ebuild @@ -7,7 +7,7 @@ ETYPE="sources" K_WANT_GENPATCHES="base extras experimental" K_GENPATCHES_VER="1" K_DEBLOB_AVAILABLE="0" -K_KDBUS_AVAILABLE="1" +K_KDBUS_AVAILABLE="0" inherit kernel-2 detect_version diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest index 2b136b7e99ac..ab1a33926655 100644 --- a/sys-kernel/git-sources/Manifest +++ b/sys-kernel/git-sources/Manifest @@ -5,3 +5,4 @@ DIST patch-4.3-rc3.xz 6370684 SHA256 5fb1f48e05e7523223498dcb319cfbdb5de8211713f DIST patch-4.3-rc4.xz 6415156 SHA256 8ca3c9cefc9fff22ebe8cd8dba1100fa053ecc2d6197156bf3fe6aeca1570e97 SHA512 dfc14556e14a0b3ac786b189ede36e79b71ab8711cf635b0be5793d293447d7e45e59dfeed562a3295149a7a23cb03ee6713e35d511a8285d21b7a65e758e356 WHIRLPOOL 4251e94d6c31f530bd577cdbdd21f5c79f99a5a3ee124d36bbe347766e380e79e3f5e5585787bf8a808de4c964c799ca2a7f6af853941f0ac50599566fd563b7 DIST patch-4.3-rc5.xz 6432572 SHA256 b77ae187707167ac73363ca9ef34dd38552ff0a08d5dc0467460a16bd41582c6 SHA512 c07c4cd33a3cebb616a35d1aab69d70d046c60f82e317fe2ead733e632ef22e93a39e5181dc3f6261665cc0ec80535246b47e7d37fcb46dc4891efe8bbed4258 WHIRLPOOL 7de2dc159da2ee66e2438bd0744210586596e7f6565a97bc61cd0c975e389c23036b206f394404999f985a4393f4d5d5e453933f5a2962e0f9500c0efa4004db DIST patch-4.3-rc6.xz 6446876 SHA256 622b65bb48d11caa34b599f1f89ed9eb5559b8c2dc186b6cf984e30ec0a6f4a3 SHA512 e6d3b571676afa8a8ede771d999dfb096dc6693dcee86130570f71eee1ee781ff8e4aaab3e361320de82f121604b7faddc4446b160fa8bbb6eb592ee54ea95c3 WHIRLPOOL 6f291f2cbf88e9093c662265ebdcb8b93ae9ea34136a692f92d4adb48056c9d5426b8bb9c978a1938b88b483fd640aa4055f6727009fd1ef903e1567dcebc95b +DIST patch-4.3-rc7.xz 6478080 SHA256 19e4a01d995d90aac99ced702bfc99b2bf8a21fd657dd70974698f2b6a799918 SHA512 4c923c39d3b5614751be879bd17928c2cf4ccf7c63dbfba1b221fc3fe645cd8ecb7a4b84867666ea6c65ef7105264a82cf376b562acdafde3f8e054b849d3b84 WHIRLPOOL 9000e288f7ed90d6bcf8c7b96d744fe03b7bc5f371b76b8ab43eb0d3bb5e03d02b9cb1844b9c84811d4a2add3a00cc0b1631ed4142064ced57d92831bc25fcab diff --git a/sys-kernel/git-sources/git-sources-4.3_rc7.ebuild b/sys-kernel/git-sources/git-sources-4.3_rc7.ebuild new file mode 100644 index 000000000000..13457dbf08c4 --- /dev/null +++ b/sys-kernel/git-sources/git-sources-4.3_rc7.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +UNIPATCH_STRICTORDER="yes" +K_NOUSENAME="yes" +K_NOSETEXTRAVERSION="yes" +K_NOUSEPR="yes" +K_SECURITY_UNSUPPORTED="yes" +K_BASE_VER="4.2" +ETYPE="sources" +CKV="${PVR/-r/-git}" + +# only use this if it's not an _rc/_pre release +[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}" +inherit kernel-2 +detect_version + +DESCRIPTION="The very latest -git version of the Linux kernel" +HOMEPAGE="https://www.kernel.org" +SRC_URI="${KERNEL_URI}" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" + +K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and +experimental nature. If you have any issues, try a matching vanilla-sources +ebuild -- if the problem is not there, please contact the upstream kernel +developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to +report the problem so it can be fixed in time for the next kernel release." + +RDEPEND="" +DEPEND="${RDEPEND} + >=sys-devel/patch-2.7.4" + +pkg_postinst() { + postinst_sources +} diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest index 98bf69756ed7..5525405e3050 100644 --- a/sys-kernel/hardened-sources/Manifest +++ b/sys-kernel/hardened-sources/Manifest @@ -3,10 +3,8 @@ DIST deblob-4.2 134706 SHA256 fc6f631436d0a8ce8ef338a6ff5e612cd1bec679386f7129e7 DIST deblob-check-4.1 674781 SHA256 54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33 WHIRLPOOL d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0 DIST deblob-check-4.2 681496 SHA256 8b72723b3f5c651ba45017f557372dd25a43a1ce1b9ba622948399c20a5c318f SHA512 63e86dc0a4e676b4d0d4497d275e9885bda57ee63453a4e9e08fa4327f51b10b80da70d3f1d688e7c447632b31a388eed98470d88f88f60b50c0d53f4803cd94 WHIRLPOOL 4ad1b38354e7ed7e5c82f348956bda5cfa704b21e6f395a3b53a7ae61806c9df593ee9e560d4ad60d1501f6c5381dc6d79194b4aed6810908616e795fc757fc9 DIST genpatches-4.1-11.base.tar.xz 233284 SHA256 4189cfd2c7d1a1d7f28c8a596ad36741ce087c7c4cfbe0d5d20a0ee889328d18 SHA512 e5944edf832070d6072ab8efc242165afcfb689874687196c96389c6176ca9772e72e82836aba40ad05840536acae6efd6e72890efd692d903018d47489a90f8 WHIRLPOOL 13cb400b330443025f77dee6c710ca9886991a7032fa3ff925d53ed4fc03d07ece5647dca65de1a149073362db1d7a0b374a21d980eafcae09a4b01584c64cb6 -DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f +DIST genpatches-4.2-8.base.tar.xz 191276 SHA256 395dc09c285606e830be9b002eec8968394ec2ac67eaec6673c0703196e708d8 SHA512 216d8c9be1c3ed1fcc612e3739bf7186e996b6fca8ce3d08be4ea9da16f7d4f63a01d6e8606a83d2743f94ffe1640da9f2c1d588fddab51e0f25b090141a353d WHIRLPOOL fdb58098517642e5ec075218b612f765b559b6c850bfd678d3eb7fb0479bd175c6eb01896e552525eb6025a93e72ce204fa57c77f96a028ac0f93bc0c59d13c0 DIST hardened-patches-4.1.7-2.extras.tar.bz2 1419438 SHA256 c8c0fc29c39eafbcea107b8237087fd0e185297e2df9ffeaafc6b3a4736b7a45 SHA512 dac324e265174777d8b9c2369f57e52833b4228b3291e41952a9791ce41b9abf378e1d9a0521566c3a0e42de15a16afa5fe379985b7fee78b1b2b3b815d7cdd4 WHIRLPOOL 7638001f1b95e4af1d051b13648f486aa0eca524157e1a46dd2023fbd86313e0a5e8043653d7388b7286d42cc6e7c0f07cde2de3d5aee6cc058d12538a0980c1 -DIST hardened-patches-4.2.3-4.extras.tar.bz2 1464525 SHA256 476824e9cf3bab15d52b522569b70aa6eb9819120eb098fbd164e6fc54d2227c SHA512 ac7e67165ff6d1711927268f36a0ce2d5f65099a67b38491cb28f19f306c87c2412eed5db202500d633a21ca6c530ea7c9e14fa4d690dbbfd39db3d802860a35 WHIRLPOOL 0fabf287f54293832bb1d60b72d9adaa5c61c78655d8e6944b9e76e337966bdbe957643f94e0ef6bc45f46fec9b55deddfbc905a951097d2c8362be3e205b7f7 -DIST hardened-patches-4.2.3-7.extras.tar.bz2 1614579 SHA256 b458ab1d642052d93bf95e603757e862b471e0cd6f85ca805ba154a305be8bd8 SHA512 c5a4fc722d1aea57d8b67729881825e4537815475eb1d3dde46edd0159e53c83e0f0dced6245ff877f55980cd599c155fd6475ae5333e21a3d2229ef0dec4116 WHIRLPOOL 815abd3267b1f02e053cb9eec1d6da5b11435398e08a516f8be3e253916ebb7011669bd8436bbd5dcf885b77c606293a1f0c9dda8c54f0a0f712a357f36cada1 -DIST hardened-patches-4.2.4-1.extras.tar.bz2 1694154 SHA256 38353677c3bd46c513996cf79a8f3fe6adbe7a931e29923fda80c0e06bbb51f9 SHA512 2036d72c6f2f2e63beaa4ac580e5d564b4fe68d3527758dc27f729a20ef21f4d2a40711623f15685956d7d105499f185f7cf31e60c778d7aa70e16c976f8beb1 WHIRLPOOL 325370b7fa5c1787bd7385b3f1340c924f6065037c0a4d42c91b26f4ae3f6c7be3bad341b299501b49a9cfaf09db0d3e05c936ff3ed936dfde2416de0c657e5f +DIST hardened-patches-4.2.5-2.extras.tar.bz2 1610883 SHA256 0204a7e8774e28992e8ecb1d2209e5628a7188a79936c941fe172c29b6b39a21 SHA512 b529924c08441e6a2142046de3d0fb843d0c0b03f53f73b9309522b33b30bd6e036b90e3d0ae46adf09a5d3901216c76b0a32a219e57a41cb0b3d1b00125f9b9 WHIRLPOOL 89db72fb3b289f53a67fbd4050d96acf1c9fdd00b58fd9d62121bce81d8602523bf58dfff98ef4409b86a6c8ea4db14c98ed54c8602b26fa490ca044d9409379 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8 DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0 diff --git a/sys-kernel/hardened-sources/hardened-sources-4.2.3-r3.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.2.3-r3.ebuild deleted file mode 100644 index 821789304a1e..000000000000 --- a/sys-kernel/hardened-sources/hardened-sources-4.2.3-r3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -ETYPE="sources" -K_WANT_GENPATCHES="base" -K_GENPATCHES_VER="6" -K_DEBLOB_AVAILABLE="1" - -inherit kernel-2 -detect_version - -HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-4" -HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2" -SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2" -UNIPATCH_EXCLUDE=" - 1500_XATTR_USER_PREFIX.patch - 2900_dev-root-proc-mount-fix.patch" - -DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})" -HOMEPAGE="http://www.gentoo.org/proj/en/hardened/" -IUSE="deblob" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND=">=sys-devel/gcc-4.5" - -pkg_postinst() { - kernel-2_pkg_postinst - - local GRADM_COMPAT="sys-apps/gradm-3.1*" - - ewarn - ewarn "Users of grsecurity's RBAC system must ensure they are using" - ewarn "${GRADM_COMPAT}, which is compatible with ${PF}." - ewarn "It is strongly recommended that the following command is issued" - ewarn "prior to booting a ${PF} kernel for the first time:" - ewarn - ewarn "emerge -na =${GRADM_COMPAT}" - ewarn -} diff --git a/sys-kernel/hardened-sources/hardened-sources-4.2.3-r5.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.2.3-r5.ebuild deleted file mode 100644 index 8406cf796098..000000000000 --- a/sys-kernel/hardened-sources/hardened-sources-4.2.3-r5.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -ETYPE="sources" -K_WANT_GENPATCHES="base" -K_GENPATCHES_VER="6" -K_DEBLOB_AVAILABLE="1" - -inherit kernel-2 -detect_version - -HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-7" -HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2" -SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2" -UNIPATCH_EXCLUDE=" - 1500_XATTR_USER_PREFIX.patch - 2900_dev-root-proc-mount-fix.patch" - -DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})" -HOMEPAGE="http://www.gentoo.org/proj/en/hardened/" -IUSE="deblob" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND=">=sys-devel/gcc-4.5" - -pkg_postinst() { - kernel-2_pkg_postinst - - local GRADM_COMPAT="sys-apps/gradm-3.1*" - - ewarn - ewarn "Users of grsecurity's RBAC system must ensure they are using" - ewarn "${GRADM_COMPAT}, which is compatible with ${PF}." - ewarn "It is strongly recommended that the following command is issued" - ewarn "prior to booting a ${PF} kernel for the first time:" - ewarn - ewarn "emerge -na =${GRADM_COMPAT}" - ewarn -} diff --git a/sys-kernel/hardened-sources/hardened-sources-4.2.4.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.2.5-r1.ebuild index bf12ce9c792b..04d434cfc4a2 100644 --- a/sys-kernel/hardened-sources/hardened-sources-4.2.4.ebuild +++ b/sys-kernel/hardened-sources/hardened-sources-4.2.5-r1.ebuild @@ -6,13 +6,13 @@ EAPI="5" ETYPE="sources" K_WANT_GENPATCHES="base" -K_GENPATCHES_VER="6" +K_GENPATCHES_VER="8" K_DEBLOB_AVAILABLE="1" inherit kernel-2 detect_version -HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1" +HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2" HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2" SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}" diff --git a/sys-kernel/linux-firmware/linux-firmware-20150812.ebuild b/sys-kernel/linux-firmware/linux-firmware-20150812.ebuild index c29fd58e5c3d..cfea282cde9f 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20150812.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20150812.ebuild @@ -9,10 +9,10 @@ if [[ ${PV} == 99999999* ]]; then inherit git-2 SRC_URI="" EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" - KEYWORDS="" + KEYWORDS="hppa ppc64 x86" else SRC_URI="mirror://gentoo/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86" fi DESCRIPTION="Linux firmware files" diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest index 7f8c6527a860..0b1945a6aa27 100644 --- a/sys-kernel/linux-headers/Manifest +++ b/sys-kernel/linux-headers/Manifest @@ -5,11 +5,13 @@ DIST gentoo-headers-3.19-1.tar.xz 3848 SHA256 f66fedf95b99130b3b43dababe40b22695 DIST gentoo-headers-4.0-2.tar.xz 5368 SHA256 ac090b3ced9f1a4b046795402ef919a756570b33f605a8a963af421d5a86af5e SHA512 2c7687c460bba24c8ed6e1df6f55ae79acbdc9f0f5b83074ec062226208fa0384b9660850ebe699bf72eeb8d44716f71115d802858bdf3147fa91c2f85eed85e WHIRLPOOL fcc530b2b973817cd5a16a34e26b1f817b67d622ab6cdcf0398ced6b73a6a626d7d1179b30895e2a33eb044d304fc98ed313e0353cf55fe4d791cd8959b202a8 DIST gentoo-headers-4.1-1.tar.xz 5616 SHA256 c66e0f023fb786ed4c041e0643e7a778bcc868528ee902b0228cf71986d30dbc SHA512 fa1ebc03e5a3a15b25e037d566ace812a451830c0a05454524e6e3021a6a77dd048ae79b85f2d2aeb4cff414f4bfabe93bfb42ec18a3a8a9c80ed7d6b5352832 WHIRLPOOL 93ecfac69c93500c5f2d3734d2a8a260821032a549b119bb554688ddc725b800e2c0c37612c2cc4f217452d0b2887dd1e1d2bb3f0a3774f3395a72a7cf307445 DIST gentoo-headers-4.2-1.tar.xz 5624 SHA256 1ec257e2cb9d79068d563868a08bfd13bdd0f4c053c368d97d7d40c24dece4f9 SHA512 a022f0af952956d330bc05f86868953de86a736395658bbedb91cd7db16401795a6f556978d1c1c5fc584479e00a042c43b90dd0d3f80e8c231fe980dfbfbdfe WHIRLPOOL c957b99005f5f16dafee216ec7afc293acb6cdc963b3f1ddadeeb8e1550afbe0b4188a038e80598fc1f1c67080a3db79aa77ba4c3f19afeb41cd17b8fe4c4dbb +DIST gentoo-headers-4.3-1.tar.xz 6336 SHA256 dbe99afe8b96b181f1b065b4d91969913eb23750c1fdf5c05f86667a314ca726 SHA512 55310299ccf6fc013b26b28df52740188ea68547617141af45a1278d0028c8db47e43e230f08fff399793e420028ed1602438a73bad6f4ffb6f3c43f9f28002d WHIRLPOOL a87198b9f868d913c14a2578c5cd452fd0f041576141fc8089d4a3eef0840929923d95de188fac8a6f1115d588f2a17dd51ddcaae90871131d39458c90afe956 DIST gentoo-headers-base-3.18.tar.xz 3776668 SHA256 12a44590e505525509556f6e973464f124f172565d3a4b29a3ff4627aa24f9a7 SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535 WHIRLPOOL 5cdd500aaac3589d6672ea365f5b29ccef207db36cbc34052f0bf1bbe35b5dbfedf3b1675079c1ec05daf1a136d2da3018b2ca91bcaeda1fe8d23e3246fda25e DIST gentoo-headers-base-3.19.tar.xz 3807516 SHA256 e614ab947a7d0bd5064c49aeaac43507a7a322c43fdcca9a0858855137193b1d SHA512 3ba9b5e442e53d82e5af7fced55b173cacc7edc99157eb430dad81f95d48594bc18a8d5f54cd15ba2221bad4098c7732b9ba24780fc0964ea34377933ba36333 WHIRLPOOL 6ca7f201272202e6e2bc1d36c6e62e47d85163546e317fee5e4e31af98722aa6de81c4c0c54635acd4386a515f28376517aa84eec7ae4cd17220fb549e5f51c1 DIST gentoo-headers-base-4.0.tar.xz 3815288 SHA256 96c4ff8acc80fe6c401e0452212cd49fec50c7eccceb5b1e79e9b3a70d309318 SHA512 42e158532181dd225009a4b564cbd1d7ae00485ec4a3d56ab7cd54b6816e171b6a6a9217b9db460ceb701b473a4082f1f4f9cd7a7da6fde2bba5591d95d03fc9 WHIRLPOOL 5a9d29237f1729109dee4b9990efa339b1e953e5663a2774dac17a463d8c7f5934f4a0627a7b46496fa2127e9d9b205f673a1b32c4c77bb5b849078a39a5db5c DIST gentoo-headers-base-4.1.tar.xz 3832284 SHA256 7abef9c950ebbc5da3f11c6b7883f1417ba429cd4d39aa7776c13c50f5c68e83 SHA512 e91ee80d31a0205f8d835931c39b4b4c085e338a3dddaf1fc179ae95a566148ba7b8a28e73e661700b834c7b2ca9b25e0a0645403d13330fd2fd887695898111 WHIRLPOOL 7cfb035b6d4cc330bce89d2025ee927758fcf20addbd8100503ccecd9e3b0be057603da96412cc1cc564698a6ffdf961a4a35f24b1a3bb822c8be1370a0751ae DIST gentoo-headers-base-4.2.tar.xz 3866404 SHA256 b0787b40c865988b2f934f60291c5cb0df861f6eadf747b1efb85add6fafd6cd SHA512 3f75ff4dcfed72f1b2e8c6833a8e84dadbf5085114c9704499a0e75022ebffb12881260567eda01a7f08c729c72c320e6cde165385b7e943d7b3d69d80621b89 WHIRLPOOL 40993e689b37645e92c121fba68546f7c3734ba5eab004ce48236ea487b886c5638f7b7d8a01d7b25669812658e0004f3dd39f6d45bc6359183248e15d82136c +DIST gentoo-headers-base-4.3.tar.xz 3892104 SHA256 5add8ce264a85ced6222060d962c079821bb15b4dc015091425f609fd8db4629 SHA512 fed69490e15b2add489fe55225b98641135d4d7f10b4a8fa716ab039c79e74172168b90a4c3c154bbac14abddbde1dfb901e35527a76c898afba32a2d76b6f48 WHIRLPOOL b1193f24ae4a31c12e5fcddfb62ce73d1434e18048a6ae67dbeb4e0bb6b514c7350faaafe6d9b5ecd4cdd43468ec88e1ba8109da6f1eb83c26a9d1e360bff565 DIST linux-2.4.33.tar.xz 25725956 SHA256 f5e58cc4b85cfc84accb284b9b65eec24ba637d6bacddc734948a8ca3ca75d4b SHA512 cc5b6ba5824471a81b80e973378a706882b10951ff4ff6c888e849fb5efff88cce20d2265ba5c8161605cbf87d1759851f9e4703720dd0ac339ec129985d4b0e WHIRLPOOL 7389d6adbaed5731d4f58fa6e1c3e58c65b326329c91a40ab75d50d8c5dc3c18f04aa90d30ff04bd9db90ed94079cd7efcef600bb4e000595446722bdfbf642d DIST linux-2.4.36.tar.xz 25535188 SHA256 7850a814e5be336214b9e4b68cfcf3d03c8061b4d7b9926aac65b968435fcfbd SHA512 e203ceebf97bd4228bb680ded39d6ebc801dd77eb82bafc63802e548849f5922b5c80462ba7e0564c04d40cc777414c2cefe57d3c0024b811277d6c2dddd38d2 WHIRLPOOL ba1452d09e97a52ff2b9003a46680beba399ac6d77f690c1b19c262903018f7933b8d048106a2cd1a626c1293e4a515651ca2608365f73d14befc8faf45f7090 DIST patch-2.4.33.3.xz 5796 SHA256 89fe1dbf5cb9513b73f9825328765c342f6054186f0b41c08b8612a6a4ad7a90 SHA512 9f6b9118f4888b34b7b20ba0d6c9ffaba547dea0f7cc93019117ad94411d9008e5513367e7da23a19e347f63ef823a493972850edd69b140d528454fa65124c9 WHIRLPOOL 75a06efb368fe5268fc0e6a625a4144dacf0e4ad3d4b6a4128e6e483dd809d294f406d96314b60138365d35397799f3d2c507f3e4eefdce17f7732eac565e55f diff --git a/sys-kernel/linux-headers/linux-headers-4.3.ebuild b/sys-kernel/linux-headers/linux-headers-4.3.ebuild new file mode 100644 index 000000000000..f0e395419fbc --- /dev/null +++ b/sys-kernel/linux-headers/linux-headers-4.3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +ETYPE="headers" +H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa" +inherit kernel-2 +detect_version + +PATCH_VER="1" +SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz + ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" + +DEPEND="app-arch/xz-utils + dev-lang/perl" +RDEPEND="!!media-sound/alsa-headers" + +S=${WORKDIR}/gentoo-headers-base-${PV} + +src_unpack() { + unpack ${A} +} + +src_prepare() { + [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV} +} + +src_install() { + kernel-2_src_install + + # hrm, build system sucks + find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete + find "${ED}" -depth -type d -delete 2>/dev/null +} + +src_test() { + # Make sure no uapi/ include paths are used by accident. + egrep -r \ + -e '# *include.*["<]uapi/' \ + "${D}" && die "#include uapi/xxx detected" + + einfo "Possible unescaped attribute/type usage" + egrep -r \ + -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \ + -e '\<([us](8|16|32|64))\>' \ + . + + einfo "Missing linux/types.h include" + egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h + + emake ARCH=$(tc-arch-kernel) headers_check +} diff --git a/sys-kernel/tuxonice-sources/Manifest b/sys-kernel/tuxonice-sources/Manifest index 0658f3382a3f..8ca117d19424 100644 --- a/sys-kernel/tuxonice-sources/Manifest +++ b/sys-kernel/tuxonice-sources/Manifest @@ -4,28 +4,42 @@ DIST genpatches-3.10-93.extras.tar.xz 17836 SHA256 d879d631a860c5d88b8c796ee0520 DIST genpatches-3.10-95.base.tar.xz 1284756 SHA256 aef21ca9662ab60728b05f028346cdbc7fc9ed0d07ad7e9c8f5d8d341242859a SHA512 308c97eb8f196e136cbdca5ee22fd9538048b0c7b5b3a75ee465be95f77046bac24fadeb78f4181b58f8c441a220a1d77c95ac281ba2dfcce047274475353a1e WHIRLPOOL dcc971cad6eefb922aa2479f9461817ec881666971bfadeec8f61ea724939a89a3a8379ce2b440f7993eeb40ad369d5fe2be9bc7a1d2ee4a5b842458cb65aa82 DIST genpatches-3.10-95.experimental.tar.xz 60180 SHA256 480f41bd269bfa73cdf1ce325d5723fa1e4c0cdf5fd81f3b39de388d73df4e37 SHA512 3fe8eb14736ba06247f9eee9b17493e4099054f2d9608b80d22b25f7e6e2dbb480bccfd78447ec699f46236cb1ff079aa5b50cdc81ba261174783f06a569d7cb WHIRLPOOL fb94803708fd183c045764bf317a2cb5acbd5e6d28b279d2909b166cd7136b7d126374afe497968e97c3aa76b35310c9e7f1705f1465e17cd9ecd7188fe0ce00 DIST genpatches-3.10-95.extras.tar.xz 17840 SHA256 ad5b28336aabad8e933d7ceffdbfe6c5f420ebaa299f541e41ee17e945cdb082 SHA512 59abf2f8445f4c40b0f29dee7ef5be45ffe18923b6d168506ca6211ed4c2fbb344240305052f253c86d6d48bef1cf5b076e676192158b7bf05b98590cc4ea80a WHIRLPOOL d6c34e0eb46c66400337c96bf015f321867265055337ac7f9cb32b5777df3807ad5adc219bc621a8f5d30c16c5695da83869796fbb934020aa5f6dedac6f638d +DIST genpatches-3.10-97.base.tar.xz 1299308 SHA256 d5407d2f91744519c407e1f74773e1861cf1ce46d82d5c0353333035a86e8189 SHA512 2a91d0772002a079691ba1c0810fd3ac38e4b893a4da28c53b62bba790d402e36389275dbbc8df6d0bd76634cdfc319a6221da2a1bf07abf0657fc419084d141 WHIRLPOOL b2a5a758695fdd6fa78926cd3eff3f7d3b074fb0d3ac35a51393662d6724f0abc2fd21647096a8a0a9805bde706314d085169ff10d8999af73d55934d4b66359 +DIST genpatches-3.10-97.experimental.tar.xz 60148 SHA256 c0d7145c053c8165b8a0036c3d6d823300319ac7d7766d0c2c431b7f2f558a13 SHA512 b9d78f88ef57cd4ba43dec4b9dab1ea72c39947e1de5369060cb044b9d5eaa4ed81731d3f26280d5f7fb47d84c4c439c2024f870f5324bff09a32538fa15e072 WHIRLPOOL ca93d5351300ca4166b20021ed14c31ced9c9743fbdcc0b676a43c1853d3e868209fb747f31a0e1a9eb5f4dce8a9e3ae3299dfbb312a35e1459e268a8e300306 +DIST genpatches-3.10-97.extras.tar.xz 17832 SHA256 6eb6942f08071bd467bdb13218975f1670c385a21cfa41226454ea4b4f03036c SHA512 240549a6ea1d6f119a563de6676628d8c0a3207f7be685a8a7903a04d0bfce639d02858896b4dda95cf0fba48bb22d0feadbc176c5f00bbaebdd5edc68c0b87c WHIRLPOOL 19ff955983a322086feaeeecb3c664f13b6ee1faaecb6745bbff0e6f2acb1937ea7212cd23869146e0a5c59ca83370a61437b691fc5ba8224d2d2cc69cb70a39 DIST genpatches-3.12-44.base.tar.xz 1444756 SHA256 b7ee32a2439bfa7318b1b42ceb2590098a061fe0eff563ad84126a3f672699f8 SHA512 74c929166b1399b80e3b00ee7573f8808c9abdf401b9c9d2a20565f82ac70e176d05dfb2127a2baab87a244f9783603defb6f19a2ec36c9aeab109456c5d3a97 WHIRLPOOL 58924c96b06194c90f09cad60221488e28b74977ed2713d6e29736102a8e90f70e6c3f29094317c66d2f08a077c1b7c5d109dac195b79cdfcc220042e04b5021 DIST genpatches-3.12-44.experimental.tar.xz 46524 SHA256 58ecdc367450ffd0b6e7efecf0d98e292916fa92db079c46c27308e4b76f8e83 SHA512 61611fec8d4b9b25c7f9538f29d332b550ac47c708beb3083459c1b519d8198fa40091fccee529c1819dea3186104006264ca34ba2d9cd755302ea4394a0ebd6 WHIRLPOOL 19eac3c35333dfd33fa26b15ab8904ae116dae37e15ad43cb5be635ab77f929fac614365804d30655188e53b3899565985e358fccf8211406650876fc7257541 DIST genpatches-3.12-44.extras.tar.xz 18232 SHA256 b1007266063f8a9d2e15877a440cf32b023d24f0db7dbf6cd4283e57363fd717 SHA512 bb62811238a0e43f46871f76d32ec28eb9aed6b47d3a72dd4efdf16b81a7bf350dd5b2965e71cac224d222a1a5e55eb46cd66e3f9de91d90d92f43235be99eca WHIRLPOOL 21e9c4c9c023d4cf2aa56245df600a6ba173a8ca842a1f8eb3e9a08b285fbe3a8fc315c04556c2cebbf6ebba09d6144e9e6239b6c32848199d8785263da26d6f DIST genpatches-3.12-45.base.tar.xz 1453664 SHA256 ec4d9bcce9b1210e68a0bb24af280eb1e969e8b0179138647fcbdf44a3572fab SHA512 a18cbd4359fb410b10ec3bf579ff77f931f6f86b1d29d7be61204ef0984d34870810942ff395456578efba76d73ab8416d51e7eb2edf3ced4be5a00d8a4967ab WHIRLPOOL c3795f46cee61c54f46a66b7e3dd1d1232035ad6d745f19598bfa4a69aef297b89b11bd7d845fa75247bcc723d7f52d5501a3281c95c8a4b80dee6104b72dd61 DIST genpatches-3.12-45.experimental.tar.xz 46536 SHA256 10a2fad4f699cfed49f8a5e3b0e5685a12328ffe06cd90c97fdf92d7bf7f33a3 SHA512 6dd0e76110fcdd50e48c85f6e777ffc63a55a434be59c92c33318fe331a4f04561c9e526dd015bae84ab5b5df0101389e764b3f77b164a59b8b46f22fa2a3ae9 WHIRLPOOL 59f60478fea7af16e373cc3e4166391d97cd1c5198d736844f5f692fea8c4456f87db1b37475508b1aa185bafbe08b9b685bc8235c8439eef488c49525af8316 DIST genpatches-3.12-45.extras.tar.xz 18244 SHA256 976054b5555a797b073b302e723ed6823b0e35b354d469dd7516f312d290f98a SHA512 77da50d1f74455ce5c38d5eeabb54dc9de936b3cdfd9dc3666f93cdcbfb546b32ad1dbcc0798c08c538389997182f87afa8d009ab26c6872a4c32a4d5b76a734 WHIRLPOOL 38eccba1cdee6da7ee00f332d740c0046f4cefe3d629e15f13acf4b3740ccbfe8c52029df2d1286e4510ba9f459dc738a75877b73b40b0b98d13d607295325fc +DIST genpatches-3.12-46.base.tar.xz 1477068 SHA256 62f8e7101afdf671a51e3beb9b01f8c06cc3df6b12274fdbfdb1bacf2d3f2952 SHA512 8464d356a7267f41a5d4b8eaae24b3ba391d51157adb3b5b7d6bd626b1569e5c565f4383e138bd3d939d4a2bc3dfde349f74c2b421365205d98132cb79442612 WHIRLPOOL 50aa1c4ccb5bf46e54ef1cbf699c7af27f00252325b09bf25e8f9cead1faf346a94bce29e4cc556e7eb3e339b627e8fd321acc320221a8a208fcff4493eaaa29 +DIST genpatches-3.12-46.experimental.tar.xz 46524 SHA256 48069be9b5b0a4ba7f1da5dc046770e2e36a52951bd6815a00907cd721881b25 SHA512 6daf5d04d5cf569eb5b0bedd5feee8f3869938ceb9093f109f82ec8e4fed5349a5dfd445f89a9f5c5459b2524bc4d00707c4fbfa449783ef63a65204755546e3 WHIRLPOOL e51be15d4756dcc8ec59179809584bc1232ff20148a1bb2143947138a8591311a7bc7162b29ea3db81c0781551a186b7650f597ad850864b1ffd2f7dc975b00f +DIST genpatches-3.12-46.extras.tar.xz 18240 SHA256 7cf508f807c15884428573ec210eeefb53470504bfef2eca8357e60d82cbfc4c SHA512 11736da85ec15ae89dff6c850ea730fe5ca62bfa24d864df3d7c832fb20fc4321485306124b516037b3121e1b8c5a47bc0610f17767867babc9f8cab4ee599e0 WHIRLPOOL c5164b37852f78ef0297c70a41f984ff6647eced6e980f7718d924622f28c8ccb325b32cc04f0cb14b01fde029ed09f0b2b6d0ed41126140061e010aa4e95405 DIST genpatches-3.14-58.base.tar.xz 1049500 SHA256 e39936f18642b1ff5ae8aea779176c85aa744594f92ba1c02a371364c769ca11 SHA512 1061a233ba42ec880de32099c0a94b772f57cbe5b26ff162ca89be62271ba56b340d20f35143df9a546f93deaf2b5cc6491bd3fa078ec4f1ddff90d49e71cab4 WHIRLPOOL 9b65cac5d4341419a8ee4058a14199e5f2cd58018be13e42f5f885cea7d12342c77281458287fd61176bb258617d1cd5222d9ac9d6cb906a125a723bf7de185c DIST genpatches-3.14-58.experimental.tar.xz 60308 SHA256 8ba27a67947f2c67a1552b036bffba7edd6c5fd7f9aa8807ef28268426696fd3 SHA512 cf1c273dd41c3a7351cbb6c7b3f7026b9bd890b48e92f6ebfa4b455a2321ba8de8221bb091e70107bc3de82e039240ef21c7a49ddfb1c3aa1ee3395ad057b92d WHIRLPOOL 220a59400138e8c56f7a25d6ea3f39ee9123de3adfdae74fb0847e53cfaca3e3c9137025c31faaf3c39bf6d4ea37c5b939d81ec6e98376083460a39c530b0157 DIST genpatches-3.14-58.extras.tar.xz 18252 SHA256 de10705e4f7f9035bdee22b320dc2c988f8700e222d63a78b34336eed5e533b2 SHA512 df1bda02acc817f5bd2c5e812b25180117dda66180fc0c57b217158850d24fd959d1578042417caf11eeffe3a1ed4108061c53a1113867d3bd6c5dc310fe0f90 WHIRLPOOL bfdf157b050d511abf0b478f0478658e0d20137cfead706a0c8c71ee9ea0332b1f034532cf6445910ce43cec520c96d6f6ea76ed003b4d6a8df50850e56a7397 DIST genpatches-3.14-60.base.tar.xz 1080052 SHA256 a1983df5b2064e3dd6f6bf020ea1b2c107e806dfe354d29fecba4382b437c2bb SHA512 b56dadfff7dc2d1191fbad0c16d8e91206d55470bc241a99ce5c11c7b5f713f0c6f33871464f693385e97726a689935ef271ac771244baec9a517a61507830ea WHIRLPOOL 90d73ae372375cf4f2caf0064d4f60700dfbb70e7a34e435018b2fac8c865e8f428206d9a01acb7bb6c544482bb28371e00b1146535ba3bf44117ed333fe217b DIST genpatches-3.14-60.experimental.tar.xz 60280 SHA256 a8b2b6de84dc66028fb4195164d8a5086ab4e0201419a2b7bc9b591792013f08 SHA512 15329d3945d7721b8289b9fe4e3f04dc6446ca53b44c1332b7be3018dd1d8ea4e509198a9ff568d8c61c0d1b9b748323e6111086e4b881273b5186747b9cba04 WHIRLPOOL 0e46224baee6b1997090988034ba75cdd4be9be8121a196ed39a8d15ad1fd27ecf027af8abc22fb98f84da5279f9392adb9e24c6890db151ba8015bd7916e399 DIST genpatches-3.14-60.extras.tar.xz 18256 SHA256 98f631421c5faa472fd4f9054d173ca94dd57dde04c282dee6250d6f28f2514d SHA512 89aae299eab84e795fef89805f1dec933aa3931d185af24acab9ccb4e83a89b6c74302f94fc68caa85bb6e4eb614b582d0f253ecb6f4c687b5be49fb74a81162 WHIRLPOOL 311149588a2d807b4284402f06901c8e13f6f84437bc62650a88d959b17ff9bf9e67756e634e74b2877899d2ae225312de2f635a17a958e409bd690c170ad1c0 +DIST genpatches-3.14-62.base.tar.xz 1104664 SHA256 d7790182dab0aba591fc5e9bed4f1dc4420a3b484ce3cf8af57769318d1a3229 SHA512 8cc76af4175f2e9d54ac1c7255b870df250ff3b28ac7000b32ce7b3348830f7072f13a8b25b0b6ab7fe49ca3ad5c6aeba62a899e43869a97677dfec017b32b02 WHIRLPOOL c77640e5fd36af50d78f49f00de79c2c986c99b8997d42c9a4888a0c6afc9f10833a87ec7acf5a4e228f483d35aeae9f767fb8f27fbfbfaa1b06d0443fc6d593 +DIST genpatches-3.14-62.experimental.tar.xz 60300 SHA256 564892b993deadbb2d47f936d924d7d1e6891de329b5bd04d2b3ecb126690401 SHA512 942d099b41c4e041570e23ae97006fcc5c6dafefe42d9d694c373b9a5398ff5b7c20f58edc8d339a6ef56cce240cc47f07958f59208165233e39ab573f611717 WHIRLPOOL bd7f6519d20137f18e086871a8dfd7cd06ddd7b9170badee7a31496cb6fa0669723a433ef7c159e037c15b3f31ccf0744afe6a76cb680bf8e9a1faf6df14b842 +DIST genpatches-3.14-62.extras.tar.xz 18252 SHA256 6702160c63ae9de7eb95279ffbe3e5b08fcc6d016803f18e3c09183f1ce309ba SHA512 8fe48eaecf72c257a6642a51dcabe8a0b76e5dd352dca0ff99ff4098db59151f622357beb14830aca7a7f16132b41f8b35d337933f38d8ce1c60531487b3d843 WHIRLPOOL e9e9790a84b432bb90b50e27a369cdd6777b5df67cc5175c4542ff6c15cb8ff7ba650b7046756dcade77742c595b8f9037f49c28e82ecb623742ed3073d74f1e DIST genpatches-3.18-21.base.tar.xz 632956 SHA256 f657997b05dc52e215c22fde16cb227895d072ac2716d25481654849a9e373f1 SHA512 f1dac401caf1cd6282fc47670ad9e3540855542d7eee77f27231bdb9679d3da07b7b09f675ce5998aa777024817546ba8747c7d75aa45cbeb2789dbabf5c5602 WHIRLPOOL 26d19e9302ffd72123c897f7012ae6d81cbab7a7d1b498d10b6aef27fd5e7f4d466fb510c6e72ef3c5f855eb9c88e80f8adbf436e80d52dcbcf1ac1f3e1bf684 DIST genpatches-3.18-21.experimental.tar.xz 61600 SHA256 ebee995e505d68dcf95f39986b73185b353cc64627b048f230e755195a910094 SHA512 d7866e7948e8d6c83a452f99ca50ed06951f68b7552d9dc182c5686d43abe3dc76e3773c8325a87b65e8bf1fa4c09db75fc1af27b7837bb60918e82273cc17e4 WHIRLPOOL 01f897a369a036624364de57b1ea213b8bbe1b1e9bea792e45e0e5b921c3cff0a88174c3284359466059e3dc3793a51ea92a1aa4a5c7b0dd79d98e99693ccd80 DIST genpatches-3.18-21.extras.tar.xz 16192 SHA256 76e21081cdcb3c1b38632ec5375b456287ed572c1a3cb64cc036471a4ae4f726 SHA512 c1e98a5d2350b07a5d939863386027765c8820e32a45a9c68201beb6de811aadcd32c82ef8ef0627290f6fef7ad5751418b2aa7ab4e2d8f3e5b6683e40fbc80a WHIRLPOOL b39979d760f0695fb2632bf7fbed16070e24efa03992c0575bbd13185ab33f0e2d05e35071e9f352f0eaa83e15015550229c33df2294beebe2ef6d24fa2b755e DIST genpatches-3.18-22.base.tar.xz 651380 SHA256 9c866ac44e0c716a5292c3ec907fc52edfce1a32d75cbc63e51f2adbd10067d0 SHA512 d1183150a2ee641714dc85c873713936d862688d4314a6906a25943bbfb34566fe5d0e838d61eba2fc369a657aa762f6276a2a31a5c4e2e9429db4330a0fa03a WHIRLPOOL 22d358be0bfd836ded82b5fc347f5bc266186ee0374120f2def7e6d8c4e87c43ab364eb64c6b141ee8d0705912ebc12f5525694c7d6fcbc9da38c0012ed09da2 DIST genpatches-3.18-22.experimental.tar.xz 61604 SHA256 a216f6a678d83ca91283adddaef52face5980718cc7eae9d8764f782422771c8 SHA512 aa2819419490a7ea0ac06179c07a2139e671877b4a5109c019c8931f21069e4d313c75279b679a76ead8381bc1f709a77b8eb19da27f3d5e8d4d4fb97a0ae5c3 WHIRLPOOL fb4364fc476edac40019c1215c5ba94e29ffd003aae37cb8bb642008e2f0a853ec174c4495699a2c7984dd190d895aeab17cae3ab6c6045ff497c07716a46939 DIST genpatches-3.18-22.extras.tar.xz 16196 SHA256 deeab880c0705b9a02492e2e73152614b7c7dd9f213303fd5284ee07debf0416 SHA512 5ba6d42c5973daa52a54bc77f3f13312d9c6f496e002ab2ad613a08f18ee64dad39472ec0cdb0e545b2c95aee0d69fd30c38877d15f266768a22fabb8a06e2a3 WHIRLPOOL 84092c11122198958498e26d3c4fccbf06451ff9c880510f763968644d03c30160f01090c2bc5b411cb813715083682b90b750401ffd7c8f011ae24f203e90c0 +DIST genpatches-3.18-23.base.tar.xz 723664 SHA256 e2b851168cb14811a7cbbdf7cf6c6285948353729ff8a6d5d243607fcc0eff8a SHA512 7cf09b223927d656d19466bcfe2f4284301a409b0b680f21f2e949ba973706b5042eaa65378e1034ac1377cd887af5330dcb210262907bcb725d6601c61264cf WHIRLPOOL 4ed8f9c163f3cea84e7923066ea7002710980250362e18e231f0421872b212d7777a6d1f1273945784b0d720182044b842478b939af20f137e0bb9e26fff91d0 +DIST genpatches-3.18-23.experimental.tar.xz 61600 SHA256 f6335db1e0d3a35489ba7632669c47548414389d28fb25838457cea30375c430 SHA512 20b2fa1bd461fb1b7de7c7faa85533d2baa4681ae8a5144fcd9d8ccc34fe6643b491d9f419d4d4d25a5f81398d03af5cfbcce33e7ed18a185072ba11a39f3ebd WHIRLPOOL 62c73dd6833ab3cfd7c0999c68d910340c2652705f6cf075ada82a2db5efb37132255068833454d38bb91472e5ed06bb35ec945fa433ef6ac6f714da45073d75 +DIST genpatches-3.18-23.extras.tar.xz 16200 SHA256 c055d6c67161b7497cd6fb98d6143676efa506a06fd7d77c7db527f648cdbb29 SHA512 898c991f77e578ee4d8280038d65f446a309e154d26410741f4f6d6935e4c5c294d0befa4a627b248c109273725c5ca4a489ede6a8eae4c567a7725589fe6f20 WHIRLPOOL 47754319b9a2179c1ddec78647ab13b5ad862b7677a028fc307205d1c3c29d291da322c465d053938019f72efcd25311d5762fe55769ea87318de330a84a5a58 DIST genpatches-3.4-91.base.tar.xz 1363016 SHA256 14bf3a56d4444ae5a9c307c2bbf2cccda44b5bb8f7c460ef9711b858bc8475b0 SHA512 f28f86bb302313b13c2de08d227e0bd0ca93ab5dd2071b6c0797c9b7e29f84b7abe2266c93bba15789a51d6d77c70b749105b5d4a1f7053b041ebd9eb5a80df5 WHIRLPOOL 8535d191d5482773a6d9aa8d45a6b8614b3ba936fc043e7ae5d52ee676ff89a65457c531bb14ce2ea447cb26083efc50c6748c04412b7d6b1a1c76d1d52a2ed6 DIST genpatches-3.4-91.extras.tar.xz 18236 SHA256 34a52d49b677ca2f528e47e08af64bf4b9e8b036710806ebc31ba31bd612dd1e SHA512 04571d1f872a7dae516c8d20c99639039393f23f961650e4ed63d7cab72ca99b227bc0aafb82143c69890fb084fb51bb28367ad9b59a64c79702078fff9bd208 WHIRLPOOL e70a665250cd5999f3b4906fc8ea8637ef703441aa6e51a06771f0cd906a16b83181bb317375fc3c604676bbf490336a6969e8748a81d4c5628107bbc38439af DIST genpatches-3.4-92.base.tar.xz 1396616 SHA256 690030c86258fa1111aac6d1dbc011023537e4becee793d4351307d965290612 SHA512 af321be89ca243ed5920c12482afc7ed0b7e694b4154a2f83b4f35a432dda90fb5b1fc2bae91b99861d56c70cccd2bfb304b7b52e99b94a4bf3b87dd0980d53b WHIRLPOOL 180749b1314707344c0db11edc0a57640741d1f610145b863bd0ded5f2bfb165b2bd454623899c146fe45927a12bf4e9a6c6c1e6323920c7721d42e791e9a284 DIST genpatches-3.4-92.extras.tar.xz 18240 SHA256 db4f7be2ce243c490895d551506486b7d56407c9f55fc2930202f0601d48317b SHA512 8ed85c0a62d0d7f13256dd959ac029d5dfbd2bb25911bced52e23e0d5b8fca196c305efc7cfe31cb4c39dd99040e05064aa9456a6c97b00692efe489aa93f698 WHIRLPOOL 76d9a84c6dc7e6188a8aa92defe05db81a362b6a15e525e249b16a610b688089e4f84c81ed82fb88757cc162b5f7ddf6b5dbb193e50fd09f28e4d0fa0af42cdf +DIST genpatches-3.4-93.base.tar.xz 1412220 SHA256 dce2f6bce8058560fb4f005729a29fee9c6846147bca986b8b44d1554b78f0eb SHA512 0f0cf52185a8a49f639a1f9d3ff302a72fd7cbf4403f7f5626c9f39c3f4e2e5ea69f402df429b0b3341655d9b7a4779b738f5d5fc6ecde3799861e0b6efb8cf4 WHIRLPOOL ac2b82b6e749b945b79d2c21dc3081eaf399aafef80a3fc49ee71dc1f7ee753bf406d6e93bf2142ee4b25447e0304800de0adb9911274dc37172a9a9c63d624f +DIST genpatches-3.4-93.extras.tar.xz 18236 SHA256 c59bbc018e3c7e71fb655c5e33cbbcc3077dedee08553c287624b175c83d0811 SHA512 61e74164a8de8646d4d0c1cd1592eaeb8f5747f0e03557a78349d8cd2df7e924f012ae4904e14210ab56eb3f1f04e8610818ee05e4b5a51b325a42ded9876e66 WHIRLPOOL 42876d70dadac671875e7dc129020ed04c91ea99f40972cf87554accbe1d5e1651cca02f5e16e30654dabdfc1d15771eab8908a64376402c3b1639164b10258f DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee DIST genpatches-4.0-11.experimental.tar.xz 61632 SHA256 cedb08c7d68cf62038aa6f8db3999a7d6daf434a08d0c811308affd5d18667d4 SHA512 cfe5281678acc938ba0c906ef58a654889a71da5238fbff13e5e78f328dc07485345deea6080abf1380a8a3ec5314691b8f5a35ae0cf627e6ebb38ba66860e38 WHIRLPOOL 5bfd4de5098fe5cd05bc7184a5797f9b310a848b2d96e04b83986f45d3961abaf6cfb76b801b9031c0b46c2c072578b59b98781c8c432b7ec0989449f8098a04 DIST genpatches-4.0-11.extras.tar.xz 16288 SHA256 84b7509ecc82f7ff1b90959b88e9e0ad77544610d5a95aacfb88b7200b9aced1 SHA512 95354b1a2dce8d93a50cc1e1e79ea807134eb050c7a76921ada26f5bfa210963a16c9af7bda0b75894201a1e82929859f6dfa5c23cf63fe4586e4264eef85c7f WHIRLPOOL 4ebc929d8e39c0967b99d558f68e5454e6ffc771273b7e9637d8d0ba477c67ee490e0a443a8aa4fdcc74f3aab59cf8e9c159f2a3b152b33fb9a8f395a67b0085 @@ -35,12 +49,21 @@ DIST genpatches-4.1-11.extras.tar.xz 16168 SHA256 be4078adaac6d679a563709dc7528b DIST genpatches-4.1-14.base.tar.xz 311648 SHA256 e3a959d79834266bd4760d806598b7e9b982823e9b177219f0e385482380aa25 SHA512 b2626d0b45da547a293ba233a4c33c30aa4f7b9ff1d2c3a3aea664f9d99e272b5c9aeba6abc63f27930771b9c282184501c62a987985e23c53471ca5feb260d2 WHIRLPOOL 5db2f30fe0f30cd1161cfbd7d7a8a7cb6815ece833874e303782bf28afc25d11568d48372816e9736d39c781635d5ba91b3f80817552485ddf1c945c40aec01a DIST genpatches-4.1-14.experimental.tar.xz 215988 SHA256 3b58f4e8e4867bb7eac7acc78954824f79d0e4260ab5b21d73d30ee617287708 SHA512 bed868ee20616194dfd314705234348f1a860a2163c886470a16e387940a48dfa78e1cd0e2a6b4a827b9c664fa37586d0a52925ad7502e2ca4e15e94fd33c2b3 WHIRLPOOL 2ff84c87619e2dea27886d1bf7e94753187e2f1b07c71b4b5ebbbaa3ead391c0d3a14431a67b3707ceda05d26b86598f1bfbe1beadb63285614e77b3e76102af DIST genpatches-4.1-14.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd +DIST genpatches-4.1-16.base.tar.xz 390916 SHA256 c36edc8f56a26e0ae74fa28e9a50d02d8196f5d29447d6d2cdbf17ad71f70902 SHA512 981c4589a2f448a8c58276590eae9db25e716e0df584f4e431e7d29e69714695078112e30b84179038879071dcb94adb0753a94bcc3cf3e4c3a676244543f0aa WHIRLPOOL 6f3bf0ec325a1d7363315fd7828da31901916c497cbb8adb212e515ee7fae1179f276116f9e484fb23f2200e2fa61ad315baa8de1c073c5412dd1ff3ce624cf9 +DIST genpatches-4.1-16.experimental.tar.xz 215996 SHA256 0840ccdcad7c4b03cd4fd54940e3ca31d0d738184abe1c9340d5d0f9c3943009 SHA512 95b8bc22413b24627ac1906830a345689c7e98a77beb1405e9a6c5b97f48c4fa7dbd15a2ffe66f24ef9dd8617a83a4913a26acbcb387f4a0add6d5f37c3343a9 WHIRLPOOL b19fbda05c354c17df10a8fe3e482798926e6631c5b5f96685e2d99cc016f10c37fbe5aef633c8a77bc427d045b02390815469f5aa2850dd76d5cb374a916cc0 +DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6 DIST genpatches-4.2-2.base.tar.xz 4384 SHA256 f38d37d15378eecca3e1d74d7dca66ba2200d66e87b7f5a68f716cbb61faf5f1 SHA512 9c754e1bf9cc39635f98a9ac5656c030612d72e0f4d4680b6f619a176e660e3c90594fbe0d9759abb5c9402e4649bd1fcd3e3f55b7d132d1b3d0277e17c65ffc WHIRLPOOL 05df0d6ed05927ee2f6f7b86091f9c10cc932250ecbd12064a46a590943d6d4d0dee4e57d3ba07a4f75fc939f6f14feee5177447bed63349f1b9ef8f109617d6 DIST genpatches-4.2-2.experimental.tar.xz 161712 SHA256 760c2851a96a385298edc817e873a51ec46edb63e9a6a1361912c5f28fb0a371 SHA512 0b1fa56cb667f0c073ea622aa195ac7784c6ace7a0f1fe09a402e8dc9e11a5cc737a2695eaa41e409972beb6ad71353be87b5f2e771bb464e026a20ea3103c95 WHIRLPOOL 468bd993e750ceafe0115ac9a06d49f9f97add5c9bd11e3343b2319bc8bbf9f0cf988b6afcbeab0bf3f00299405b44347d46c2a4e35869eb03ae951a9a967743 DIST genpatches-4.2-2.extras.tar.xz 16168 SHA256 be4078adaac6d679a563709dc7528b92587a463877c28d7c49117b5ddd842fe1 SHA512 9a561564511e3a15648f88f1b230e8985e33b3dac92a082cd8d4a5ccf0da8f8eb030fde59f6a0c5664c478751f710e2f2f8f3cf4b13293329444ed702c70732c WHIRLPOOL 46a021f1801aae12167bfb5378ee62cb058a13b18d48c006b9e7fc4a086803c8c509070cee059c5eb817abec317285f7e1157f6f286ed53a4ce7ad761c7d2e36 DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f DIST genpatches-4.2-6.experimental.tar.xz 216008 SHA256 ce3ab8bec66d7e9bcf1ecd6f6e9925f8863869e09073cb76e6f4e1d9b6b65eb5 SHA512 1dec060dab9c942b154ea468e0cebae16a5a63844be3576a1300a1263e1b38e45b230faa2dabe020c0c32431b4c2025b38dd8fe866eef102359d81a3fd23f66f WHIRLPOOL 53396343aad281e3cdf36dbe4c0714723688b7e6a9938b8a8efdb1d6cf447e075f7d6cf503b5cef922f2a03ee2d85661011d0fba68c5a4a66853862bc5e1f378 DIST genpatches-4.2-6.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd +DIST genpatches-4.2-8.base.tar.xz 191276 SHA256 395dc09c285606e830be9b002eec8968394ec2ac67eaec6673c0703196e708d8 SHA512 216d8c9be1c3ed1fcc612e3739bf7186e996b6fca8ce3d08be4ea9da16f7d4f63a01d6e8606a83d2743f94ffe1640da9f2c1d588fddab51e0f25b090141a353d WHIRLPOOL fdb58098517642e5ec075218b612f765b559b6c850bfd678d3eb7fb0479bd175c6eb01896e552525eb6025a93e72ce204fa57c77f96a028ac0f93bc0c59d13c0 +DIST genpatches-4.2-8.experimental.tar.xz 216032 SHA256 53f431427f4deb72e5495159f8f56902a5470b0f230ab549cd6a21380d757ffd SHA512 3c8233427efa0c181ddc8044d7d5ce3ad914b7df84381af8816b75545d8512777c786710422dfb1006277dd0e5fd69a18404e2d83cd361431853e3f900906db1 WHIRLPOOL eaa9d7697a391f90bcd04293545adbc21cff4c5ae82ee96e00c2cae12720ea9d9679c75988bf24f2eb9ca4f7e9aaa2bee36d3f7208edaa84fc1236a55b418bc9 +DIST genpatches-4.2-8.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6 +DIST genpatches-4.3-1.base.tar.xz 3464 SHA256 7a4fa6450f306844cbe767c69e0f26cd9363803840e5147c27bc78fa1b20d739 SHA512 a37d673a6daf0956cd5a9284c1772112b726187b2e83293cf1c41b64988eeb3ed27be41394fa18b9ce2dc2c2f07a974f39d74a0d9de406d76d5c8e960bafbe94 WHIRLPOOL 95289c547af7c6ef0c2bf2af323782044c45191b1055e032aeff2652ee2d51779abcb2caea23634dbeaf375397ca4b9ec6b4bb11e3074cac37787b047db0e958 +DIST genpatches-4.3-1.experimental.tar.xz 4904 SHA256 e36a9856c8bef942c21f8211a23b54522cd270e98e7bb3facdd562f19e579a0a SHA512 1690d38ebdd12d9593931b6fe7467cfb3cbe160a65c955fa82fccce2a9f57b6818efb39ef01ce97274aa6c8d0596c2d651f293b67abba5556fba7c7495658cd1 WHIRLPOOL 42414daeecba5d9cbc1fe46a3e438c3ef82ebae317a38c9d8b78ad723376550dbf3b83b102a9a0f7f893ed624a62bfeb80a49566bf13803805ae3dd3050e5afe +DIST genpatches-4.3-1.extras.tar.xz 16288 SHA256 41cf40be254f6204a0dcfbb0051309bf506a9306e6c637058fc23dbecbe37c00 SHA512 6cedca7ab7e3971751077dbebb84d6cdd711600db7ea19a6e110ebc71a6281dc9db3d195b6f4e553bafd74d3dd1a252308c85e13de76879e3b6becd1b64ad2ff WHIRLPOOL 129068f0912b07e64b8087e90a4f8758673f89f61d9d6ff69962168ad183efe27f9a657bcac85e44db62ee690b86eadc131282200e9d657b47402b3bbc95b96b DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41 @@ -49,18 +72,27 @@ DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019 DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8 DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0 +DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935 DIST tuxonice-for-linux-3.10.87-2015-08-22.patch.bz2 129349 SHA256 29ba679672289dde0e918a3c24241a955a88f786ccfae045753683eaa9121f65 SHA512 b5fec2d22d510afd943e96fbb3221658894223a8891b2ad8776babce3cd8f4ccc7294892189322cd7ed476e5b76c4301ab3ab9376b1a85c34c1bacf1ac64b7a2 WHIRLPOOL bf9a1b9b675733b49b372077b5cfcc8cd62b56817aa10754ce4778f163a14ff1bfd40b32cbf9a3b9389eed793021906d48ef4261e138f5c088b19b0fb4ce8e50 DIST tuxonice-for-linux-3.10.90-2015-10-02.patch.bz2 129346 SHA256 6f3906febc2ef223070b8eae846f4c5384b0767c41bb92a00060956675332c0e SHA512 70c29e472f2e623f29fd6c4de29adcc3be7b2be5f2384e6dff87a36de3afd6442af63b10b65e07ef5985c34694da175410168f731b4dd476bc889a19559216d1 WHIRLPOOL 26b2adc733aa3ad64c3d342e55054a0ca1a70a54fe43ea4c6b3408467e40b5d5b85fef683198e1370f06fdfc925eec3fcaaeb878f8056cbd487ca0b3a53b81f6 +DIST tuxonice-for-linux-3.10.92-2015-10-30.patch.bz2 129326 SHA256 0a6bcbfdd95c9cd00edf6dc3a8e6c90f23d609c9bdb848b9ec82b537cf04e72d SHA512 2262eeefcead10a174611aca9be6357336c282fd382832414c8a3bf22597aca68ebf4e954642e76f0fad512ca39bf411ec1889301586110058fa4ce921dc687f WHIRLPOOL 6fd77b95bd5584a354f0499e0048ee1657056cbaf906a08c2a96baa016d49f5c1734fd12621b0d54a75dcb6332554c6b88830e1feca61135330cf94c58a236b3 DIST tuxonice-for-linux-3.12.47-2015-09-08.patch.bz2 129322 SHA256 2a837a1b4e5746a0bd553f5ca9a866fd771bcf5dbb4a3693b63d2188d072162d SHA512 136a0eb836b9c6aa169f8d760937d197852401c0dd77e48390cc35ce2a5b09710fc4d49c34edad909d6d50d698f2392db974b448a6adec5754c389338209570d WHIRLPOOL 6965b9aafbf15c2167d17aaba2a1baa4b636123889318161d40927202fa006518ac647e590d4ab115356b1d8db471668a2dcfa39f3e0a0eb7eede4b02949d104 DIST tuxonice-for-linux-3.12.48-2015-09-23.patch.bz2 129322 SHA256 2a837a1b4e5746a0bd553f5ca9a866fd771bcf5dbb4a3693b63d2188d072162d SHA512 136a0eb836b9c6aa169f8d760937d197852401c0dd77e48390cc35ce2a5b09710fc4d49c34edad909d6d50d698f2392db974b448a6adec5754c389338209570d WHIRLPOOL 6965b9aafbf15c2167d17aaba2a1baa4b636123889318161d40927202fa006518ac647e590d4ab115356b1d8db471668a2dcfa39f3e0a0eb7eede4b02949d104 +DIST tuxonice-for-linux-3.12.49-2015-10-10.patch.bz2 129255 SHA256 d4a87a3f83fd0c6d6e9bff6cc776aa4a306ffa3d44046244b78aebf312402c4e SHA512 54e726c12e0dbd2ab39a2c8197924041457718d92121ef720a8e7917ee5f16b9a4337ef5f09ab8cfb9a9e0cbc260f2bdc00af85ee7f89b67ec32404ea7f2445e WHIRLPOOL a4d9697f97e4ff32d37f22283f6fa9e4115f458f09c05232caae06eaa0ac1166a8fb3d056c8bd151480b598945afeebf897d9b8f3097e0bb0f704dc9f34338e8 DIST tuxonice-for-linux-3.14.51-2015-08-22.patch.bz2 129508 SHA256 c2aa93c31b914b12fa4d624191a524c9b4b80672868b53d8b16f7590066ebd96 SHA512 73537ada4d02f171d309788ef89b5e58f90b7b93e52cfdc196b3c3213c57cf3703e72aa43998eeac8746aa3d232fe61a0ca25f82d2d635ab209d423b37caf240 WHIRLPOOL f5433114ba02cd2af58628d831cd5e3e62f56abe50c2149fb46268377329b569413e9e17ab296dcd6396043114bc19b45735722093b2ddc90906abbbab095ce2 DIST tuxonice-for-linux-3.14.54-2015-10-02.patch.bz2 129475 SHA256 dafa74c9bfc0d6755f1911929f219c3e290109b3403070ce7174d810c676b414 SHA512 302b6ce76f8c0078ae5f87d0e1274121af557f5b6e331f248d14575e021ff719baf98044d4605edd8268948312b9cd2c8c360466d8f7cdb51f8be2c403bb9d74 WHIRLPOOL 4b7532cf2c6109ddd4065d16b83cbc5c4933d5d93330c89bae0e547ac48b03182d5998e1702e94c4d91fc60e1d3130d126f2587e1b22f0ce39eeb1489ff47ad2 +DIST tuxonice-for-linux-3.14.56-2015-10-30.patch.bz2 129506 SHA256 23982d9b8b86efb2a7872de2ce42f64d1246964aa8f22e85e9931982489c1bf5 SHA512 a6144f2bdaa1f7571a43eb80866b9cc5538153e697d55b76579a6105036366d5bfa2ff89684d06be1ba15900197915569adb3a9a4617ebf951b8e6bcc7d93a28 WHIRLPOOL a1d04ea3d7f3dfa0ea45c14da1abb479f62bcbe65d7cbd561fb2505a50279d91e3ea2bc15eef205f8f0d2bb1bccc332574c29f1d1affc0c35657186659676a04 DIST tuxonice-for-linux-3.18.21-2015-09-08.patch.bz2 127760 SHA256 4234da16ed5861234859311d7b668749e16fa3131ac5059aa7c34194c7d60f55 SHA512 bb7a8ca5d9fb9f652c22c69009c7b9861df9f5ee2a254cbdc7c0e077ece16e93220b46625dc6671eb7d865ecf4292e2b23fdd0c291db96cefcc71c7add99eec9 WHIRLPOOL 61a7c1bc42a29b5398df72b498a97a7149b9fe882f2a0ce38dae9e91a16e8c45e9f851cc124d6682417a1f699ebcccebd9cf646a6bbbacaad283c47c627ec329 DIST tuxonice-for-linux-3.18.22-2015-10-10.patch.bz2 127674 SHA256 83c12cbb770e8a10b35e1b003a061a8bf2b407b82e523fe45406f4876592c897 SHA512 23fa6d07e0e28fe30284e98950c57cbad42900f22bf84eea52860202218ef6629f192ab6e66517f9d9d0aa3223c164a49ba54d12ded7b15e460d44b2e324a9ac WHIRLPOOL 6bf452057971eae52660aa01ea9ab3ffdd1bd148d4452d394ce3c2ad42392463bdbf210f453601f1de3520028316d84063bebec13f6e9520f2378ff9b71d1ac3 +DIST tuxonice-for-linux-3.18.23-2015-10-30.patch.bz2 127492 SHA256 d213ebe58d2119dcda6e12bb0af6c83a67e96b31ee642e774e8f413e5f725124 SHA512 2da98ae2ed51d4ca1a998c1ad7acd08a9baaf0b5600149c8e231ece0c28be708b6719d77776cb095922729aad2eff5b4d4246d9946bf857ee1c15ada13900a75 WHIRLPOOL 3261c5e7901a32e5af3295f2b729d69f3d20057663a0c3af37a03b603ae1461e9bf4765730db9be3346b18c73d7e224dae6f3a92f7361dca30839256357e5a35 DIST tuxonice-for-linux-3.4.107-2015-04-18.patch.bz2 131546 SHA256 c2802f72c7cce5b6811b4476b8135a8e9aa7c715c3807b2c60f92cc84c661caf SHA512 4f4da36b697db267e8153e4336f0458aea9093f20eee8e809a61f2addaba3b9707c73ed6656ad54cbac006bfb08d64f5cd9eb0e2fb9990b00e126e7af15c8178 WHIRLPOOL a4c05d1325a1326273506b07721ec8b7618db17e5fbe5c23353fee922714889a92a19063727ec308e1b63ba6b7912a2ee9b80a9a30cdf837090dc18c4a366adf DIST tuxonice-for-linux-3.4.109-2015-09-23.patch.bz2 131542 SHA256 79321295f40b3e635e53c200e6c4c4cad40250df13c48fb68cab95e150295c02 SHA512 3a66a3e97f3324d51ea6285b6fcfdcdf621818457c6e38dadaca13ab7a3e95ddacf1a1deda784ae3a9dfd967fa85848c223b0c8e0d059756058bc27e6b9b75e6 WHIRLPOOL f13808f5898339762faff722488656bf994d68e29a4cf0640072cc94f5385df4b7b310615caa78aa5bd23507a7a2eeddf5cd2790dd12112f4624eb1f79500ad9 +DIST tuxonice-for-linux-3.4.110-2015-10-30.patch.bz2 131521 SHA256 560c01b65d68b9679111f83e6de40878594c323de09a6c3d86b4d57b3cd07d8a SHA512 7245467dea585fcd3c0d44c60202e15c038e4e7d17e37efa0decf7db92bdc385568ba50fc70c85bdf6f97ef3346fed3fc49e7edf25773713fdd239e618ef159b WHIRLPOOL 00f387c6e3f01c3d89ae5eaf2d3d49914a9cb30f07c1845bebb8b6883aa74e3f0dca0626c84f6233cdc2b05fbcbaac4158319c21d67d85d7dfd9132e106a70db DIST tuxonice-for-linux-4.0.9-2015-07-23.patch.bz2 133980 SHA256 f1063b01027317d95cfb7ea91f8ea0bdc1754ccd65d0cdcdb30b92abd201a5df SHA512 79c11bbb2a50e07042ea31759468ad9d60dd807e7cb54796d51da8c258966ec289c703b81563b4a652f2da7f5645ae42f77867a43fe6b3d56ff8b0f7b3974191 WHIRLPOOL 86fe1993ba447fdd8a4bca148bb8080ce46aa6fa7ca6d1ca2b0899a193638dbe983381462637df80d3c7bce52a027c0462d1d13cdac9bbec9c9c46e9e4aa5128 +DIST tuxonice-for-linux-4.1.12-2015-10-30.patch.bz2 133960 SHA256 0562b40fd3b154c4046398a6c095d5dc804357f115d7a02d3adbdbca93452899 SHA512 35d4f53bd4614ce08098d1246df963b564725d3b2390a5b2474ba855f0f263306a4d857c90c9f986d15966eb2e57609215bf7d3f8f5c35cf04b6c2636dd2454a WHIRLPOOL 96014dd874a87afdc1fe88f49bdc13ac77a96bf50f3bee8011924c7aa2fadd5eb38ec278fa75d4e24ff058cb34959a904a1fb9785c935f3cbfb74c2b2a2154ff DIST tuxonice-for-linux-4.1.6-2015-08-22.patch.bz2 133792 SHA256 4720c29dff3e8a3ab086ce4b66219aacc72ef291c82cf50571d2a73750e4a565 SHA512 a1bb71712e38988ae7ed72fc8b52d72fd9e2ca9896ca47de6f5b269b8e6d237404192b1b5190536c861c28ce440a96376c4aad9b90f8c889b1e2c4ee8161073d WHIRLPOOL 9f31ca35fa1ec857a244ebbe73ae33df0a9de65500c276b45b7eb7108cf82243182016946399069eaac2c0663f27292042cc214ff16ccad8d1dfa932c8bfc63b DIST tuxonice-for-linux-4.1.9-2015-10-02.patch.bz2 134173 SHA256 1610210f37253848bc9d50658bf862cdca6f081e9bf7f146ceb731e863f72dd8 SHA512 4616de7fca26d6f20dcc0ef1233272a45a824707e6de8ecad64f01ed73ad9219ef80d0aa26fd197c0c48e080e53a357db999b5ced6ac03c7e8bc16dc2ee09d76 WHIRLPOOL 509018ac1435b18d2043c6000ec131e16f9129d980c8623ec98645398821eca3b86ccb8639cbdbcdb64b8b5084ec0bc4a2f9fbd9432e01a524f66fd8bce491ca DIST tuxonice-for-linux-4.2.0-2015-09-08.patch.bz2 133600 SHA256 e7dc8e56fc7efa8eafbed18d37f406bdb9a6a9201ca06bf5f46a94db605dae14 SHA512 b76aa697211591d364ab463d3e06cf30c5496e5f849e5fa63b5d49d0676100ffb3bd54b3c76ce925232cd0a737bce31db50d59bd4d45bdaa4ef41fdb5d9716b8 WHIRLPOOL b165787d221015a09e0fecbab54f8d45ccefdd439af492175a6d77e6f4d45239803943f521ea4c320eedbea6e2aaa4fd31aa1ac45e198bd3b3bfdc5d008d4cee DIST tuxonice-for-linux-4.2.3-2015-10-10.patch.bz2 133618 SHA256 6f3640495524c9dbbbc90eee5179da358d7e280659797b1b9d3fb9eab27b8379 SHA512 263a98d92ad80b5db834d4bd9e5f1a91a22227cd51f8257ef705386743beef0de69ff6e3030675be543f33e7126d45d9c97b0ecbf93de58a0bc68254c48c219b WHIRLPOOL 5da716dabcc7c5109768f0ce6451b1af9c2e33c681e9903b3b5f2caa0056e433ccd0919939144237f1551060f0aa8709a5d24230be1939450eed7e62aba0c1ac +DIST tuxonice-for-linux-4.2.5-2015-10-30.patch.bz2 133573 SHA256 e7e6b8767aa97d44f46659ce8be99be58a73f0d83a69d5c5809703c7158835a7 SHA512 e379505276f5829ba07ac7da36ba29a3841c4ee086eb223b833bfc3a1ac3f1c9b3a64b43dae96b5ae6edd34d4fd3b280e027bb94afda3f3f05d95272fe4cc034 WHIRLPOOL 43a5e24cfb24d84350fbfe21043aad3e86aafb5f83f1ab86a3832488b1f65663d768650420585a59c487cc25ed3b5f4267c44dd7b36a4ef242c656d50d7897bd +DIST tuxonice-for-linux-head-4.3.0-rc7-2015-11-01.patch.bz2 133453 SHA256 7b82218d17001ab54691552fd87f38482afa4a2923cfdab104381ca0efce8ae0 SHA512 07f349938f34eba8a4da3eec18325be5aa01067a46290d818b453b170acf66b214802b9cc3b25175b3b478839a6611b4c1862b2271401da396a8bc9a52837787 WHIRLPOOL 133e9b38850a82e52faac6eba16dc6b0445e803c5035fe2da38317ad11a581d266a3ba731fb6db589b0bd2f030aa2e7bedeefa7ebc4e5278acc81f197f4acb8a diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.92.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.92.ebuild new file mode 100644 index 000000000000..983d05711d57 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.92.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="97" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.10.92" +TUXONICE_DATE="2015-10-30" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.49.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.49.ebuild new file mode 100644 index 000000000000..7de68dd651d2 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.49.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="46" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.12.49" +TUXONICE_DATE="2015-10-10" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.56.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.56.ebuild new file mode 100644 index 000000000000..491621a69fc4 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.56.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="62" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.14.56" +TUXONICE_DATE="2015-10-30" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.23.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.23.ebuild new file mode 100644 index 000000000000..716b9a993615 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.23.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="23" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.18.23" +TUXONICE_DATE="2015-10-30" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.110.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.110.ebuild new file mode 100644 index 000000000000..4c33b3b37516 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.110.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras" +K_GENPATCHES_VER="93" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.4.110" +TUXONICE_DATE="2015-10-30" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.12.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.12.ebuild new file mode 100644 index 000000000000..4cf8c16f9ab5 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.12.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="16" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="4.1.12" +TUXONICE_DATE="2015-10-30" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.5.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.5.ebuild new file mode 100644 index 000000000000..4bee51d6d341 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.5.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="8" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="4.2.5" +TUXONICE_DATE="2015-10-30" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.3.0.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.3.0.ebuild new file mode 100644 index 000000000000..e56b5d544f0e --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.3.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="1" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="head-4.3.0-rc7" +TUXONICE_DATE="2015-11-01" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest index 8ffc1c2e0758..d5151ac4c894 100644 --- a/sys-kernel/vanilla-sources/Manifest +++ b/sys-kernel/vanilla-sources/Manifest @@ -6,11 +6,12 @@ DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca5 DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 SHA512 1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c WHIRLPOOL a36e62fe197ba7c08d498a79034da58091a94348f69542241067c9ebef683f86371b2c0a3b3fb6c4611e2fb885d9b74eee5c1f46a493c72dfb76c5665f0b8a6a DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8 DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0 -DIST patch-3.10.91.xz 1193920 SHA256 1609879037b337b42f8ab675246f2cc4a43238956cebfb09fe21be4398df1f24 SHA512 973720b7371e5339764bc4c80b4c9f4a409c7bfac8ec49ff19f0ca0008a711051ea3246620576747fca446e2ba3a55b8e999452453348420ae073ede72cc75fe WHIRLPOOL 1e5ff1b3cd457d265aeed1f20b5cf14516b46abb4db330a313870907d933ff847df6b51b7190a7cb6afff5a4d39631836dbf9d546f9a0323150252f0e05c6ab3 +DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935 +DIST patch-3.10.92.xz 1195956 SHA256 882861332acc85c734b30792488b0480b0344fc95d299c4b300e58af70968f2d SHA512 d5639a9710e77bfef71f3d46777351cffa14a93e6c237aa5a6cb06a969e8af73fc701516e5c7f5a3e46892e381e5c53d0c0e32c599787c66d797281a9a07ce35 WHIRLPOOL 058610e22dc2a0a8795918afc10655d8af54847630db770b4fe46d9efee8e27c8e49de3ef60f264d810da9f872ecf59c7571b2a0ae529d7c3f0fd9caeca87e96 DIST patch-3.12.49.xz 1363484 SHA256 f413289e803ed9511f080f9b8d6a15d2b20aee67d2f63ff939e2fb06519eaae9 SHA512 636ff6a7da8435a2311833fbe1cb64abd2a30e4c99705cffd81f084b7d4bfebddd3df332ee156f519d45ae3a1d9b059b510d4b634ab2bccd765cb7a8fcde365e WHIRLPOOL ddf5e7686d262742f24b955c333ed899f0a0690b06c8121b6f6a4cf5ae1de98fc730d17b7f7830382d06a5ca4b248f7f2bae1f95244611444a6a077dc6db6315 -DIST patch-3.14.55.xz 1025008 SHA256 e36d24592c93775862b97e3be46e686023af9e9254abd706f7e089d7d1e032bb SHA512 3c1f3143b633d45de63bae8682d3a7a732e97b1d590c4d69847d7beadba195775380f12aaa7b9c6446eaea9ab3214b749afdc8c9342bab5da9165b28e89ffcd7 WHIRLPOOL 73daf6fbce241831dd9a82d3a47afbd1bc9253db4bcdde9a3b7fe7b2ae56314e1743525d589fefdde67e76ba2dd050c6acca8cb2eeb34e838f97da7e0eef5930 -DIST patch-3.18.22.xz 622064 SHA256 370993a59dc24aff4e7428b9c701aaf7fc9ea05fc5f1dd55f2dc93464a7a982c SHA512 281ae98feed012f43fc5b125c6d695ca59fc2f0472e757cfc1cbba3254c456c3312b468e7cf419e35ba9086f3be81feb54577b5ac56a3438bc6374f2c73e8be3 WHIRLPOOL 0df342c9af62eb0a96028bc734e8323d061af3aa4d79a8b004b4b002cb7f950fcd16097f1631faf53887c6fba9ee69387be7f02f7dd3bf7a180fac3df9015c85 +DIST patch-3.14.56.xz 1028880 SHA256 a31f27cf9dfb6e933aef45b965044094aa295bd37d3d95547d22befad642fe61 SHA512 c892e00ef51dc9be4ff56fda888bea051e73f2de588546165a827486062a4573496aef0f4e0e384386f949e2bfebf03a7ec56fbd7953d2b3c975b59a7f20a59b WHIRLPOOL 4e2c6bd5b4a33b42f01d0377538ddee2c0d768205a1586d3c415a91bd51abd5f2a4dee47c34594a4f0a483f4ac5fc9dd93656b952077b138968790eb0416e6d5 +DIST patch-3.18.23.xz 690832 SHA256 52406a0efaefdffd6464ce5866213fa6c800d08d3e8c3af19f01a38c237e5212 SHA512 b52747facd9049ed3dc32f75aec605766e29c538204eb585ee029e6dea5a763921ac00e7778c42b2033dec8f5543e8eaccfefca3f9aba1a0345894cdc58b77fc WHIRLPOOL 3c61f2b884a8d4b4305b16954d4f0e83cba57fd862d11d0aa596c80e057fba84440d9aca10ae5c3a62caefcfe1cbf188d0811d279a507e5fe203356a4d108e1e DIST patch-3.2.72.xz 1486368 SHA256 4c11037f31cfdcc0aa171d1d83599dff0954464d0d395f9b474d9090285036c3 SHA512 6d9adc37abb563f8b69478ea904179009b52a88aaf07866e63f2e6cc9bc64dda18fbeddbba28a9412dfb9c6d52853986cd6fcd5e6e20be68fb1e4cde9d1be871 WHIRLPOOL 7034edc3b73bbb9096c7e68d91052dff1a68278839eb1e1ddf726699fac03466a2415c547f9b7d2f9fdcb7d041b7346da3e3cf734e1edd20ae4479c350d764d4 DIST patch-3.4.110.xz 1293116 SHA256 132362637b7ba272d58acbedb172a7233c238ec1d794af111af55ee8a406e12d SHA512 fc3f95dbf831b8edf9626632983b2d38dc017ff9db8718a79c9c3f714d1114c4fc8c6673854218c5230b3f71667b735945f6f80ae11e424894570941e7431b4a WHIRLPOOL 9f1ec18591c043ba103856d2667c776bebc3369aafcb27d75174aac9d7e00653c571b245dcc8aca735838117cab62178e7a2f63a616a594fc9a508e85a997cca -DIST patch-4.1.8.xz 256048 SHA256 4373af2baaae5429be37e5257a22454d468f36b1322f784bb91a608c80ed52a1 SHA512 1ba853bd1a4da73563e1f9c3bc01436274d63b77a577d6789843c7e5236158d204f333275c5a95be52c4ae1e26f6b813e58ae5fbdaee6b1cc53942273c8fbaf1 WHIRLPOOL 2d3dcd938c5758afb020c83cf3a1b08acbb321a2be2e3ef6bf47de3f09944e0551d337f53d8ccff1b98e38296dbbd04e274a7eb86aa1a21ecc4a5d094a1c9913 -DIST patch-4.2.4.xz 173336 SHA256 104ba869111c7ce037fc92646f9da7352412a73e84cde7467f29cd4b973d6e78 SHA512 8d0e7a520db077b718bca91a4380c829b8f2c1bf4a39f1ce05f8c6292059ad7a79a6d0ba380a8fdbcde77d09397d8bae3e7fdf9f45abefdc3c6563933a824554 WHIRLPOOL 7a4a8d7a6b1147acd0d5c8360d440c0a00ac46dc70c91419a56efd8e44f68ac40bf163c9b181826dc68a77cf1eb6049d9daecb9766cfbcd9d6c3b223491c17de +DIST patch-4.1.12.xz 376252 SHA256 f3520b06e6a2b9929173c680de75f11cde9f0a380e04195d538b5de820a549ae SHA512 164f216faa8fef6a28fe03bdb69c7bee5ff99cf560271264b52e62aec63c1d4d6475d4a6f2b4b4c02d235568ebe8bafd3b36be75c8a505cde8edbb70136d89b4 WHIRLPOOL 6bd93ac25fd1bad3c1ef12e97d72ff6db2e31125f2060515686663d1e73dd4b525ffc0a646531445e0544e12b3d78ec60ee34d24179efb5a608b7651132ef05a +DIST patch-4.2.5.xz 186184 SHA256 b631eb4e8b4911b31111b0838e00f7c4a1b7689abcd2233609831b638493f4fb SHA512 f98afaad46ba9bd7fa330d8b4d07aff284da059fd762aa2601a10893e666acd87957a14e397b5a16f0d8009ab82ea3e3d084ab44cdf13db62274ac5939a998f3 WHIRLPOOL 6074acfe197bfa7e48c608e7b47493a9e01f55752e06bce6bad1966153e913c9280a24c4fec7e367da90d03283ad7e346724cfa3c2bb5298cbbb6c5a888d0e1a diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.10.91.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.10.92.ebuild index d49630dbe440..d49630dbe440 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-3.10.91.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-3.10.92.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.14.55.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.14.56.ebuild index d49630dbe440..d49630dbe440 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-3.14.55.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-3.14.56.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.2.4.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.18.23.ebuild index d49630dbe440..d49630dbe440 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-4.2.4.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-3.18.23.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.18.22.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.1.12.ebuild index aba0a803dd0b..d49630dbe440 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-3.18.22.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-4.1.12.ebuild @@ -16,4 +16,3 @@ HOMEPAGE="https://www.kernel.org" SRC_URI="${KERNEL_URI}" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="deblob" diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.1.8.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.2.5.ebuild index aba0a803dd0b..d49630dbe440 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-4.1.8.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-4.2.5.ebuild @@ -16,4 +16,3 @@ HOMEPAGE="https://www.kernel.org" SRC_URI="${KERNEL_URI}" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="deblob" diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.3.0.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.3.0.ebuild new file mode 100644 index 000000000000..d49630dbe440 --- /dev/null +++ b/sys-kernel/vanilla-sources/vanilla-sources-4.3.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +K_NOUSENAME="yes" +K_NOSETEXTRAVERSION="yes" +K_SECURITY_UNSUPPORTED="1" +K_DEBLOB_AVAILABLE="0" +ETYPE="sources" +inherit kernel-2 +detect_version + +DESCRIPTION="Full sources for the Linux kernel" +HOMEPAGE="https://www.kernel.org" +SRC_URI="${KERNEL_URI}" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" diff --git a/sys-libs/glibc/glibc-2.21-r1.ebuild b/sys-libs/glibc/glibc-2.21-r1.ebuild index f9f7a3686924..ffcb5be6fa11 100644 --- a/sys-libs/glibc/glibc-2.21-r1.ebuild +++ b/sys-libs/glibc/glibc-2.21-r1.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library" HOMEPAGE="https://www.gnu.org/software/libc/libc.html" LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86" RESTRICT="strip" # strip ourself #46186 EMULTILIB_PKG="true" diff --git a/sys-libs/musl/musl-1.1.12.ebuild b/sys-libs/musl/musl-1.1.12.ebuild index 657955a2283d..239a045a3676 100644 --- a/sys-libs/musl/musl-1.1.12.ebuild +++ b/sys-libs/musl/musl-1.1.12.ebuild @@ -23,7 +23,7 @@ HOMEPAGE="http://www.musl-libc.org/" if [[ ${PV} != "9999" ]] ; then PATCH_VER="" SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz" - KEYWORDS="-* amd64 ~arm ~mips ~ppc x86" + KEYWORDS="-* amd64 arm ~mips ppc x86" fi LICENSE="MIT LGPL-2 GPL-2" diff --git a/sys-libs/readline/readline-4.3_p5.ebuild b/sys-libs/readline/readline-4.3_p5.ebuild index 986d7449dacc..416f92cd272a 100644 --- a/sys-libs/readline/readline-4.3_p5.ebuild +++ b/sys-libs/readline/readline-4.3_p5.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ # This version is just for the ABI .4 library -inherit eutils flag-o-matic +EAPI="5" + +inherit eutils multilib-minimal flag-o-matic # Official patches # See ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/ @@ -36,26 +38,28 @@ SLOT="${PV:0:1}" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" IUSE="" -RDEPEND=">=sys-libs/ncurses-5.2-r2" +RDEPEND=">=sys-libs/ncurses-5.2-r2:0[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} -src_unpack() { - unpack ${MY_P}.tar.gz - cd "${S}" +src_prepare() { [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) # force ncurses linking #71420 sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed" } -src_compile() { +multilib_src_configure() { append-cppflags -D_GNU_SOURCE - econf --with-curses --disable-static || die - emake -C shlib || die + ECONF_SOURCE=${S} \ + econf --with-curses --disable-static +} + +multilib_src_compile() { + emake -C shlib } -src_install() { - emake -C shlib DESTDIR="${D}" install || die +multilib_src_install() { + emake -C shlib DESTDIR="${D}" install rm -f "${D}"/usr/lib*/*.so } diff --git a/sys-libs/readline/readline-5.2_p14.ebuild b/sys-libs/readline/readline-5.2_p14.ebuild index 89f18029e84b..814c028fdf5e 100644 --- a/sys-libs/readline/readline-5.2_p14.ebuild +++ b/sys-libs/readline/readline-5.2_p14.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ # This version is just for the ABI .5 library -inherit eutils multilib flag-o-matic +EAPI="5" + +inherit eutils multilib-minimal flag-o-matic # Official patches # See ftp://ftp.cwru.edu/pub/bash/readline-5.1-patches/ @@ -36,35 +38,29 @@ SLOT="${PV:0:1}" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" IUSE="" -RDEPEND=">=sys-libs/ncurses-5.2-r2" +RDEPEND=">=sys-libs/ncurses-5.2-r2:0[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} -src_unpack() { - unpack ${MY_P}.tar.gz - cd "${S}" +src_prepare() { [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch # force ncurses linking #71420 sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed" } -src_compile() { - append-flags -D_GNU_SOURCE +multilib_src_configure() { + append-cppflags -D_GNU_SOURCE + ECONF_SOURCE=${S} \ + econf --with-curses --disable-static +} - # the --libdir= is needed because if lib64 is a directory, it will default - # to using that... even if CONF_LIBDIR isnt set or we're using a version - # of portage without CONF_LIBDIR support. - econf \ - --with-curses \ - --disable-static \ - --libdir=/usr/$(get_libdir) \ - || die - emake -C shlib || die +multilib_src_compile() { + emake -C shlib } -src_install() { - emake -C shlib DESTDIR="${D}" install || die +multilib_src_install() { + emake -C shlib DESTDIR="${D}" install rm -f "${D}"/usr/lib*/*.so } diff --git a/sys-libs/talloc/talloc-2.1.0-r1.ebuild b/sys-libs/talloc/talloc-2.1.0-r1.ebuild index 79589e989505..867d31d130f4 100644 --- a/sys-libs/talloc/talloc-2.1.0-r1.ebuild +++ b/sys-libs/talloc/talloc-2.1.0-r1.ebuild @@ -79,7 +79,7 @@ multilib_src_install() { install_name_tool \ -change "${S}/bin/default/libtalloc.dylib" \ "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ - "${ED}"$(python_get_sitedir)/talloc.bundle || die + "${D}"$(python_get_sitedir)/talloc.bundle || die fi fi } diff --git a/sys-libs/talloc/talloc-2.1.3.ebuild b/sys-libs/talloc/talloc-2.1.3.ebuild index a0633c2af256..6efd84bc132e 100644 --- a/sys-libs/talloc/talloc-2.1.3.ebuild +++ b/sys-libs/talloc/talloc-2.1.3.ebuild @@ -79,7 +79,7 @@ multilib_src_install() { install_name_tool \ -change "${S}/bin/default/libtalloc.dylib" \ "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ - "${ED}"$(python_get_sitedir)/talloc.bundle || die + "${D}"$(python_get_sitedir)/talloc.bundle || die fi fi } diff --git a/sys-libs/talloc/talloc-2.1.4.ebuild b/sys-libs/talloc/talloc-2.1.4.ebuild index a0633c2af256..6efd84bc132e 100644 --- a/sys-libs/talloc/talloc-2.1.4.ebuild +++ b/sys-libs/talloc/talloc-2.1.4.ebuild @@ -79,7 +79,7 @@ multilib_src_install() { install_name_tool \ -change "${S}/bin/default/libtalloc.dylib" \ "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ - "${ED}"$(python_get_sitedir)/talloc.bundle || die + "${D}"$(python_get_sitedir)/talloc.bundle || die fi fi } diff --git a/sys-libs/uid_wrapper/Manifest b/sys-libs/uid_wrapper/Manifest index d35e3cc36062..171c4a530e87 100644 --- a/sys-libs/uid_wrapper/Manifest +++ b/sys-libs/uid_wrapper/Manifest @@ -1,2 +1,3 @@ DIST uid_wrapper-1.1.0.tar.gz 34979 SHA256 d6038b7f9eb04714798ad37b4d0ca677014c5ad7c02b42a4791fd89d8ff7ada3 SHA512 21443e4945e932db6043990693a44c45df04d0a1235b499c1d01bebfbf0feac9bc231f4c9fc14334e8d0e45967344627c7de48e16c5ccb493ab8c2de696ee9f9 WHIRLPOOL 33fe78236b20793f3e490c12fd4c55d1fbf42d115d86ab9b951562e9dd474d26fbec2c676bc6f913a945f95caf02bacf6a49bc4c912959fcae4c3599db987e49 DIST uid_wrapper-1.1.1.tar.gz 35873 SHA256 6995bebda7a729502012fac7f897e139cd9dd0819cb00e4ebf954fa0251b0378 SHA512 eedea3fe9f262c341521fc1d52e8f90cf77571c5a589973783c13e153eca23765d84456182e47bbad89f83b8421a61333241789068bcf243318f8b236c5e3c0c WHIRLPOOL 0e63e2c36ebab932dfc4458084eb4f88a5e0af5b91c0e6ef8f57fa7c6015174c1d7c25749d91c58cdd98afb562f8abfa5b1ba17433c5c25ade4519bac311f508 +DIST uid_wrapper-1.2.0.tar.gz 308300 SHA256 80910aaa975dc90247b1c49f90f21c7c118d39bf642fdef3a8e9d739cab4df69 SHA512 2d893b5b7e986b82f22a361a95d8fd3c236463400bd00616c4fa184c57d9d884d0ac2a8a443536d1d5a921912fca302c2ec88db1021f4f2c18b6f7ef9d67cd07 WHIRLPOOL a7f79ea7ae756ad62c19aca23a3394f1b2473c2f61b95ea0f9ca7093dc2f2a9bc49f61b8b667062a503800115cc6efc5a4dc170c59fc2074a74f242a3655dbb8 diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.0.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.0.ebuild new file mode 100644 index 000000000000..a7773d31ac95 --- /dev/null +++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-multilib + +DESCRIPTION="A wrapper to fake privilege separation" +HOMEPAGE="https://cwrap.org/uid_wrapper.html" +SRC_URI="ftp://ftp.samba.org/pub/cwrap/${P}.tar.gz + https://ftp.samba.org/pub/cwrap/${P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +DEPEND="" +RDEPEND="${DEPEND}" + +# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340) +# Because of this we cannot use cmake-multilib_src_configure() here. +multilib_src_configure() { + local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) ) + cmake-utils_src_configure +} diff --git a/sys-power/bbswitch/metadata.xml b/sys-power/bbswitch/metadata.xml index 2c9726db7a94..885be06c1bd9 100644 --- a/sys-power/bbswitch/metadata.xml +++ b/sys-power/bbswitch/metadata.xml @@ -7,7 +7,7 @@ <name>Pacho Ramos</name> </maintainer> <maintainer> - <email>mva@mva.name</email> + <email>gentoo@mva.name</email> <name>Vadim A. Misbakh-Soloviov</name> </maintainer> <maintainer> diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest index 47f32570b1f4..5f7395acf89d 100644 --- a/sys-process/procps/Manifest +++ b/sys-process/procps/Manifest @@ -1,5 +1,4 @@ -DIST procps-3.3.8-respect_epipe_in_fileutils.patch 1412 SHA256 4a56c88697fa6099a62a4169838c9c04df2c2c2bbc08e9ad9953e5b00df16d68 SHA512 317fc8e7c3fbd280182f55b399a30b2cfbc72268590825ea323537361cd761776afe1486509cb04ae937287ccf11578def5aac2eaa0fe660d04f0357282d9c14 WHIRLPOOL f8fdac8a172037edf51e1e777374293848afaa2180adc35adce5bf8ebefceb37df30082b27f6d6f1f5a571ba0f84bdfff9fc6c2343f120ce5c80b2f52e1804ac -DIST procps-3.3.8-top_user_filter.patch 2355 SHA256 089d7d0a0a497d88d34f3d05da245198b97353d11768453f5c57b7a346d72d0d SHA512 dc9af2ef6a9f1e5b8434069226c4739cdb914f4b84c366596e8a4fb853e4d61715814a0888938cd4c96f2f5bd9adaa573e4fb37be659424e615298e65980bca2 WHIRLPOOL 7e7a52917567013f425dc631dbdcafd3c4978893caf9c3e0e2979c7825332d1296e8026c43c1ac4915787226b53949d6264860b549cd0ac79bb0e8c63f264231 +DIST procps-3.3.11-remove_Unix98_output_limits.patch 7582 SHA256 0801b971c630d2d68fe87da0b84842169df38cd88d3854da73b0e9bb45572d29 SHA512 8502264cba62475e3fc218dfde6c8ac375ccbf309843cec3000796e7455f41f287692aafd423f301b6c1a7e5f04c708fe30c2dd305ec3345b7a77b3443e35e55 WHIRLPOOL cbdba6dc94a4bec63f9fae8edc396aa5e59551a1606ed7dee56a65fad2e3d75ea5f391105806262f00103386c47434ec656b55bcefdd565313139355fa31ac61 DIST procps-ng-3.3.10.tar.xz 657232 SHA256 1759229cd0d97da3d200d5599c4ea82726d61fae9c4b7d3edd52c544962791b7 SHA512 cbfa49e79a88a8e7066a9c316ef089f15fa825c5bfbc22ab8a83f53c6f367a7c586cef9c403e360d373d824c471533a15ddb11cd30c561650e6879fe687e7e4f WHIRLPOOL 723dd1c00578a7fa7e3ff47bed60283c30850cc8ae8069c704ba648792809a67c5944dbfd9b7b0159e0be83215b61e6b71b2d76e65b3619aed54223900ffed9b -DIST procps-ng-3.3.8.tar.xz 553056 SHA256 a4109cfb6fe3bcfb5a0efb37efe04d0c8ce858bff3820d48cc258bad41bed46b SHA512 63ba13f9ef0f4558748c6b2d1b0719a1173bd87e38279e3b052a10e207e1b808626d031f16dd65b05c55708366df7350cb0a64da8dc20e7f9f1fdc1cd2417c71 WHIRLPOOL 671860af1f028c9c8c7bb0c035db86e3e13d9d754801e7a3f19105710bb9720bbfa627e4e748b823192286319fe4e7e736c1af5a3fb34116cbe93386b0d2bed6 +DIST procps-ng-3.3.11.tar.xz 815920 SHA256 e9493169a2d2adc0bc045538707310c8e877b385e4e296143b62607d2bb044ed SHA512 8ab4770adeba4c7e3cf75bc189278cf7a162ece0f23b862e7f726faccee11bd4524aec622b895f3b4e0b272a739a327a01e91f48834feea513544f0515b250df WHIRLPOOL 1da50ec4e8be9d76086a1112b00eea0daa39a7e579e846b92c12fea23a8303a7287e2d32d41feae93aad7b138768852b004544731fff882236ee3bd9511154ff DIST procps-ng-3.3.9.tar.xz 560812 SHA256 00f0cb0fadf968ddf605b0ef119846af07386629244d4f3da711a2cecf4e8663 SHA512 62c7270aa48b4346a3198f306d1cb8474f64650bfb67e8cc6c4d41923e50c31c95b3a0367a464823fb50a6137ec0c6352006292ac85b50caf730ec8ec35eb553 WHIRLPOOL dac97433a87badd40b46e3155bf0e30652ed2961a41bc8fca074357431301d250632215512ad752634c9c4f3273a1c75caba1ecf4f5a3c510bee155660dde166 diff --git a/sys-process/procps/procps-3.3.10-r1.ebuild b/sys-process/procps/procps-3.3.10-r1.ebuild index 2371c4dba7ad..b80315344650 100644 --- a/sys-process/procps/procps-3.3.10-r1.ebuild +++ b/sys-process/procps/procps-3.3.10-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-ng-${PV}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux" IUSE="+ncurses modern-top nls selinux static-libs systemd test unicode" RDEPEND="!<sys-apps/sysvinit-2.88-r6 diff --git a/sys-process/procps/procps-3.3.11-r1.ebuild b/sys-process/procps/procps-3.3.11-r1.ebuild new file mode 100644 index 000000000000..d3c2a5def9c0 --- /dev/null +++ b/sys-process/procps/procps-3.3.11-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils toolchain-funcs + +DESCRIPTION="standard informational utilities and process-handling tools" +# http://packages.debian.org/sid/procps +HOMEPAGE="http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps" +# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz" +#FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74" +#SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz" +SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz +https://gitlab.com/procps-ng/procps/commit/b2f49b105d23c833d733bf7dfb99cb98e4cae383.patch -> ${PN}-3.3.11-remove_Unix98_output_limits.patch" + +LICENSE="GPL-2" +SLOT="0/5" # libprocps.so +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" +IUSE="+ncurses modern-top nls selinux static-libs systemd test unicode" + +RDEPEND="!<sys-apps/sysvinit-2.88-r6 + ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) + selinux? ( sys-libs/libselinux ) + systemd? ( >=sys-apps/systemd-209 )" +DEPEND="${RDEPEND} + ncurses? ( virtual/pkgconfig ) + systemd? ( virtual/pkgconfig ) + test? ( dev-util/dejagnu )" + +S="${WORKDIR}/${PN}-ng-${PV}" + +#src_unpack() { +# unpack ${A} +# mv ${WORKDIR}/${PN}-v${PV}-* ${WORKDIR}/${P} || die +#} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209 + epatch "${DISTDIR}"/${P}-remove_Unix98_output_limits.patch # 555200 +} + +src_configure() { + econf \ + --docdir='$(datarootdir)'/doc/${PF} \ + $(use_enable modern-top) \ + $(use_with ncurses) \ + $(use_enable nls) \ + $(use_enable selinux libselinux) \ + $(use_enable static-libs static) \ + $(use_with systemd) \ + $(use_enable unicode watch8bit) +} + +src_test() { + emake check </dev/null #461302 +} + +src_install() { + default + #dodoc sysctl.conf + + dodir /bin + mv "${ED}"/usr/bin/{kill,pidof,ps} "${ED}"/bin/ || die + + gen_usr_ldscript -a procps + prune_libtool_files +} diff --git a/sys-process/procps/procps-3.3.8-r2.ebuild b/sys-process/procps/procps-3.3.8-r2.ebuild deleted file mode 100644 index 81f27df40987..000000000000 --- a/sys-process/procps/procps-3.3.8-r2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils toolchain-funcs - -DESCRIPTION="standard informational utilities and process-handling tools" -# http://packages.debian.org/sid/procps -HOMEPAGE="http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps" -# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz" -FEDORA_HASH="aecbeeda2ab308f8d09dddcb4cb9a572" -SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz - https://gitorious.org/procps/procps/commit/ce5e995921e770bfcda25e42fe090aeccdbf1291.patch -> ${PN}-3.3.8-respect_epipe_in_fileutils.patch - https://gitorious.org/procps/procps/commit/e6a78f2745ca6c7ceed4406d3ce5397e77518b11.patch -> ${PN}-3.3.8-top_user_filter.patch" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="+ncurses nls static-libs test unicode" - -RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] )" -DEPEND="${RDEPEND} - ncurses? ( virtual/pkgconfig ) - test? ( dev-util/dejagnu )" - -S=${WORKDIR}/${PN}-ng-${PV} - -src_prepare() { - epatch "${FILESDIR}"/${P}-kill-neg-pid.patch \ - "${DISTDIR}"/${P}-respect_epipe_in_fileutils.patch \ - "${DISTDIR}"/${P}-top_user_filter.patch -} - -src_configure() { - econf \ - --exec-prefix="${EPREFIX}" \ - --docdir='$(datarootdir)'/doc/${PF} \ - $(use_with ncurses) \ - $(use_enable nls) \ - $(use_enable static-libs static) \ - $(use_enable unicode watch8bit) -} - -src_install() { - default -# dodoc sysctl.conf - - # The configure script is completely whacked in the head - mv "${ED}"/lib* "${ED}"/usr/ || die - gen_usr_ldscript -a procps - prune_libtool_files -} diff --git a/sys-process/procps/procps-3.3.9.ebuild b/sys-process/procps/procps-3.3.9.ebuild deleted file mode 100644 index aeecf82ae205..000000000000 --- a/sys-process/procps/procps-3.3.9.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils toolchain-funcs - -DESCRIPTION="standard informational utilities and process-handling tools" -# http://packages.debian.org/sid/procps -HOMEPAGE="http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps" -# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz" -FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74" -SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="+ncurses nls static-libs test unicode" - -RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] ) - !<sys-apps/sysvinit-2.88-r6" -DEPEND="${RDEPEND} - ncurses? ( virtual/pkgconfig ) - test? ( dev-util/dejagnu )" - -S=${WORKDIR}/${PN}-ng-${PV} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch -} - -src_configure() { - econf \ - --exec-prefix="${EPREFIX}" \ - --docdir='$(datarootdir)'/doc/${PF} \ - $(use_with ncurses) \ - $(use_enable nls) \ - $(use_enable static-libs static) \ - $(use_enable unicode watch8bit) -} - -src_install() { - default -# dodoc sysctl.conf - - mv "${ED}"/usr/bin/pidof "${ED}"/bin/ || die - - # The configure script is completely whacked in the head - mv "${ED}"/lib* "${ED}"/usr/ || die - gen_usr_ldscript -a procps - prune_libtool_files -} diff --git a/virtual/dnspython/dnspython-1.ebuild b/virtual/dnspython/dnspython-1.ebuild new file mode 100644 index 000000000000..14cf6ee264d7 --- /dev/null +++ b/virtual/dnspython/dnspython-1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit python-r1 + +DESCRIPTION="A virtual for dnspython, for Python 2 & 3" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + !dev-python/dnspython:0 + $(python_gen_cond_dep 'dev-python/dnspython:py2[${PYTHON_USEDEP}]' python2*) + $(python_gen_cond_dep 'dev-python/dnspython:py3[${PYTHON_USEDEP}]' python3*)" +DEPEND="!dev-python/dnspython:0" diff --git a/virtual/dnspython/metadata.xml b/virtual/dnspython/metadata.xml new file mode 100644 index 000000000000..ee7e8b2450a8 --- /dev/null +++ b/virtual/dnspython/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>python</herd> +</pkgmetadata> diff --git a/virtual/funcsigs/funcsigs-0.ebuild b/virtual/funcsigs/funcsigs-0.ebuild index 6674d0ca0aa9..c811a39f5d10 100644 --- a/virtual/funcsigs/funcsigs-0.ebuild +++ b/virtual/funcsigs/funcsigs-0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_{3,4}} ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit python-r1 @@ -14,11 +14,12 @@ SRC_URI="" SLOT="0" LICENSE="" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/funcsigs' python2_7)" + $(python_gen_cond_dep 'dev-python/funcsigs' python2_7 pypy )" +DEPEND="" diff --git a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.140.0.ebuild b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.140.0.ebuild new file mode 100644 index 000000000000..b628e6c93ba9 --- /dev/null +++ b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.140.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="Virtual for ${PN#perl-}" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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" +IUSE="" + +DEPEND="" +RDEPEND=" + ~perl-core/${PN#perl-}-${PV} +" diff --git a/virtual/pmw/pmw-1.ebuild b/virtual/pmw/pmw-1.ebuild index e36e85d41660..f16cf1185864 100644 --- a/virtual/pmw/pmw-1.ebuild +++ b/virtual/pmw/pmw-1.ebuild @@ -17,6 +17,9 @@ SLOT="0" KEYWORDS="alpha amd64 ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux" IUSE="" -RDEPEND=" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep 'dev-python/pmw:py2[${PYTHON_USEDEP}]' python2*) $(python_gen_cond_dep 'dev-python/pmw:py3[${PYTHON_USEDEP}]' python3*)" +DEPEND="" diff --git a/www-apps/jekyll-gist/Manifest b/www-apps/jekyll-gist/Manifest index 2079378c0b44..2b28063ebed9 100644 --- a/www-apps/jekyll-gist/Manifest +++ b/www-apps/jekyll-gist/Manifest @@ -1 +1 @@ -DIST jekyll-gist-1.3.4.tar.gz 5294 SHA256 a66e4440eae6c811f20b4aedded236a89b2aaf89190d00979fad478ff979fda2 SHA512 379ce28b5ebf740e1e876b8f7ff9ea9ae0525acbbf9f0cd4b3e8e91d977efbd405fa6886f700b18764c705ebcb3b308cc2e8e453177855afeb6e1bdcf6cae14b WHIRLPOOL c14e640091ab98ba3fd036014047e8b87e633af0b53da83629a41b093e5489ddc22bcc4e56f4f7bbc53b000d7e591f9820ecca3788765c6866c4c8a99807b2e5 +DIST jekyll-gist-1.3.5.tar.gz 5495 SHA256 fda6aa7638c9255b197d3037aa9b236b99dff117d17c293bfb59f28776e065cb SHA512 f3028f11d594645a776c10cb9daef55d2f54592bc97fba25f1ffe4390c18e2c35330a674f40c12e34847c9dfe9844495aa419d9959b305a4100c2729e291efb2 WHIRLPOOL 9c52508ce49bd3974fe2965fa56c0bed3b1869f0b1613e220a1b10c849ecb42bbc83800ad501c0ed8a2d6a17399503e93cc9601a061169161087cf3d3d675020 diff --git a/www-apps/jekyll-gist/jekyll-gist-1.3.4.ebuild b/www-apps/jekyll-gist/jekyll-gist-1.3.5.ebuild index 14eb376d9fb4..1405a58457a6 100644 --- a/www-apps/jekyll-gist/jekyll-gist-1.3.4.ebuild +++ b/www-apps/jekyll-gist/jekyll-gist-1.3.5.ebuild @@ -20,7 +20,8 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )" +ruby_add_bdepend "test? ( dev-ruby/webmock + >=www-apps/jekyll-2 )" all_ruby_prepare() { rm Rakefile || die diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest index 9bd80c86e5ac..cbb1f55f21c8 100644 --- a/www-apps/jekyll-watch/Manifest +++ b/www-apps/jekyll-watch/Manifest @@ -1 +1,2 @@ DIST jekyll-watch-1.2.1.tar.gz 13660 SHA256 7641a8f4eb5a281ae0ff6f5553882b40ad95bd663136bc802036a3f3110e97fd SHA512 69fabe7ef01f2bbcf81e0ba0ce4e62d6999ff1a1da1b8dc254e364dc61af2bf6989f1f1ac8da6b2da7991e1972813b7c509fb0cb23558f16536b8f68fa57f62c WHIRLPOOL 2c082ce9bd703e639170f6b4ee781c3ebe8dad8e59f1cb0fdc690fb4136b4432368a53095f7455728fed4e6b44b0ae1d467dd26cc0acf8a7713b582fc3703c25 +DIST jekyll-watch-1.3.0.tar.gz 13882 SHA256 a87b9e76e575ec394525b6b804bf8aa430eb51df2e309f34b0f2f46129b9c353 SHA512 91950cdeba568ef368ea5f91f3ec3208073786f12e7a8587e2560c92be9108d5d97d9ddc517eb681df3335bcdc0f8b85c9425fbe289b39912c3c4c6ef8d641e2 WHIRLPOOL a5e18c641921f561e42557cbd902100fac085d2fd320771581d507122fa6fa77bf60cf9e26a7444eac0387227c1e131ab611cee814178cd1748c2e74912a67d1 diff --git a/www-apps/jekyll-watch/jekyll-watch-1.3.0.ebuild b/www-apps/jekyll-watch/jekyll-watch-1.3.0.ebuild new file mode 100644 index 000000000000..4ffd0bce342d --- /dev/null +++ b/www-apps/jekyll-watch/jekyll-watch-1.3.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby19 ruby20 ruby21" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="README.md History.markdown" + +inherit ruby-fakegem + +DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch" +HOMEPAGE="https://github.com/jekyll/jekyll-watch" +SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_rdepend ">=dev-ruby/listen-3.0" +ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )" + +all_ruby_prepare() { + rm Rakefile || die + # Fix tests until Rspec:3 is in tree + sed -i -e "/default_formatter/d" -e "/verify_partial_doubles/d" spec/spec_helper.rb || die +} diff --git a/www-apps/webdavcgi/metadata.xml b/www-apps/webdavcgi/metadata.xml index 69dfa868c9fb..d68a2a4f22b4 100644 --- a/www-apps/webdavcgi/metadata.xml +++ b/www-apps/webdavcgi/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>christian.affolter@stepping-stone.ch</email> + <email>c.affolter@stepping-stone.ch</email> <description>Maintainer</description> </maintainer> <maintainer> diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 14d33d0f09c1..2d78741b6d7c 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ DIST chromium-46.0.2490.71-lite.tar.xz 261722748 SHA256 28248eea8ee6855e6b5e41ff1cd28d8f5878896c2c388e113e419141c07dcbaf SHA512 e889739ab2783d617626e113642804c6e92bae08e4192b656c62f5efa57bee8db7eda2edc2e48a2245936f6c1a359ee55847c52a9d63588a0c5253332aeddd71 WHIRLPOOL b33fdc7f46dc90341acdb9cafd4854235479020d722fe6431c2e0e5626634eb0f8e1f34d0bb1f55adbc984c889f60f136f465bcc578005089f3b2b6360b57843 DIST chromium-47.0.2526.16-lite.tar.xz 302984700 SHA256 771deecde8d861e6ac7ba125113269566cad6a9dbdcf129eeac1005b38691096 SHA512 fed1e62c98ec2c21d7ff4b0357fdcd67b536b2bdf9eec3b043dd50127c073749cf8e138e7909481992ab3b4de4a47d34ede3bc348b4dad4964c4c2cd9cf52f84 WHIRLPOOL c45149bb9b91c215be65254680d878c5260ecdfb0a97325fd5726ad67d6fcedae8b70bb158ba1be1e10aed10cb6713625f444a85348c08098f25710df53be239 DIST chromium-47.0.2526.6-lite.tar.xz 302688196 SHA256 c794fa33f97b0ab9b77a9438d8ba86cd1311d18241acd53a6f23df058f051279 SHA512 838ca886e78e03e53bc8c6c9d0bd89d04004a8befc5021cc13cc1ac0b30620cac88d543353518a413ea94be503fcb64c0810b8bd24c706afa64c5e4425e4827e WHIRLPOOL ee7636c223d63bd46f65da05839af4da369445afe427eefb268066a86c5819385c75cdc1abb8ec9506defe631b0e1ef29b6e71a1d8d7331edc63c3be3a90a82a -DIST chromium-48.0.2535.0-lite.tar.xz 303353372 SHA256 5a15d41b5853308e49351abaf8063e3713ec0eb4496aa3bc732c31c2ee3966ff SHA512 70c6ec154be33bc6772b8bd06da0fbbbd6a159e54caa380f5e784e660d5e8838248591fc57cffa9356cb78a6a9abfff4a1ab028b41ed10e2b24593863149b98b WHIRLPOOL fba422c5d49c321c1cc15335b9050fe12f73df7d699afb55e438dcb4018b15d44eafecc907555de5a083e4e5b69f207c04bde9aea841ede61e0558ddbfd547fc DIST chromium-48.0.2541.0-lite.tar.xz 303773932 SHA256 09a1913336a7b0b5278e98759671cb88e15d04340fb244c9c31dbf8986149a12 SHA512 19b19268bd50019847b2e2262d6941beaa6ede9b740e3a18944598dcd17a7e61850f535c3384e3f34331d8f6fa9235025dfc08f3a32b70ad9cfeef43def4bbe6 WHIRLPOOL 79e193afca9304d3f0bf764da74d6268539511ddc2ecff58142301762c9d51422ebc6350a8175fb7bd5ec4b94db02dd99d93f4d2b1d1dc75660407a5d5dc9272 +DIST chromium-48.0.2547.0-lite.tar.xz 306282056 SHA256 cfbdce75bd8904d4a43d5bc7acc82481bfe840c17894294cb0b3d79c2386cee2 SHA512 706c7e6699b7e07a819d29c88a678c62507251cb08ccd4516e2ce847519a34356d49762037a3fefac8adff39f1f9b7c0a6284fa455ffccd98e6074d1ac346d1f WHIRLPOOL 7694f443375dfdc17c90fd4b6c603b210b5e34ad39cfbe93ee9bcdebf0d5600f389b5ffd54fd3438460ffa88e4d456ad20e5b0553582b8ce0389f2bd7c7e15f5 diff --git a/www-client/chromium/chromium-48.0.2535.0.ebuild b/www-client/chromium/chromium-48.0.2547.0.ebuild index bb24b4ac678b..795e72fa7e3d 100644 --- a/www-client/chromium/chromium-48.0.2535.0.ebuild +++ b/www-client/chromium/chromium-48.0.2547.0.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD hotwording? ( no-source-code )" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="cups gnome gnome-keyring gtk3 hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" +IUSE="cups gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" # Native Client binaries are compiled with different set of flags, bug #452066. @@ -230,13 +230,13 @@ src_prepare() { 'third_party/brotli' \ 'third_party/cacheinvalidation' \ 'third_party/catapult' \ + 'third_party/catapult/third_party/py_vulcanize' \ + 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ + 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \ 'third_party/catapult/tracing/third_party/components/polymer' \ 'third_party/catapult/tracing/third_party/d3' \ 'third_party/catapult/tracing/third_party/gl-matrix' \ 'third_party/catapult/tracing/third_party/jszip' \ - 'third_party/catapult/tracing/third_party/tvcm' \ - 'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \ - 'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \ 'third_party/cld_2' \ 'third_party/cros_system_api' \ 'third_party/cython/python_flags.py' \ @@ -288,7 +288,6 @@ src_prepare() { 'third_party/polymer' \ 'third_party/protobuf' \ 'third_party/qcms' \ - 'third_party/readability' \ 'third_party/sfntly' \ 'third_party/skia' \ 'third_party/smhasher' \ @@ -378,6 +377,7 @@ src_configure() { $(gyp_use gnome-keyring use_gnome_keyring) $(gyp_use gnome-keyring linux_link_gnome_keyring) $(gyp_use gtk3) + $(gyp_use hangouts enable_hangout_services_extension) $(gyp_use hidpi enable_hidpi) $(gyp_use hotwording enable_hotwording) $(gyp_use kerberos) diff --git a/www-client/dillo/dillo-3.0.5.ebuild b/www-client/dillo/dillo-3.0.5.ebuild index 9db79ebd5f52..779b93db886d 100644 --- a/www-client/dillo/dillo-3.0.5.ebuild +++ b/www-client/dillo/dillo-3.0.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.dillo.org/download/${P}.tar.bz2 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd" IUSE="doc +gif ipv6 +jpeg +png ssl" RDEPEND=" diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest index a5742c5f6393..af3a5c5b0754 100644 --- a/www-client/google-chrome-beta/Manifest +++ b/www-client/google-chrome-beta/Manifest @@ -1,2 +1,2 @@ -DIST google-chrome-beta_47.0.2526.27-1_amd64.deb 47182218 SHA256 24f6a0b6c5c7593f941b12874620ae39eefa796030c0c8a3e5d0b6f650af5e51 SHA512 5c84019746941f7c9adb6f147ec6db6b8aeb3147146a305b2464b1438733f292abe759e60b65dbebe57187a356e633a6110fc6ea6a9beef4136f57000b150a05 WHIRLPOOL e392759a3e5c24b04d15fc6acfc7c9352af9427a0c6ef91a364be24562bf9c0ed0d27d923bf990de239da698478d87687be6b2d34c674d7ab9402f907a7b795c -DIST google-chrome-beta_47.0.2526.27-1_i386.deb 47207988 SHA256 70f70014f0b4c5529699c40171894e5aed0f575d79418399d8ad76bf9edc9f9d SHA512 8df2307d24ae19e2022cb12b8f1472701c06a0e5d743308a10c52cff84e5434d63d8e0da1b4dd41ae0819b8611c6c8eac283b0ca38b7e5b08b5ead093c00cb3e WHIRLPOOL a1374d6023a08b945f45ae902cc6e24e48f85730522e2679331ab405ece418c8fbd40edce2098844165e072d07c9dbe9ca842fb9fc0c1fad3d44df1b094a80a9 +DIST google-chrome-beta_47.0.2526.35-1_amd64.deb 47152890 SHA256 287e7bed84db2a833d2497e1a5d691ea4ac6f92dd97406a3d62c14da624d9a9f SHA512 aba35bd3d4e1bb4d1a48c1d52500af025de696012d6667f680252c00b1af1b1548c23e2f8b131e5a443d23aca35ba2cf4c4410bab6100344735c4a21626757cd WHIRLPOOL 392b3119e19df24f67832f8318fd5dea4071b16c1ab266a02eef9e0a4534b5c03e339ee5a8d36a415f7bedb56154d8192ae47577e342c6149dc6ca08e8fcec56 +DIST google-chrome-beta_47.0.2526.35-1_i386.deb 46829710 SHA256 b8083b7c666c1d639bce8b741d1c811ccec4fd7fdf823982b730c503afa448cd SHA512 e3cfebef29c568c57d93b97294d71805208c7ed82edd2141ca42599b7c93b06c6830495d28830c750741cab4d8c951917cef8b012494e9c8069ad8bceba3a787 WHIRLPOOL 644bddf0f66989dea7c74ab612c6cc3a7ea4c5f06ed8fb423113f6c7951c46be522c8768836cad3b2221c9b009476cbe4775d0cff4afd47fb80e776fb629b0fd diff --git a/www-client/google-chrome-beta/google-chrome-beta-47.0.2526.27_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-47.0.2526.35_p1.ebuild index e8b0bfaff40c..e8b0bfaff40c 100644 --- a/www-client/google-chrome-beta/google-chrome-beta-47.0.2526.27_p1.ebuild +++ b/www-client/google-chrome-beta/google-chrome-beta-47.0.2526.35_p1.ebuild diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest index 62aef2c9dd23..788492193187 100644 --- a/www-client/google-chrome-unstable/Manifest +++ b/www-client/google-chrome-unstable/Manifest @@ -1,2 +1,2 @@ -DIST google-chrome-unstable_48.0.2541.0-1_amd64.deb 47822896 SHA256 96561ef74947ec511e20bee51bf7dc94e42ccdbc51a2180d61effe6907865d05 SHA512 1e56c0489c0740fc7c4b095c66a35952cd1ea6374611498a302afc4cb9daa0553738cd80dfbb5bee7e66fe3bd12736a24e6ee0b9d94317f4f2b649a17bdfe092 WHIRLPOOL 4fb4d69e8422d486bc69460433ac442bea8c2fbe8c1b3b4c6fd3cf105aa75b2123f37879abf3625cd694c72fe292c4a5675049dbe3795330cfcc0f7d327e78cd -DIST google-chrome-unstable_48.0.2541.0-1_i386.deb 47379976 SHA256 03576fef4165fe77ad32bf3faa4c787120fd342323b8ffb8098b381437fe6351 SHA512 7376c3a0e0ba48f5325195190495a7d45abf037446a8ef6710d5f4a309bed0c4cb7179592d0b06341bece887b525a5a9a6ddf3ab5f51e31259615acf32d02556 WHIRLPOOL 91bc6c30fb0b04b9d54c07afb16a769578d110439db547e32266ecb3e57a9a362bb756f4055f35e3266abed5f2143b9b577ef01d1508c4c1d669f417014d33b5 +DIST google-chrome-unstable_48.0.2547.0-1_amd64.deb 47606416 SHA256 8b7311ee78b3f710eccd8d655e58c67ffbc58b7b8af3fb997a458dce2fd272c6 SHA512 f2fcb3bd41557311c65fdf85b3acfaa5be61b44b094297fad988c7224cddb3f6630cb4c8f6d2930079715410622ba597e86dabe2cb2dd43748bcf7d694fb6527 WHIRLPOOL 3b7df0012186ad634dc4488dc03cb7720331c372a17cf3f70052adbe13e734515f57089d75ac2d358c4157a39130502bae8c6953c0cdf4311609752b0fc6d841 +DIST google-chrome-unstable_48.0.2547.0-1_i386.deb 47055758 SHA256 d9eb126aab595a57ed893fe57f3b14eb76d3593f19ba0925dfff7c10890df1e6 SHA512 b07a3069d6c9cc5a626398913498b4934065a13b22d3454cfa07eaf2f93c3f1f70b45bdf0a91d2a7547f81b7170fbec500212c91736a1e50bd724493c2b7564f WHIRLPOOL ea90e644fc93713d6588116b716c94b95fb0628ed93cae61d5db9cbfc13ce96139609cc9478b23fba94047ec6d20556753d61ea43d64376964637b163c3eb931 diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2541.0_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2547.0_p1.ebuild index 16a97bed9bb0..16a97bed9bb0 100644 --- a/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2541.0_p1.ebuild +++ b/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2547.0_p1.ebuild diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index 872ffdc39e6f..696c7f0b5d28 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -2,4 +2,4 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 SHA256 ecc001605c45baa4acf60 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 dcd80ea7a8f090a47007fc630495817feeb167220b9a9bbffbf349687f3e29d3 SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844 WHIRLPOOL 5703b2c736694cf6ffcf808872e72585b81c7fed9d2263d5679ee54f667f4eb6b9d34a73b80c8efc0a8640daf03da60dafa0defe0c560d3ef78f2a8a68cbb960 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 WHIRLPOOL ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1 -DIST opera-stable_32.0.1948.69_amd64.deb 42053626 SHA256 b2178af796a9b5adf3a8d6f17391ade03efc6ad3c0f9d853f1e9766735eba91b SHA512 33990e095c4ab135c391fac1c03ec0f0af58f3844b5d96dd95a8308768567cf8ee55d0a014ce3796545a57cbb67431a44344248cffe17718c5526e17300d396d WHIRLPOOL f1646a4f35c9f0d8745ef9917f5c1fca1d66c8bc01608d592dcc5597f5abdbfb554d61b780ca75096eb849207276e6565ea176280578ef47f9d68f8bb1f76f6a +DIST opera-stable_33.0.1990.43_amd64.deb 43844248 SHA256 39798cfd3a10402e95bcd93cf03c43f0d3819561d22f7a7ecf0ebe9d4c4bef8d SHA512 4d7a3c090c93ead8b7fcc36b84b3e51b8bd849ff8eeef8c9d0da9bb71636f802b68f54729946032f20c8ece80d16e07c363bfa164d79614df6af9e03a0391bc5 WHIRLPOOL ce87e24f24f61665262960590b920106da3c08b325abbfb9bf65f1f4afd3ab48cb5acf07ca665f77ae94ed185a800222363ab20af260d7a8908a567f802820c2 diff --git a/www-client/opera/opera-32.0.1948.69.ebuild b/www-client/opera/opera-33.0.1990.43.ebuild index eb73eb41609e..eb73eb41609e 100644 --- a/www-client/opera/opera-32.0.1948.69.ebuild +++ b/www-client/opera/opera-33.0.1990.43.ebuild diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest index 039da4ad9325..4b10d3120d70 100644 --- a/www-client/qutebrowser/Manifest +++ b/www-client/qutebrowser/Manifest @@ -1,2 +1,3 @@ DIST qutebrowser-0.2.1.tar.gz 892955 SHA256 0738377c1069d7d9ce1ff61e7425a139b44d21493d3a5c6338d697eb54f26d31 SHA512 9c49779515e6d7a3c9b93d50b51138f20292712f08de6f682db4f452c893796d9c66af7cca9ab7c18a5b7ddc147d62b7649572c7cdd416cc67c81cdf462c4f01 WHIRLPOOL 5f2f42163b59490eda25bad390c71113c8e7725a7bd8fa47240516a336364c76a7f97c516996f1ffcbc11025785070a30a6bccdcd66a06459ffbb24f874ed960 DIST qutebrowser-0.3.0.tar.gz 938380 SHA256 a0c02148bf76eb13691d9476e6ab8bc791993dfe7a408974ba31dd6eb6584461 SHA512 ee0e5808f7732c3c4cd577beb9c25227af0b6a3136bd20b80e18fef20a0d7ae34111f40db2bc0071e34a92c0b0dc94c8899f0953107b4926ff5ba2894fc818e0 WHIRLPOOL 95bd3e1a8c065a31d816ea8f7d85649d937aed6ddf85cb28ad309cab2d7ed0b9dc72672106321be9a2d0a085622114fc340122920c4c528750e70636d88930d3 +DIST qutebrowser-0.4.1.tar.gz 909363 SHA256 6e1022e4b349fd09bd8efa643d2411badb8305fee911d266db5dce66290a3ed7 SHA512 a31b3a99010babf26c4e9c867840d419e0f2f3acf874d9b61812744d1845914fd2505c8178976a14e57286842706431ad6305773e7087db6a4d4105b91c98aed WHIRLPOOL 2176e54fcff48b6b81629040b9826ea981b5eec963b506a54194d60a12a971763df9609f00958b30f61c209acf306faa2290f58d81590eed89e0b3705a2b9b9f diff --git a/www-client/qutebrowser/qutebrowser-0.4.1-r1.ebuild b/www-client/qutebrowser/qutebrowser-0.4.1-r1.ebuild new file mode 100644 index 000000000000..6e4744da5712 --- /dev/null +++ b/www-client/qutebrowser/qutebrowser-0.4.1-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python3_4 ) + +inherit gnome2-utils distutils-r1 eutils fdo-mime + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git" + inherit git-r3 +else + SRC_URI="https://github.com/The-Compiler/qutebrowser/releases/download/v${PV}/qutebrowser-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit" +HOMEPAGE="https://github.com/The-Compiler/qutebrowser" + +LICENSE="GPL-3" +SLOT="0" +IUSE="gstreamer test" + +COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="${COMMON_DEPEND} + app-text/asciidoc + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" +RDEPEND="${COMMON_DEPEND} + >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}] + >=dev-python/pygments-2.0.2[${PYTHON_USEDEP}] + >=dev-python/pypeg2-2.15.1[${PYTHON_USEDEP}] + dev-python/PyQt5[${PYTHON_USEDEP},gui,network,printsupport,webkit,widgets] + dev-python/sip[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}] + gstreamer? ( dev-qt/qtwebkit:5[gstreamer] ) +" + +RESTRICT="test" + +python_compile_all() { + if [[ ${PV} == "9999" ]]; then + "${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs" + fi + + a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page" +} + +python_test() { + py.test tests || die "Tests failed with ${EPYTHON}" +} + +python_install_all() { + doman doc/${PN}.1 + dodoc {CHANGELOG,CONTRIBUTING,FAQ,README}.asciidoc + + domenu ${PN}.desktop + doicon -s scalable icons/${PN}.svg + + distutils-r1_python_install_all +} + +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/www-client/qutebrowser/qutebrowser-0.4.1.ebuild b/www-client/qutebrowser/qutebrowser-0.4.1.ebuild new file mode 100644 index 000000000000..0bfb6986d259 --- /dev/null +++ b/www-client/qutebrowser/qutebrowser-0.4.1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python3_4 ) + +inherit distutils-r1 eutils fdo-mime + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git" + inherit git-r3 +else + SRC_URI="https://github.com/The-Compiler/qutebrowser/releases/download/v${PV}/qutebrowser-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit" +HOMEPAGE="https://github.com/The-Compiler/qutebrowser" + +LICENSE="GPL-3" +SLOT="0" +IUSE="gstreamer test" + +COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="${COMMON_DEPEND} + app-text/asciidoc + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" +RDEPEND="${COMMON_DEPEND} + >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}] + >=dev-python/pygments-2.0.2[${PYTHON_USEDEP}] + >=dev-python/pypeg2-2.15.1[${PYTHON_USEDEP}] + dev-python/PyQt5[${PYTHON_USEDEP},gui,network,printsupport,webkit,widgets] + dev-python/sip[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}] + gstreamer? ( dev-qt/qtwebkit:5[gstreamer] ) +" + +RESTRICT="test" + +python_compile_all() { + if [[ ${PV} == "9999" ]]; then + "${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs" + fi + + a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page" +} + +python_test() { + py.test tests || die "Tests failed with ${EPYTHON}" +} + +python_install_all() { + doman doc/${PN}.1 + dodoc {CHANGELOG,CONTRIBUTING,FAQ,README}.asciidoc + + domenu ${PN}.desktop + doicon icons/${PN}.svg + + distutils-r1_python_install_all +} + +pkg_postinst() { + fdo-mime_desktop_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest index 44d988caba34..fbc382ff6683 100644 --- a/www-client/vivaldi/Manifest +++ b/www-client/vivaldi/Manifest @@ -1,4 +1,4 @@ -DIST vivaldi-1.0.303.23_p1-amd64.deb 41796198 SHA256 b58e90380ca40e94933523e3ec5c67708fd693a3fe7f11380f52ee88cc7e0819 SHA512 b8ef7b6881d64239a1151b5350b878384849ec9040d3ed62b894ff6eacde1a43031b7502df1dae935439416083094ad516affdd831415b8d8ed24d5ffc58608b WHIRLPOOL dcba679aeaf2cade9085a058a6a14b6ec9607eb8a5ed50dc4b1bfd6eb750677cd04476e973a8c4189255972218abf2a518b744cb3df4056160a1d56c31a90f40 -DIST vivaldi-1.0.303.23_p1-i386.deb 42319714 SHA256 f1bfbc5dd5b6f8dac6f4fbf5627e26623e341d964d323802825f3a03cb5006f5 SHA512 e1164a991c1685b612dcabe122af488d085946504121a17a2e88b87913a1a1ea4f1c5b3ce89b27b614baf1706df3aac6349c44aa1630467834bad8fffa40720c WHIRLPOOL ccc9787a6f24beb48a1c4f23e9b299dd95d54f4287ed303aeadf0f8bb650ef16999d51eecddce608b1199c027673df749da318161c3ed2c9e29d1a078f562ea0 -DIST vivaldi-1.0.303.27_p1-amd64.deb 41796372 SHA256 d5894de6bea068618861fee067370a52a39360e7922598062f763f90244ed195 SHA512 aea6cea491c146344e3f14cf86724fdba89c45ac5956cdc14c0d4f693f0751334c7364e958571485a629a8cad34553325639f8881b14bdb4c9122468517314a4 WHIRLPOOL 97c5915e6c57e3d786c9446d4e57f6c88f1051f4efb67b611cad5e01b4b687887c46545b1cc70693661151ca3bf052dae9c463079021bdc140afed3b3335502f -DIST vivaldi-1.0.303.27_p1-i386.deb 42248962 SHA256 04de6d303e848ab7374e9c4d282ef6c8e75bf39dddafaba866bc9e25bf59c193 SHA512 a247a917194bdb5931b57e5a34e49da51f858b2238358e351a791a62aee0fa7c1e8481f22e34d994d54ce3967ec5676df7ca0b82375eb87131b7769caedd042e WHIRLPOOL 745abf17aa4431c54da8a6bd474a95bbdc80f8f9ae72cc054fd79c2a853f0625b851ff6de69115a829f5b09537589b7a2cca4a89a0f14a2e83f4b2ea8d5357ba +DIST vivaldi-1.0.303.40_p1-amd64.deb 41795562 SHA256 3550e902a5246ded926266248882f4ae921d42783b50c9b619a688f383baa28a SHA512 1af1e63034d4e8aad4a45cb114adc11dd43f42e339cbb6170ce6923cd9495ec53da59ab81c89e732fcd59428ade5eb98d5931ddbf8c8ad90984caabcd213c8e9 WHIRLPOOL 54e492562b8348fc87297adb0166af18ac1d93702eb124bde878970a39e85d7c3b43d2bda3abc8bc5218bbc077a5fd92ff3431c5d988eaf2667ea5f87a3de12a +DIST vivaldi-1.0.303.40_p1-i386.deb 42289384 SHA256 559e14b38c45929557527c708adc3291b92248bbe008ac88b435e64a8bb4161f SHA512 66ea0a253f02c024fd4be6f62728a4ac6468989dbf51991b945366c74c5cbb086fddde09b84e4250c5ee423c20b721726c7f6311e1a78595cd48e47b103bc192 WHIRLPOOL a06ce50c21bf0af0c808e5f32d864bd5958969f2104ddf0e740f6b0bf29d2f12c6c0e1469f84c24f48b9c0cc38d31495559cdff5bedee2370d0902c0027099e9 +DIST vivaldi-1.0.303.48_p1-amd64.deb 41856320 SHA256 4025ebdee426c3778c891ecb4d63fc4081ed71b129d433334e364621e8f764a8 SHA512 59a0af1731ad3afc3550a1bf4b013b04622fa47be3ca1d857527d5e391724bf400ab227ccc88ffb03f4b673167134ef733c22c1cc6fcacda480914348befac9c WHIRLPOOL 6f511de2fd90163db3d91b51e78d489d3e276d5a8fbfe73deeefe8672a8e28f0351f7f7c1a66ebd190a4f5fded4bac475f491c037113f6c06316e612a99a78fd +DIST vivaldi-1.0.303.48_p1-i386.deb 42360320 SHA256 69cae26c2a5bd9b0995a17aaa5f44f04057624b4906a294f6ebc0af30ee9b9af SHA512 f4da47fa16adabd42bb82d8e485013d2f6af95ccd35e90ad3697d85d382e0389503ed61d113f17db76cbca99f556b2496e94cec53f00f485460ee6782ae72733 WHIRLPOOL 1691e15fb187a401f712072247b0d35433c604e4c27a8831a447f36e2593fcfb360ce2594e535444f9bd3923bab68863b80e02107822e405939e7a34cd5789eb diff --git a/www-client/vivaldi/vivaldi-1.0.303.23_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.303.40_p1.ebuild index c40dd917fbf3..c40dd917fbf3 100644 --- a/www-client/vivaldi/vivaldi-1.0.303.23_p1.ebuild +++ b/www-client/vivaldi/vivaldi-1.0.303.40_p1.ebuild diff --git a/www-client/vivaldi/vivaldi-1.0.303.27_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.303.48_p1.ebuild index c40dd917fbf3..c40dd917fbf3 100644 --- a/www-client/vivaldi/vivaldi-1.0.303.27_p1.ebuild +++ b/www-client/vivaldi/vivaldi-1.0.303.48_p1.ebuild diff --git a/www-misc/litmus/metadata.xml b/www-misc/litmus/metadata.xml index f0b5e4cd5d70..04e6d0d7818c 100644 --- a/www-misc/litmus/metadata.xml +++ b/www-misc/litmus/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>beber@meleeweb.net</email> + <email>bertrand@jacquin.bzh</email> <name>Bertrand Jacquin</name> </maintainer> <longdescription>WebDAV server protocol compliance test suite</longdescription> diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index f8489cd14f40..f3f6914eff5c 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,6 +1,6 @@ -DIST google-chrome-beta_47.0.2526.27-1_amd64.deb 47182218 SHA256 24f6a0b6c5c7593f941b12874620ae39eefa796030c0c8a3e5d0b6f650af5e51 SHA512 5c84019746941f7c9adb6f147ec6db6b8aeb3147146a305b2464b1438733f292abe759e60b65dbebe57187a356e633a6110fc6ea6a9beef4136f57000b150a05 WHIRLPOOL e392759a3e5c24b04d15fc6acfc7c9352af9427a0c6ef91a364be24562bf9c0ed0d27d923bf990de239da698478d87687be6b2d34c674d7ab9402f907a7b795c -DIST google-chrome-beta_47.0.2526.27-1_i386.deb 47207988 SHA256 70f70014f0b4c5529699c40171894e5aed0f575d79418399d8ad76bf9edc9f9d SHA512 8df2307d24ae19e2022cb12b8f1472701c06a0e5d743308a10c52cff84e5434d63d8e0da1b4dd41ae0819b8611c6c8eac283b0ca38b7e5b08b5ead093c00cb3e WHIRLPOOL a1374d6023a08b945f45ae902cc6e24e48f85730522e2679331ab405ece418c8fbd40edce2098844165e072d07c9dbe9ca842fb9fc0c1fad3d44df1b094a80a9 +DIST google-chrome-beta_47.0.2526.35-1_amd64.deb 47152890 SHA256 287e7bed84db2a833d2497e1a5d691ea4ac6f92dd97406a3d62c14da624d9a9f SHA512 aba35bd3d4e1bb4d1a48c1d52500af025de696012d6667f680252c00b1af1b1548c23e2f8b131e5a443d23aca35ba2cf4c4410bab6100344735c4a21626757cd WHIRLPOOL 392b3119e19df24f67832f8318fd5dea4071b16c1ab266a02eef9e0a4534b5c03e339ee5a8d36a415f7bedb56154d8192ae47577e342c6149dc6ca08e8fcec56 +DIST google-chrome-beta_47.0.2526.35-1_i386.deb 46829710 SHA256 b8083b7c666c1d639bce8b741d1c811ccec4fd7fdf823982b730c503afa448cd SHA512 e3cfebef29c568c57d93b97294d71805208c7ed82edd2141ca42599b7c93b06c6830495d28830c750741cab4d8c951917cef8b012494e9c8069ad8bceba3a787 WHIRLPOOL 644bddf0f66989dea7c74ab612c6cc3a7ea4c5f06ed8fb423113f6c7951c46be522c8768836cad3b2221c9b009476cbe4775d0cff4afd47fb80e776fb629b0fd DIST google-chrome-stable_46.0.2490.80-1_amd64.deb 47267978 SHA256 307fac6999f68092c5aa65524e17f5bc9e9f7cbb7d0e09e601bb6f62eda15c85 SHA512 65d6b7e58213ab9902d4c301c8a3732037da90a9e93360fb3ee9ec4631afd2bb066692b647ff14695d4a6f4f22bd45525b9566b6877282cb54bec8916333c893 WHIRLPOOL 875013f114639867db4870d11afcf2a6fea2b76f24e1b650be7d9bf52afb971e10692224fd20f337229b356b7d268c8b737689bb74c48ef3116aacca5b57d221 DIST google-chrome-stable_46.0.2490.80-1_i386.deb 46822720 SHA256 6d3fcd532b1483d961edc4bd65aef79980b41587e736857ff2869ad34732e6b1 SHA512 d8b4d09e5f359cb28c3fc0e35ae4a3bc81fba4b5c899718bab5255761260652f3471b502f5bdb0dd5ec77a5026cb717c9aa9a95c7a5b2050e2b2b1d5c55af427 WHIRLPOOL 397439d22c3912b8ce870edf907ebb285f442ef3a6a2a52114acc58b853fe422d58d9984b51f6b4253306b814adb1ce76e3d270560f674d5cf256843915a62ce -DIST google-chrome-unstable_48.0.2541.0-1_amd64.deb 47822896 SHA256 96561ef74947ec511e20bee51bf7dc94e42ccdbc51a2180d61effe6907865d05 SHA512 1e56c0489c0740fc7c4b095c66a35952cd1ea6374611498a302afc4cb9daa0553738cd80dfbb5bee7e66fe3bd12736a24e6ee0b9d94317f4f2b649a17bdfe092 WHIRLPOOL 4fb4d69e8422d486bc69460433ac442bea8c2fbe8c1b3b4c6fd3cf105aa75b2123f37879abf3625cd694c72fe292c4a5675049dbe3795330cfcc0f7d327e78cd -DIST google-chrome-unstable_48.0.2541.0-1_i386.deb 47379976 SHA256 03576fef4165fe77ad32bf3faa4c787120fd342323b8ffb8098b381437fe6351 SHA512 7376c3a0e0ba48f5325195190495a7d45abf037446a8ef6710d5f4a309bed0c4cb7179592d0b06341bece887b525a5a9a6ddf3ab5f51e31259615acf32d02556 WHIRLPOOL 91bc6c30fb0b04b9d54c07afb16a769578d110439db547e32266ecb3e57a9a362bb756f4055f35e3266abed5f2143b9b577ef01d1508c4c1d669f417014d33b5 +DIST google-chrome-unstable_48.0.2547.0-1_amd64.deb 47606416 SHA256 8b7311ee78b3f710eccd8d655e58c67ffbc58b7b8af3fb997a458dce2fd272c6 SHA512 f2fcb3bd41557311c65fdf85b3acfaa5be61b44b094297fad988c7224cddb3f6630cb4c8f6d2930079715410622ba597e86dabe2cb2dd43748bcf7d694fb6527 WHIRLPOOL 3b7df0012186ad634dc4488dc03cb7720331c372a17cf3f70052adbe13e734515f57089d75ac2d358c4157a39130502bae8c6953c0cdf4311609752b0fc6d841 +DIST google-chrome-unstable_48.0.2547.0-1_i386.deb 47055758 SHA256 d9eb126aab595a57ed893fe57f3b14eb76d3593f19ba0925dfff7c10890df1e6 SHA512 b07a3069d6c9cc5a626398913498b4934065a13b22d3454cfa07eaf2f93c3f1f70b45bdf0a91d2a7547f81b7170fbec500212c91736a1e50bd724493c2b7564f WHIRLPOOL ea90e644fc93713d6588116b716c94b95fb0628ed93cae61d5db9cbfc13ce96139609cc9478b23fba94047ec6d20556753d61ea43d64376964637b163c3eb931 diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.27_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.35_beta1.ebuild index 0d9e442ee50b..0d9e442ee50b 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.27_beta1.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.35_beta1.ebuild diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2541.0_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2547.0_alpha1.ebuild index 0d9e442ee50b..0d9e442ee50b 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2541.0_alpha1.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2547.0_alpha1.ebuild diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.2.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.2.ebuild index b6fad6650d26..35da3683f3e9 100644 --- a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.2.ebuild +++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SLOT=0 IUSE="gtk3 jack libav pulseaudio vaapi vdpau" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" HWDEC_DEPEND=" libav? ( media-video/libav:0=[vaapi?,vdpau?,x264] ) diff --git a/www-servers/axis/Manifest b/www-servers/axis/Manifest deleted file mode 100644 index a574a72dd1b8..000000000000 --- a/www-servers/axis/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST axis-src-1_4.tar.gz 17041546 SHA256 911b4467f3d6cfe2e50fb7baea7a754e6aa717902d6ed91cef78f8f52bef8572 SHA512 7d08212b04702e76c960ad772a475f5765fef7f9ebe0aea3d4b949c6ba28a62500e8a76a43c7364b7caf36b7f27aee8592744256154670c7a24d29c5c1518258 WHIRLPOOL cf359caa9e645bdefb7c2ff012673dc64af9d4cc4bbe2a082cb64bcb0211d3a844ef797738ae1a3e9f978d0bbd8dc42bac9ecbdf4c734dd30ff52da18bdd7a91 diff --git a/www-servers/axis/axis-1.4-r2.ebuild b/www-servers/axis/axis-1.4-r2.ebuild deleted file mode 100644 index a247f2beee12..000000000000 --- a/www-servers/axis/axis-1.4-r2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -WANT_ANT_TASKS="ant-nodeps ant-trax" -JAVA_PKG_IUSE="doc source examples" - -inherit eutils java-pkg-2 java-ant-2 - -MY_PV="${PV//./_}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Apache's Axis1 implementation of the SOAP (Simple Object Access Protocol)" -HOMEPAGE="http://ws.apache.org/axis/index.html" -SRC_URI="mirror://apache/ws/${PN}/${MY_PV}/${PN}-src-${MY_PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="amd64 x86" -IUSE="debug" - -CDEPEND="dev-java/commons-discovery:0 - dev-java/wsdl4j:0 - dev-java/sun-jaf:0 - dev-java/commons-logging:0 - java-virtuals/javamail:0 - dev-java/ant-core:0 - dev-java/bsf:2.3 - dev-java/castor:1.0 - dev-java/commons-httpclient:3 - dev-java/commons-net:0 - dev-java/sun-jimi:0 - dev-java/servletapi:2.4 - dev-java/saaj:0 - dev-java/jax-rpc:0 - dev-java/log4j:0 - dev-java/xml-commons:0 - dev-java/xml-xmlbeans:1" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -DEPEND=">=virtual/jdk-1.6 - ${CDEPEND}" - -# uses enum as identifier -JAVA_PKG_WANT_SOURCE="1.4" -JAVA_PKG_WANT_TARGET="1.4" - -S="${WORKDIR}/${MY_P}" - -AXIS_NAME="${PN}-${SLOT}" - -# not declared mandatory but fails without it -# mailapi.jar would be enough but that's only in -bin, mail.jar superseedes -EANT_GENTOO_CLASSPATH="sun-jaf,javamail,log4j,xml-xmlbeans-1,servletapi-2.4,bsf-2.3,sun-jimi,commons-httpclient-3,castor-1.0,xml-commons,commons-net" -EANT_EXTRA_ARGS="-Ddeprecation=false -Dbase.path=/opt --Dservlet.jar=servlet-api.jar -Dwsdl4j-1.5.1.jar=wsdl4j.jar --Dcommons-logging-1.0.4.jar=commons-logging.jar" -EANT_BUILD_TARGET="compile" -EANT_DOC_TARGET="javadocs" -EANT_NEEDS_TOOLS="true" - -#TODO-tests require Atlassian clover, need to figure out which ones -RESTRICT="test" - -java_prepare() { - # remove some <copy> actions - epatch "${FILESDIR}/${P}-build.xml.patch" - # remove exact lib paths and global java.classpath from classpath - epatch "${FILESDIR}/${P}-path_refs.xml.patch" - # add missing target to javac, xml rewriting would break entities - epatch "${FILESDIR}/${P}-tools-build.xml.patch" - # remove most of <available> checks - epatch "${FILESDIR}/${P}-targets.xml.patch" - # this clashes with java6 method - epatch "${FILESDIR}/${P}-java6.patch" - - # fix CVE-2014-3596 and bug 520304 - epatch "${FILESDIR}/${P}-JSSESocketFactory.java.patch" - - # and replace them with predefined properties - cp "${FILESDIR}/build.properties" . \ - || die "failed to copy build.properties from ${FILESDIR}" - - rm -rf "${S}"/docs/apiDocs || die - - #Remove test till they are working - rm -rf "${S}"/test || die - #cd "${S}"/test - #mv build_ant.xml build.xml - cd "${S}"/webapps/axis/WEB-INF/lib - rm -v *.jar || die - - cd "${S}/lib" - mv saaj.jar endorsed/ || die - rm -v *.jar || die - java-pkg_jar-from --build-only ant-core - java-pkg_jar-from wsdl4j wsdl4j.jar - java-pkg_jar-from commons-logging commons-logging.jar - java-pkg_jar-from commons-discovery commons-discovery.jar - - if use debug; then - EANT_EXTRA_ARGS+=" -Ddebug=on" - else - EANT_EXTRA_ARGS+=" -Ddebug=off" - fi - - cd "${S}" - java-ant_rewrite-classpath - java-ant_rewrite-bootclasspath auto build.xml "lib/endorsed/xml-apis-2.6.2.jar:lib/endorsed/xercesImpl-2.6.2.jar:lib/endorsed/saaj.jar" - sed -i '/<bootclasspath refid="boot.classpath"/d' build.xml || die -} - -src_install() { - dodir /usr/share/${AXIS_NAME} - mv build/lib/axis-ant.jar build/lib/ant-axis.jar || die - java-pkg_dojar build/lib/axis.jar - java-pkg_dojar build/lib/ant-axis.jar - java-pkg_dojar build/lib/jaxrpc.jar - java-pkg_register-ant-task - dodir /usr/share/${AXIS_NAME}/webapps - - cp -pR "${S}"/webapps/axis "${D}"/usr/share/${AXIS_NAME}/webapps || die - - dodoc NOTICE README - dohtml release-notes.html changelog.html - - if use doc; then - java-pkg_dojavadoc build/javadocs/ - dohtml -r docs/* - dodoc xmls/* - fi - - use source && java-pkg_dosrc src - use examples && java-pkg_doexamples samples -} diff --git a/www-servers/axis/files/axis-1.4-JSSESocketFactory.java.patch b/www-servers/axis/files/axis-1.4-JSSESocketFactory.java.patch deleted file mode 100644 index 1309115295d1..000000000000 --- a/www-servers/axis/files/axis-1.4-JSSESocketFactory.java.patch +++ /dev/null @@ -1,342 +0,0 @@ ---- src/org/apache/axis/components/net/JSSESocketFactory.java (revision 1618775) -+++ src/org/apache/axis/components/net/JSSESocketFactory.java (working copy) -@@ -15,12 +15,6 @@ - */ - package org.apache.axis.components.net; - --import org.apache.axis.utils.Messages; --import org.apache.axis.utils.XMLUtils; --import org.apache.axis.utils.StringUtils; -- --import javax.net.ssl.SSLSocket; --import javax.net.ssl.SSLSocketFactory; - import java.io.BufferedWriter; - import java.io.IOException; - import java.io.InputStream; -@@ -28,9 +22,35 @@ - import java.io.OutputStreamWriter; - import java.io.PrintWriter; - import java.net.Socket; -+import java.security.cert.Certificate; -+import java.security.cert.CertificateParsingException; -+import java.security.cert.X509Certificate; -+import java.util.ArrayList; -+import java.util.Arrays; -+import java.util.Collection; - import java.util.Hashtable; -+import java.util.Iterator; -+import java.util.LinkedList; -+import java.util.List; -+import java.util.Locale; -+import java.util.regex.Pattern; - -+import javax.naming.InvalidNameException; -+import javax.naming.NamingException; -+import javax.naming.directory.Attribute; -+import javax.naming.directory.Attributes; -+import javax.naming.ldap.LdapName; -+import javax.naming.ldap.Rdn; -+import javax.net.ssl.SSLException; -+import javax.net.ssl.SSLSession; -+import javax.net.ssl.SSLSocket; -+import javax.net.ssl.SSLSocketFactory; - -+import org.apache.axis.utils.Messages; -+import org.apache.axis.utils.StringUtils; -+import org.apache.axis.utils.XMLUtils; -+ -+ - /** - * SSL socket factory. It _requires_ a valid RSA key and - * JSSE. (borrowed code from tomcat) -@@ -41,6 +61,10 @@ - */ - public class JSSESocketFactory extends DefaultSocketFactory implements SecureSocketFactory { - -+ // This is a a sorted list, if you insert new elements do it orderdered. -+ private final static String[] BAD_COUNTRY_2LDS = -+ {"ac", "co", "com", "ed", "edu", "go", "gouv", "gov", "info", -+ "lg", "ne", "net", "or", "org"}; - /** Field sslFactory */ - protected SSLSocketFactory sslFactory = null; - -@@ -187,6 +211,279 @@ - if (log.isDebugEnabled()) { - log.debug(Messages.getMessage("createdSSL00")); - } -+ verifyHostName(host, (SSLSocket) sslSocket); - return sslSocket; - } -+ /** -+ * Verifies that the given hostname in certicifate is the hostname we are trying to connect to. -+ * This resolves CVE-2012-5784 and CVE-2014-3596 -+ * @param host -+ * @param ssl -+ * @throws IOException -+ */ -+ -+ private static void verifyHostName(String host, SSLSocket ssl) -+ throws IOException { -+ if (host == null) { -+ throw new IllegalArgumentException("host to verify was null"); -+ } -+ -+ SSLSession session = ssl.getSession(); -+ if (session == null) { -+ // In our experience this only happens under IBM 1.4.x when -+ // spurious (unrelated) certificates show up in the server's chain. -+ // Hopefully this will unearth the real problem: -+ InputStream in = ssl.getInputStream(); -+ in.available(); -+ /* -+ If you're looking at the 2 lines of code above because you're -+ running into a problem, you probably have two options: -+ -+ #1. Clean up the certificate chain that your server -+ is presenting (e.g. edit "/etc/apache2/server.crt" or -+ wherever it is your server's certificate chain is -+ defined). -+ -+ OR -+ -+ #2. Upgrade to an IBM 1.5.x or greater JVM, or switch to a -+ non-IBM JVM. -+ */ -+ -+ // If ssl.getInputStream().available() didn't cause an exception, -+ // maybe at least now the session is available? -+ session = ssl.getSession(); -+ if (session == null) { -+ // If it's still null, probably a startHandshake() will -+ // unearth the real problem. -+ ssl.startHandshake(); -+ -+ // Okay, if we still haven't managed to cause an exception, -+ // might as well go for the NPE. Or maybe we're okay now? -+ session = ssl.getSession(); -+ } -+ } -+ -+ Certificate[] certs = session.getPeerCertificates(); -+ verifyHostName(host.trim().toLowerCase(Locale.US), (X509Certificate) certs[0]); -+ } -+ /** -+ * Extract the names from the certificate and tests host matches one of them -+ * @param host -+ * @param cert -+ * @throws SSLException -+ */ -+ -+ private static void verifyHostName(final String host, X509Certificate cert) -+ throws SSLException { -+ // I'm okay with being case-insensitive when comparing the host we used -+ // to establish the socket to the hostname in the certificate. -+ // Don't trim the CN, though. -+ -+ String[] cns = getCNs(cert); -+ String[] subjectAlts = getDNSSubjectAlts(cert); -+ verifyHostName(host, cns, subjectAlts); -+ -+ } -+ -+ /** -+ * Extract all alternative names from a certificate. -+ * @param cert -+ * @return -+ */ -+ private static String[] getDNSSubjectAlts(X509Certificate cert) { -+ LinkedList subjectAltList = new LinkedList(); -+ Collection c = null; -+ try { -+ c = cert.getSubjectAlternativeNames(); -+ } catch (CertificateParsingException cpe) { -+ // Should probably log.debug() this? -+ cpe.printStackTrace(); -+ } -+ if (c != null) { -+ Iterator it = c.iterator(); -+ while (it.hasNext()) { -+ List list = (List) it.next(); -+ int type = ((Integer) list.get(0)).intValue(); -+ // If type is 2, then we've got a dNSName -+ if (type == 2) { -+ String s = (String) list.get(1); -+ subjectAltList.add(s); -+ } -+ } -+ } -+ if (!subjectAltList.isEmpty()) { -+ String[] subjectAlts = new String[subjectAltList.size()]; -+ subjectAltList.toArray(subjectAlts); -+ return subjectAlts; -+ } else { -+ return new String[0]; -+ } -+ -+ } -+ /** -+ * Verifies -+ * @param host -+ * @param cn -+ * @param subjectAlts -+ * @throws SSLException -+ */ -+ -+ private static void verifyHostName(final String host, String[] cns, String[] subjectAlts)throws SSLException{ -+ StringBuffer cnTested = new StringBuffer(); -+ -+ for (int i = 0; i < subjectAlts.length; i++){ -+ String name = subjectAlts[i]; -+ if (name != null) { -+ name = name.toLowerCase(Locale.US); -+ if (verifyHostName(host, name)){ -+ return; -+ } -+ cnTested.append("/").append(name); -+ } -+ } -+ for (int i = 0; i < cns.length; i++) { -+ String cn = cns[i]; -+ if (cn != null) { -+ cn = cn.toLowerCase(Locale.US); -+ if (verifyHostName(host, cn)) { -+ return; -+ } -+ cnTested.append("/").append(cn); -+ } -+ } -+ throw new SSLException("hostname in certificate didn't match: <" -+ + host + "> != <" + cnTested + ">"); -+ } -+ -+ private static boolean verifyHostName(final String host, final String cn){ -+ if (doWildCard(cn) && !isIPAddress(host)) { -+ return matchesWildCard(cn, host); -+ } -+ return host.equalsIgnoreCase(cn); -+ } -+ private static boolean doWildCard(String cn) { -+ // Contains a wildcard -+ // wildcard in the first block -+ // not an ipaddress (ip addres must explicitily be equal) -+ // not using 2nd level common tld : ex: not for *.co.uk -+ String parts[] = cn.split("\\."); -+ return parts.length >= 3 && -+ parts[0].endsWith("*") && -+ acceptableCountryWildcard(cn) && -+ !isIPAddress(cn); -+ } -+ -+ private static final Pattern IPV4_PATTERN = -+ Pattern.compile("^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$"); -+ -+ private static final Pattern IPV6_STD_PATTERN = -+ Pattern.compile("^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$"); -+ -+ private static final Pattern IPV6_HEX_COMPRESSED_PATTERN = -+ Pattern.compile("^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$"); -+ -+ -+ private static boolean isIPAddress(final String hostname) { -+ return hostname != null -+ && ( -+ IPV4_PATTERN.matcher(hostname).matches() -+ || IPV6_STD_PATTERN.matcher(hostname).matches() -+ || IPV6_HEX_COMPRESSED_PATTERN.matcher(hostname).matches() -+ ); -+ -+ } -+ -+ private static boolean acceptableCountryWildcard(final String cn) { -+ // The CN better have at least two dots if it wants wildcard action, -+ // but can't be [*.co.uk] or [*.co.jp] or [*.org.uk], etc... -+ // The [*.co.uk] problem is an interesting one. Should we just -+ // hope that CA's would never foolishly allow such a -+ // certificate to happen? -+ -+ String[] parts = cn.split("\\."); -+ // Only checks for 3 levels, with country code of 2 letters. -+ if (parts.length > 3 || parts[parts.length - 1].length() != 2) { -+ return true; -+ } -+ String countryCode = parts[parts.length - 2]; -+ return Arrays.binarySearch(BAD_COUNTRY_2LDS, countryCode) < 0; -+ } -+ -+ private static boolean matchesWildCard(final String cn, -+ final String hostName) { -+ String parts[] = cn.split("\\."); -+ boolean match = false; -+ String firstpart = parts[0]; -+ if (firstpart.length() > 1) { -+ // server∗ -+ // e.g. server -+ String prefix = firstpart.substring(0, firstpart.length() - 1); -+ // skipwildcard part from cn -+ String suffix = cn.substring(firstpart.length()); -+ // skip wildcard part from host -+ String hostSuffix = hostName.substring(prefix.length()); -+ match = hostName.startsWith(prefix) && hostSuffix.endsWith(suffix); -+ } else { -+ match = hostName.endsWith(cn.substring(1)); -+ } -+ if (match) { -+ // I f we ’ r e i n s t r i c t mode , -+ // [ ∗.foo.com] is not allowed to match [a.b.foo.com] -+ match = countDots(hostName) == countDots(cn); -+ } -+ return match; -+ } -+ -+ private static int countDots(final String data) { -+ int dots = 0; -+ for (int i = 0; i < data.length(); i++) { -+ if (data.charAt(i) == '.') { -+ dots += 1; -+ } -+ } -+ return dots; -+ } -+ -+ -+ private static String[] getCNs(X509Certificate cert) { -+ // Note: toString() seems to do a better job than getName() -+ // -+ // For example, getName() gives me this: -+ // 1.2.840.113549.1.9.1=#16166a756c6975736461766965734063756362632e636f6d -+ // -+ // whereas toString() gives me this: -+ // EMAILADDRESS=juliusdavies@cucbc.com -+ String subjectPrincipal = cert.getSubjectX500Principal().toString(); -+ -+ return getCNs(subjectPrincipal); -+ -+ } -+ private static String[] getCNs(String subjectPrincipal) { -+ if (subjectPrincipal == null) { -+ return null; -+ } -+ final List cns = new ArrayList(); -+ try { -+ final LdapName subjectDN = new LdapName(subjectPrincipal); -+ final List rdns = subjectDN.getRdns(); -+ for (int i = rdns.size() - 1; i >= 0; i--) { -+ final Rdn rds = (Rdn) rdns.get(i); -+ final Attributes attributes = rds.toAttributes(); -+ final Attribute cn = attributes.get("cn"); -+ if (cn != null) { -+ try { -+ final Object value = cn.get(); -+ if (value != null) { -+ cns.add(value.toString()); -+ } -+ } -+ catch (NamingException ignore) {} -+ } -+ } -+ } -+ catch (InvalidNameException ignore) { } -+ return cns.isEmpty() ? null : (String[]) cns.toArray(new String[ cns.size() ]); -+ } -+ - } diff --git a/www-servers/axis/files/axis-1.4-build.xml.patch b/www-servers/axis/files/axis-1.4-build.xml.patch deleted file mode 100644 index 92e5116934da..000000000000 --- a/www-servers/axis/files/axis-1.4-build.xml.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- build.xml.orig 2006-04-23 03:57:27.000000000 +0200 -+++ build.xml 2006-10-01 21:18:20.000000000 +0200 -@@ -223,10 +223,12 @@ - </section> - </manifest> - </jar> -+ <!-- - <copy file="${wsdl4j.jar}" toDir="${build.lib}"/> - <copy file="${commons-logging.jar}" toDir="${build.lib}"/> - <copy file="${commons-discovery.jar}" toDir="${build.lib}"/> - <copy file="${log4j-core.jar}" toDir="${build.lib}"/> -+ --> - <copy file="${src.dir}/log4j.properties" - toDir="${build.lib}"/> - diff --git a/www-servers/axis/files/axis-1.4-java6.patch b/www-servers/axis/files/axis-1.4-java6.patch deleted file mode 100644 index 2e9bd4289900..000000000000 --- a/www-servers/axis/files/axis-1.4-java6.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/org/apache/axis/i18n/ProjectResourceBundle.java.orig 2006-04-23 03:57:27.000000000 +0200 -+++ src/org/apache/axis/i18n/ProjectResourceBundle.java 2009-11-08 19:08:20.000000000 +0100 -@@ -357,13 +357,6 @@ - return resourceName; - } - -- /** -- * Clears the internal cache -- */ -- public static void clearCache() -- { -- bundleCache.clear(); -- } - - public String toString() { - return resourceName; diff --git a/www-servers/axis/files/axis-1.4-path_refs.xml.patch b/www-servers/axis/files/axis-1.4-path_refs.xml.patch deleted file mode 100644 index 7c0ad2455bd4..000000000000 --- a/www-servers/axis/files/axis-1.4-path_refs.xml.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xmls/path_refs.xml.orig 2006-04-23 03:56:52.000000000 +0200 -+++ xmls/path_refs.xml 2006-10-01 15:31:34.000000000 +0200 -@@ -1,4 +1,5 @@ - <path id="classpath"> -+ <!-- - <pathelement location="${xercesImpl.jar}"/> - <pathelement location="${xmlParserAPIs.jar}"/> - <pathelement location="${xalan.jar}"/> -@@ -14,10 +15,10 @@ - <pathelement location="${j2ee.jar}"/> - <pathelement location="${junit.jar}"/> - <pathelement location="${servlet.jar}"/> -+ --> - <fileset dir="${lib.dir}"> - <include name="**/*.jar"/> - </fileset> -- <pathelement path="${java.class.path}"/> - <pathelement location="${build.dest}" /> - <pathelement location="${build.dir}/tools" /> - <pathelement location="${build.lib}/axis-ant.jar" /> diff --git a/www-servers/axis/files/axis-1.4-targets.xml.patch b/www-servers/axis/files/axis-1.4-targets.xml.patch deleted file mode 100644 index 1f5f63ee1831..000000000000 --- a/www-servers/axis/files/axis-1.4-targets.xml.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- xmls/targets.xml.orig 2006-10-01 15:08:41.000000000 +0200 -+++ xmls/targets.xml 2006-10-01 15:14:27.000000000 +0200 -@@ -84,6 +84,7 @@ - <mkdir dir="${build.lib}"/> - <mkdir dir="${build.dir}/work"/> - -+ <!-- - <available property="servlet.present" - classname="javax.servlet.Servlet" - classpathref="classpath"/> -@@ -135,18 +136,18 @@ - <available property="httpunit.present" - classname="com.meterware.httpunit.GetMethodWebRequest" - classpathref="classpath"/> -- -+ --> - <available property="jsse.present" - classname="javax.net.ssl.SSLSocketFactory" - classpathref="classpath"/> -- -+ <!-- - <condition property="jetty.present" > - <and> - <available classname="javax.servlet.Servlet" classpathref="classpath" /> - <available classname="org.mortbay.http.HttpServer" classpathref="classpath" /> - </and> - </condition> -- -+ --> - <condition property="jdk14.jsse.present" > - <and> - <available classname="javax.net.ssl.X509TrustManager" classpathref="classpath" /> -@@ -185,7 +186,7 @@ - <condition property="sun.codec.present" > - <available classname="sun.awt.image.codec.JPEGImageEncoderImpl" classpathref="classpath" /> - </condition> -- -+ <!-- - <condition property="jimi.present" > - <available classname="com.sun.jimi.core.Jimi" classpathref="classpath" /> - </condition> -@@ -193,7 +194,7 @@ - <condition property="merlinio.present" > - <available classname="javax.imageio.ImageIO" classpathref="classpath" /> - </condition> -- -+ --> - <condition property="axis-ant.present" > - <available classname="org.apache.axis.tools.ant.foreach.ForeachTask"> - <classpath> -@@ -201,7 +202,7 @@ - </classpath> - </available> - </condition> -- -+ <!-- - <condition property="jimiAndAttachments.present"> - <and> - <available classname="javax.activation.DataHandler" classpathref="classpath" /> -@@ -220,7 +221,7 @@ - <available classname="progress.message.jclient.Message" classpathref="classpath" /> - </and> - </condition> -- -+ --> - <available property="post-compile.present" file="post-compile.xml" /> - - <property environment="env"/> -@@ -229,7 +230,7 @@ - <equals arg1="on" arg2="${env.debug}"/> - </and> - </condition> -- -+ <!-- - <condition property="castor.present" > - <available classname="org.exolab.castor.xml.MarshalException" classpathref="classpath" /> - </condition> -@@ -248,7 +249,7 @@ - <condition property="combridge.present" > - <available classname="org.apache.axis.components.bridge.COMBridge" classpathref="classpath" /> - </condition> -- -+ --> - <!-- look for WSDL support on the platform --> - <condition property="wsdl.found"> - <or> diff --git a/www-servers/axis/files/axis-1.4-tools-build.xml.patch b/www-servers/axis/files/axis-1.4-tools-build.xml.patch deleted file mode 100644 index ce9759264eda..000000000000 --- a/www-servers/axis/files/axis-1.4-tools-build.xml.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- tools/build.xml.orig 2006-10-02 10:18:43.000000000 +0200 -+++ tools/build.xml 2006-10-02 10:21:34.000000000 +0200 -@@ -66,6 +66,7 @@ - <javac srcdir="${tools.dir}" - debug="${debug}" - source="${source}" -+ target="${target}" - nowarn="${nowarn}" - destdir="${tools.build.dir}"> - <classpath refid="classpath"/> -@@ -77,6 +78,7 @@ - <javac srcdir="${tools.dir}" - debug="${debug}" - source="${source}" -+ target="${target}" - nowarn="${nowarn}" - destdir="${tools.build.dir}"> - <classpath refid="classpath"/> -@@ -88,6 +90,7 @@ - <javac srcdir="${tools.dir}" - debug="${debug}" - source="${source}" -+ target="${target}" - nowarn="${nowarn}" - destdir="${tools.build.dir}"> - <classpath> diff --git a/www-servers/axis/files/build.properties b/www-servers/axis/files/build.properties deleted file mode 100644 index 9387391ab441..000000000000 --- a/www-servers/axis/files/build.properties +++ /dev/null @@ -1,15 +0,0 @@ -source=1.4 -target=1.4 - -activation.present=true -commons-discovery.present=true -commons-logging.present=true -wsdl4j.present=true -mailapi.present=true - -bsf.present=true -castor.present=true -commons-httpclient.present=true -commons-net.present=true -jimi.present=true -servlet.present=true diff --git a/www-servers/axis/metadata.xml b/www-servers/axis/metadata.xml deleted file mode 100644 index d75e8a6c1c56..000000000000 --- a/www-servers/axis/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>java</herd> - -<longdescription> -Apache Axis is an implementation of the SOAP ("Simple Object Access Protocol") submission to W3C. - -From the draft W3C specification: - -SOAP is a lightweight protocol for exchange of information in a decentralized, distributed environment. It is an XML based protocol that consists of three parts: an envelope that defines a framework for describing what is in a message and how to process it, a set of encoding rules for expressing instances of application-defined datatypes, and a convention for representing remote procedure calls and responses. -</longdescription> -</pkgmetadata> diff --git a/www-servers/hiawatha/Manifest b/www-servers/hiawatha/Manifest index d351f96f1789..9a62e6afa208 100644 --- a/www-servers/hiawatha/Manifest +++ b/www-servers/hiawatha/Manifest @@ -1,2 +1,3 @@ DIST hiawatha-9.14.tar.gz 891930 SHA256 79c92587cd86a0461d952c99036f5615dacdcaccabe0a9a29359e6044d809bfa SHA512 66ad77c132d34daa5eb597ce67d7b26581c59534e5cf83dd65f78567a9a1798030cd42fef2d612bd1935243db979a2ef1df873f01b0d0a009395ef3da1dca6e6 WHIRLPOOL 8dbeb2c33e9111a27b76f3e5e307872314e85c481a600c39a1e02e7f9e08e1cc0d64f79838dad92a4a5a555cb86334487dd247efb56f0ef9c15a7735da27ddae +DIST hiawatha-9.15.tar.gz 869922 SHA256 e9252133a1114095d1a9a89144b88828ee3b9754f435bd88270f7bf444dd9421 SHA512 e5f0459475863c7cb2d15bdf2a9712f13c96ac450f349fd89e60fd600aad9010f25182aa6353a3014069a9798544a56ef79695918613946b63fecd3806b1982b WHIRLPOOL 80840072765430b05ecaf1ec631d3f1981c6f420edc18b4bcc7957f53f28ed2800170bbcec943c287da2968e6ac769514843fc54aa2a927d7d451057ed76d4d3 DIST hiawatha-9.8.tar.gz 888977 SHA256 6fe9bd408361bc07b47fe6eeaf98d6b644e1cd258b3470da3e70aba510e83b64 SHA512 f55b6065e0dd1dab11ccbbb44e981944aab5b542077fc2b4a03ec8c055be80bedb7b639fe9c52ccf0fc279648b9f4bfc0cbfa018b195b155907810bdfc4ec51a WHIRLPOOL 342c19df23dbe4eef7056f2424d53badede5a8dcf8bb713e7d3892f21e1061ae5e1a0c985f1fc824b10f25eb9fcc9cf0cbf8d384240bf814df4f9dca45dd96f2 diff --git a/www-servers/hiawatha/files/hiawatha.initd-r1 b/www-servers/hiawatha/files/hiawatha.initd-r1 new file mode 100644 index 000000000000..5635ababa0a6 --- /dev/null +++ b/www-servers/hiawatha/files/hiawatha.initd-r1 @@ -0,0 +1,26 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + need net +} + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon \ + --start \ + --exec "/usr/sbin/hiawatha" \ + --pidfile "@HIAWATHA_PID_DIR@/hiawatha.pid" + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon \ + --stop \ + --exec "/usr/sbin/hiawatha" \ + --pidfile "@HIAWATHA_PID_DIR@/hiawatha.pid" + eend $? +} diff --git a/www-servers/hiawatha/hiawatha-9.15.ebuild b/www-servers/hiawatha/hiawatha-9.15.ebuild new file mode 100644 index 000000000000..31650705f9c4 --- /dev/null +++ b/www-servers/hiawatha/hiawatha-9.15.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +CMAKE_MIN_VERSION="2.8.2" + +inherit cmake-utils eutils systemd user + +DESCRIPTION="Advanced and secure webserver" +HOMEPAGE="http://www.hiawatha-webserver.org" +SRC_URI="http://www.hiawatha-webserver.org/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+cache ipv6 monitor +rewrite +rproxy +ssl tomahawk +xslt" + +RDEPEND=" + sys-libs/zlib + ssl? ( >=net-libs/mbedtls-2.0[threads] ) + xslt? ( dev-libs/libxslt + dev-libs/libxml2 )" +DEPEND="${RDEPEND}" +PDEPEND="monitor? ( www-apps/hiawatha-monitor )" + +# set these in the environment of your PM if you want to use different values +HIAWATHA_CONFIG_DIR="${HIAWATHA_CONFIG_DIR:-/etc/hiawatha}" +HIAWATHA_LOG_DIR="${HIAWATHA_LOG_DIR:-/var/log/hiawatha}" +HIAWATHA_PID_DIR="${HIAWATHA_PID_DIR:-/var/run}" +HIAWATHA_WEBROOT_DIR="${HIAWATHA_WEBROOT_DIR:-/var/www/hiawatha}" +HIAWATHA_WORK_DIR="${HIAWATHA_WORK_DIR:-/var/lib/hiawatha}" +HIAWATHA_USER="${HIAWATHA_USER:-hiawatha}" +HIAWATHA_GROUP="${HIAWATHA_GROUP:-hiawatha}" + +safe_sed() { + local replace_of=$1 + local replace_with=$2 + local file=$3 + # optional + local outfile=$4 + + grep -E "${replace_of}" "${file}" 1>/dev/null \ + || die "\"${replace_of}\" not found in ${file}!" + + if [[ -n ${outfile} ]] ; then + einfo "Sedding ${file} into ${outfile}" + sed -r \ + -e "s|${replace_of}|${replace_with}|" \ + "${file}" > ${outfile} || die "sed on ${file} to ${outfile} failed!" + else + einfo "Sedding ${file} in-place" + sed -r -i \ + -e "s|${replace_of}|${replace_with}|" \ + "${file}" || die "sed on ${file} failed!" + fi + +} + +pkg_pretend() { + einfo + einfo "You can change hiawatha user and group, as well as the" + einfo "directories the webserver is going to use. For that," + einfo "set the following environment variables in your PM:" + einfo " HIAWATHA_CONFIG_DIR" + einfo " default: /etc/hiawatha" + einfo " current: ${HIAWATHA_CONFIG_DIR}" + einfo " HIAWATHA_LOG_DIR" + einfo " default: /var/log/hiawatha" + einfo " current: ${HIAWATHA_LOG_DIR}" + einfo " HIAWATHA_PID_DIR" + einfo " default: /var/run" + einfo " current: ${HIAWATHA_PID_DIR}" + einfo " HIAWATHA_WEBROOT_DIR" + einfo " default: /var/www/hiawatha" + einfo " current: ${HIAWATHA_WEBROOT_DIR}" + einfo " HIAWATHA_WORK_DIR" + einfo " default: /var/lib/hiawatha" + einfo " current: ${HIAWATHA_WORK_DIR}" + einfo " HIAWATHA_USER" + einfo " default: hiawatha" + einfo " current: ${HIAWATHA_USER}" + einfo " HIAWATHA_GROUP" + einfo " default: hiawatha" + einfo " current: ${HIAWATHA_GROUP}" + einfo +} + +pkg_setup() { + enewgroup ${HIAWATHA_GROUP} + enewuser ${HIAWATHA_USER} -1 -1 "${HIAWATHA_WEBROOT_DIR}" ${HIAWATHA_GROUP} +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-9.5-cflags.patch + + safe_sed "^#ServerId =.*$" "ServerId = ${HIAWATHA_USER}" \ + config/hiawatha.conf.in + + safe_sed "@HIAWATHA_PID_DIR@" "${HIAWATHA_PID_DIR}" \ + "${FILESDIR}/hiawatha.initd-r1" \ + "${T}/hiawatha.initd-r1" +} + +src_configure() { + local mycmakeargs=( + -DCONFIG_DIR:STRING="${HIAWATHA_CONFIG_DIR}" + -DENABLE_CACHE=$(usex cache) + -DENABLE_IPV6=$(usex ipv6) + -DENABLE_LOADCHECK=$(usex kernel_linux) + -DENABLE_MONITOR=$(usex monitor) + -DENABLE_RPROXY=$(usex rproxy) + -DENABLE_TLS=$(usex ssl) + -DENABLE_TOMAHAWK=$(usex tomahawk) + -DENABLE_TOOLKIT=$(usex rewrite) + -DENABLE_XSLT=$(usex xslt) + -DLOG_DIR:STRING="${HIAWATHA_LOG_DIR}" + -DPID_DIR:STRING="${HIAWATHA_PID_DIR}" + -DUSE_SYSTEM_MBEDTLS=$(usex ssl) + -DWEBROOT_DIR:STRING="${HIAWATHA_WEBROOT_DIR}" + -DWORK_DIR:STRING="${HIAWATHA_WORK_DIR}" + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + rm -r "${ED%/}${HIAWATHA_WEBROOT_DIR}"/* || die + + newinitd "${T}"/hiawatha.initd-r1 hiawatha + systemd_dounit "${FILESDIR}"/hiawatha.service + + local i + for i in "${HIAWATHA_LOG_DIR}" "${HIAWATHA_WORK_DIR}" ; do + keepdir "${i}" + fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} "${i}" + fperms 0750 "${i}" + done + + keepdir "${HIAWATHA_WEBROOT_DIR}" + fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} "${HIAWATHA_WEBROOT_DIR}" +} diff --git a/www-servers/hiawatha/metadata.xml b/www-servers/hiawatha/metadata.xml index f9fc42478ea8..653494f4ecc7 100644 --- a/www-servers/hiawatha/metadata.xml +++ b/www-servers/hiawatha/metadata.xml @@ -2,15 +2,19 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>maintainer-needed@gentoo.org</email> + <email>hasufell@gentoo.org</email> + <name>Julian Ospald</name> </maintainer> <use> - <flag name='cache'>Enable caching of content.</flag> - <flag name='monitor'>Pull in www-apps/hiawatha-monitor.</flag> - <flag name='rewrite'>Enable the rewrite toolkit.</flag> - <flag name='tomahawk'>Enable Tomahawk control server.</flag> + <flag name='cache'>Enable caching of content</flag> + <flag name='monitor'>Pull in www-apps/hiawatha-monitor</flag> + <flag name='rewrite'>Enable the rewrite toolkit</flag> + <flag name='ssl'>Enable TLS support via + <pkg>net-libs/mbedtls</pkg></flag> + <flag name='tomahawk'>Enable Tomahawk control server</flag> <flag name='xslt'>Enable XSLT support. - This is also needed for directory listings.</flag> + This is also needed for directory listings</flag> + <flag name='rproxy'>Enable reverse proxy support</flag> </use> <upstream> <remote-id type='github'>hsleisink/hiawatha</remote-id> diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest index 443362c8bd5d..a7d822412dc7 100644 --- a/www-servers/monkeyd/Manifest +++ b/www-servers/monkeyd/Manifest @@ -1,2 +1,2 @@ DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1 -DIST monkey-1.6.3.tar.gz 2032771 SHA256 47973b12cc45c185b054e251a6c3d8a36cae70301f614b4132bb1ef504f01cfa SHA512 21d317b55bc22e0ef34a2ff545103fbba3728a47e888db58506891e525e926397af81d0ad42ac134f67ab30548853ea4c98df264fab6238901dd05c5b0f55abe WHIRLPOOL acda82625c281f31212eb22d4cef0f64fa251fad25ba5e8aa9e2f4f2146d5bd626a6c66cdb2d17f6559cc858d09fd0afd2383bcdccbf225b8956e2f8b272726c +DIST monkey-1.6.5.tar.gz 2033866 SHA256 5e24a782fe3d97f4a4e78cac54646ca13d8646b8c790ea63924be77235453ea5 SHA512 64b5a30e8636e9aaaf3f8fb207201282980a29449476e8905218b5e36da78c9a1754a5706eafb40d46c72458a32346899a1bf859b29c213bf7cc5e66f5d834b3 WHIRLPOOL 1573fd42dc87da294f56dc3ddea8968d9cabd9421788beda074968343e52ea94f2ec321ed2a73c778787337e4f0c4eff89b43026f7e495976eb1d0cddd6b6c19 diff --git a/www-servers/monkeyd/monkeyd-1.6.3.ebuild b/www-servers/monkeyd/monkeyd-1.6.5.ebuild index fc9146ee2746..add07dc76ee8 100644 --- a/www-servers/monkeyd/monkeyd-1.6.3.ebuild +++ b/www-servers/monkeyd/monkeyd-1.6.5.ebuild @@ -59,7 +59,7 @@ pkg_setup() { src_prepare() { # Unconditionally get rid of the bundled jemalloc rm -rf "${S}"/deps - epatch "${FILESDIR}"/${P}-system-mbedtls.patch + epatch "${FILESDIR}"/${PN}-1.6.3-system-mbedtls.patch } src_configure() { @@ -84,6 +84,7 @@ src_configure() { use cgi && enable_plugins+="cgi," || disable_plugins+="cgi," use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi," # For the rest, we scan the monkeyd_plugins_* and parse out the plugin name. + local p for p in ${PLUGINS}; do pp=${p/+/} cp=${pp/monkeyd_plugins_/} @@ -129,8 +130,7 @@ src_install() { # Move htdocs to docdir, bug #429632 docompress -x /usr/share/doc/"${PF}"/htdocs.dist mv "${D}"${WEBROOT}/htdocs \ - "${D}"/usr/share/doc/"${PF}"/htdocs.dist - mkdir "${D}"${WEBROOT}/htdocs + "${D}"/usr/share/doc/"${PF}"/htdocs.dist || die keepdir \ /var/log/monkeyd \ diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild index fc9146ee2746..add07dc76ee8 100644 --- a/www-servers/monkeyd/monkeyd-9999.ebuild +++ b/www-servers/monkeyd/monkeyd-9999.ebuild @@ -59,7 +59,7 @@ pkg_setup() { src_prepare() { # Unconditionally get rid of the bundled jemalloc rm -rf "${S}"/deps - epatch "${FILESDIR}"/${P}-system-mbedtls.patch + epatch "${FILESDIR}"/${PN}-1.6.3-system-mbedtls.patch } src_configure() { @@ -84,6 +84,7 @@ src_configure() { use cgi && enable_plugins+="cgi," || disable_plugins+="cgi," use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi," # For the rest, we scan the monkeyd_plugins_* and parse out the plugin name. + local p for p in ${PLUGINS}; do pp=${p/+/} cp=${pp/monkeyd_plugins_/} @@ -129,8 +130,7 @@ src_install() { # Move htdocs to docdir, bug #429632 docompress -x /usr/share/doc/"${PF}"/htdocs.dist mv "${D}"${WEBROOT}/htdocs \ - "${D}"/usr/share/doc/"${PF}"/htdocs.dist - mkdir "${D}"${WEBROOT}/htdocs + "${D}"/usr/share/doc/"${PF}"/htdocs.dist || die keepdir \ /var/log/monkeyd \ diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index 74b79b4076a9..5691b2be3c30 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -2,6 +2,7 @@ DIST modsecurity-2.9.0.tar.gz 4246467 SHA256 e2bbf789966c1f80094d88d9085a81bde08 DIST nginx-1.8.0.tar.gz 832104 SHA256 23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5 SHA512 3e5d7e1b01839b2638251c47046149450b9b65985e611ef55e5953846e9eb0128c3708c695540ad4dfd0ce5e3060dfecb51213403048fab1a99dd5cea94f0038 WHIRLPOOL e4619e0e0454b86d725a21abe9300ad33ad700c4d577b33f1762b5af796093abd3c7b6afed38301dd0b2a235d6ff47db189b24fd19a5cbc777398bc237ae8534 DIST nginx-1.9.4.tar.gz 866423 SHA256 479b0c03747ee6b2d4a21046f89b06d178a2881ea80cfef160451325788f2ba8 SHA512 6616b971361ded7a316a5718dffb2476dac0c625afb047595fbca0e24ea84391d3e0df88bc8d6a40747411094f8453a85c331d8089e51eecd1ac152898bb350a WHIRLPOOL a3e6699b81fbf33b24ae605a0cd113a76eac9f572a05e7b982f4dca3ede573fe425cddd21b136255ca7d0db8201babb2780fe7ba971dc4d62a4bc8545ddc8c67 DIST nginx-1.9.5.tar.gz 884023 SHA256 48e2787a6b245277e37cb7c5a31b1549a0bbacf288aa4731baacf9eaacdb481b SHA512 a3f12ca919b9750141c323d58e5be32d1f6ed086c6ecf45c559baa911606cbae1bb3b2eafd84f67294b6b23366ef5be7d24edc1dae7b3fa5b3aff5ecbaefb31d WHIRLPOOL b1c6bb6062423f70904483041855caaf42e79edc1ba14e32d240bc541236afd4a8c287e23147ffa04136171c2bd37b5b77ee7ec872ee35fb8bce1ac6f4d0b866 +DIST nginx-1.9.6.tar.gz 884733 SHA256 ed501fc6d0eff9d3bc1049cc1ba3a3ac8c602de046acb2a4c108392bbfa865ea SHA512 d42199542585dc2c4feeeb5a86462b96ccd008a72a067d9fa83ed6171f098f4f515a62df2b4bf4b169b1aa78eccb6099701caea6a805de784a0f4bfe2ce92716 WHIRLPOOL 137643033860520610d707cb04f262e78e349e27ba6ed3fd5b91c95d4f8aeca49fa96721f58f809f81ed457040aa1c05d7f37400912376bc454829b491dd4983 DIST nginx_http_sticky_module_ng-1.2.5.tar.bz2 124072 SHA256 f975c033eb3c342f7247f6524774bbb727aaf630ed984576dbafe5de7a790c58 SHA512 d6ae723f739efb2f0548461931b1c395801684759962beda08067111426b1c9787ceaede91b0e984c023108fd17864c53c53925506f7e8e25ec8d2fc065585f6 WHIRLPOOL 1013c6a51f5989c8131392b3d9704d42c99f9727a673f6205878d0b7dfd265bb6042c1d30089603c9b38e339d48302e6873e77fe380b7e8edba25b71e9e84ba6 DIST nginx_http_sticky_module_ng-1.2.6.tar.bz2 124089 SHA256 e47b9fd435d7a5a3200f945a9745aaa7b9446495bda76df48f211129f88d6b26 SHA512 2632b04c94f523aa7c9726db182cba11d83e642c2db5798274e67fbef30de95d02e4e95cbfb98bc429d4244d630b5d9617405b43f728ae0117a5c134940c0ded WHIRLPOOL 1b754c02f834c6b4d4930e9c46b8c5accb6c9663718fb9296c92d79bc33206e66e49e4234ca4db9a5afcd42fa23273bdf0e675aa7b38927c4e46a85318c189eb DIST ngx_devel_kit-0.2.19-r1.tar.gz 65029 SHA256 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679 SHA512 915954acf16a27fbd3c93c154012d38e864f1d8dfd51cde401bba26e46eb3e3c778ec4c92f4f8ed83ac001e96cee72765554d0e4da06acf6a4be5184b23b3657 WHIRLPOOL 0ce6bffc0fe2cef28ee74f5862ca6d914ed18fdee18d900608ff2a9983594c707aab3e335957b79dd7e77ae1beed054d8f71965ca0f57fc5f1d41ac06106c5a4 @@ -15,6 +16,7 @@ DIST ngx_http_headers_more-0.26.tar.gz 28028 SHA256 d6bdc51f9e778a3b23e41a51cae5 DIST ngx_http_headers_more-0.261.tar.gz 28022 SHA256 03d1f5fbecba8565f247d87a38f5e4b6440b0a56d752bdd2b29af2f1c4aea480 SHA512 252b5adc86f114460a956b38cca448917124523730e95ffc822a953232da9835e5ee663c65077413d655a8887ac692872b5de115e3cf4123463df7a84f759c3f WHIRLPOOL d97828ac45a1641210544a8b3ee21d86a8c2160fa665352992822b9a4cd7b8b48f9816afc124007e73467237a53615bff23a5cfbfad48bd04fefb9843335f1ee DIST ngx_http_lua-0.9.15.tar.gz 520190 SHA256 659fe4c201f4a4ae1007fa029cef472aaa837bf0904babb6158f83b86536c5b7 SHA512 1d809f873ced8e50422298bb4b730b8e7aaf442c11570cbe892fd73a414ff4f6d6eca7be8b2d2dbf57a136136b17d80596ee2f2f195dcb59776e78df5a94ae92 WHIRLPOOL caf128254f99d674eb370779c6e41c0b459be1c5a2baac7df1ff3498a38349bd2c140594eea3eb29c468a366e265421f90363886be73db0b3484cc6f386cb563 DIST ngx_http_lua-0.9.16.tar.gz 523900 SHA256 a3cda55b8cba5bc6632aa270b8a02d543fdb43f4d60a3bd2cb411c2a3b467656 SHA512 01be7dca10c1c1f25d2b8e65c9944662d5ba0235ecccba1143f7c30dcb76fad847a4a2fa7a34055906a33d50ecf8fb463aac9f76581390035a88e48c9b9f5319 WHIRLPOOL 6f8c04f8d284d1fdcf69471a4590ad0381335ae64e6f0bc5b3ec4a13c8e7254d2363cbf23304f559997d7e5695832390bc187e18ee57b9c72c39c8ed5a98b7e0 +DIST ngx_http_lua-0.9.17.tar.gz 540687 SHA256 68fba0cae22b11314968ba18d811991a95cade992aa76da3768af93d4b83b70f SHA512 3e140dff37443f2b2d9da28c4318741c7e8fb7e5d5f29b51745ed62517d3f5e873e1f86c0ade7e0d637aef0227c8a533699e8525292d8210f2b9eb41b3d7852a WHIRLPOOL a9e1e8a88b7339cb16f2e2f261afb81d175e14edd1b4987e300c7e0541a871a660128996f9b7de746f5846df4ff34d583379e8b9dae0658eca5438b0c146b96a DIST ngx_http_naxsi-0.53-2.tar.gz 165690 SHA256 3eadff1d91995beae41b92733ade28091c2075a24ae37058f4d6aa90b0f4b660 SHA512 ada592f5e7f80a6d549cc435ee8720df01a788dc88cf27a7d55521bb7e4c66fa11b9ec28216aff7e13c70a5faf12cb745bd398b8a782ed4dea1eecd04b07e24c WHIRLPOOL c5b736dbe9bd66daf7e023f176a08f78225b61990781d7ad5a55d0f35391df7e05bf1b2623a6227e0355cf0204ef9eac1b9fa03aa62b3c0d6eac515f1213f270 DIST ngx_http_naxsi-0.54.tar.gz 163809 SHA256 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5 SHA512 91934bfd41495715269cc6e549d17f6da66f2bdd0c9a6821fa9096b694dd3927109c4aad2f8b327620ae7c34f76a0839ac16669cd8c65081bc01fa7f829c1d43 WHIRLPOOL ef68cfecc9849086527c3590744d3c0d73cec830c6cf1ebca63566a7444438757a85d0c79fa552c4763e0416a615f4cf8d99622e2f36d3713b7072138a82f5a8 DIST ngx_http_push_stream-0.4.1.tar.gz 166928 SHA256 553584f557a3faec73702550e7e1417cbc0021f4f98468cc83e61e9d94def5cc SHA512 3b2289cc3abe6df0ee39360816675a39de1669a284e23770aa04b29e1e5dc73f5d99f3db6c7e8e4895a4abad0602aa64024ec19a2e741e138a70191501f038be WHIRLPOOL 9d203d4a78a3bd189527ebeaf1ff98613ee6a3150ae433efa17ed45dd9f6cb263b2a4c329a6fc2d04c6583ac2beaf24e87e3263d71a910f720b80038c9bc09c2 diff --git a/www-servers/nginx/nginx-1.9.6.ebuild b/www-servers/nginx/nginx-1.9.6.ebuild new file mode 100644 index 000000000000..e82d214c9656 --- /dev/null +++ b/www-servers/nginx/nginx-1.9.6.ebuild @@ -0,0 +1,695 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# Maintainer notes: +# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite +# - any http-module activates the main http-functionality and overrides USE=-http +# - keep the following requirements in mind before adding external modules: +# * alive upstream +# * sane packaging +# * builds cleanly +# * does not need a patch for nginx core +# - TODO: test the google-perftools module (included in vanilla tarball) + +# prevent perl-module from adding automagic perl DEPENDs +GENTOO_DEPEND_ON_PERL="no" + +# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license) +DEVEL_KIT_MODULE_PV="0.2.19" +DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1" +DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz" +DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" + +# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license) +HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1" +HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1" +HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz" +HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}" + +# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license) +HTTP_HEADERS_MORE_MODULE_PV="0.261" +HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}" +HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz" +HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}" + +# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license) +HTTP_CACHE_PURGE_MODULE_PV="2.3" +HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" +HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz" +HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" + +# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license) +HTTP_SLOWFS_CACHE_MODULE_PV="1.10" +HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" +HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz" +HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" + +# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license) +HTTP_FANCYINDEX_MODULE_PV="0.3.5" +HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" +HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz" +HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" + +# http_lua (https://github.com/openresty/lua-nginx-module, BSD license) +HTTP_LUA_MODULE_PV="0.9.17" +HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}" +HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz" +HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}" + +# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license) +HTTP_AUTH_PAM_MODULE_PV="1.4" +HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}" +HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz" +HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}" + +# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license) +HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0" +HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}" +HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz" +HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}" + +# http_metrics (https://github.com/zenops/ngx_metrics, BSD license) +HTTP_METRICS_MODULE_PV="0.1.1" +HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}" +HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz" +HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}" + +# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+) +HTTP_NAXSI_MODULE_PV="0.54" +HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}" +HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz" +HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src" + +# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license) +RTMP_MODULE_PV="1.1.7" +RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}" +RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz" +RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}" + +# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license) +HTTP_DAV_EXT_MODULE_PV="0.0.3" +HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}" +HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz" +HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}" + +# echo-nginx-module (https://github.com/agentzh/echo-nginx-module, BSD license) +HTTP_ECHO_MODULE_PV="0.58" +HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}" +HTTP_ECHO_MODULE_URI="https://github.com/agentzh/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz" +HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}" + +# mod_security for nginx (https://modsecurity.org/, Apache-2.0) +# keep the MODULE_P here consistent with upstream to avoid tarball duplication +HTTP_SECURITY_MODULE_PV="2.9.0" +HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}" +HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz" +HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}" + +# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3) +HTTP_PUSH_STREAM_MODULE_PV="0.5.1" +HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}" +HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz" +HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}" + +# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2) +HTTP_STICKY_MODULE_PV="1.2.6" +HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}" +HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2" +HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-c78b7dd79d0d" + +# mogilefs-module (http://www.grid.net.ru/nginx/mogilefs.en.html, BSD-2) +HTTP_MOGILEFS_MODULE_PV="1.0.4" +HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" +HTTP_MOGILEFS_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}.tar.gz" +HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" + +# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2) +HTTP_MEMC_MODULE_PV="0.16" +HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}" +HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz" +HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}" + +inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib + +DESCRIPTION="Robust, small and high performance http and reverse proxy server" +HOMEPAGE="http://nginx.org" +SRC_URI="http://nginx.org/download/${P}.tar.gz + ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz + nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) + nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) + nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz ) + nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz ) + nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) + nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz ) + nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz ) + nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz ) + nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz ) + nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz ) + rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz ) + nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz ) + nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz ) + nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz ) + nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz ) + nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 ) + nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz ) + nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )" + +LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ + nginx_modules_http_security? ( Apache-2.0 ) + nginx_modules_http_push_stream? ( GPL-3 )" + +SLOT="mainline" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi +geo gzip limit_req limit_conn map memcached proxy referer rewrite scgi ssi +split_clients upstream_ip_hash userid uwsgi" +NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip gzip_static +image_filter mp4 perl random_index realip secure_link stub_status sub xslt" +NGINX_MODULES_MAIL="imap pop3 smtp" +NGINX_MODULES_3RD=" + http_upload_progress + http_headers_more + http_cache_purge + http_slowfs_cache + http_fancyindex + http_lua + http_auth_pam + http_upstream_check + http_metrics + http_naxsi + http_dav_ext + http_echo + http_security + http_push_stream + http_sticky + http_ajp + http_mogilefs + http_memc" + +IUSE="aio debug +http http2 +http-cache ipv6 libatomic luajit +pcre pcre-jit rtmp +selinux ssl threads userland_GNU vim-syntax" + +for mod in $NGINX_MODULES_STD; do + IUSE="${IUSE} +nginx_modules_http_${mod}" +done + +for mod in $NGINX_MODULES_OPT; do + IUSE="${IUSE} nginx_modules_http_${mod}" +done + +for mod in $NGINX_MODULES_MAIL; do + IUSE="${IUSE} nginx_modules_mail_${mod}" +done + +for mod in $NGINX_MODULES_3RD; do + IUSE="${IUSE} nginx_modules_${mod}" +done + +# Add so we can warn users updating about config changes +IUSE="${IUSE} nginx_modules_http_spdy" + +CDEPEND=" + pcre? ( >=dev-libs/libpcre-4.2 ) + pcre-jit? ( >=dev-libs/libpcre-8.20[jit] ) + ssl? ( dev-libs/openssl:0= ) + http2? ( >=dev-libs/openssl-1.0.1c:0= ) + http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) ) + nginx_modules_http_geoip? ( dev-libs/geoip ) + nginx_modules_http_gunzip? ( sys-libs/zlib ) + nginx_modules_http_gzip? ( sys-libs/zlib ) + nginx_modules_http_gzip_static? ( sys-libs/zlib ) + nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) + nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) + nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) + nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) ) + nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) + nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) + nginx_modules_http_auth_pam? ( virtual/pam ) + nginx_modules_http_metrics? ( dev-libs/yajl ) + nginx_modules_http_dav_ext? ( dev-libs/expat ) + nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-nginx ) + !www-servers/nginx:0" +DEPEND="${CDEPEND} + arm? ( dev-libs/libatomic_ops ) + libatomic? ( dev-libs/libatomic_ops )" +PDEPEND="vim-syntax? ( app-vim/nginx-syntax )" + +REQUIRED_USE="pcre-jit? ( pcre ) + nginx_modules_http_lua? ( nginx_modules_http_rewrite ) + nginx_modules_http_naxsi? ( pcre ) + nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) + nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) + nginx_modules_http_security? ( pcre ) + nginx_modules_http_push_stream? ( ssl )" + +pkg_setup() { + NGINX_HOME="/var/lib/nginx" + NGINX_HOME_TMP="${NGINX_HOME}/tmp" + + ebegin "Creating nginx user and group" + enewgroup ${PN} + enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN} + eend $? + + if use libatomic; then + ewarn "GCC 4.1+ features built-in atomic operations." + ewarn "Using libatomic_ops is only needed if using" + ewarn "a different compiler or a GCC prior to 4.1" + fi + + if [[ -n $NGINX_ADD_MODULES ]]; then + ewarn "You are building custom modules via \$NGINX_ADD_MODULES!" + ewarn "This nginx installation is not supported!" + ewarn "Make sure you can reproduce the bug without those modules" + ewarn "_before_ reporting bugs." + fi + + if use !http; then + ewarn "To actually disable all http-functionality you also have to disable" + ewarn "all nginx http modules." + fi + + if use nginx_modules_http_ajp; then + eerror "The AJP module currently doesn't build for nginx >1.8." + eerror "It will be reintroduced with the 1.9 series when proven stable." + eerror "Either disable it or stick with nginx 1.7.x." + die "AJP module not supported" + fi + + if use nginx_modules_http_mogilefs && use threads; then + eerror "mogilefs won't compile with threads support." + eerror "Please disable either flag and try again." + die "Can't compile mogilefs with threads support" + fi +} + +src_prepare() { + epatch_user + + epatch "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch" + + if use nginx_modules_http_upstream_check; then + epatch "${FILESDIR}/check-1.9.2".patch + fi + + if use nginx_modules_http_lua; then + sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die + fi + + find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die + # We have config protection, don't rename etc files + sed -i 's:.default::' auto/install || die + # remove useless files + sed -i -e '/koi-/d' -e '/win-/d' auto/install || die + + # don't install to /etc/nginx/ if not in use + local module + for module in fastcgi scgi uwsgi ; do + if ! use nginx_modules_http_${module}; then + sed -i -e "/${module}/d" auto/install || die + fi + done +} + +src_configure() { + # mod_security needs to generate nginx/modsecurity/config before including it + if use nginx_modules_http_security; then + cd "${HTTP_SECURITY_MODULE_WD}" + if use luajit ; then + sed -i \ + -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \ + configure || die + fi + ./configure \ + --enable-standalone-module \ + $(use_enable pcre-jit) \ + $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security" + fi + + cd "${S}" + + local myconf=() http_enabled= mail_enabled= + + use aio && myconf+=( --with-file-aio ) + use debug && myconf+=( --with-debug ) + use http2 && myconf+=( --with-http_v2_module ) + use ipv6 && myconf+=( --with-ipv6 ) + use libatomic && myconf+=( --with-libatomic ) + use pcre && myconf+=( --with-pcre ) + use pcre-jit && myconf+=( --with-pcre-jit ) + use threads && myconf+=( --with-threads ) + + # HTTP modules + for mod in $NGINX_MODULES_STD; do + if use nginx_modules_http_${mod}; then + http_enabled=1 + else + myconf+=( --without-http_${mod}_module ) + fi + done + + for mod in $NGINX_MODULES_OPT; do + if use nginx_modules_http_${mod}; then + http_enabled=1 + myconf+=( --with-http_${mod}_module ) + fi + done + + if use nginx_modules_http_fastcgi; then + myconf+=( --with-http_realip_module ) + fi + + # third-party modules + if use nginx_modules_http_upload_progress; then + http_enabled=1 + myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} ) + fi + + if use nginx_modules_http_headers_more; then + http_enabled=1 + myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} ) + fi + + if use nginx_modules_http_cache_purge; then + http_enabled=1 + myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} ) + fi + + if use nginx_modules_http_slowfs_cache; then + http_enabled=1 + myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} ) + fi + + if use nginx_modules_http_fancyindex; then + http_enabled=1 + myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} ) + fi + + if use nginx_modules_http_lua; then + http_enabled=1 + if use luajit; then + export LUAJIT_LIB=$(pkg-config --variable libdir luajit) + export LUAJIT_INC=$(pkg-config --variable includedir luajit) + else + export LUA_LIB=$(pkg-config --variable libdir lua) + export LUA_INC=$(pkg-config --variable includedir lua) + fi + myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} ) + myconf+=( --add-module=${HTTP_LUA_MODULE_WD} ) + fi + + if use nginx_modules_http_auth_pam; then + http_enabled=1 + myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} ) + fi + + if use nginx_modules_http_upstream_check; then + http_enabled=1 + myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} ) + fi + + if use nginx_modules_http_metrics; then + http_enabled=1 + myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} ) + fi + + if use nginx_modules_http_naxsi ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_NAXSI_MODULE_WD} ) + fi + + if use rtmp ; then + http_enabled=1 + myconf+=( --add-module=${RTMP_MODULE_WD} ) + fi + + if use nginx_modules_http_dav_ext ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} ) + fi + + if use nginx_modules_http_echo ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} ) + fi + + if use nginx_modules_http_security ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity ) + fi + + if use nginx_modules_http_push_stream ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} ) + fi + + if use nginx_modules_http_sticky ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} ) + fi + + if use nginx_modules_http_mogilefs ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} ) + fi + + if use nginx_modules_http_memc ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} ) + fi + + if use http || use http-cache || use http2; then + http_enabled=1 + fi + + if [ $http_enabled ]; then + use http-cache || myconf+=( --without-http-cache ) + use ssl && myconf+=( --with-http_ssl_module ) + else + myconf+=( --without-http --without-http-cache ) + fi + + # MAIL modules + for mod in $NGINX_MODULES_MAIL; do + if use nginx_modules_mail_${mod}; then + mail_enabled=1 + else + myconf+=( --without-mail_${mod}_module ) + fi + done + + if [ $mail_enabled ]; then + myconf+=( --with-mail ) + use ssl && myconf+=( --with-mail_ssl_module ) + fi + + # custom modules + for mod in $NGINX_ADD_MODULES; do + myconf+=( --add-module=${mod} ) + done + + # https://bugs.gentoo.org/286772 + export LANG=C LC_ALL=C + tc-export CC + + if ! use prefix; then + myconf+=( --user=${PN}" "--group=${PN} ) + fi + + ./configure \ + --prefix="${EPREFIX}"/usr \ + --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \ + --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ + --pid-path="${EPREFIX}"/run/${PN}.pid \ + --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ + --with-cc-opt="-I${EROOT}usr/include" \ + --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ + --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ + --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ + --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ + --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \ + --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \ + --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \ + "${myconf[@]}" || die "configure failed" + + # A purely cosmetic change that makes nginx -V more readable. This can be + # good if people outside the gentoo community would troubleshoot and + # question the users setup. + sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die +} + +src_compile() { + use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}" + + # https://bugs.gentoo.org/286772 + export LANG=C LC_ALL=C + emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" +} + +src_install() { + emake DESTDIR="${D%/}" install + + cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf || die + + newinitd "${FILESDIR}"/nginx.initd-r2 nginx + + systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service + + doman man/nginx.8 + dodoc CHANGES* README + + # just keepdir. do not copy the default htdocs files (bug #449136) + keepdir /var/www/localhost + rm -rf "${D}"usr/html || die + + # set up a list of directories to keep + local keepdir_list="${NGINX_HOME_TMP}"/client + local module + for module in proxy fastcgi scgi uwsgi; do + use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}" + done + + keepdir /var/log/nginx ${keepdir_list} + + # this solves a problem with SELinux where nginx doesn't see the directories + # as root and tries to create them as nginx + fperms 0750 "${NGINX_HOME_TMP}" + fowners ${PN}:0 "${NGINX_HOME_TMP}" + + fperms 0700 /var/log/nginx ${keepdir_list} + fowners ${PN}:${PN} /var/log/nginx ${keepdir_list} + + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}"/nginx.logrotate-r1 nginx + + if use nginx_modules_http_perl; then + cd "${S}"/objs/src/http/modules/perl/ + emake DESTDIR="${D}" INSTALLDIRS=vendor + perl_delete_localpod + fi + + if use nginx_modules_http_cache_purge; then + docinto ${HTTP_CACHE_PURGE_MODULE_P} + dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md} + fi + + if use nginx_modules_http_slowfs_cache; then + docinto ${HTTP_SLOWFS_CACHE_MODULE_P} + dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md} + fi + + if use nginx_modules_http_fancyindex; then + docinto ${HTTP_FANCYINDEX_MODULE_P} + dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst + fi + + if use nginx_modules_http_lua; then + docinto ${HTTP_LUA_MODULE_P} + dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown} + fi + + if use nginx_modules_http_auth_pam; then + docinto ${HTTP_AUTH_PAM_MODULE_P} + dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog} + fi + + if use nginx_modules_http_upstream_check; then + docinto ${HTTP_UPSTREAM_CHECK_MODULE_P} + dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES} + fi + + if use nginx_modules_http_naxsi; then + insinto /etc/nginx + doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules + fi + + if use rtmp; then + docinto ${RTMP_MODULE_P} + dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl} + fi + + if use nginx_modules_http_dav_ext; then + docinto ${HTTP_DAV_EXT_MODULE_P} + dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README + fi + + if use nginx_modules_http_echo; then + docinto ${HTTP_ECHO_MODULE_P} + dodoc "${HTTP_ECHO_MODULE_WD}"/{README.markdown,doc/HttpEchoModule.wiki} + fi + + if use nginx_modules_http_security; then + docinto ${HTTP_SECURITY_MODULE_P} + dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt} + fi + + if use nginx_modules_http_push_stream; then + docinto ${HTTP_PUSH_STREAM_MODULE_P} + dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile} + fi + + if use nginx_modules_http_sticky; then + docinto ${HTTP_STICKY_MODULE_P} + dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf} + fi + + if use nginx_modules_http_memc; then + docinto ${HTTP_MEMC_MODULE_P} + dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown + fi +} + +pkg_postinst() { + if use ssl; then + if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then + install_cert /etc/ssl/${PN}/${PN} + use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem} + fi + fi + + if use nginx_modules_http_spdy; then + ewarn "In nginx 1.9.5 the spdy module was superseded by http2." + ewarn "Update your configs and package.use accordingly." + fi + + if use nginx_modules_http_lua && use http2; then + ewarn "Lua 3rd party module author warns against using ${P} with" + ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg" + fi + + # This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for + # existing installations + local fix_perms=0 + + for rv in ${REPLACING_VERSIONS} ; do + version_compare ${rv} 1.4.1-r2 + [[ $? -eq 1 ]] && fix_perms=1 + done + + if [[ $fix_perms -eq 1 ]] ; then + ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following" + ewarn "directories the world-readable bit removed (if set):" + ewarn " ${EPREFIX}/var/log/nginx" + ewarn " ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" + ewarn "Check if this is correct for your setup before restarting nginx!" + ewarn "This is a one-time change and will not happen on subsequent updates." + ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}" + chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi} + fi + + # If the nginx user can't change into or read the dir, display a warning. + # If su is not available we display the warning nevertheless since we can't check properly + su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null + if [ $? -ne 0 ] ; then + ewarn "Please make sure that the nginx user or group has at least" + ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)" + ewarn "Otherwise you end up with empty log files after a logrotate." + fi +} diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index af697ab74e29..6e88e73ed43d 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -2,7 +2,5 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c WHIRLPOOL a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51 DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 38c266a21ff27560ba4c213dd64628a1ed35b22289d37b5d7f250010e963cc39 SHA512 6eb420a3067783a6ffee781c834dc363d6638d6e79182886594249a0ef810b2ab721f2a44f84b4ea90372a7e2e5171caf49697945d359e9c877a2db640fc3da2 WHIRLPOOL db678b899455ef977d893eec01ba50687c7563646321dbe511be6c55f03859a08778e4f6da14021a9ed051c1f3573edf9d0de527383aaf4ee6114f3a027b281d -DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88 DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc -DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb diff --git a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch deleted file mode 100644 index 481591fb6ff5..000000000000 --- a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch +++ /dev/null @@ -1,149 +0,0 @@ -diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml ---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100 -+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100 -@@ -660,12 +660,14 @@ - </fileset> - </copy> - <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar --> -+<!-- - <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1"> - <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources"> - <include name="*" /> - <exclude name="jspxml*" /> - </fileset> - </copy> -+--> - - </target> - -@@ -721,26 +723,32 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - <!-- Servlet 3.0 Implementation JAR File --> -+<!-- - <jarIt jarfile="${servlet-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.servlet-api" - manifest="${tomcat.manifests}/servlet-api.jar.manifest" - notice="${tomcat.manifests}/servlet-api.jar.notice" - license="${tomcat.manifests}/servlet-api.jar.license" /> -+--> - - <!-- JSP 2.2 Implementation JAR File --> -+<!-- - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" - notice="${tomcat.manifests}/jsp-api.jar.notice" - license="${tomcat.manifests}/jsp-api.jar.license" /> -+--> - - <!-- JSP 2.2 EL Implementation JAR File --> -+<!-- - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" /> -+--> - - <!-- Bootstrap JAR File --> - <jarIt jarfile="${bootstrap.jar}" -@@ -986,12 +994,14 @@ - <target name="deploy" depends="package,build-docs,compile-webapp-examples" - description="Default. Builds a working Tomcat instance"> - -+<!-- - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" - file="${tomcat-native.tar.gz}" /> - <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" - file="${commons-daemon.native.src.tgz}" /> - - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> -+--> - - <!-- Copy scripts --> - <copy todir="${tomcat.build}/bin"> -@@ -1051,14 +1061,15 @@ - <exclude name="${jdt.jar.filename}"/> - </fileset> - </delete> -+<!-- - <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -- -+--> - <!-- Add sources for examples --> - <antcall target="examples-sources" /> -- -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" - failonerror="false"/> -- -+--> - <!-- build the jdbc-pool jar and source jar--> - <echo message="Building Tomcat JDBC pool libraries"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1681,7 +1692,7 @@ - - <target name="extras-webservices-prepare" - depends="extras-prepare" -- description="Prepare to build web services extras package"> -+ description="Prepare to build web services extras package" unless="noget"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${jaxrpc-lib.loc}"/> -@@ -1886,6 +1897,7 @@ - description="Create the Tomcat javadoc" > - <fail unless="java.7.home" - message="The java.7.home property must be set for javadoc build"/> -+<!-- - <javadoc packagenames="javax.servlet.*" - excludepackagenames="javax.servlet.jsp.*" - sourcepath="${tomcat.dist}/src/java" -@@ -1947,6 +1959,7 @@ - <path location="${ant.core.lib}"/> - </classpath> - </javadoc> -+--> - <javadoc packagenames="javax.websocket.*" - sourcepath="${tomcat.dist}/src/java" - destdir="${tomcat.dist}/webapps/docs/websocketapi" -@@ -1985,9 +1998,11 @@ - <path refid="tomcat.webservices.classpath"/> - <path location="${ant.core.lib}"/> - </classpath> -+<!-- - <link href="../servletapi"/> - <link href="../jspapi"/> - <link href="../elapi"/> -+--> - <link href="../websocketapi"/> - <link href="http://docs.oracle.com/javase/7/docs/api/"/> - <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> -@@ -2642,7 +2657,7 @@ - </target> - - <target name="download-compile" -- description="Download (and build) components necessary to compile" > -+ description="Download (and build) components necessary to compile" unless="noget"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2699,7 +2714,7 @@ - </target> - - <target name="download-test-compile" -- description="Download additional components for the tests" > -+ description="Download additional components for the tests" unless="noget"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${junit.loc}"/> -@@ -2727,7 +2742,7 @@ - </target> - - <target name="download-dist" -- description="Download additional components for a distribution" > -+ description="Download additional components for a distribution" unless="noget"> - - <antcall target="downloadzip-2"> - <param name="sourcefile.1" value="${tomcat-native.win.1}"/> diff --git a/www-servers/tomcat/files/tomcat-8.0.23-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.23-build.xml.patch deleted file mode 100644 index d7479598837b..000000000000 --- a/www-servers/tomcat/files/tomcat-8.0.23-build.xml.patch +++ /dev/null @@ -1,230 +0,0 @@ -diff -Naur apache-tomcat-8.0.18-src-orig/build.xml apache-tomcat-8.0.18-src/build.xml ---- apache-tomcat-8.0.18-src-orig/build.xml 2015-01-28 15:10:36.112146352 -0500 -+++ apache-tomcat-8.0.18-src/build.xml 2015-02-19 18:08:37.971396016 -0500 -@@ -703,24 +703,29 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - <!-- Servlet 3.1 Implementation JAR File --> -+<!-- - <jarIt jarfile="${servlet-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.servlet-api" - manifest="${tomcat.manifests}/servlet-api.jar.manifest" - notice="${tomcat.manifests}/servlet-api.jar.notice" - license="${tomcat.manifests}/servlet-api.jar.license" /> -- -+--> - <!-- JSP 2.3 Implementation JAR File --> -+<!-- - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> -+--> - - <!-- EL 3.0 Implementation JAR File --> -+<!-- - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" /> -+--> - - <!-- WebSocket 1.1 API JAR File --> - <jarIt jarfile="${websocket-api.jar}" -@@ -992,14 +997,14 @@ - - <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" - description="Default. Builds a working Tomcat instance"> -- -+<!-- - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" - file="${tomcat-native.tar.gz}" /> - <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" - file="${commons-daemon.native.src.tgz}" /> - - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> -- -+--> - <!-- Copy scripts --> - <copy todir="${tomcat.build}/bin"> - <fileset dir="bin"> -@@ -1059,7 +1064,7 @@ - <exclude name="${jdt.jar.filename}"/> - </fileset> - </delete> -- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> - - <!-- Add sources for examples --> - <antcall target="examples-sources" /> -@@ -1093,7 +1098,7 @@ - </javac> - </target> - -- <target name="build-tomcat-jdbc" depends="package"> -+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> - <!-- build the jdbc-pool jar and source jar--> - <echo message="Building Tomcat JDBC pool libraries"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1108,7 +1113,7 @@ - <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> - </target> - -- <target name="build-tomcat-jdbc-src"> -+ <target name="build-tomcat-jdbc-src" unless="noget"> - <!-- build the jdbc-pool source jar--> - <echo message="Building Tomcat JDBC pool src JAR"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1212,10 +1217,11 @@ - - <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> - <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.embed}" /> -- -+--> - <!-- Note the meta-inf below will work as long as there is only one JAR - that needs to add entries. If there is more than one a more complex - solution will be required. --> -@@ -1519,7 +1525,7 @@ - - <target name="extras-commons-logging-prepare" - depends="extras-prepare" -- description="Prepare to build web services extras package"> -+ description="Prepare to build web services extras package" unless="noget"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> -@@ -1658,7 +1664,7 @@ - - <target name="extras-webservices-prepare" - depends="extras-prepare" -- description="Prepare to build web services extras package"> -+ description="Prepare to build web services extras package" unless="noget"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${jaxrpc-lib.loc}"/> -@@ -2703,7 +2709,7 @@ - </target> - - <target name="download-compile" -- description="Download (and build) components necessary to compile" > -+ description="Download (and build) components necessary to compile" unless="noget"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2746,7 +2752,7 @@ - </target> - - <target name="download-test-compile" -- description="Download additional components for the tests" > -+ description="Download additional components for the tests" unless="noget"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${junit.loc}"/> -@@ -2792,7 +2798,7 @@ - </target> - - <target name="download-dist" -- description="Download additional components for a distribution" > -+ description="Download additional components for a distribution" unless="noget"> - - <antcall target="downloadzip-2"> - <param name="sourcefile.1" value="${tomcat-native.win.1}"/> -@@ -2818,18 +2824,18 @@ - - <!-- =============== Utility Targets to support downloads ================ --> - -- <target name="setproxy" if="${proxy.use}"> -+ <target name="setproxy" if="${proxy.use}" unless="noget"> - <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" - proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> - <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> - </target> - -- <target name="testexist"> -+ <target name="testexist" unless="noget"> - <echo message="Testing for ${destfile}"/> - <available file="${destfile}" property="exist"/> - </target> - -- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2841,7 +2847,7 @@ - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadgz-2" unless="exist" depends="testexist"> -+ <target name="downloadgz-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2860,7 +2866,7 @@ - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2871,7 +2877,7 @@ - <delete file="${temp.file}"/> - </target> - -- <target name="downloadzip-2" unless="exist" depends="testexist"> -+ <target name="downloadzip-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2889,7 +2895,7 @@ - <delete file="${temp.file}"/> - </target> - -- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> - <!-- Download the file --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2899,7 +2905,7 @@ - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="downloadfile-2" unless="exist" depends="testexist"> -+ <target name="downloadfile-2" unless="noget" depends="testexist"> - <!-- Download the file from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2922,7 +2928,7 @@ - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="trydownload.check" depends="setproxy"> -+ <target name="trydownload.check" depends="setproxy" unless="noget"> - <condition property="trydownload.run"> - <and> - <not> -@@ -2933,7 +2939,7 @@ - </condition> - </target> - -- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> -+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> - <!-- Downloads a file if not yet downloaded and the source URL is available --> - <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> - </target> -@@ -2944,7 +2950,7 @@ - - <target name="ide-eclipse" - depends="download-compile, extras-webservices-prepare, download-test-compile" -- description="Prepares the source tree to be built in Eclipse"> -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - <!-- Copy the sample project files into the root directory --> - <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> diff --git a/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch deleted file mode 100644 index 1923d23ba50b..000000000000 --- a/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch +++ /dev/null @@ -1,265 +0,0 @@ -diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml ---- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100 -+++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100 -@@ -697,24 +697,29 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - <!-- Servlet 3.1 Implementation JAR File --> -+<!-- - <jarIt jarfile="${servlet-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.servlet-api" - manifest="${tomcat.manifests}/servlet-api.jar.manifest" - notice="${tomcat.manifests}/servlet-api.jar.notice" - license="${tomcat.manifests}/servlet-api.jar.license" /> -- -+--> - <!-- JSP 2.3 Implementation JAR File --> -+<!-- - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> -+--> - - <!-- EL 3.0 Implementation JAR File --> -+<!-- - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" /> -+--> - - <!-- WebSocket 1.1 API JAR File --> - <jarIt jarfile="${websocket-api.jar}" -@@ -982,14 +987,14 @@ - - <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" - description="Default. Builds a working Tomcat instance"> -- -+<!-- - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" - file="${tomcat-native.tar.gz}" /> - <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" - file="${commons-daemon.native.src.tgz}" /> - - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> -- -+--> - <!-- Copy scripts --> - <copy todir="${tomcat.build}/bin"> - <fileset dir="bin"> -@@ -1049,7 +1054,7 @@ - <exclude name="${jdt.jar.filename}"/> - </fileset> - </delete> -- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> - - <!-- Add sources for examples --> - <antcall target="examples-sources" /> -@@ -1083,7 +1088,7 @@ - </javac> - </target> - -- <target name="build-tomcat-jdbc" depends="package"> -+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> - <!-- build the jdbc-pool jar and source jar--> - <echo message="Building Tomcat JDBC pool libraries"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1098,7 +1103,7 @@ - <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> - </target> - -- <target name="build-tomcat-jdbc-src"> -+ <target name="build-tomcat-jdbc-src" unless="noget"> - <!-- build the jdbc-pool source jar--> - <echo message="Building Tomcat JDBC pool src JAR"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1202,10 +1207,11 @@ - - <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> - <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.embed}" /> -- -+--> - <!-- Note the meta-inf below will work as long as there is only one JAR - that needs to add entries. If there is more than one a more complex - solution will be required. --> -@@ -1542,7 +1548,7 @@ - - <target name="extras-commons-logging-prepare" - depends="extras-prepare" -- description="Prepare to build web services extras package"> -+ description="Prepare to build web services extras package" unless="noget"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> -@@ -1681,7 +1687,7 @@ - - <target name="extras-webservices-prepare" - depends="extras-prepare" -- description="Prepare to build web services extras package"> -+ description="Prepare to build web services extras package" unless="noget"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${jaxrpc-lib.loc}"/> -@@ -1882,6 +1888,7 @@ - - <target name="javadoc" depends="dist-source,extras-webservices-prepare" - description="Create the Tomcat javadoc" > -+<!-- - <javadoc packagenames="javax.servlet.*" - excludepackagenames="javax.servlet.jsp.*" - sourcepath="${tomcat.dist}/src/java" -@@ -1940,6 +1947,7 @@ - <path location="${ant.core.lib}"/> - </classpath> - </javadoc> -+--> - <javadoc packagenames="javax.websocket.*" - sourcepath="${tomcat.dist}/src/java" - destdir="${tomcat.dist}/webapps/docs/websocketapi" -@@ -1970,15 +1978,17 @@ - docencoding="UTF-8" - charset="UTF-8" - additionalparam="-breakiterator -notimestamp" -- maxmemory="256m" > -+ maxmemory="512m" > - <classpath> - <path refid="compile.classpath"/> - <path refid="tomcat.webservices.classpath"/> - <path location="${ant.core.lib}"/> - </classpath> -+<!-- - <link href="../servletapi"/> - <link href="../jspapi"/> - <link href="../elapi"/> -+--> - <link href="../websocketapi"/> - <link href="http://docs.oracle.com/javase/7/docs/api/"/> - <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> -@@ -2739,7 +2749,7 @@ - </target> - - <target name="download-compile" -- description="Download (and build) components necessary to compile" > -+ description="Download (and build) components necessary to compile" unless="noget"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2773,7 +2783,7 @@ - </target> - - <target name="download-test-compile" -- description="Download additional components for the tests" > -+ description="Download additional components for the tests" unless="noget"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${junit.loc}"/> -@@ -2819,7 +2829,7 @@ - </target> - - <target name="download-dist" -- description="Download additional components for a distribution" > -+ description="Download additional components for a distribution" unless="noget"> - - <antcall target="downloadzip-2"> - <param name="sourcefile.1" value="${tomcat-native.win.1}"/> -@@ -2845,18 +2855,18 @@ - - <!-- =============== Utility Targets to support downloads ================ --> - -- <target name="setproxy" if="${proxy.use}"> -+ <target name="setproxy" if="${proxy.use}" unless="noget"> - <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" - proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> - <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> - </target> - -- <target name="testexist"> -+ <target name="testexist" unless="noget"> - <echo message="Testing for ${destfile}"/> - <available file="${destfile}" property="exist"/> - </target> - -- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2868,7 +2878,7 @@ - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadgz-2" unless="exist" depends="testexist"> -+ <target name="downloadgz-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2887,7 +2897,7 @@ - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2898,7 +2908,7 @@ - <delete file="${temp.file}"/> - </target> - -- <target name="downloadzip-2" unless="exist" depends="testexist"> -+ <target name="downloadzip-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2916,7 +2926,7 @@ - <delete file="${temp.file}"/> - </target> - -- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> - <!-- Download the file --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2926,7 +2936,7 @@ - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="downloadfile-2" unless="exist" depends="testexist"> -+ <target name="downloadfile-2" unless="noget" depends="testexist"> - <!-- Download the file from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2949,7 +2959,7 @@ - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="trydownload.check" depends="setproxy"> -+ <target name="trydownload.check" depends="setproxy" unless="noget"> - <condition property="trydownload.run"> - <and> - <not> -@@ -2960,7 +2970,7 @@ - </condition> - </target> - -- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> -+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> - <!-- Downloads a file if not yet downloaded and the source URL is available --> - <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> - </target> -@@ -2971,7 +2981,7 @@ - - <target name="ide-eclipse" - depends="download-compile, extras-webservices-prepare, download-test-compile" -- description="Prepares the source tree to be built in Eclipse"> -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - <!-- Copy the sample project files into the root directory --> - <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> diff --git a/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch deleted file mode 100644 index 1923d23ba50b..000000000000 --- a/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch +++ /dev/null @@ -1,265 +0,0 @@ -diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml ---- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100 -+++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100 -@@ -697,24 +697,29 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - <!-- Servlet 3.1 Implementation JAR File --> -+<!-- - <jarIt jarfile="${servlet-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.servlet-api" - manifest="${tomcat.manifests}/servlet-api.jar.manifest" - notice="${tomcat.manifests}/servlet-api.jar.notice" - license="${tomcat.manifests}/servlet-api.jar.license" /> -- -+--> - <!-- JSP 2.3 Implementation JAR File --> -+<!-- - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> -+--> - - <!-- EL 3.0 Implementation JAR File --> -+<!-- - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" /> -+--> - - <!-- WebSocket 1.1 API JAR File --> - <jarIt jarfile="${websocket-api.jar}" -@@ -982,14 +987,14 @@ - - <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" - description="Default. Builds a working Tomcat instance"> -- -+<!-- - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" - file="${tomcat-native.tar.gz}" /> - <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" - file="${commons-daemon.native.src.tgz}" /> - - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> -- -+--> - <!-- Copy scripts --> - <copy todir="${tomcat.build}/bin"> - <fileset dir="bin"> -@@ -1049,7 +1054,7 @@ - <exclude name="${jdt.jar.filename}"/> - </fileset> - </delete> -- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> - - <!-- Add sources for examples --> - <antcall target="examples-sources" /> -@@ -1083,7 +1088,7 @@ - </javac> - </target> - -- <target name="build-tomcat-jdbc" depends="package"> -+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> - <!-- build the jdbc-pool jar and source jar--> - <echo message="Building Tomcat JDBC pool libraries"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1098,7 +1103,7 @@ - <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> - </target> - -- <target name="build-tomcat-jdbc-src"> -+ <target name="build-tomcat-jdbc-src" unless="noget"> - <!-- build the jdbc-pool source jar--> - <echo message="Building Tomcat JDBC pool src JAR"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1202,10 +1207,11 @@ - - <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> - <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.embed}" /> -- -+--> - <!-- Note the meta-inf below will work as long as there is only one JAR - that needs to add entries. If there is more than one a more complex - solution will be required. --> -@@ -1542,7 +1548,7 @@ - - <target name="extras-commons-logging-prepare" - depends="extras-prepare" -- description="Prepare to build web services extras package"> -+ description="Prepare to build web services extras package" unless="noget"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> -@@ -1681,7 +1687,7 @@ - - <target name="extras-webservices-prepare" - depends="extras-prepare" -- description="Prepare to build web services extras package"> -+ description="Prepare to build web services extras package" unless="noget"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${jaxrpc-lib.loc}"/> -@@ -1882,6 +1888,7 @@ - - <target name="javadoc" depends="dist-source,extras-webservices-prepare" - description="Create the Tomcat javadoc" > -+<!-- - <javadoc packagenames="javax.servlet.*" - excludepackagenames="javax.servlet.jsp.*" - sourcepath="${tomcat.dist}/src/java" -@@ -1940,6 +1947,7 @@ - <path location="${ant.core.lib}"/> - </classpath> - </javadoc> -+--> - <javadoc packagenames="javax.websocket.*" - sourcepath="${tomcat.dist}/src/java" - destdir="${tomcat.dist}/webapps/docs/websocketapi" -@@ -1970,15 +1978,17 @@ - docencoding="UTF-8" - charset="UTF-8" - additionalparam="-breakiterator -notimestamp" -- maxmemory="256m" > -+ maxmemory="512m" > - <classpath> - <path refid="compile.classpath"/> - <path refid="tomcat.webservices.classpath"/> - <path location="${ant.core.lib}"/> - </classpath> -+<!-- - <link href="../servletapi"/> - <link href="../jspapi"/> - <link href="../elapi"/> -+--> - <link href="../websocketapi"/> - <link href="http://docs.oracle.com/javase/7/docs/api/"/> - <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> -@@ -2739,7 +2749,7 @@ - </target> - - <target name="download-compile" -- description="Download (and build) components necessary to compile" > -+ description="Download (and build) components necessary to compile" unless="noget"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2773,7 +2783,7 @@ - </target> - - <target name="download-test-compile" -- description="Download additional components for the tests" > -+ description="Download additional components for the tests" unless="noget"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${junit.loc}"/> -@@ -2819,7 +2829,7 @@ - </target> - - <target name="download-dist" -- description="Download additional components for a distribution" > -+ description="Download additional components for a distribution" unless="noget"> - - <antcall target="downloadzip-2"> - <param name="sourcefile.1" value="${tomcat-native.win.1}"/> -@@ -2845,18 +2855,18 @@ - - <!-- =============== Utility Targets to support downloads ================ --> - -- <target name="setproxy" if="${proxy.use}"> -+ <target name="setproxy" if="${proxy.use}" unless="noget"> - <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" - proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> - <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> - </target> - -- <target name="testexist"> -+ <target name="testexist" unless="noget"> - <echo message="Testing for ${destfile}"/> - <available file="${destfile}" property="exist"/> - </target> - -- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2868,7 +2878,7 @@ - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadgz-2" unless="exist" depends="testexist"> -+ <target name="downloadgz-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2887,7 +2897,7 @@ - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2898,7 +2908,7 @@ - <delete file="${temp.file}"/> - </target> - -- <target name="downloadzip-2" unless="exist" depends="testexist"> -+ <target name="downloadzip-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2916,7 +2926,7 @@ - <delete file="${temp.file}"/> - </target> - -- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> - <!-- Download the file --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2926,7 +2936,7 @@ - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="downloadfile-2" unless="exist" depends="testexist"> -+ <target name="downloadfile-2" unless="noget" depends="testexist"> - <!-- Download the file from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2949,7 +2959,7 @@ - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="trydownload.check" depends="setproxy"> -+ <target name="trydownload.check" depends="setproxy" unless="noget"> - <condition property="trydownload.run"> - <and> - <not> -@@ -2960,7 +2970,7 @@ - </condition> - </target> - -- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> -+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> - <!-- Downloads a file if not yet downloaded and the source URL is available --> - <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> - </target> -@@ -2971,7 +2981,7 @@ - - <target name="ide-eclipse" - depends="download-compile, extras-webservices-prepare, download-test-compile" -- description="Prepares the source tree to be built in Eclipse"> -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - <!-- Copy the sample project files into the root directory --> - <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> diff --git a/www-servers/tomcat/files/tomcat-instance-manager-r2.bash b/www-servers/tomcat/files/tomcat-instance-manager-r2.bash new file mode 100644 index 000000000000..b3b1a0221bc3 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-instance-manager-r2.bash @@ -0,0 +1,270 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Author: Ralph Sennhauser <sera@gentoo.org> + +die() { + echo "${@}" + exit 1 +} + +dir_is_empty() { + # usage: + # dir_is_empty <some-dir> + # + # returns 2 if the dir does not even exist + # returns 1 if the dir is not empty + # returns 0 (success) if the dir exists and is empty + + local dir=$1 + local files + + if [[ ! -e ${dir} ]] ; then + return 2 + fi + + shopt -s nullglob dotglob # To include hidden files + files=( "${dir}"/* ) + shopt -u nullglob dotglob + + if [[ ${#files[@]} -eq 0 ]]; then + return 0 + else + return 1 + fi + +} + +usage() { + cat <<EOL +Usage: ${BASH_SOURCE} <--create|--remove|--help> [--suffix s][--user u][--group g] + + Options: + --help: + show this text. + --create: + create a new instance + --remove: + remove an existing instance. + --suffix SUFFIX: + a suffix for this instance. the suffix may not collide with an already + existing instance, defaults to empty. + --user USER: + the user for which to configure this instance for. The user needs to + exist already. defaults to tomcat. + --group GROUP: + the group for which to configure this instance for. The group needs to + exist already. defaults to tomcat. + + Examples: + ${BASH_SOURCE} --create --suffix testing --user tacmot --group tacmot + ${BASH_SOURCE} --remove --suffix testing +EOL +} + +parse_argv() { + action="not specified" + instance_name="tomcat-@SLOT@" + instance_user="tomcat" + instance_group="tomcat" + + while [[ -n $1 ]]; do + case $1 in + --help) + usage + exit 0;; + --suffix) + instance_name+="-$2" + shift; shift;; + --user) + instance_user="$2" + shift; shift;; + --group) + instance_group="$2" + shift; shift;; + --create) + action=create + shift;; + --remove) + action=remove + shift;; + --backup) + action=backup + shift;; + --restore) + action=restore + shift;; + --update) + action=update + shift;; + *) + echo "Invalid option '$1'" + usage + exit 2;; + esac + done + + tomcat_home="/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-@SLOT@" + instance_base="/@GENTOO_PORTAGE_EPREFIX@var/lib/${instance_name}" + instance_conf="/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}" + instance_logs="/@GENTOO_PORTAGE_EPREFIX@var/log/${instance_name}" + instance_temp="/@GENTOO_PORTAGE_EPREFIX@var/tmp/${instance_name}" + + all_targets=( + "${instance_base}" + "${instance_logs}" + "${instance_temp}" + "/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}" + "/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}" + "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}" + ) +} + +test_can_deploy() { + local no_deploy target + for target in "${all_targets[@]}"; do + if [[ -e "${target}" ]]; then + if ! dir_is_empty "${target}" ; then + echo "Error: '${target}' already exists and is not empty." + no_deploy=yes + fi + fi + done + if [[ -n "${no_deploy}" ]]; then + cat <<-EOL + + To protect an existing installation no new instance was deployed. You can use + '${BASH_SOURCE} --remove' + to remove an existing instance first or run + '${BASH_SOURCE} --create --sufix <instance_suffix>' + to deploy an instance under a different name + + EOL + usage + exit 1 + fi + + if ! getent passwd | cut -d: -f1 | grep -Fx "${instance_user}" > /dev/null; then + echo "Error: user '${instance_user}' doesn't exist." + exit 1 + fi + + if ! getent group | cut -d: -f1 | grep -Fx "${instance_group}" > /dev/null; then + echo "Error: group '${instance_group}' doesn't exist." + exit 1 + fi +} + +deploy_instance() { + test_can_deploy + + mkdir -p "${instance_base}"/{work,webapps} || die + mkdir -p "${instance_logs}" || die + mkdir -p "${instance_temp}" || die + mkdir -p "${instance_conf}" || die + + cp -r "${tomcat_home}"/webapps/ROOT "${instance_base}"/webapps || die + + chown -R "${instance_user}":"${instance_group}" \ + "${instance_base}" "${instance_logs}" "${instance_temp}" || die + + find "${instance_base}"/webapps -type d -exec chmod 750 {} + || die + find "${instance_base}"/webapps -type f -exec chmod 640 {} + || die + + # initial config # + + cp -r "${tomcat_home}"/conf/* "${instance_conf}"/ || die + + sed -i -e "s|\${catalina.base}/logs|${instance_logs}|" \ + "${instance_conf}"/logging.properties || die + sed -i -e "s|directory=\"logs\"|directory=\"${instance_logs}\"|" \ + "${instance_conf}"/server.xml || die + + mkdir -p "${instance_conf}"/Catalina/localhost || die + cat > "${instance_conf}"/Catalina/localhost/host-manager.xml <<-'EOF' + <?xml version="1.0" encoding="UTF-8"?> + <Context docBase="${catalina.home}/webapps/host-manager" + antiResourceLocking="false" privileged="true" /> + EOF + + cat > "${instance_conf}"/Catalina/localhost/manager.xml <<-'EOF' + <?xml version="1.0" encoding="UTF-8"?> + <Context docBase="${catalina.home}/webapps/manager" + antiResourceLocking="false" privileged="true" /> + EOF + + if [[ -d "${tomcat_home}"/webapps/docs ]]; then + cat > "${instance_conf}"/Catalina/localhost/docs.xml <<-'EOF' + <?xml version="1.0" encoding="UTF-8"?> + <Context docBase="${catalina.home}/webapps/docs" /> + EOF + fi + + if [[ -d "${tomcat_home}"/webapps/examples ]]; then + cat > "${instance_conf}"/Catalina/localhost/examples.xml <<-'EOF' + <?xml version="1.0" encoding="UTF-8"?> + <Context docBase="${catalina.home}/webapps/examples" /> + EOF + fi + + chown -R "${instance_user}":"${instance_group}" "${instance_conf}" || die + find "${instance_conf}" -type d -exec chmod 750 {} + || die + find "${instance_conf}" -type f -exec chmod 640 {} + || die + + # rc script # + + cp "${tomcat_home}"/gentoo/tomcat.init \ + "/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}" || die + + sed -e "s|@INSTANCE_NAME@|${instance_name}|g" \ + -e "s|@INSTANCE_USER@|${instance_user}|g" \ + -e "s|@INSTANCE_GROUP@|${instance_group}|g" \ + "${tomcat_home}"/gentoo/tomcat.conf \ + > "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}" || die + + # some symlinks for tomcat and netbeans # + + ln -s "${instance_conf}" "${instance_base}"/conf || die + ln -s "${instance_temp}" "${instance_base}"/temp || die + + # a note to update the default configuration # + + cat <<-EOL + Successfully created instance '${instance_name}' + It's strongly recommended for production systems to go carefully through the + configuration files at '${instance_conf}'. + The generated initial configuration is close to upstreams default which + favours the demo aspect over hardening. + EOL +} + +remove_instance() { + echo "The following files will be removed permanently:" + local target; for target in "${all_targets[@]}"; do + find ${target} + done + + echo "Type 'yes' to continue" + read + if [[ ${REPLY} == yes ]]; then + rm -rv "${all_targets[@]}" + else + echo "Aborting as requested ..." + fi +} + +parse_argv "$@" + +if [[ ${action} == create ]]; then + deploy_instance +elif [[ ${action} == remove ]]; then + remove_instance +elif [[ ${action} == "not specified" ]]; then + echo "No action specified!" + usage + exit 1 +else + echo "${action} not yet implemented!" + usage + exit 1 +fi diff --git a/www-servers/tomcat/tomcat-7.0.64.ebuild b/www-servers/tomcat/tomcat-7.0.64.ebuild index 370d94253a93..7072bb9e5e79 100644 --- a/www-servers/tomcat/tomcat-7.0.64.ebuild +++ b/www-servers/tomcat/tomcat-7.0.64.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="7" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="extra-webapps websockets" RESTRICT="test" # can we run them on a production system? diff --git a/www-servers/tomcat/tomcat-8.0.23-r2.ebuild b/www-servers/tomcat/tomcat-8.0.23-r2.ebuild deleted file mode 100644 index 763649776bee..000000000000 --- a/www-servers/tomcat/tomcat-8.0.23-r2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc source test" - -inherit eutils java-pkg-2 java-ant-2 prefix user - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container" -HOMEPAGE="http://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="8" -KEYWORDS="amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.4" -SAPI_SLOT="3.1" - -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/tomcat-servlet-api:${SAPI_SLOT}" -RDEPEND="${COMMON_DEP} - !<dev-java/tomcat-native-1.1.24 - >=virtual/jre-1.7" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.7 - >=dev-java/ant-core-1.8.1:0 - test? ( - dev-java/ant-junit:0 - dev-java/junit:4 - )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - java-pkg-2_pkg_setup - enewgroup tomcat 265 - enewuser tomcat 265 -1 /dev/null tomcat -} - -java_prepare() { - find -name '*.jar' -type f -delete -print || die - - epatch "${FILESDIR}/${P}-build.xml.patch" - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die -} - -JAVA_ANT_REWRITE_CLASSPATH="true" - -EANT_BUILD_TARGET="deploy" -EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" -EANT_NEEDS_TOOLS="true" -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" - -# revision of the instance-manager script -IM_REV="-r1" - -src_compile() { - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" - java-pkg-2_src_compile -} - -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" - -src_test() { - java-pkg-2_src_test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - # so we don't have to call java-config with --with-dependencies, which might - # bring in more jars then actually desired. - java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})" - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dohtml -r output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - doexe "${T}"/tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" - elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." - elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" - - elog "To manage Tomcat instances, run:" - elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" - ewarn "from upstream binary if you need it. Gentoo Bug # 144276" - -# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." -} diff --git a/www-servers/tomcat/tomcat-8.0.26.ebuild b/www-servers/tomcat/tomcat-8.0.26.ebuild index 4284e5765752..3b71c0d0fb1d 100644 --- a/www-servers/tomcat/tomcat-8.0.26.ebuild +++ b/www-servers/tomcat/tomcat-8.0.26.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="8" -KEYWORDS="amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="extra-webapps" RESTRICT="test" # can we run them on a production system? diff --git a/www-servers/tomcat/tomcat-8.0.27.ebuild b/www-servers/tomcat/tomcat-8.0.28-r1.ebuild index 3074dfa43e93..0d40f89e880f 100644 --- a/www-servers/tomcat/tomcat-8.0.27.ebuild +++ b/www-servers/tomcat/tomcat-8.0.28-r1.ebuild @@ -31,6 +31,7 @@ RDEPEND="${COMMON_DEP} !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.7" DEPEND="${COMMON_DEP} + app-admin/pwgen >=virtual/jdk-1.7 test? ( >=dev-java/ant-junit-1.9:0 @@ -69,7 +70,7 @@ EANT_NEEDS_TOOLS="true" EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" # revisions of the scripts -IM_REV="-r1" +IM_REV="-r2" INIT_REV="-r1" src_compile() { @@ -110,7 +111,7 @@ src_install() { fperms 0750 "${dest}"/logs # replace the default pw with a random one, see #92281 - local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) + local randpw="$(pwgen -s -B 15 1)" sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die # prepend gentoo.classpath to common.loader, see #453212 diff --git a/www-servers/tomcat/tomcat-8.0.28.ebuild b/www-servers/tomcat/tomcat-8.0.28.ebuild deleted file mode 100644 index 3074dfa43e93..000000000000 --- a/www-servers/tomcat/tomcat-8.0.28.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -JAVA_PKG_IUSE="doc source test" - -inherit eutils java-pkg-2 java-ant-2 prefix user - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container" -HOMEPAGE="http://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="8" -KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.4" -SAPI_SLOT="3.1" - -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/oracle-javamail:0 - dev-java/tomcat-servlet-api:${SAPI_SLOT}" -RDEPEND="${COMMON_DEP} - !<dev-java/tomcat-native-1.1.24 - >=virtual/jre-1.7" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.7 - test? ( - >=dev-java/ant-junit-1.9:0 - dev-java/easymock:3.2 - )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - java-pkg-2_pkg_setup - enewgroup tomcat 265 - enewuser tomcat 265 -1 /dev/null tomcat -} - -java_prepare() { - find -name '*.jar' -type f -delete -print || die - - # Remove bundled javamail, servlet-api - rm -rv java/javax/{el,mail,servlet} || die - - epatch "${FILESDIR}/${P}-build.xml.patch" - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die -} - -JAVA_ANT_REWRITE_CLASSPATH="true" - -EANT_BUILD_TARGET="deploy" -EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}" -EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" -EANT_NEEDS_TOOLS="true" -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" - -# revisions of the scripts -IM_REV="-r1" -INIT_REV="-r1" - -src_compile() { - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" - java-pkg-2_src_compile -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" - elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." - elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" - - elog "To manage Tomcat instances, run:" - elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" - ewarn "from upstream binary if you need it. Gentoo Bug # 144276" - -# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." -} diff --git a/www-servers/xsp/metadata.xml b/www-servers/xsp/metadata.xml index 3cbbb7bde1f4..da626214408a 100644 --- a/www-servers/xsp/metadata.xml +++ b/www-servers/xsp/metadata.xml @@ -8,6 +8,9 @@ </longdescription> <use> <flag name="developer">creates .mdb files for either Release and Debug</flag> + <flag name="net35">use .NET 3.5 Framework</flag> + <flag name="net40">use .NET 4.0 Framework</flag> + <flag name="net45">use .NET 4.5 Framework</flag> </use> <upstream> <remote-id type="github">mono/xsp</remote-id> diff --git a/x11-apps/fusion-icon/fusion-icon-0.1-r2.ebuild b/x11-apps/fusion-icon/fusion-icon-0.1-r2.ebuild deleted file mode 100644 index 79515c6a8030..000000000000 --- a/x11-apps/fusion-icon/fusion-icon-0.1-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -PYTHON_DEPEND="2" - -inherit distutils gnome2-utils - -MINIMUM_COMPIZ_RELEASE=0.6.0 - -DESCRIPTION="Compiz Fusion Tray Icon and Manager" -HOMEPAGE="http://compiz.org" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+gtk qt4" - -REQUIRED_USE="|| ( gtk qt4 )" - -RDEPEND=" - >=dev-python/compizconfig-python-${MINIMUM_COMPIZ_RELEASE} - >=x11-wm/compiz-${MINIMUM_COMPIZ_RELEASE} - x11-apps/xvinfo - gtk? ( >=dev-python/pygtk-2.10:2 ) - qt4? ( dev-python/PyQt4[X] )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}" - -PYTHON_MODNAME="FusionIcon" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_install() { - distutils_src_install - - use gtk || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_gtk" - use qt4 || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_qt4" -} - -pkg_postinst() { - distutils_pkg_postinst - - use gtk && gnome2_icon_cache_update -} - -pkg_postrm() { - distutils_pkg_postrm - - use gtk && gnome2_icon_cache_update -} diff --git a/x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild b/x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild deleted file mode 100644 index 2c1bf38c3768..000000000000 --- a/x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -PYTHON_DEPEND="2" - -inherit distutils eutils gnome2-utils - -MINIMUM_COMPIZ_RELEASE=0.6.0 - -DESCRIPTION="Compiz Fusion Tray Icon and Manager" -HOMEPAGE="http://compiz.org" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+gtk qt4" - -REQUIRED_USE="|| ( gtk qt4 )" - -RDEPEND=" - >=dev-python/compizconfig-python-${MINIMUM_COMPIZ_RELEASE} - >=x11-wm/compiz-${MINIMUM_COMPIZ_RELEASE} - x11-apps/xvinfo - gtk? ( >=dev-python/pygtk-2.10:2 ) - qt4? ( dev-python/PyQt4[X] )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}" - -PYTHON_MODNAME="FusionIcon" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-qt4-interface-subprocess-call.patch - distutils_src_prepare -} - -src_install() { - distutils_src_install - - use gtk || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_gtk" - use qt4 || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_qt4" -} - -pkg_postinst() { - distutils_pkg_postinst - - use gtk && gnome2_icon_cache_update -} - -pkg_postrm() { - distutils_pkg_postrm - - use gtk && gnome2_icon_cache_update -} diff --git a/x11-apps/fusion-icon/metadata.xml b/x11-apps/fusion-icon/metadata.xml index b19d78282b3f..36b9293a2f3e 100644 --- a/x11-apps/fusion-icon/metadata.xml +++ b/x11-apps/fusion-icon/metadata.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>desktop-effects</herd> -<longdescription lang="en">Compiz Fusion Tray Icon and Manager.</longdescription> + <herd>desktop-effects</herd> + <longdescription lang="en">Compiz Fusion Tray Icon and Manager.</longdescription> </pkgmetadata> diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index a1703a09d4a4..f26dfacaf8c9 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -3,5 +3,4 @@ DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e9193 DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163 SHA512 5fcbf0012af309f80e1db206e05d7861796146d765cd17f3963fde6da7f43f0e57d63dbbdbf2c554612a557aa4dee623ef62f7ca7d007834aafd7a46ca7bb1d6 WHIRLPOOL 22cdbad68462f9bac32b13be958df496411ca72fe47435ec7e3ebb470b121ba4b4a0e023913f31a92113c5a56bc4be660dfec5086bc1fb72a617d2cdeaa8adf1 DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b WHIRLPOOL 2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885 DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33 -DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f WHIRLPOOL a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776 -DIST xorg-server-1.17.2.tar.bz2 5767983 SHA256 f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993 SHA512 7e7b7620890cc8db696695758fa22fa879f9d3c33946663611ec0b37f02116e9c6f08779f9eece59907b430d3df93f0c0548939683ea156b3c4cbe02571b7551 WHIRLPOOL bfa04d9a6fba776138ec239183bd9f7badd73da520f1c4c62f7bf00bc264431959cd73ba145b5698429a6d5f3ae71d8dc07ab3f9442f365fae94ba2a98d69b96 +DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 WHIRLPOOL c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab diff --git a/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild index 8181fa562e97..c13b9119dece 100644 --- a/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild @@ -10,27 +10,28 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" DESCRIPTION="X.Org X servers" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" +SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.12-cve-2014-8091..8103.patches.tar.xz" -CDEPEND=">=app-eselect/eselect-opengl-1.3.0 - dev-libs/openssl +IUSE_SERVERS="dmx kdrive xnest xorg xvfb" +IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev" + +RDEPEND=">=app-eselect/eselect-opengl-1.3.0 + dev-libs/openssl:0 media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp - >=x11-libs/libdrm-2.4.46 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 + <x11-libs/libXfont-1.5.0 >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libxshmfence-1.1 - >=x11-libs/pixman-0.27.2 - >=x11-libs/xtrans-1.3.5 + >=x11-libs/pixman-0.21.8 + >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( @@ -46,67 +47,45 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) - glamor? ( - media-libs/libepoxy - >=media-libs/mesa-10.3.4-r1[egl,gbm] - !x11-libs/glamor - ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) - xephyr? ( - x11-libs/libxcb - x11-libs/xcb-util - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-10.3.4-r1[nptl=] + >=media-libs/mesa-10.3.7-r2[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) - unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - media-libs/libepoxy - ) - >=x11-apps/xinit-1.3.3-r1 - systemd? ( - sys-apps/dbus - sys-apps/systemd - )" + >=x11-apps/xinit-1.3 + selinux? ( sec-policy/selinux-xserver )" -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 - >=x11-proto/fontsproto-2.1.3 + >=x11-proto/fontsproto-2.0.2 + <x11-proto/fontsproto-2.1.3 >=x11-proto/glproto-1.4.17-r1 - >=x11-proto/inputproto-2.2.99.1 + >=x11-proto/inputproto-2.1.99.3 >=x11-proto/kbproto-1.0.3 - >=x11-proto/randrproto-1.4.0 + >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 - >=x11-proto/resourceproto-1.2.0 + >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/xextproto-7.2.99.901 + >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/xproto-7.0.26 - >=x11-proto/presentproto-1.0 - >=x11-proto/dri3proto-1.0 + >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( @@ -119,66 +98,60 @@ DEPEND="${CDEPEND} ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.8 + >=x11-proto/dri2proto-2.6 + >=x11-libs/libdrm-2.4.20 )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-xserver ) - !x11-drivers/xf86-video-modesetting -" - PDEPEND=" xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" REQUIRED_USE="!minimal? ( || ( ${IUSE_SERVERS} ) - ) - xephyr? ( kdrive )" + )" -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -#) +# Security patches taken from Debian from their 1.12 package +UPSTREAMED_PATCHES=( + "${WORKDIR}"/patches/${PN}-1.12-cve-2014-8091..8103.patch +) PATCHES=( "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch - # needed for new eselect-opengl, bug #541232 - "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch + "${FILESDIR}"/${PN}-1.12-disable-acpi.patch + "${FILESDIR}"/${PN}-1.12-cve-2013-1940.patch + "${FILESDIR}"/${PN}-1.12-cve-2013-4396.patch + "${FILESDIR}"/${PN}-1.17-cve-2015-0255-0.patch + "${FILESDIR}"/${PN}-1.17-cve-2015-0255-1.patch + "${FILESDIR}"/${PN}-1.12-cve-2015-3418.patch "${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch ) pkg_pretend() { # older gcc is not supported [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ - die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." + die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." } src_configure() { # localstatedir is used for the log location; we need to override the default # from ebuild.sh # sysconfdir is used for the xorg.conf location; same applies + # --enable-install-setuid needed because sparcs default off # NOTE: fop is used for doc generating ; and i have no idea if gentoo # package it somewhere XORG_CONFIGURE_OPTIONS=( $(use_enable ipv6) $(use_enable dmx) - $(use_enable glamor) $(use_enable kdrive) $(use_enable kdrive kdrive-kbd) $(use_enable kdrive kdrive-mouse) $(use_enable kdrive kdrive-evdev) - $(use_enable suid install-setuid) $(use_enable tslib) - $(use_enable unwind libunwind) - $(use_enable wayland xwayland) $(use_enable !minimal record) $(use_enable !minimal xfree86-utils) $(use_enable !minimal install-libxf86config) $(use_enable !minimal dri) $(use_enable !minimal dri2) $(use_enable !minimal glx) - $(use_enable xephyr) $(use_enable xnest) $(use_enable xorg) $(use_enable xvfb) @@ -186,19 +159,15 @@ src_configure() { $(use_enable udev config-udev) $(use_with doc doxygen) $(use_with doc xmlto) - $(use_with systemd systemd-daemon) - $(use_enable systemd systemd-logind) - --enable-libdrm - --sysconfdir="${EPREFIX}"/etc/X11 - --localstatedir="${EPREFIX}"/var - --with-fontrootdir="${EPREFIX}"/usr/share/fonts - --with-xkb-output="${EPREFIX}"/var/lib/xkb + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-fontrootdir=/usr/share/fonts + --with-xkb-output=/var/lib/xkb --disable-config-hal - --disable-linux-acpi --without-dtrace --without-fop --with-os-vendor=Gentoo - --with-sha1=libcrypto ) xorg-2_src_configure @@ -215,7 +184,7 @@ src_install() { fi newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-11 xdm + newinitd "${FILESDIR}"/xdm.initd-9 xdm newconfd "${FILESDIR}"/xdm.confd-4 xdm # install the @x11-module-rebuild set for Portage @@ -226,20 +195,33 @@ src_install() { pkg_postinst() { # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) eselect opengl set xorg-x11 --use-old + + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" + ewarn "because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can generate a list of all installed packages in the x11-drivers" + ewarn "category using this command:" + ewarn " emerge portage-utils; qlist -I -C x11-drivers/" + ewarn "or using sets from portage-2.2:" + ewarn " emerge @x11-module-rebuild" + fi } pkg_postrm() { # Get rid of module dir to ensure opengl-update works properly - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules fi } server_based_install() { if ! use xorg; then - rm "${ED}"/usr/share/man/man1/Xserver.1x \ - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${ED}"/usr/share/man/man1/Xserver.1x + rm "${D}"/usr/share/man/man1/Xserver.1x \ + "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${D}"/usr/share/man/man1/Xserver.1x fi } diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild index f05a7321201b..e2aaedc05d00 100644 --- a/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild @@ -4,19 +4,22 @@ EAPI=5 +XORG_EAUTORECONF=yes XORG_DOC=doc inherit xorg-2 multilib versionator flag-o-matic EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" DESCRIPTION="X.Org X servers" -SLOT="0/1.16.1" +SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.16-cve-2014-8091..8103.patches.tar.xz" + IUSE_SERVERS="dmx kdrive xnest xorg xvfb" -IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" +IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind" CDEPEND=">=app-eselect/eselect-opengl-1.3.0 - dev-libs/openssl + dev-libs/openssl:0 media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 @@ -27,10 +30,11 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 + <x11-libs/libXfont-1.5.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 - >=x11-libs/xtrans-1.3.3 + >=x11-libs/xtrans-1.3.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( @@ -46,11 +50,6 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) - glamor? ( - media-libs/libepoxy - >=media-libs/mesa-10.3.4-r1[egl,gbm] - !x11-libs/glamor - ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv @@ -58,20 +57,12 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0 !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-10.3.4-r1[nptl=] + >=media-libs/mesa-10.3.7-r2[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - media-libs/libepoxy - ) - >=x11-apps/xinit-1.3 - systemd? ( - sys-apps/dbus - sys-apps/systemd - )" + >=x11-apps/xinit-1.3" DEPEND="${CDEPEND} sys-devel/flex @@ -79,7 +70,8 @@ DEPEND="${CDEPEND} >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 - >=x11-proto/fontsproto-2.1.3 + >=x11-proto/fontsproto-2.0.2 + <x11-proto/fontsproto-2.1.3 >=x11-proto/glproto-1.4.17-r1 >=x11-proto/inputproto-2.2.99.1 >=x11-proto/kbproto-1.0.3 @@ -96,7 +88,7 @@ DEPEND="${CDEPEND} >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/xproto-7.0.26 + >=x11-proto/xproto-7.0.22 >=x11-proto/presentproto-1.0 >=x11-proto/dri3proto-1.0 dmx? ( @@ -125,22 +117,27 @@ REQUIRED_USE="!minimal? ( || ( ${IUSE_SERVERS} ) )" -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -#) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch -) - pkg_pretend() { # older gcc is not supported [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." } +src_prepare() { + UPSTREAMED_PATCHES=( + "${WORKDIR}"/patches/*.patch + ) + PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + "${FILESDIR}"/${PN}-1.17-cve-2015-0255-0.patch + "${FILESDIR}"/${PN}-1.17-cve-2015-0255-1.patch + "${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch + ) + xorg-2_src_prepare +} + src_configure() { # localstatedir is used for the log location; we need to override the default # from ebuild.sh @@ -150,7 +147,6 @@ src_configure() { XORG_CONFIGURE_OPTIONS=( $(use_enable ipv6) $(use_enable dmx) - $(use_enable glamor) $(use_enable kdrive) $(use_enable kdrive kdrive-kbd) $(use_enable kdrive kdrive-mouse) @@ -158,7 +154,6 @@ src_configure() { $(use_enable suid install-setuid) $(use_enable tslib) $(use_enable unwind libunwind) - $(use_enable wayland xwayland) $(use_enable !minimal record) $(use_enable !minimal xfree86-utils) $(use_enable !minimal install-libxf86config) @@ -172,8 +167,6 @@ src_configure() { $(use_enable udev config-udev) $(use_with doc doxygen) $(use_with doc xmlto) - $(use_with systemd systemd-daemon) - $(use_enable systemd systemd-logind) --enable-libdrm --sysconfdir="${EPREFIX}"/etc/X11 --localstatedir="${EPREFIX}"/var @@ -212,6 +205,17 @@ src_install() { pkg_postinst() { # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) eselect opengl set xorg-x11 --use-old + + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" + ewarn "because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can rebuild all installed packages in the x11-drivers" + ewarn "category using this command:" + ewarn " emerge @x11-module-rebuild" + fi } pkg_postrm() { diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild deleted file mode 100644 index 166c3ff5eda1..000000000000 --- a/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -XORG_DOC=doc -inherit xorg-2 multilib versionator flag-o-matic -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" - -DESCRIPTION="X.Org X servers" -SLOT="0/1.16.1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" - -IUSE_SERVERS="dmx kdrive xnest xorg xvfb" -IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" - -CDEPEND=">=app-eselect/eselect-opengl-1.3.0 - dev-libs/openssl - media-libs/freetype - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - x11-apps/xkbcomp - >=x11-libs/libdrm-2.4.20 - >=x11-libs/libpciaccess-0.12.901 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXfont-1.4.2 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libxshmfence-1.1 - >=x11-libs/pixman-0.27.2 - >=x11-libs/xtrans-1.3.3 - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-2.4.1-r3 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libXfixes-5.0 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - x11-libs/libXrender - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 - ) - glamor? ( - media-libs/libepoxy - >=media-libs/mesa-10.3.4-r1[egl,gbm] - !x11-libs/glamor - ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-10.3.4-r1[nptl=] - ) - tslib? ( >=x11-libs/tslib-1.0 ) - udev? ( >=virtual/udev-150 ) - unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - media-libs/libepoxy - ) - >=x11-apps/xinit-1.3 - systemd? ( - sys-apps/dbus - sys-apps/systemd - )" - -DEPEND="${CDEPEND} - sys-devel/flex - >=x11-proto/bigreqsproto-1.1.0 - >=x11-proto/compositeproto-0.4 - >=x11-proto/damageproto-1.1 - >=x11-proto/fixesproto-5.0 - >=x11-proto/fontsproto-2.1.3 - >=x11-proto/glproto-1.4.17-r1 - >=x11-proto/inputproto-2.2.99.1 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/randrproto-1.4.0 - >=x11-proto/recordproto-1.13.99.1 - >=x11-proto/renderproto-0.11 - >=x11-proto/resourceproto-1.2.0 - >=x11-proto/scrnsaverproto-1.1 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/xextproto-7.2.99.901 - >=x11-proto/xf86dgaproto-2.0.99.1 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.99.1 - >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/xproto-7.0.26 - >=x11-proto/presentproto-1.0 - >=x11-proto/dri3proto-1.0 - dmx? ( - >=x11-proto/dmxproto-2.2.99.1 - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - ) - !minimal? ( - >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.8 - )" - -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-xserver ) -" - -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - )" - -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -#) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch - # needed for new eselect-opengl, bug #541232 - "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch -) - -pkg_pretend() { - # older gcc is not supported - [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ - die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." -} - -src_configure() { - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # NOTE: fop is used for doc generating ; and i have no idea if gentoo - # package it somewhere - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable glamor) - $(use_enable kdrive) - $(use_enable kdrive kdrive-kbd) - $(use_enable kdrive kdrive-mouse) - $(use_enable kdrive kdrive-evdev) - $(use_enable suid install-setuid) - $(use_enable tslib) - $(use_enable unwind libunwind) - $(use_enable wayland xwayland) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal install-libxf86config) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal glx) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable nptl glx-tls) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - $(use_with systemd systemd-daemon) - $(use_enable systemd systemd-logind) - --enable-libdrm - --sysconfdir="${EPREFIX}"/etc/X11 - --localstatedir="${EPREFIX}"/var - --with-fontrootdir="${EPREFIX}"/usr/share/fonts - --with-xkb-output="${EPREFIX}"/var/lib/xkb - --disable-config-hal - --disable-linux-acpi - --without-dtrace - --without-fop - --with-os-vendor=Gentoo - --with-sha1=libcrypto - ) - - xorg-2_src_configure -} - -src_install() { - xorg-2_src_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example - fi - - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-11 xdm - newconfd "${FILESDIR}"/xdm.confd-4 xdm - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf -} - -pkg_postinst() { - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules - fi -} - -server_based_install() { - if ! use xorg; then - rm "${ED}"/usr/share/man/man1/Xserver.1x \ - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${ED}"/usr/share/man/man1/Xserver.1x - fi -} diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r3.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r3.ebuild deleted file mode 100644 index 58c70e0256e8..000000000000 --- a/x11-base/xorg-server/xorg-server-1.16.4-r3.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -XORG_DOC=doc -inherit xorg-2 multilib versionator flag-o-matic -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" - -DESCRIPTION="X.Org X servers" -SLOT="0/1.16.1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" - -IUSE_SERVERS="dmx kdrive xnest xorg xvfb" -IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" - -CDEPEND=">=app-eselect/eselect-opengl-1.0.8 - !>=app-eselect/eselect-opengl-1.3.0 - dev-libs/openssl - media-libs/freetype - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - x11-apps/xkbcomp - >=x11-libs/libdrm-2.4.20 - >=x11-libs/libpciaccess-0.12.901 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXfont-1.4.2 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libxshmfence-1.1 - >=x11-libs/pixman-0.27.2 - >=x11-libs/xtrans-1.3.3 - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-2.4.1-r3 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libXfixes-5.0 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - x11-libs/libXrender - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 - ) - glamor? ( - media-libs/libepoxy - media-libs/mesa[egl,gbm] - !x11-libs/glamor - ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-9.2.0[nptl=] - ) - tslib? ( >=x11-libs/tslib-1.0 ) - udev? ( >=virtual/udev-150 ) - unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - media-libs/libepoxy - ) - >=x11-apps/xinit-1.3 - systemd? ( - sys-apps/dbus - sys-apps/systemd - )" - -DEPEND="${CDEPEND} - sys-devel/flex - >=x11-proto/bigreqsproto-1.1.0 - >=x11-proto/compositeproto-0.4 - >=x11-proto/damageproto-1.1 - >=x11-proto/fixesproto-5.0 - >=x11-proto/fontsproto-2.1.3 - >=x11-proto/glproto-1.4.17 - >=x11-proto/inputproto-2.2.99.1 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/randrproto-1.4.0 - >=x11-proto/recordproto-1.13.99.1 - >=x11-proto/renderproto-0.11 - >=x11-proto/resourceproto-1.2.0 - >=x11-proto/scrnsaverproto-1.1 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/xextproto-7.2.99.901 - >=x11-proto/xf86dgaproto-2.0.99.1 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.99.1 - >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/xproto-7.0.26 - >=x11-proto/presentproto-1.0 - >=x11-proto/dri3proto-1.0 - dmx? ( - >=x11-proto/dmxproto-2.2.99.1 - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - ) - !minimal? ( - >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.8 - )" - -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-xserver ) -" - -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - )" - -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -#) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch - "${FILESDIR}"/${PN}-1.17-cve-2015-3164-1.patch - "${FILESDIR}"/${PN}-1.17-cve-2015-3164-2.patch - "${FILESDIR}"/${PN}-1.17-cve-2015-3164-3.patch -) - -pkg_pretend() { - # older gcc is not supported - [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ - die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." -} - -src_configure() { - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # NOTE: fop is used for doc generating ; and i have no idea if gentoo - # package it somewhere - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable glamor) - $(use_enable kdrive) - $(use_enable kdrive kdrive-kbd) - $(use_enable kdrive kdrive-mouse) - $(use_enable kdrive kdrive-evdev) - $(use_enable suid install-setuid) - $(use_enable tslib) - $(use_enable unwind libunwind) - $(use_enable wayland xwayland) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal install-libxf86config) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal glx) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable nptl glx-tls) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - $(use_with systemd systemd-daemon) - $(use_enable systemd systemd-logind) - --enable-libdrm - --sysconfdir="${EPREFIX}"/etc/X11 - --localstatedir="${EPREFIX}"/var - --with-fontrootdir="${EPREFIX}"/usr/share/fonts - --with-xkb-output="${EPREFIX}"/var/lib/xkb - --disable-config-hal - --disable-linux-acpi - --without-dtrace - --without-fop - --with-os-vendor=Gentoo - --with-sha1=libcrypto - ) - - # Xorg-server requires includes from OS mesa which are not visible for - # users of binary drivers. - mkdir -p "${T}/mesa-symlinks/GL" - for i in gl glx glxmd glxproto glxtokens; do - ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die - done - for i in glext glxext; do - ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die - done - append-cppflags "-I${T}/mesa-symlinks" - - xorg-2_src_configure -} - -src_install() { - xorg-2_src_install - - dynamic_libgl_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example - fi - - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-11 xdm - newconfd "${FILESDIR}"/xdm.confd-4 xdm - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf -} - -pkg_postinst() { - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules - fi -} - -dynamic_libgl_install() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving GL files for dynamic switching" - dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions - local x="" - for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions - fi - done - eend 0 -} - -server_based_install() { - if ! use xorg; then - rm "${ED}"/usr/share/man/man1/Xserver.1x \ - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${ED}"/usr/share/man/man1/Xserver.1x - fi -} diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r4.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild index 1ec0222efd22..9647f6a9a4a4 100644 --- a/x11-base/xorg-server/xorg-server-1.16.4-r4.ebuild +++ b/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild @@ -16,7 +16,7 @@ IUSE_SERVERS="dmx kdrive xnest xorg xvfb" IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" CDEPEND=">=app-eselect/eselect-opengl-1.3.0 - dev-libs/openssl + dev-libs/openssl:0 media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.17-cve-2015-3164-1.patch "${FILESDIR}"/${PN}-1.17-cve-2015-3164-2.patch "${FILESDIR}"/${PN}-1.17-cve-2015-3164-3.patch + "${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch ) pkg_pretend() { diff --git a/x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild deleted file mode 100644 index 8f4c90e67998..000000000000 --- a/x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild +++ /dev/null @@ -1,244 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -XORG_DOC=doc -inherit xorg-2 multilib versionator flag-o-matic -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" - -DESCRIPTION="X.Org X servers" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" - -IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" - -CDEPEND=">=app-eselect/eselect-opengl-1.3.0 - dev-libs/openssl - media-libs/freetype - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - x11-apps/xkbcomp - >=x11-libs/libdrm-2.4.46 - >=x11-libs/libpciaccess-0.12.901 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXfont-1.4.2 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libxshmfence-1.1 - >=x11-libs/pixman-0.27.2 - >=x11-libs/xtrans-1.3.5 - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-2.4.1-r3 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libXfixes-5.0 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - x11-libs/libXrender - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 - ) - glamor? ( - media-libs/libepoxy - >=media-libs/mesa-10.3.4-r1[egl,gbm] - !x11-libs/glamor - ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - ) - xephyr? ( - x11-libs/libxcb - x11-libs/xcb-util - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-10.3.4-r1[nptl=] - ) - tslib? ( >=x11-libs/tslib-1.0 ) - udev? ( >=virtual/udev-150 ) - unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - media-libs/libepoxy - ) - >=x11-apps/xinit-1.3.3-r1 - systemd? ( - sys-apps/dbus - sys-apps/systemd - )" - -DEPEND="${CDEPEND} - sys-devel/flex - >=x11-proto/bigreqsproto-1.1.0 - >=x11-proto/compositeproto-0.4 - >=x11-proto/damageproto-1.1 - >=x11-proto/fixesproto-5.0 - >=x11-proto/fontsproto-2.1.3 - >=x11-proto/glproto-1.4.17-r1 - >=x11-proto/inputproto-2.2.99.1 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/randrproto-1.4.0 - >=x11-proto/recordproto-1.13.99.1 - >=x11-proto/renderproto-0.11 - >=x11-proto/resourceproto-1.2.0 - >=x11-proto/scrnsaverproto-1.1 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/xextproto-7.2.99.901 - >=x11-proto/xf86dgaproto-2.0.99.1 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.99.1 - >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/xproto-7.0.26 - >=x11-proto/presentproto-1.0 - >=x11-proto/dri3proto-1.0 - dmx? ( - >=x11-proto/dmxproto-2.2.99.1 - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - ) - !minimal? ( - >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.8 - )" - -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-xserver ) - !x11-drivers/xf86-video-modesetting -" - -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - ) - xephyr? ( kdrive )" - -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -#) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch - # needed for new eselect-opengl, bug #541232 - "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch -) - -pkg_pretend() { - # older gcc is not supported - [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ - die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." -} - -src_configure() { - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # NOTE: fop is used for doc generating ; and i have no idea if gentoo - # package it somewhere - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable glamor) - $(use_enable kdrive) - $(use_enable kdrive kdrive-kbd) - $(use_enable kdrive kdrive-mouse) - $(use_enable kdrive kdrive-evdev) - $(use_enable suid install-setuid) - $(use_enable tslib) - $(use_enable unwind libunwind) - $(use_enable wayland xwayland) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal install-libxf86config) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal glx) - $(use_enable xephyr) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable nptl glx-tls) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - $(use_with systemd systemd-daemon) - $(use_enable systemd systemd-logind) - --enable-libdrm - --sysconfdir="${EPREFIX}"/etc/X11 - --localstatedir="${EPREFIX}"/var - --with-fontrootdir="${EPREFIX}"/usr/share/fonts - --with-xkb-output="${EPREFIX}"/var/lib/xkb - --disable-config-hal - --disable-linux-acpi - --without-dtrace - --without-fop - --with-os-vendor=Gentoo - --with-sha1=libcrypto - ) - - xorg-2_src_configure -} - -src_install() { - xorg-2_src_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example - fi - - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-11 xdm - newconfd "${FILESDIR}"/xdm.confd-4 xdm - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf -} - -pkg_postinst() { - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules - fi -} - -server_based_install() { - if ! use xorg; then - rm "${ED}"/usr/share/man/man1/Xserver.1x \ - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${ED}"/usr/share/man/man1/Xserver.1x - fi -} diff --git a/x11-base/xorg-server/xorg-server-1.17.1.ebuild b/x11-base/xorg-server/xorg-server-1.17.1.ebuild deleted file mode 100644 index 84398cd22b3b..000000000000 --- a/x11-base/xorg-server/xorg-server-1.17.1.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -XORG_DOC=doc -inherit xorg-2 multilib versionator flag-o-matic -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" - -DESCRIPTION="X.Org X servers" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" - -IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" - -CDEPEND=">=app-eselect/eselect-opengl-1.3.0 - dev-libs/openssl - media-libs/freetype - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - x11-apps/xkbcomp - >=x11-libs/libdrm-2.4.46 - >=x11-libs/libpciaccess-0.12.901 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXfont-1.4.2 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libxshmfence-1.1 - >=x11-libs/pixman-0.27.2 - >=x11-libs/xtrans-1.3.5 - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-2.4.1-r3 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libXfixes-5.0 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - x11-libs/libXrender - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 - ) - glamor? ( - media-libs/libepoxy - >=media-libs/mesa-10.3.4-r1[egl,gbm] - !x11-libs/glamor - ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - ) - xephyr? ( - x11-libs/libxcb - x11-libs/xcb-util - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-10.3.4-r1[nptl=] - ) - tslib? ( >=x11-libs/tslib-1.0 ) - udev? ( >=virtual/udev-150 ) - unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - media-libs/libepoxy - ) - >=x11-apps/xinit-1.3.3-r1 - systemd? ( - sys-apps/dbus - sys-apps/systemd - )" - -DEPEND="${CDEPEND} - sys-devel/flex - >=x11-proto/bigreqsproto-1.1.0 - >=x11-proto/compositeproto-0.4 - >=x11-proto/damageproto-1.1 - >=x11-proto/fixesproto-5.0 - >=x11-proto/fontsproto-2.1.3 - >=x11-proto/glproto-1.4.17-r1 - >=x11-proto/inputproto-2.2.99.1 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/randrproto-1.4.0 - >=x11-proto/recordproto-1.13.99.1 - >=x11-proto/renderproto-0.11 - >=x11-proto/resourceproto-1.2.0 - >=x11-proto/scrnsaverproto-1.1 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/xextproto-7.2.99.901 - >=x11-proto/xf86dgaproto-2.0.99.1 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.99.1 - >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/xproto-7.0.26 - >=x11-proto/presentproto-1.0 - >=x11-proto/dri3proto-1.0 - dmx? ( - >=x11-proto/dmxproto-2.2.99.1 - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - ) - !minimal? ( - >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.8 - )" - -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-xserver ) - !x11-drivers/xf86-video-modesetting -" - -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - ) - xephyr? ( kdrive )" - -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -#) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch -) - -pkg_pretend() { - # older gcc is not supported - [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ - die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." -} - -src_configure() { - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # NOTE: fop is used for doc generating ; and i have no idea if gentoo - # package it somewhere - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable glamor) - $(use_enable kdrive) - $(use_enable kdrive kdrive-kbd) - $(use_enable kdrive kdrive-mouse) - $(use_enable kdrive kdrive-evdev) - $(use_enable suid install-setuid) - $(use_enable tslib) - $(use_enable unwind libunwind) - $(use_enable wayland xwayland) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal install-libxf86config) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal glx) - $(use_enable xephyr) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable nptl glx-tls) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - $(use_with systemd systemd-daemon) - $(use_enable systemd systemd-logind) - --enable-libdrm - --sysconfdir="${EPREFIX}"/etc/X11 - --localstatedir="${EPREFIX}"/var - --with-fontrootdir="${EPREFIX}"/usr/share/fonts - --with-xkb-output="${EPREFIX}"/var/lib/xkb - --disable-config-hal - --disable-linux-acpi - --without-dtrace - --without-fop - --with-os-vendor=Gentoo - --with-sha1=libcrypto - ) - - xorg-2_src_configure -} - -src_install() { - xorg-2_src_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example - fi - - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-11 xdm - newconfd "${FILESDIR}"/xdm.confd-4 xdm - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf -} - -pkg_postinst() { - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules - fi -} - -server_based_install() { - if ! use xorg; then - rm "${ED}"/usr/share/man/man1/Xserver.1x \ - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${ED}"/usr/share/man/man1/Xserver.1x - fi -} diff --git a/x11-base/xorg-server/xorg-server-1.17.2.ebuild b/x11-base/xorg-server/xorg-server-1.17.2.ebuild deleted file mode 100644 index 8f4c90e67998..000000000000 --- a/x11-base/xorg-server/xorg-server-1.17.2.ebuild +++ /dev/null @@ -1,244 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -XORG_DOC=doc -inherit xorg-2 multilib versionator flag-o-matic -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" - -DESCRIPTION="X.Org X servers" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" - -IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" - -CDEPEND=">=app-eselect/eselect-opengl-1.3.0 - dev-libs/openssl - media-libs/freetype - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - x11-apps/xkbcomp - >=x11-libs/libdrm-2.4.46 - >=x11-libs/libpciaccess-0.12.901 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXfont-1.4.2 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libxshmfence-1.1 - >=x11-libs/pixman-0.27.2 - >=x11-libs/xtrans-1.3.5 - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-2.4.1-r3 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libXfixes-5.0 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - x11-libs/libXrender - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 - ) - glamor? ( - media-libs/libepoxy - >=media-libs/mesa-10.3.4-r1[egl,gbm] - !x11-libs/glamor - ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - ) - xephyr? ( - x11-libs/libxcb - x11-libs/xcb-util - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-10.3.4-r1[nptl=] - ) - tslib? ( >=x11-libs/tslib-1.0 ) - udev? ( >=virtual/udev-150 ) - unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - media-libs/libepoxy - ) - >=x11-apps/xinit-1.3.3-r1 - systemd? ( - sys-apps/dbus - sys-apps/systemd - )" - -DEPEND="${CDEPEND} - sys-devel/flex - >=x11-proto/bigreqsproto-1.1.0 - >=x11-proto/compositeproto-0.4 - >=x11-proto/damageproto-1.1 - >=x11-proto/fixesproto-5.0 - >=x11-proto/fontsproto-2.1.3 - >=x11-proto/glproto-1.4.17-r1 - >=x11-proto/inputproto-2.2.99.1 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/randrproto-1.4.0 - >=x11-proto/recordproto-1.13.99.1 - >=x11-proto/renderproto-0.11 - >=x11-proto/resourceproto-1.2.0 - >=x11-proto/scrnsaverproto-1.1 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/xextproto-7.2.99.901 - >=x11-proto/xf86dgaproto-2.0.99.1 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.99.1 - >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/xproto-7.0.26 - >=x11-proto/presentproto-1.0 - >=x11-proto/dri3proto-1.0 - dmx? ( - >=x11-proto/dmxproto-2.2.99.1 - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - ) - !minimal? ( - >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.8 - )" - -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-xserver ) - !x11-drivers/xf86-video-modesetting -" - -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - ) - xephyr? ( kdrive )" - -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -#) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch - # needed for new eselect-opengl, bug #541232 - "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch -) - -pkg_pretend() { - # older gcc is not supported - [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ - die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." -} - -src_configure() { - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # NOTE: fop is used for doc generating ; and i have no idea if gentoo - # package it somewhere - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable glamor) - $(use_enable kdrive) - $(use_enable kdrive kdrive-kbd) - $(use_enable kdrive kdrive-mouse) - $(use_enable kdrive kdrive-evdev) - $(use_enable suid install-setuid) - $(use_enable tslib) - $(use_enable unwind libunwind) - $(use_enable wayland xwayland) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal install-libxf86config) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal glx) - $(use_enable xephyr) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable nptl glx-tls) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - $(use_with systemd systemd-daemon) - $(use_enable systemd systemd-logind) - --enable-libdrm - --sysconfdir="${EPREFIX}"/etc/X11 - --localstatedir="${EPREFIX}"/var - --with-fontrootdir="${EPREFIX}"/usr/share/fonts - --with-xkb-output="${EPREFIX}"/var/lib/xkb - --disable-config-hal - --disable-linux-acpi - --without-dtrace - --without-fop - --with-os-vendor=Gentoo - --with-sha1=libcrypto - ) - - xorg-2_src_configure -} - -src_install() { - xorg-2_src_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example - fi - - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-11 xdm - newconfd "${FILESDIR}"/xdm.confd-4 xdm - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf -} - -pkg_postinst() { - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules - fi -} - -server_based_install() { - if ! use xorg; then - rm "${ED}"/usr/share/man/man1/Xserver.1x \ - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${ED}"/usr/share/man/man1/Xserver.1x - fi -} diff --git a/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild b/x11-base/xorg-server/xorg-server-1.17.4.ebuild index 3001951b1ef3..fc8f46a10ae3 100644 --- a/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild +++ b/x11-base/xorg-server/xorg-server-1.17.4.ebuild @@ -146,7 +146,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch # needed for new eselect-opengl, bug #541232 "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch - "${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch ) pkg_pretend() { diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest index 9e2e975a966b..f647d57d27bc 100644 --- a/x11-drivers/xf86-input-evdev/Manifest +++ b/x11-drivers/xf86-input-evdev/Manifest @@ -1,3 +1,4 @@ +DIST xf86-input-evdev-2.10.0.tar.bz2 388811 SHA256 d097298eb07b7a9edf4493b5c3c058041458ca52c8c62dbd4f40b84c5086d117 SHA512 b17e2f315b5291ccb234e2b9eeec9c32828091ca935fdc7463a75eccc7fcc9d465c88970c12d2128db6e0b49df23714c794fbaa5767e7b91ef58efb40aadaa30 WHIRLPOOL c86325e64a382b955e47c458891e880f275b928b12e42e3e9740e72c3f5a853f34c3cbe1e0f6e72ab6057277f2ccaab618eaa44cd7229573548a8245858af8db DIST xf86-input-evdev-2.7.3.tar.bz2 364819 SHA256 eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504 SHA512 edd5691bc6878bb491d7ffb04b35ab60cd70853ae702883c672c53c9f6cb8e81817f94cc03feaaca4e4a02a2a436f1417bd1e1e5f52a151a416fd04306159879 WHIRLPOOL 750605a0efabcb078e65d08b7ea610fdfc4cab49b73a2676247f95f50fcf7d17e80ab2186ef103830865a564dc695f035739f1b88e28f68c981fc703e26610a6 DIST xf86-input-evdev-2.8.1.tar.bz2 369337 SHA256 09f887e1ce6cdb92154035db9044e0795a5c80f1ffb9efc599aed9a9dc1ff539 SHA512 8a9fce3b1d7a577a914d662b5a36dc43d56f16ae9318bbaf09fbd28ee572a69f40b7960d6d51ede9074284eed5a01732a4a246b43f8a1140cb8f1c0073ea189c WHIRLPOOL f0b337aebb5168efe382d69f47c2b332097470c82bcd3dfcb61e4d599a73da2cec36c4a51c77584ffa548e5a2ce1c512a2ebc304e64e37ce8e74fa551d1efd99 DIST xf86-input-evdev-2.8.2.tar.bz2 369981 SHA256 750461749a83bdee7771592aa5c0db5e267b18d847078a4b8622f55b04797eb3 SHA512 20ff24785333f3742b191a6cbfad79ab9ac67ea97fa78cc8037fbc6946c437ee61a717aa3b7e21d5942a282917667d93d65ef424c4db4cec38e38dc41197386b WHIRLPOOL 432e22c5f12f33175f70c379a7d0e872b81e413046c9138f9e5daaf59e4e86b4a075dc38a696ad2f84292c13107c91e2a3315582acbfb57f93528dfb102a8a13 diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.ebuild new file mode 100644 index 000000000000..141404143932 --- /dev/null +++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit linux-info xorg-2 + +DESCRIPTION="Generic Linux input driver" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="" + +RDEPEND=">=x11-base/xorg-server-1.12[udev] + dev-libs/libevdev + sys-libs/mtdev" +DEPEND="${RDEPEND} + >=x11-proto/inputproto-2.1.99.3 + >=sys-kernel/linux-headers-2.6" + +pkg_pretend() { + if use kernel_linux ; then + CONFIG_CHECK="~INPUT_EVDEV" + fi + check_extra_config +} diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest index 783ddc04278e..d7c7ea639596 100644 --- a/x11-drivers/xf86-input-libinput/Manifest +++ b/x11-drivers/xf86-input-libinput/Manifest @@ -1,6 +1,4 @@ -DIST xf86-input-libinput-0.11.0.tar.bz2 294627 SHA256 56babf46c13d15fbd15c9d43815e9220e63acd9ed28095e7d68ad03f9148bbda SHA512 3d8463a9f5275a54b1d5299aca0a12271715582fed882e39ff10934308aadce864357cd9e3c75a4713aee8b12b81f139f33f25e8f92846c98cc299b3c4d6389b WHIRLPOOL 239cf0e7fed5cf82a417a73623b16d0c505695095c2e0957012df030201c1745cd4a1062b691952b39338e167b0eea7e581ad59032382620d896b04617f51bca -DIST xf86-input-libinput-0.12.0.tar.bz2 295050 SHA256 db8f919c24a381cec1e7840f1f2117251501c0c7ae2a43941d84753154a826d6 SHA512 983a40b5b153deb8fff8c4ca6bfd6ede40304365a66f32c2b36942e207ed5fd930ae715aaba7333cd6c3cdddcccf5a8b841f223ce61264f6edafc841145d135f WHIRLPOOL 2af6a411ebdb1404c6216db701e32a1692ee4b69e9298d997d9152f2ea800fa07e6b843bbd8405884bc1e84034ee79344b72737a5f93c9ae3ee3d1b3ba399987 DIST xf86-input-libinput-0.13.0.tar.bz2 295850 SHA256 b9535c58904f47e8f85fee045b4a2b549c91216ddc9b0ee733d47d1b049fe3da SHA512 27dcb80d1b806a3f03afc8112325dfdd9864e8d744de2b91f084288beeca29e3926392dcd6d751c7ab8332d6547c5a912f7e64e885501dc40c956565cc758941 WHIRLPOOL 7c46d0596f10d40da5b7d206c0bab0f7c7b9e4503aff0120f111aa831ffcc5842a66a18df4a963e809ed807a21b8f76ec9e9ca73c942c2b861f7162b6609c7fa DIST xf86-input-libinput-0.14.0.tar.bz2 312256 SHA256 e8d05798a556e5ea0d9f1823bb632e425487e8bcf89711ed93b079bbee742265 SHA512 229b45cb9e76ca96dce4247b421135ff74054f2cbcfd019d2ceb409fdb4bc8166e3fa1d068ba6e8f6d6ac0c44ade275e31cc6a1ee6d7f6de8918eced5c59d508 WHIRLPOOL 45400e7966d730fe809043ced977dc0faa456336157dba9049558f0489463c8ade5f9a130b77ea2e85ae82e27c320e1f70780acca53fae253f930a53c0ac823b +DIST xf86-input-libinput-0.15.0.tar.bz2 314205 SHA256 28707c504194648b11a1e26acf13039b60bf344efa6aa9788afed6d47f019a41 SHA512 f9c9f5f09537cd4830bd17720135102a9b02454e0acc4a80230ddd066c39a106c91260f7774da364760fd4f3b59b8ba9ab6abc83ad49ae6e9dad1609b9b25cf4 WHIRLPOOL 3dad70a7ce44dd8812d4dd1ebdcf7325c521b5dce4763c87bdd89962df577a4d9b9cf457ca7d72cc987554034636429d2f047b8a7cf257bd79b2c233e56f3925 DIST xf86-input-libinput-0.6.0.tar.bz2 287826 SHA256 2f29be1ed7f9b9c597b6f5c6ef24c37a244a0ba87ccd1c2586ffa4d08452ad79 SHA512 536324b4bf52b6a1905655d6d82af5d12d40503e48018e10b1922bcfd18bddad742a716bcc7588188993f46f9724874456e90a70e5a764432f968a66a9d2b639 WHIRLPOOL 5d8994c86b5682d7e5ae0e53b7c8d1b13fdba304603b9ecf3c97297ab732e59111f4c902403a6d0a19492f3e34a7b9a718fbbe105591da19260a3c1f3e2c2a4b -DIST xf86-input-libinput-0.8.0.tar.bz2 290565 SHA256 2152b0984feffe8151934ad9af29bde7fc621e0a54b0cdedbaf1abc367dea43a SHA512 44d2c77b2cc9b29151f90458dbd6fb61b6cdfb23c878ea553e7b96f1085cd547080ab3afe804d0b6cb4d806ae2c9a4c4594b0164a54f3f44741016ec918b9d0e WHIRLPOOL 2c43000edbf688ce6e7bf87f64d1a290e8e7183906e4c586223aa0ef5b9a443b161e0aeca428ec713b0f0aea8b59830040d98ab556566fdaea44b77ae0a16482 diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.11.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.11.0.ebuild deleted file mode 100644 index bba8c3c63703..000000000000 --- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.11.0.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit xorg-2 - -DESCRIPTION="X.org input driver based on libinput" - -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND=">=dev-libs/libinput-0.14.0:0=" -DEPEND="${RDEPEND}" - -DOCS=( "README.md" "conf/99-libinput.conf" ) diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.12.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.15.0.ebuild index b66b7aadbcea..a59a6b472a25 100644 --- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.12.0.ebuild +++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.15.0.ebuild @@ -8,10 +8,10 @@ inherit xorg-2 DESCRIPTION="X.org input driver based on libinput" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" IUSE="" -RDEPEND=">=dev-libs/libinput-0.19.0:0=" +RDEPEND=">=dev-libs/libinput-1.1.0:0=" DEPEND="${RDEPEND}" -DOCS=( "README.md" "conf/99-libinput.conf" ) +DOCS=( "README.md" "conf/90-libinput.conf" ) diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.8.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.8.0.ebuild deleted file mode 100644 index cc1cfe784a03..000000000000 --- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.8.0.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit xorg-2 - -DESCRIPTION="X.org input driver based on libinput" - -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND=">=dev-libs/libinput-0.11.0:0=" -DEPEND="${RDEPEND}" - -DOCS=( "README.md" "conf/99-libinput.conf" ) diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest index 3bbf2d2e9986..49b01facb24e 100644 --- a/x11-drivers/xf86-input-synaptics/Manifest +++ b/x11-drivers/xf86-input-synaptics/Manifest @@ -2,3 +2,4 @@ DIST xf86-input-synaptics-1.7.4.tar.bz2 451614 SHA256 56a2d2df7bd39e29f56102c62f DIST xf86-input-synaptics-1.7.8.tar.bz2 495292 SHA256 14e7d54f81c2a2503f8acbe5e265dc336a0f2b30d007657d7afbeff979821c11 SHA512 b0f9ec0bd7ff2b7da40e597c331e3c0bffbb8abf2374ddaee5bbac3d1c848cb8a674e9b440c0e41b73916d3e89141d06d0d2ac9cb6ee0a050cba62379c004f50 WHIRLPOOL e02b0c56470b7e464d6516c98009d0953a80b9efe9a35ef2cb1c9a9018fa80952ba30cc9f882268aa64a280103b8953f4b6ee46ea3dd6b1c64467eea67d42fb5 DIST xf86-input-synaptics-1.8.1.tar.bz2 479212 SHA256 d74fdaf29e9888a2cb494e16d0a9ddb24265c5c765b05392b69c50e84ffbf09a SHA512 15e3250accc5959705aa0cd4e36ed46767860e07ba34561a227b58476df0649739057087d65e9f77d094f766cc06dd9ebd4174abb5efdcc3a04e58031567c178 WHIRLPOOL 3172534dfd193fcc757844cec25ef23a051cd1cf8f4e9dfc31c774cdad170bf32399dd38a00714fcd22b4a776ad1eb0abbf01064f2770a9077e9f560435f12bf DIST xf86-input-synaptics-1.8.2.tar.bz2 484261 SHA256 7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80 SHA512 b8880e229437586e9be34aa26f1cfdac20de009caf85a95db39b0232221baf4dee670b2740b1946356fcbfb0bcc2515092daffaab826b3460698c28b48e20a12 WHIRLPOOL 9cbc809e5386c4d65394b5bcc8b3f569a0b754e04f9738a6ada3e7753ef9f8cfee81fddc62de15a99e36410116be935207e5947cd7bf969d2215b8e979d02e77 +DIST xf86-input-synaptics-1.8.3.tar.bz2 484026 SHA256 d39f100c74f3673778b53f17bab7690161925e25dd998a15dd8cc69b52e83f01 SHA512 84924592acf5b107e9e0121cdcdaa92318ebb605a74f6d80eff67f4faf70be58d1655afaf61a93fd54554ef70ab78ad3726e1bda2bc6fddddd6754caca4f75c0 WHIRLPOOL a2f40a0b26cae16b8e6a5c7ca982a170a623a65bedc8d20a281f30f4143d67ba07b87fd462e9ff0138aedc7f640e255f4b2f6e5e53ddd7becc5727eef85501c7 diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.3.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.3.ebuild new file mode 100644 index 000000000000..215fd1050aa1 --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit linux-info xorg-2 + +DESCRIPTION="Driver for Synaptics touchpads" +HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/" + +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +IUSE="kernel_linux" + +RDEPEND="kernel_linux? ( >=dev-libs/libevdev-0.4 ) + >=x11-base/xorg-server-1.14 + >=x11-libs/libXi-1.2 + >=x11-libs/libXtst-1.1.0" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-2.6.37 + >=x11-proto/inputproto-2.1.99.3 + >=x11-proto/recordproto-1.14" + +DOCS=( "README" ) + +pkg_pretend() { + linux-info_pkg_setup + # Just a friendly warning + if ! linux_config_exists \ + || ! linux_chkconfig_present INPUT_EVDEV; then + echo + ewarn "This driver requires event interface support in your kernel" + ewarn " Device Drivers --->" + ewarn " Input device support --->" + ewarn " <*> Event interface" + echo + fi +} diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest index 70fc4121ee35..8e420d7e701e 100644 --- a/x11-drivers/xf86-input-wacom/Manifest +++ b/x11-drivers/xf86-input-wacom/Manifest @@ -1,3 +1,4 @@ DIST xf86-input-wacom-0.24.0.tar.bz2 581176 SHA256 96478b26c125938245d386f50b5286e362b85efdd71bf7faf27ed3d5292032b8 SHA512 e7c3af4a358d9a8e39992b6151201bb19c7df69b9b3a162015c73b8789e2e803317e02dd8492b00e769815b6936ff06f300676d64726b4dd5b5896122cd05fd6 WHIRLPOOL 5b9ec0321e2a35f23eb9242d71401b0f312983805297d9ac7586050f8f00c8890eabd823a08ff629cf2829b639098030f0e2247648697322342656479d0e85b9 DIST xf86-input-wacom-0.29.0.tar.bz2 589495 SHA256 88507e76f1eb98a20c4381806e03c694adcff88ac0028f93892019a7a6fc8b96 SHA512 26035a0b49f15f1782ab0ffe4c24383db84f203f0e8c2e82a9e1f4fa015bc3272b6e7250ee2c25eaa1bba4c4eeb71775f2adc331d0df957bbb952dbe1c6766a4 WHIRLPOOL 68a89ea73370bcd7b9b79a7c17c6c10edf603c80300d3ea0b6092731bb9fff767fe4cc454a1f60585fa273165ce7706e72a6a07cf9d287867a504c385dcff8f1 DIST xf86-input-wacom-0.30.0.tar.bz2 591648 SHA256 8ad4e479a4fc6d3c18e680958a8f42c3c87f15fdf8d2561810ca01a0a78841f5 SHA512 115e87715e736d77ad4e45e29287c855289cea5871983b7ad2e7e1e64954078de184d1b78157e958a0c9e7b949061b4c5599e2b11e87d5019a843bcaa34e0381 WHIRLPOOL 92f93b8694760c5dfbfb0182909e5b2ec3a8c197143962249c032f51483f3b194db12ad522cdfe8401b7368f99395dbf0b941b73a9691cea19cc156a180e6fb6 +DIST xf86-input-wacom-0.31.0.tar.bz2 592564 SHA256 e7e9723f048071adabc878bf6139342ea39dea5e3a8134452df5a33bef2e3f76 SHA512 6c24394038585d90b9b30c594b773b36b5ea26ea5eaab73519cd2e1b56eb2ad3e1f3991ca3962a70468da32e83105c9619f524afbf4e6c500661c7c62b4261e8 WHIRLPOOL d84326730a73a50c420876c2e81adc836dcf657d746e09b614902c879390230c43d657f748fd015f874ebe11f277c9b586ddaf762e1aac551ff05a74321c48ff diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.31.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.31.0.ebuild new file mode 100644 index 000000000000..8ec78b81c76c --- /dev/null +++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.31.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit linux-info xorg-2 + +DESCRIPTION="Driver for Wacom tablets and drawing devices" +HOMEPAGE="http://linuxwacom.sourceforge.net/" +LICENSE="GPL-2" +EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}" +[[ ${PV} != 9999* ]] && \ + SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug" + +# depend on libwacom for its udev rules, bug #389633 +RDEPEND="dev-libs/libwacom + virtual/udev + >=x11-base/xorg-server-1.7 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXinerama" +DEPEND="${RDEPEND} + x11-proto/randrproto" + +pkg_setup() { + linux-info_pkg_setup + + XORG_CONFIGURE_OPTIONS=( + $(use_enable debug) + ) +} + +src_install() { + xorg-2_src_install + + rm -rf "${ED}"/usr/share/hal +} + +pkg_pretend() { + linux-info_pkg_setup + + if ! linux_config_exists \ + || ! linux_chkconfig_present TABLET_USB_WACOM \ + || ! linux_chkconfig_present INPUT_EVDEV; then + echo + ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel" + ewarn " Device Drivers --->" + ewarn " Input device support --->" + ewarn " <*> Event interface" + ewarn " [*] Tablets --->" + ewarn " <*> Wacom Intuos/Graphire tablet support (USB)" + echo + fi +} diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest index a4a4ba68d92d..73eb15e8dbff 100644 --- a/x11-libs/cairo/Manifest +++ b/x11-libs/cairo/Manifest @@ -1 +1,2 @@ DIST cairo-1.14.2.tar.xz 35376404 SHA256 c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb SHA512 74d30f3f879f097b2c3408ef9698da8f337301f971c3eba7f336d02d6b2812d2ca0bd8bbc0cc7ee11127d3574910b1b77fde3b065cfd504436b62e17c2acb200 WHIRLPOOL fd57e1f474280a1df7a641bdcbe4dc5e5a71bd53b9e46e54302c7858e3bc0081fd1145f19133152819d259611096e4cca034c9caa73a748a507de9094f81a519 +DIST cairo-1.14.4.tar.xz 36040204 SHA256 f6ec9c7c844db9ec011f0d66b57ef590c45adf55393d1fc249003512522ee716 SHA512 b0d983c89ed31a53e26af89e174bb6df3e7c83cf482cbf975c839022ea84b74bb775599d24ca50f4482bbb6d6ef5d09ebb8273d08dfc928328f880344d4e66b2 WHIRLPOOL 88d8e1b622fb6b5c4530d558cf3a4c10ea83820e3e243b9d8c9e3436e3276e9824f028ae96aafd2f4ba349ec4e4a5c84767e7ecd5a5a1de87ef3953e5c61be6e diff --git a/x11-libs/cairo/cairo-1.14.4.ebuild b/x11-libs/cairo/cairo-1.14.4.ebuild new file mode 100644 index 000000000000..12d34b3af803 --- /dev/null +++ b/x11-libs/cairo/cairo-1.14.4.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils flag-o-matic autotools multilib-minimal + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo" + SRC_URI="" +else + SRC_URI="http://cairographics.org/releases/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="A vector graphics library with cross-device output support" +HOMEPAGE="http://cairographics.org/" +LICENSE="|| ( LGPL-2.1 MPL-1.1 )" +SLOT="0" +IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb xlib-xcb" +# gtk-doc regeneration doesn't seem to work with out-of-source builds +#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate + +# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it +RESTRICT="test" + +RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] + >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] + sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}] + directfb? ( dev-libs/DirectFB ) + gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) + glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) + opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) ) + X? ( + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + ) + xcb? ( + >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] + ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + )" +DEPEND="${RDEPEND} + virtual/pkgconfig + >=sys-devel/libtool-2 + X? ( + >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}] + )" +#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND} +# doc? ( +# >=dev-util/gtk-doc-1.6 +# ~app-text/docbook-xml-dtd-4.2 +# )" + +REQUIRED_USE=" + gles2? ( !opengl ) + xlib-xcb? ( xcb ) +" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/cairo/cairo-directfb.h +) + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch + epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch + + # tests and perf tools require X, bug #483574 + if ! use X; then + sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die + fi + + epatch_user + + # Slightly messed build system YAY + if [[ ${PV} == *9999* ]]; then + touch boilerplate/Makefile.am.features + touch src/Makefile.am.features + touch ChangeLog + fi + + eautoreconf +} + +multilib_src_configure() { + local myopts + + [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT + + use elibc_FreeBSD && myopts+=" --disable-symbol-lookup" + + # TODO: remove this (and add USE-dep) when DirectFB is converted, + # bug #484248 -- but beware of the circular dep. + if ! multilib_is_native_abi; then + myopts+=" --disable-directfb" + fi + + # TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010 + if ! multilib_is_native_abi; then + myopts+=" --disable-qt" + fi + + # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)" + + ECONF_SOURCE="${S}" \ + econf \ + --disable-dependency-tracking \ + $(use_with X x) \ + $(use_enable X tee) \ + $(use_enable X xlib) \ + $(use_enable X xlib-xrender) \ + $(use_enable aqua quartz) \ + $(use_enable aqua quartz-image) \ + $(use_enable debug test-surfaces) \ + $(use_enable directfb) \ + $(use_enable gles2 glesv2) \ + $(use_enable glib gobject) \ + $(use_enable opengl gl) \ + $(use_enable static-libs static) \ + $(use_enable svg) \ + $(use_enable valgrind) \ + $(use_enable xcb) \ + $(use_enable xcb xcb-shm) \ + $(use_enable xlib-xcb) \ + --enable-ft \ + --enable-pdf \ + --enable-png \ + --enable-ps \ + --disable-drm \ + --disable-gallium \ + --disable-qt \ + --disable-vg \ + ${myopts} +} + +multilib_src_install_all() { + prune_libtool_files --all + einstalldocs +} + +pkg_postinst() { + if use !xlib-xcb; then + if has_version net-misc/nxserver-freenx \ + || has_version net-misc/x2goserver; then + ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers." + ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+" + ewarn "applications that are running inside NX sessions. For details, see" + ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173" + fi + fi +} diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild index 76810ec987d1..513c1b915934 100644 --- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild +++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz" SLOT="1" LICENSE="FLTK LGPL-2" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" RDEPEND=" diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest index 3e13c6589ffb..e43ec47cf66d 100644 --- a/x11-libs/libdockapp/Manifest +++ b/x11-libs/libdockapp/Manifest @@ -2,3 +2,4 @@ DIST libdockapp-0.6.1.tar.bz2 155920 SHA256 eacae024ce6f2bdaba50f18bd18a27a9b4a3 DIST libdockapp-0.6.4.tar.gz 32200 SHA256 188e95f093a79746450294a6d9a7be74bfa658215a7f617eb1b63a2bb013fae7 SHA512 8246434de903f113888dd7ef21c27d4bd3991d901b453963c696e5474082f5295de80b00f09d690de8a4a7fbbfa174d1727e138714015ddfbd39b8348e064c6f WHIRLPOOL 2e13efca76d879e9f5d86043e5d9570dad7e212dae6020356644bfa57d26cdb7d421f7a6b671843d396ea26ea18025286c4c6aaf00f59869f93d7211a94cdd7e DIST libdockapp-0.7.0.tar.gz 39051 SHA256 03392b1b393089c696fdf448b489167191df2b7edf61f86d4354a327db8de15a SHA512 853564de3181a34b38c05d93df0faa4a142f66d82513af17689a6485f56b1f68436a9c85eb23332d9d0acb0069a08e30eedb60bd70896963810669a0d3980247 WHIRLPOOL 40ba54fcf62fc80c307f1dc2b912a91b6ac1b0b02ffe10fc6dae5f918e020edd0eb1c902174d4a4bf23721cd055dfb1b825ac49267f93396a9d6d33eba72953c DIST libdockapp-0.7.1.tar.gz 40070 SHA256 d74e54fab837b4c353431d07cd06689be2eeb75d46eb39498b6c80933a3aa942 SHA512 e020b4404f9fd1835aa06295de59695b2fa9a49a456962d188e8cba9ecdc3ab5c2af26dfce69991af007458b3ba7e9332d0aafd9cd1e1cb789ea522ffd3e4e6e WHIRLPOOL 683659ea97e37a93c93e5f72b1ccf696f40f2499d3b975fd4b717079b8bd1d8b5eb4c1677c9fe2033eb51e3cf86f5cd57a61551c2462b9c34b36edd6391ea1f3 +DIST libdockapp-0.7.2.tar.gz 40462 SHA256 82a4f9f9235f425322fea46a723f16efe255c84e1717191bcea14565dadc2ff9 SHA512 a2f216ac1105abe0efbea191691bae986b6022510f96c78b08c1b809cff131794c81810197af7d1321f9b248202376cc7092e79a4d4afa3fb93e9ed8000c9d79 WHIRLPOOL 4664ff5d7d8702a9cc51cdb6b55d397e685c53bc1529ebaafd2886a914b51fa55627dcee886fee991a29d177d9c9e8362c943d147c8e01955793b0d5c303789d diff --git a/x11-libs/libdockapp/libdockapp-0.7.2.ebuild b/x11-libs/libdockapp/libdockapp-0.7.2.ebuild new file mode 100644 index 000000000000..dac52b3c74d8 --- /dev/null +++ b/x11-libs/libdockapp/libdockapp-0.7.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools font + +DESCRIPTION="Window Maker Dock Applet Library" +HOMEPAGE="http://windowmaker.org/dockapps/?name=wmclock" +# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz +SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz" + +LICENSE="MIT public-domain" +SLOT="0/3" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +# Required for font eclass +IUSE="+X" +REQUIRED_USE="X" + +RDEPEND="x11-libs/libX11 + x11-libs/libXt + x11-libs/libXext + x11-libs/libXpm" +DEPEND="${RDEPEND} + x11-proto/xproto" + +FONT_S=${S}/fonts +FONT_SUFFIX="gz" +DOCS="README ChangeLog NEWS AUTHORS" + +src_prepare() +{ + eautoreconf +} + +src_configure() +{ + # Font installation handled by font eclass + econf --without-font --without-examples +} + +src_install() +{ + emake DESTDIR="${D}" install + font_src_install +} diff --git a/x11-libs/libxdl_view/Manifest b/x11-libs/libxdl_view/Manifest deleted file mode 100644 index 8f5dc9db9b31..000000000000 --- a/x11-libs/libxdl_view/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libxdl_view-4.2.tar.gz 857566 SHA256 826adc9c6d6706ffc6f9b52e6f7871e3ebf397837010a75daa971812f162d0b3 SHA512 1ea461cc27e53e94b89cdeef9fc435342d66f618f52a6bb936ff2c7ee63fbc89ecbbecfb4da0209ec8969f09b422af3690408dc61470299ce23e3cf84b202266 WHIRLPOOL 212c7e9f09c804bf58445a116ad75d343f6cd8e393e88ed2b2fcd4f311bd59f8a803c7fbf2d3c3a799cc7e88a9ba55f6e148c07a4956b8c6f22a0398f4b8e91f diff --git a/x11-libs/libxdl_view/files/4.2-as-needed.patch b/x11-libs/libxdl_view/files/4.2-as-needed.patch deleted file mode 100644 index a59d1997c2e5..000000000000 --- a/x11-libs/libxdl_view/files/4.2-as-needed.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 347bb21..cbb04db 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -19,7 +19,11 @@ lib_LTLIBRARIES = libxdl_view.la libxdl_viewextra.la - ## The initial value of this was a mistake! - ## See the libtool doc. - libxdl_view_la_LDFLAGS = -version-info 2:0:0 -+libxdl_view_la_LIBADD = -lX11 -lXt -lm -+ - libxdl_viewextra_la_LDFLAGS = -version-info 0:0:0 -+libxdl_viewextra_la_DEPENDENCIES = libxdl_view.la -+libxdl_viewextra_la_LIBADD = -lm -lxdl_view -ljwc_c - - EXTRA_DIST = doc/xdl_view_icon.gif doc/xdl_view_top.gif \ - doc/xdl_view_top.html doc/xdl_view_updates.html \ diff --git a/x11-libs/libxdl_view/files/4.2-impl-dec.patch b/x11-libs/libxdl_view/files/4.2-impl-dec.patch deleted file mode 100644 index 418143777338..000000000000 --- a/x11-libs/libxdl_view/files/4.2-impl-dec.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 347bb21..aa41ba3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,6 +3,8 @@ - - ## Process this file with automake. - -+CFLAGS += -std=c99 -L.libs -+ - libxdl_view_la_SOURCES = xdl_base_fr.c xdl_blank_obj.c xdl_image.c \ - xdl_bg.c xdl_img_rd.c xdl_film_img.c xdl_io_window.c \ - xdl_menu_area.c xdl_text_tab.c xdl_panel_itm.c \ diff --git a/x11-libs/libxdl_view/libxdl_view-4.2-r2.ebuild b/x11-libs/libxdl_view/libxdl_view-4.2-r2.ebuild deleted file mode 100644 index 6a9900710a5c..000000000000 --- a/x11-libs/libxdl_view/libxdl_view-4.2-r2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -AUTOTOOLS_AUTORECONF=yes - -inherit autotools-utils - -DESCRIPTION="An X-Windows Based Toolkit" -HOMEPAGE="http://www.ccp4.ac.uk/dist/x-windows/xdl_view/doc/xdl_view_top.html" -SRC_URI="ftp://ftp.ccp4.ac.uk/jwc/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="static-libs" - -RDEPEND=" - dev-libs/libjwc_c - x11-libs/libXt" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PV}-impl-dec.patch - "${FILESDIR}"/${PV}-as-needed.patch ) - -src_prepare() { - rm missing || die - autotools-utils_src_prepare -} diff --git a/x11-libs/libxdl_view/metadata.xml b/x11-libs/libxdl_view/metadata.xml deleted file mode 100644 index d747d72a25b4..000000000000 --- a/x11-libs/libxdl_view/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci</herd> - <maintainer> - <email>sci@gentoo.org</email> - </maintainer> -</pkgmetadata> diff --git a/x11-libs/pixman/pixman-0.32.8.ebuild b/x11-libs/pixman/pixman-0.32.8.ebuild index ffffc444fc63..79cfba33c1f2 100644 --- a/x11-libs/pixman/pixman-0.32.8.ebuild +++ b/x11-libs/pixman/pixman-0.32.8.ebuild @@ -9,7 +9,7 @@ inherit xorg-2 toolchain-funcs versionator EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman" DESCRIPTION="Low-level pixel manipulation routines" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3" RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008 diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild index dc3517f48dae..525e9db88c6c 100644 --- a/x11-libs/pixman/pixman-9999.ebuild +++ b/x11-libs/pixman/pixman-9999.ebuild @@ -16,10 +16,6 @@ else fi IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3" -RDEPEND="abi_x86_32? ( - !<=app-emulation/emul-linux-x86-gtklibs-20131008 - !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] - )" src_configure() { XORG_CONFIGURE_OPTIONS=( diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest index 389e3fd40d4f..ca8df97a2679 100644 --- a/x11-misc/albert/Manifest +++ b/x11-misc/albert/Manifest @@ -1 +1,2 @@ DIST albert-0.7.7.tar.gz 4490918 SHA256 24fbe1f758eea8b8a0920413d2b7a3b44c0cfa88e3d98f302bd5604b4eb0acc3 SHA512 890bb0ba53be64b58090ad1b73152980c5f3e426fa2582a13bca081978253e792c1569857b01f71b3d2513d37bee7af79b9aef502881c30f0afa29cd6d9f0bdf WHIRLPOOL 924d24e1840eaab11aecaa82edf68c1b050a840b97393736b84601cab66b7914748206d6118b4a68668b8cb115408c6a63913637829d2eb9936ae14bf0416cd4 +DIST albert-0.8.0.tar.gz 4556624 SHA256 1d0337d341f25e43486a40743e504f510e87e3cefeaff86cb2673ae7695015fa SHA512 75acd4e042e05452a4658ca61453e8afab41ac06c806919937caf5e84e98c0ec1c12bcdb6179797292c6835d0cba81833122677bebb350472ca18df3bcc78d19 WHIRLPOOL 08397f7f114ecc016bf34bcf3fc6998e9ebc022318af44b30cf842195bfb552f8dbd7f2309f033c716378778ca84f2071f8b26322ac071a0fe5ceb476ba461e9 diff --git a/x11-misc/albert/albert-0.8.0.ebuild b/x11-misc/albert/albert-0.8.0.ebuild new file mode 100644 index 000000000000..d02847033903 --- /dev/null +++ b/x11-misc/albert/albert-0.8.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils gnome2-utils + +DESCRIPTION="Desktop agnostic launcher" +HOMEPAGE="https://github.com/manuelschneid3r/albert" +SRC_URI="https://github.com/manuelschneid3r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + dev-cpp/muParser + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 +" +RDEPEND="${DEPEND} + dev-qt/qtsvg:5 +" + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/x11-misc/albert/metadata.xml b/x11-misc/albert/metadata.xml index 07339f6f0ce8..2fd2095bc1a4 100644 --- a/x11-misc/albert/metadata.xml +++ b/x11-misc/albert/metadata.xml @@ -1,7 +1,10 @@ -<?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> <maintainer> <email>kensington@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">manuelschneid3r/albert</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch new file mode 100644 index 000000000000..f7e13f6b5d40 --- /dev/null +++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch @@ -0,0 +1,14 @@ +Fix build with Qt 5.5. + +Gentoo-bug: 563678 + +--- databasedatatypes.h ++++ databasedatatypes.h +@@ -23,6 +23,7 @@ + #include <QColor> + #include <QStringList> + #include <QGeoCoordinate> ++#include <QObject> + + class Enums : public QObject + { diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch new file mode 100644 index 000000000000..01689167ecd8 --- /dev/null +++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch @@ -0,0 +1,43 @@ +Use system copy of qtsingleapplication. + +--- sialantools/sialantools.pri ++++ sialantools/sialantools.pri +@@ -1,4 +1,5 @@ + QT += qml quick ++CONFIG += qtsingleapplication + + android { + manifest.source = android-build +@@ -24,20 +25,10 @@ + + HEADERS += \ + sialantools/sialanmimeapps.h \ +- sialantools/qtsingleapplication/qtsinglecoreapplication.h \ +- sialantools/qtsingleapplication/qtsingleapplication.h \ +- sialantools/qtsingleapplication/qtlockedfile.h \ +- sialantools/qtsingleapplication/qtlocalpeer.h + + SOURCES += \ + sialantools/sialanmimeapps.cpp \ +- sialantools/qtsingleapplication/qtsinglecoreapplication.cpp \ +- sialantools/qtsingleapplication/qtsingleapplication.cpp \ +- sialantools/qtsingleapplication/qtlockedfile.cpp \ +- sialantools/qtsingleapplication/qtlocalpeer.cpp + +- win32: SOURCES += sialantools/qtsingleapplication/qtlockedfile_win.cpp +- unix: SOURCES += sialantools/qtsingleapplication/qtlockedfile_unix.cpp + } + } + } + +--- sialantools/sialanapplication.h ++++ sialantools/sialanapplication.h +@@ -22,7 +22,7 @@ + #include "sialan_macros.h" + + #ifdef DESKTOP_DEVICE +-#include "qtsingleapplication/qtsingleapplication.h" ++#include "qtsingleapplication.h" + class INHERIT_QAPP : public QtSingleApplication + { + public: diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild new file mode 100644 index 000000000000..f4a21ddcad10 --- /dev/null +++ b/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils qmake-utils + +DESCRIPTION="Modern note manager" +HOMEPAGE="http://labs.sialan.org/projects/kaqaz" +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/sialan-labs/kaqaz.git" + KEYWORDS="" +else + SRC_URI="https://github.com/sialan-labs/kaqaz/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="" + +RDEPEND="dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgraphicaleffects:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5[qml] + dev-qt/qtnetwork:5 + dev-qt/qtpositioning:5 + dev-qt/qtsingleapplication[qt5,X] + dev-qt/qtsensors:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtquick1:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 +" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}/${P}-qt55.patch" + epatch "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" + + rm -r sialantools/qtsingleapplication || die +} + +src_configure() { + eqmake5 +} + +src_install() { + emake install INSTALL_ROOT="${D}" +} diff --git a/x11-misc/netwmpager/netwmpager-2.05.ebuild b/x11-misc/netwmpager/netwmpager-2.05.ebuild index bfa1d12eb671..afead28d56d4 100644 --- a/x11-misc/netwmpager/netwmpager-2.05.ebuild +++ b/x11-misc/netwmpager/netwmpager-2.05.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="" RDEPEND=" diff --git a/x11-misc/qxkb/Manifest b/x11-misc/qxkb/Manifest index 5b3b8b29b451..36e14ff32527 100644 --- a/x11-misc/qxkb/Manifest +++ b/x11-misc/qxkb/Manifest @@ -1,3 +1 @@ -DIST qxkb-0.4.4.tar.bz2 201092 SHA256 034b70bddc5b363d3fcee9718924f0d2000acb3c2c99bd745505236a40689b6f SHA512 f4687bffd49d2b3cd4c37a768a9b4148d3192be20f7061111e188937c6208bb55ee9a9c83e706cf88ec52187965d03da888544a9ab6f6bc2eff0f99df9e7cca0 WHIRLPOOL 6decfcaa0d352362291eee1f4ca9b8a99e9187d01bcb5b6265136ccc8bc5b692f9ff410a4ed74a54ea653a65424171eb9b3c842868f67f34dc0271ba06bf0bbd -DIST qxkb-0.4.5.tar.bz2 177479 SHA256 03c897c1a4c594b3895d5fb23ee6a405d6fb1ba062ecc502ce4513b2982974f9 SHA512 2e5ab7b563b72eab5ace0b5a3f14efabb2e138b80075605ddff059ab0d05b1726bf6ae6736ab9079a67d05be7e980f7836a240cc64d2881570e527f76453cf2e WHIRLPOOL 5edf8a4a255cfc33a607c4118205d32eab0f7589868f64d35fd57f3a142ca3063530e3973e1c60d96e79adde6f99e231c2c7821b5adfe4da748a6935bfd604d8 DIST qxkb-0.4.6.tar.bz2 172194 SHA256 d41f09913ebf89c94ac75a7cd7dd08344485506f1c50a469e076a214952fee79 SHA512 25ac14043ddd6499abf338b1327c2c62c256293419de90932a149151fb00295230da37276c0c6b3ceb2466e983536b9eca3b7072516a6c2e8464c8f06cd2fcef WHIRLPOOL dad87ba3b6154d1c15c70ad97ab3eabe288e308c7118cc8afacd646759f341d7438256ae78a495949ac409b4411fd6a1a5f6cf7fb79c77299b3f35b2ba51c613 diff --git a/x11-misc/qxkb/qxkb-0.4.4-r1.ebuild b/x11-misc/qxkb/qxkb-0.4.4-r1.ebuild deleted file mode 100644 index 3cb815881b04..000000000000 --- a/x11-misc/qxkb/qxkb-0.4.4-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit cmake-utils - -DESCRIPTION="Qt4-based keyboard layout switcher" -HOMEPAGE="https://github.com/disels/qxkb" -SRC_URI="https://qxkb.googlecode.com/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug" - -DEPEND="x11-libs/libxkbfile - dev-qt/qtgui:4 - dev-qt/qtsvg:4" -RDEPEND="${DEPEND} - x11-apps/setxkbmap" diff --git a/x11-misc/qxkb/qxkb-0.4.5.ebuild b/x11-misc/qxkb/qxkb-0.4.5.ebuild deleted file mode 100644 index 7772c27c6ff1..000000000000 --- a/x11-misc/qxkb/qxkb-0.4.5.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="Qt4-based keyboard layout switcher" -HOMEPAGE="https://github.com/disels/qxkb" -SRC_URI="https://qxkb.googlecode.com/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - x11-libs/libxkbfile - dev-qt/qtgui:4 - dev-qt/qtsvg:4 -" -RDEPEND="${DEPEND} - x11-apps/setxkbmap -" - -src_prepare() { - sed -i -e 's:../language:${CMAKE_SOURCE_DIR}/language:' \ - CMakeLists.txt || die - - cmake-utils_src_prepare -} diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest index cfdf1ada139d..735ebb1feb29 100644 --- a/x11-misc/rofi/Manifest +++ b/x11-misc/rofi/Manifest @@ -1,2 +1,3 @@ +DIST rofi-0.15.10.tar.xz 136156 SHA256 c297771e7b6f0c8aef4be27ec7f8e5ab3138c558afddef188f7787d6a84d7326 SHA512 8fdbc7a06a1cb83e6fa891175d8892398566df272ca5e771724a75726c0d675aff73d8e34ad251de1064745f3a6580aac2e02dd02664f0c78f4deb5bc3256bbc WHIRLPOOL ed266202019e4959d2c759d1ecef3c1b2e2d3a7a12a5eedbe90ffeba95a3a41f39472f3e992cf6373c231b1f6e2f8063fd2557c844006e4a11b9b9414688c9ee DIST rofi-0.15.7.tar.xz 125824 SHA256 8c35d3d2a36cc61ae6b5dcc6a07a590e3d6d446944ec6e37dd5a3c3fcff64188 SHA512 51caaaf6f2280c24b65386a3e38591b601e06f9d7ffa132023c93d86cb9ccf8ac1d1e2dec6886128ebdac6558fae3c718c21e489c4bd13575aeee2143ecdac13 WHIRLPOOL a9de957c8cee9682608c35363d1142ec624fb4ce8f22c96da9dc35259afab599fd48dc1e9d528c287fecaa5e1a3c20efe51f1c9159913d7aa7878bbd98814578 DIST rofi-0.15.8.tar.xz 129980 SHA256 13aa2194c87f183c217069292092b38b9ab12115abb0bf312c6d48b22c3b369f SHA512 9c43bdef60a229af371e992a0363e81d5bc09704e5579ffce38c6f0218df9e7607efe13744b700d8b3fa01f3654193afa2f95cd86383ab668573b51902030bb6 WHIRLPOOL 3c9863cafecd606d4f7514328bc3434e60b2bf24faa3f77478c836efa4ea3e4c7037eb4588a76ae23c29294504c9a5b983a86f59ca2c784520a66fadd3f2ce18 diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml index 999093b2ecfb..b63b5dec9933 100644 --- a/x11-misc/rofi/metadata.xml +++ b/x11-misc/rofi/metadata.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>desktop-misc</herd> - <maintainer> - <email>jer@gentoo.org</email> - <name>Jeroen Roovers</name> - </maintainer> - <use> - <flag name="i3">Compile in support for the <pkg>x11-wm/i3</pkg> window manager</flag> - </use> - <upstream> - <remote-id type="github">DaveDavenport/rofi</remote-id> - </upstream> +<herd>desktop-misc</herd> +<maintainer> + <email>jer@gentoo.org</email> +</maintainer> +<use> + <flag name="i3">Compile in support for the <pkg>x11-wm/i3</pkg> window manager</flag> + <flag name="windowmode">Enable normal window mode</flag> +</use> +<upstream> + <remote-id type="github">DaveDavenport/rofi</remote-id> +</upstream> </pkgmetadata> diff --git a/x11-misc/rofi/rofi-0.15.10.ebuild b/x11-misc/rofi/rofi-0.15.10.ebuild new file mode 100644 index 000000000000..e21134b2bccc --- /dev/null +++ b/x11-misc/rofi/rofi-0.15.10.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils toolchain-funcs + +DESCRIPTION="A window switcher, run dialog and dmenu replacement" +HOMEPAGE="https://davedavenport.github.io/rofi/" +SRC_URI="https://github.com/DaveDavenport/${PN}/releases/download/${PV}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="i3 windowmode" +REQUIRED_USE="i3? ( windowmode )" + +RDEPEND=" + dev-libs/glib:2 + media-libs/freetype + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXinerama + x11-libs/pango[X] + x11-libs/startup-notification + i3? ( x11-wm/i3 ) +" +DEPEND=" + ${RDEPEND} + x11-proto/xineramaproto + x11-proto/xproto + virtual/pkgconfig +" + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-0.15.4-Werror.patch + + eautoreconf +} + +src_configure() { + tc-export CC + econf \ + $(use_enable windowmode) \ + $(usex i3 '' --disable-i3support) +} + +src_test() { + emake test +} diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild new file mode 100644 index 000000000000..d12bbab56d8e --- /dev/null +++ b/x11-misc/vym/vym-9999.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils cmake-utils git-r3 + +DESCRIPTION="View Your Mind, a mindmap tool" +HOMEPAGE="http://www.insilmaril.de/vym/" +EGIT_REPO_URI="git://git.code.sf.net/p/vym/code" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="dbus" + +VYM_LINGUAS=( cs_CZ de_DE es fr ia it pt_BR ru sv zh_CN zh_TW ) +IUSE+=" ${VYM_LINGUAS[@]/#/linguas_}" + +DEPEND=" + dev-qt/qtgui:4[qt3support] + dev-qt/qtsvg:4 + dbus? ( dev-qt/qtdbus:4 ) +" +RDEPEND=" + ${DEPEND} + app-arch/zip +" + +DOCS=( README.txt ) + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.3.22-arrowobj.patch + + sed -i \ + -e '/lang\/vym_en.ts/d' \ + CMakeLists.txt || die + rm -r lang/vym_en.ts || die +} + +src_configure() { + local lingua + for lingua in ${VYM_LINGUAS[@]}; do + if ! use linguas_${lingua}; then + sed -i -e "/lang\/vym_${lingua}.ts/d" CMakeLists.txt || die + rm -r lang/vym_${lingua}.ts || die + fi + done + + local mycmakeargs=( + $(cmake-utils_use !dbus NO_DBUS) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + doman doc/vym.1.gz + make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education +} diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest index 57763a021473..e4901b325d0f 100644 --- a/x11-misc/xosview/Manifest +++ b/x11-misc/xosview/Manifest @@ -1,3 +1,2 @@ -DIST xosview-1.14.tar.gz 135178 SHA256 d2f8c0b9e25ad259d114963d64aa9d3c532398fcbbb4213f24a876a94fb23012 SHA512 0d3e2e17c000358183ca8438fef621d7ec10533171a7cf92db7ae9e9fc5e5dbde0dc81d82431e5b252322ba0d07b7917ec4462c1bc1364e17f12b1f0acaaf7e7 WHIRLPOOL e75e7caa439a768c85c850c419e8682e69e24cd3b89cb9f224ac6c0888f091b652c0b70109825d0ec5352b3b53abac2ed62871e78a4a8bcc7186eeeffd5c9129 DIST xosview-1.16.tar.gz 137097 SHA256 8e9e130d1bbb30b68419d12f0d74609c10eeed4d6c6a85f35d9941ea3c7b23a0 SHA512 f83cddebd260a5468110418172623d1367a50eeb69cdce63bff8e93a1908a2d6d860978f7d96eac700e238b270984df1802788400080ccd27ad76c964534e1c2 WHIRLPOOL 36ab8fa63f3bea4b8d87fbd4559fa1d7a8df47f25a558f80c25065b62e7b7c51121aa91604fed4c095fd7fae853cfe37c911710faef5b7f1d0de6e2db7816879 DIST xosview-1.17.tar.gz 143263 SHA256 640998e7bd23b875e2556a97b9149a4cca0ac255889f484489b13a888c19b3f1 SHA512 c1d34887aa75afd244d9b5399c00642e68e75f8b0aafc06555955200e13bca398080dfcc92421f72b0242dcfac1e41d05bfb031e49f1560196a8f6e33ce79df6 WHIRLPOOL 28530451395cfd2b971cfb1f62b21bc3a1cb08f1792f3be87cfb91b7735102cc5bc5b7d5c12f787674ce926a1bc143905db243187cc0ef7beaaa1d0354c05349 diff --git a/x11-misc/xosview/xosview-1.14.ebuild b/x11-misc/xosview/xosview-1.14.ebuild deleted file mode 100644 index 3ff3262d81ea..000000000000 --- a/x11-misc/xosview/xosview-1.14.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils toolchain-funcs - -DESCRIPTION="X11 operating system viewer" -HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/" -SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="suid" - -COMMON_DEPS="x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXt" -RDEPEND="${COMMON_DEPS} - media-fonts/font-misc-misc" -DEPEND="${COMMON_DEPS} - x11-proto/xproto" - -src_prepare() { - sed -e 's:lib/X11/app:share/X11/app:g' \ - -i xosview.1 || die - tc-export CXX -} - -src_compile() { - emake OPTFLAGS="${CXXFLAGS}" -} - -src_install() { - dobin ${PN} - use suid && fperms 4755 /usr/bin/${PN} - insinto /usr/share/X11/app-defaults - newins Xdefaults XOsview - doman *.1 - dodoc CHANGES README.linux TODO -} - -pkg_postinst() { - if ! use suid ; then - ewarn "If you want to use serial meters ${PN} needs to be executed as root." - ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details." - fi -} diff --git a/x11-misc/xosview/xosview-1.16.ebuild b/x11-misc/xosview/xosview-1.16.ebuild index bcbcdd4ba7f9..0f29a11bac91 100644 --- a/x11-misc/xosview/xosview-1.16.ebuild +++ b/x11-misc/xosview/xosview-1.16.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz" LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="amd64 ~ppc ppc64 x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="suid" COMMON_DEPS="x11-libs/libX11 diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 3b39b832267c..af968c0dfedd 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1,2 +1,3 @@ DIST xscreensaver-5.32.tar.gz 10571502 SHA256 4252a6079d2d2f5b342e8bdd172cbad5f0af73daf4e412b61a68344d91ca93bd SHA512 0d7f3d283998cdb2aec10c8f5e94c9cc6e28a72785c36759cee988f3592a5f8aae20ba593c8363eab8fe61f7caf325376a887cac42ecf300c60894bf20d2f75b WHIRLPOOL 1a99e36ac89cf7f3121d499da6bf06e02808465b7b500e0fc371a97df0d8e1b729bc20c57cd7fe560e151e1051e46dafc0b034cf72c343a185b1fddcf8fdb749 DIST xscreensaver-5.33.tar.gz 10725482 SHA256 d4a0c1619219f2843fa8b68d4ae337ab0e9fcb79a6d231540adeb16b3d313f4d SHA512 a8126b165e96d89ada38c4bce0b6c6ef5769667477301f5388633d22b9aed7fa6defcd07b8768c1197556c565b8f220f75c1937e0151d66c3b8e05fbadf37d1d WHIRLPOOL d9210589b1b8263b46740b27c6fc5a64b4d2d5c69c8a7267d4650cf7ed54de1dc927e007ecb37110ead5229e0f9742181ce40b104478c9e0ec488caec07d5231 +DIST xscreensaver-5.34.tar.gz 10788657 SHA256 6fff7ec4be743e5c042647ea9687dd0cdf48d1dd5e8e15098e5018bbd02e5e27 SHA512 58d0beb6556ee77122feb04090ceed80f9ffa67070f28305a00cc42adeae678305d43594c38d00539d2f13f2474311cb82cda6fdafc2bdc918a28438d6b51e75 WHIRLPOOL c7969e5b762cbeabd0564328aefdb895acfcd1c37e2b84c628718b613ca309f4c1222103c0d6ab0fd046eb355f02ee36b11fb57b55eb72e65944ea72e4fa7419 diff --git a/x11-misc/xscreensaver/xscreensaver-5.34.ebuild b/x11-misc/xscreensaver/xscreensaver-5.34.ebuild new file mode 100644 index 000000000000..33115ed85736 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-5.34.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils flag-o-matic multilib pam + +DESCRIPTION="A modular screen saver and locker for the X Window System" +HOMEPAGE="http://www.jwz.org/xscreensaver/" +SRC_URI=" + http://www.jwz.org/xscreensaver/${P}.tar.gz +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama" + +COMMON_DEPEND=" + >=gnome-base/libglade-2 + dev-libs/libxml2 + media-libs/netpbm + x11-apps/appres + x11-apps/xwininfo + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXmu + x11-libs/libXrandr + x11-libs/libXt + x11-libs/libXxf86misc + x11-libs/libXxf86vm + jpeg? ( virtual/jpeg:0 ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) + ) + opengl? ( + virtual/glu + virtual/opengl + ) + pam? ( virtual/pam ) + xinerama? ( x11-libs/libXinerama ) +" +# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` +RDEPEND=" + ${COMMON_DEPEND} + perl? ( + dev-lang/perl + dev-perl/libwww-perl + virtual/perl-Digest-MD5 + ) + selinux? ( sec-policy/selinux-xscreensaver ) +" +DEPEND=" + ${COMMON_DEPEND} + dev-util/intltool + sys-devel/bc + sys-devel/gettext + virtual/pkgconfig + x11-proto/recordproto + x11-proto/scrnsaverproto + x11-proto/xextproto + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto + xinerama? ( x11-proto/xineramaproto ) +" + +src_prepare() { + sed -i configure.in -e '/^ALL_LINGUAS=/d' || die + strip-linguas -i po/ + export ALL_LINGUAS="${LINGUAS}" + + if use new-login && ! use gdm; then #392967 + sed -i \ + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ + configure{,.in} || die + fi + + epatch \ + "${FILESDIR}"/${PN}-5.33-gentoo.patch \ + "${FILESDIR}"/${PN}-5.05-interix.patch \ + "${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \ + "${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \ + "${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \ + "${FILESDIR}"/${PN}-5.28-comment-style.patch \ + "${FILESDIR}"/${PN}-5.31-pragma.patch + + epatch_user + + eautoconf + eautoheader +} + +src_configure() { + if use ppc || use ppc64; then + filter-flags -maltivec -mabi=altivec + append-flags -U__VEC__ + fi + + unset BC_ENV_ARGS #24568 + export RPM_PACKAGE_VERSION=no #368025 + + econf \ + $(use_with jpeg) \ + $(use_with new-login login-manager) \ + $(use_with opengl gl) \ + $(use_with pam) \ + $(use_with suid setuid-hacks) \ + $(use_with xinerama xinerama-ext) \ + --enable-locking \ + --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ + --with-dpms-ext \ + --with-gtk \ + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ + --with-pixbuf \ + --with-proc-interrupts \ + --with-randr-ext \ + --with-text-file="${EPREFIX}"/etc/gentoo-release \ + --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ + --with-xdbe-ext \ + --with-xf86gamma-ext \ + --with-xf86vmode-ext \ + --with-xinput-ext \ + --with-xshm-ext \ + --without-gle \ + --without-kerberos \ + --x-includes="${EPREFIX}"/usr/include \ + --x-libraries="${EPREFIX}"/usr/$(get_libdir) +} + +src_install() { + emake install_prefix="${D}" install + + dodoc README{,.hacking} + + use pam && fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + + rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml +} diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest index 06fa239bcada..1f4cac90a310 100644 --- a/x11-misc/zim/Manifest +++ b/x11-misc/zim/Manifest @@ -1,3 +1 @@ -DIST zim-0.61.tar.gz 1733251 SHA256 5843a9b2fb41f153b7b628732ac157889709b9937b4921c05099af81dceccc4a SHA512 381f1d740bedaecf52c4b7178e7ac17aac98971cc5292476396a28b965b93195a2e07e55f7872048b3577123cd6afb44c2a0e2dee220b02a84fed2a13fb67f61 WHIRLPOOL d0f9d8ce65e8970226f8878cc4e89d228c76e06f9772692d7bc3653b4fc85b4b9ed22d2b0aa91aa724384062a4b1b93859594089c9b1799c2eded313cea7deba -DIST zim-0.62.tar.gz 1772246 SHA256 19d62aebd2c1a92d84d80720c6c1dcdb779c39a2120468fed01b7f252511bdc2 SHA512 53dc97052ee8ec57a61adf9d540f7721ee7e8d8d2500fc4d6ca7bc1b82dc07c5596b8b900c312d155bb1c06e7fbf661e667e0da391ac8f1e326caa2942f7cb1f WHIRLPOOL f1b44e27b49577868f5374b196fe5d59fd111664568141af1aa809fdcf916f830e385320f87c075242ad0ec7fa3db4d6d87fcbe7b70c850c1f1b3725abc66978 -DIST zim-0.63.tar.gz 1864169 SHA256 1584547150b6c96dacdb540c2b88e16d2cd673fa8026d9179aab4a082071fb1c SHA512 052f65c98badfcb1a6d9ed9d09eb84a01878384430affcb97d48d51ef5853478c8d489f9337600fc28b9949f8e1ff97e7e4070ed9a4f488f684a392ad2bff791 WHIRLPOOL 12c884fdaeac1c0c4766637d96e9699491cac1d3421368c073f852e78995a969303dd510172ef89b70c65226cfd1de794968b31313e1ee63aeb6e2f63d610451 +DIST zim-0.65.tar.gz 1899614 SHA256 5442f3334395a2beafc5b9a2bbec2e53e38270d4bad696b5c4053dd51dc1ed96 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb WHIRLPOOL 22bfeaee53214029538ba76d309f3413fa327aec125e49270f168a5d985e37672f3a8cc8043e4a35d1141ffb54f958c0a466c6edac4192028893d017401ce2a2 diff --git a/x11-misc/zim/files/zim-0.62-desktop.patch b/x11-misc/zim/files/zim-0.62-desktop.patch deleted file mode 100644 index b2494509b381..000000000000 --- a/x11-misc/zim/files/zim-0.62-desktop.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/xdg/zim.desktop -+++ b/xdg/zim.desktop -@@ -7,7 +7,7 @@ - Terminal=false - Categories=Utility;TextEditor;GTK; - MimeType=application/x-zim-notebook;text/x-zim-wiki;application/x-gjots; --Keywords=Text;Editor;Write;Wiki;Notes;Notebook;Journal -+Keywords=Text;Editor;Write;Wiki;Notes;Notebook;Journal; - Name=Zim Desktop Wiki - Comment=Edit text files "wiki style" - GenericName=Text Editor diff --git a/x11-misc/zim/zim-0.61.ebuild b/x11-misc/zim/zim-0.61.ebuild deleted file mode 100644 index 8d5163cac7b8..000000000000 --- a/x11-misc/zim/zim-0.61.ebuild +++ /dev/null @@ -1,70 +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="sqlite" -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 gnome2-utils fdo-mime virtualx - -DESCRIPTION="A desktop wiki" -HOMEPAGE="http://zim-wiki.org/" -SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz" - -LICENSE="BSD GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - x11-misc/xdg-utils - test? ( - dev-vcs/bzr - dev-vcs/git - dev-vcs/mercurial )" - -PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch ) - -python_prepare() { - sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die - distutils-r1_python_prepare -} - -python_test() { - VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py -} - -python_install() { - distutils-r1_python_install --skip-xdg-cmd -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - if ! has_version ${CATEGORY}/${PN}; then - einfo "Please emerge these packages for additional functionality" - einfo " dev-lang/R" - einfo " dev-python/gtkspell-python" - einfo " dev-vcs/bzr" - einfo " gnome-extra/zeitgeist" - einfo " media-gfx/graphviz" - einfo " media-gfx/imagemagick" - einfo " media-gfx/scrot" - einfo " media-sound/lilypond" - einfo " sci-visualization/gnuplot" - einfo " virtual/latex-base app-text/dvipng" - fi -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/x11-misc/zim/zim-0.62.ebuild b/x11-misc/zim/zim-0.62.ebuild deleted file mode 100644 index f9f9e5d0005b..000000000000 --- a/x11-misc/zim/zim-0.62.ebuild +++ /dev/null @@ -1,84 +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="sqlite" -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 gnome2-utils fdo-mime virtualx - -DESCRIPTION="A desktop wiki" -HOMEPAGE="http://zim-wiki.org/" -SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz" - -LICENSE="BSD GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - x11-misc/xdg-utils - test? ( - dev-vcs/bzr - dev-vcs/git - dev-vcs/mercurial )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch - "${FILESDIR}"/${P}-desktop.patch -) - -python_prepare() { - sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die - - if [[ ${LINGUAS} ]]; then - local lingua - for lingua in translations/*.po; do - lingua=${lingua/.po} - lingua=${lingua/translations\/} - has ${lingua} ${LINGUAS} || \ - { rm translations/${lingua}.po || die; } - done - fi - - distutils-r1_python_prepare -} - -python_test() { - VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py -} - -python_install() { - distutils-r1_python_install --skip-xdg-cmd -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - if ! has_version ${CATEGORY}/${PN}; then - einfo "Please emerge these packages for additional functionality" - einfo " dev-lang/R" - einfo " dev-python/gtkspell-python" - einfo " dev-vcs/bzr" - einfo " gnome-extra/zeitgeist" - einfo " media-gfx/graphviz" - einfo " media-gfx/imagemagick" - einfo " media-gfx/scrot" - einfo " media-sound/lilypond" - einfo " sci-visualization/gnuplot" - einfo " virtual/latex-base app-text/dvipng" - fi -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/x11-misc/zim/zim-0.63.ebuild b/x11-misc/zim/zim-0.65.ebuild index fb9808a99d12..fb9808a99d12 100644 --- a/x11-misc/zim/zim-0.63.ebuild +++ b/x11-misc/zim/zim-0.65.ebuild diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest index 3c4bd76dd2de..9d0908879f53 100644 --- a/x11-terms/guake/Manifest +++ b/x11-terms/guake/Manifest @@ -6,3 +6,4 @@ DIST guake-0.7.0.tar.gz 341020 SHA256 ce771ac377d3ef74c793b50936617b0dda5682dd68 DIST guake-0.7.2.tar.gz 351702 SHA256 761bb608d7ec907cab3281c7c67317ac6413fdf52293bd5e9c8e4dc1024a5993 SHA512 1fd27b35fcc25743be7a49cc560fbc1a269f78d7e4c07afbd0fe489c1b8e0edbe31e73fb9735a6405668a3e5748cbc4757defd2996a51815d245283f4fca2c16 WHIRLPOOL 08579c7493cc74f9a0b97396e08d7223e9c614d86697ba9d7dfd262240e7c8123a3d4b117a3457a0af27fcc483a0a5a28571f181f49baf9bffa21a2e10d09742 DIST guake-0.8.0.tar.gz 343381 SHA256 a34e80f2cbf1b57076ce2ecc67c04b21167a5439d1345877bc758256c57ac15a SHA512 42cb93a111d2f8c6e40b4555033a98efb42a6efd89b7efda8cbfe7417821846a20afaf3545008b644e39110b1bd92f83b732cdc36437fa00755be910275dd2b5 WHIRLPOOL cae222c1288bd5528c8e0aebd77d5ad047ce601ce4e541935221a5db4a4157d324d8c770c8633394bad1c397c38e302bf6c503b0da37006b01c347f6647ae1aa DIST guake-0.8.1.tar.gz 357086 SHA256 2d67ffb22e89b136b9c3e1d9b4befd6c9687b1b69d7c12559c9ce9048c57b386 SHA512 26c8cc37a10d65d440a7f58a7305019860357d539b1c50777d28ef79516dfc23c93b724b6ef2371fd1f26fff252a580668d016fe97a09795ca0d709ddd65933e WHIRLPOOL 68a7d3c19646b6939f0b023ec46743168077606a70b4e19b5c891bf46e179e214d58fd647e46bd332bc2178f71a1f91c12aa59e2a2a2c94ccf98dba4e16abb8f +DIST guake-0.8.3.tar.gz 380656 SHA256 3e4c254209f4afceac9a46c3e161b5673408ccd0690804014127a914c76f75d1 SHA512 cf2fa505c774e608b0e1faf677c0725ea4b72d1ef5273e3504d75b57867d524bffdc5fa76ee88b76096305c7f897a746c477daf5543d765baea3a349099b8651 WHIRLPOOL 9eaa09a1c36fa69d586e1e38955bca477461bd19fd63dc3e25f72358bb8345f2a6f181b9d8d67728b2ce0c94861c90940d34eaa18b07b6c0b46303199f2d1a99 diff --git a/x11-terms/guake/guake-0.8.1.ebuild b/x11-terms/guake/guake-0.8.1.ebuild index 0cdc6ed49b4a..83e39e24ece1 100644 --- a/x11-terms/guake/guake-0.8.1.ebuild +++ b/x11-terms/guake/guake-0.8.1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm ~x86" RDEPEND=" dev-libs/keybinder:0[python] diff --git a/x11-terms/guake/guake-0.8.3.ebuild b/x11-terms/guake/guake-0.8.3.ebuild new file mode 100644 index 000000000000..0cdc6ed49b4a --- /dev/null +++ b/x11-terms/guake/guake-0.8.3.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +GCONF_DEBUG=no +GNOME2_LA_PUNT=yes +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eutils gnome2 python-single-r1 + +DESCRIPTION="Drop-down terminal for GTK+ desktops" +HOMEPAGE="https://github.com/Guake/guake" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +RDEPEND=" + dev-libs/keybinder:0[python] + dev-python/dbus-python + dev-python/gconf-python + dev-python/notify-python + dev-python/pygtk + dev-python/pyxdg + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/vte:0[python] +" +DEPEND=" + ${RDEPEND} + dev-util/intltool + virtual/pkgconfig +" + +DOCS=( AUTHORS ChangeLog NEWS README.rst ) + +src_prepare() { + eautoreconf + + gnome2_src_prepare + + G2CONF="--disable-static" +} + +pkg_postinst() { + gnome2_pkg_postinst +} + +pkg_postrm() { + gnome2_pkg_postrm +} diff --git a/x11-themes/chameleon-xcursors/metadata.xml b/x11-themes/chameleon-xcursors/metadata.xml index 4367b75064e9..a20e7b5433b8 100644 --- a/x11-themes/chameleon-xcursors/metadata.xml +++ b/x11-themes/chameleon-xcursors/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>sterkrig@myopera.com</email> + <email>skrattaren@yandex.ru</email> <name>Nikolaj Sjujskij</name> </maintainer> <maintainer> diff --git a/x11-themes/clearlooks-phenix/metadata.xml b/x11-themes/clearlooks-phenix/metadata.xml index 7c4df9f5ee39..4c8b53e2b39d 100644 --- a/x11-themes/clearlooks-phenix/metadata.xml +++ b/x11-themes/clearlooks-phenix/metadata.xml @@ -7,7 +7,7 @@ <name>Ian Delaney</name> </maintainer> <maintainer> - <email>geert.braekmans@gmail.com</email> + <email>brakarov@outlook.com</email> <name>Geert Braekmans</name> <description>Proxy maintainer</description> </maintainer> diff --git a/x11-themes/fvwm-crystal/metadata.xml b/x11-themes/fvwm-crystal/metadata.xml index 729da74629f0..edb3c129e531 100644 --- a/x11-themes/fvwm-crystal/metadata.xml +++ b/x11-themes/fvwm-crystal/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>dominique.michel@vtxnet.ch</email> + <email>dominique.c.michel@gmail.com</email> <name>Dominique Michel</name> </maintainer> <longdescription> diff --git a/x11-themes/smplayer-themes/Manifest b/x11-themes/smplayer-themes/Manifest index 6995fb434038..0d39aec6dda5 100644 --- a/x11-themes/smplayer-themes/Manifest +++ b/x11-themes/smplayer-themes/Manifest @@ -1,2 +1,3 @@ DIST smplayer-themes-14.12.0.tar.bz2 2660621 SHA256 2c520a678bfcfa8c9a6881d4612ce8fb5216abdf072d27fb3da362af316ae333 SHA512 b97c097c7bbbcc60878e9cf4306c08fb87b83da67763a965e9e21517fb02568e902cbc1c8739be3f54b7a5b398c49dc8ab81964b97140a64f34bcf8af9c39765 WHIRLPOOL bab1009ab6dfe693177a905a583454fd5614830c90c09f1a93832129342583efd8f6c4bce6c355e340e43062b06119fde1c5532136dd38cdadc72fe280603312 DIST smplayer-themes-14.9.0.tar.bz2 2094596 SHA256 66164c0edc8698e174844ebbb7047a2444f249c569029cdc3c04833bbfb73238 SHA512 2c6b96c2fc5029ee3d4d6cd1204788c89c712d69ca230ba335f7a988fab181df9b700d8ceee446a7ccb852bdfdc82106fdcbf38ca199fb881088f9efc1ae1d7c WHIRLPOOL f68a511793a4f6fd270ce2708e4bfe5a25ef26493f18e9b18f49d5c19cb80fcab2a37c8494c9e9eac263a978ebce64e4bdfc4c0af32c6551a9f5dc7b4b2584d5 +DIST smplayer-themes-15.6.0.tar.bz2 2903294 SHA256 3d64f4db3d5465230b995ef5140ca6716206b4479f15d7a4b52c5fd939b60138 SHA512 2381254851894386722e832c56b0b65d94465413c5ca49690d59f499e95a64cfb5067d705c1b27e0c27eefcab01863c945c3c619804a298a9e96fc3e23b2855e WHIRLPOOL a17a43bcede39441e47feedb66df417daa3db1c18b380dab9f941fbb15cfe2cc0754ce26eec0b469f15d6f49e5ab75372b55202fdefd4746f8429eb69cba983c diff --git a/x11-themes/smplayer-themes/smplayer-themes-15.6.0.ebuild b/x11-themes/smplayer-themes/smplayer-themes-15.6.0.ebuild new file mode 100644 index 000000000000..01065b0c5f7c --- /dev/null +++ b/x11-themes/smplayer-themes/smplayer-themes-15.6.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit qmake-utils + +DESCRIPTION="Icon themes for smplayer" +HOMEPAGE="http://smplayer.sourceforge.net/" +SRC_URI="mirror://sourceforge/smplayer/${P}.tar.bz2" + +LICENSE="CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 GPL-2 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE="" + +DEPEND="dev-qt/qtcore:4" +RDEPEND="media-video/smplayer" + +src_prepare() { + # bug 544108 + sed -i -e "s| rcc| \"$(qt4_get_bindir)\"/rcc|" themes/Makefile || die + + # bug 544160 + sed -i -e 's/make/$(MAKE)/' Makefile || die +} + +src_install() { + insinto /usr/share/smplayer + doins -r themes + dodoc Changelog README.txt +} diff --git a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild index 7a08527a6c07..dd9014802629 100644 --- a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild +++ b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}wm/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd" IUSE="nls truetype debug" RDEPEND="x11-libs/libXft diff --git a/x11-wm/dwm/metadata.xml b/x11-wm/dwm/metadata.xml index b6af2b7ba15c..4f357a207350 100644 --- a/x11-wm/dwm/metadata.xml +++ b/x11-wm/dwm/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>michael.stahn.42@gmail.com</email> + <email>hm.stahl@web.de</email> <name>Michael Stahn</name> <description>Maintainer. Assign bugs to him</description> </maintainer> diff --git a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild index 31ec9aa9c49a..2fbceba98450 100644 --- a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild @@ -56,7 +56,7 @@ src_configure() { myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)" if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" + [[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)" else myconf="${myconf} --disable-locale" fi diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild index 2e5a7783c700..0753568bbb5d 100644 --- a/x11-wm/windowmaker/windowmaker-9999.ebuild +++ b/x11-wm/windowmaker/windowmaker-9999.ebuild @@ -62,7 +62,7 @@ src_configure() { myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)" if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" + [[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)" else myconf="${myconf} --disable-locale" fi diff --git a/xfce-extra/xfce4-pulseaudio-plugin/Manifest b/xfce-extra/xfce4-pulseaudio-plugin/Manifest index 1e0ed0f73e52..9b7620ab513f 100644 --- a/xfce-extra/xfce4-pulseaudio-plugin/Manifest +++ b/xfce-extra/xfce4-pulseaudio-plugin/Manifest @@ -1,2 +1,3 @@ DIST xfce4-pulseaudio-plugin-0.2.2.tar.bz2 324250 SHA256 67c04ab9a3932d74480f42461aafe779b68de4388db3f7546966a3967376c6d8 SHA512 d7640637de7fb295bea0b1d29e8b75e854926aab96847018a60a86f6fdb6a408328688285767ee1b34109df06bd7fb1ee907798b7f60bcbb095294d743e1b32f WHIRLPOOL 10b5df905e7d3ff6beec9bc11c0d572ae38635fc18c114ad42a10e61e0a0e24c1bc2813b08926896f1f529a053c021e13a5af291158e989cf3ce4ef4579fbdbf DIST xfce4-pulseaudio-plugin-0.2.3.tar.bz2 306349 SHA256 e82836bc8cf7d905b4e60d43dc630ba8e32dea785989700c71d4aeee9f583b33 SHA512 9440e68b81be0845be4da88154db6e407891d5cc7504e46bc5dd7deac36bfba7354b38b7658e099fdd40fe581bd6e549ae1c6655a2d05df1f297ec944db47cc6 WHIRLPOOL e1fef58d0a510b9121a36e131f72f5b8333bf86ee8c50ece978ca66697cd8fbf21903d35d67639b4ec2dd2493c18f8603efe14ebd51626168721807ad5091143 +DIST xfce4-pulseaudio-plugin-0.2.4.tar.bz2 307315 SHA256 8d9330ddf1d44a864a36d566cce4b76d4f859c5984bba7653d7dc39aa24d5c3e SHA512 b53ab48e282a506fc7fe91fa70520f0db32f2f73653a0210681bf7389f13441d5af8f855604b59817b1fe7a3f41e2d4fe52b052ac0c3479f3f4e37b2afedb193 WHIRLPOOL 8763a9422a7519b5603703306d968f9e020c1bd4b304be0d21bd6353c54e8fa979ef68c513d6e1c398ce6857ad88807a7cb7eefc29d6fba4f12a243eb7205e26 diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4.ebuild new file mode 100644 index 000000000000..01b51235845b --- /dev/null +++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit xfconf + +DESCRIPTION="A panel plug-in for PulseAudio volume control" +HOMEPAGE="https://github.com/andrzej-r/xfce4-pulseaudio-plugin" +SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86" +IUSE="debug keybinder libnotify" + +RDEPEND=">=dev-libs/glib-2.24.0:= + media-sound/pulseaudio:= + >=x11-libs/gtk+-3.6.0:3= + >=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)] + >=xfce-base/libxfce4util-4.9.0:= + >=xfce-base/xfce4-panel-4.11.0:= + >=xfce-base/xfconf-4.6.0:= + keybinder? ( dev-libs/keybinder:3= ) + libnotify? ( x11-libs/libnotify:= )" +DEPEND="${RDEPEND} + dev-util/intltool + virtual/pkgconfig" + +pkg_setup() { + XFCONF=( + $(use_enable keybinder) + $(use_enable libnotify) + $(xfconf_use_debug) + ) + + DOCS=( AUTHORS ChangeLog NEWS README ) +} |