gentoo resync : 03.11.2019

4 files changed, 167 insertions, 0 deletions

diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index c15fbedd8d4c..7facbb84d18a 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -1,3 +1,7 @@
+AUX redland-bindings-1.0.17.1-bool.patch 502 BLAKE2B 09ab5d8b5b3cf2edd046830bbc88a275c2df804dbb9e09a411bada838afd7f30c592dc48f02995752822a5d738af35c208f124c9d9d008cbff3395bbcfd7b404 SHA512 158e06e58ad66ca88ac8eb4646df0628f423de8d22638e78a737be3ea12fd123fd3bcf63b75478ff7f82ec3b444773a2e8d467fd737b8de0ae9143ef79e60a65
+AUX redland-bindings-1.0.17.1-php-config.patch 1184 BLAKE2B f22aac3f4753f11c1473c2aef3291a311aa4313679e076a185b21e19735438ef9a3dd8cf4ddc4dab0cd691a17502a7a4d907935889755c2626720111246e532c SHA512 e9c9bdf5ed61b24afcb6bcf912be545525d5bdb0c77c304bc146c5fb645ddae2e7e90c6f71ae79d9624eaa2b0d498fddf149fd710524969b66c0f5c3ddabda65
 DIST redland-bindings-1.0.14.1.tar.gz 792557 BLAKE2B fac20e9e2fbf9a4ea7299ef0b4a656ea3e5f1cbf436cd31c80e81be40dc95e074e557925b32ecf24091ce3cfe882d681318ae8402e14baf1e0966ec8a0a892ed SHA512 5e037a96f857c95bf4b9277d98c7de1fa41c4ba7e49e199eeb516458343587c796a10e857679c889406b22bca8617828a2bccd07c31b73f2366cdea39cefad15
+DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
 EBUILD redland-bindings-1.0.14.1-r2.ebuild 1331 BLAKE2B d275c6df8aa46588a6019fbe5c0a02cf52cb50a04ef58e0f581fc3c2c47d91e4feea2654e8d735d50d39722f19115436e033caebc3bde73c9f04477877d53c0b SHA512 a05fc7daa0b42aade87680e5fdf4705da2efaadcc5b20d283839cca038e5e45e3f81520f210b8559f311ef5442c23655ad95efdd58d68c11cba3a41d253bf3d6
