New revision for GTK+-2, desktop entry, and icon.

Package-Manager: portage-2.1.4.4

5 files changed, 125 insertions, 5 deletions

diff --git a/games-kids/lletters/ChangeLog b/games-kids/lletters/ChangeLog
index 780f35352815..fb29895479f7 100644
--- a/games-kids/lletters/ChangeLog
+++ b/games-kids/lletters/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-kids/lletters
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/ChangeLog,v 1.16 2006/10/04 18:35:18 nyhm Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/ChangeLog,v 1.17 2008/04/09 18:03:49 drac Exp $
+
+*lletters-0.1.95-r2 (09 Apr 2008)
+
+  09 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/lletters-0.1.95-build-2.patch, metadata.xml,
+  +lletters-0.1.95-r2.ebuild:
+  New revision for GTK+-2, desktop entry, and icon.
 
   04 Oct 2006; Tristan Heaven <nyhm@gentoo.org> lletters-0.1.95-r1.ebuild:
   Fix nls support
diff --git a/games-kids/lletters/Manifest b/games-kids/lletters/Manifest
index 1ebc3205824c..0167aa05fd8c 100644
--- a/games-kids/lletters/Manifest
+++ b/games-kids/lletters/Manifest
@@ -1,7 +1,11 @@
+AUX lletters-0.1.95-build-2.patch 2433 RMD160 a288c68363a304cbcdab1bb073580ce4f7c1cc1f SHA1 eb1774c045d528b03bb66ca082b33141edcd293e SHA256 4fbde2c0d4060278155cca9bb186791401b9b98e64aa323d33e0f75aa0b74633
 AUX lletters-0.1.95-build.patch 875 RMD160 71f83141e8ef0722985a071f7b12256de238e1b3 SHA1 d7f8baf6d55caef6be7f3781e72f5c236aba3bce SHA256 00d79d876d449dce222d5bb5014bf6c2580a4bab0fd567dd12155282ca5ad693
 AUX tellhow.h.gentoo 762 RMD160 4d1bb69b706880bfd3cc80825c192f648bd969c0 SHA1 c455bd8a67b75e1299c7bce0c2664e36058966ac SHA256 208cfc6ec0caec0901ae6c3ca1623028212b2d8b52c482155dda19969f2bd862
 DIST lletters-0.1.95.tar.gz 180896 RMD160 83bb950f64a6f026e3abc99899ea70d6a9f8e4da SHA1 1aa4e963939158d46ce0f56f088732753a28bd52 SHA256 abcdb9448064972e2d0c4a4ca473c8e3ccb795458aa84c87438ecd29ef05e8c6
 DIST lletters-media-0.1.9a.tar.gz 1966275 RMD160 7a09ecffcff7464986a28aeac9d735c0b864a7c9 SHA1 edff4a39b8490d21c8affdd254ec2b46cdafe604 SHA256 5456457083fe026bbc818da307a000401d7a4903bd56b018e9a23526871b4c76
+DIST lletters_0.1.95+gtk2-3.diff.gz 457812 RMD160 0cd3829642f61883a0f9434ef4603ece1bb51227 SHA1 4ccf1a2eb5e4226d33d6868e4a8dd8d2c7eff1b0 SHA256 f94b282ca699b0be3071335813e295df0650c9473f569ff5a255ca1bde1219d7
+DIST lletters_0.1.95+gtk2.orig.tar.gz 180896 RMD160 83bb950f64a6f026e3abc99899ea70d6a9f8e4da SHA1 1aa4e963939158d46ce0f56f088732753a28bd52 SHA256 abcdb9448064972e2d0c4a4ca473c8e3ccb795458aa84c87438ecd29ef05e8c6
 EBUILD lletters-0.1.95-r1.ebuild 1218 RMD160 eb886e408c0961abb207bb87c573839b20c64ed4 SHA1 169cf5816937b62580ae404f3f7eb44c96eb6fb7 SHA256 0b1a28ae2550228c2e543cb6b674f51e84c17394687b5b07d192ff0520eef62d
