version bump #206297; ebuild cleanup wrt #208584

Package-Manager: portage-2.1.4.4

4 files changed, 96 insertions, 22 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index c5117ad15186..c5385c8e773b 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/phpmyadmin
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.287 2007/12/05 12:47:11 wrobel Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.288 2008/02/19 13:35:21 hollow Exp $
+
+*phpmyadmin-2.11.4 (19 Feb 2008)
+
+  19 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
+  phpmyadmin-2.11.2.2.ebuild, +phpmyadmin-2.11.4.ebuild:
+  version bump #206297; ebuild cleanup wrt #208584
 
   05 Dec 2007; Gunnar Wrobel <wrobel@gentoo.org>
   -phpmyadmin-2.11.1.2.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 92a49061e712..bc68f891b5c1 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en-2.8.0.txt 1146 RMD160 bf699b21596c24f8f08be4eb53c18a3154be39a9 SHA1 f61856930f39872a3af08a43f06583468024c221 SHA256 93836b091c71c0316744b3a4b601e465a2d98d9e7b74cfa98c17aa66d4fb31d7
 AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bde5e20a06f46c4a7b1733038f7dc9745965 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612
 DIST phpMyAdmin-2.11.2.2-all-languages-utf-8-only.tar.bz2 2238832 RMD160 d1378ab1eef322800866faf9d940260a76af5422 SHA1 21f487dd1a00d17596d85ad415f1e93ad2c77e58 SHA256 a18a59a39088d1ea79f0245f765c7567256bbe4786ca2eddaa6d753d4223f601
-EBUILD phpmyadmin-2.11.2.2.ebuild 1853 RMD160 ae17a143d4e87dc1328ea41e40e8e9a3b0ba861b SHA1 44fb0aaf781b150a53b02994fad4ef0cffc61064 SHA256 ebce1ff5b4dbabe299683e877efaa0ff7cab40613781c735d7a7be193a01f006
-MISC ChangeLog 38912 RMD160 9ae8499c1a38134ed626fd82cf4d1f749b0082fb SHA1 798c8a2853a506de559fc7743fe6d0f366fc76d3 SHA256 dafb52f7027624ed5901a1a499d46e594d8ee377c448c159ed60526e850859c9
+DIST phpMyAdmin-2.11.4-all-languages-utf-8-only.tar.bz2 2241351 RMD160 f8a722b279d194c39bfeaf57a5969504ef316a50 SHA1 e8e4d2d10e34413a0004711eed17543d36e2b803 SHA256 7566ab1f2257648bf1c5c9e4152d638b42ded7be2594975cfcff20b96d04992d
+EBUILD phpmyadmin-2.11.2.2.ebuild 1690 RMD160 181426ccc19e8904ab0a5d0790a749a216129102 SHA1 a677912f6d75f33f7af2580904cb6e896fefce46 SHA256 05758e071ffb98e3037c3ebaa5c46a274766ade1ed07320c7354988637889892
+EBUILD phpmyadmin-2.11.4.ebuild 1695 RMD160 946bf9da36071e017e9c20c8c8bfa32a3246668e SHA1 b60ab7d0651b0d447b7d07d5b992fe72308673dd SHA256 c31e48a0a3c1554adf74d08b6a59889a700a271aadc99acec5038e0eb7b457ae
+MISC ChangeLog 39105 RMD160 29eb9fa8d1d86bd4c5a8e573990e3341461ebc28 SHA1 5c0f894e761cf8998db7851105b2861f6dbb68f4 SHA256 2c9132e7e85c02b59778c9d67fd7963ea18171015fa8ae601deff5d1057215f2
 MISC metadata.xml 182 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d SHA1 a6d1f4b69883a0940325b7b4ad1de261c7b8c485 SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAke62yIACgkQmPFBzbX68WFTlwCeMwNoxTxRGmAbjKDvdetFULCS
+qBgAnjVpDMDbt5+/Md3CkqOLubag83hM
+=Axh5
+-----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.2.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.2.2.ebuild
index aac5206cf9bf..2d2dff4d9c33 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.2.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.11.2.2.ebuild
@@ -1,22 +1,26 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.2.2.ebuild,v 1.7 2007/12/05 12:36:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.2.2.ebuild,v 1.8 2008/02/19 13:35:21 hollow Exp $
 
 inherit eutils webapp depend.php
 
 MY_PV=${PV/_/-}
 MY_P="phpMyAdmin-${MY_PV}-all-languages-utf-8-only"
+
 DESCRIPTION="Web-based administration for MySQL database in PHP"
 HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
-DEPEND="sys-apps/findutils"
-RDEPEND="virtual/httpd-cgi"
-S=${WORKDIR}/${MY_P}
 
-need_php
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"/${MY_P}
+
+need_php_httpd
 
 pkg_setup() {
 	webapp_pkg_setup
@@ -38,22 +42,14 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	# Remove .cvs* files and CVS directories
-	find "${S}" -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
-}
-
 src_install() {
 	webapp_src_preinst
 
-	local docs="CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog"
-
-	dodoc ${docs}
-	dohtml Documentation.html
+	dodoc CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog
+	rm -f LICENSE CREDITS INSTALL README RELEASE-DATE-${MY_PV} TODO
 
-	cp -r . "${D}${MY_HTDOCSDIR}"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
 
 	webapp_configfile "${MY_HTDOCSDIR}"/libraries/config.default.php
 	webapp_serverowned "${MY_HTDOCSDIR}"/libraries/config.default.php
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.4.ebuild
new file mode 100644
index 000000000000..2ad15a28ebbd
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.11.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.4.ebuild,v 1.1 2008/02/19 13:35:21 hollow Exp $
+
+inherit eutils webapp depend.php
+
+MY_PV=${PV/_/-}
+MY_P="phpMyAdmin-${MY_PV}-all-languages-utf-8-only"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="http://www.phpmyadmin.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"/${MY_P}
+
+need_php_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if ! PHPCHECKNODIE="yes" require_php_with_use crypt ctype pcre session unicode \
+		|| ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli ; then
+		eerror
+		eerror "${PHP_PKG} needs to be re-installed with all of the following"
+		eerror "USE flags enabled:"
+		eerror
+		eerror "ctype pcre session unicode"
+		eerror
+		eerror "as well as any of the following USE flags enabled:"
+		eerror
+		eerror "mysql or mysqli if using dev-lang/php-5"
+		eerror "mysql if using dev-lang/php-4"
+		eerror
+		die "Re-install ${PHP_PKG}"
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog
+	rm -f LICENSE CREDITS INSTALL README RELEASE-DATE-${MY_PV} TODO
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.8.0.txt
+	webapp_hook_script "${FILESDIR}"/reconfig-2.8
+	webapp_src_install
+}