Reverted to EAPI=3

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

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index 2acec7a86ac62850d5ba97bd23a37d8140d04cfd..32880de783d93f2b42bd35519ee97f6612adce50 100644 (file)
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/blt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.48 2011/10/24 17:50:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.49 2011/10/24 17:54:44 jlec Exp $
+
+  24 Oct 2011; Justin Lecher <jlec@gentoo.org> blt-2.4z-r10.ebuild,
+  metadata.xml:
+  Reverted to EAPI=3
 
 *blt-2.4z-r10 (24 Oct 2011)
 

diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 8b2d11c8f9389b88cfa417742355925dbaa41c92..141e6fb24277c48647247d86cbab05b68b08e00f 100644 (file)
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -11,16 +11,16 @@ AUX blt2.4z-64bit.patch 891 RMD160 f2bc82f9a98d632480fc678af7a94fdf8899810d SHA1
 AUX blt2.4z-install.diff 1057 RMD160 4531572aa1177ab362d522964a8f62d6401ff237 SHA1 47b65e77e663cf95282612216a2fb4c8d8dda725 SHA256 6849139557c2846c332c4d81b04c03872933adfef0fa8432d6b757cfd02774c8
 AUX pkgIndex.tcl 146 RMD160 fdb0f974b517685ba1f207b11eea1f3a4c4f2f14 SHA1 c005d612949e1a70a34fa83098d1a36bf51a912c SHA256 79ff9c41afa3157d6f180dce21ddf82f5a55ed24a274eea0eeef511ec2f2659d
 DIST blt2.4z-8.5.2.tar.gz 2326234 RMD160 1012e0a21a9b45957d6482e55e21b9e54e3f1db2 SHA1 217986ef73dfbb9f64d4af7da0248e28ee2f6cab SHA256 e4e60628f79e1899175b51a3398133131fac52021b9b9019b4483525c48d6d16
-EBUILD blt-2.4z-r10.ebuild 3304 RMD160 716d6ab933274cc3aec96320813749e90a5d4566 SHA1 a489e3679f750fb81b106aa1d2edf1d5702a90b7 SHA256 ec2aedc2447601334b7f5f1b9c4b73fc85834f37f1a0c5c0192cb87b095b0f92
+EBUILD blt-2.4z-r10.ebuild 3398 RMD160 55423eacc5adf8bfe08124c0004e5d3a77844c2b SHA1 a763521cdb0dee34f7b85f7249c4a2d390a1c8bf SHA256 49879d7cc4b8e7524d3a891925ad67bc74420c7fae08d31610300f154d236b92
 EBUILD blt-2.4z-r5.ebuild 1977 RMD160 43678707ba9c6b0e394113ec9c8882447b8feca2 SHA1 d4b6fd944ac48a4443ad685f86e0e2a6f7459fc1 SHA256 ea16bcd0a3745126b1a28944600866f565b60e8dadcc142122eea501fadc6fae
 EBUILD blt-2.4z-r8.ebuild 3277 RMD160 55dc9b187156f640de49c32e36395719aec92c3c SHA1 b1058412ea466a287fc9aef55f147cf561c2768f SHA256 a50f5b2a8117829ce1b2816a81ac7515d5dca00bd255f9ac45bc827cd8227642
 EBUILD blt-2.4z-r9.ebuild 3330 RMD160 5f385075916fa9df0066f996b1f2efefd461bb31 SHA1 aa3feed4f8aa42fda3b0fdc1d904fef79430ebea SHA256 066849a92b732b24ba67e9695bde90e375fac767c66f72cbecf4fc470aeca4ba
-MISC ChangeLog 6688 RMD160 c91550df839f2ec3eb792bc33edb855ed008c8d6 SHA1 1d17d55ba8f8a0fe0d74680075a27945ce5d2326 SHA256 4ce216f913070128eb8f0325aa54720b0e1a24ceb29fcfcdfd5d9081e0fd2338
+MISC ChangeLog 6794 RMD160 2c6459dbdc9ad89aef8aebf25b3eec860337eee3 SHA1 d0c9da18af41a5c27772183a97e4193a904e919d SHA256 8cf075833556e4ef6303ae5052a6f48f3e2cdeac612e34b16a81e62f4f811d40
 MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6lpY0ACgkQgAnW8HDreRYR4gCgmGEWG8wd5aa43rlJ8rQHbb7F
-F5sAoLNWomofrcVjr3Vp5xhql/Ls5YU/
-=e3ng
+iEYEAREKAAYFAk6lpnIACgkQgAnW8HDreRZIMQCfSbxoVSuRv24khxce76v/4n3U
+2ssAmwa+2tJdsIn2g5ntUNeDLRXmcFlp
+=YW8D
 -----END PGP SIGNATURE-----

diff --git a/dev-tcltk/blt/blt-2.4z-r10.ebuild b/dev-tcltk/blt/blt-2.4z-r10.ebuild
index 4d2336499e21bdf15c6b32a36c9a97bd1db66872..dd6f6c2eb872608aa4bc0cd23e38431f5fa06fbf 100644 (file)
--- a/dev-tcltk/blt/blt-2.4z-r10.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r10.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/dev-tcltk/blt/blt-2.4z-r10.ebuild,v 1.1 2011/10/24 17:50:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r10.ebuild,v 1.2 2011/10/24 17:54:44 jlec Exp $
 
-EAPI=4
+EAPI="3"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -75,7 +75,7 @@ src_configure() {
 
 src_compile() {
        # parallel borks
-       emake -j1 LDFLAGS="${LDFLAGS}"
+       emake -j1 LDFLAGS="${LDFLAGS}" || die "emake failed"
 }
 
 src_install() {
@@ -89,8 +89,9 @@ src_install() {
        dodir /usr/bin \
                /usr/$(get_libdir)/blt2.4/demos/bitmaps \
                /usr/share/man/mann \
-               /usr/include
-       emake -j1 INSTALL_ROOT="${D}" install
+               /usr/include \
+                       || die "dodir failed"
+       emake -j1 INSTALL_ROOT="${D}" install || die "make install failed"
 
        dodoc NEWS PROBLEMS README
        dohtml html/*.html
@@ -102,6 +103,6 @@ src_install() {
        cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
 
        # fix for linking against shared lib with -lBLT or -lBLTlite
-       dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname)
-       dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname)
+       dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname) || die
+       dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname) || die
 }