gentoo resync : 10.11.2017

3 files changed, 152 insertions, 2 deletions

diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 5dcff3afe07c..4feb7d797964 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,8 +1,10 @@
 DIST paludis-2.6.0.tar.bz2 1885055 SHA256 bde018c89fce95c2cc793d9171e5a51748ad682d06f839fab394e233257aaf4c SHA512 78a9c0a19703dbbc07934de389b749ab83365454e29b19c323d6c03304162e35ff4d92f7ac1f28067ad853057f2422be43418b3c6a57a193c4b8dd5a4e81eba4 WHIRLPOOL dc4f4ecad0ccbb4b8e6b1b4d0a2c71772b5be244f09dc5456fe42d5510b6b7432ca087f99ae86b2bbbd05b18f70a15371dca1193ead556751faffd01ef227dd6
 DIST paludis-3.0.0_pre20170219.tar.xz 1004380 SHA256 02b9f5e270edc31b967f58615390b3a6c8268ee000d4d1c093aa04651c4e5681 SHA512 46b970c3585aeba1151442256850d4ad1acd28ca911277459d84dfe2fa480c310e5a9cde83baa7f185a76837b84959ec2d01ee9c4f85ba4a9664993b82d61eb6 WHIRLPOOL 8e2384cca652e71bfb5620ed6e6f6b33568342dec1fa2b8403f9074ca83e3a71106de5061cf08240db91fe34d1c779e689bb8057d18a75cabfe641af2d3eb747
+DIST paludis-f8e58ee1d02d2476ae92ebc3737e42b8b6a36891.tar.xz 1004024 SHA256 575c528026663c1c2bb89c5f16c488ab48f305756fff80a8524cad6fbb39a5dc SHA512 813592b6f164d7994000ff1740e003049e040e7d58832bb1393a1f4facf428806b57bbf97855b830f75acf4b20e963093e9993b110f76f44e25afb9a8a1eaa1e WHIRLPOOL 95e2989c401455a10ba34b9690631c467fdf3dd6a08dd7a12d16985234f6698ccce5f3d8d98ba75495fadddc660bb171742b7ce81c122c6eaf6bbd0a33e5df49
 EBUILD paludis-2.6.0.ebuild 3765 SHA256 f2fbe43ec2e715b3b6418325050d8ce855441b2cf3cd0bbc8f3ddaf4a3f0bb99 SHA512 585d750b8e8d6c48f8260acaeee567771adfa12cea0f8bfc7b7b069c280d29fd2d28784856c002f8ba51c3eb4e40835fe86b775cb3a6c35361aec37006ed300c WHIRLPOOL db3926f89b4019fffe8ced33a720fd0d72443751d3b0f11c2b120028b9874d05accbe4d8f9c332b2909bb787351e5abbafdcd42b2c2dbec4e3bad0833452a52e
 EBUILD paludis-3.0.0_pre20170219.ebuild 3766 SHA256 85b630a4f1e8dacab093afd56711aea3c26f0864bea12d8c383efd513e7e8968 SHA512 23cf386093f2f0c59d706b8a166550600dfc677e58986636846c0f180ed59629868f2a3d4c73df3d4bad00550ccaa5e22cddcbdfdf8195b9a15665db99cfa365 WHIRLPOOL fad8ae221b5b9be16430851f1e08fa145adc65e3e994cbb68ab2c453164e93f1f1e2606c053a234829d4410a8c77615929745741a0d84d737578b35d4516e582
