Version bump, brings modern boost support and test suite fixes. Use new EAPI and new eclasses. Clean up bash syntax, reduce needless USE flags and use prebuilt documentation unconditionally.

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

4 files changed, 190 insertions, 14 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 4f45ebfcaee6..d0cd62484d05 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.235 2013/05/19 18:33:14 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.236 2013/10/20 07:10:02 mgorny Exp $
+
+*paludis-1.4.2 (20 Oct 2013)
+
+  20 Oct 2013; Michał Górny <mgorny@gentoo.org> +paludis-1.4.2.ebuild,
+  metadata.xml:
+  Version bump, brings modern boost support and test suite fixes. Use new EAPI
+  and new eclasses. Clean up bash syntax, reduce needless USE flags and use
+  prebuilt documentation unconditionally.
 
   19 May 2013; Jeff Horelick <jdhore@gentoo.org> paludis-1.4.0.ebuild:
   Require >=app-arch/libarchive-3.1.2 as it's the only version currently in the
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 8599963a56ce..098aab7d2b2f 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,20 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 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
+DIST paludis-1.4.2.tar.bz2 1791385 SHA256 ac342d908572e97968abcdd806ba9f390585a06f8da213b34374475972cb2611 SHA512 1176812683453e61897005612f525aad42b38063ff680e645ee840d63c3ffe866578f4c2756f85f7d8bea5be8ca70d3ad1713c0ea2de9e18a76135251126c109 WHIRLPOOL 72b7391b242cebd78883e43ad82d736825841de64a2e4675a7b43a751a51edd3da8acdf37888b5112f4c9aa22c0137502e519cb81b6a1085681a4d860dafcd1c
 EBUILD paludis-1.2.0.ebuild 5064 SHA256 0045021df32d2f5f7b6585337fa1059547d1c454aa362b186af9dc192a377b0a SHA512 5edff1135de15d330c9e59593031216c4a9dbc843503141058d549b4692309fdd7d33699abf81d67b6892a1226e2af8e030da8da173bcb1d75e59edeac560ff4 WHIRLPOOL c7e1b9beec4874aa31c11e5bd57709254020000d1e6383d1c44415c57468418fa1c0b5c49312c6eeddecafb07c807a62757d0e9c86952c4e5ff89fd1fa2e0771
 EBUILD paludis-1.4.0.ebuild 5064 SHA256 c5dec16232126d5d8aeccb744f099db9fd1a391f636a85194b2a6bde5cd565e3 SHA512 492d4ce94977383e35684727a589fd3cdf12cd0c6b34e33a2aa3faea2440e95c661391c6c8103d439f478f27cde2d8f16d7bf8b5564890c6de552e00eabbab81 WHIRLPOOL 87f046c68465995e3939affc795132e9b04e833443196c0480b3ce127fe05e44affb91a1af3ae7346ec54f0f1625607001b4759a07c053064c89d904828d6f82
