Update to EAPI 4 and other minor fixes.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 6f52d81b1b117356933588b2fc64de6c89808f7f..5246f2b074342e2452bd2c03a86ebfaaff98b6d4 100644 (file)
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.169 2011/12/09 09:19:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.170 2011/12/09 22:09:03 radhermit Exp $
+
+  09 Dec 2011; Tim Harder <radhermit@gentoo.org> mediawiki-1.18.0.ebuild:
+  Update to EAPI 4 and other minor fixes.
 
 *mediawiki-1.18.0 (09 Dec 2011)
 

diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index bd4166b6a4a28541e7db0d4a38f83722f3781f2e..4792bf572e41c1dbe979d9c2a176237e803d6803 100644 (file)
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,8 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX postinstall-1.13-en.txt 2751 RMD160 4f6c918bc1b897ed017ab8129a6d5387e982e07a SHA1 a4afb248ab7cb7abe25aa9d69533a7fd52401d73 SHA256 cebfe53c219cd6acacffcf0ed24493c0aa3180c89fa954e4a7e458dd0feb62c9
 AUX postupgrade-1.16-en.txt 1512 RMD160 362daf6f25f8a1497209426751aedd4cf78796c7 SHA1 d86a1f9097b4809f3f295e3784d4c4baf79936b6 SHA256 d45dd49ecfd27f3dee9296925befbf334437035e311c985db78ac6132b990877
 DIST mediawiki-1.16.5.tar.gz 13235937 RMD160 0a8298051baaf02f400bc6f317508f7b7544ec57 SHA1 2526a5aebeafe49dcbfb1584823e467445daf1ae SHA256 5b451f578d9876f02a1a4363851d1558385290638676680ab33dc26116db20cb
 DIST mediawiki-1.18.0.tar.gz 17018978 RMD160 9e83e7f07ee11da4348afb01a7aad63501176aef SHA1 4f41ebcf986873625ae22641da8dca76542914a7 SHA256 da522adc659280c5a95813c571d76f7bc555942e0ae3a5f6d92e9a852e252077
 EBUILD mediawiki-1.16.5.ebuild 3786 RMD160 0ff8b4d5b4091b32e04cc25e52acf32059b3fb2b SHA1 a354d0652ec80de0bfa73d0d9e749a597856c7fa SHA256 6b59a5221b34f7cc6e1cc500157c739179b3f2214e21d7d994edb36ffa75fe36
-EBUILD mediawiki-1.18.0.ebuild 3787 RMD160 2420ed7fdbce1cc21be3415d3d8346b30d458f6a SHA1 8473baab956a39acfb140f1a806a3b9062b12599 SHA256 aaaf5ff710b4798555fcae771db08dc78bfd11a94ca9363f24fbd024a528392d
-MISC ChangeLog 28747 RMD160 803a1cfccb17b379f1e4431cbeed58e2831d0853 SHA1 af9a9a6620cf9626a7fbc6c31a3c0d7fc253ed6d SHA256 ec579e4c7dfb989f31ff7ce4095fd5c288ba6b9d96c80616908c527551dff68d
+EBUILD mediawiki-1.18.0.ebuild 3736 RMD160 4e205ed9d3d09c54af89f3defaf699c336b5fe8f SHA1 1ac14683ba5eb887e805e3d8d1751fc109c62440 SHA256 9d1dab7ae0d15cde367044f1c614d1adaa1edc81f5d1a337d8a900b693d4edb7
+MISC ChangeLog 28866 RMD160 d5d5b7438d3e776fe675ea9b9f653397f442d12d SHA1 7fe1261798d8b3d58d08069370616a6ec8be9b94 SHA256 6b077937eba0e8496bf5d800ac291a2d731273eaff226d7fa2c722e03ca18dfe
 MISC metadata.xml 295 RMD160 0e99ed39b17f196d96fa661725f18447202c793a SHA1 3d63cc41895a26fde229f1394541cf6792fbc016 SHA256 ac52057208794d9f818ca0f56f292885eac738678c8fcdf56e099e98ce953593
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJO4ocMAAoJEEqz6FtPBkyj2UEIALb4SOrKvr67mJRG4i8fDaAM
++wIPFv4N/Atn+QU5N6KOu+YGGhEMzLx7kKRttFuENy9wClnQJviPsMX2vuq+MNnU
+t/KI4CwUfA6XB8nZF2KVg/jNvZd440SU5hG6GAzUatK77OmJqqMX67ou9RrXq0D7
+VRemHU8XZ92VY3E0zm2bjyddypj/nfYJgkbXE8wqK3fzhdxRAjw7aCIGKO+CbAR9
+gEOmXs9Qlzl3fRi+5pQnOheB/Hhe4HDLJvs+iuCUkcCrFsTwkb7YllbODuZRs/tc
+sPuzI6rJS1tB+zNV0edOVmfltAIiib0NVsDOHkRPNDPh89CQNZsm63YjGAkh7ZU=
+=79W5
+-----END PGP SIGNATURE-----

diff --git a/www-apps/mediawiki/mediawiki-1.18.0.ebuild b/www-apps/mediawiki/mediawiki-1.18.0.ebuild
index 48bfa0e1729747a1489729fe0e3dca7ce29c69ff..d8904e0abaff222602e4edcd1b73dba8300e7b1c 100644 (file)
--- a/www-apps/mediawiki/mediawiki-1.18.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.18.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.18.0.ebuild,v 1.1 2011/12/09 09:19:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.18.0.ebuild,v 1.2 2011/12/09 22:09:03 radhermit Exp $
 
-EAPI="3"
+EAPI="4"
 inherit webapp depend.php versionator eutils
 
 MY_BRANCH=$(get_version_component_range 1-2)
@@ -30,11 +30,11 @@ RDEPEND="${DEPEND}
        sqlite? ( dev-db/sqlite:3[fts3]
                || ( >=dev-lang/php-5.3[sqlite3,pdo] <dev-lang/php-5.3[sqlite,pdo] ) )"
 
-RESTRICT="test"
-
 need_httpd_cgi
 need_php_httpd
 
+RESTRICT="test"
+
 src_compile() {
        if use math; then
                einfo "Compiling math support"
@@ -44,7 +44,7 @@ src_compile() {
                                -e "s/cmxa/cma/" \
                                -e "s/cmx/cmo/g" -i Makefile || die
                fi
-               emake || die
+               emake
        else
                einfo "Math support not enabled. Skipping."
        fi
@@ -65,7 +65,7 @@ src_install() {
        if use math; then
                einfo "Installing math support"
                exeinto "${MY_HTDOCSDIR}"/math
-               doexe math/texvc || die "Failed to create math support executable."
+               doexe math/texvc
 
                docinto math
                dodoc math/{README,TODO}
@@ -78,7 +78,7 @@ src_install() {
                webapp_serverowned "${MY_HTDOCSDIR}"/images/tmp
        fi
 
-       local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES UPGRADE"
+       local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-1.18 UPGRADE"
        dodoc ${DOCS} docs/*.txt
        docinto php-memcached
        dodoc docs/php-memcached/*