Cleanup

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 15 insertions, 22 deletions

diff --git a/dev-perl/DBD-SQLite/ChangeLog b/dev-perl/DBD-SQLite/ChangeLog
index 0bd9d99a3cdf..3b3b117c04d8 100644
--- a/dev-perl/DBD-SQLite/ChangeLog
+++ b/dev-perl/DBD-SQLite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/DBD-SQLite
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-SQLite/ChangeLog,v 1.70 2009/11/24 07:40:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-SQLite/ChangeLog,v 1.71 2009/12/24 20:25:31 tove Exp $
+
+  24 Dec 2009; Torsten Veller <tove@gentoo.org> -DBD-SQLite-1.25.ebuild,
+  DBD-SQLite-1.27.ebuild:
+  Cleanup
 
 *DBD-SQLite-1.27 (24 Nov 2009)
 
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.25.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.25.ebuild
deleted file mode 100644
index a45fe5b8da69..000000000000
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.25.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-SQLite/DBD-SQLite-1.25.ebuild,v 1.1 2009/05/01 18:38:18 tove Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=ADAMK
-inherit perl-module eutils
-
-DESCRIPTION="Self Contained RDBMS in a DBI Driver"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=dev-perl/DBI-1.57
-	!<dev-perl/DBD-SQLite-1"
-
-SRC_TEST="do"
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.27.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.27.ebuild
index 55e029fd104a..bce6e5bf73a5 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.27.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-SQLite/DBD-SQLite-1.27.ebuild,v 1.1 2009/11/24 07:40:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-SQLite/DBD-SQLite-1.27.ebuild,v 1.2 2009/12/24 20:25:31 tove Exp $
 
 EAPI=2
 
@@ -13,7 +13,15 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-DEPEND=">=dev-perl/DBI-1.57
+RDEPEND=">=dev-perl/DBI-1.57
+	>=dev-db/sqlite-3.6.0
 	!<dev-perl/DBD-SQLite-1"
+DEPEND="${RDEPEND}"
 
 SRC_TEST="do"
+
+src_prepare() {
+	perl-module_src_prepare
+	sed -i 's/^if ( 0 )/if ( 1 )/' "${S}"/Makefile.PL || die
+	sed -i "/DBD::SQLite::db->install_method('sqlite_enable_load_extension');/d" "${S}"/lib/DBD/SQLite.pm || die
+}