Drop sqlite2 support and rename sqlite3 USE to sqlite (#530176)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 216 insertions, 12 deletions

diff --git a/dev-db/opendbx/ChangeLog b/dev-db/opendbx/ChangeLog
index 4ee743a30d10..e0d637a9abbd 100644
--- a/dev-db/opendbx/ChangeLog
+++ b/dev-db/opendbx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/opendbx
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/ChangeLog,v 1.43 2015/03/15 18:03:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/ChangeLog,v 1.44 2015/05/07 18:28:03 pacho Exp $
+
+*opendbx-1.4.5-r1 (07 May 2015)
+*opendbx-1.5.0-r1 (07 May 2015)
+*opendbx-1.4.6-r1 (07 May 2015)
+
+  07 May 2015; Pacho Ramos <pacho@gentoo.org> +opendbx-1.4.5-r1.ebuild,
+  +opendbx-1.4.6-r1.ebuild, +opendbx-1.5.0-r1.ebuild:
+  Drop sqlite2 support and rename sqlite3 USE to sqlite (#530176)
 
   15 Mar 2015; Ulrich Müller <ulm@gentoo.org> opendbx-1.4.5.ebuild,
   opendbx-1.4.6.ebuild, opendbx-1.5.0.ebuild, metadata.xml:
diff --git a/dev-db/opendbx/Manifest b/dev-db/opendbx/Manifest
index a2c0f1f78f93..26f3f90a17d5 100644
--- a/dev-db/opendbx/Manifest
+++ b/dev-db/opendbx/Manifest
@@ -4,22 +4,18 @@ Hash: SHA256
 DIST libopendbx-1.5.0.tar.gz 583894 SHA256 1a274939847c3b3d3614c19cad86539007737c60ba0d7259614a0967b1fd71d9 SHA512 7e4e9b8c62fd981276f6747f8184d7e34d743b866bfd76c8126a16371b50dc682177fd563212333d2dbebe2128d0b1527fc69029833329ba8cc0311308fa9bb5 WHIRLPOOL c5a933fcbffe6f7c7589a43d7f4148375b30d81d7221a0148bece6f3d3f1ea490fade6b8c160f4db0576ada31aab00a69d828418e67f2c8b0b4df6f31fcf184b
 DIST opendbx-1.4.5.tar.gz 582915 SHA256 206c998f370d1677a5692a64941470205dc6cd8ad95be1af6b033df50a6431cd SHA512 e46289f9a7eb8b6e4084863834f8c4ca080eb3343b5f9d5837c476bab0a39e798a6364c8648f9fb53e52ab60cae57749b9f7e9bd23cb95b8ff21160f1bf4247e WHIRLPOOL 0a518ee0993447c67731141bc105ff5c082cb434c575a64b3df53614ffc6a72e8734b2720ffa46697b52e81e544e4a3752517059b534faae5698060af71bc5ef
 DIST opendbx-1.4.6.tar.gz 587514 SHA256 2246a03812c7d90f10194ad01c2213a7646e383000a800277c6fb8d2bf81497c SHA512 dd6d53d29157057dbf4e273fd82c7694e8bc626d3409d6ab9c25627a0fec96418326550fa8004b5341facdc4cd8aae12516224e8bb84e2562482885780ff0e55 WHIRLPOOL b66761e99e04119f2aaefa071c8a35a9f0af84a012e7e2f908eb9fefc9bae99a26a9942c1adf3e5dc6061ff78fb4ae0d0397bebcb709ea10c7a7797f95f03aad
+EBUILD opendbx-1.4.5-r1.ebuild 1785 SHA256 eca36fb85995f607aea435279cd4203dffc6ca9a0f79c1bbc03261e6c50c5985 SHA512 342f5a008fe62474c8551aeccc3e48e4454faab6efa2bf1601cd8384febdcbd17f08d554564f3488c8c0395ee92e3cac8e0915a3d3d834a89279ec331c320ab2 WHIRLPOOL 8a8d983cd10563bc7592f99878041f22b34ef70c4c4a18c5c6cbec960364a98fd3b852030fa3b6c6bd3b505067b15a9a58776820d80a124269823e4f162e423b
 EBUILD opendbx-1.4.5.ebuild 1960 SHA256 3c95882d70b7af653c34f4ec79107a6f25e2547420c79b5980a9ebfec226b8f3 SHA512 d1ba5473252bedc1c624fc2bf47cbc06f278fa7ab5b8c1a17ab5098ddf29da22b86868bef38ac0c4bfefa3234f7267b8a626bd92f055ea1c8b051c7a1ce0d86b WHIRLPOOL 5c3533c9a25f86627223fd3ac473c91930d03906563284045b3ce2d2c7c25961007b34e6fe553a03bbb7165422b0762ff221faa1c77c3774403961161cdcc4d1
+EBUILD opendbx-1.4.6-r1.ebuild 1858 SHA256 d65c5877b354ed9ac281699ccee11a1464110cdf440bd30f0973d851865e5776 SHA512 f549230172406cb499326417db501103737859969f6d28b48fa58ab7bc84ffb71a0ff6c5fdea7d0af5c30a5f488f0c61da815bccc89106679e0180e9d1570419 WHIRLPOOL 2935ce9c874f435dfb5a65ac25993a47ea05a733eb2ce6ae09652fdf227161390d178393b8da0286786090c696fe4444b0d8576fef11a1998256fc5120f4367b
 EBUILD opendbx-1.4.6.ebuild 1962 SHA256 8f4ca726422fc09cca4be2a9d521feb07dde421182865e206a767c3ed91cf2bd SHA512 a8ef7e3a11fd6994ba6f0a54ec70282f4831c34ade3eec849d29699c9fb9c02350041e13e8ea6e9041e19f4c4a5e879117416466450d3b9d28fb48ba13957a23 WHIRLPOOL 51b671a268417545abb617b44308ec5f4a228aa7c0ac1366f6f1b4e14d8dad7186cbc73b85ce2ed34aabfe729be26b235f48b6b79d41f42642fdf665d6865eab
+EBUILD opendbx-1.5.0-r1.ebuild 1926 SHA256 4e0113635f03318a1b1a787f05d2e3ce390f06155e6cb60b133eaae6e53c7c7d SHA512 ae2160004318b2b76fd96b6bdbd52dd3aca1396dcca8d16f07bae6f8a29896c059e251a62bbe3724f8a5a3e78178cc0a0e044c818db373b28cac36aa9f57d3f8 WHIRLPOOL b72a8b20d157c1ea73a320f75593027330e96edee8d9daa243d576384515be3fcac4830d984198c02f2351e5aefba40e29bb3a74efaf7f275bf1a508feff9fbc
 EBUILD opendbx-1.5.0.ebuild 2030 SHA256 b1c9f1d9e56f89ce9a99a7206a2259508ec1e35f478be9468f219b53a08d9c8e SHA512 80788588733eba2eba416894e7e2d6fe4d3d648f2e5c44516b3e9d93d19d8c13d84a55b85123caec6b0e5fac51f0ddefba54379477e130159220f1bf417c87b6 WHIRLPOOL 51985994ce5ef93f85f070a7e2a2854e5a27f3355d69c74a27c18272e8de6ed819f59045aa9a9d6bd65c22e9ab58fc01c1562172ce8dc1d673a16b00dc5e7a3f
-MISC ChangeLog 6686 SHA256 d74577ca28dca5ae79a5075a5e1130afac81985ce8d2c5ea1c82d11c47138384 SHA512 171c2ddbb020ab42996a68932b240ee3da19cb6d1cb685c16fd45e5b1df9d7696a279815fc12aef115a0d4390f8cf8bef23543c43fd656991dc7aa73a568d16d WHIRLPOOL 48b6b4968da4e20eb5eb3587078193809d78f490b8ac943dbe3c4b48cc8e583bfbead70d9d1588c14fd24a6b386304cdba139d18e2543ccb13ac77131c60d024
+MISC ChangeLog 6978 SHA256 180eb03abc2055e2cf9831c540a33b0345636ada1c467a8207d9db25e66a1c10 SHA512 dc7d39799d5a360959afbd3300e48ab2cc3becf37519b3571168c5158c8e4b23ef4d33be3dbcde5f0580e5d7b3ba3874437621eca3ef5da4984d2f6988c7a623 WHIRLPOOL ba71bc35de2b252f1ac937b0781947fc70af158ef4953e2d234df9f4e64dda4226f853864b12ff204300e2c2ade1eda9383350797b851c93912eff4d89ae668b
 MISC metadata.xml 229 SHA256 12b161b95a7a407fa671dae17cb8b171096e6ad84c4a7dbcd4719e96ed08be56 SHA512 41ab0f6ef630ff95037ddee3f20d05f55eb6117e9e21c12ec070ce440bb189703bc76a5aedda4df14281d0a11bdec941ebce1416046440fafe2fc85b94ed95b7 WHIRLPOOL dbd0652e013d063bb12d913cb5eacf5dac07bd50a37e9618a5aa51eb97faf4a1944ad527e8025c8624daa974136f490d79a3b8d8bd07595634dac174781d2f29
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJVBcmIAAoJEJQzkH1pP7W4UtwMAJf110ReEfgdXftHt+SQGSa1
-52Wpkxcu0LqjHSN2T0cU5g8J5/efjmvWUOhei3W/04G7Q0xZ36x8orUB7e95PUi8
-28+VJMBPbhHedKwLDXCVZ/gOmhk4rnF+oJ59DfL/raKl8zNEYNbubaupgoo+rrh0
-uCzi7tOZEpq0ysdlo0Fwkjbz/+krPO+Go7t5flJit7no2LcsdfaskbQQTaANiTJx
-7TrUZpXUyJARXtsBPk26F2BR2dY3cJowaFD1wMz7lFoyNSf6M3Ot4S/sB3Nm8+SL
-VhCk1k1wsKqIXHXIJW8Ys1FUqjWcHZkcakaircz7C5EL3lD25b8Ix0rXNkJf4Hpy
-Nh7iHpGRYBkK6cJ7XJDLZjNzKW6u5BZwt4Hfa/q8pBy11HaCrsH3F99Ev/SPJjwM
-IIBFwnfuyvNDL2imhxGHUzd4hYD/ngNgoce4gBeNCNEUhkVw2q8sMCgC9duq2Xht
-wkb/LeA2BUOUmfnUh0I5fbr451E8pVY3YIijI8N5OQ==
-=WSy6
+iEYEAREIAAYFAlVLrrQACgkQCaWpQKGI+9Q7jQCdFSabsTGYKLBBSIeChPblfT8Y
+IisAn3aGkUJIq7yt9U3pzsKJ0OZwxbOx
+=xNxz
 -----END PGP SIGNATURE-----
diff --git a/dev-db/opendbx/opendbx-1.4.5-r1.ebuild b/dev-db/opendbx/opendbx-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..d5adda4a35b6
--- /dev/null
+++ b/dev-db/opendbx/opendbx-1.4.5-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.4.5-r1.ebuild,v 1.3 2015/05/07 18:28:03 pacho Exp $
+
+EAPI="5"
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="OpenDBX - A database abstraction layer"
+HOMEPAGE="http://www.linuxnetworks.de/doc/index.php/OpenDBX"
+SRC_URI="http://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="firebird +mysql oracle postgres sqlite"
+RESTRICT="firebird? ( bindist )"
+
+DEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	firebird? ( dev-db/firebird )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! ( use firebird || use mysql || use oracle || use postgres || use sqlite )
+	then
+		ewarn "You should enable at least one of the following USE flags:"
+		ewarn "firebird, mysql, oracle, postgres or sqlite"
+	fi
+
+	if use oracle && [[ ! -d ${ORACLE_HOME} ]]
+	then
+		die "Oracle support requested, but ORACLE_HOME not set to a valid directory!"
+	fi
+
+	use mysql && append-cppflags -I/usr/include/mysql
+	use firebird && append-cppflags -I/opt/firebird/include
+	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
+}
+
+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"
+
+	econf --with-backends="${backends}"
+}
+
+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}
+}
diff --git a/dev-db/opendbx/opendbx-1.4.6-r1.ebuild b/dev-db/opendbx/opendbx-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..38f2b6afd088
--- /dev/null
+++ b/dev-db/opendbx/opendbx-1.4.6-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.4.6-r1.ebuild,v 1.1 2015/05/07 18:28:03 pacho Exp $
+
+EAPI="5"
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="OpenDBX - A database abstraction layer"
+HOMEPAGE="http://www.linuxnetworks.de/doc/index.php/OpenDBX"
+SRC_URI="http://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="firebird +mysql oracle postgres sqlite"
+RESTRICT="firebird? ( bindist )"
+
+DEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	firebird? ( dev-db/firebird )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! ( use firebird || use mysql || use oracle || use postgres || use sqlite )
+	then
+		ewarn "You should enable at least one of the following USE flags:"
+		ewarn "firebird, mysql, oracle, postgres or sqlite"
+	fi
+
+	if use oracle && [[ ! -d ${ORACLE_HOME} ]]
+	then
+		die "Oracle support requested, but ORACLE_HOME not set to a valid directory!"
+	fi
+
+	use mysql && append-cppflags -I/usr/include/mysql
+	use firebird && append-cppflags -I/opt/firebird/include
+	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
+}
+
+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"
+
+	econf --with-backends="${backends}" || die "econf failed"
+}
+
+src_compile() {
+	# bug #322221
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake -j1 install DESTDIR="${D}" || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+
+	rm -f "${D}"/usr/$(get_libdir)/opendbx/*.{a,la}
+}
diff --git a/dev-db/opendbx/opendbx-1.5.0-r1.ebuild b/dev-db/opendbx/opendbx-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..21be99e93e7a
--- /dev/null
+++ b/dev-db/opendbx/opendbx-1.5.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.5.0-r1.ebuild,v 1.1 2015/05/07 18:28:03 pacho Exp $
+
+EAPI="5"
+
+inherit flag-o-matic multilib
+
+MY_PN="lib${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="OpenDBX - A database abstraction layer"
+HOMEPAGE="http://www.linuxnetworks.de/doc/index.php/OpenDBX"
+SRC_URI="http://www.linuxnetworks.de/opendbx/download/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x64-solaris"
+IUSE="firebird +mysql oracle postgres sqlite"
+RESTRICT="firebird? ( bindist )"
+
+DEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	firebird? ( dev-db/firebird )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	if ! ( use firebird || use mysql || use oracle || use postgres || use sqlite )
+	then
+		ewarn "You should enable at least one of the following USE flags:"
+		ewarn "firebird, mysql, oracle, postgres or sqlite"
+	fi
+
+	if use oracle && [[ ! -d ${ORACLE_HOME} ]]
+	then
+		die "Oracle support requested, but ORACLE_HOME not set to a valid directory!"
+	fi
+
+	use mysql && append-cppflags -I/usr/include/mysql
+	use firebird && append-cppflags -I/opt/firebird/include
+	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
+}
+
+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"
+
+	econf --with-backends="${backends}" || die "econf failed"
+}
+
+src_compile() {
+	# bug #322221
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake -j1 install DESTDIR="${D}" || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+
+	rm -f "${D}"/usr/$(get_libdir)/opendbx/*.{a,la}
+}