Port to EAPI="2" by request of Dror Levin.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 81591899d23c62ccc040b0e6b472ef61f531d456..1d30122258524e90888f8563e375ccb5b80207d6 100644 (file)
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.83 2010/03/08 10:25:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.84 2010/03/25 20:48:57 ssuominen Exp $
+
+  25 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  ghostscript-gpl-8.71-r1.ebuild:
+  Port to EAPI="2" by request of Dror Levin.
 
   08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   ghostscript-gpl-8.71-r1.ebuild:

diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 43d8f46bd58ed259eff071bda56fcdd48952ccdb..3264a5776787e063c32110d68f73e328fc66d157 100644 (file)
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -10,6 +10,6 @@ DIST gsdjvu-1.3.tar.gz 204330 RMD160 a6d2326ba9098e801000b957ab5508e998e17be8 SH
 DIST gsdjvu-1.4.tar.gz 208611 RMD160 ecbb2fded61a29c4f49f852f99d106a0ba0eb48d SHA1 2650c85481de3aef66a4f7970d14a7dd36a1bc96 SHA256 7b5992f5203d662a7e03ce57d4a1b7a97990b0d3e09eb46ef1b4cb66d8d8c57d
 EBUILD ghostscript-gpl-8.64-r3.ebuild 5567 RMD160 b60c7d8aacf28be202909a97578975e817962bed SHA1 d20fbb12defe85fafbf4bb22ae11ceb4ae21ddf1 SHA256 0f1e85db127407d2d7f223c268419b4c1404f4f2dc57afb3c0054326b2dd0e01
 EBUILD ghostscript-gpl-8.70-r1.ebuild 5457 RMD160 88076a489ae14790beca13ee3828dc9b4912330e SHA1 61c7b01dcf96b530f08b7ab556e9de1db05c09d7 SHA256 30c961d0aa04bf87d66e511bdbb274018d5a7b0cb40ea7b67e17d9c11e161992
-EBUILD ghostscript-gpl-8.71-r1.ebuild 5921 RMD160 4e2262747aae43f01d722fc4ad1589ea336cde42 SHA1 2329324b29ece2b429f17416cd730d3c87fffcbf SHA256 6a069cf48d74da04ecfda1f194558f2938e492d3f91ce934c26f54ea7cd16cf8
-MISC ChangeLog 16271 RMD160 763a093308646eae959cb3778874e05aa91c551a SHA1 552f9f41d6d6684cc94aa316f42f51d18e254662 SHA256 84d49297c832823299dc3186a09ec6266e814c72d1b76dec9e25f2a0b1329073
+EBUILD ghostscript-gpl-8.71-r1.ebuild 5940 RMD160 a9db1567d7dea3fbab44c88070217cfa72be4c1f SHA1 fbb4f1e6d5d4dff2c7bad246a1209605fd595bfd SHA256 734e55eb8521dcc48b8ad8a0922ccff3bc48c249dafcc07f4aa432ae8567d350
+MISC ChangeLog 16405 RMD160 ef9fc3ec0faa2461c3ceaea891eabfa64d99a6a8 SHA1 9e1d8285016e834a7fc2f3eae426033894f41c1d SHA256 9fce8266ca880ab85e878740a9d0b67524d99abc2ebe92df4d7c594b94388981
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76

diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild
index abfd3b4eb6f8df2f411a92c89918b92f1b1fdf4a..a50034d0a4506b9cc4c57d4b1183bf176cea0d0a 100644 (file)
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild,v 1.3 2010/03/11 19:53:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild,v 1.4 2010/03/25 20:48:57 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils versionator flag-o-matic
 
 DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed."
@@ -50,10 +51,7 @@ for X in ${LANGS} ; do
        IUSE="${IUSE} linguas_${X}"
 done
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
+src_prepare() {
        # remove internal copies of expat, jasper, jpeg, libpng and zlib
        rm -rf "${S}/expat"
        rm -rf "${S}/jasper"
@@ -129,7 +127,7 @@ src_unpack() {
        eautoreconf
 }
 
-src_compile() {
+src_configure() {
        econf \
                $(use_enable cairo) \
                $(use_enable cups) \
@@ -148,10 +146,14 @@ src_compile() {
                sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
        fi
 
+       cd "${S}/ijs"
+       econf || die "ijs econf failed"
+}
+
+src_compile() {
        emake -j1 so all || die "emake failed"
 
        cd "${S}/ijs"
-       econf || die "ijs econf failed"
        emake || die "ijs emake failed"
 }