EAPI bump, bug #543174.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 190 insertions, 3 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index d2232cedabd4..71af2e8d42e2 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/paludis
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.248 2014/10/09 10:29:11 jdhore Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.249 2015/03/21 12:31:39 mgorny Exp $
+
+*paludis-2.2.0-r1 (21 Mar 2015)
+
+  21 Mar 2015; Michał Górny <mgorny@gentoo.org> +paludis-2.2.0-r1.ebuild:
+  EAPI bump, bug #543174.
 
 *paludis-2.2.0 (09 Oct 2014)
 
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 8818d801526b..e39101a80f49 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX paludis-2.0.0-fix-format-security.patch 5556 SHA256 ebbb74a941370675edfca73f29e953773921267a8f618554384bd8b06648f2f3 SHA512 88684502ece678cc76415ad7355495bd060cadaeb8a1880fd848478eb68b9c8eef65e1a057e803da8ea5db133253e298182667c327a669bf23f3cca27d31e3c7 WHIRLPOOL 0711cc616e46c3394d521d61d2d508d2259c3816e1bff598a68a40b4feef8cfaa63a7b366bfde9969143692c88f46cbb7775c4c754ed3df2378cd0ad254c3a76
 DIST paludis-1.2.0.tar.bz2 1793681 SHA256 310c77163ea83c2ef43dba7c9a11daf894001b1a2d1f966612b22aa236de39f7 SHA512 53b1cb2dda4ae99659c2fd79a23c79659f9d1037a48dea01a3bcb6ebc3b2df0dba182f91eea2c5b1785e5bb463cf1846e5605064942aa91b2c95ff4e238e1c1f WHIRLPOOL 8114e9163edd830187f55df307c5b76c0f39f8eca2dd24f45b04b198f914d828703b045fb1efbde13a3d5b036782753a0fbf385587fa5cc61026aab9ae6e922b
 DIST paludis-1.4.0.tar.bz2 1792579 SHA256 161c02b4328acc5cade6e37c69176ac227a695b056a2942690f833c4b1f008b0 SHA512 9e9d8a00a20f79b6a7220ddc47c924114c07814ed6cc3e1c3ec7736b17378b6e8a3aa03adaf060dcb97aca01ea9b832b082336e1e67725ef9def68da3cfc3e15 WHIRLPOOL 4fd41cc3b15ebc7ea05b87408053e27fbdf1fb7ddc6a0a1ee882faeb281281a7206f9ee98603860e0bb2a6924af6b8c0954241e702262509757a9b140eeded6f
@@ -8,6 +11,26 @@ EBUILD paludis-1.2.0.ebuild 5064 SHA256 0045021df32d2f5f7b6585337fa1059547d1c454
 EBUILD paludis-1.4.0.ebuild 5064 SHA256 c5dec16232126d5d8aeccb744f099db9fd1a391f636a85194b2a6bde5cd565e3 SHA512 492d4ce94977383e35684727a589fd3cdf12cd0c6b34e33a2aa3faea2440e95c661391c6c8103d439f478f27cde2d8f16d7bf8b5564890c6de552e00eabbab81 WHIRLPOOL 87f046c68465995e3939affc795132e9b04e833443196c0480b3ce127fe05e44affb91a1af3ae7346ec54f0f1625607001b4759a07c053064c89d904828d6f82
 EBUILD paludis-1.4.2-r1.ebuild 4088 SHA256 6148cbe68a0550e950c1ffd782893d1cf62d201d27ff55b653ead7753ba25eb6 SHA512 320a4e284d907dbd905f85587455a734e538a303343b2918038b02befe3d299af1345699765259c90662b3b3890fb3fc383ca5ab5e6b869ea2d7324a1a690be5 WHIRLPOOL 81e12491803a98d4079980f350d44541f44a53564cabe418034a2f66945db4a872ef16aa2a383ca6121d54928e7e444f75d51c4f871c241728ba5f10519064fa
 EBUILD paludis-2.0.0.ebuild 4111 SHA256 820623f08617defc485f4a185b1c04b608ef5abf5c59560ac8284ca4185d4528 SHA512 1cb2d92f05e4c406a1e354804eb7865d17442d3154b7c23544cb7a10ff9d42340d060ab6638832c6f78091058fde9d0714434c35b5fe547509434eb20af11660 WHIRLPOOL 7b0c4c37e55736049a59d5d30be73deb20c394858e8fe0608eb46e99ed5be17c7b2aa1cc1df6173e5d658a9eeb725c8429538c32d634c6271d01076625ca4219
