Version bump, remove old.

(Portage version: 2.2_rc33/cvs/Linux i686)

4 files changed, 19 insertions, 81 deletions

diff --git a/dev-php/adodb/ChangeLog b/dev-php/adodb/ChangeLog
index 946ca2da4f2e..03ce07cc61ca 100644
--- a/dev-php/adodb/ChangeLog
+++ b/dev-php/adodb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/adodb
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/ChangeLog,v 1.97 2009/04/27 16:41:16 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/ChangeLog,v 1.98 2009/06/26 09:04:22 pva Exp $
+
+*adodb-5.09 (26 Jun 2009)
+
+  26 Jun 2009; Peter Volkov <pva@gentoo.org> -adodb-5.04a.ebuild,
+  -adodb-5.06.ebuild, -adodb-5.07.ebuild, +adodb-5.09.ebuild:
+  Version bump, remove old.
 
 *adodb-5.08a (27 Apr 2009)
 
diff --git a/dev-php/adodb/adodb-5.04a.ebuild b/dev-php/adodb/adodb-5.04a.ebuild
deleted file mode 100644
index 32b588549899..000000000000
--- a/dev-php/adodb/adodb-5.04a.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/adodb-5.04a.ebuild,v 1.6 2008/08/19 09:33:24 pva Exp $
-
-inherit php-lib-r1 versionator
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-DESCRIPTION="Active Data Objects Data Base library for PHP."
-HOMEPAGE="http://adodb.sourceforge.net/"
-
-MY_PV=$(delete_all_version_separators "${PV}" )
-SRC_URI="mirror://sourceforge/adodb/${PN}${MY_PV}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${PN}$(get_major_version)
-
-need_php5
-
-pkg_setup() {
-	ewarn "ADODB requires some form of SQL or ODBC support in your PHP."
-}
-
-src_install() {
-	# install php files
-	php-lib-r1_src_install . `find . -name '*.php' -print`
-
-	# install xsl files
-	php-lib-r1_src_install . xsl/*.xsl
-
-	# install documentation
-	dodoc-php *.txt xmlschema.dtd session/adodb-sess.txt pear/readme.Auth.txt
-	dohtml-php docs/*.htm
-}
diff --git a/dev-php/adodb/adodb-5.07.ebuild b/dev-php/adodb/adodb-5.07.ebuild
deleted file mode 100644
index 3d7c01d0ad7b..000000000000
--- a/dev-php/adodb/adodb-5.07.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/adodb-5.07.ebuild,v 1.1 2008/12/26 09:33:08 pva Exp $
-
-inherit php-lib-r1 versionator
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-DESCRIPTION="Active Data Objects Data Base library for PHP."
-HOMEPAGE="http://adodb.sourceforge.net/"
-
-MY_PV=$(delete_all_version_separators "${PV}" )
-SRC_URI="mirror://sourceforge/adodb/${PN}${MY_PV}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${PN}$(get_major_version)
-
-need_php5
-
-pkg_setup() {
-	ewarn "ADODB requires some form of SQL or ODBC support in your PHP."
-}
-
-src_install() {
-	# install php files
-	php-lib-r1_src_install . `find . -name '*.php' -print`
-
-	# install xsl files
-	php-lib-r1_src_install . xsl/*.xsl
-
-	# install documentation
-	dodoc-php *.txt xmlschema.dtd session/adodb-sess.txt pear/readme.Auth.txt
-	dohtml-php docs/*.htm
-}
diff --git a/dev-php/adodb/adodb-5.06.ebuild b/dev-php/adodb/adodb-5.09.ebuild
index b706899be50a..761954352dc4 100644
--- a/dev-php/adodb/adodb-5.06.ebuild
+++ b/dev-php/adodb/adodb-5.09.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/adodb-5.06.ebuild,v 1.1 2008/10/29 11:41:57 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/adodb-5.09.ebuild,v 1.1 2009/06/26 09:04:22 pva Exp $
+
+EAPI="2"
 
 inherit php-lib-r1 versionator
 
@@ -25,9 +27,15 @@ pkg_setup() {
 	ewarn "ADODB requires some form of SQL or ODBC support in your PHP."
 }
 
+src_prepare() {
+	# Check http://phplens.com/lens/lensforum/msgs.php?id=18043
+	# probably this mv is a problem...
+	mv "${S}"/drivers/adodb-ads{\ ,.}inc.php
+}
+
 src_install() {
 	# install php files
-	php-lib-r1_src_install . `find . -name '*.php' -print`
+	php-lib-r1_src_install . $(find . -name '*.php' -print)
 
 	# install xsl files
 	php-lib-r1_src_install . xsl/*.xsl