drop old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 9 insertions, 319 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 636d11783ab8..1662cc7720a2 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.225 2014/03/09 12:00:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.226 2014/04/26 20:04:01 pacho Exp $
+
+  26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -libgda-5.0.3-r1.ebuild,
+  -libgda-5.0.4.ebuild:
+  drop old
 
   09 Mar 2014; Pacho Ramos <pacho@gentoo.org> libgda-5.2.2.ebuild:
   x86 stable, bug 499954
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 7f832927c5ee..510208e91ef3 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -9,19 +9,15 @@ AUX libgda-4.99.4-statement-rewriting-fix.patch 17054 SHA256 81c6089b0899ef43428
 AUX libgda-5.0.3-custom.vala 171 SHA256 28be89b84fdb22a38d7c0d9bb65e6d1a8ebfc3aa16eff424e26bdcfe95e2d0bf SHA512 5894e70dec948f1db4d85a03c6fad580e1f9cd411bcf6e424f536dc1b695841051b1f83782c249661cd5f1307b9cc772f58025d21b66f75637485feabe591ce2 WHIRLPOOL 3e8cbb33b45d7e57f0b611f35041e463fad7a9de56843afc515e14bbf5a7c05f1b4b743d445fb1b59a155f544790311b2223c3e05bbef0e2c23ccadd5e34c0a0
 AUX libgda-5.1.2-graphviz.patch 3346 SHA256 29de3081c8fc5a8eaef92bfcc5bb4cf662faf22b96b8ac858af4a2ebe21198e0 SHA512 fdf43692755dee496a85532f1b155c36f1bfebc0c16b860a97e85172021f1b0131d94824283f175321bf63f44b6726dcb9d672544f7a7fc716a558d5535fa8b1 WHIRLPOOL 7a8bddfcc7a2014a10f6f894b1ae3488e6dda76d5a3e571760de5ac4525d90f4fb670e26fb9de627f59917869da33a66a3ecc0148af3a274debdd60da0a065a2
 DIST libgda-4.2.13.tar.xz 11247816 SHA256 25b75951f8f38fd58a403389566a0aae2f83b39d4225bc3acf5f2d68895ab4c3 SHA512 54506b65ac7127ab67168f8169aba4d366ea1c7f9e5401c27c00a7eee7ea5ce33821faef0c7f2d397455869bd98025990b527cb7ad8cca1a88d32bd699d44f22 WHIRLPOOL c958ecb735b5ba84236bd80f20f39017dca35911452ad95c65c82e4ee40eadecc683d78f7d459f65d576d520e309f19ceddf0da3054696d83261ebd141db13b8
-DIST libgda-5.0.3.tar.xz 11623340 SHA256 82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc SHA512 ee71b3be95f735aeb536b5af5c873e1175e934f930657eca567d79f12cf471d0f5714cd749e9cde483efd868db00e83fad6c1698da0a004d8653fc544f361b55 WHIRLPOOL c321c4344d50965927951050ee1e5c55205e23cc286b627b5a5fddd2bd7756fcc48b8852078b2b092f315113304ec8734d2bd048f0bbde24ad93f890e1f4ef10
-DIST libgda-5.0.4.tar.xz 11565144 SHA256 e4fbb17ba2f0630172b364fea2b6ef413fce81b8dbc4ee5c0957087b8f31c5ff SHA512 97a4f9eef6bbd7cab4b7082398f6515df9f3aa50285ff73a821611a3c908a10bb2429fd4020de4598230a4985833ba4b4035cd7c8ee398341fae9e5dfd4a42ee WHIRLPOOL 7bb8191090cb28ace9e0493105d67f7683d1375a089e2358a134ebdd7fec8b27236a77f4cfadd310ae474b411f758e31e9086884711f0accc1cef3f831f85b1a
 DIST libgda-5.2.2.tar.xz 12173216 SHA256 c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4 SHA512 b09ef364c3357a58b17508a39ee53ef462baa54bb3c8af580d23fd2771b034355092ecdb7ef29b29dd08533394a702f12b838732c712fb6b3a04b6b201cd3c74 WHIRLPOOL 463efc5825be741d55ab6741d250f537537d59c71d926c20c7202f384e5c7c9b2bcc49419a796df4bfa5e9248f59bcf12aa8331495c3aae7d56408f295c0693f
 EBUILD libgda-4.2.13.ebuild 3084 SHA256 0c62b2eb9a28bd9171b640d4822543a8e3b12b3c86e95eda16b66b7ff49876fb SHA512 f52006e896e7b5cf0365091bd360db2b46072eef90c0e8df6edea3bcafc3e458c78270529c7b916a2c5a01efb314aef04889866756810abfe3b6a63a596b569a WHIRLPOOL 2ba71cbc8c746bd95214d31503fcf3ac7badd7a9be2faf9d3fa58665f9604ce205433890e3dc837368ba43af4a46d4068492c813f783813de816a0c5268cdbbb
