Version bump, remove old.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

4 files changed, 16 insertions, 148 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 046a0558b2bf..19eceaeb665e 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.165 2011/05/06 17:10:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.166 2011/06/03 17:42:16 pacho Exp $
+
+*libgda-4.2.8 (03 Jun 2011)
+
+  03 Jun 2011; Pacho Ramos <pacho@gentoo.org> -libgda-4.2.5-r1.ebuild,
+  -libgda-4.2.6.ebuild, +libgda-4.2.8.ebuild:
+  Version bump, remove old.
 
 *libgda-4.2.7 (06 May 2011)
 
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index f5af18d3c137..d425d2519c8f 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -6,20 +6,18 @@ AUX libgda-4.2.2-fix-build-order.patch 738 RMD160 b17874c3aab6b50b342e612e24bc70
 AUX libgda-4.2.5-missing-m4.patch 359 RMD160 495d1eb184ffeb1d529a385291b61b41fccff445 SHA1 55c70bfdbaf9411a10ddf6f63b71f6e12b315703 SHA256 ed03d29bdb6454d6a54bd21cb1844ecd294e2d58593ec58496deb09953176b2f
 DIST libgda-3.0.4.tar.bz2 2908854 RMD160 6efbf5a0f40277124dcc5464168677cc97be40e3 SHA1 50ba121e05ab1fbe95b66e8df4f54a0c6a30ef23 SHA256 3f9d75e9bc50610bf6033863b79265c7c9c702323b918caf90eb3923f971da48
 DIST libgda-4.2.2.tar.bz2 14091997 RMD160 2604f68f25ee1a44b9b44897a6d06a7d2ede63c1 SHA1 124c00c977b0cfd4a615c925ec79ee0ff97e107f SHA256 7d0bfca2eda3158fb44ff05890aabd79e6e4b357a03574eacf380dc03bcb9d87
-DIST libgda-4.2.5.tar.bz2 15196398 RMD160 e9bd4e33b8b5758a3e88775f18d66375389d51ba SHA1 ffafc1c51b5c27a21e716f71346c70552fa5525b SHA256 b98d6063469a1ba8226d94800732544be629c55132516de741c937e8bf175f13
-DIST libgda-4.2.6.tar.bz2 12632479 RMD160 c534658aea7eb82f6a3a008db846aa8588bc5eba SHA1 37ed6221f7cf162ac6df574d111f248e66d3aa4a SHA256 141259e19ba163500963bd5bd512cfa4eb542b24c99f2fa14a2ef27643308cd3
 DIST libgda-4.2.7.tar.bz2 12636540 RMD160 ab3587f3ed2d049cd1e7bd1f051188e7f2405470 SHA1 8c2b1a744ba50008fa230be0f0abebdb8ea9b0b9 SHA256 0c95d2ae4563bbb024c9179a20e95a4b544a7d4fc687ca79ac6b33c5adc113d5
+DIST libgda-4.2.8.tar.bz2 13130319 RMD160 ae4d1264b68122b3670c7bfbb7bc9b80fee9ae37 SHA1 01b859233407407807b2da1c4c244a5907695b7b SHA256 4f7a0bdb366f2711628a4751b40b2b194d1c5632d60fb8b549e2d8319f9c93cf
 EBUILD libgda-3.0.4.ebuild 1995 RMD160 e8c0f30a4cc85d69c98ac3162a61c4cdb70cb039 SHA1 5aa1b85875f7aa3b64f7af9c6eaec3dbb00f4653 SHA256 daddd4b35901c0848fcd1f7c7f63193c44e1d9935701f0d49ce71aecc448832b
 EBUILD libgda-4.2.2.ebuild 3523 RMD160 3c2d6d860bce908a4899a1e4650423d767757cad SHA1 a029fdb96de02751d8a6751ca542deb90925c835 SHA256 4f0926ae46da5228ab8f6d389c7988acab75ca186fdb887898b202d8d6482bd9
-EBUILD libgda-4.2.5-r1.ebuild 3820 RMD160 469f26e56e718332a7bf6b2d190d1cc59f6c5e11 SHA1 f953f9186089134cb2681cdd1fec6dbae9266a66 SHA256 a004aa40f2a70fde90e59d767a723ae73410b1ff851379aaddb8fea470a009cf
-EBUILD libgda-4.2.6.ebuild 3778 RMD160 22f4f49ede819242e9612c67db8277ef68b69e41 SHA1 6b8320553e18bbd2ef4dcd1c30f31521374553b2 SHA256 e887532355b912dd3e194da30ebc538cf5a774802dae977996b03b7cd116663c
 EBUILD libgda-4.2.7.ebuild 3673 RMD160 13189551efe8edf9338506a5bc6e3021055954dc SHA1 3e455d0345232a7781a0ff80e552d8f67ac41e10 SHA256 ceeb342355f59f7ef04088d1ab30e0e51fab76983fad85d68f3ab9841ce47bbf
