Remove old revision. Fix http use flag handling, bug #343613.

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

4 files changed, 19 insertions, 104 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 619b6ca988a8..cb2d7cb12240 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.152 2010/10/28 16:49:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.153 2010/11/01 12:18:13 eva Exp $
+
+  01 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org> -libgda-4.1.0.ebuild,
+  libgda-4.2.0.ebuild:
+  Remove old revision. Fix http use flag handling, bug #343613.
 
   28 Oct 2010; Jeroen Roovers <jer@gentoo.org> libgda-4.1.4-r1.ebuild:
   Stable for PPC (bug #327803).
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index e0d97a06ed96..4eb9a1953232 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libgda-1.2.3-mdb_api.patch 1374 RMD160 d7091403baa8b299d815be7e679fb17720d18b29 SHA1 8e36dec7a9844769697df815048f126b47a89792 SHA256 a65143afb029c72db1038f6577e517377263f9d9281eb583e8bbffe9d1a7e499
 AUX libgda-1.2.4-freetds_api_fixes.patch 14119 RMD160 2c2becec232a74eb9e430288b3e78f70e2294f2c SHA1 125e13af1ffbf03d2f503908a67eb7575fe65dc4 SHA256 cf4dfa78d13f79d698532945ba7a26edc2a256a7b1fa3cdc89eec544d18448ea
 AUX libgda-4.0.2-libsoup-magic.patch 1029 RMD160 7de27c428c734e83e9475340e731e65217626418 SHA1 e28b5799ba4245253580bd2bdd1a7ef77b6a4ada SHA256 91df316d270025f7d42a7027fdc8d8a688448f54886d7060efdb5d566f25b4b5
@@ -9,15 +12,20 @@ AUX libgda-4.2.0-json-libcrypto-automagic.patch 3004 RMD160 6aeb885ea26b920d3e8c
 AUX libgda-4.2.0-missing-include-in-keyword_hash-generator.patch 897 RMD160 2a879a730831b7d6c05bf3a48df542cbf025adc4 SHA1 d76018f2b545290174cce55be7c4561edf7772bc SHA256 7cc133de8931b1dc86a08ee7a620e8b9218071723549734ea2290440318a7b8f
 DIST libgda-1.2.4.tar.bz2 1087076 RMD160 83981076ac408fdd4b89f0cb97cb605d5301fcb2 SHA1 a2fefe602a07ca92cfb066492e33d4d1e4733bfc SHA256 d5e700203764e3f8d9ab3573a9b1b0e218778022c7956cf719fa0500b3027930
 DIST libgda-3.0.4.tar.bz2 2908854 RMD160 6efbf5a0f40277124dcc5464168677cc97be40e3 SHA1 50ba121e05ab1fbe95b66e8df4f54a0c6a30ef23 SHA256 3f9d75e9bc50610bf6033863b79265c7c9c702323b918caf90eb3923f971da48
-DIST libgda-4.1.0.tar.bz2 8574216 RMD160 ebfced03c7436b12f76838f52364f4060922fdf1 SHA1 2518f79ead114b49395812736cf170be8403210e SHA256 0abd9b4d9111451a6dca6732d3523a57b4a1f823f85c2c0c58e1a28a5badb563
 DIST libgda-4.1.10.tar.bz2 12944110 RMD160 979abd512ff437eded06d770568ca7d36d7c4e5d SHA1 78f7018734905ba1aa83b4b8add9184eed369fa0 SHA256 2800989489410ba5cc4c0adbd0efd79a539175b17ee19342e737fb11824aad55
 DIST libgda-4.1.4.tar.bz2 12217669 RMD160 a2331b9ece709e215a4c8b73d33cc0557142ab32 SHA1 b18c1b7d3114ca370a54bb7bbd6bbb931509a46a SHA256 82866d2d9628f2605f7fd22f12953d2516259401f3d234c208865d7881659235
 DIST libgda-4.2.0.tar.bz2 13932542 RMD160 fa284ee1bc98ff81fcd788c77fdd467fab861b63 SHA1 98da33580855525c927afcbdaea83625156ec206 SHA256 2e639957f50719957cea5326b0d95511794322a54f9ef8547d3241f409765441
 EBUILD libgda-1.2.4.ebuild 2283 RMD160 b306c86af14692c872e890531d5bda5eb257d87b SHA1 d34d29c4bbdfbdf1be035e4cbb64bba40d02713f SHA256 a829c7280f55733b294c6ea3bf90c592842a61c0575dc64e66690bb8e0ad8e68
 EBUILD libgda-3.0.4.ebuild 1995 RMD160 e8c0f30a4cc85d69c98ac3162a61c4cdb70cb039 SHA1 5aa1b85875f7aa3b64f7af9c6eaec3dbb00f4653 SHA256 daddd4b35901c0848fcd1f7c7f63193c44e1d9935701f0d49ce71aecc448832b
-EBUILD libgda-4.1.0.ebuild 2630 RMD160 6ac4a78e79d1d89ed7df1b81cb9a7c36cbe45bdc SHA1 c1027deed2c3048ed85f752027c39db5ce53aa68 SHA256 c1609cf64076c6e144cf744a8bfa66a3a92318df7ff8cc51c62691f5f0112476
 EBUILD libgda-4.1.10.ebuild 3234 RMD160 22e494e6c2fa22a6db3ec7038d5ddc2602427db3 SHA1 6ac697f2d129e77ee56a3a14abc57b233b658dfc SHA256 987f2b3ec9ba413042ac42642d72ba091654bfae78a4fbcfaeefd441460b0914
 EBUILD libgda-4.1.4-r1.ebuild 3185 RMD160 b4f8c8bbbaafae5aaef429ecc3aa640cdec082bc SHA1 8b3ef8261229a31d8534f70e8f8dcb5a41b6d2ad SHA256 6035221f5b86efc90849c3df57606086e122db0279161f651df14ae7cd5b938b
-EBUILD libgda-4.2.0.ebuild 3984 RMD160 c92b1d3ccdfcde5669fde257b349f2c0cacbeae5 SHA1 52dcd404742cc3e808df9eaa89cab504ec95ad90 SHA256 f36f7aaf82573fe438274c93bf8233e2a0f845249e584749e2cedb72035fc79f
-MISC ChangeLog 22747 RMD160 85c58cf5083ac6b72b719a5ec9383a849a5c9ecf SHA1 0d2ca1c04208eae70270dad6ae7689ce9c9decef SHA256 1788c0b1fe223f4fb1559527735b3423d14172f4770f9fd469016307ac811700
+EBUILD libgda-4.2.0.ebuild 3978 RMD160 e654e1951a5040732c65955beb8e3dfa2a33928b SHA1 84790a4ecd2642acdf10e2b279366a4c7d41ebde SHA256 c468a2fb596e26308c6fedf89a16d4fecdc4f9adeefa95b33a7a004c09bae7f3
+MISC ChangeLog 22911 RMD160 cb23f85031547a5f9a73fe42d140b458ee8ea47b SHA1 8e93250bdab36f291bb80380ebae13bf5e392d1d SHA256 a147e754d12519be855c02af1cca275c9d5cbb32f1e6436bc963e79de4f2f179
 MISC metadata.xml 723 RMD160 9d9142462b76a2f63fef0aae5234b82bdaa691b5 SHA1 1f1bfff922d1a5ee49ad825212f8b865d30c818a SHA256 e4a93d5cfd3ca132966e5a14daafbbf8c99f944e70e184bfa137a0bb4df676e9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzOsBgACgkQ1fmVwcYIWAadOwCfTgMrSdPePlba4UzIzCZXTbQ8
+BGoAoM3wip1Fow/5wDnP5pNi95m17Mjw
+=lZp4
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/libgda-4.1.0.ebuild b/gnome-extra/libgda/libgda-4.1.0.ebuild
deleted file mode 100644
index c47632bedf7c..000000000000
--- a/gnome-extra/libgda/libgda-4.1.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.1.0.ebuild,v 1.9 2010/07/20 15:37:29 jer Exp $
-
-EAPI="2"
-
-inherit autotools db-use flag-o-matic gnome2 java-pkg-opt-2
-
-DESCRIPTION="Gnome Database Access Library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2 LGPL-2"
-
-# MDB support currently works with CVS only, so disable it in the meantime
-IUSE="berkdb bindist doc firebird freetds ldap mysql oci8 odbc postgres xbase"
-SLOT="4"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-# FIXME: sqlite is automagic, but maybe it is a hard-dep
-# FIXME: autoconf is a hell of inconsistencies
-RDEPEND=">=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2
-	dev-libs/libxslt
-	sys-libs/readline
-	sys-libs/ncurses
-	>=net-libs/libsoup-2.24
-	berkdb?   ( sys-libs/db )
-	odbc?     ( >=dev-db/unixODBC-2.0.6 )
-	mysql?    ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	freetds?  ( >=dev-db/freetds-0.62 )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	xbase?    ( dev-db/xbase )
-	ldap?     ( >=net-nds/openldap-2.0.25 )
-	>=dev-db/sqlite-3.6.11:3"
-#   json?     ( dev-libs/json-glib )
-#	mdb?      ( >app-office/mdbtools-0.5 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.18
-	>=dev-util/intltool-0.35.5
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# Tests are not really good
-RESTRICT="test"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-libsoup
-		 --enable-system-sqlite
-		$(use_with berkdb bdb /usr)
-		$(use_with odbc odbc /usr)
-		$(use_with mysql mysql /usr)
-		$(use_with postgres postgres /usr)
-		$(use_with freetds tds /usr)
-		$(use_with xbase xbase /usr)
-		$(use_with ldap ldap /usr)
-		$(use_with java java $JAVA_HOME)
-		--without-mdb"
-#		$(use_with mdb mdb /usr)
-
-	if use bindist; then
-		# firebird license is not GPL compatible
-		G2CONF="${G2CONF} --without-firebird"
-	else
-		G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
-	fi
-
-	use berkdb && append-cppflags "-I$(db_includedir)"
-	use oci8 || G2CONF="${G2CONF} --without-oracle"
-
-	# Not in portage
-	G2CONF="${G2CONF}
-		--without-msql
-		--without-sybase
-		--without-ibmdb2
-		--disable-default-binary"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix sandbox violations, upstream bug #579458
-	epatch "${FILESDIR}/${PN}-4.0.2-sandbox.patch"
-
-	# Fix automagic libsoup support, upstream bug #584398
-	epatch "${FILESDIR}/${PN}-4.0.2-libsoup-magic.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_test() {
-	emake check HOME=$(unset HOME; echo "~") || die "tests failed"
-}
diff --git a/gnome-extra/libgda/libgda-4.2.0.ebuild b/gnome-extra/libgda/libgda-4.2.0.ebuild
index 25f067d6402b..bd778814e99f 100644
--- a/gnome-extra/libgda/libgda-4.2.0.ebuild
+++ b/gnome-extra/libgda/libgda-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.0.ebuild,v 1.2 2010/10/10 11:57:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.0.ebuild,v 1.3 2010/11/01 12:18:13 eva Exp $
 
 EAPI="3"
 
@@ -82,7 +82,7 @@ pkg_setup() {
 		$(use_with freetds tds /usr)
 		$(use_with gnome-keyring)
 		$(use_with gtk ui)
-		$(use_enable http libsoup)
+		$(use_with http libsoup)
 		$(use_enable introspection)
 		$(use_with java java $JAVA_HOME)
 		$(use_enable json)