From 117bd20110b28cdd37b7f7e478edc4e3092153a6 Mon Sep 17 00:00:00 2001 From: Renat Lumpau Date: Sun, 28 Aug 2005 23:33:09 +0000 Subject: [PATCH] Version bump, removed old version Package-Manager: portage-2.0.51.22-r2 --- dev-db/phpmyadmin/ChangeLog | 8 ++- dev-db/phpmyadmin/Manifest | 12 ++--- .../files/digest-phpmyadmin-2.6.2_rc1 | 1 - .../files/digest-phpmyadmin-2.6.4_rc1 | 1 + ...rc1.ebuild => phpmyadmin-2.6.4_rc1.ebuild} | 50 ++++++------------- 5 files changed, 30 insertions(+), 42 deletions(-) delete mode 100644 dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2_rc1 create mode 100644 dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_rc1 rename dev-db/phpmyadmin/{phpmyadmin-2.6.2_rc1.ebuild => phpmyadmin-2.6.4_rc1.ebuild} (58%) diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog index 2dd97dbd59c9..2f9a0106f175 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.113 2005/08/22 23:14:23 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.114 2005/08/28 23:33:09 rl03 Exp $ + +*phpmyadmin-2.6.4_rc1 (28 Aug 2005) + + 28 Aug 2005; Renat Lumpau -phpmyadmin-2.6.2_rc1.ebuild, + +phpmyadmin-2.6.4_rc1.ebuild: + Version bump, removed old version 22 Aug 2005; Renat Lumpau files/postinstall-en.txt: Housekeeping diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest index f1ae3694c633..f76cb1540a00 100644 --- a/dev-db/phpmyadmin/Manifest +++ b/dev-db/phpmyadmin/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +MD5 1c55c694a3812c7fdec466d964d61ace phpmyadmin-2.6.4_rc1.ebuild 2087 MD5 b00bc9fe866abc51d9a85cd08b911508 phpmyadmin-2.6.3_p1.ebuild 2058 -MD5 0101bf56e2017374f01c58dec71fca8f phpmyadmin-2.6.2_rc1.ebuild 2390 MD5 48f714785bc74b5b0ef3adb1f39421c0 phpmyadmin-2.6.2-r2.ebuild 2563 -MD5 91414922dfefd3f35e0341205258c758 ChangeLog 16073 +MD5 f8b1b6a2224f71526b74ce90f2383fbc ChangeLog 16255 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162 MD5 182411f504d40f317a802da58ec5e176 files/digest-phpmyadmin-2.6.2-r2 70 MD5 f2b2abcad19bc7efa598ba903d93b9e8 files/digest-phpmyadmin-2.6.3_p1 74 -MD5 278c189dfbc22e4f95fcb1f2c8a7622a files/digest-phpmyadmin-2.6.2_rc1 74 +MD5 cf627de1acb2efda0af3d42a61305df2 files/digest-phpmyadmin-2.6.4_rc1 74 MD5 4f79e26c8e5060be5dd522af91639d9b files/postinstall-en.txt 511 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857 @@ -17,7 +17,7 @@ MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFDClxaEzitwsaoONoRAtbGAJ9UuydwLzoeTpQuxB9Vy8C9L5XuGwCfZq5b -j1RU5eOUJfiYoPT6jGayfFY= -=cn5S +iD8DBQFDEknHEzitwsaoONoRAmPgAJ9WLLC20lu+DsuGdHERWGABM0+RggCguO3h +dHVigeTmb05D72bte8lH98A= +=cCUA -----END PGP SIGNATURE----- diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2_rc1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2_rc1 deleted file mode 100644 index 58fddbd5836c..000000000000 --- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2_rc1 +++ /dev/null @@ -1 +0,0 @@ -MD5 20093576299c6cc1468aa67b3dcedf50 phpMyAdmin-2.6.2-rc1.tar.bz2 1638568 diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_rc1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_rc1 new file mode 100644 index 000000000000..182646257b4d --- /dev/null +++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.4_rc1 @@ -0,0 +1 @@ +MD5 dfa8a387ae7e69ec3888a1e58b68a8cc phpMyAdmin-2.6.4-rc1.tar.bz2 1728180 diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.2_rc1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.4_rc1.ebuild similarity index 58% rename from dev-db/phpmyadmin/phpmyadmin-2.6.2_rc1.ebuild rename to dev-db/phpmyadmin/phpmyadmin-2.6.4_rc1.ebuild index 7eb703c8a066..f45153f33b38 100644 --- a/dev-db/phpmyadmin/phpmyadmin-2.6.2_rc1.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-2.6.4_rc1.ebuild @@ -1,17 +1,15 @@ # 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.2_rc1.ebuild,v 1.6 2005/04/09 11:13:18 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.4_rc1.ebuild,v 1.1 2005/08/28 23:33:09 rl03 Exp $ inherit eutils webapp -MY_PV=${PV/_p/-pl} -MY_PV=${MY_PV/_rc/-rc} -MY_P=phpMyAdmin-${MY_PV} +MY_P=phpMyAdmin-${PV/_rc/-rc} 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 ppc hppa sparc x86 amd64 ~mips" +KEYWORDS="~alpha ~ppc ~hppa ~sparc ~x86 ~amd64 ~mips" IUSE="" DEPEND=">=dev-db/mysql-3.23.32 ${WORKDIR}/postinstall-en.txt } src_compile() { einfo "Setting random user/password details for the controluser" local pmapass="${RANDOM}${RANDOM}${RANDOM}${RANDOM}" - mv config.inc.php ${T}/config.inc.php - sed -e "s/@pmapass@/${pmapass}/g" \ - ${T}/config.inc.php > config.inc.php + 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 } @@ -46,7 +38,7 @@ src_compile() { src_install() { webapp_src_preinst - local docs="ANNOUNCE.txt CREDITS Documentation.txt RELEASE-DATE-${PV} TODO ChangeLog LICENSE README" + local docs="CREDITS ChangeLog Documentation.txt INSTALL README RELEASE-DATE-2.6.4-rc1 TODO" # install the SQL scripts available to us # @@ -55,34 +47,24 @@ src_install() { webapp_sqlscript mysql ${T}/mysql-setup.sql - # handle documentation files - # - # NOTE that doc files go into /usr/share/doc as normal; they do NOT - # get installed per vhost! - dodoc ${docs} - for doc in ${docs} INSTALL; do - rm -f ${doc} - done + dohtml Documentation.html # Copy the app's main files einfo "Installing main files" cp -r . ${D}${MY_HTDOCSDIR} - - # Identify the configuration files that this app uses + for doc in ${docs} LICENSE; do + rm -f ${D}/${MY_HTDOCSDIR}/${doc} + done webapp_configfile ${MY_HTDOCSDIR}/config.inc.php - - # there are no files which need to be owned by the web server - - # add the post-installation instructions - - webapp_postinst_txt en ${WORKDIR}/postinstall-en.txt - - # all done - # - # now we let the eclass strut its stuff ;-) - + 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 } -- 2.26.2