-EBUILD paludis-9999.ebuild 3621 SHA256 848cd527c5f2d77878796a0de4378ec82b6e937395bfa5f179a6b1948a5cb599 SHA512 0e10e521b42d36c471fc8afaa59c5e7b6d380e32426bbd69f33568af445afdd42a3f0d4cd10c1448b40e7f2bac8783920dc93c5e78e80ca43b234b5fcf071014 WHIRLPOOL aee3869301770a0188744cbd453556af938872af596861887eb278bd9cf754067a5065aeffa84ec04983ce6509b974a82aeafa572164f3426c47151c99801f8a
+EBUILD paludis-3.0.0_pre20170808.ebuild 3784 SHA256 5b995d55d510edfb2e46719b7a8f90d854657473d218760bc6d9edac16f987b4 SHA512 ce2783f67cfccdeb3c8bde767890f9fdbf8af3c68228ce333d5bb9b92d73bf0bb69d7947b8e678817b58e3420ceecf7d99ea6a4ff2fd3eae79644fce175d02f0 WHIRLPOOL 23ac48637db7f05d94c9dedd2060f5e9ed8b12e2fa4591226e7882e3ec1cefb6f4f1d07d2a8dec5137ef37de966cd869482849333410057f09aa5884ba3246bc
+EBUILD paludis-9999.ebuild 3633 SHA256 a7ada7764b0ccfef1a64aafaa8d49b820d73446d2310ecf544ef832597b86e68 SHA512 5ecdff9a67ac467dbc7c925f2ad77eb98344f01d0b6ccfda938a3ee3a6681d4af7f108713d2764154cd5d7b251078fce2c70c6aba0629ab40efbd090e265962d WHIRLPOOL 58118348a283eef6dbd0cd9d7063fe50ff042bdfdb578ec6e72889854379d43c18be97844bc83b76de252fa2862f923cc761aaef485f6ecb7156d71ce346bf3f
 MISC ChangeLog 5959 SHA256 4018cab68a86f029bccc207bc84b15ae4502823335bc14f8265591f6bd1df0a1 SHA512 6e432a3a695e60a4380daf1741e4fd218fe3fed7a548622f13fc07cfa7b73ead4145c52879f3a722e81050005f2521afad3a036d4541dd7ebf0c623a108564ab WHIRLPOOL 34f5497ed1e1d62cb40c18b07d071a657f79fe94f23bca5037e0e7bb8f33aa3698edfb5b1ef61f30b982e111bfd86bf51f3517a4cf54e47ed88a98bdecb0efb7
 MISC ChangeLog-2015 40901 SHA256 53512c036950cc0304a1714a2a7b116940c4b14057137058e1ba778d0152e98f SHA512 d7e9b4646d3d450bfa8e74690b55cb8f56c1aa4a62d9fe1f3add02819955de39d563cf7878f09b54bce5d188f2cb41e83dd6839cf91205aebbd3322c3e09ae7b WHIRLPOOL 2ebd68e3f12f72b448dc5c71d2fb3529df4e1d7af81bad24844ae5010028340eff8686861d3b61a5f5cd396d157effe6b02832213e776c1efabde3f91ee6423b
 MISC metadata.xml 706 SHA256 c45c21c0c85d887b499d8c6b5576ae41c39ac7593c80529d06c61afb962c9e33 SHA512 ab32599364fb289dc43d8dc1574ee472585f014c663d2c80209700596b455e074346ab35e69bd05fee86a451902852790f1bb9dcd37f2118e8e8bc24b90a01ec WHIRLPOOL d35b406e15b8de19ff12cdebc8702e1a482228358b37da2b47f58f43986b895e9097a4f2332e5779051095ebe98aae9efcf43e5ca30851f79e6633a953f43e6e
diff --git a/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild b/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
new file mode 100644
index 000000000000..d37eafd6067a
--- /dev/null
+++ b/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+RUBY_VER=2.3
+
+inherit bash-completion-r1 cmake-utils python-single-r1 user
+
+MY_P=paludis-f8e58ee1d02d2476ae92ebc3737e42b8b6a36891
+DESCRIPTION="paludis, the other package mangler"
+HOMEPAGE="http://paludis.exherbo.org/"
+SRC_URI="https://git.exherbo.org/paludis/paludis.git/snapshot/${MY_P}.tar.xz"
+
+IUSE="doc pbins pink python ruby ruby_targets_ruby${RUBY_VER/./} 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:0
+	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-arch/xz-utils
+	>=app-text/asciidoc-8.6.3
+	app-text/htmltidy
+	app-text/xmlto
+	>=sys-devel/gcc-4.7
+	doc? (
+		app-doc/doxygen
+		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} )
+	ruby? ( ruby_targets_ruby${RUBY_VER/./} )"
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${MY_P}
+
+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
+}
+
+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
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DENABLE_GTEST=$(usex test)
+		-DENABLE_PBINS=$(usex pbins)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_PYTHON_DOCS=$(usex doc) # USE=python implicit
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_RUBY_DOCS=$(usex doc) # USE=ruby implicit
+		-DENABLE_SEARCH_INDEX=$(usex search-index)
+		-DENABLE_VIM=ON
+		-DENABLE_XML=$(usex xml)
+
+		-DPALUDIS_COLOUR_PINK=$(usex pink)
+		-DRUBY_VERSION=${RUBY_VER}
+		-DPALUDIS_ENVIRONMENTS=all
+		-DPALUDIS_DEFAULT_DISTRIBUTION=gentoo
+		-DPALUDIS_CLIENTS=all
+		-DCONFIG_FRAMEWORK=eselect
+
+		# GNUInstallDirs
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	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
+
+	cmake-utils_src_test
+}
+
+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
+}
diff --git a/sys-apps/paludis/paludis-9999.ebuild b/sys-apps/paludis/paludis-9999.ebuild
index 89cf081c10bc..cecf2cc4dee7 100644
--- a/sys-apps/paludis/paludis-9999.ebuild
+++ b/sys-apps/paludis/paludis-9999.ebuild
@@ -78,7 +78,7 @@ src_prepare() {
 	# https://bugs.gentoo.org/show_bug.cgi?id=439372#c2
 	sed -i -e "1s/ruby/&${RUBY_VER/./}/" ruby/demos/*.rb || die
 
-	eapply_user
+	cmake-utils_src_prepare
 }
 
 src_configure() {