Version bump, removing old versions

Package-Manager: portage-2.0.51.22-r2

7 files changed, 28 insertions, 86 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index a0d270569b6f..9b220325beca 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.148 2005/11/20 21:36:44 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.149 2005/11/27 01:56:33 rl03 Exp $
+
+*phpmyadmin-2.7.0_rc1 (27 Nov 2005)
+
+  27 Nov 2005; Renat Lumpau <rl03@gentoo.org> -phpmyadmin-2.6.4_p3.ebuild,
+  -phpmyadmin-2.7.0_beta1.ebuild, +phpmyadmin-2.7.0_rc1.ebuild:
+  Version bump, removing old versions
 
   20 Nov 2005; Simon Stelling <blubb@gentoo.org> phpmyadmin-2.6.4_p4.ebuild:
   stable on amd64 wrt bug 112690
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index f2e6956bd97c..6c18484a74aa 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,14 +1,22 @@
-MD5 370074931bdde8c24c311d1e06ed5456 ChangeLog 20512
-MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
-MD5 06ef9cf16f596c7eace1c9a7e6e54725 phpmyadmin-2.6.4_p3.ebuild 2093
-MD5 6e358909bac88b65fab218ee14a160c3 phpmyadmin-2.7.0_beta1.ebuild 2067
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 8a8c80816c9dac5c4e0050b792130e04 phpmyadmin-2.6.4_p4.ebuild 2094
-MD5 0fb913f47fa22640fc0df136df21818c files/digest-phpmyadmin-2.6.4_p3 74
-MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
+MD5 8e768c1ae2acb95e89e8b32fdef8ea56 phpmyadmin-2.7.0_rc1.ebuild 2061
+MD5 7f98f62becba67c6a1a585c0769eef89 ChangeLog 20726
+MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
+MD5 f9b280ad4bce0ff1073ad7692ae4ef27 files/digest-phpmyadmin-2.6.4_p4 74
 MD5 03e1c16e02d105f6fcfb56c1bf734f6e files/reconfig-2.7 319
-MD5 a7201a857705dfcec9502fc7dd3a96db files/reconfig 315
+MD5 7ee66f34f065179705964d9cd02ea689 files/digest-phpmyadmin-2.7.0_rc1 74
 MD5 ab6e8b5ecc163d415aebb7d2c42238a3 files/config.default.php-2.7.0.patch 5533
-MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
 MD5 c9eb06723752a2bcafd88c3164e83ea2 files/postinstall-en.txt 593
-MD5 0cd8fc0cfff0431b90baeaa43ab92365 files/digest-phpmyadmin-2.7.0_beta1 76
-MD5 f9b280ad4bce0ff1073ad7692ae4ef27 files/digest-phpmyadmin-2.6.4_p4 74
+MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
+MD5 a7201a857705dfcec9502fc7dd3a96db files/reconfig 315
+MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDiRJaEzitwsaoONoRAqpgAJ93ri4Uk+wEpOUTCo3ynAt2oAWqZwCdFNgw
+XYxWkkjPbkBi5V4kZm2+ToU=
+=uX7g
+-----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_p3 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_p3
deleted file mode 100644
index 1e1b635d9e25..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_p3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 66f7287ce59d2f41ec180a04d5a3094a phpMyAdmin-2.6.4-pl3.tar.bz2 1722662
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_beta1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_beta1
deleted file mode 100644
index c59c2f2b5c64..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f237b7921c06b990d4c436ea73dc3a9b phpMyAdmin-2.7.0-beta1.tar.bz2 1921812
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_rc1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_rc1
new file mode 100644
index 000000000000..040db36e8830
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_rc1
@@ -0,0 +1 @@
+MD5 77c33e0c6d9f2ed900d36262f7b535ed phpMyAdmin-2.7.0-rc1.tar.bz2 1944983
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild
deleted file mode 100644
index e38339feb2e4..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild,v 1.7 2005/11/09 19:10:18 rl03 Exp $
-
-inherit eutils webapp
-
-MY_PV=${PV/_p/-pl}
-MY_P=phpMyAdmin-${MY_PV}
-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 ~mips ppc sparc x86"
-IUSE=""
-DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
-	virtual/httpd-php
-	sys-apps/findutils
-	!<=dev-db/phpmyadmin-2.5.6"
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/config.inc.php-2.5.6.patch
-
-	# Remove .cvs* files and CVS directories
-	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
-}
-
-src_compile() {
-	einfo "Setting random user/password details for the controluser"
-
-	local pmapass="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
-	sed -e "s/@pmapass@/${pmapass}/g" -i config.inc.php
-	sed -e "s/@pmapass@/${pmapass}/g" \
-		${FILESDIR}/mysql-setup.sql.in-2.5.6 > ${T}/mysql-setup.sql
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO"
-
-	# install the SQL scripts available to us
-	#
-	# unfortunately, we do not have scripts to upgrade from older versions
-	# these are things we need to add at a later date
-
-	webapp_sqlscript mysql ${T}/mysql-setup.sql
-
-	dodoc ${docs} ChangeLog
-	dohtml Documentation.html
-
-	# Copy the app's main files
-
-	einfo "Installing main files"
-	cp -r . ${D}${MY_HTDOCSDIR}
-	for doc in ${docs} LICENSE; do
-		rm -f ${D}/${MY_HTDOCSDIR}/${doc}
-	done
-
-	webapp_configfile ${MY_HTDOCSDIR}/config.inc.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/reconfig
-	webapp_src_install
-
-	fperms 0640 ${MY_HTDOCSDIR}/config.inc.php
-	fowners root:apache ${MY_HTDOCSDIR}/config.inc.php
-	# bug #88831, make sure the create script is world-readable.
-	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.7.0_rc1.ebuild
index 5e80b2c51b93..39d815610d0e 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.7.0_rc1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild,v 1.3 2005/11/10 14:00:51 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.7.0_rc1.ebuild,v 1.1 2005/11/27 01:56:33 rl03 Exp $
 
 inherit eutils webapp
 
-MY_PV=${PV/_beta/-beta}
+MY_PV=${PV/_rc/-rc}
 MY_P=phpMyAdmin-${MY_PV}
 DESCRIPTION="Web-based administration for MySQL database in PHP"
 HOMEPAGE="http://www.phpmyadmin.net/"