gentoo resync : 07.10.2018

4 files changed, 74 insertions, 77 deletions

diff --git a/dev-libs/rasqal/Manifest b/dev-libs/rasqal/Manifest
index 31c0c8eea201..88f9c0c05b59 100644
--- a/dev-libs/rasqal/Manifest
+++ b/dev-libs/rasqal/Manifest
@@ -1,5 +1,5 @@
-DIST rasqal-0.9.29.tar.gz 1550144 BLAKE2B 205fc4864a86447246d43b52c2defa00b17628c2a6f459dc40b0fa79b42cd306405f31f600d5ad535891d2f79c46970d77f559249d6a22578d9b83e28d2fb46c SHA512 9795e2ffd439157af7d386ef7191fed3c960e88f04e46ec80bf845986841b9fb094219c561144cbe9ada5582264b32eec4850cf8f2258661d09f2df9dbffda4d
 DIST rasqal-0.9.32.tar.gz 1544623 BLAKE2B c94833d2906fc211d743d63a52478e6acc9f26c7528beb1bea0ec8c365b5d13e6ac85e57b75b920d1ccb5768112d06cf615212c7bf248120671730c5095b3c88 SHA512 071f5ff30a1271bdd747cab7991a34c75f9c0132e81d7662acb13a2e380b98c325a9b2998f6a08a393251623680074a76f58f70bdd93b5c1416779aacc7be428
