cleanup, version bump

(Portage version: 2.2.0_alpha168/cvs/Linux x86_64, signed Manifest commit with key 0x4849EC6C)

3 files changed, 23 insertions, 53 deletions

diff --git a/dev-php/adodb/ChangeLog b/dev-php/adodb/ChangeLog
index 225aff187b30..130cf9103903 100644
--- a/dev-php/adodb/ChangeLog
+++ b/dev-php/adodb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/adodb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/ChangeLog,v 1.128 2013/03/16 17:02:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/ChangeLog,v 1.129 2013/04/03 20:26:27 mabi Exp $
+
+*adodb-5.18 (03 Apr 2013)
+
+  03 Apr 2013; Matti Bickel <mabi@gentoo.org> +adodb-5.18.ebuild,
+  -adodb-5.14.ebuild, -adodb-5.17.ebuild:
+  cleanup, version bump
 
   16 Mar 2013; Jeroen Roovers <jer@gentoo.org> adodb-5.17-r1.ebuild:
   Stable for HPPA (bug #461152).
diff --git a/dev-php/adodb/adodb-5.14.ebuild b/dev-php/adodb/adodb-5.14.ebuild
deleted file mode 100644
index 093fc5bf6d9e..000000000000
--- a/dev-php/adodb/adodb-5.14.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/adodb-5.14.ebuild,v 1.6 2012/02/08 20:06:38 jer Exp $
-
-EAPI="2"
-
-inherit php-lib-r1 versionator
-
-MY_PV=$(delete_all_version_separators "${PV}" )
-DESCRIPTION="Active Data Objects Data Base library for PHP."
-HOMEPAGE="http://adodb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/adodb/${PN}${MY_PV}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-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.17.ebuild b/dev-php/adodb/adodb-5.18.ebuild
index 00cdb3de1b32..806781200d48 100644
--- a/dev-php/adodb/adodb-5.17.ebuild
+++ b/dev-php/adodb/adodb-5.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/adodb-5.17.ebuild,v 1.1 2012/06/10 12:12:11 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/adodb-5.18.ebuild,v 1.1 2013/04/03 20:26:27 mabi Exp $
 
 EAPI=4
 
@@ -9,18 +9,16 @@ inherit versionator
 MY_PV=$(delete_all_version_separators "${PV}" )
 DESCRIPTION="Active Data Objects Data Base library for PHP."
 HOMEPAGE="http://adodb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/adodb/${PN}${MY_PV}.zip"
+SRC_URI="mirror://sourceforge/adodb/adodb-php5-only/${PN}-${MY_PV}-for-php5/${PN}${MY_PV}a.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+RDEPEND="dev-lang/php"
 
 S="${WORKDIR}/${PN}"$(get_major_version)
-
 DOCS="license.txt readme.txt xmlschema.dtd session/adodb-sess.txt pear/readme.Auth.txt docs/*htm"
 
 pkg_setup() {
@@ -28,10 +26,16 @@ pkg_setup() {
 }
 
 src_install() {
-	insinto "/usr/share/php/${PN}"
-	doins $(find . -name '*.php' -print)
-	doins xsl/*.xsl
-
-	# do DOCS
-	default_src_install
+	# install php files
+	local INSTDIR="/usr/share/php/${PN}"
+	insinto "$INSTDIR" 
+	doins -r ./*
+
+	for f in $DOCS ; do
+		rm "${INSTDIR}/${f}"
+	done
+	rm -rf "${INSTDIR}/cute_icons_for_site"
+	find "${D}" -type d -empty -exec rm -r {} \+
+
+	default_src_install # copy DOCS
 }