gentoo resync : 11.07.2019

4 files changed, 99 insertions, 1 deletions

diff --git a/dev-db/opendbx/Manifest b/dev-db/opendbx/Manifest
index 8caf0cab6098..35e037613c81 100644
--- a/dev-db/opendbx/Manifest
+++ b/dev-db/opendbx/Manifest
@@ -1,8 +1,10 @@
 AUX opendbx-doxy.patch 1557 BLAKE2B 260c5578e22a751f59308d9dc3f94017951f24775c5dc52d3e4e512380244e5d7266704aae43119267c1726a08c086658c7c0e89bbcb66f671507712d9e2c9ba SHA512 f98f1b1014a44713c1cc5adf46fba8af5333c97faf765e8d1e6c0eb4772650c7524f4c8a90cffe6bbdb4c688beb6bac3eb2755105164002f3e85797adb135004
+AUX opendbx-man-optional.patch 1000 BLAKE2B a8e5dc4e0721b94acd0b379a6d27ea8e349e85ea31d362d4f6c0ac274220f69e09bcb4c0436b6cfd3037983e66d484cb48057cb740456d772ab49e7c4dade566 SHA512 1acf644bc84474e62d28cfa07a0030fd2ec919e27cb514cf710d4322f0f6c869e79bb11895e5eee549e4edb5e1924e708dc7ec87b02be722ce5306c418b6ecf8
 DIST libopendbx-1.5.0.tar.gz 583894 BLAKE2B c427bf8d79df6b83d0ce940d974625bd9b54e49e502f864d244a780185b6321f84a6b779e09b603a71ca26549844001268f0357169e9a74e742b9c2668e4b3ec SHA512 7e4e9b8c62fd981276f6747f8184d7e34d743b866bfd76c8126a16371b50dc682177fd563212333d2dbebe2128d0b1527fc69029833329ba8cc0311308fa9bb5
 DIST opendbx-1.4.5.tar.gz 582915 BLAKE2B 7a11947f73ba3a3d407fecf7600589b64a6a80b82f24720ae613d1dc7044e7efe3af8fe273c0cdb043923af2cee1913766054eff3267243345b89c6977124be6 SHA512 e46289f9a7eb8b6e4084863834f8c4ca080eb3343b5f9d5837c476bab0a39e798a6364c8648f9fb53e52ab60cae57749b9f7e9bd23cb95b8ff21160f1bf4247e
 DIST opendbx-1.4.6.tar.gz 587514 BLAKE2B 0a6c983ac1ebdc3ad9390185938f32e13ba9ff2ced6d41390421e1e3a1e9eb639a85d89da7ce2dd67f05fd2fcaebb2f53146f43678e548511403d8cdc4de88da SHA512 dd6d53d29157057dbf4e273fd82c7694e8bc626d3409d6ab9c25627a0fec96418326550fa8004b5341facdc4cd8aae12516224e8bb84e2562482885780ff0e55
 EBUILD opendbx-1.4.5-r1.ebuild 1602 BLAKE2B c60c9934a2be4e82de7699d60d0f17a26f272621f285ac7773b2204354528b861b3649fd6d36b96e82ea57a6d87e6ec68ccf48e908eb3f7cbfb17cbcc5f067b7 SHA512 951c6404d3599c47cf81fb2f4655aa000b3991c9df0eea4ea6b81f7a2f3e21342c6417863c48971c9e924fbfbc92be1833303a520ed683a2a3cf32a5a0f988a5
 EBUILD opendbx-1.4.6-r2.ebuild 1604 BLAKE2B 1e77a1b530d45461925490e089846ade568083cde20953b0cd1b79adae6173dd0513f54e72bc30008b8f080b4c679a04ff04e02bdb22e2d8bd2528764e75dd3b SHA512 6ef51b6ae514c238b57a82f785145eb96d6430dde6c011087491328b8fb7817b722f0223cef31f6bfcf253632e7a9014345015d0ce7cb3db24f3b392c86b7a8a
+EBUILD opendbx-1.4.6-r3.ebuild 1751 BLAKE2B 9221f19b85ee887c010d01a09a0238126d57fa38b721e09fcd7d64fa2d4708c90a6f1e35a9507f7a254782402608676c1a6a04356338639c7a13c634763c1bff SHA512 1b08f337d683f617ad9fbfe2fecd07ad2f4651c82cf45fb7125275b9a48ccfce0f0fc767d3e2ecbfc0db600a89c633a200461e5d58454a36629e0d3b1e01671e
 EBUILD opendbx-1.5.0-r2.ebuild 1672 BLAKE2B 306102765d9f0a879490988bba0c5d2fa69e14fc5bae6d6e27943376278bbfd49412b90e8a497b8dcc4090d047cae6559d1c690e8e19c68f236d167f8d6918c2 SHA512 0be32ee80a73b302f33cf7024b9d11d5432f6d766de2c1144f14b48b13faa02e64121b06aea35b7c3a0509f5091076fae6ff1a462aa503f158544f11439f6a80
