swegener 14/03/10 21:15:06
Modified: opendbx-1.4.6.ebuild metadata.xml ChangeLog
opendbx-1.5.0.ebuild
Added: opendbx-1.4.5-r1.ebuild
Log:
Add local description for bindist USE flag, bug #448918. Bump EAPI for
REQUIRED_USE support.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key
0x64D4CF24)
Revision Changes Path
1.3 dev-db/opendbx/opendbx-1.4.6.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/opendbx-1.4.6.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/opendbx-1.4.6.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/opendbx-1.4.6.ebuild?r1=1.2&r2=1.3
Index: opendbx-1.4.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.4.6.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opendbx-1.4.6.ebuild 28 Oct 2013 18:13:58 -0000 1.2
+++ opendbx-1.4.6.ebuild 10 Mar 2014 21:15:06 -0000 1.3
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.ebuild,v 1.2
2013/10/28 18:13:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.4.6.ebuild,v 1.3
2014/03/10 21:15:06 swegener Exp $
-EAPI="2"
+EAPI="5"
inherit flag-o-matic multilib
@@ -20,11 +20,13 @@
sqlite? ( <dev-db/sqlite-3 )
sqlite3? ( =dev-db/sqlite-3* )
oracle? ( dev-db/oracle-instantclient-basic )
- !bindist? ( firebird? ( dev-db/firebird ) )"
+ firebird? ( dev-db/firebird )"
RDEPEND="${DEPEND}"
+REQUIRED_USE="bindist? ( !firebird )"
+
pkg_setup() {
- if ! ( use !bindist && use firebird || use mysql || use oracle || use
postgres || use sqlite || use sqlite3 )
+ if ! ( use firebird || use mysql || use oracle || use postgres || use
sqlite || use sqlite3 )
then
ewarn "You should enable at least one of the following USE
flags:"
ewarn "firebird, mysql, oracle, postgres, sqlite or sqlite3"
1.3 dev-db/opendbx/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/metadata.xml?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/metadata.xml?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/metadata.xml?r1=1.2&r2=1.3
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/opendbx/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml 23 Sep 2011 22:08:05 -0000 1.2
+++ metadata.xml 10 Mar 2014 21:15:06 -0000 1.3
@@ -5,4 +5,8 @@
<email>[email protected]</email>
<description>Primary Maintainer</description>
</maintainer>
+<use>
+ <flag name="bindist">Disable support for <pkg>dev-db/firebird</pkg>
database
+ which is not GPL compatible.</flag>
+</use>
</pkgmetadata>
1.37 dev-db/opendbx/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/ChangeLog?rev=1.37&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/ChangeLog?rev=1.37&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/ChangeLog?r1=1.36&r2=1.37
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/opendbx/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog 28 Oct 2013 18:13:58 -0000 1.36
+++ ChangeLog 10 Mar 2014 21:15:06 -0000 1.37
@@ -1,6 +1,13 @@
# ChangeLog for dev-db/opendbx
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/ChangeLog,v 1.36 2013/10/28
18:13:58 grobian Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/ChangeLog,v 1.37 2014/03/10
21:15:06 swegener Exp $
+
+*opendbx-1.4.5-r1 (10 Mar 2014)
+
+ 10 Mar 2014; Sven Wegener <[email protected]> +opendbx-1.4.5-r1.ebuild,
+ opendbx-1.4.6.ebuild, opendbx-1.5.0.ebuild, metadata.xml:
+ Add local description for bindist USE flag, bug #448918. Bump EAPI for
+ REQUIRED_USE support.
28 Oct 2013; Fabian Groffen <[email protected]> opendbx-1.4.6.ebuild,
opendbx-1.5.0.ebuild:
1.3 dev-db/opendbx/opendbx-1.5.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/opendbx-1.5.0.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/opendbx-1.5.0.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/opendbx-1.5.0.ebuild?r1=1.2&r2=1.3
Index: opendbx-1.5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.5.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opendbx-1.5.0.ebuild 28 Oct 2013 18:13:58 -0000 1.2
+++ opendbx-1.5.0.ebuild 10 Mar 2014 21:15:06 -0000 1.3
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.ebuild,v 1.2
2013/10/28 18:13:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.5.0.ebuild,v 1.3
2014/03/10 21:15:06 swegener Exp $
-EAPI="2"
+EAPI="5"
inherit flag-o-matic multilib
@@ -23,13 +23,15 @@
sqlite? ( <dev-db/sqlite-3 )
sqlite3? ( =dev-db/sqlite-3* )
oracle? ( dev-db/oracle-instantclient-basic )
- !bindist? ( firebird? ( dev-db/firebird ) )"
+ firebird? ( dev-db/firebird )"
RDEPEND="${DEPEND}"
+REQUIRED_USE="bindist? ( !firebird )"
+
S="${WORKDIR}"/${MY_P}
pkg_setup() {
- if ! ( use !bindist && use firebird || use mysql || use oracle || use
postgres || use sqlite || use sqlite3 )
+ if ! ( use firebird || use mysql || use oracle || use postgres || use
sqlite || use sqlite3 )
then
ewarn "You should enable at least one of the following USE
flags:"
ewarn "firebird, mysql, oracle, postgres, sqlite or sqlite3"
1.1 dev-db/opendbx/opendbx-1.4.5-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/opendbx-1.4.5-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/opendbx/opendbx-1.4.5-r1.ebuild?rev=1.1&content-type=text/plain
Index: opendbx-1.4.5-r1.ebuild
===================================================================
# Copyright 1999-2014 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.1
2014/03/10 21:15:06 swegener 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="bindist firebird +mysql oracle postgres sqlite sqlite3"
DEPEND="mysql? ( virtual/mysql )
postgres? ( dev-db/postgresql-base )
sqlite? ( <dev-db/sqlite-3 )
sqlite3? ( =dev-db/sqlite-3* )
oracle? ( dev-db/oracle-instantclient-basic )
firebird? ( dev-db/firebird )"
RDEPEND="${DEPEND}"
REQUIRED_USE="bindist? ( !firebird )"
pkg_setup() {
if ! ( use firebird || use mysql || use oracle || use postgres || use
sqlite || use sqlite3 )
then
ewarn "You should enable at least one of the following USE
flags:"
ewarn "firebird, mysql, oracle, postgres, sqlite or sqlite3"
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 !bindist && use firebird && backends="${backends} firebird"
use mysql && backends="${backends} mysql"
use oracle && backends="${backends} oracle"
use postgres && backends="${backends} pgsql"
use sqlite && backends="${backends} sqlite"
use sqlite3 && 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}
}
