| 1 |
dang 07/11/27 19:36:55 |
| 2 |
|
| 3 |
Modified: ChangeLog libgda-3.0.1.ebuild |
| 4 |
Removed: libgda-1.2.3.ebuild |
| 5 |
Log: |
| 6 |
Hide firebird behind bindist; bug #200284 |
| 7 |
(Portage version: 2.1.4_rc3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.118 gnome-extra/libgda/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/ChangeLog?rev=1.118&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/ChangeLog?rev=1.118&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/ChangeLog?r1=1.117&r2=1.118 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v |
| 19 |
retrieving revision 1.117 |
| 20 |
retrieving revision 1.118 |
| 21 |
diff -u -r1.117 -r1.118 |
| 22 |
--- ChangeLog 10 Nov 2007 12:12:20 -0000 1.117 |
| 23 |
+++ ChangeLog 27 Nov 2007 19:36:54 -0000 1.118 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for gnome-extra/libgda |
| 26 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.117 2007/11/10 12:12:20 nixnut Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.118 2007/11/27 19:36:54 dang Exp $ |
| 29 |
+ |
| 30 |
+ 27 Nov 2007; Daniel Gryniewicz <dang@g.o> |
| 31 |
+ -files/libgda-1.2.3-freetds_api_fixes.patch, -libgda-1.2.3.ebuild, |
| 32 |
+ libgda-3.0.1.ebuild: |
| 33 |
+ Hide firebird behind bindist; bug #200284 |
| 34 |
|
| 35 |
10 Nov 2007; nixnut <nixnut@g.o> libgda-1.2.4.ebuild: |
| 36 |
Stable on ppc wrt bug 197799 |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.4 gnome-extra/libgda/libgda-3.0.1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/libgda-3.0.1.ebuild?rev=1.4&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/libgda-3.0.1.ebuild?rev=1.4&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/libgda-3.0.1.ebuild?r1=1.3&r2=1.4 |
| 45 |
|
| 46 |
Index: libgda-3.0.1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-3.0.1.ebuild,v |
| 49 |
retrieving revision 1.3 |
| 50 |
retrieving revision 1.4 |
| 51 |
diff -u -r1.3 -r1.4 |
| 52 |
--- libgda-3.0.1.ebuild 27 Jul 2007 14:19:11 -0000 1.3 |
| 53 |
+++ libgda-3.0.1.ebuild 27 Nov 2007 19:36:54 -0000 1.4 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2007 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-3.0.1.ebuild,v 1.3 2007/07/27 14:19:11 uberlord Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-3.0.1.ebuild,v 1.4 2007/11/27 19:36:54 dang Exp $ |
| 59 |
|
| 60 |
# TODO: |
| 61 |
# * Verify if the parallel compilation problems persist, and if so fix them. |
| 62 |
@@ -12,7 +12,7 @@ |
| 63 |
LICENSE="GPL-2 LGPL-2" |
| 64 |
|
| 65 |
# MDB support currently works with CVS only, so disable it in the meantime |
| 66 |
-IUSE="berkdb doc firebird freetds ldap mysql oci8 odbc postgres xbase" |
| 67 |
+IUSE="berkdb bindist doc firebird freetds ldap mysql oci8 odbc postgres xbase" |
| 68 |
SLOT="3" |
| 69 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 70 |
|
| 71 |
@@ -26,7 +26,7 @@ |
| 72 |
mysql? ( virtual/mysql ) |
| 73 |
postgres? ( >=dev-db/libpq-7.2.1 ) |
| 74 |
freetds? ( >=dev-db/freetds-0.62 ) |
| 75 |
- firebird? ( dev-db/firebird ) |
| 76 |
+ !bindist? ( firebird? ( dev-db/firebird ) ) |
| 77 |
xbase? ( dev-db/xbase ) |
| 78 |
ldap? ( >=net-nds/openldap-2.0.25 )" |
| 79 |
# mdb? ( >app-office/mdbtools-0.5 ) |
| 80 |
@@ -47,12 +47,18 @@ |
| 81 |
$(use_with mysql mysql /usr) \ |
| 82 |
$(use_with postgres postgres /usr) \ |
| 83 |
$(use_with freetds tds /usr) \ |
| 84 |
- $(use_with firebird firebird /usr) \ |
| 85 |
$(use_with xbase xbase /usr) \ |
| 86 |
$(use_with ldap ldap /usr) \ |
| 87 |
--without-mdb" |
| 88 |
# $(use_with mdb mdb /usr) \ |
| 89 |
|
| 90 |
+ if use bindist; then |
| 91 |
+ # firebird license is not GPL compatible |
| 92 |
+ G2CONF="${G2CONR} --without-firebird" |
| 93 |
+ else |
| 94 |
+ G2CONF="${G2CONR} $(use_with firebird firebird /usr)" |
| 95 |
+ fi |
| 96 |
+ |
| 97 |
use berkdb && append-cppflags "-I$(db_includedir)" |
| 98 |
use oci8 || G2CONF="${G2CONF} --without-oracle" |
| 99 |
|
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
-- |
| 104 |
gentoo-commits@g.o mailing list |
Archives