cleanup, version bump

Package-Manager: portage-2.2.0_alpha168/cvs/Linux x86_64
Manifest-Sign-Key: 0x4849EC6C

4 files changed, 29 insertions, 60 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/Manifest b/dev-php/adodb/Manifest
index f33f029f3184..609274ca4025 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST adodb514.zip 731949 SHA256 8138f290ee0a4ae414dbf2a1d7fdcdf92cec5ea440f4ae5ca60317e00b865a38 SHA512 8ef631832812bf5fbce32cc3ac58d48a39b9f63ed65ba0ec7cf2834c37a205ca8cf8b4e53d062f559158ea8d0f755874e76447435ed155baa920657e725ab594 WHIRLPOOL ce864cf6db05daf2ca9e94c05e20e097a95a988771b9e9e5098d092888ec3d049ea359f52df5c19b4498761ccd79bc616d29dacd09b83ae8663ba851b0e8d53d
 DIST adodb517.zip 736170 SHA256 6ff1025b67d7daf4d5468544db78476d7a0b777c53724e00aee43f5804acfbe5 SHA512 ef901727b463a98cff62d7aec1addc6ba64d8e59c9f13d2f9c2fcec79a215a8792b69dc2a59275e9b4a6f11b81dffd8f6d74cf2a4595b8a848edbbc739deb7cd WHIRLPOOL 21b5e6b56a9bfe3190df8bd532190c5f1b5dfa4dd071fd19fae6067817652ef3b2b9344a378bfbe2ca5c1af5ec6ffec32018581e8609933324c6db0eddee8e22
-EBUILD adodb-5.14.ebuild 1006 SHA256 29a7996db6df6528ee683de364568703eef44a64c5f7c26a415692c9f011e13d SHA512 ba722dac35b0a3b08fceffdca9c60443dc837bbb83b229472c000fcc97b719b2ac4a548c3501b88a86a028d7969ce99bd47c64b0a7b7a9a986f81d43d3a93208 WHIRLPOOL c615818989a46c97a9b7549f2689d33918c6850fe6a0d68a5fef7bde24bcb364a476d0ef12d9807e97be3262430dcb4daacc1b39bb1d7753bc9b46d864e3020d
+DIST adodb518a.tgz 544455 SHA256 3814dbd776ec5416f9a03eb4eecb081844b0166240dd539439cf27c79efb4d5e SHA512 d561a5143e903195a2c87e637b33c9767f62148d7466fa6cb84d3bc86e5b303c0bf0f04cf370db4b81d9ac7ef8b3f2f28af9e5f28d0956706f59a74367898c53 WHIRLPOOL 3c972f937afd76f5a4595bcee7cb3355a52a2d596615c2f7c3232d472e3b838b72547a4d5216c489f62d02fd3d96b6672b7d044aa2c39fa707f940469ea35554
 EBUILD adodb-5.17-r1.ebuild 1106 SHA256 c1ea7aa0c543d329fb56744f80793403b4beb4f94978c9cbefa8436f47992fa4 SHA512 7ef9046fab82501fe0cb5276a84442bec44042d48668b6a57e36e31f70d0b58628d37f27e8c5239c447bef5f85dd60ac28ef0415c1a7a696049c79a398a97803 WHIRLPOOL 5cab56efb2f9aa83d9a81abe6c7146d96ee576000443021aaf3a624ce27065c78164ea0d19ff2fea4caf759ce3bbdbff928bb9e5b73228635f12bf2904c556c3
-EBUILD adodb-5.17.ebuild 952 SHA256 54e8f51569bdd87250ac41ba351bad4c14c563aa78006c82d9c3f690e79853fa SHA512 196baced5ecd0f20c2ceb21dad2f9d958771035152c6010454d7fde4e6ad80d045b967db6d5b891167d5ac227665b523c5a19bf7feeb39280ba573cb24cca718 WHIRLPOOL 55962543fff62df479a85c612930f053fedfcfc60d2e1b75024bbb3bfcd83b9e5201133d4c31bcca6fa2bdab924566ab43028af0a7db3310637f993ea7ce9656
-MISC ChangeLog 15137 SHA256 869767793896cc233ac19c08e036458cbd2121e35ff65769a2e55ff3011f6ec3 SHA512 69f006b9e19d483769513f01a57fa195b350768dbfb4ae8166a4ef471427ef75de8223e2cdd90f2a666b45504b3a14dc51f24ad10483b3e7b11a855da82e0629 WHIRLPOOL 808ce262e89705fb4f0541211002bd1c6fc2e3f38f8585b891f89d4c45ac3b5717309dce70a51839a8292d74816c340b0c467109c25f04fde5d419d9d7a0f815
+EBUILD adodb-5.18.ebuild 1126 SHA256 c1c0945c5a264422c69b11675ef30612c64f22a18d8ab199864ce5a2aa187dc0 SHA512 420493a8f8857cc217da50505554ef916344d4407f8c611803fdde645d1bb5e01c7f1174beb861bb59e19712a5d3782f80bbd54bb3e70ac62222e2d08850bda8 WHIRLPOOL 04f83eeb51d1793a3622f91043c2934c38a78f475871a4b4bb0ab222055d69275cb5e8ffde8557eec593883c8ebc679f1ea29c9034a54e44e1983a27ea874d61
+MISC ChangeLog 15298 SHA256 1c6550fe0a33665d4c4a49c45e8216f1a7143a370398de0f6a8f55a9fe568ab9 SHA512 a4640d01e0f922a41a34c6d682448be8bfe21345a86164ed35c4e6d971ca6c8911c46ad652b3db74e5a8ea524c58f5b2e12de971a620b1e55ce63d6571c0c1d9 WHIRLPOOL e649e10e894032c307afea0a882408b08ff322387854640989878263b295577c72cf4a431a28c30f3fa3bbba7818522545982d55321423e19960eaeb7ec6c15d
 MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFEpaoACgkQVWmRsqeSphODRQCfb1dsNa917RBAI5BFtRdjtZ3v
-wnkAniyT5ZAG0KawVFZ66MSkhqwnGNTc
-=Tcud
+iEYEAREIAAYFAlFckIAACgkQfNMcoUhJ7GwpIgCeMwPe6fKFtGlc9zvYRNNau71J
+LCIAoIjEIu2A6CZBgroBnhbnjK3WWqO1
+=/UT/
 -----END PGP SIGNATURE-----
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
 }