-MISC metadata.xml 243 BLAKE2B 1d641d0445b6ef43e1ca3ca3f967b0580b0a5ba444509e092a8a51bba18564136091c2dacd69ed723e36cb851b3962176a8aca06d3b2e604cf089c4983dbb7f5 SHA512 2bbd30d145173aa1c10a47ec43bfc1f6b1aeda4b25ec40e534d08a35fc9a63ba9ba7826204cf4d561566ea0678f2d865cb7a947814f5e5e436a839d750f2db2e
+MISC metadata.xml 309 BLAKE2B 5c0ca8838e34f1f057ebf663b89556aa87472b51c83ac67cdb5d0b3d6d35f979762fdfef4772918fc05fa11f05826d77a696a02677a005c97e5ec8190ccb6507 SHA512 8573f7c92a989a1752e2e4f94ed32fc915711981664d6a8164987caeebd8fa8d2d2b9f820decbc7ab79c442eb0efa9a9a40bad976d2d3d75ec9efa57cb9ef3f6
diff --git a/dev-db/opendbx/files/opendbx-man-optional.patch b/dev-db/opendbx/files/opendbx-man-optional.patch
new file mode 100644
index 000000000000..c8a55a0ed362
--- /dev/null
+++ b/dev-db/opendbx/files/opendbx-man-optional.patch
@@ -0,0 +1,23 @@
+From 261a864f7c8823093accfe751ef1863d716a4d53 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <mrueg@gentoo.org>
+Date: Sun, 7 Jul 2019 15:22:16 +0200
+Subject: [PATCH] configure.ac: Make building manpages optional
+
+
+diff --git a/configure.ac b/configure.ac
+index 2f74bf8..5f98de5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,7 +96,8 @@ AC_CHECK_PROG([doxygen], [doxygen], [yes], [no])
+ if test "x${db2man}" != xyes; then AC_MSG_RESULT([Warning: docbook man page converter not found - skip generating man pages]); fi
+ if test "x${doxygen}" != xyes; then AC_MSG_RESULT([Warning: doxygen not found - skip generating man pages]); fi
+ 
+-AM_CONDITIONAL([ENABLEMAN], [test "x${db2man}" = xyes -a "x${doxygen}" = xyes])
++AC_ARG_ENABLE([manpages], [AS_HELP_STRING([--enable-manpages], [build man pages])], [manpages="${enableval}"], [manpages=yes])
++AM_CONDITIONAL([ENABLEMAN], [test "x${db2man}" = xyes -a "x${doxygen}" = xyes -a "x${manpages}" = xyes])
+ 
+ 
+ # Build options
+-- 
+2.21.0
+
diff --git a/dev-db/opendbx/metadata.xml b/dev-db/opendbx/metadata.xml
index 92db6f744243..3b864d715662 100644
--- a/dev-db/opendbx/metadata.xml
+++ b/dev-db/opendbx/metadata.xml
@@ -5,4 +5,7 @@
 	<email>alicef@gentoo.org</email>
 	<name>Alice Ferrazzi</name>
 </maintainer>
+<use>
+	<flag name="man">Build and install man pages</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-db/opendbx/opendbx-1.4.6-r3.ebuild b/dev-db/opendbx/opendbx-1.4.6-r3.ebuild
new file mode 100644
index 000000000000..425a43a399a9
--- /dev/null
+++ b/dev-db/opendbx/opendbx-1.4.6-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="OpenDBX - A database abstraction layer"
+HOMEPAGE="https://www.linuxnetworks.de/doc/index.php/OpenDBX"
+SRC_URI="https://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="firebird +man +mysql oracle postgres sqlite"
+RESTRICT="firebird? ( bindist )"
+
+RDEPEND="mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	firebird? ( dev-db/firebird )"
+DEPEND="${RDEPEND}
+	man? ( app-doc/doxygen
+		app-text/docbook2X )"
+
+REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )"
+
+PATCHES=( "${FILESDIR}/${PN}-doxy.patch"
+	"${FILESDIR}/${PN}-man-optional.patch" )
+
+pkg_setup() {
+	if use oracle && [[ ! -d ${ORACLE_HOME} ]]
+	then
+		die "Oracle support requested, but ORACLE_HOME not set to a valid directory!"
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local backends=""
+
+	use firebird && backends="${backends} firebird"
+	use mysql && backends="${backends} mysql"
+	use oracle && backends="${backends} oracle"
+	use postgres && backends="${backends} pgsql"
+	use sqlite && backends="${backends} sqlite3"
+
+	use mysql && append-cppflags -I/usr/include/mysql
+	use firebird && append-cppflags -I/opt/firebird/include
+	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
+
+	econf --with-backends="${backends}" --enable-manpages="$(usex man yes no)"
+}
+
+src_compile() {
+	# bug #322221
+	emake -j1
+}
+
+src_install() {
+	emake -j1 install DESTDIR="${D}"
+	dodoc AUTHORS ChangeLog README
+
+	rm -f "${D}"/usr/$(get_libdir)/opendbx/*.{a,la}
+}