commit: a440f33e8afc01e1348b3578076681d476741c89
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo
<DOT> org>
AuthorDate: Tue Jun 2 20:48:10 2015 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Jun 2 20:49:10 2015 +0000
URL: https://gitweb.gentoo.org/dev/jmbsvicetto.git/commit/?id=a440f33e
Stop using depend.php eclass and add virtual/httpd-php dep directly. Silence
repoman warnings.
Bump to 4.4.8 release.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT>
gentoo.org>
dev-db/phpmyadmin/Manifest | 2 +-
....13.1.ebuild => phpmyadmin-4.0.10.10-r1.ebuild} | 4 +-
....10.10.ebuild => phpmyadmin-4.1.14.8-r1.ebuild} | 4 +-
...1.14.8.ebuild => phpmyadmin-4.2.13.3-r1.ebuild} | 4 +-
...2.13.3.ebuild => phpmyadmin-4.3.13.1-r1.ebuild} | 4 +-
dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild | 61 ----------------------
...min-4.3.13.1.ebuild => phpmyadmin-4.4.8.ebuild} | 4 +-
7 files changed, 11 insertions(+), 72 deletions(-)
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 61bbf01..af4f8ae 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -2,4 +2,4 @@ DIST phpMyAdmin-4.0.10.10-all-languages.tar.xz 4775140 SHA256
5f4522227ad9ffce91
DIST phpMyAdmin-4.1.14.8-all-languages.tar.xz 4881004 SHA256
e2a2fee1658e3108048907a257b8f291fcfbd5840690e8f4711f9ea28233dce8 SHA512
34d28f04d6a808565ecc3d7187b2719d1e25e55d6248e3ea516e5914bd5a70aab0d9c4df3525cb8e77b37949a78671235af46e22871fe26ba999aa01b01c44d2
WHIRLPOOL
a2e236a47154117c1bee3b9a51d4c3da9d1bd5834e3167174cbd80e562b5c14424b7e75de814f85d1ade1f6501b665a2af21cedd1c87be2ea6a9e151c0d8a2cf
DIST phpMyAdmin-4.2.13.3-all-languages.tar.xz 5205440 SHA256
2d78bd91dc90d95d9f21c7e41294f2995a36dbbe1e4d1209e972b1d855c4877e SHA512
77ad296931666896613b7363c35c5546da66bddcda37fb31609ca5fb78f4b12241f6c976d1916a6491fbbc33d5f837163bcd0c0e0f227458d055076a971b640f
WHIRLPOOL
c4bb8f0689b0aa2ae7a67793f9c26b761e1a1e28e4e684f495815caf89ef527f4fced30aa53986c10d41ec000f3e295677739d5e73cbfc336466591c9fcf6a3e
DIST phpMyAdmin-4.3.13.1-all-languages.tar.xz 5446988 SHA256
d7484e2449453eae52613aae59e5f3a9342014aba7db88598ad6a90504ebfbd3 SHA512
b08a41721876a4c7c8fcc162f0f1f43bbd67b4f87fc1c0668672addb8eb6f56695755401a2de2c75fc944b074f5187c6df942bec0ff03c16ad34c27b505b87a0
WHIRLPOOL
a72b7e4247bb7de68820d5583967b04b8dfd0917383f88d707b48235d119e0ad4fd45a04352dda0f43b11b2ba4def5a4648eca01e2f7ceabd3f788e429dc83ca
-DIST phpMyAdmin-4.4.6.1-all-languages.tar.xz 5635832 SHA256
d423a81868f01b4ce77f90113d83df96590446acdbe8f00a46aeb670c4a9ac5c SHA512
d25c63f9d354ae3f488d1837c710cfc5bacde3d6421d71eb96ff5868971132ea570aad9875f35d862d22d0318b5e16b208a2d6a7d542424ee2a04e329a619978
WHIRLPOOL
8c5f5e9349e801e328ddafe89322e457b89bfa4c5dbe593be9990ac3168a5d0cfada260ef275388b95f2c806952a682445baff23d6092dd5a66766681759172b
+DIST phpMyAdmin-4.4.8-all-languages.tar.xz 5651996 SHA256
17637f61849a8f42c60775195a83dd13bb5e69c496d912e27dad0f9baddab1eb SHA512
87ebbb6df38c61825460a210d9ddfd796a12c7a5bcc3496d31f52d479f801d0ab5c83220a89522688209438972eff2e9917a47dd44b3885348f7f3d98aeeffd9
WHIRLPOOL
894574745ae0f02c41028d0e601e09d3a7ce6c71307151c78549cb9430d3acbea634897be45cd28e4a37bbfc1afe49f47d320c74e878f7e00eb9ed2c01b333ad
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild
similarity index 96%
copy from dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
copy to dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild
index 9367135..f5b3a1c 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit eutils webapp depend.php
+inherit eutils webapp
MY_PV=${PV/_/-}
MY_P="phpMyAdmin-${MY_PV}-all-languages"
@@ -23,10 +23,10 @@ RDEPEND="
dev-lang/php[mysqli]
dev-lang/php[mysql]
)
+ virtual/httpd-php:*
"
need_httpd_cgi
-need_php_httpd
S="${WORKDIR}"/${MY_P}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.1.14.8-r1.ebuild
similarity index 96%
rename from dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-4.1.14.8-r1.ebuild
index 9367135..f5b3a1c 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.1.14.8-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit eutils webapp depend.php
+inherit eutils webapp
MY_PV=${PV/_/-}
MY_P="phpMyAdmin-${MY_PV}-all-languages"
@@ -23,10 +23,10 @@ RDEPEND="
dev-lang/php[mysqli]
dev-lang/php[mysql]
)
+ virtual/httpd-php:*
"
need_httpd_cgi
-need_php_httpd
S="${WORKDIR}"/${MY_P}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild
similarity index 96%
rename from dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild
index 9367135..f5b3a1c 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit eutils webapp depend.php
+inherit eutils webapp
MY_PV=${PV/_/-}
MY_P="phpMyAdmin-${MY_PV}-all-languages"
@@ -23,10 +23,10 @@ RDEPEND="
dev-lang/php[mysqli]
dev-lang/php[mysql]
)
+ virtual/httpd-php:*
"
need_httpd_cgi
-need_php_httpd
S="${WORKDIR}"/${MY_P}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild
similarity index 96%
rename from dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild
index 9367135..f5b3a1c 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit eutils webapp depend.php
+inherit eutils webapp
MY_PV=${PV/_/-}
MY_P="phpMyAdmin-${MY_PV}-all-languages"
@@ -23,10 +23,10 @@ RDEPEND="
dev-lang/php[mysqli]
dev-lang/php[mysql]
)
+ virtual/httpd-php:*
"
need_httpd_cgi
-need_php_httpd
S="${WORKDIR}"/${MY_P}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild
deleted file mode 100644
index 9367135..0000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/";
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
- dev-lang/php[crypt,ctype,filter,json,session,unicode]
- || (
- dev-lang/php[mysqli]
- dev-lang/php[mysql]
- )
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
- webapp_pkg_setup
-}
-
-src_install() {
- webapp_src_preinst
-
- dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
- rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
- if ! use setup; then
- rm -rf setup || die "Cannot remove setup utility"
- elog "The phpMyAdmin setup utility has been removed."
- elog "It is a regular target of various exploits. If you need
it, set USE=setup."
- else
- elog "You should consider disabling the setup USE flag"
- elog "to exclude the setup utility if you don't use it."
- elog "It regularly is the target of various exploits."
- fi
-
- insinto "${MY_HTDOCSDIR#${EPREFIX}}"
- doins -r .
-
- webapp_configfile
"${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
- webapp_serverowned
"${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
- webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.4.8.ebuild
similarity index 96%
rename from dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-4.4.8.ebuild
index 9367135..f5b3a1c 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.8.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit eutils webapp depend.php
+inherit eutils webapp
MY_PV=${PV/_/-}
MY_P="phpMyAdmin-${MY_PV}-all-languages"
@@ -23,10 +23,10 @@ RDEPEND="
dev-lang/php[mysqli]
dev-lang/php[mysql]
)
+ virtual/httpd-php:*
"
need_httpd_cgi
-need_php_httpd
S="${WORKDIR}"/${MY_P}