+EBUILD paludis-2.2.0-r1.ebuild 4035 SHA256 24861598d060a557e7a245fd0f120321ddb8838b02baa08e7d8eb205fd28e394 SHA512 76a0b6c1b81e96a265bb8a903640939a7c862645ad737233ed512206c6eb9b8ba48fa6bcfa0da1d7ef8e5318fe9a50b486a9547bfdcd07bb522ad3bb15a65203 WHIRLPOOL bac4dd133c9001d106189582b19165cd85e441d33672cd4a7de1001b8dde170135959c9455713e7e41cfa1b0ba244fa8ea2506c609ad4d6b892442973fe6e048
 EBUILD paludis-2.2.0.ebuild 4038 SHA256 598cc3889f9108fd9c0553cfd7717b8e11f0a6b45db242d88fd2e20b399c391f SHA512 fce9dd1856850e0eaf5d406576bd2a993828aabc72afcd0fee72f68f92dc86a9c6364abaf9cda7f1c5ca63231b0edf8dce4d7a7e806b0b82ba0fc1a8e1e1afb8 WHIRLPOOL b951226d1a65d8a58da815eeabccdada4c8554b5cd0bf532368e35727ed36affc4e91696549ed39384178e138b5f0fde55a367504c072af015a1956ae97769d6
-MISC ChangeLog 39106 SHA256 aa3349fb6224338d5c2f0b5de89d881bdec2dc8cc738f4edcf0272793a43d993 SHA512 f4dfd70d6c48711887855a0c4da8ae46f187a1abc4ead0cbd4a790402158993a592d02cce709eb3cc27f80a883b79564f081d2d4996f52271d5114413a84ebef WHIRLPOOL cc2e7abb5a444d8db2fc8576ff6af8dbf67a3b5f4e1f0f9f6e51d569fea74c70c7de857c0afe67378c70cd3633722b90bd8d47beae159e4a39eb01f3e0c9adf0
+MISC ChangeLog 39242 SHA256 44ef417f82a308d72029d1eb4bcd84136cfdbb2ff7e4e5fb3fc2d94859060419 SHA512 04d9a5bca7adad7321a4b0be58af7a24512de63af369c52c7ecbfcd23c6159275d16faa1fc0ade076d641a7cc70df1675a42de6b1e8725f5b16ccadb1b30f989 WHIRLPOOL a4550c2f5190799ea3082f67a93c75660cb4dc7c67042bd8e5b8d982aae04afa527d2d167750f06b0fe8eb7e32bf0ec449ecb25aa925f575c48b7832f9d618af
 MISC metadata.xml 1141 SHA256 300482e42865640820375ce50549e529bcc15bf168c4595692be2413155c6a37 SHA512 26b475393d38f6833e404cbbb8c8c52e3e32c0015d60debf6cf5d2470407a18b83e28211f09b693cd6f9de0fc7141c08ec66adaeec99c34c7ba1496f58f2fbce WHIRLPOOL bf53292f6e023dbfa7c9707838c8aac45d957d9ca6b4bec12c0a8d6179edf84eb2792a45ea4ff61629c16c9139a76c76c58024041c4e0264e51d064094b616d9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJVDWS0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOWJoP/1ShzSR8crid/YhaTYKeQoIY
