gentoo resync : 09.03.2018

3 files changed, 152 insertions, 2 deletions

diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index ad9b47668e4b..36419e7da225 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,4 +1,6 @@
+DIST paludis-57881321fa3d5d82a9260db54afd608fd61dd533.tar.xz 1004012 BLAKE2B 0bc65918b277ae4203fb5dc66fe3a84caa142b5e97b9e1f1b9a5f2e1b9c27fb4c60109c0bc1c058e095850bcf488075e21ab080bc5c4f2156e4c901923856ddb SHA512 ed9053b933172dea0122c171a14965b0d183affa8d3f2aa2be5cc2a2cf11f81f8a693b30bee93963dd890ebe41f454cf5ec5ab38f0b7924318b8bd8d1c37f5d9
 DIST paludis-f8e58ee1d02d2476ae92ebc3737e42b8b6a36891.tar.xz 1004024 BLAKE2B 1c34c93815efa41298cc2916c4428971d1f54242cfd759c771972bdcde94986c6af03546372c7eda277a343851b38ee93c0a103e519457b42e48cc7bed87b755 SHA512 813592b6f164d7994000ff1740e003049e040e7d58832bb1393a1f4facf428806b57bbf97855b830f75acf4b20e963093e9993b110f76f44e25afb9a8a1eaa1e
-EBUILD paludis-3.0.0_pre20170808.ebuild 3784 BLAKE2B c7e95761d787f258f7ad92a2471db03c731649d7287f2ed9a26d69e933ef87236713d04240a85ab43df41c7128236e3135fbed1aaa8c4cb8444ebf6bab245946 SHA512 ce2783f67cfccdeb3c8bde767890f9fdbf8af3c68228ce333d5bb9b92d73bf0bb69d7947b8e678817b58e3420ceecf7d99ea6a4ff2fd3eae79644fce175d02f0
+EBUILD paludis-3.0.0_pre20170808.ebuild 3781 BLAKE2B 41ada11076e248393068b4c539b89c7a42b6b36c6cdd8d684bc695456e78b07bf80f8155216d508d582d7f6a07a101535e6bbb305c87108f45bc1acd74f5a4f5 SHA512 6947e1a370a606159c0077bdba03d0eca7675e89a19eecc2952a329f460de4e17373d93777c3824699b43fa6074b010b1338643e319b4ee47271e800182af7a7
+EBUILD paludis-3.0.0_pre20180214.ebuild 3781 BLAKE2B 304dce8fa19a5d1ff731ea6b8cb39256ac4fba72107826bf86f38b83163adb7df116f92d55eb4b9166b5d495cbeff571484fea7fe509e153f001a9535c2cff8d SHA512 7efe60fd1d35cc760f9f922a4ed6ce2159de6627905de097940d2992d822dd6d94011d0b492ea8315ae260e8e9e97cfc4de0b7c69b8e2a3768756022c035a540
 EBUILD paludis-9999.ebuild 3633 BLAKE2B b27ba87915d6a019d6503c97eb23fb5ea87dc85df20e0ce3d29973117a961c7f477bad0b21c660f6689f9c1eebba178b4f2797e5c8e40d8c5fe23f3d46a12e1d SHA512 5ecdff9a67ac467dbc7c925f2ad77eb98344f01d0b6ccfda938a3ee3a6681d4af7f108713d2764154cd5d7b251078fce2c70c6aba0629ab40efbd090e265962d
 MISC metadata.xml 706 BLAKE2B ec2963b467d0fbab598fdf44b021cc10569e9a25305ad22c08d129c17f36db1a0759edb6e89119cd687fc36b2b26c4844086ab1cb8e249b6883df8fb9858b830 SHA512 ab32599364fb289dc43d8dc1574ee472585f014c663d2c80209700596b455e074346ab35e69bd05fee86a451902852790f1bb9dcd37f2118e8e8bc24b90a01ec
diff --git a/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild b/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
index d37eafd6067a..d0801ab01b6d 100644
--- a/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
+++ b/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	pbins? ( >=app-arch/libarchive-3.1.2:= )
 	python? (
 		${PYTHON_DEPS}
-		>=dev-libs/boost-1.41.0:=[python,${PYTHON_USEDEP}] )
+		<dev-libs/boost-1.65:=[python,${PYTHON_USEDEP}] )
 	ruby? ( dev-lang/ruby:${RUBY_VER} )
 	search-index? ( >=dev-db/sqlite-3:= )
 	xml? ( >=dev-libs/libxml2-2.6:= )"
diff --git a/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild b/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild
new file mode 100644
index 000000000000..f2a2976a3d9c
--- /dev/null
+++ b/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2018 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-57881321fa3d5d82a9260db54afd608fd61dd533
+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.65:=[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
+}