Version bump, bug #161460.
authorRenat Lumpau <rl03@gentoo.org>
Sun, 14 Jan 2007 15:55:54 +0000 (15:55 +0000)
committerRenat Lumpau <rl03@gentoo.org>
Sun, 14 Jan 2007 15:55:54 +0000 (15:55 +0000)
Package-Manager: portage-2.1.2_rc4-r4

dev-db/phpmyadmin/ChangeLog
dev-db/phpmyadmin/Manifest
dev-db/phpmyadmin/files/config.default.php-2.9.2.patch [new file with mode: 0644]
dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.2_rc1 [new file with mode: 0644]
dev-db/phpmyadmin/phpmyadmin-2.9.2_rc1.ebuild [new file with mode: 0644]

index 87738b134b8c34928680ddab017d40db971f78a0..c00499e58aab4d3205e59b4f77e6292a08bc4d7f 100644 (file)
@@ -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.230 2007/01/13 15:08:11 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.231 2007/01/14 15:55:54 rl03 Exp $
+
+*phpmyadmin-2.9.2_rc1 (14 Jan 2007)
+
+  14 Jan 2007; Renat Lumpau <rl03@gentoo.org>
+  +files/config.default.php-2.9.2.patch, +phpmyadmin-2.9.2_rc1.ebuild:
+  Version bump, bug #161460.
 
   13 Jan 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml:
   Add MySQL herd to metadata.
index 1f626201bc34049e81eaaf0a713a24aef7fa8f4c..ce6ae246ac9c179f0ac6185bf8b9665d1fbb906e 100644 (file)
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX common.lib.php.diff 272 RMD160 47977c97e73ed2d5a09e9951c7f814eb993a04ec SHA1 3358710b668b33e348d640be2837fbb7c0cfad29 SHA256 066b0241e466db73d1f9ca694e96b6bb23a56e3e4fa16d9b31bf4e5d3fd6b57a
 MD5 da50258f238da90ef88e4600b6068a55 files/common.lib.php.diff 272
 RMD160 47977c97e73ed2d5a09e9951c7f814eb993a04ec files/common.lib.php.diff 272
@@ -6,6 +9,10 @@ AUX config.default.php-2.8.0.patch 5553 RMD160 60869c33523751098a98a067fee3482c2
 MD5 9dc203a856638d41f9992d0e54f8c8f8 files/config.default.php-2.8.0.patch 5553
 RMD160 60869c33523751098a98a067fee3482c2c26795a files/config.default.php-2.8.0.patch 5553
 SHA256 78ab8d8910101accd03f8820210feb49a997571e66156d86255dc8fafebf16ce files/config.default.php-2.8.0.patch 5553
+AUX config.default.php-2.9.2.patch 5290 RMD160 065246a1fe6ec281518210a96d61b600d0941d99 SHA1 1328ad58e0f253bbf0ad2c2262f68fcfd6d38035 SHA256 9f676484fd42a96ade7a8890dbc39294663d889a65af432273f05a58c6b9f0e0
+MD5 31a8f5e607ee6379bc9841c200b9262c files/config.default.php-2.9.2.patch 5290
+RMD160 065246a1fe6ec281518210a96d61b600d0941d99 files/config.default.php-2.9.2.patch 5290
+SHA256 9f676484fd42a96ade7a8890dbc39294663d889a65af432273f05a58c6b9f0e0 files/config.default.php-2.9.2.patch 5290
 AUX mysql-setup.sql.in-2.5.6 3231 RMD160 7b462640601d77d01c8f11322cb2cb84ce8e79a6 SHA1 fa3ffac6200d8f372daccdb3051753ca94ce236d SHA256 482ada180bcaf41fa4dc103edae4a78a55f3ced1fb2becc12124b914db1dcbfe
 MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
 RMD160 7b462640601d77d01c8f11322cb2cb84ce8e79a6 files/mysql-setup.sql.in-2.5.6 3231