-MISC ChangeLog 2777 RMD160 28b558da847bf242dd061d85eca53ddcb2450d06 SHA1 757f1690605b1afd5cb30a480d198cf3ba8bda8e SHA256 b3cd25635760f9c402fda5bf7d9e1094e68b05c2b29e91271f2f001a7672e113
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+EBUILD lletters-0.1.95-r2.ebuild 1268 RMD160 95da81258bab9034e38a0d49cc7487f1cecdac43 SHA1 c28953dca43e7385eac9c6ec3ecc1f332733ebb8 SHA256 f0674c5b95d883ef88bfc497173b43de0c9efa0374ff72169910f4f719dea433
+MISC ChangeLog 2998 RMD160 edc45c0d1223d57b333d8b93908d93bbce451afe SHA1 d1a4902122e4c098e3e132a7086094ddcb799954 SHA256 535d77e7a3aeca868f5daf4d45ea25178b2d87089ebaa368f7332bf0452aa0fd
+MISC metadata.xml 252 RMD160 e411517dfb6780a014783443250bcc27b2f2ab55 SHA1 2b0c462d2a8f8ef492eec0126df154578d704c2d SHA256 9d0e4b5866a81feafc2114ba80b39a45e341eb905734f978cbabc588bcabcd85
diff --git a/games-kids/lletters/files/lletters-0.1.95-build-2.patch b/games-kids/lletters/files/lletters-0.1.95-build-2.patch
new file mode 100644
index 000000000000..41e10517faf9
--- /dev/null
+++ b/games-kids/lletters/files/lletters-0.1.95-build-2.patch
@@ -0,0 +1,60 @@
+diff -ur lletters-0.1.95.orig/libqdwav/Makefile.in lletters-0.1.95/libqdwav/Makefile.in
+--- lletters-0.1.95.orig/libqdwav/Makefile.in	2008-04-09 19:23:13.000000000 +0300
++++ lletters-0.1.95/libqdwav/Makefile.in	2008-04-09 19:48:08.000000000 +0300
+@@ -225,7 +225,6 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ noinst_LIBRARIES = libqdwav.a
+-AM_CFLAGS = -O2
+ libqdwav_a_SOURCES = wav_read.c wav_write.c
+ noinst_HEADERS = wav_lib.h
+ all: all-am
+diff -ur lletters-0.1.95.orig/libqdwav/wav_read.c lletters-0.1.95/libqdwav/wav_read.c
+--- lletters-0.1.95.orig/libqdwav/wav_read.c	2000-02-21 09:53:08.000000000 +0200
++++ lletters-0.1.95/libqdwav/wav_read.c	2008-04-09 19:51:23.000000000 +0300
+@@ -1,5 +1,6 @@
+ /* operations for verifying and reading wav files. */
+ 
++#include <string.h> /* for strs */
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+diff -ur lletters-0.1.95.orig/libqdwav/wav_write.c lletters-0.1.95/libqdwav/wav_write.c
+--- lletters-0.1.95.orig/libqdwav/wav_write.c	2008-04-09 19:23:13.000000000 +0300
++++ lletters-0.1.95/libqdwav/wav_write.c	2008-04-09 19:51:28.000000000 +0300
+@@ -1,3 +1,4 @@
++#include <string.h> /* for strs */
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <signal.h>
+diff -ur lletters-0.1.95.orig/list.c lletters-0.1.95/list.c
+--- lletters-0.1.95.orig/list.c	2000-02-23 06:54:57.000000000 +0200
++++ lletters-0.1.95/list.c	2008-04-09 19:51:35.000000000 +0300
+@@ -1,3 +1,4 @@
++#include <string.h> /* for strs */
+ #include "lletters.h"
+ 
+ /* prototype std lib functions */
+diff -ur lletters-0.1.95.orig/po/Makefile.in.in lletters-0.1.95/po/Makefile.in.in
+--- lletters-0.1.95.orig/po/Makefile.in.in	2008-04-09 19:23:13.000000000 +0300
++++ lletters-0.1.95/po/Makefile.in.in	2008-04-09 19:48:08.000000000 +0300
+@@ -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-r2.ebuild b/games-kids/lletters/lletters-0.1.95-r2.ebuild
new file mode 100644
index 000000000000..42a364b506b5
--- /dev/null
+++ b/games-kids/lletters/lletters-0.1.95-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/04/09 18:03:49 drac Exp $
+
+inherit eutils games
+
+PATCH_LEVEL=3
+
+DESCRIPTION="Game that helps young kids learn their letters and numbers"
+HOMEPAGE="http://lln.sourceforge.net"
+SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}+gtk2.orig.tar.gz
+	mirror://debian/pool/main/l/${PN}/${PN}_${PV}+gtk2-${PATCH_LEVEL}.diff.gz
+	mirror://sourceforge/lln/${PN}-media-0.1.9a.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+RDEPEND=">=x11-libs/gtk+-2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${PN}_${PV}+gtk2-${PATCH_LEVEL}.diff
+	epatch "${FILESDIR}"/${P}-build-2.patch
+	cp -r "${WORKDIR}"/{images,sounds} .
+}
+
+src_compile() {
+	egamesconf $(use_enable nls)
+	emake || die "emake failed."
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog CREDITS NEWS README* TODO
+	newdoc debian/changelog ChangeLog.debian
+	doicon debian/${PN}.xpm
+	make_desktop_entry ${PN} "Linux Letters and Numbers" ${PN}
+	prepgamesdirs
+}
diff --git a/games-kids/lletters/metadata.xml b/games-kids/lletters/metadata.xml
index d3c2cc926f0b..d13ac87fcb0d 100644
--- a/games-kids/lletters/metadata.xml
+++ b/games-kids/lletters/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+	<herd>games</herd>
+	<maintainer>
+		<email>drac@gentoo.org</email>
+		<name>Samuli Suominen</name>
+	</maintainer>
 </pkgmetadata>