-EBUILD rasqal-0.9.29.ebuild 1867 BLAKE2B 9d1eb0fd9ad725ee2af187407b6d7e0157bfa84b72fdf84f67f2f2d0c2f208c0800bd1e103c2c5421ee2e862c3c193096237f7e0d9dfb6ac46e43c4783fb1869 SHA512 56ad947cb4af7c7676a14ddeaceefdf2fd96c60e27d66e42c604d7fbf6303faf96c1d934c6a44da3cc3668e77c9bfbbbf13b07972ad7e028363c23855543c2a9
-EBUILD rasqal-0.9.32.ebuild 1925 BLAKE2B 3549cf20fc56e92ca7adef2cfe92b4e5bf402fb62e44f6305477364893cb4080d85cf2f41d3df6ffd5bc4cd5872a76e1b27871ca6cd5c6f32dc0193c161252c8 SHA512 d2f02414c7290705d43cbfe2f2d77a4adf531600bcf5a113eccf1dc83e49046554a852fda2a9cbffcd0347643a101d3ba03f7b97c131ba05b8f9470d7904aa31
+DIST rasqal-0.9.33.tar.gz 1595647 BLAKE2B 87bca86b2f0dceb0801f5a34dae9ae1f87d8a7d0dc1e03fdf04998a0d4885ed76be2719d3e01489a5510a26715bb093a75ce194cc42f3cedff88f64161d6a2fb SHA512 05728682797470db9e51d156012e8fde9dec1554d107372faa11cbe6cdc3356e92386f4f8de6d7c41e3100b76f9b1c6809102a913829cddbd2ff29043c04d522
+EBUILD rasqal-0.9.32.ebuild 1923 BLAKE2B da3d291be1ec4e166366babaf6f674e0625f636dd387eb54ce3a7be8aba2b7434425b03aacaaa1ade21a45ce3c03a6d45ab91573ccb931bd08d9d59ce7f3e86f SHA512 f8d876154ce4b8847c067776d2fd8d48cae9eac11fceb14d9a15994ebb3e461f9a0226e55388387692f13493098fd670ba5c2f3cd87585056aecf696cb743948
+EBUILD rasqal-0.9.33.ebuild 1697 BLAKE2B b4aad4ea467364c724c5b902db89e81b3fbe25d5673c33f5bb5d493f3e6f8ed3a9ad9c782825a5df24cba0568c10a0d9a5b73eb582d8232a70b252456175931d SHA512 32d3ccc61649161ca647e76736fcb02819124d5c325f2ce45ac113d56d159b7cffd916194a6ccf3c96581cca1082d335d1e7c5df1c923ad92ffb1395e21e1ade
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/rasqal/rasqal-0.9.29.ebuild b/dev-libs/rasqal/rasqal-0.9.29.ebuild
deleted file mode 100644
index 5851683b32c7..000000000000
--- a/dev-libs/rasqal/rasqal-0.9.29.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit libtool
-
-DESCRIPTION="library that handles Resource Description Framework (RDF)"
-HOMEPAGE="http://librdf.org/rasqal/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+crypt doc gmp kernel_linux +mhash pcre static-libs test xml"
-
-RDEPEND=">=media-libs/raptor-2.0.7:2
-	kernel_linux? ( >=sys-apps/util-linux-2.19 )
-	pcre? ( dev-libs/libpcre )
-	xml? ( dev-libs/libxml2 )
-	!gmp? ( dev-libs/mpfr )
-	gmp? ( dev-libs/gmp )
-	crypt? (
-		!mhash? ( dev-libs/libgcrypt:0 )
-		mhash? ( app-crypt/mhash )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	test? ( dev-perl/XML-DOM )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	sed -i -e '/random_approach/s:==:=:' configure || die #416659
-	elibtoolize # g/fbsd .so versioning
-}
-
-src_configure() {
-	# FIXME: From 0.9.27 to .28 --with-random-approach= was introduced, do we
-	# need a logic for it? Perhaps for dev-libs/gmp?
-
-	local regex=posix
-	local decimal=mpfr
-	local digest=internal
-	local uuid=internal
-
-	use pcre && regex=pcre
-	use gmp && decimal=gmp
-	use kernel_linux && uuid=libuuid
-
-	if use crypt; then
-		digest=gcrypt
-		use mhash && digest=mhash
-	fi
-
-	econf \
-		$(use_enable pcre) \
-		$(use_enable static-libs static) \
-		$(use_enable xml xml2) \
-		--with-regex-library=${regex} \
-		--with-digest-library=${digest} \
-		--with-uuid-library=${uuid} \
-		--with-decimal=${decimal} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	dohtml {NEWS,README,RELEASE}.html
-	use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html/rasqal
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/dev-libs/rasqal/rasqal-0.9.32.ebuild b/dev-libs/rasqal/rasqal-0.9.32.ebuild
index bd7ad7318390..2400b22d3e4d 100644
--- a/dev-libs/rasqal/rasqal-0.9.32.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
 
 RDEPEND=">=media-libs/raptor-2.0.14
diff --git a/dev-libs/rasqal/rasqal-0.9.33.ebuild b/dev-libs/rasqal/rasqal-0.9.33.ebuild
new file mode 100644
index 000000000000..df3e0ecc3f50
--- /dev/null
+++ b/dev-libs/rasqal/rasqal-0.9.33.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="Library that handles Resource Description Framework (RDF)"
+HOMEPAGE="http://librdf.org/rasqal/"
+SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
+
+RDEPEND="
+	>=media-libs/raptor-2.0.15
+	crypt? (
+		!mhash? ( dev-libs/libgcrypt:0 )
+		mhash? ( app-crypt/mhash )
+	)
+	!gmp? ( dev-libs/mpfr:= )
+	gmp? ( dev-libs/gmp:= )
+	kernel_linux? ( >=sys-apps/util-linux-2.19 )
+	pcre? ( dev-libs/libpcre )
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/bison-3
+	>=sys-devel/flex-2.5.36
+	virtual/pkgconfig
+	test? ( dev-perl/XML-DOM )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+HTML_DOCS=( {NEWS,README,RELEASE}.html )
+
+src_prepare() {
+	default
+	elibtoolize # g/fbsd .so versioning
+}
+
+src_configure() {
+	# FIXME: From 0.9.27 to .28 --with-random-approach= was introduced, do we
+	# need a logic for it? Perhaps for dev-libs/gmp?
+	local myeconfargs=(
+		--with-decimal=$(usex gmp gmp mpfr)
+		--with-uuid-library=$(usex kernel_linux libuuid internal)
+		$(use_enable pcre)
+		--with-regex-library=$(usex pcre pcre posix)
+		$(use_enable static-libs static)
+		$(use_enable xml xml2)
+	)
+
+	if use crypt; then
+		myeconfargs+=( $(usex mhash mhash gcrypt) )
+	else
+		myeconfargs+=( --with-digest-library=internal )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}