Add a live ebuild, remove unnecessary inherit from -2.4.0.

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

4 files changed, 199 insertions, 5 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 7186c0e61be8..48e80f16e475 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.256 2015/07/21 21:25:11 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.257 2015/08/07 11:19:59 mgorny Exp $
+
+*paludis-9999 (07 Aug 2015)
+
+  07 Aug 2015; Michał Górny <mgorny@gentoo.org> +paludis-9999.ebuild,
+  paludis-2.4.0.ebuild:
+  Add a live ebuild, remove unnecessary inherit from -2.4.0.
 
   21 Jul 2015; Manuel Rüger <mrueg@gentoo.org> metadata.xml:
   Drop unused metadata useflag descriptions.
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 719983771869..c1d09eb47106 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
 AUX paludis-2.2.0-check-IUSE_EFFECTIVE-in-EAPI-5.patch 3042 SHA256 929dfad378dd5f614b73b676aa0c325d5cc5e252dbbff787e97b7d5ff599b1b8 SHA512 415140a1ab74ec1dbd85405886eac7e037ee56ddb250e6e9d4a50749fd40b4f38e0387728b3db9703f8fdfd2f07e3c0728b5e07b1d4d93ca2f93da78314bd622 WHIRLPOOL e2167b2f05adeceab5ea6a23936c0900918604350bafb6549866de2117f2d30baa1cf9011ad1abaf1b4231381f786af17caf39c0a06ce19761be3fa310eccece
 AUX paludis-2.2.0-filter-EBUILD_PHASE_FUNC.patch 1074 SHA256 8b2d0aa55aa7cc946b9f6bc91fb67f02e10796d32ba8a54aa2609bcc565d663e SHA512 09c5f073976a83e67bf68f76e868c8f77b7975353dc9dc200d43551965dc70eaeca3aff13bc351c3a2b1ccb534e2bb4f3182759acdab9c32c1b8872949b23d0f WHIRLPOOL 27212e592a51ebe31606f93d0955ee9f9657fc70ae9d4ec005a2ee873bed34fef00cc82307db98bbb29cfd86789a24c192431b1c0dcfcfe9a17e0541fe5f7757
@@ -12,6 +15,26 @@ EBUILD paludis-1.4.2-r1.ebuild 4084 SHA256 de76b9305d66d1ac5c76c357baf540b1e1bda
 EBUILD paludis-2.0.0.ebuild 4107 SHA256 b043f011ee28a9875988f87babfc0062082b7393603ce1c6417c8fb5346d72d3 SHA512 14555a51063085b638cc88797490007b0df4f48e1b75790eb69dc6170f24a90a311ecd5ae8926929ee78206aa0b523910318d9941021fac6bc00af47541971e0 WHIRLPOOL d998ab01daa45ac38c95e4f071628abe0b7517437633a77e804115f72db2a9104d0e2e95409446537acc0b370ca02c05304c153f09d130d971b14395aec50013
 EBUILD paludis-2.2.0-r2.ebuild 4350 SHA256 caf30413e31b6ca0c8db62b26800b2e2eeec933a817c488fd88181232d82f76e SHA512 527642f28a78201f24e79bd885b14edbac658f0bb9acb14a180d57b10d49f224073a4ba957df5c594df141f92052bb0da27c227721745cc51f052154549be49e WHIRLPOOL cb3231234a6b35431207995b10ea8d70ec40c729722755dcf03db7b261835ba5a8a5377005f28aceeb5d257cf1744db74b7627358c6fb111d3b8a09207735ea1
 EBUILD paludis-2.2.0.ebuild 4034 SHA256 893ebc6109ac0276af78108f0005be62619c9c41281e4d240efb1e81c5060489 SHA512 5efca51ea2c35c31184307bc56d7a30bf4ebcbef179a265ec6495076aa72c414ae7e82a2d547b4dbcdd91027092d55b773ad955f925f74c9bfaedcdaa5dfc9b5 WHIRLPOOL 29148339a6c3e729aad1e3948cd368b4fe9d1a206ff3e837a5ecbdf30f3f8562eb3c0085614d2f06a3233fb188babb33cfe61ee2544033b22a79e4341c06f91d