+4UTrRMliF45vMAfsJQBKQrU088MB0/MA0WvCMtAlhKWeFZqJkfxxakLrcch2B9k6
+2Y5/0av6yCFfqHGKDHCo/AwPDGWylij+CEaUAMHYNbim6njB3MKZ7uMgomRUHqg1
+2XFf6HdpRHPzuwplIh8GUb9fEr4sG6N5gnoO9fKEo95ydAYX5HIK6NIq34QnFwhj
+S0Vyidsump3qgA66E960P6l/WdQEKk35TWlqN6WoUVX1JCX7yJEI0Xn6ES33/5eI
+WdbmlFdz73zOvtGdIH0F0piue5kQ7iNpsJb1cH20HYS1UXT1VcFEN4kckPjSCW5A
+xoWmCCydFbZ+rnsP7AbQB63UpHUVYsKxZjnR6XkvguOz5IQgdj9mIECwOpAp5hmh
+x5wF2GMRdUVB5f4Kn5ZrOr9Ja1L2zyE8g+JEkzOc84v2BWKnHV8cIkZShXo9+nSK
+S+A5NtPWKnDwygePuEMDSnnOViLmCHCGy3Cw/EWK4E4ECgmbs7rK2lJL9ndZ+IDX
+U8M9SBFl9sRV8npzrZA9G598GpCMWi+Il6hujAP6oaNjwYveV1XArSqEPAtCSRv5
+PWv23+31/PqKpackJYQKiIawY98yIBwpkF4X/vw6ybU8iE+Nu3RDoL6MQu+UvicN
+SppYFKzzTrdStcfFARZv
+=NWOP
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/paludis/paludis-2.2.0-r1.ebuild b/sys-apps/paludis/paludis-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..5ab12f1c9065
--- /dev/null
+++ b/sys-apps/paludis/paludis-2.2.0-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-2.2.0-r1.ebuild,v 1.1 2015/03/21 12:31:39 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 eutils python-single-r1 user
+
+DESCRIPTION="paludis, the other package mangler"
+HOMEPAGE="http://paludis.exherbo.org/"
+SRC_URI="http://paludis.exherbo.org/download/${P}.tar.bz2"
+
+IUSE="doc pbins pink python ruby search-index test xml"
+LICENSE="GPL-2 vim"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=app-admin/eselect-1.2.13
+	>=app-shells/bash-3.2
+	dev-libs/libpcre[cxx]
+	sys-apps/file
+	pbins? ( >=app-arch/libarchive-3.1.2 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/boost-1.41.0[python,${PYTHON_USEDEP}] )
+	ruby? ( dev-lang/ruby:1.9 )
+	search-index? ( >=dev-db/sqlite-3 )
+	xml? ( >=dev-libs/libxml2-2.6 )"
+
+DEPEND="${COMMON_DEPEND}
+	>=app-text/asciidoc-8.6.3
+	app-text/htmltidy
+	app-text/xmlto
+	>=sys-devel/gcc-4.7
+	doc? (
+		|| (
+			>=app-doc/doxygen-1.5.3
+			<=app-doc/doxygen-1.5.1 )
+		python? (
+		dev-python/sphinx[${PYTHON_USEDEP}] )
+		ruby? ( dev-ruby/syntax )
+	)
+	virtual/pkgconfig
+	test? ( >=dev-cpp/gtest-1.6.0-r1 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/sandbox"
+
+PDEPEND="app-admin/eselect-package-manager"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if id paludisbuild >/dev/null 2>/dev/null ; then
+			if ! groups paludisbuild | grep --quiet '\<tty\>' ; then
+				eerror "The 'paludisbuild' user is now expected to be a member of the"
+				eerror "'tty' group. You should add the user to this group before"
+				eerror "upgrading Paludis."
+				die "Please add paludisbuild to tty group"
+			fi
+		fi
+	fi
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if [[ $(gcc-major-version) -lt 4
+			|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ) ]]
+		then
+			eerror "Paludis requires at least gcc 4.7 to build. Please switch the active"
+			eerror "gcc version using gcc-config."
+			die "Paludis requires at least gcc 4.7"
+		fi
+	fi
+}
+
+pkg_setup() {
+	enewgroup "paludisbuild"
+	enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# The package explicitly wants ruby1.9, so fix the script on it.
+	# https://bugs.gentoo.org/show_bug.cgi?id=439372#c2
+	sed -i -e '1s/ruby/&19/' ruby/demos/*.rb || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=(
+		--htmldir=/usr/share/doc/${PF}/html
+
+		$(use_enable doc doxygen)
+		$(use_enable test gtest)
+		$(use_enable pbins)
+		$(use_enable pink)
+		$(use_enable python)
+		$(use python && use_enable doc python-doc)
+		$(use_enable ruby)
+		$(use ruby && use_enable doc ruby-doc)
+		$(use_enable search-index)
+		$(use_enable xml)
+
+		--enable-vim
+		--with-config-framework=eselect
+		--with-environments=default,portage
+		--with-vim-install-dir=/usr/share/vim/vimfiles
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	dobashcomp bash-completion/cave
+
+	insinto /usr/share/zsh/site-functions
+	doins zsh-completion/_cave
+}
+
+src_test() {
+	# Work around Portage bugs
+	local -x PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
+	local -x BASH_ENV=/dev/null
+
+	if [[ ${EUID} == 0 ]] ; then
+		# hate
+		local -x PALUDIS_REDUCED_UID=0
+		local -x PALUDIS_REDUCED_GID=0
+	fi
+
+	if ! nonfatal emake check ; then
+		eerror "Tests failed. Looking for files for you to add to your bug report..."
+		find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
+			eerror "    $a"
+		done
+		die "Make check failed"
+	fi
+}
+
+pkg_postinst() {
+	local pm
+	if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
+		pm=$( source "${ROOT}"/etc/env.d/50package-manager ; echo "${PACKAGE_MANAGER}" )
+	fi
+
+	if [[ ${pm} != paludis ]] ; then
+		elog "If you are using paludis or cave as your primary package manager,"
+		elog "you should consider running:"
+		elog "    eselect package-manager set paludis"
+	fi
+}