[gentoo-commits] gentoo-x86 commit in gnome-extra/libgda: ChangeLog libgda-3.0.1.ebuild libgda-1.2.3.ebuild

[gentoo-commits] gentoo-x86 commit in gnome-extra/libgda: ChangeLog libgda-3.0.1.ebuild libgda-1.2.3.ebuild

[Daniel Gryniewicz (dang)]

dang        07/11/27 19:36:55

  Modified:             ChangeLog libgda-3.0.1.ebuild
  Removed:              libgda-1.2.3.ebuild
  Log:
  Hide firebird behind bindist; bug #200284
  (Portage version: 2.1.4_rc3)

Revision  Changes    Path
1.118                gnome-extra/libgda/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/ChangeLog?rev=1.118&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/ChangeLog?rev=1.118&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/ChangeLog?r1=1.117&r2=1.118

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- ChangeLog	10 Nov 2007 12:12:20 -0000	1.117
+++ ChangeLog	27 Nov 2007 19:36:54 -0000	1.118
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.117 2007/11/10 12:12:20 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.118 2007/11/27 19:36:54 dang Exp $
+
+  27 Nov 2007; Daniel Gryniewicz <dang@gentoo.org>
+  -files/libgda-1.2.3-freetds_api_fixes.patch, -libgda-1.2.3.ebuild,
+  libgda-3.0.1.ebuild:
+  Hide firebird behind bindist; bug #200284
 
   10 Nov 2007; nixnut <nixnut@gentoo.org> libgda-1.2.4.ebuild:
   Stable on ppc wrt bug 197799



1.4                  gnome-extra/libgda/libgda-3.0.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/libgda-3.0.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/libgda-3.0.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/libgda-3.0.1.ebuild?r1=1.3&r2=1.4

Index: libgda-3.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-3.0.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgda-3.0.1.ebuild	27 Jul 2007 14:19:11 -0000	1.3
+++ libgda-3.0.1.ebuild	27 Nov 2007 19:36:54 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-3.0.1.ebuild,v 1.3 2007/07/27 14:19:11 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-3.0.1.ebuild,v 1.4 2007/11/27 19:36:54 dang Exp $
 
 # TODO:
 # * Verify if the parallel compilation problems persist, and if so fix them.
@@ -12,7 +12,7 @@
 LICENSE="GPL-2 LGPL-2"
 
 # MDB support currently works with CVS only, so disable it in the meantime
-IUSE="berkdb doc firebird freetds ldap mysql oci8 odbc postgres xbase"
+IUSE="berkdb bindist doc firebird freetds ldap mysql oci8 odbc postgres xbase"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
@@ -26,7 +26,7 @@
 	mysql?    ( virtual/mysql )
 	postgres? ( >=dev-db/libpq-7.2.1 )
 	freetds?  ( >=dev-db/freetds-0.62 )
-	firebird? ( dev-db/firebird )
+	!bindist? ( firebird? ( dev-db/firebird ) )
 	xbase?    ( dev-db/xbase )
 	ldap?     ( >=net-nds/openldap-2.0.25 )"
 #	mdb?      ( >app-office/mdbtools-0.5 )
@@ -47,12 +47,18 @@
 		$(use_with mysql mysql /usr)       \
 		$(use_with postgres postgres /usr) \
 		$(use_with freetds tds /usr)       \
-		$(use_with firebird firebird /usr) \
 		$(use_with xbase xbase /usr)       \
 		$(use_with ldap ldap /usr)         \
 		--without-mdb"
 #		$(use_with mdb mdb /usr)           \
 
+	if use bindist; then
+		# firebird license is not GPL compatible
+		G2CONF="${G2CONR} --without-firebird"
+	else
+		G2CONF="${G2CONR} $(use_with firebird firebird /usr)"
+	fi
+
 	use berkdb && append-cppflags "-I$(db_includedir)"
 	use oci8 || G2CONF="${G2CONF} --without-oracle"
 



-- 
gentoo-commits@gentoo.org mailing list