From: Martin Holzer Date: Mon, 22 Nov 2004 23:45:45 +0000 (+0000) Subject: cleanup X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f1df8032d2661b9c4c93ed130f769c23776ce579;p=gentoo.git cleanup --- diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest index 8946d94bb8b0..4dab67f4e7c2 100644 --- a/dev-db/phpmyadmin/Manifest +++ b/dev-db/phpmyadmin/Manifest @@ -1,19 +1,11 @@ -MD5 dd19aa2991aba207f71ccc7b017f6b99 phpmyadmin-2.5.7.ebuild 2580 -MD5 12b248930666709caa74239d6d57032e phpmyadmin-2.5.7_p1.ebuild 2579 -MD5 319be547b5537b1cbcd3bdd509f6e26d phpmyadmin-2.5.6.ebuild 2953 -MD5 4586dda97b247d5ebe945fcc46a37ff8 phpmyadmin-2.6.0_p3.ebuild 2574 MD5 b8249f06bedf4006419e5589ecebc561 ChangeLog 9728 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244 MD5 a15cc76e0e9d5fe7a990f19c1bca381d phpmyadmin-2.6.0_p2.ebuild 2572 -MD5 71b5699d1654d0d17ffa926729ae202a phpmyadmin-2.5.6-r1.ebuild 2580 -MD5 a424f37ca165d4c8e3c7c0c4295902d8 files/digest-phpmyadmin-2.6.0_p2 74 -MD5 7507cfb3edae5600142424613b1eb892 files/digest-phpmyadmin-2.6.0_p3 74 -MD5 5367bc809b77e6374f18d126990fba75 files/digest-phpmyadmin-2.5.6 70 -MD5 09deb77d7dc18f657af1dc07afa81072 files/digest-phpmyadmin-2.5.7 70 -MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506 +MD5 4586dda97b247d5ebe945fcc46a37ff8 phpmyadmin-2.6.0_p3.ebuild 2574 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525 +MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857 MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712 -MD5 5367bc809b77e6374f18d126990fba75 files/digest-phpmyadmin-2.5.6-r1 70 -MD5 4bc84bc21f355fef1b2041ab45d3c6a5 files/digest-phpmyadmin-2.5.7_p1 74 -MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231 +MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506 +MD5 a424f37ca165d4c8e3c7c0c4295902d8 files/digest-phpmyadmin-2.6.0_p2 74 +MD5 7507cfb3edae5600142424613b1eb892 files/digest-phpmyadmin-2.6.0_p3 74 diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6 deleted file mode 100644 index 9001221652cf..000000000000 --- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 b62afe98600eacc2a3300c9856b349f7 phpMyAdmin-2.5.6.tar.bz2 1111512 diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6-r1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6-r1 deleted file mode 100644 index 9001221652cf..000000000000 --- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 b62afe98600eacc2a3300c9856b349f7 phpMyAdmin-2.5.6.tar.bz2 1111512 diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.7 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.7 deleted file mode 100644 index c620fe541456..000000000000 --- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 f0f06811aa4f7c14e053ddd23002f40d phpMyAdmin-2.5.7.tar.bz2 1121972 diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.7_p1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.7_p1 deleted file mode 100644 index d23977f88b0a..000000000000 --- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.7_p1 +++ /dev/null @@ -1 +0,0 @@ -MD5 93b7c7f3dfcfd6df9c2ea26f31a51772 phpMyAdmin-2.5.7-pl1.tar.bz2 1123591 diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.6-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.6-r1.ebuild deleted file mode 100644 index f1f8cf0ea022..000000000000 --- a/dev-db/phpmyadmin/phpmyadmin-2.5.6-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.6-r1.ebuild,v 1.7 2004/07/22 21:08:57 twp Exp $ - -inherit eutils webapp - -MY_P=phpMyAdmin-${PV/_p/-pl} -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 -arm ~ppc -hppa -mips ~sparc ~x86 ~amd64" -IUSE="" -DEPEND=">=net-www/apache-1.3 - >=dev-db/mysql-3.23.32 =dev-php/mod_php-4.1.0 - sys-apps/findutils - !<=dev-db/phpmyadmin-2.5.6" -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/config.inc.php-${PV}.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}" - 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" \ - ${FILESDIR}/mysql-setup.sql.in-${PV} > ${T}/mysql-setup.sql -} - -src_install() { - webapp_src_preinst - - local docs="ANNOUNCE.txt CREDITS Documentation.txt RELEASE-DATE-${PV} TODO ChangeLog LICENSE README" - - # 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 - - # 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 - - # Copy the app's main files - - einfo "Installing main files" - cp -r . ${D}${MY_HTDOCSDIR} - - # Identify the configuration files that this app uses - - webapp_configfile ${MY_HTDOCSDIR}/config.inc.php - - # Identify any script files that need #! headers adding to run under - # a CGI script (such as PHP/CGI) - # - # for phpmyadmin, we *assume* that all .php files that don't end in - # .inc.php need to have CGI/BIN support added - - for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do - webapp_runbycgibin php ${MY_HTDOCSDIR}/$x - done - - # there are no files which need to be owned by the web server - - # add the post-installation instructions - - webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt - - # all done - # - # now we let the eclass strut its stuff ;-) - - webapp_src_install -} diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild deleted file mode 100644 index 9e5b82a622f7..000000000000 --- a/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild,v 1.14 2004/07/22 21:08:57 twp Exp $ - -inherit eutils webapp-apache - -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" -IUSE="" -SLOT="0" -KEYWORDS="alpha ppc hppa sparc x86 amd64" -DEPEND=">=net-www/apache-1.3 - >=dev-db/mysql-3.23.32 =dev-php/mod_php-4.1.0 - sys-apps/findutils" -S=${WORKDIR}/${MY_P} - -pkg_setup() { - webapp-detect || NO_WEBSERVER=1 - webapp-pkg_setup "${NO_WEBSERVER}" - einfo "Installing into ${ROOT}${HTTPD_ROOT}." -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/config.inc.php-${PV}.patch -} - -src_compile() { - 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" \ - ${FILESDIR}/mysql-setup.sql.in-${PV} > ${T}/mysql-setup.sql -} - -src_install() { - webapp-detect || NO_WEBSERVER=1 - webapp-mkdirs - - local DocumentRoot=${HTTPD_ROOT} - local destdir=${DocumentRoot}/phpmyadmin - local docs="CREDITS Documentation.txt RELEASE-DATE-* TODO" - - # Copy everything - mkdir -p ${D}${destdir} - cp -r . ${D}${destdir} - # Remove documentation files - for doc in ${docs} INSTALL; do - rm -f ${D}${destdir}/${doc} - done - # Remove .cvs* files and CVS directories - find ${D}${destdir} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf - # Fix permissions - find ${D}${destdir} -type d | xargs chmod 755 - find ${D}${destdir} -type f | xargs chmod 644 - - dodoc ${docs} ChangeLog LICENSE README - - dosym /etc/phpmyadmin/config.inc.php ${destdir}/config.inc.php - insinto /etc/phpmyadmin - insopts -g apache -m 640 - doins config.inc.php - doins ${T}/mysql-setup.sql - -} - -pkg_postinst() { - einfo - einfo "To complete installation, you must" - einfo "1. Update your configuration files:" - einfo " etc-update" - einfo "2. Update MySQL's grant tables and the pmadb database:" - einfo " ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config" - einfo "3. Reload MySQL:" - einfo " /etc/init.d/mysql restart" - einfo - einfo "If you are upgrading from an earlier version and are using phpMyAdmin's" - einfo "features for master/foreign tables be sure to read" - einfo " http://localhost/phpmyadmin/Documentation.html#col_com" - einfo "You will need to perform the ALTER TABLE step yourself." - einfo - einfo "Finally, point your browser to http://localhost/phpmyadmin/." - einfo -} - -pkg_config() { - einfo "This will execute the contents of ${ROOT}etc/phpmyadmin/mysql-setup.sql" - einfo "Type in your MySQL root password:" - mysql -u root -p < ${ROOT}etc/phpmyadmin/mysql-setup.sql || die - einfo "You need to reload MySQL for the changes to take effect" -} diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild deleted file mode 100644 index 5afb006cdf10..000000000000 --- a/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild,v 1.6 2004/11/03 06:53:19 psi29a Exp $ - -inherit eutils webapp - -MY_P=phpMyAdmin-${PV/_p/-pl} -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 -arm ~ppc -hppa ~mips ~sparc ~x86 ~amd64" -IUSE="" -DEPEND=">=net-www/apache-1.3 - >=dev-db/mysql-3.23.32 =dev-php/mod_php-4.1.0 - 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}" - 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" \ - ${FILESDIR}/mysql-setup.sql.in-2.5.6 > ${T}/mysql-setup.sql -} - -src_install() { - webapp_src_preinst - - local docs="ANNOUNCE.txt CREDITS Documentation.txt RELEASE-DATE-${PV} TODO ChangeLog LICENSE README" - - # 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 - - # 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 - - # Copy the app's main files - - einfo "Installing main files" - cp -r . ${D}${MY_HTDOCSDIR} - - # Identify the configuration files that this app uses - - webapp_configfile ${MY_HTDOCSDIR}/config.inc.php - - # Identify any script files that need #! headers adding to run under - # a CGI script (such as PHP/CGI) - # - # for phpmyadmin, we *assume* that all .php files that don't end in - # .inc.php need to have CGI/BIN support added - - for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do - webapp_runbycgibin php ${MY_HTDOCSDIR}/$x - done - - # there are no files which need to be owned by the web server - - # add the post-installation instructions - - webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt - - # all done - # - # now we let the eclass strut its stuff ;-) - - webapp_src_install -} diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.7_p1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.7_p1.ebuild deleted file mode 100644 index c6cc346a748d..000000000000 --- a/dev-db/phpmyadmin/phpmyadmin-2.5.7_p1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.7_p1.ebuild,v 1.9 2004/07/29 13:10:14 pvdabeel Exp $ - -inherit eutils webapp - -MY_P=phpMyAdmin-${PV/_p/-pl} -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 -arm ppc hppa -mips sparc x86 amd64" -IUSE="" -DEPEND=">=net-www/apache-1.3 - >=dev-db/mysql-3.23.32 =dev-php/mod_php-4.1.0 - 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}" - 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" \ - ${FILESDIR}/mysql-setup.sql.in-2.5.6 > ${T}/mysql-setup.sql -} - -src_install() { - webapp_src_preinst - - local docs="ANNOUNCE.txt CREDITS Documentation.txt RELEASE-DATE-${PV} TODO ChangeLog LICENSE README" - - # 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 - - # 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 - - # Copy the app's main files - - einfo "Installing main files" - cp -r . ${D}${MY_HTDOCSDIR} - - # Identify the configuration files that this app uses - - webapp_configfile ${MY_HTDOCSDIR}/config.inc.php - - # Identify any script files that need #! headers adding to run under - # a CGI script (such as PHP/CGI) - # - # for phpmyadmin, we *assume* that all .php files that don't end in - # .inc.php need to have CGI/BIN support added - - for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do - webapp_runbycgibin php ${MY_HTDOCSDIR}/$x - done - - # there are no files which need to be owned by the web server - - # add the post-installation instructions - - webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt - - # all done - # - # now we let the eclass strut its stuff ;-) - - webapp_src_install -}