@@ -19,14 +26,19 @@ MD5 cf0af0543cb29eb88163220df6f14669 files/reconfig-2.8 329
 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 files/reconfig-2.8 329
 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612 files/reconfig-2.8 329
 DIST phpMyAdmin-2.9.1.1-all-languages-utf-8-only.tar.bz2 1545641 RMD160 8c21b9450534f674931c3c056c4b0f34a0ba009f SHA1 12eb273ce3a91e0dcf5ba84b42acbd1f564233f8 SHA256 2a4b8379f0fbcdef6bbc3112be13fa19de67a564196456fda77e13642f7ac0e5
+DIST phpMyAdmin-2.9.2-rc1-all-languages-utf-8-only.tar.bz2 1546404 RMD160 f8254e0a357ae75817e4a588119d923f4c9cb2ba SHA1 345cee890fbebe9773dad6a0bacf8a2a2f822c42 SHA256 2597d79b5386ead817ac8c7afbe8cc95f3c0847f4e3a113a6dfff5ffe107dc1e
 EBUILD phpmyadmin-2.9.1.1.ebuild 2619 RMD160 b25e4aa08897cc309855f96f2d442b434ca0b7b2 SHA1 6e6a938af91e58938e399990f3e85c50b99cffdd SHA256 2e4c429b4780acd323e2805b3b2a35e9b63293ca648a79dfc9f7a99cc8c0b4ef
 MD5 2fa9a492f4be08eedb5b56c229b27de4 phpmyadmin-2.9.1.1.ebuild 2619
 RMD160 b25e4aa08897cc309855f96f2d442b434ca0b7b2 phpmyadmin-2.9.1.1.ebuild 2619
 SHA256 2e4c429b4780acd323e2805b3b2a35e9b63293ca648a79dfc9f7a99cc8c0b4ef phpmyadmin-2.9.1.1.ebuild 2619
-MISC ChangeLog 31546 RMD160 959a541837ffce7ec57e64f9118497954c22b578 SHA1 de2c36743a28966a39c44bb0b8f3fd8a254a3835 SHA256 566f43647dbdf99ac11b9f89538b244094075a573111c9d6f92f4d4a9b8f0b37
-MD5 67ef98cccdf0e1cb351ced6180f6262a ChangeLog 31546
-RMD160 959a541837ffce7ec57e64f9118497954c22b578 ChangeLog 31546
-SHA256 566f43647dbdf99ac11b9f89538b244094075a573111c9d6f92f4d4a9b8f0b37 ChangeLog 31546
+EBUILD phpmyadmin-2.9.2_rc1.ebuild 2627 RMD160 3c91e8f04087f73d3f7c6eccba0097d040536bde SHA1 220102f28acfce0fd31385d51d05504b6038b561 SHA256 c277f99dc53eaf6881770b2c1ef0ac9f667068b07a4484fd0dac30c91047a718
+MD5 061af49fd09cd8fcbbe7d51f5f0db0bc phpmyadmin-2.9.2_rc1.ebuild 2627
+RMD160 3c91e8f04087f73d3f7c6eccba0097d040536bde phpmyadmin-2.9.2_rc1.ebuild 2627
+SHA256 c277f99dc53eaf6881770b2c1ef0ac9f667068b07a4484fd0dac30c91047a718 phpmyadmin-2.9.2_rc1.ebuild 2627
+MISC ChangeLog 31728 RMD160 1a626d8dbb36434d477d796a7be866c59b8794a1 SHA1 20f2b0588fc410293a6c011c0e7573b759d7c06c SHA256 b7698e4f361c7731eec9ff2a0da913c55ed9e2257205671d11f7f2e2c1343ab9
+MD5 7fb87b542dda8afc27feb76f98b9d8ca ChangeLog 31728
+RMD160 1a626d8dbb36434d477d796a7be866c59b8794a1 ChangeLog 31728
+SHA256 b7698e4f361c7731eec9ff2a0da913c55ed9e2257205671d11f7f2e2c1343ab9 ChangeLog 31728
 MISC metadata.xml 182 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d SHA1 a6d1f4b69883a0940325b7b4ad1de261c7b8c485 SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1
 MD5 4bfbfdac057f18787bab530fdaf64fdf metadata.xml 182
 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d metadata.xml 182