-EBUILD paludis-2.4.0.ebuild 4162 SHA256 4d80166ce475fbb49e59df0e5f99207ea6e2adefee4c5a58aefc6e187f935662 SHA512 43005adffb921ba5071141ca480ce10bc120ef0eb74922bcdb4011d117ee7b37d8363460c3eb011baeedb71cab693f9b9ec851407846d7cac6f846404998c933 WHIRLPOOL fbbe8baa4b4517ed2b41cc09ef0ae6311a55376e5cfe4278fa0fc3431d7532a9bff88e77a449081dc564f8652c1b41a101fae893c41affc80019a7db43074dff
-MISC ChangeLog 40713 SHA256 6e34cfdf99ea49b6308ee23703f7c20ef3269c64bd958a934b303dc0651e7e1f SHA512 f41ebe71ac8e49e60cf39b0be4f66130125a70383427e509560b9a1533ed053fe09a1a13c36f13417f81481274870e7397a4ab53fe49508a01635914e1f1268a WHIRLPOOL 1e7aaffc38c13d6c630ec793376ee3826620f469b030c8ddd93521a3f669aa681a1efd4fc1a724c08a21f5284ffdcdb4c89e2384b761a89bfbfd67ebae732a67
+EBUILD paludis-2.4.0.ebuild 4152 SHA256 887055fe46332bdef811248b47292069cdb13d4b541591229850947e5c46e5c9 SHA512 8a63b3fb0071e9b3367696e86744d6eaada4f01952d0d61c8f1e86729d3fcd76d6039fa652f88a6a710a299bf55141ae919c08bee53260115d3dd27bd940a912 WHIRLPOOL a3502cf0502a1c768fe00b2cfd960bd35560e60916a0a0b5dcc5350f3215d22ed937c29e5d4b8eed62dba1b0d579f37ff34ca28f96d9b161f0a22a1a58de91f7
+EBUILD paludis-9999.ebuild 4164 SHA256 32bd815bace0a63d05f57e38946276be1f5e40338c34f7ed6e847f126020ccd3 SHA512 bc243bb6f6de3705b90b26153336892b10f8f7258fe89c2f0b59c4bbbfd9dc09e77bdb155959ef977fe8d8b7999465462cd0d1b7fd8afc232c26f2120995376f WHIRLPOOL 575ddb148ca517252fd25d4718c75886cbd4deb833d06bce470e907f4a9fda2ffeb238b8b6afdf842e04ed5dafb80c3c0985c5a8df7979745aec6886dacda522
+MISC ChangeLog 40901 SHA256 53512c036950cc0304a1714a2a7b116940c4b14057137058e1ba778d0152e98f SHA512 d7e9b4646d3d450bfa8e74690b55cb8f56c1aa4a62d9fe1f3add02819955de39d563cf7878f09b54bce5d188f2cb41e83dd6839cf91205aebbd3322c3e09ae7b WHIRLPOOL 2ebd68e3f12f72b448dc5c71d2fb3529df4e1d7af81bad24844ae5010028340eff8686861d3b61a5f5cd396d157effe6b02832213e776c1efabde3f91ee6423b
 MISC metadata.xml 637 SHA256 c071c65b5320ddab3c5d2e71d0c5f6de8f3f3aeb9b012732d99d0f9ab319c1bf SHA512 da45fa862aac8e3ff9cc9f8960624828bedcad3721f165734d0ae1c9b2460ebe9d8af53aed831d32c9d60b911a7a37239724b023d976070d9977025c9ae2fea4 WHIRLPOOL 05db6a71b11bd446fb6e21b84d89b6624d0e05a21f110e84cd766f79f8f48382e11a272cf8c0dd21e5ee1a4b3995fdbd298f095277cd30d90af3caf9f6ad53ce
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJVxJRhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOk9AP/0fkslSqVScMQmJv+fkSrIob
+4QDQw5lVnrpkAwIWOWNrOnfE6QsxtuyfUl73kL1HR0EmItofKeo6siQgZeWgQfnw
+gQBlCtY8sERWJ+3C8BlvmF2ojyGe0KpI1R7n3rpwyOB4u1kh8VDCNavvj6aqutZa
+Ke+cR24GoqlOHri2Xi9sYx1/Kc7Eiw5IzauK9i+Pmdn/O0V/tFwhUjVzTW8fQ4at
+XsyfhtXP8XaJ+fhpAwpF6H5lVTRShd+ncCQZKaApGBk+11Flb93GYcrQYYNLnCKj
+7GJmom8m0DXLG0zz1NHUQMCUlcFxF02ybs9ZtB8xto8RxQkS7JI/Ni+ooTplWkss
+rJqeoIXjRVZjJVKsrOQJ1g0wlLOpwdA8NURVewUTAlm196WKxLxTeYKaandgDen8
+PHZDJn8ulnlJoi2vFQrKe7yjXlsK+H/af1UFc9zclp/ek62pWc0mf5zZIz719RNU
+/HDQN8wafokc29+9DiuzY5Iih+yxt5rYaz4jiUvMnDyvVjFcNxmfxL4NmsJ1aPCb
+xNo2uBii1IbPwcFOPa/0ar3+s2H1ELsDigxSCZLmIdi4Yc94+/EGZxpUEjlfTr+3
+s0i5IT+RQPABgTCZcrZFVY93TDNgYmwHZst/4diKqGPP06n3NAa9JdzAogX2UrTq
+ekYQnm3RP3GanD7i7owM
+=Gu34
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/paludis/paludis-2.4.0.ebuild b/sys-apps/paludis/paludis-2.4.0.ebuild
index 061362982501..9cef5721b1c2 100644
--- a/sys-apps/paludis/paludis-2.4.0.ebuild
+++ b/sys-apps/paludis/paludis-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-2.4.0.ebuild,v 1.2 2015/08/07 11:19:59 mgorny Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 # matching profile defaults for now
 RUBY_VER=2.0
 
-inherit autotools bash-completion-r1 eutils python-single-r1 user
+inherit bash-completion-r1 eutils python-single-r1 user
 
 DESCRIPTION="paludis, the other package mangler"
 HOMEPAGE="http://paludis.exherbo.org/"
diff --git a/sys-apps/paludis/paludis-9999.ebuild b/sys-apps/paludis/paludis-9999.ebuild
new file mode 100644
index 000000000000..de30abbc0202
--- /dev/null
+++ b/sys-apps/paludis/paludis-9999.ebuild
@@ -0,0 +1,165 @@
+# 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-9999.ebuild,v 1.1 2015/08/07 11:19:59 mgorny Exp $
+
+EAPI=5
+
+EGIT_REPO_URI='git://git.exherbo.org/paludis/paludis.git'
+PYTHON_COMPAT=( python2_7 )
+# matching profile defaults for now
+RUBY_VER=2.0
+
+inherit autotools bash-completion-r1 eutils git-r3 python-single-r1 user
+
+DESCRIPTION="paludis, the other package mangler"
+HOMEPAGE="http://paludis.exherbo.org/"
+SRC_URI=""
+
+IUSE="doc pbins pink python ruby search-index test xml"
+LICENSE="GPL-2 vim"
+SLOT="0"
+KEYWORDS=""
+
+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
+
+	./autotools_prepare.bash || die
+	eautoreconf
+	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
+}