Cleanup ebuild and build system #109990.

Package-Manager: portage-2.0.53_rc6

diff --git a/games-kids/lletters/ChangeLog b/games-kids/lletters/ChangeLog
index 07ea40a25b829bf96d5ad67231a34e0a6c8642f6..d3ede1a2c355b1806295b1f3568102c83bd18054 100644 (file)
--- a/games-kids/lletters/ChangeLog
+++ b/games-kids/lletters/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-kids/lletters
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/ChangeLog,v 1.14 2005/04/24 02:53:07 hansmi Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/ChangeLog,v 1.15 2005/10/22 06:27:01 vapier Exp $
+
+  22 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/lletters-0.1.95-build.patch, lletters-0.1.95-r1.ebuild:
+  Cleanup ebuild and build system #109990.
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   lletters-0.1.95-r1.ebuild:

diff --git a/games-kids/lletters/Manifest b/games-kids/lletters/Manifest
index 465df3b46816261754e6bf54ba0e78472f330603..e326cd72c4605bae0ea79a2bc3907f4e96a520d8 100644 (file)
--- a/games-kids/lletters/Manifest
+++ b/games-kids/lletters/Manifest
@@ -1,5 +1,16 @@
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 ef61329006d3cd5d8c77c89056bdb03a ChangeLog 2526
-MD5 6a63086325eee1cf2d0126499b3a1fe0 lletters-0.1.95-r1.ebuild 1373
-MD5 a21b498ef02d981381f06d7e7ee0777b files/tellhow.h.gentoo 762
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3a23156ef185ff214cbaf083cc483913 ChangeLog 2685
 MD5 a259a5d00bd54dc2a2dc9905b28b808d files/digest-lletters-0.1.95-r1 141
+MD5 1291047f7e926ab70ceba5f6d7fde683 files/lletters-0.1.95-build.patch 875
+MD5 a21b498ef02d981381f06d7e7ee0777b files/tellhow.h.gentoo 762
+MD5 f9638233342d841b9684475146059947 lletters-0.1.95-r1.ebuild 1091
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDWdvKgIKl8Uu19MoRAitHAJ95XMSnQJan32D96fcbzSiEU+IjhwCePV/F
+9N0CAtms6Gfe1jXXwL+4NKw=
+=EZ4C
+-----END PGP SIGNATURE-----

diff --git a/games-kids/lletters/files/lletters-0.1.95-build.patch b/games-kids/lletters/files/lletters-0.1.95-build.patch
new file mode 100644 (file)
index 0000000..d9b132a
--- /dev/null
+++ b/games-kids/lletters/files/lletters-0.1.95-build.patch
@@ -0,0 +1,32 @@
+--- libqdwav/Makefile.in
++++ libqdwav/Makefile.in
+@@ -96,7 +96,6 @@
+ 
+ noinst_LIBRARIES =    libqdwav.a
+ 
+-CFLAGS =              -O2
+ 
+ libqdwav_a_SOURCES =  wav_read.c wav_write.c
+ 
+--- po/Makefile.in.in
++++ po/Makefile.in.in
+@@ -111,9 +111,9 @@
+ install-data-no: all
+ install-data-yes: all
+       if test -r "$(MKINSTALLDIRS)"; then \
+-        $(MKINSTALLDIRS) $(datadir); \
++        $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+       else \
+-        $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
++        $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+       fi
+       @catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+@@ -122,6 +122,7 @@
+           *.gmo) destdir=$(gnulocaledir);; \
+           *)     destdir=$(localedir);; \
+         esac; \
++        destdir="$(DESTDIR)$$destdir"; \
+         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+         dir=$$destdir/$$lang/LC_MESSAGES; \
+         if test -r "$(MKINSTALLDIRS)"; then \

diff --git a/games-kids/lletters/lletters-0.1.95-r1.ebuild b/games-kids/lletters/lletters-0.1.95-r1.ebuild
index 078aee1eb338d87fadc72b8920d59ae2de8b8d3f..5333630b35803e8bb78df1008edbbc93a0df16af 100644 (file)
--- a/games-kids/lletters/lletters-0.1.95-r1.ebuild
+++ b/games-kids/lletters/lletters-0.1.95-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/lletters-0.1.95-r1.ebuild,v 1.11 2005/04/24 02:53:07 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/lletters-0.1.95-r1.ebuild,v 1.12 2005/10/22 06:27:01 vapier Exp $
 
 inherit games
 
@@ -10,45 +10,34 @@ SRC_URI="mirror://sourceforge/lln/${PN}-media-0.1.9a.tar.gz
        mirror://sourceforge/lln/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ppc"
 SLOT="0"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
 DEPEND="virtual/x11
        media-libs/imlib
        =x11-libs/gtk+-1.2*"
-
 RDEPEND="${DEPEND}
        nls? ( sys-devel/gettext )"
 
 src_unpack() {
        unpack ${P}.tar.gz
        cd "${S}"
-       cp -f "${FILESDIR}/tellhow.h.gentoo" tellhow.h || die "cp failed"
+       cp -f "${FILESDIR}"/tellhow.h.gentoo tellhow.h || die "cp failed"
        unpack lletters-media-0.1.9a.tar.gz
+       epatch "${FILESDIR}"/${P}-build.patch
 }
 
 src_compile() {
-       if [ "${ARCH}" = "amd64" ]; then
-               aclocal
-               autoheader
-               WANT_AUTOMAKE=1.4 automake -a -c
-               autoconf
-               libtoolize -c -f
-       fi
-
-       egamesconf $(use_enable nls) || die
-       # Work around the po/Makefile (bug #43762)
-       # Why don't people honor DESTDIR?
-       sed -i \
-               -e '/^prefix =/ s:/.*:$(DESTDIR)/usr:' po/Makefile \
-                       || die "sed po/Makefile failed"
+       egamesconf \
+               $(use_enable nls) \
+               || die
        emake -C libqdwav || die "emake failed"
        emake || die "emake failed"
 }
 
 src_install () {
        make DESTDIR="${D}" install || die "make install failed"
-       dodoc AUTHORS CREDITS ChangeLog README* TODO || die "dodoc failed"
+       dodoc AUTHORS CREDITS ChangeLog README* TODO
        prepgamesdirs
 }