summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games-kids/lletters/ChangeLog8
-rw-r--r--games-kids/lletters/files/lletters-0.1.95-build.patch32
-rw-r--r--games-kids/lletters/lletters-0.1.95-r1.ebuild27
3 files changed, 46 insertions, 21 deletions
diff --git a/games-kids/lletters/ChangeLog b/games-kids/lletters/ChangeLog
index 07ea40a25b82..d3ede1a2c355 100644
--- 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/files/lletters-0.1.95-build.patch b/games-kids/lletters/files/lletters-0.1.95-build.patch
new file mode 100644
index 000000000000..d9b132a56712
--- /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 078aee1eb338..5333630b3580 100644
--- 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
}