@@ -34,3 +46,13 @@ SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1 metadata
 MD5 bf0d666ad3ebeb9629500545aff539dd files/digest-phpmyadmin-2.9.1.1 337
 RMD160 f8e6770d06ab77da4066dce624fde52f52122e52 files/digest-phpmyadmin-2.9.1.1 337
 SHA256 439b479648f77327d77f2e01224bdaf5a9d280dd23beb5a12b46b3c6319334f1 files/digest-phpmyadmin-2.9.1.1 337
+MD5 9f43e978247073c7e88b034c1c29caf0 files/digest-phpmyadmin-2.9.2_rc1 343
+RMD160 8adf920c095f0b1bb8e678e081ca057cc59d7de5 files/digest-phpmyadmin-2.9.2_rc1 343
+SHA256 8ea1ccd705a491d9e2290b09f54864fa97169f62531a426a789296d8c85efd1f files/digest-phpmyadmin-2.9.2_rc1 343
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFqlKTEzitwsaoONoRAkOHAJ9b4HK2n3CQI9NOYbg9IrrzD1U4xQCgzLXB
+iigyB+2gjIn94x/5QyVx6Iw=
+=K1vP
+-----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/config.default.php-2.9.2.patch b/dev-db/phpmyadmin/files/config.default.php-2.9.2.patch
new file mode 100644 (file)
index 0000000..5fbb09a
--- /dev/null
@@ -0,0 +1,58 @@
+--- libraries/config.default.php.old   2007-01-14 15:50:51.000000000 +0000
++++ libraries/config.default.php       2007-01-14 15:52:37.000000000 +0000
+@@ -61,14 +61,14 @@ $cfg['Servers'][$i]['connect_type']  = '
+ $cfg['Servers'][$i]['extension']     = 'mysql';     // The php MySQL extension to use ('mysql' or 'mysqli')
+ $cfg['Servers'][$i]['compress']      = FALSE;       // Use compressed protocol for the MySQL connection
+                                                     // (requires PHP >= 4.3.0)
+-$cfg['Servers'][$i]['controluser']   = '';          // MySQL control user settings
++$cfg['Servers'][$i]['controluser']   = 'pma';          // MySQL control user settings
+                                                     // (this user must have read-only
+-$cfg['Servers'][$i]['controlpass']   = '';          // access to the "mysql/user"
++$cfg['Servers'][$i]['controlpass']   = '@pmapass@';          // access to the "mysql/user"
+                                                     // and "mysql/db" tables).
+                                                     // The controluser is also
+                                                     // used for all relational
+                                                     // features (pmadb)
+-$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (valid choices: config, http, HTTP or cookie)
++$cfg['Servers'][$i]['auth_type']     = 'http';    // Authentication method (valid choices: config, http, HTTP or cookie)
+ $cfg['Servers'][$i]['user']          = 'root';      // MySQL user
+ $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
+                                                     // with 'config' auth_type)
+@@ -79,29 +79,29 @@ $cfg['Servers'][$i]['only_db']       = '
+ $cfg['Servers'][$i]['hide_db']       = '';          // Database name to be hidden from listings
+ $cfg['Servers'][$i]['verbose']       = '';          // Verbose name for this host - leave blank to show the hostname
+-$cfg['Servers'][$i]['pmadb']         = '';          // Database used for Relation, Bookmark and PDF Features
++$cfg['Servers'][$i]['pmadb']         = 'pmadb';          // Database used for Relation, Bookmark and PDF Features
+                                                     // (see scripts/create_tables.sql)
+                                                     //   - leave blank for no support
+                                                     //     DEFAULT: 'phpmyadmin'
+-$cfg['Servers'][$i]['bookmarktable'] = '';          // Bookmark table
++$cfg['Servers'][$i]['bookmarktable'] = 'PMA_bookmark';          // Bookmark table
+                                                     //   - leave blank for no bookmark support
+                                                     //     DEFAULT: 'pma_bookmark'
+-$cfg['Servers'][$i]['relation']      = '';          // table to describe the relation between links (see doc)
++$cfg['Servers'][$i]['relation']      = 'PMA_relation';          // table to describe the relation between links (see doc)
+                                                     //   - leave blank for no relation-links support
+                                                     //     DEFAULT: 'pma_relation'
+-$cfg['Servers'][$i]['table_info']    = '';          // table to describe the display fields
++$cfg['Servers'][$i]['table_info']    = 'PMA_table_info';          // table to describe the display fields
+                                                     //   - leave blank for no display fields support
+                                                     //     DEFAULT: 'pma_table_info'
+-$cfg['Servers'][$i]['table_coords']  = '';          // table to describe the tables position for the PDF schema
++$cfg['Servers'][$i]['table_coords']  = 'PMA_table_coords';          // table to describe the tables position for the PDF schema
+                                                     //   - leave blank for no PDF schema support
+                                                     //     DEFAULT: 'pma_table_coords'
+-$cfg['Servers'][$i]['pdf_pages']     = '';          // table to describe pages of relationpdf
++$cfg['Servers'][$i]['pdf_pages']     = 'PMA_pdf_pages';          // table to describe pages of relationpdf
+                                                     //   - leave blank if you don't want to use this
+                                                     //     DEFAULT: 'pma_pdf_pages'
+-$cfg['Servers'][$i]['column_info']   = '';          // table to store column information
++$cfg['Servers'][$i]['column_info']   = 'PMA_column_info';          // table to store column information
+                                                     //   - leave blank for no column comments/mime types
+                                                     //     DEFAULT: 'pma_column_info'
+-$cfg['Servers'][$i]['history']       = '';          // table to store SQL history
++$cfg['Servers'][$i]['history']       = 'PMA_history';          // table to store SQL history
+                                                     //   - leave blank for no SQL query history
+                                                     //     DEFAULT: 'pma_history'
+ $cfg['Servers'][$i]['verbose_check'] = TRUE;        // set to FALSE if you know that your pma_* tables
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.2_rc1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.2_rc1
new file mode 100644 (file)
index 0000000..85df14a
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 b97740d0dcfe8a17e885373f6141103c phpMyAdmin-2.9.2-rc1-all-languages-utf-8-only.tar.bz2 1546404
+RMD160 f8254e0a357ae75817e4a588119d923f4c9cb2ba phpMyAdmin-2.9.2-rc1-all-languages-utf-8-only.tar.bz2 1546404
+SHA256 2597d79b5386ead817ac8c7afbe8cc95f3c0847f4e3a113a6dfff5ffe107dc1e phpMyAdmin-2.9.2-rc1-all-languages-utf-8-only.tar.bz2 1546404
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.9.2_rc1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.9.2_rc1.ebuild
new file mode 100644 (file)
index 0000000..205bd27
--- /dev/null
@@ -0,0 +1,89 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.9.2_rc1.ebuild,v 1.1 2007/01/14 15:55:54 rl03 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"
+S=${WORKDIR}/${MY_P}
+
+need_php
+
+pkg_setup() {
+       webapp_pkg_setup
+
+       if ! PHPCHECKNODIE="yes" require_php_with_use 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 "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_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/config.default.php-2.9.2.patch
+       # bug 152933
+       cd libraries && epatch ${FILESDIR}/common.lib.php.diff
+       cd ..
+
+       # 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 libraries/config.default.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 ChangeLog"
+
+       # 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}
+       dohtml Documentation.html
+
+       # Copy the app's main files
+
+       einfo "Installing main files"
+       cp -r . ${D}${MY_HTDOCSDIR}
+
+       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
+       # bug #88831, make sure the create script is world-readable.
+       fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
+}