-EBUILD libgda-5.0.3-r1.ebuild 4709 SHA256 902e25377accf9bb7e66467789a09f1be725a1fb4e00a0650514aa86730de0d8 SHA512 3be584cf6e950c273de9a63dfeea74f535dedf4a1da94bf8b609043e26682da70cf2e974fc780d70463acb130d4304d05bdeadbc20d411aaadfd980a60a18c29 WHIRLPOOL 7bc9d59494af35cd63f97735ac29ea9b60b65d3416fb3fd92df2b581efed652461326f54227430d4df54674557caf4397646d9e55c477d781aaa3b0d042200d8
-EBUILD libgda-5.0.4.ebuild 4372 SHA256 31e9e160d1adde54a7184076ac2e62393ebab745c093343045217078f5358f29 SHA512 42249abaaf8883f5ca70ab186a6a746c4753a7603b808196d75007a4651aac937982a08db68ca03dd21321e778c4cfa2c39c32755b07a1aa23f4109949be32e1 WHIRLPOOL 49bc3bd10cc6aab7b9fb372fd0a7ef243fdfb815ad399ba2e8da9ef67fff9a0efc79ebb3bd8ba693d653da625f206af744bfb1de0e244f49edfaabf8d2060a0b
 EBUILD libgda-5.2.2.ebuild 4358 SHA256 c175d153614f70718e3337778d982f3f902736e356e9618c7335d8222ed035c1 SHA512 63929f136755779096527d9ca529ab0ca0f7889a591e70b1e00ff903b3dd7eeb029f4a74e25c1a7c3c4f7839589da7cf34455d0395480dc85053dd49ba518e16 WHIRLPOOL 7a561e49b0322fe89d1340bed0c873c88229c7f5878bcfbe0eebd49228b1e7b13ad1c42f99d9976b4ca8e8bc15caa966f99b447b5907cc4287b5d5584e11fdc4
-MISC ChangeLog 34727 SHA256 118e9e62ff4385ea37905ac144ed075e0e465e4b7eee4f2e54386f91734aba4f SHA512 d66b3bd9e662a558627f8e0bbf52cbee07303bb95850e966aaa75d3ee36419a6de09f6d58e46c53fa51b6067fa33ff88430d021663ccbeacf2bcb70e579b1f3d WHIRLPOOL b00f22ce99c04fa4a35f204eaa5d72e6f23ca081fc3e0a6eede428a173c4e75edcb982168aee77fb67ea7a98471e3c9882dbae22eae4b0f45e4cf4ebca854055
+MISC ChangeLog 34834 SHA256 63be9b446d28ec128c15e6f7b92f722b9703381988a1e9d872bf018766294845 SHA512 0d414ef1bc5aa1c8000fab143a06e668b8050b5eabb34822d5b6c5b0fa8b48d173b5bbace816bbdd06fb3cdcc083f3e141858219742246ffbcbd492fddeef69f WHIRLPOOL 1aa8da9b684c9c0ab9751bbac406a4f031e17360a2fa713af28bd24c1431357e2355af4233f737eff0f270d896d843725ae0aec58c2b68d8d00e5fb1d74d4d9f
 MISC metadata.xml 908 SHA256 950b0cbb48f8f9254e4457efc8d4e290edcc814a1b07dfb85eb0d61b077bfc4c SHA512 e9b04c54efd1d15fed1e3820e0b5ccb9c6bd8260deabc9e850278132906263e18f4156598b3bafc26ef57ae0e83a95a6560e182bf7b3c63db045611ee36549b7 WHIRLPOOL d8f28595e61688646263d534b60235072294c96a62f1c86bd42a83ce481dc584c4939ad354b55718169c64522656d135ab4f0733db2a9fa05e27a6490aff3e5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMcV+gACgkQCaWpQKGI+9SktgCeNiJBP09mLAyBwFDWEbaqVBwV