+EBUILD redland-bindings-1.0.17.1.ebuild 2489 BLAKE2B f93016c80dc1c2b07f80d3b63210f20a00c91059b89fd929e319d09def1483648b7f277f5b6e5c4dd82784d8020b0e3ebf01a2a655ed449f592818ccd448ad0c SHA512 5bdb893ca819a9557ef25a93d0e40e4a5be5dad9ebb98e9fb7b5bf25dee4bd77a820a78cb4aa8083d1ede74701a08a74edc9bc46a704a4efa18af60d60a8d049
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-bool.patch b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-bool.patch
new file mode 100644
index 000000000000..35594515c793
--- /dev/null
+++ b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-bool.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej@sury.org>
+Date: Wed, 22 Jun 2016 10:28:48 +0200
+Subject: Don't undef bool, it's needed
+
+---
+ perl/CORE_wrap.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/perl/CORE_wrap.c b/perl/CORE_wrap.c
+index 46c2a46..4eb3785 100644
+--- a/perl/CORE_wrap.c
++++ b/perl/CORE_wrap.c
+@@ -1432,9 +1432,6 @@ SWIG_Perl_SetModule(swig_module_info *module) {
+ #ifdef eof
+   #undef eof
+ #endif
+-#ifdef bool
+-  #undef bool
+-#endif
+ #ifdef close
+   #undef close
+ #endif
diff --git a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config.patch b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config.patch
new file mode 100644
index 000000000000..1ca8ded91e9f
--- /dev/null
+++ b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config.patch
@@ -0,0 +1,34 @@
+diff -aurN a/configure.ac b/configure.ac
+--- a/configure.ac	2014-05-10 18:38:09.000000000 -0400
++++ b/configure.ac	2016-10-12 14:27:04.635849601 -0400
+@@ -153,13 +153,17 @@
+   fi
+ fi
+ 
++AC_ARG_WITH([php-config],
++    AS_HELP_STRING([--with-php-config=path], [Custom path to php-config]))
++AS_IF([test "x$with_php_config" != "x"],
++  [AC_CHECK_PROG(PHP_CONFIG, php-config, ["$with_php_config/php-config"], [], [$with_php_config])],
++  [AC_CHECK_PROG(PHP_CONFIG, php-config, php-config)])
+ 
+-AC_CHECK_PROG(PHP_CONFIG, php-config, php-config)
+ if test "X$PHP_CONFIG" != X ; then
+ 
+-  PHP_VERSION=`$PHP_CONFIG --version`
+-  PHP_INCLUDES=`$PHP_CONFIG --includes`
+-  PHP_EXTENSION_DIR=`$PHP_CONFIG --extension-dir`
++  PHP_VERSION=`${PHP_CONFIG} --version`
++  PHP_INCLUDES=`${PHP_CONFIG} --includes`
++  PHP_EXTENSION_DIR=`${PHP_CONFIG} --extension-dir`
+ 
+   if test $PHP_VERSION '>' 5.0.0; then
+     PHP_SWIG="-php5"
+@@ -445,7 +449,7 @@
+   with_php=yes
+ fi
+ 
+-PHP_VERSION=`php-config --version 2>/dev/null`
++PHP_VERSION=`${PHP_CONFIG} --version 2>/dev/null`
+ if test "X$PHP_VERSION" != X; then
+   languages_available="$languages_available php($PHP_VERSION)"
+   if test $with_php = yes; then
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild
new file mode 100644
index 000000000000..b03e9531a939
--- /dev/null
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+USE_PHP="php7-2"
+PHP_EXT_NAME="redland"
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_SKIP_PHPIZE="yes"
+
+inherit php-ext-source-r3 python-single-r1 autotools
+
+DESCRIPTION="Language bindings for Redland"
+HOMEPAGE="http://librdf.org/bindings/"
+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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos"
+IUSE="lua perl python php ruby"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/redland-1.0.14
+	lua? ( >=dev-lang/lua-5.1 )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( dev-lang/ruby dev-ruby/log4r )
+"
+#	php? ( php_targets_php5-6? ( dev-lang/php:5.6[-threads] ) )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-lang/swig-2
+	sys-apps/sed"
+
+PATCHES=( "${FILESDIR}/${P}-bool.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare(){
+	default
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			eapply "${FILESDIR}/${P}-php-config.patch"
+			eautoreconf
+		done
+	fi
+}
+
+src_configure() {
+	if use lua || use perl || use python || use ruby ; then
+		econf \
+			$(use_with lua) \
+			$(use_with perl) \
+			$(use_with python) \
+			--without-php \
+			$(use_with ruby)
+	fi
+
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			econf --with-php="${PHP_CURRENTSLOT}" \
+				--with-php-config="${PHPPREFIX}/bin" \
+				--without-lua --without-perl \
+				--without-python --without-ruby
+		done
+	fi
+}
+
+src_compile() {
+	if use lua || use perl || use python || use ruby ; then
+		default
+	fi
+	use php && php-ext-source-r3_src_compile
+}
+
+src_install() {
+	if use lua || use perl || use python || use ruby ; then
+		emake DESTDIR="${D}" INSTALLDIRS=vendor luadir=/usr/$(get_libdir)/lua/5.1 install
+	fi
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -delete
+		find "${ED}" -depth -mindepth 1 -type d -empty -delete
+	fi
+	use python && python_optimize
+
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			exeinto "${EXT_DIR#$EPREFIX}"
+			doexe "php/${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r3_createinifiles
+	fi
+	local DOCS=( AUTHORS ChangeLog NEWS README TODO )
+	local HTML_DOCS=( {NEWS,README,RELEASE,TODO}.html )
+	einstalldocs
+}