-MISC ChangeLog 36947 SHA256 2106ee3f7a3a9522bad1c8835a7329b7a6311bbe0a8b98f61782203d9cb4f02d SHA512 3488d236499d0cbb4a7fb05e4a9ad7621a06f8851d509b57cca4fa02e02c78cda4972c6610ab3e9abbbeebb6aef51a2fdfa6dae17b6d507316301d9d416d1433 WHIRLPOOL 79309260f867623be7d8750945f1e9fcee21ddfcf517cb6ea1ca1a867e501d711171be570486cb0a11bc06d7fb9d7b730bd8bb7dc81fcb5ecb18b9714d934d3c
-MISC metadata.xml 1039 SHA256 9e47d2b2f235d4fe429a0a17da165373892a94de4d812c92bb4efe840533b740 SHA512 3be4366060f1958481c6065d4f8c23f13b2fda2ff3664bd952942df8c5119bcae0046b5a42056096c7dfbc92a162f696e5dd0124edf4bfdef59506e5809f0468 WHIRLPOOL 95ea70041da461dd05cabb69ed30d454a35d25d39157d1c8df06ffa25f071e69809b6a68fbe2821510215989f2b528911d33b1834aa458a4f246e2eb0ec87689
+EBUILD paludis-1.4.2.ebuild 4003 SHA256 9409af7dfdfca89d2dbf6205d3813baee60b8c8ea54a941a784fb478d3184c48 SHA512 bb86874b171817509133f23dcfd553368914eac7b026dd42cade02802527279fc4b8cf7e1a12fa25d03918f987ed6f107d47ec7e7265e580e2750952a23dfef8 WHIRLPOOL e43b588acad5cb5f3149e7335f549bf70d4e97f3a7fb170ddc4c187c13accbc55706ea2bec44b23ed6b0d07db3500e88f82f21f04078e914c3966f58ecd81f04
+MISC ChangeLog 37264 SHA256 5bc62f265a3a2b803b7db7674e4c4252c2fa3781fcf9a8ca976614b6a29df2bd SHA512 3a00b49656c85265777b88746bf97d0511d873a8198ca1df600758904c1550d47fb0d18e3002685eb3d7260ecebb69c3f4257c1423a3d126ec7d184afe8e414c WHIRLPOOL 802f796f0a54a3dc1821d10f979ac87afc9320cae07d2285c87b674f386c032a47099ca5602d6b0116e70f6f75a95768512b51347ad51e2a79d0f080594a608f
+MISC metadata.xml 1141 SHA256 300482e42865640820375ce50549e529bcc15bf168c4595692be2413155c6a37 SHA512 26b475393d38f6833e404cbbb8c8c52e3e32c0015d60debf6cf5d2470407a18b83e28211f09b693cd6f9de0fc7141c08ec66adaeec99c34c7ba1496f58f2fbce WHIRLPOOL bf53292f6e023dbfa7c9707838c8aac45d957d9ca6b4bec12c0a8d6179edf84eb2792a45ea4ff61629c16c9139a76c76c58024041c4e0264e51d064094b616d9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCgAGBQJRmRrsAAoJEPUd7O0j6ekAFK8IAJBVHtvI/nkBjqqrq1djYl0s
-JFiIMcMRvTGCvpOiTIdMQqeHS00PDD3iSu92KEMybM9jXmMunvl8wjdYJsvzCE9c
-IaTqVIikgSruIRQjMSjZCqwVpivMinUIumVfFQ9OUVb3KXqrb/GZhpjylQ9OkDWt
-0/9uxzcjLqYABZt5V9qENcE3FJrSUGx/KeZiHF7ySsM1d4L9CcXUOlljAz5h4e4V
-fiSaRQpYv/UK31C5NehJP4+hDyFLfVjlOLbpiCCh+b2c7Hplc1E6bFGxCasCUL9+
-qKJRzUFfx+LAcWNHf3FJU1t4maN9iXtBJObKqYTvi/7865pReRyG5qbjHXKbsak=
-=jn96
+iQJ8BAEBCABmBQJSY4HfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOfxsQANsYXHUaYfw9+KIgPz6utKVa
+EsZJrtY32/SM3HL+PLYLl/lf+11+IoU/hsrL1oZqSEEsMEpvBbFZgRUGvraFmFXt
+z7WO+hauWHcJGRpGUfDsuRF5KazPE6Mg49KVB9n4W3M69cmN1y53tAvzPajMB7aD
+lKf2uBgqjCexXpEYLLlBk+qAQwkTLjFR67r3IRviYNW6wApPSAWMfQx86EjRPdij
+O5hzmfgKUCduGm31pfsx/kxaxYhNzupkLTuW4ylWfhyg3foMg8jCBjAWlbxNS4+m
+uHd9jiRRZVasBnKK485fw5b4V3HXYKVXXu5pczrdU7O9RHlJ3fROIeMVaE+H5Vx8
+EdKcDnqqKIb/mUtih5r+/Yhp8A11H4hWSRblO4Zi8kFgPbikRFrBhmW02zax3ySn
+Sr+Ryaw90XF8OBhMUsgpElqlgnrzQKYLaUjJ4t7ehf9tM5UvtPaZv41N7+qzN4Cb
+UXUZhCzaQ3G8xPjAOpiJCOQlO5Ycxbqzz8aeiuhl5YRKg/5Da/WG1+pl0WPBiCX9
+Nqh09LFsRpi0mF1+xlZPfauVs5YuDI1RNc1W5nj9xVvLo7q1uCV+lLegq/K9EoE7
+yRqKs2TtN//ocVO67rnU3Cx7p9LRmOJtoqnk4cEm/8EiCsMAOg8izOenhcqUpidv
+vlrMjdDTVqp22QUeWi3w
+=b5/D
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/paludis/metadata.xml b/sys-apps/paludis/metadata.xml
index 97208ce51f06..2c871a1e5587 100644
--- a/sys-apps/paludis/metadata.xml
+++ b/sys-apps/paludis/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-	  <email>jdhore@gentoo.org</email>
-	  <name>Jeff Horelick</name>
+    <email>jdhore@gentoo.org</email>
+    <name>Jeff Horelick</name>
+  </maintainer>
+  <maintainer>
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
   </maintainer>
   <use>
     <flag name="pbins">Enable binary package support. Adds dependency upon
diff --git a/sys-apps/paludis/paludis-1.4.2.ebuild b/sys-apps/paludis/paludis-1.4.2.ebuild
new file mode 100644
index 000000000000..e93013f17b0a
--- /dev/null
+++ b/sys-apps/paludis/paludis-1.4.2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-1.4.2.ebuild,v 1.1 2013/10/20 07:10:02 mgorny Exp $
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_6,2_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
+	>=sys-devel/gcc-4.4
+	dev-libs/libpcre[cxx]
+	sys-apps/file
+	pbins? ( >=app-arch/libarchive-3.1.2[xattr] )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/boost-1.41.0[python,${PYTHON_USEDEP}] )
+	ruby? ( >=dev-lang/ruby-1.8 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	search-index? ( >=dev-db/sqlite-3 )"
+
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		|| ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
+		media-gfx/imagemagick
+		python? (
+			dev-python/epydoc[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}] )
+		ruby? ( dev-ruby/syntax )
+	)
+	virtual/pkgconfig
+	test? ( >=dev-cpp/gtest-1.6.0-r1 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/sandbox"
+
+# Keep syntax as a PDEPEND. It avoids issues when Paludis is used as the
+# default virtual/portage provider.
+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 4 ) ]]
+		then
+			eerror "Paludis requires at least gcc 4.4 to build. Please switch the active"
+			eerror "gcc version using gcc-config."
+			die "Paludis requires at least gcc 4.4"
+		fi
+	fi
+}
+
+pkg_setup() {
+	enewgroup "paludisbuild"
+	enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
+
+	python-single-r1_pkg_setup
+}
+
+csep() {
+	local IFS=,
+	echo "${*}"
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc doxygen)
+		$(use_enable pbins)
+		$(use_enable pink)
+		$(use_enable ruby)
+		$(use ruby && use_enable doc ruby-doc)
+		$(use_enable python)
+		$(use python && use_enable doc python-doc)
+		$(use_enable xml)
+		$(use_enable search-index)
+		$(use_enable test gtest)
+		--enable-prebuilt-documentation
+		--enable-vim
+		--enable-visibility
+		--with-config-framework=eselect
+		--with-environments=default,portage
+		--with-vim-install-dir=/usr/share/vim/vimfiles
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+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
+}