-MISC ChangeLog 24935 RMD160 49d8ac104e0a518ba17fc672434ade911ac64e63 SHA1 3726d8c038b4aec75b186a8d40d6bb385a673e75 SHA256 d21a47fd30cb4cc513b3976e5d7e74c0098fe7d8613e0539217af63a820a99e1
+EBUILD libgda-4.2.8.ebuild 3673 RMD160 423df451e16239926f460586f10541ba44f76f4e SHA1 2cb2346edb93839f88e2592d174546198578382d SHA256 037aac3f6bf6e58b644de99dbd5d8639e5f2c8263d3f6ceb5f5ea8a7df5df877
+MISC ChangeLog 25110 RMD160 3df498f95d253f80e09ef4b8b81f6cdecd183c79 SHA1 6caa0b868c234eaf799a699e44faa7e9857ab012 SHA256 c2bd77a5226d9217d68c1a1ac5a94d1d08525a2b3584ef591f48c743b75c9086
 MISC metadata.xml 662 RMD160 b1ccb1efcefacfebab6e65d48e8bcd9cb5fa26b2 SHA1 d2faa83fd89fb86dbadfb846dd163633871a00b9 SHA256 ec5b2e3142cec4f76603d13d30843a887294646f285c278fc9e1258dae8e78e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3EK5AACgkQCaWpQKGI+9Tg3QCeL4r7qLnhC7Rj9vGEwuz4DMsu
-V7UAn1sNj8sNPvqiXLDyW3fPPi9/NOUU
-=+q/d
+iEYEARECAAYFAk3pHP4ACgkQCaWpQKGI+9Q3XgCfVdPyZXuzu2OIIOdaj+m7rYvO
+NygAni6kRWq3swASvjvUd9RJU+yg7yL1
+=Zerb
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/libgda-4.2.5-r1.ebuild b/gnome-extra/libgda/libgda-4.2.5-r1.ebuild
deleted file mode 100644
index a7673655971c..000000000000
--- a/gnome-extra/libgda/libgda-4.2.5-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.5-r1.ebuild,v 1.1 2011/04/04 15:40:19 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit autotools db-use eutils 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 canvas doc firebird gnome-keyring gtk graphviz http +introspection json mysql oci8 postgres sourceview ssl"
-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="
-	app-text/iso-codes
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	dev-libs/libunique:1
-	sys-libs/readline
-	sys-libs/ncurses
-	berkdb?   ( sys-libs/db )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	gtk? (
-		|| ( >=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 )
-		canvas? ( x11-libs/goocanvas:0 )
-		sourceview? ( x11-libs/gtksourceview:2.0 )
-		graphviz? ( media-gfx/graphviz )
-	)
-	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
-	http? ( >=net-libs/libsoup-2.24:2.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
-	json?     ( dev-libs/json-glib )
-	mysql?    ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ssl?      ( dev-libs/openssl )
-	>=dev-db/sqlite-3.6.22:3"
-#	mdb?      ( >app-office/mdbtools-0.5 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.18
-	>=dev-util/intltool-0.35.5
-	>=app-text/gnome-doc-utils-0.9
-	>=dev-util/gtk-doc-am-1
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-# Tests are not really good
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	if use canvas || use graphviz || use sourceview; then
-		if ! use gtk; then
-			ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
-			ewarn "Disabling for now."
-			G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
-		else
-			G2CONF="${G2CONF}
-				$(use_with canvas goocanvas)
-				$(use_with graphviz)
-				$(use_with sourceview gtksourceview)"
-		fi
-	fi
-
-	G2CONF="${G2CONF}
-		--with-unique
-		--disable-scrollkeeper
-		--disable-static
-		--enable-system-sqlite
-		$(use_with berkdb bdb /usr)
-		$(use_with gnome-keyring)
-		$(use_with gtk ui)
-		$(use_with http libsoup)
-		$(use_enable introspection)
-		$(use_with java java $JAVA_HOME)
-		$(use_with mysql mysql /usr)
-		$(use_with postgres postgres /usr)
-		$(use_enable ssl crypto)
-		--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)"
-	# --disable-json doesn't work, upstream bug #636439
-	use json && G2CONF="${G2CONF} --enable-json"
-	use oci8 || G2CONF="${G2CONF} --without-oracle"
-
-	# Not in portage
-	G2CONF="${G2CONF}
-		--disable-default-binary"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix build order for generated content, upstream #630958
-	epatch "${FILESDIR}/${PN}-4.2.2-fix-build-order.patch"
-
-	# Fix compilation failure of keyword_hash.c, upstream #630959
-	epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
-
-	# Don't break when running autoreconf, upstream bug #639319
-	epatch "${FILESDIR}/${PN}-4.2.5-missing-m4.patch"
-
-	intltoolize --force --copy --automake || die
-	eautoreconf
-}
-
-src_test() {
-	emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
-}
-
-src_install() {
-	gnome2_src_install
-	# Nothing uses these in the tree
-	find "${D}" -name '*.la' -exec rm -f '{}' + || die
-}
diff --git a/gnome-extra/libgda/libgda-4.2.6.ebuild b/gnome-extra/libgda/libgda-4.2.8.ebuild
index e95b0ea801ea..ed3d2c1da539 100644
--- a/gnome-extra/libgda/libgda-4.2.6.ebuild
+++ b/gnome-extra/libgda/libgda-4.2.8.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.6.ebuild,v 1.1 2011/04/20 16:54:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.8.ebuild,v 1.1 2011/06/03 17:42:16 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2
 
@@ -122,9 +123,3 @@ src_prepare() {
 src_test() {
 	emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
 }
-
-src_install() {
-	gnome2_src_install
-	# Nothing uses these in the tree
-	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
-}