touchups

diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 4082888e7be83027dd72e7bc9b5222ed1948c698..e122abf516039a5ff7e2fad61872cb54e402eb0a 100644 (file)
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 c58c81dcba3f1a86cce17a8ed17a7e13 ChangeLog 1770
-MD5 b952b4f3a51703bbd1e503811ee80f97 libcaca-0.9-r1.ebuild 1307
-MD5 5803deb24638705484736c09a13790bb libcaca-0.9.ebuild 1070
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 5803deb24638705484736c09a13790bb libcaca-0.9.ebuild 1070
+MD5 7e5062b31484e2e20f1c0360c75c31a6 libcaca-0.9-r1.ebuild 1375
+MD5 b74aa05e5d6b2a7d9b7108a84d6b82d7 files/digest-libcaca-0.9 63
 MD5 b74aa05e5d6b2a7d9b7108a84d6b82d7 files/digest-libcaca-0.9-r1 63
 MD5 8f10a784d1326f49c14a32fb0bcdc430 files/libcaca-0.9-libtool.patch 4596
-MD5 b74aa05e5d6b2a7d9b7108a84d6b82d7 files/digest-libcaca-0.9 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBjENHHTu7gpaalycRAkAYAKDEHJdjpib6QEMWcCTEg2dUTECDugCgujI8
+TRzgWm3ueLSFtOcbDhp3TDA=
+=h3eg
+-----END PGP SIGNATURE-----

diff --git a/media-libs/libcaca/libcaca-0.9-r1.ebuild b/media-libs/libcaca/libcaca-0.9-r1.ebuild
index 360165a951c51999007cbafe0f507ad1ab3a8117..36a89b4dff59f834f15f38ceb4ac17474a49a98e 100644 (file)
--- a/media-libs/libcaca/libcaca-0.9-r1.ebuild
+++ b/media-libs/libcaca/libcaca-0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9-r1.ebuild,v 1.1 2004/09/30 21:08:46 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9-r1.ebuild,v 1.2 2004/11/06 03:20:53 vapier Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://sam.zoy.org/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64 ~mips"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ncurses slang doc imlib X"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.3 )
@@ -24,23 +24,21 @@ src_unpack() {
        cd ${WORKDIR}
        # Let libtool build the libraries, see BUG #57359
        epatch ${FILESDIR}/${P}-libtool.patch
+       libtoolize --force || die "libtoolize"
+       aclocal || die "aclocal"
+       automake --add-missing || die "automake"
+       autoconf || die "autoconf"
 }
 
 src_compile() {
-       #57359
-       libtoolize --force
-       aclocal
-       automake --add-missing
-       autoconf
-
        # temp font fix #44128
        export VARTEXFONTS="${T}/fonts"
        econf \
-           `use_enable doc` \
-           `use_enable ncurses` \
-           `use_enable slang` \
-           `use_enable imlib imlib2` \
-               `use_enable X x11` \
+           $(use_enable doc) \
+           $(use_enable ncurses) \
+           $(use_enable slang) \
+           $(use_enable imlib imlib2) \
+               $(use_enable X x11) \
            || die
        emake || die
        unset VARTEXFONTS
@@ -48,6 +46,6 @@ src_compile() {
 
 src_install() {
        mv doc/man/man3caca doc/man/man3
-       make install DESTDIR=${D} || die
+       make install DESTDIR="${D}" || die
        dodoc AUTHORS BUGS ChangeLog NEWS NOTES README TODO
 }