diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 81079005a316..afec2c51cc50 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -10,3 +10,5 @@ DIST puppet-agent_1.2.7-1wheezy_amd64.deb 15280016 SHA256 c250bcdeb22296ef3b0097
DIST puppet-agent_1.2.7-1wheezy_i386.deb 15214412 SHA256 c2b9f51cfe3d3e43b3cdfb7a1c6c92abaeaf2c4ab26e9ceac5aba2b58cf1480e SHA512 6950e09c49da35c0cf463364b4ec468ba011f15d3caf9c59c58ef01a0cfd859cb5c97a3271d9a11c958a71c4c77ba45a8dab205124b92a80354da519dc1a2f3c WHIRLPOOL 12ce6f5ba23f00d1320d7cd40734485ac69bdddda8a9711e18f3549c12919592ca27394963578c5850400864e2b524e7034833e8b2985b15f06bb66f06df1b75
DIST puppet-agent_1.3.0-1wheezy_amd64.deb 18018964 SHA256 dd107d96f674100e399f1e1a773b22ed2dd77081f3580d7df729f0d02885326f SHA512 20b5a2e516e98db30450b54f0ae042b4c6d5ccf4f44bc3403381bc663c73a7349b393fefaafabfbe334a49afbfcabc8eeae727e4eca54ef7eaa81463a7f05ed2 WHIRLPOOL df75fda9fa2ddc46fea419a65dc0de7eccd9ded41534c96f9be6688b07287fb3f6343ae908fcede47f857d37af1513e74ae5b25302150b1b186f0dc698d85860
DIST puppet-agent_1.3.0-1wheezy_i386.deb 17960480 SHA256 eda86599bd647e1367874636aedb9e2812540043b6bf3f0f614efb00b7f727b8 SHA512 d2a3555c9298c9a14ea9342e787f4971a0e6fbe0ea37a2ca8a6f8ee4863fb8eb21dd5cb45c493ad0bffdc85e239baa6aaec95c778fb697e6ec5fe65ba592ea84 WHIRLPOOL f77446c30aaf56e529ecec2dfbd00d438407ed58bfa460f147cc59c403eeafa4fbb62697d84696173501c349156d0b0c0a0166760dc2bdf1f133371bc9ee1d98
+DIST puppet-agent_1.3.1-1wheezy_amd64.deb 18079810 SHA256 c7df7a99ac0ee08564e60596ec4547f4208010d196c7e229f54fe8c8939cf7fd SHA512 c205c24a2c8aee1f57ddb9c1e0b09172455e953de8b51452c274e43edd95e3d5999c8ff74d00935b3a3b3221532d264bd4e9917a994095e9deee8430e91cc572 WHIRLPOOL fb492b8f6e98565e664bfb14dcb8b06fcae20b5bcefb9a04abd064099271fbae8d21c47b6605e32e0efce7fb6bcceeb9e3e330c1e7338491b700e66945870c5b
+DIST puppet-agent_1.3.1-1wheezy_i386.deb 18015662 SHA256 7a6df5b1ff33ab6791c76d7080fc2b8174e6efdf701c774d7945238f3be28e5a SHA512 3960327559ef9b7f58b6b0997789ec89b74afab2628c8067383556e66cdbfe5a5951ddf5c11840bf0fc76052a8548500f2608dc823ae757c669272ee10a22af5 WHIRLPOOL 9c8c50401e3388af6114a24b70753b6ee96beee5f73e9fbb50ff1e6c63ae6e94ae4110ad197558288f4d310ef36714ca9132d08ff0f122aab8a4885b4ab682cc
diff --git a/app-admin/puppet-agent/puppet-agent-1.3.1.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.1.ebuild
new file mode 100644
index 000000000000..696bcc79467a
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.3.1.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 eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
+SRC_URI="
+ amd64? ( ${SRC_BASE}_amd64.deb )
+ x86? ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+ !app-admin/mcollective
+ !app-admin/puppet
+ !dev-ruby/hiera
+ !dev-ruby/facter
+ !app-emulation/virt-what"
+
+DEPEND="
+ ${CDEPEND}"
+RDEPEND="${CDEPEND}
+ sys-apps/dmidecode
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+ /opt/puppetlabs/puppet
+ /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+ /opt/puppetlabs/puppet/lib/engines/*
+ /opt/puppetlabs/puppet/lib/virt-what/*
+ /opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+ # conf.d
+ doconfd etc/default/puppet
+ doconfd etc/default/mcollective
+ # logrotate.d
+ insinto /etc/logrotate.d
+ doins etc/logrotate.d/mcollective
+ # puppet itself
+ insinto /etc/puppetlabs
+ doins -r etc/puppetlabs/*
+ # logdir for systemd
+ dodir var/log/puppetlabs/puppet/
+ fperms 0750 var/log/puppetlabs/puppet/
+ # the rest
+ insinto /opt
+ dodir opt/puppetlabs/puppet/cache
+ doins -r opt/*
+ fperms 0750 /opt/puppetlabs/puppet/cache
+ # init
+ newinitd "${FILESDIR}/puppet.initd" puppet
+ newinitd "${FILESDIR}/mcollective.initd" mcollective
+ systemd_dounit "${FILESDIR}/puppet.service"
+ systemd_dounit "${FILESDIR}/mcollective.service"
+ systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+ # symlinks
+ chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+ chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+ dosym /opt/puppetlabs/bin/facter /usr/bin/facter
+ dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
+ dosym /opt/puppetlabs/bin/mco /usr/bin/mco
+ dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
+ dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+ dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+ dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+ dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+ dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 163342a661ae..ee40247ae9e6 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,5 +1,5 @@
DIST salt-2015.5.6.tar.gz 5564414 SHA256 4fe478132ce84076b3e424cdd217443766d83ac40fa0ec0e914ca46111971c38 SHA512 6f091b2de8d5f949eb8df8d5173bc122b971a3966b3f4fa55209906dba83b744a72b24e40ee1b0b4dc0a51d740bc336e10798a310da3544e36d4d8585934ac11 WHIRLPOOL 2d25cfada4dab07e82dad6542ac8c290d55ca493fe90186af4b1f78b3684dcb7c9d95eab4a0fe22a0c82cb8b31e8176cc750ebab5304927bbbc7f2a2545ebc8b
-DIST salt-2015.5.7.tar.gz 5733060 SHA256 132feb4a067470a85a73942a125b2435612ca6798e88de3e4d413e8ac09a850e SHA512 ee552f82b2ffbe5eed608336a6ae6b60515f4ddb1cc5ea5d726f450f60b88f95874ac2686b5eaa39def41a73c447e949a5ee79c3816c5ee1265fca591a5a05a0 WHIRLPOOL eed3c57c43e28df89eddb4c7ff59ed2ddfe39dacb81f7aace9e7a5324a4bc5e399628e4809d4b82a8eb24aafd90847f29a916c06dd74ea777d3dd582119d84af
+DIST salt-2015.5.8.tar.gz 5741097 SHA256 07c3eb054ef214c17481fed1262a5e4fd3c429df3058b504eb2cfc36ce4ad2fc SHA512 969cfdfb82f40957d1fa923a4640596cd08529eb9159527365094a3ab0d3e5ad6ff023eea34ad3b1328102f5d03ec8bf7da0958c77dfaee058f5e361a3dc395a WHIRLPOOL bf6960fe18c5181253d428ae678ed3f2e8203cbfcf0d7105d19ac5c6ce1d3c7acdf131062cfca255839c95bfa8f692f6463c9b7d41ad62d80c7a738b758bad71
DIST salt-2015.8.1.tar.gz 6527650 SHA256 04133839b4632859ad696a40261d1d14b62902dbcaf7df2f9e5e926c89401c23 SHA512 d882e3a8e70cf19c64e14c35d4c69fa308b8502d01095ce3f8c383a0ee0b70dbefd4b8eda95205f2cba2fe237279e2a3425daf0d5bf66144fb97ca3be0ec162a WHIRLPOOL a1014b8b2b1f815e2f9981cf3c8696b151a4788afb5525021ad94a6d9da774870290ed94fa159b5e3d8f8c73a682417937a1c48b0431d009a21c1e89a32d61f0
-DIST salt-2015.8.2.tar.gz 6724537 SHA256 075ab604cff3acc222904d9299ab6a1f86715bd11b043fd931e1cfe386221d27 SHA512 386d3fa36e4e6aaec069148b16d70c601ac1a805044b28630a671a12a45d813a80e058bba45ee664cce3010ef094c5e48736a50b7ba19c7ea2eb0f828bbf0706 WHIRLPOOL b7ad1ddfdfff1e4c679203be831e96b17c4ded3f3aa1ffc705501ff6bf2ef0256a514db90132d64abe554cd643c5f9065cb0ee202034157d8c55947744de4f39
+DIST salt-2015.8.3.tar.gz 6757678 SHA256 2e9a262789b018f3443513105c0c6ae98934c9bc105a04cf9e5c073ef706218a SHA512 18a2c63d5e54d09468189450557974e47f87d8b7dde52beaae678120da1da1e7aecfff18cf0fdfb63a11cd5f6bab102c229462f0afe5e3e858c0c467761c7121 WHIRLPOOL 5f1e1562904aecf97027688adbe9a2eb1b910065e52a2e20e7bad67fc4e91660e3e1e04612ee3b18d9632f3ff782837336cf1a5d85d771b67071422a3cea9861
DIST salt-vim-20141109.tar.gz 3783 SHA256 4989d111ad618ea3f5f7a7046a0ff6ce3ca6bc7f71fca90849f7c38947ab6d9a SHA512 d8d62ee827012e29586cf492f2881ee5870ed058828102f985e8b27300c115e01bb126f89decb15a19a8e206dc54c89856d4c31b3ff5320a36385cb5ed517a63 WHIRLPOOL 98026b2cdcb64665790475e3b20a7de294e5cefb390b414294756cad440bc040d9044ffd37a13f3c93af9be1a1bfd444710ff0df24895db624f49fddd16b5545
diff --git a/app-admin/salt/salt-2015.5.7.ebuild b/app-admin/salt/salt-2015.5.8.ebuild
similarity index 100%
rename from app-admin/salt/salt-2015.5.7.ebuild
rename to app-admin/salt/salt-2015.5.8.ebuild
diff --git a/app-admin/salt/salt-2015.8.2.ebuild b/app-admin/salt/salt-2015.8.3.ebuild
similarity index 100%
rename from app-admin/salt/salt-2015.8.2.ebuild
rename to app-admin/salt/salt-2015.8.3.ebuild
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
new file mode 100644
index 000000000000..1f9364034341
--- /dev/null
+++ b/app-crypt/acme/acme-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
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+
+EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
+
+inherit git-r3 distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ >=dev-python/ndg-httpsclient-0.4[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/werkzeug[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${P}/${PN}
+
+python_test() {
+ nosetests -w ${PN} || die
+}
diff --git a/app-crypt/acme/metadata.xml b/app-crypt/acme/metadata.xml
new file mode 100644
index 000000000000..bfcb6974f1c4
--- /dev/null
+++ b/app-crypt/acme/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ mrueg@gentoo.org
+ Manuel Rüger
+
+
diff --git a/app-crypt/letsencrypt/Manifest b/app-crypt/letsencrypt/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/app-crypt/letsencrypt/letsencrypt-9999.ebuild b/app-crypt/letsencrypt/letsencrypt-9999.ebuild
new file mode 100644
index 000000000000..c271da785b44
--- /dev/null
+++ b/app-crypt/letsencrypt/letsencrypt-9999.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)
+
+EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
+
+inherit git-r3 distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+ dev-python/configargparse[${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-0.7[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/parsedatetime[${PYTHON_USEDEP}]
+ >=dev-python/psutil-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ >=dev-python/pythondialog-3.2.2:python-2[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/zope-component[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}] )
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ nosetests -w ${PN}/tests || die
+}
diff --git a/app-crypt/letsencrypt/metadata.xml b/app-crypt/letsencrypt/metadata.xml
new file mode 100644
index 000000000000..bfcb6974f1c4
--- /dev/null
+++ b/app-crypt/letsencrypt/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ mrueg@gentoo.org
+ Manuel Rüger
+
+
diff --git a/app-text/xmlto/metadata.xml b/app-text/xmlto/metadata.xml
index 4538a68724a6..e8b6b46fca44 100644
--- a/app-text/xmlto/metadata.xml
+++ b/app-text/xmlto/metadata.xml
@@ -2,4 +2,7 @@
maintainer-needed@gentoo.org
+
diff --git a/app-text/xmlto/xmlto-0.0.26-r1.ebuild b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
index 50d6509554cd..38abb31b5ca2 100644
--- a/app-text/xmlto/xmlto-0.0.26-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz
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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="latex"
+IUSE="latex +text"
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
app-text/docbook-xml-dtd:4.2
@@ -22,7 +22,7 @@ RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
|| ( sys-apps/util-linux app-misc/getopt )
|| ( sys-apps/which sys-freebsd/freebsd-ubin )
- || ( virtual/w3m www-client/lynx www-client/links )
+ text? ( || ( virtual/w3m www-client/lynx www-client/links ) )
latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
# We only depend on flex when we patch the imput lexer.
DEPEND="${RDEPEND}"
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
index 4078641e1b83..4fe3dc4144f7 100644
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz
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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="latex"
+IUSE="latex +text"
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
app-text/docbook-xml-dtd:4.2
@@ -22,7 +22,7 @@ RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
|| ( sys-apps/util-linux app-misc/getopt )
|| ( sys-apps/which sys-freebsd/freebsd-ubin )
- || ( virtual/w3m www-client/lynx www-client/elinks )
+ text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) )
latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
# We only depend on flex when we patch the imput lexer.
DEPEND="${RDEPEND}"
diff --git a/dev-java/jigsaw/jigsaw-2.2.6.ebuild b/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
similarity index 63%
rename from dev-java/jigsaw/jigsaw-2.2.6.ebuild
rename to dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
index db4345bf12ea..58f4df3c12a4 100644
--- a/dev-java/jigsaw/jigsaw-2.2.6.ebuild
+++ b/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
@@ -1,15 +1,15 @@
-# 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
JAVA_PKG_IUSE="doc source"
# Jigsaw is actually a WWW server, it would be nice to package it as such, not
# as a raw library like this ebuild does.
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2
DESCRIPTION="W3 Consortium's Java-based Web server libraries"
HOMEPAGE="http://jigsaw.w3.org/"
@@ -21,42 +21,48 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
-COMMON_DEP="dev-java/jakarta-oro:2.0
- java-virtuals/servlet-api:2.3
+CDEPEND="
+ dev-java/jtidy:0
dev-java/xerces:2
- dev-java/jtidy"
+ dev-java/jakarta-oro:2.0
+ java-virtuals/servlet-api:2.3"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
app-arch/unzip
- ${COMMON_DEP}"
+ >=virtual/jdk-1.6"
EANT_DOC_TARGET="javadocs"
S="${WORKDIR}/Jigsaw"
-src_prepare() {
- rm -f classes/*.jar
- mkdir -p "${S}/jars" || die "mkdir failed"
+PATCHES=(
+ "${FILESDIR}/${P}-build.xml.patch"
+)
+
+java_prepare() {
+ epatch "${PATCHES[@]}"
+
+ java-pkg_clean
- epatch "${FILESDIR}/${P}-build.xml.patch"
+ mkdir -p "${S}/jars" || die "mkdir failed"
java-pkg_jar-from --into jars/ jakarta-oro-2.0
java-pkg_jar-from --into jars/ servlet-api-2.3
java-pkg_jar-from --into jars/ xerces-2
java-pkg_jar-from --into jars/ jtidy
- cd jars/
- ln -s $(java-config --tools)
+ cd "${S}/jars" || die
+ ln -s $(java-config --tools) || die
}
src_install() {
- java-pkg_dojar classes/jigsaw.jar
- java-pkg_dojar classes/jigadmin.jar
- java-pkg_dojar classes/jigedit.jar
-
- use doc && java-pkg_dojavadoc ant.build/javadocs
+ java-pkg_dojar classes/{jigsaw,jigadmin,jigedit}.jar
dodoc ANNOUNCE README
+ use doc && java-pkg_dojavadoc ant.build/javadocs
}
diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
index 5c5d3ceb49e9..9b3860f69e0f 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -1 +1,2 @@
DIST jtidy-04aug2000r7-dev.zip 718750 SHA256 18e9fc9bcf2d573a27a466ceee2b75772c6dd830af8e83cadb23df9d772583c6 SHA512 3e8baedd992797d7894b2b47f5e214b55189b34081d276563a152ef8603a22188c64d4a363279d1a400cafefdb24018467249bc67283c547f27da44c77cb261c WHIRLPOOL f90403fb86b9860e355710ce0b638a16979487f6aedb9cc1ee4f23d3d0bddc65689cdd989dcac2391f141bca15429f8aad24228a25dbf50df76802ec6118961c
+DIST jtidy-1.0.zip 240642 SHA256 50d7d93aeb9b53f4fe3e46a685c334482f2e15da7f81c93b53aec128f1fd7aa6 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a WHIRLPOOL 24cd2b55bb7713c7ebdee9bab7b1ad730a13f3bc825347a6fa6e7d137770891a985811102c494155b56c15726ccbb105a9421ce720699f9ba796ab4daf1c0f24
diff --git a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
new file mode 100644
index 000000000000..fea64813365d
--- /dev/null
+++ b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
@@ -0,0 +1,31 @@
+--- build.xml.orig 2015-12-01 21:10:36.689000000 +0000
++++ build.xml 2015-12-01 21:11:05.642000000 +0000
+@@ -9,11 +9,7 @@
+
+
+
+-
+-
+-
+-
+-
++
+
+
+
+@@ -30,13 +26,13 @@
+
+
+
+-
++
+
+
+
+
+
+-
++
+
+
+
diff --git a/dev-java/jtidy/jtidy-1.0.ebuild b/dev-java/jtidy/jtidy-1.0.ebuild
new file mode 100644
index 000000000000..089d46d9c9b1
--- /dev/null
+++ b/dev-java/jtidy/jtidy-1.0.ebuild
@@ -0,0 +1,52 @@
+# 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
+
+MY_PV="r938"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Tidy is a Java port of HTML Tidy , a HTML syntax checker and pretty printer"
+HOMEPAGE="http://jtidy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
+LICENSE="HTML-Tidy W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND="
+ ${CDEPEND}
+ app-arch/unzip
+ >=virtual/jdk-1.6"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="ant-core"
+EANT_BUILD_TARGET="jar"
+
+S="${WORKDIR}"
+
+PATCHES=(
+ "${FILESDIR}"/"${P}-build.xml.patch"
+)
+
+java_prepare() {
+ epatch "${PATCHES[@]}"
+}
+
+src_install() {
+ java-pkg_newjar "target/${MY_P}.jar"
+ java-pkg_dolauncher "jtidy" --main org.w3c.tidy.Tidy
+
+ use doc && java-pkg_dojavadoc target/javadoc/
+ use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
new file mode 100644
index 000000000000..f127d7d4ec4a
--- /dev/null
+++ b/dev-python/zope-component/Manifest
@@ -0,0 +1 @@
+DIST zope.component-4.2.2.tar.gz 546598 SHA256 282c112b55dd8e3c869a3571f86767c150ab1284a9ace2bdec226c592acaf81a SHA512 4b000fcbd8425b84c67533e0a7d0e0c3a6703b7bc8590e640a38605601b4ad40bded891e58f20357e251a04e67e2cfc2c1771b4fe89353591556404d49853129 WHIRLPOOL d6ec37bacc2adfd614ff973ae58a9f1d262ab207b1938c8b361b02cd2a6cecf2d0d0e07fb7a9d628be3102db4a952f5aa13cb2b87164a1f99a8c5e98113ce456
diff --git a/dev-python/zope-component/metadata.xml b/dev-python/zope-component/metadata.xml
new file mode 100644
index 000000000000..3be1e82eb364
--- /dev/null
+++ b/dev-python/zope-component/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+ python
+
+ mrueg@gentoo.org
+ Manuel Rüger
+
+
diff --git a/dev-python/zope-component/zope-component-4.2.2.ebuild b/dev-python/zope-component/zope-component-4.2.2.ebuild
new file mode 100644
index 000000000000..5da95d8bcdff
--- /dev/null
+++ b/dev-python/zope-component/zope-component-4.2.2.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=(python{2_7,3_4,3_5})
+
+inherit distutils-r1
+MY_PN=zope.component
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope Component Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.component http://docs.zope.org/zope.component/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RDEPEND="dev-python/zope-event[${PYTHON_USEDEP}]
+ >=dev-python/zope-interface-4.1.0[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}] )
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+python_test() {
+ nosetests || die
+}
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
new file mode 100644
index 000000000000..5ec280c8363f
--- /dev/null
+++ b/dev-python/zope-event/Manifest
@@ -0,0 +1 @@
+DIST zope.event-4.0.3.tar.gz 390984 SHA256 f5fdf6ca5716f714023358b212f7f435539dea11771603cd90eebf3ad34405f1 SHA512 bc328bb588beea0cdf55d5f36ff5b269d7b75f399b6d595e1df6565bf1d1fbe2d65b63072db26d096a3fc2dfc0fcec747ea7cf8eabe3c4535084347cb149f1e7 WHIRLPOOL 58ce4490fa86c79b30edc3c96d8d9e912b5d692bffe9664a29d2a7963efb90bb6d03acbe0774eb03ac912acfe44cca1c126cc1a840538bd2abcb1848ec972b53
diff --git a/dev-python/zope-event/metadata.xml b/dev-python/zope-event/metadata.xml
new file mode 100644
index 000000000000..3be1e82eb364
--- /dev/null
+++ b/dev-python/zope-event/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+ python
+
+ mrueg@gentoo.org
+ Manuel Rüger
+
+
diff --git a/dev-python/zope-event/zope-event-4.0.3.ebuild b/dev-python/zope-event/zope-event-4.0.3.ebuild
new file mode 100644
index 000000000000..0277959a9b45
--- /dev/null
+++ b/dev-python/zope-event/zope-event-4.0.3.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=(python{2_7,3_4,3_5})
+
+inherit distutils-r1
+MY_PN=zope.event
+
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+ nosetests || die
+}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 3933ce1f33ae..bbd6e0ca3957 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -3,3 +3,4 @@ DIST facter-2.4.3.gem 245760 SHA256 3c1e49c32e6b07c1f802ec120e860f882938a5057c6f
DIST facter-2.4.4.gem 245760 SHA256 4f7b592f9b6bc6ad8a9789e3ca0953fae07e6d06b10a9cb7599eb1e71a03646b SHA512 9d485d147cf726cd4a2943d1ee3475d2593067953102c11487e2916d59464407016a074b6eb31af4da37a3914588937d827d2cf4c64196650baefa2fb097bb89 WHIRLPOOL 574afae52fc7ad3cf8619abcd89eee4ca38e5ecc903e316bfc18aef708fa32e8b3487f315605a21ac9faf0ba66989c8d108d77a9104f74f79fc5e953dd8ccdd7
DIST facter-3.0.2.tar.gz 508583 SHA256 2fee1ee938196790f24b7b876ff04a5d69c0ac1492ff6935b003ae23500eced7 SHA512 57a5c40d2ad07911a2b9c242b22bcffbbf8eedc88e12d7d6e8f6cf044ef30034cae7230468a7b414c93d6008d8805be1621a8c6b1af2543539d979bd3df7d1e8 WHIRLPOOL 6b89ca76ba7d993e1b87fe840b76dda9b1d8534df06f9f45e3c24752b95b441e471899446018f66bb6db0d490bb4a76cd4ab146a5060755333072ab5a5767bd3
DIST facter-3.1.2.tar.gz 603375 SHA256 9da41388127b7c02f9ac17945dad48332e62d663191bf51b2339c48222641c26 SHA512 f2435bb04d4ca51f65ce54134ff81e7fccb61df3f26ee890580f59b5eb65c6f7ca6db9fcd779baedca297a1456143741777cc9ba46b00e26c8b3965ab3db79e0 WHIRLPOOL e07c743a1025320c364800d3fece9e5d0b72e0f82ac648f459aaaeed44a46b187454ec4fdfcb532c87f6f62025632ebad5985356dbe056329e16eabd8eaec68c
+DIST facter-3.1.3.tar.gz 603386 SHA256 b27bfeade320331a02a68d3d2b41491d5cfcbb889292a8e9e1a11bd8641ff7d9 SHA512 dff5b1c312590d7fda140a72d87cabe70619d52887bbdd072c9dfd22062115433645b5762e14fd5fdb46f011dc3afeb17e2ffeb569423aac539030bb12f6c3af WHIRLPOOL a9ddbc1e75196d9a40fcb083c16abae8be1dfaa8c0f69e4af8ad9972884188aa572abf96137f34120b4ab5baf788fbddb3aa881eb4ffe085802cd6e7ce46d2b2
diff --git a/dev-ruby/facter/facter-3.1.3.ebuild b/dev-ruby/facter/facter-3.1.3.ebuild
new file mode 100644
index 000000000000..7e9cf4fde45c
--- /dev/null
+++ b/dev-ruby/facter/facter-3.1.3.ebuild
@@ -0,0 +1,65 @@
+# 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"
+
+inherit cmake-utils ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+SRC_URI="https://downloads.puppetlabs.com/facter/${P}.tar.gz"
+S="${S}/all/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug test"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+CDEPEND="
+ >=sys-devel/gcc-4.8:*
+ >=dev-libs/boost-1.54[nls]
+ >=dev-cpp/yaml-cpp-0.5.1
+ dev-libs/openssl:*
+ sys-apps/util-linux
+ app-emulation/virt-what
+ net-misc/curl"
+
+RDEPEND+=" ${CDEPEND}"
+DEPEND+=" test? ( ${CDEPEND} )"
+
+src_prepare() {
+ sed -i 's/\-Werror\ //g' "vendor/leatherman/cmake/cflags.cmake" || die
+ # Remove the code that installs facter.rb to the wrong directory.
+ sed -i 's/if(RUBY_VENDORDIR)/if(False)/g' lib/CMakeLists.txt || die
+ sed -i '/RUBY_VENDORDIR/d' lib/CMakeLists.txt || die
+ # make it support multilib
+ sed -i 's/\ lib)/\ lib${LIB_SUFFIX})/g' lib/CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_VERBOSE_MAKEFILE=ON
+ -DCMAKE_BUILD_TYPE=None
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc
+ -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+ -DUSE_JRUBY_SUPPORT=FALSE
+ )
+ if use debug; then
+ mycmakeargs+=(
+ -DCMAKE_BUILD_TYPE=Debug
+ )
+ fi
+ cmake-utils_src_configure
+}
+
+each_ruby_install() {
+ doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+ cmake-utils_src_install
+ ruby-ng_src_install
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index c2efb0f791dd..e4ee769c11f3 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,2 +1,3 @@
DIST jenkins-bin-1.625.2.war 63305884 SHA256 ea061e63dc2970d37d5eab13aefe93f7d983a94729a8e9a89576dfa3bfed01d4 SHA512 61370041af2ad0dc5140c59fba6163695c48fda2352b6d02b2366bb3b53b131d62f3c0d7be47b75eaa86ef000bff1021f3480f5719a069db7804a2b9042087ef WHIRLPOOL c3e02ac4076cdbd1af99f8ed0bec5dc973b282cc289c4bae8f885700354b6ae71f7c57c36ed515c92caf863f3d0982ef90e79c507da04a775cfdb90e530fe470
DIST jenkins-bin-1.638.war 63586592 SHA256 08d60e5f7db3cb4cb650a647dea60d4e1cb285a379bf3d3de0f62309854d7dcd SHA512 1ec10ffe2e89ead95213493b17c2f48e166734f369979cf6b758b096fadebb820ea0502e2e2fe5127e67c60dee1b93a2ea78487761710e598eac5b7620dc28b4 WHIRLPOOL a3a211adff1c7a35532c28aa2612ff1cabf9f06d229f71105fcde78e29b9eaa78662f032ab193f78570408e8a6986b742af731cb380fc73426f2060476831412
+DIST jenkins-bin-1.639.war 63602201 SHA256 96d16bd30172afda64c49a03447f89813fa5f0dad6a8ce98af4384d61b7ebdc4 SHA512 267e44167db09c5c724548e7b14ac49340a8b3c37da5b53569c977b234c0d3bf5627d2132ef9267e464acfb59ea30672baa5e5094d84ea9f18e0781c213daf32 WHIRLPOOL d971cb7c8b878cfb985df74198c749cc2d4fa65fac4e866585be541b850648d70966c591acd5b55ab51d71ad39c25b6b804124ac1385260dcfbe79f6410b407a
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.639.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.639.ebuild
new file mode 100644
index 000000000000..37fc08477727
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-1.639.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 user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+ media-libs/freetype
+ !dev-util/jenkins-bin:lts
+ >=virtual/jre-1.7.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+ enewgroup jenkins
+ enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+ keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+ insinto /opt/jenkins
+ newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+ newinitd "${FILESDIR}"/${PN}.init2 jenkins
+ newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+ systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+ fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 6457501c6b08..11630512e8f7 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -20,50 +20,6 @@ _EUTILS_ECLASS=1
inherit multilib toolchain-funcs
-if has "${EAPI:-0}" 0 1 2; then
-
-# @FUNCTION: epause
-# @USAGE: [seconds]
-# @DESCRIPTION:
-# Sleep for the specified number of seconds (default of 5 seconds). Useful when
-# printing a message the user should probably be reading and often used in
-# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
-# don't wait at all. Defined in EAPIs 0 1 and 2.
-epause() {
- [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
-}
-
-# @FUNCTION: ebeep
-# @USAGE: [number of beeps]
-# @DESCRIPTION:
-# Issue the specified number of beeps (default of 5 beeps). Useful when
-# printing a message the user should probably be reading and often used in
-# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
-# don't beep at all. Defined in EAPIs 0 1 and 2.
-ebeep() {
- local n
- if [[ -z ${EBEEP_IGNORE} ]] ; then
- for ((n=1 ; n <= ${1:-5} ; n++)) ; do
- echo -ne "\a"
- sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
- echo -ne "\a"
- sleep 1
- done
- fi
-}
-
-else
-
-ebeep() {
- ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at https://bugs.gentoo.org"
-}
-
-epause() {
- ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at https://bugs.gentoo.org"
-}
-
-fi
-
# @FUNCTION: eqawarn
# @USAGE: [message]
# @DESCRIPTION:
@@ -350,12 +306,6 @@ EPATCH_FORCE="no"
# List of patches not to apply. Note this is only file names,
# and not the full path. Globs accepted.
-# @VARIABLE: EPATCH_USER_SOURCE
-# @DESCRIPTION:
-# Location for user patches, see the epatch_user function.
-# Should be set by the user. Don't set this in ebuilds.
-: ${EPATCH_USER_SOURCE:=${PORTAGE_CONFIGROOT%/}/etc/portage/patches}
-
# @FUNCTION: epatch
# @USAGE: [options] [patches] [dirs of patches]
# @DESCRIPTION:
@@ -669,69 +619,6 @@ epatch() {
: # everything worked
}
-# @FUNCTION: epatch_user
-# @USAGE:
-# @DESCRIPTION:
-# Applies user-provided patches to the source tree. The patches are
-# taken from /etc/portage/patches//[:SLOT]/, where the first
-# of these three directories to exist will be the one to use, ignoring
-# any more general directories which might exist as well. They must end
-# in ".patch" to be applied.
-#
-# User patches are intended for quick testing of patches without ebuild
-# modifications, as well as for permanent customizations a user might
-# desire. Obviously, there can be no official support for arbitrarily
-# patched ebuilds. So whenever a build log in a bug report mentions that
-# user patches were applied, the user should be asked to reproduce the
-# problem without these.
-#
-# Not all ebuilds do call this function, so placing patches in the
-# stated directory might or might not work, depending on the package and
-# the eclasses it inherits and uses. It is safe to call the function
-# repeatedly, so it is always possible to add a call at the ebuild
-# level. The first call is the time when the patches will be
-# applied.
-#
-# Ideally, this function should be called after gentoo-specific patches
-# have been applied, so that their code can be modified as well, but
-# before calls to e.g. eautoreconf, as the user patches might affect
-# autotool input files as well.
-epatch_user() {
- [[ $# -ne 0 ]] && die "epatch_user takes no options"
-
- # Allow multiple calls to this function; ignore all but the first
- local applied="${T}/epatch_user.log"
- [[ -e ${applied} ]] && return 2
-
- # don't clobber any EPATCH vars that the parent might want
- local EPATCH_SOURCE check
- for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT}}; do
- EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CTARGET}/${check}
- [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CHOST}/${check}
- [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${check}
- if [[ -d ${EPATCH_SOURCE} ]] ; then
- EPATCH_SOURCE=${EPATCH_SOURCE} \
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
- epatch
- echo "${EPATCH_SOURCE}" > "${applied}"
- has epatch_user_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" epatch_user_death_notice"
- return 0
- fi
- done
- echo "none" > "${applied}"
- return 1
-}
-# @FUNCTION: epatch_user_death_notice
-# @INTERNAL
-# @DESCRIPTION:
-# Include an explicit notice in the die message itself that user patches were
-# applied to this build.
-epatch_user_death_notice() {
- ewarn "!!! User patches were applied to this build!"
-}
-
# @FUNCTION: emktemp
# @USAGE: [temp dir]
# @DESCRIPTION:
@@ -1519,25 +1406,6 @@ path_exists() {
esac
}
-# @FUNCTION: in_iuse
-# @USAGE:
-# @DESCRIPTION:
-# Determines whether the given flag is in IUSE. Strips IUSE default prefixes
-# as necessary.
-#
-# Note that this function should not be used in the global scope.
-if has "${EAPI:-0}" 0 1 2 3 4 5; then
- in_iuse() {
- debug-print-function ${FUNCNAME} "${@}"
- [[ ${#} -eq 1 ]] || die "Invalid args to ${FUNCNAME}()"
-
- local flag=${1}
- local liuse=( ${IUSE} )
-
- has "${flag}" "${liuse[@]#[+-]}"
- }
-fi
-
# @FUNCTION: use_if_iuse
# @USAGE:
# @DESCRIPTION:
@@ -1549,17 +1417,6 @@ use_if_iuse() {
use $1
}
-# @FUNCTION: usex
-# @USAGE: