Version bump. Switch to ruby:2.0 which is the newer version in profile defaults, until we are provided with better tools to handle Ruby.

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

3 files changed, 187 insertions, 12 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index aa96f798eeb0..fbc588f270af 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.252 2015/03/31 18:24:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.253 2015/04/04 17:54:43 mgorny Exp $
+
+*paludis-2.4.0 (04 Apr 2015)
+
+  04 Apr 2015; Michał Górny <mgorny@gentoo.org> +paludis-2.4.0.ebuild:
+  Version bump. Switch to ruby:2.0 which is the newer version in profile
+  defaults, until we are provided with better tools to handle Ruby.
 
   31 Mar 2015; Ulrich Müller <ulm@gentoo.org> paludis-1.2.0.ebuild,
   paludis-1.4.0.ebuild, paludis-1.4.2-r1.ebuild, paludis-2.0.0.ebuild,
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 12b5fda545a9..3dbc5ae221aa 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -12,25 +12,32 @@ DIST paludis-1.4.0.tar.bz2 1792579 SHA256 161c02b4328acc5cade6e37c69176ac227a695
 DIST paludis-1.4.2.tar.bz2 1791385 SHA256 ac342d908572e97968abcdd806ba9f390585a06f8da213b34374475972cb2611 SHA512 1176812683453e61897005612f525aad42b38063ff680e645ee840d63c3ffe866578f4c2756f85f7d8bea5be8ca70d3ad1713c0ea2de9e18a76135251126c109 WHIRLPOOL 72b7391b242cebd78883e43ad82d736825841de64a2e4675a7b43a751a51edd3da8acdf37888b5112f4c9aa22c0137502e519cb81b6a1085681a4d860dafcd1c
 DIST paludis-2.0.0.tar.bz2 1787616 SHA256 9e635d86e655658d31adde5813f5fcad2982b5fe8847c3c565eca7d28a1ec639 SHA512 e1df4d0617b4e021d1b63181517c0ecb9ece55669226c6ea0bba318b6899277c09a8d8ccc11ef673a3f27e77302c84702df4ae7568b44a87e0b138e346623728 WHIRLPOOL 90dcd765ebc864d14e569a01071fe3effae3c4424cf7f3004ce1f273c721c512697c6100e3b775d34732640bd770220fe5304f4d2b5e67f2de86c9f04c9ffe97
 DIST paludis-2.2.0.tar.bz2 1786405 SHA256 0b0bcb14a6539874d274c72e6a7b9825aa80fa083c2b61e1d5b14daf24829346 SHA512 9b4dd4613ec31683021d6fc5b5eb094024ceada47c41e09d1f0cb86f1de5b621869756401ba14ec0ec5f5dd20a5f8bf5b596c3891724bb9c245400b5fef4961f WHIRLPOOL 9cd602561b38e1bb6fc3d9baa5452c63a394c1e51faf299d8d1e82dad9a53969f14be542dac3f90974fcdf08c16c267cfdf45273c5244f378f9a2b7b6288bd97
+DIST paludis-2.4.0.tar.bz2 1787689 SHA256 f47b4bb5503dc127022453b15ca811dec22ee2f04c3c3b76ed1c5a83dbe1af1f SHA512 5fbb15d2285c892fdf19288b8838c51ec2439817a9abc685b8692ff4a3ddf76632d3ab51b2e0298c8eacf00f8b00f4e66b47b34db12844cd4eb77cbfb87ca32e WHIRLPOOL d9dc107886b8bf09bb203704d559dd030190b8390607964578c3f2e10a5c5cd4400146ffed894a968143761fc8149796d37597274b34b8414133b26c7252345b
 EBUILD paludis-1.2.0.ebuild 5063 SHA256 84c97c4dc19f00cc4f6245fa460c2300b51e0a8d37e8cf107a253260545e93e0 SHA512 667cb0c40bb44aa66a4c19bab710259ba987baa830c202376ac641ac1af6fd05adaea35859928dd51b12984f1476c82a3ed1b13b12b0d5fd11985f6aaddbe671 WHIRLPOOL 5c9918005de2f1bf0ebe92ec9eb07335df006ffe1c79e12132ae4df3bf6d419d066177eae6d4ce0ca642515d2bd923f48be84fee87e85b6c2b2fc875e86f28b7
 EBUILD paludis-1.4.0.ebuild 5063 SHA256 f14622530eaa401bdba20609165dd16007f5fc14e3c2f532203d4ae5b7243de4 SHA512 736c979ceef772305a7ada2d37a0471efee80df5eec77cd62bb785e48ff02e3746e2f223fb47ea6a59f36fc33d25575a50407d79a251a94edadf9db9e5b8cc1b WHIRLPOOL d48399be6a2df53e3bbf43212130634f20b016ca2133a1e0bdad9c80f116c11534076073df2ffad18f7c8abee0798c06ae2d0afed913604521907be5c12f945d
 EBUILD paludis-1.4.2-r1.ebuild 4087 SHA256 6bb38a3afec07eee19903e0bbdf935cbbf19000c8b08c7cf18315f1a2e60ff35 SHA512 e60b152ff6ee37a170d475efbc03edcdec0759cc0865ce2ed9b1cbd50bf292c76c7498332c93a9f32acecebe1ce60db264dacd95729c59036733e6142fa842e7 WHIRLPOOL df934f798bdfad190b8e625bfabd93849978d10c29526180e4ef14a858bff40e98367273c6525bb026113bbae28f6f680030a41b2c8a43edf7af0bf3bf4eae7b
 EBUILD paludis-2.0.0.ebuild 4110 SHA256 bf360166dc82ae8760bc4f3e8e523393e7a4a2909b0b7d8ea3be110e4192cbc6 SHA512 ad9699166be02ce6f02145eb114b1111b352fcc3f4f520e9c9eb4364abe94eaee5177c9bd6609e42b4d2486c4d0dd57a459426b610e2fc181b997b0d0bbfa1b1 WHIRLPOOL c0d6b84525d434ed5bc105078bdb4dc038cacc4008d6094f02c61f24aa774441ed3831d8e15fcdae1c4103be0817e4a2d49ab37f24ed4e4c66c7db692c07614c
 EBUILD paludis-2.2.0-r2.ebuild 4350 SHA256 caf30413e31b6ca0c8db62b26800b2e2eeec933a817c488fd88181232d82f76e SHA512 527642f28a78201f24e79bd885b14edbac658f0bb9acb14a180d57b10d49f224073a4ba957df5c594df141f92052bb0da27c227721745cc51f052154549be49e WHIRLPOOL cb3231234a6b35431207995b10ea8d70ec40c729722755dcf03db7b261835ba5a8a5377005f28aceeb5d257cf1744db74b7627358c6fb111d3b8a09207735ea1
 EBUILD paludis-2.2.0.ebuild 4037 SHA256 69a8a3408b1a44aaeb1807d560ee775b15e99448224accec35c2e06f6858cf92 SHA512 f23801d2851237fe12413c5ad8a2b747cbe48580c5846853d46b7cd849ad5cce772e9325a33fd42754179f3e4d2a8aa8386cbb93f5ebcc09b60a7de7192fe0af WHIRLPOOL e4e2562529168f46f99920849ab86b6e08195ea0ade02dc99697c25e8021134acb4e8997364f2e97b8b7e501936d6e5f0191beb039343813d87c49ac693e9cf2
-MISC ChangeLog 40091 SHA256 122ab66c33f6cc15000ec04c8e470bee11fe973dfe5938364e2153c0858cce06 SHA512 d7d943a53f02fb33fdc76d40029788ad002b6c8782c07fc88d9436ee497fa40e75f0cfe4972f5b54579c19850daa6717ae07e4ddba5744ceb3776ad0615551df WHIRLPOOL 2a4ac2155b5056a6bfc8f741ab4787f31173b63298f640e7102b5068979404badc0b2ca7efd3a9dd461e835097450ed02f9062ebd22ade3fed5b2cb0bcbc1658
+EBUILD paludis-2.4.0.ebuild 4162 SHA256 4d80166ce475fbb49e59df0e5f99207ea6e2adefee4c5a58aefc6e187f935662 SHA512 43005adffb921ba5071141ca480ce10bc120ef0eb74922bcdb4011d117ee7b37d8363460c3eb011baeedb71cab693f9b9ec851407846d7cac6f846404998c933 WHIRLPOOL fbbe8baa4b4517ed2b41cc09ef0ae6311a55376e5cfe4278fa0fc3431d7532a9bff88e77a449081dc564f8652c1b41a101fae893c41affc80019a7db43074dff
+MISC ChangeLog 40339 SHA256 0914605f283ceb4202acb17e1ba88701ded65c5c1d164f8809827228cbd0c7c9 SHA512 f5ac972df4946a6778fe65d2e78a8a8ac97d846bcdf0214aa1df3c69d02631158a16c03bc8f99cab95f4820b986eb78f00a63af4676ea0f21056dd265ed719cf WHIRLPOOL 472161cdbb0704fd25e1dba35f2a51c8c59d26af8ee46009388fd4000ab178e26e9c6264e9e5fa8fd1f1a8b1ba479bd1411a18baec6eb95b6733d1e99c23f077
 MISC metadata.xml 1141 SHA256 300482e42865640820375ce50549e529bcc15bf168c4595692be2413155c6a37 SHA512 26b475393d38f6833e404cbbb8c8c52e3e32c0015d60debf6cf5d2470407a18b83e28211f09b693cd6f9de0fc7141c08ec66adaeec99c34c7ba1496f58f2fbce WHIRLPOOL bf53292f6e023dbfa7c9707838c8aac45d957d9ca6b4bec12c0a8d6179edf84eb2792a45ea4ff61629c16c9139a76c76c58024041c4e0264e51d064094b616d9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJVGuZNAAoJEJQzkH1pP7W4XX4L/iMwDTfR1TMPVCA+w4oMZQZv
-ORGK5kKiKdjljEXKSx9/HmYj7fyaS+bCr6amJAX1QG6e2cJn28YekN/E1wAYXrtD
-sHlLnQIaSTt8iX7Fh+8T7NBwrJCUI7QRPfw626QX8VfdHNLz5eAu23QGj1O+Eibe
-lDqxj1scfHzz1chxAIExFf4UClq4SLUUXqZQKl1tgYHFOZiI1WnSraPlVmuRPc3X
-DfCrtKe9bc3tQ62iX64kylIYWCidNuMUPNeKA2aqG9lgCjGS4sK7WjxVcYesRv/z
-EsHR3ujXOa3A8TFByOlPN5BilvxjdVflgtsFKgngTez1j3imJvHkeYSA70E+rrqn
-TaHZJ0ugDfmGJTmHKnmEoIP3lhSv4IYTIeU2GCIRBsvkjd3HxYkWY/O1+yLcO1Ix
-Hsoycw6xq/NJ5tNKIhvIBCf5xK+OmKZ9+82kOfcbSKe4eGFPPzBAvGMBp9735IfL
-3ysig7jDT8nXP2DwytvjmFZzyrikY7yCLfa0dayULA==
-=kCEZ
+iQJ8BAEBCABmBQJVICVpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6KoP/1QZ1vHxRA+76ar9y5eqw+qE
+v2otOmsZ+dSkAreDaJ5dtG04QAPh94fsRjQ/RuK3pQeg71ZTcIraUX2fAzQPIaZ1
+Oc5woUvfLa4Ho1tIPccKfMfuaT3EvH1G4cLK4NDa1yZ03gga8XxYFGhcv02OzQWx
+ivJ8oIsvRk+nEpLQjcTBf4R5UoA8B2HP5WSPWQbNWpLqDB4FU3hpXfVyyOX03LdY
+jf8N4W4YtaNSYt0Hvvha7BXzXvZBiOLNYXwFo5m0eILrNXoAVnoHMsfArxomErZC
+isfFWLxQK3d3oWjOm8Md3hnaSUDyc3EpqHS0JgYrmcC91mQRl2R/Uf/zv/jtg490
+KvK4dPQ0Fuk97KzlHRZTxYT1ptpFAP7HnnreyOkV3zewT9UGKy8JCJTyBBAwMfzw
+jeuiDGw04OKL9PBigqLIphDCNZLEopSM1jUxZWrZgCD6xulm23SYZIuqE8WO1DDY
+f/wJvbrWN44l6Aklvl7dXvcSKktbNhwk/8m2WrTQu41h+gagsvwP5Arrz/zR3SZJ
+D2Xf18d+9ETFKNPQ6WxbT1Zy60YqvBN4HKR2m8nWxFWX0ETpKXtY+bd5Y6Y/5Aa1
+H1dz9kzAv9UdN/Ain24gMpwmjgM0AYRiL4J/UljHPRscXjCDoheNyhf/kfohnDcy
+LMI8hHYYXDMa6fUvlMAV
+=0H4u
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/paludis/paludis-2.4.0.ebuild b/sys-apps/paludis/paludis-2.4.0.ebuild
new file mode 100644
index 000000000000..061362982501
--- /dev/null
+++ b/sys-apps/paludis/paludis-2.4.0.ebuild
@@ -0,0 +1,162 @@
+# 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.4.0.ebuild,v 1.1 2015/04/04 17:54:43 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+# matching profile defaults for now
+RUBY_VER=2.0
+
+inherit autotools 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:${RUBY_VER} )
+	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[ruby_targets_ruby${RUBY_VER/./}] )
+	)
+	virtual/pkgconfig
+	test? ( >=dev-cpp/gtest-1.6.0-r1 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/sandbox"
+
+PDEPEND="app-eselect/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() {
+	# Fix the script shebang on Ruby scripts.
+	# https://bugs.gentoo.org/show_bug.cgi?id=439372#c2
+	sed -i -e "1s/ruby/&${RUBY_VER/./}/" 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)
+		--with-ruby-version="${RUBY_VER}"
+		$(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 -k 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
+}