Remove old version as well.

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

3 files changed, 9 insertions, 74 deletions

diff --git a/app-office/mdbtools/ChangeLog b/app-office/mdbtools/ChangeLog
index 8455f37d1569..5832c6b3080d 100644
--- a/app-office/mdbtools/ChangeLog
+++ b/app-office/mdbtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/mdbtools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.54 2010/12/02 15:25:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.55 2010/12/02 15:51:21 flameeyes Exp $
+
+  02 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -mdbtools-0.6_pre1-r1.ebuild:
+  Remove old version as well.
 
   02 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   mdbtools-0.6_pre2-r2.ebuild:
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index f306b810714d..ccbba4680e0e 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -10,16 +10,14 @@ AUX mdbtools-0.6_pre2-gcc34.patch 1468 RMD160 fc1ba2a523bf9dd4c0dd0601d70db4e537
 AUX mdbtools-0.6_pre2-haveiconv-fix.patch 660 RMD160 6fc78057697eda733e6526573c47cfe2be950012 SHA1 cc5add40346b1aeb61985d0de6a65f3a3a39af63 SHA256 e7fc8f4809968f0cfc8e890d8dc6ca98abd51f1c243d25276e566f88f9461887
 AUX mdbtools-0.6_pre2-odbc_definitions.patch 4060 RMD160 53ae212a83bcd30bb255f6f9f7a0df08026b35de SHA1 4dd3f1fcf6c8a01bb26af81e19639c69ebcbbcff SHA256 d3381970ce81ebf4663f00424af02cb5544f7c5095abba87117813182789f6b1
 AUX mdbtools-0.6_pre2-parallel-make.patch 655 RMD160 f5e9b45e7dcfd240ba5388d049bdd3d29eb2a832 SHA1 2c3a076c482f8b52f963d82eac8d6b220ef7e17c SHA256 406acd023f0af39a0d2b2b25284efd5e01defffbfade6c17ee9dcacdaa29e15a
-DIST mdbtools-0.6pre1.tar.gz 611756 RMD160 e6a89d6984ba84aa9895ab0b6e6b68ac86881be3 SHA1 37a50d623a444ec690d2677b12b59c2f11e497c0 SHA256 7169dc50da857aae2b3f62cd5c6ace37fed56f3e39d07c9afa5aba882b1de3d3
 DIST mdbtools-cvs-20050624.tar.gz 306961 RMD160 800328d9acc763ce58211b5a37ad20b8ce34cc21 SHA1 15c97da82826935032aa2089d3e9ed7e2931ce43 SHA256 471034a00f9441e34b3a236ce07bdb766fea0bd140fc69a3d8a9c7225bf573b3
-EBUILD mdbtools-0.6_pre1-r1.ebuild 1881 RMD160 1dab3e8bb357913103e6493535368dce195e2fa3 SHA1 5e83ffc7162230642668472ef93404a8a4f4ee89 SHA256 9b4246179a80d36e3e3db927500d4cf9c06df423a9c1bc9b95450049d741fcd5
 EBUILD mdbtools-0.6_pre2-r2.ebuild 1991 RMD160 c0bc695bcb23c58e8a60c3934911fbf13a5d2987 SHA1 16b8cc25a8401d7e87a616f63bbe1683476a1f44 SHA256 e7184a75f5125c407fd63f9c60757c2f1ae804834de4ad175e82631225023c20
-MISC ChangeLog 7614 RMD160 61cb59fc6003b36ed839ed7689853c5b309fd7d1 SHA1 858e1184fd0bf3e03f9a46c83d1624ece71afda0 SHA256 79cba9192373adbeb243b4e87b59d310866c737bbdee91441d97c14c152a990e
+MISC ChangeLog 7733 RMD160 855a1831bc4a777fa142f86135ef93af9e87fc11 SHA1 059e16e47fa3761dcd0f131312d5f6392d3ec051 SHA256 9e9c48050b3a5295c943c0af63f56a8d89f5d2a40bd10845796ace03cfa75b55
 MISC metadata.xml 220 RMD160 65cff73eb25c0cc60095d42dd59adbefcb127b77 SHA1 059c076f5c2d3a1eb0b022ef90920bcabaf841b3 SHA256 0f420960bb0e6e212e563ce0883b0e412304dfd506a39e434d2c7a40a603ba86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkz3umMACgkQAiZjviIA2XjghQCg8yO+eZH4uoHkwhM7oKAlTnnP
-cBcAn02xCXbaCmRBN7Rtyc8aAICnrakX
-=Ftv9
+iEYEARECAAYFAkz3wG0ACgkQAiZjviIA2XgD0ACfZSP0hGHA33zNNehKWVO9CT8P
+c2cAoLOCdyBSQf4N4Dcdli1EKxbswKPE
+=FrCV
 -----END PGP SIGNATURE-----
diff --git a/app-office/mdbtools/mdbtools-0.6_pre1-r1.ebuild b/app-office/mdbtools/mdbtools-0.6_pre1-r1.ebuild
deleted file mode 100644
index 6dee0c3ae542..000000000000
--- a/app-office/mdbtools/mdbtools-0.6_pre1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre1-r1.ebuild,v 1.19 2008/12/30 09:29:57 graaff Exp $
-
-WANT_AUTOMAKE="1.7"
-
-inherit eutils autotools
-
-MY_P=${P/_/}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A set of libraries and utilities for reading Microsoft Access database (MDB) files"
-HOMEPAGE="http://sourceforge.net/projects/mdbtools"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-IUSE="gnome odbc"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-RDEPEND=">=dev-libs/glib-2
-	sys-libs/ncurses
-	sys-libs/readline
-	gnome? (
-		>=gnome-base/libglade-2
-		>=gnome-base/libgnomeui-2 )
-	odbc? ( >=dev-db/unixODBC-2.0 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/flex-2.5.0
-	>=sys-devel/bison-1.35"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gcc34.patch
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-strlen.patch
-
-	# This is necessary since the upstream tarball was created with a
-	# buggy libtool, and the .so suffix in library names is lost in
-	# some platforms (e.g. amd64).  Starting with libtool 2.2.4 it is
-	# also necessary to remove the acinclude.m4 file since it contains
-	# an old libtool.m4 that is obsolete, #227257.
-	rm "${S}"/acinclude.m4
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-	use odbc && myconf="${myconf} --with-unixodbc=/usr"
-
-	econf --enable-sql \
-		${myconf} || die "configure failed"
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc COPYING* NEWS README* TODO AUTHORS HACKING ChangeLog
-
-	# add a compat symlink (gmdb2 is not compiled if gnome USE flag is disabled)
-	use gnome && dosym gmdb2 /usr/bin/gmdb
-}