nls support fix #24041 + games.eclass

6 files changed, 55 insertions, 27 deletions

diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog
index ff078d62c24d..3271141c9ab8 100644
--- a/app-emulation/vice/ChangeLog
+++ b/app-emulation/vice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/vice
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.5 2003/06/24 11:55:34 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.6 2003/07/13 07:40:14 vapier Exp $
+
+*vice-1.12-r1 (13 Jul 2003)
+
+  13 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Fixed up nls support #24041, added optional arts support and added games.eclass support.
 
 *vice-1.12 (24 Jun 2003)
 
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 751d418a0294..0a0f8e5af6ed 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,5 +1,6 @@
-MD5 385fbfc77c3a5814770f9b5abd28c171 ChangeLog 763
-MD5 9493796d7927b933662bc68637fb1c7e vice-1.12.ebuild 1324
-MD5 9e902858f9beeebb848e11f1f9eaa63b vice-1.11.ebuild 1323
 MD5 6b44b25bb31dd21195c5bb6ac016d49d files/digest-vice-1.12 62
-MD5 a5dd12faf8edd8012553753de04c0a2d files/digest-vice-1.11 62
+MD5 bee1c24b1742b33f95f243358383697e files/1.12-po-Makefile.patch 555
+MD5 6b44b25bb31dd21195c5bb6ac016d49d files/digest-vice-1.12-r1 62
+MD5 5a082df64d50a0d2ecbe1ccb87bf2fbf vice-1.12.ebuild 1280
+MD5 4a596b207c8313ab1add96f3e75509c4 ChangeLog 937
+MD5 2d67e5e861a63fa88799c01cafc5d4f1 vice-1.12-r1.ebuild 1278
diff --git a/app-emulation/vice/files/1.12-po-Makefile.patch b/app-emulation/vice/files/1.12-po-Makefile.patch
new file mode 100644
index 000000000000..84ff95cb4e41
--- /dev/null
+++ b/app-emulation/vice/files/1.12-po-Makefile.patch
@@ -0,0 +1,17 @@
+--- Makefile.in.in	2000-07-14 18:26:17.000000000 -0400
++++ /Makefile.in.in	2003-07-13 03:13:35.000000000 -0400
+@@ -18,10 +18,10 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
+-gnulocaledir = $(prefix)/share/locale
+-gettextsrcdir = $(prefix)/share/gettext/po
++datadir = $(DESTDIR)$(prefix)/@DATADIRNAME@
++localedir = $(DESTDIR)$(datadir)/locale
++gnulocaledir = $(DESTDIR)$(prefix)/share/locale
++gettextsrcdir = $(DESTDIR)$(prefix)/share/gettext/po
+ subdir = po
+ 
+ INSTALL = @INSTALL@
diff --git a/app-emulation/vice/files/digest-vice-1.11 b/app-emulation/vice/files/digest-vice-1.11
deleted file mode 100644
index 2e36fd6e877c..000000000000
--- a/app-emulation/vice/files/digest-vice-1.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 580817b28097b0897e48463d4fc510aa vice-1.11.tar.gz 3185213
diff --git a/app-emulation/vice/files/digest-vice-1.12-r1 b/app-emulation/vice/files/digest-vice-1.12-r1
new file mode 100644
index 000000000000..b430d353eeda
--- /dev/null
+++ b/app-emulation/vice/files/digest-vice-1.12-r1
@@ -0,0 +1 @@
+MD5 2d761503025a84758b289564e390c7c8 vice-1.12.tar.gz 3537855
diff --git a/app-emulation/vice/vice-1.11.ebuild b/app-emulation/vice/vice-1.12-r1.ebuild
index b80932723cb3..44e213352dc4 100644
--- a/app-emulation/vice/vice-1.11.ebuild
+++ b/app-emulation/vice/vice-1.12-r1.ebuild
@@ -1,42 +1,47 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.11.ebuild,v 1.2 2003/03/28 07:37:27 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.12-r1.ebuild,v 1.1 2003/07/13 07:40:14 vapier Exp $
 
-IUSE="sdl nls gnome"
+inherit games eutils
 
 DESCRIPTION="The Versatile Commodore 8-bit Emulator"
 HOMEPAGE="http://viceteam.bei.t-online.de/"
 SRC_URI="ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE="sdl nls gnome arts"
 
 DEPEND=">=x11-base/xfree-4.0
 	sdl? ( media-libs/libsdl )
-	gnome? ( gnome-base/libgnomeui )"
-
-S=${WORKDIR}/${P}
+	gnome? ( gnome-base/libgnomeui )
+	arts? ( kde-base/arts )"
+
+src_unpack() {
+	unpack ${A}
+	if [ `use nls` ] ; then
+		cd ${S}/po
+		epatch ${FILESDIR}/${PV}-po-Makefile.patch
+	else
+		cd ${S}
+		sed -i '/^SUBDIRS =/s:po::' Makefile.in
+	fi
+}
 
 src_compile() {
-	local myconf="--enable-fullscreen"
-	use sdl && myconf="${myconf} --with-sdl"
-	use gnome && myconf="${myconf} --enable-gnomeui"
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man ${myconf} || die "./configure failed"
+	egamesconf \
+		--enable-fullscreen \
+		`use_with sdl` \
+		`use_with gnome gnomeui` \
+		`use_with arts` \
+		`use_enable nls` \
+		|| die
 	emake || die
 }
 
-src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
+src_install() {
+	make install DESTDIR=${D} || die
 
 	dohtml ${D}/usr/lib/vice/doc/*.html
 	dodoc \