-pk4AnR4lMzTFWjy9w9r3x1F/jSeEi/eu
-=wh35
+iEYEAREIAAYFAlNcETIACgkQCaWpQKGI+9QgegCdHpg0o7t7fW7gTZC+E0DSWQMY
+V4QAnRzDkTbPblCQ7bzyo+r0sVb5m5jw
+=HxoD
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/libgda-5.0.3-r1.ebuild b/gnome-extra/libgda/libgda-5.0.3-r1.ebuild
deleted file mode 100644
index e1074b4fb4e0..000000000000
--- a/gnome-extra/libgda/libgda-5.0.3-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3-r1.ebuild,v 1.10 2012/12/17 08:01:41 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-PYTHON_DEPEND="2"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb bindist canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl" # vala
-SLOT="5"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/libxml2-2
-	dev-libs/libxslt
-	sys-libs/readline
-	sys-libs/ncurses
-	berkdb?   ( sys-libs/db )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	gtk? (
-		>=x11-libs/gtk+-3.0.0:3
-		canvas? ( x11-libs/goocanvas:2.0 )
-		sourceview? ( x11-libs/gtksourceview:3.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 )
-	ldap?     ( net-nds/openldap )
-	mdb?      ( >app-office/mdbtools-0.5 )
-	mysql?    ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ssl?      ( dev-libs/openssl )
-	>=dev-db/sqlite-3.6.22:3"
-
-DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.9
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-	java? ( virtual/jdk:1.6 )"
-#	vala? ( >=dev-lang/vala-0.14:0.14[vapigen] )
-
-pkg_setup() {
-	java-pkg-opt-2_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}
-		--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_enable json)
-		$(use_with ldap)
-		$(use_with mdb mdb /usr)
-		$(use_with mysql mysql /usr)
-		$(use_with postgres postgres /usr)
-		$(use_enable ssl crypto)
-		--disable-vala
-		VAPIGEN=$(type -P vapigen-0.14)"
-#		$(use_enable vala)
-	# Disable vala due to https://bugzilla.gnome.org/show_bug.cgi?id=668701
-
-	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}
-		--disable-default-binary"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Disable broken tests so we can check the others, upstream bug #????
-#	epatch "${FILESDIR}/${PN}-4.99.4-disable-broken-tests.patch"
-
-	# Prevent file collisions with libgda:4
-	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
-	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
-	epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
-
-	# Move files with mv (since epatch can't handle rename diffs) and
-	# update pre-generated gtk-doc files
-	local f
-	for f in tools/browser/doc/gda-browser* ; do
-		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-	done
-	for f in tools/browser/doc/html/gda-browser.devhelp* ; do
-		sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
-			-i ${f} || die "sed ${f} failed"
-		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-	done
-	for f in control-center/data/*_gda-control-center.png ; do
-		mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
-			die "mv ${f} failed"
-	done
-
-	python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
-
-	# Missing from tarball
-	cp "${FILESDIR}/libgda-${PV}-custom.vala" libgda/libgda-5.0-custom.vala || die
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-	gnome2_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	local d
-	for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
-		python_mod_optimize ${d}
-	done
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	local d
-	for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
-		python_mod_cleanup ${d}
-	done
-}
diff --git a/gnome-extra/libgda/libgda-5.0.4.ebuild b/gnome-extra/libgda/libgda-5.0.4.ebuild
deleted file mode 100644
index 42670d7d0e46..000000000000
--- a/gnome-extra/libgda/libgda-5.0.4.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.4.ebuild,v 1.4 2013/12/08 18:54:26 pacho Exp $
-
-EAPI="5"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
-#VALA_MIN_API_VERSION="0.16"
-#VALA_USE_DEPEND="vapigen"
-# FIXME: vala support fails to build
-# https://bugzilla.gnome.org/show_bug.cgi?id=701752
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 #vala
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb bindist canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl" # vala"
-REQUIRED_USE="
-	reports? ( ${PYTHON_REQUIRED_USE} )
-	canvas? ( gtk )
-	firebird? ( !bindist )
-	graphviz? ( gtk )
-	sourceview? ( gtk )
-"
-# firebird license is not GPL compatible
-
-SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.28.0:2
-	>=dev-libs/libxml2-2
-	dev-libs/libxslt
-	sys-libs/readline:=
-	sys-libs/ncurses:=
-	berkdb?   ( sys-libs/db )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	gtk? (
-		>=x11-libs/gtk+-3.0.0:3
-		canvas? ( x11-libs/goocanvas:2.0= )
-		sourceview? ( x11-libs/gtksourceview:3.0 )
-		graphviz? ( media-gfx/graphviz )
-	)
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	http? ( >=net-libs/libsoup-2.24:2.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
-	json?     ( dev-libs/json-glib )
-	ldap?     ( net-nds/openldap:= )
-	mdb?      ( >app-office/mdbtools-0.5:= )
-	mysql?    ( virtual/mysql:= )
-	postgres? ( dev-db/postgresql-base:= )
-	reports? (
-		${PYTHON_DEPS}
-		dev-java/fop
-		dev-python/reportlab )
-	ssl?      ( dev-libs/openssl:= )
-	>=dev-db/sqlite-3.6.22:3=
-"
-DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.9
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-	java? ( virtual/jdk:1.6 )
-"
-#	vala? ( $(vala_depend) )
-
-# FIXME: lots of tests failing. Check if they still fail in 5.1.2
-#RESTRICT="test"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	use reports && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	use reports ||
-		sed -e '/SUBDIRS =/ s/trml2html//' \
-			-e '/SUBDIRS =/ s/trml2pdf//' \
-			-i libgda-report/RML/Makefile.{am,in} || die
-
-	# Prevent file collisions with libgda:4
-	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
-	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
-	epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
-
-	# Move files with mv (since epatch can't handle rename diffs) and
-	# update pre-generated gtk-doc files (for non-git versions of libgda)
-	local f
-	for f in tools/browser/doc/gda-browser* ; do
-		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-	done
-	for f in tools/browser/doc/html/gda-browser.devhelp* ; do
-		sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
-			-i ${f} || die "sed ${f} failed"
-		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-	done
-	for f in control-center/data/*_gda-control-center.png ; do
-		mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
-			die "mv ${f} failed"
-	done
-
-	eautoreconf
-	java-pkg-opt-2_src_prepare
-	gnome2_src_prepare
-#	use vala && vala_src_prepare
-}
-
-src_configure() {
-	use oci8 || G2CONF="${G2CONF} --without-oracle"
-	gnome2_src_configure \
-		--disable-scrollkeeper \
-		--disable-static \
-		--enable-system-sqlite \
-		$(use_with berkdb bdb /usr) \
-		$(use_with canvas goocanvas) \
-		$(use_with firebird firebird /usr) \
-		$(use_with gnome-keyring) \
-		$(use_with graphviz) \
-		$(use_with gtk ui) \
-		$(use_with http libsoup) \
-		$(use_enable introspection) \
-		$(use_with java java $JAVA_HOME) \
-		$(use_enable json) \
-		$(use_with ldap) \
-		$(use_with mdb mdb /usr) \
-		$(use_with mysql mysql /usr) \
-		$(use_with postgres postgres /usr) \
-		$(use_enable ssl crypto) \
-		$(use_with sourceview gtksourceview) \
-		--disable-vala \
-		--disable-default-binary
-}
-
-src_install() {
-	gnome2_src_install
-	if use reports; then
-		for t in trml2{html,pdf}; do
-			python_scriptinto /usr/share/libgda-5.0/gda_${t}
-			python_doscript libgda-report/RML/${t}/${t}.py
-		done
-	fi
-}