version bump (bug #299870) with additions from groepaz@gmx.net via bug #258674

Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 122 insertions, 3 deletions

diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog
index fa787fd1c0e4..94db7e841fa0 100644
--- a/app-emulation/vice/ChangeLog
+++ b/app-emulation/vice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/vice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.67 2010/03/08 18:52:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.68 2010/03/23 22:51:06 mr_bones_ Exp $
+
+*vice-2.2 (23 Mar 2010)
+
+  23 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> +vice-2.2.ebuild,
+  metadata.xml:
+  version bump (bug #299870) with additions from groepaz@gmx.net via bug
+  #258674
 
   08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> vice-2.1.ebuild:
   Don't check for obsolete png_check_sig function (because vice will
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index de6b7499bad3..05d34133aff1 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -2,7 +2,9 @@ AUX vice-2.1-gcc44.patch 218 RMD160 3d14faf8527894b83de5a0c7cf70b811b4364d62 SHA
 AUX vice-2.1-xshm.patch 421 RMD160 f40abf65680d82814b4de19d5ee0d85897c35c4c SHA1 4e0274f77ee4558370bd46fe98951589cb550ee9 SHA256 62a993fde4dfcea206d448c46f38cb3da5dad462d9e1f250dacb2df44f0fd0c7
 DIST vice-1.22.tar.gz 6088483 RMD160 ca93fc424e617e38f27e288ebcdfbab2aa3659db SHA1 55e0047824f64173539e03ddd2d5ab51cd581fbb SHA256 cd45ce3eea98ce70ae03002a4d02bb3188c982ee7fb7435ac8777bc8a780ef01
 DIST vice-2.1.tar.gz 8097482 RMD160 218a3b111d9c3bfcea06cea30299f7b471a57232 SHA1 0adf7a1d13c7b3af7b8d2d21c17b6dc0f055ff67 SHA256 dc42df924bd4b4ab4af43e372d873a79ea035059f31f2f5c297c234b1c532c66
+DIST vice-2.2.tar.gz 9597027 RMD160 d3fb33deb776ffcae297df413849437fb4e49840 SHA1 88ec1f4fefc708957b242805a28ca9b26a3e2738 SHA256 5d581bf817c97f1887651f92e73dd1f5e3c14627fa86fc70732491be7cba1551
 EBUILD vice-1.22.ebuild 2171 RMD160 c42fb2d1ee264c4c0a7297000a647d50314a4b9c SHA1 aa6d8fd1904f38a90faae780da7c0037bcabdf98 SHA256 b46fb1d48a91e82e9f5feb92cdcdd063e87225f210692b3d859acd2a0b6158fb
 EBUILD vice-2.1.ebuild 2344 RMD160 4a8b58b6c1a5f3699c1ca6ed068f4f65dbde49d8 SHA1 f2756f2c258aa375d5f407fa20626a6d89ce5e6a SHA256 4a67708222d8681afb1ac3cf34f744beda052d135d9b41b822a62a91d3d61476
-MISC ChangeLog 8662 RMD160 27ed01c5dab25f4b6c3bd4a80d90e4ee03bc6375 SHA1 205ab1d0549165bfe7583201cc080ea030835c51 SHA256 ee8b522d67f352458600989946833da9bf82c622e522dd39c6f895a733515f03
-MISC metadata.xml 321 RMD160 6709c07341536778184c86e920569d23e00f94b3 SHA1 c482881ba2599e5a49fec4f34acb13856b4eb2da SHA256 7c918d9c1645188c60a72a4e8f0dd0a7fde2b553400c79e748d0d4a24b702393
+EBUILD vice-2.2.ebuild 2731 RMD160 bff0bb0ef74a7450af1a2940a20bdb178152893b SHA1 6437467e61824a9659e6c9013016a3ca1f0a807a SHA256 85374d8c8fbbe186f93603926555739fabc110fa6eee71023d5875e230f0db1f
+MISC ChangeLog 8860 RMD160 664ae29b3544ff9e64db6d4148736c703f693527 SHA1 e45d6e82146c143911f562b8152769f6389114ae SHA256 7a48db55914bd34962bf0bd23454096430d74d18bb088b0f0eae00b792ab2cb6
+MISC metadata.xml 435 RMD160 c42033c72993639752c9896313af9d4eed93dbf0 SHA1 c2169618d71e24e641986340a93951dd7b67c0be SHA256 a1266afc9cbc0c3667071465a168b2f18289d1dd293eb54e11954813c05ffebd
diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 3ae153091e68..2f835f0256e0 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -3,6 +3,8 @@
 <pkgmetadata>
 <herd>games</herd>
 <use>
+	<flag name='ethernet'>Enable ethernet emulation</flag>
+	<flag name='memmap'>Enable extra monitor features</flag>
 	<flag name='resid'>Enable support for ReSID <pkg>media-libs/resid</pkg></flag>
 	<flag name='xrandr'>Enable support for the X xrandr extension</flag>
 </use>
diff --git a/app-emulation/vice/vice-2.2.ebuild b/app-emulation/vice/vice-2.2.ebuild
new file mode 100644
index 000000000000..d1149ba002b5
--- /dev/null
+++ b/app-emulation/vice/vice-2.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.2.ebuild,v 1.1 2010/03/23 22:51:06 mr_bones_ Exp $
+
+EAPI=2
+inherit autotools eutils games
+
+DESCRIPTION="The Versatile Commodore 8-bit Emulator"
+HOMEPAGE="http://vice-emu.sourceforge.net/"
+SRC_URI="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="Xaw3d alsa gnome nls png readline sdl ipv6 memmap ethernet oss zlib X gif jpeg xv dga xrandr ffmpeg lame pulseaudio"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	x11-apps/xset
+	Xaw3d? ( x11-libs/Xaw3d )
+	!Xaw3d? ( !gnome? ( x11-libs/libXaw ) )
+	alsa? ( media-libs/alsa-lib )
+	gnome? (
+		x11-libs/gtk+:2
+		dev-libs/atk
+		x11-libs/pango
+	)
+	lame? ( media-sound/lame )
+	ffmpeg? ( >=media-video/ffmpeg-0.5_p20373 )
+	ethernet? (
+	    >=net-libs/libpcap-0.9.8
+	    >=net-libs/libnet-1.1.2.1
+	)
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng )
+	readline? ( sys-libs/readline )
+	sdl? ( media-libs/libsdl )
+	gif? ( media-libs/giflib )
+	jpeg? ( media-libs/jpeg:0 )
+	xv? ( x11-libs/libXv )
+	dga? ( x11-libs/libXxf86dga )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-apps/bdftopcf
+	x11-apps/mkfontdir
+	x11-proto/xproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xextproto
+	dga? ( x11-proto/xf86dgaproto )
+	xv? ( x11-proto/videoproto )
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i \
+		-e "s:/usr/local/lib/VICE:${GAMES_DATADIR}/${PN}:" \
+		man/vice.1 \
+		$(grep -rl /usr/local/lib doc) \
+		|| die "sed failed"
+	sed -i \
+		-e 's:png_check_sig:png_sig_cmp:g' \
+		-e "/VICEDIR=/s:=.*:=\"${GAMES_DATADIR}/${PN}\";:" \
+		configure.in \
+		|| die "sed failed"
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+	# don't try to actually run fc-cache (bug #280976)
+	FCCACHE=/bin/true \
+	PKG_CONFIG=pkg-config \
+	egamesconf \
+		--disable-dependency-tracking \
+		--enable-fullscreen \
+		--enable-parsid \
+		--with-resid \
+		--without-arts \
+		--without-esd \
+		--without-midas \
+		$(use_enable ffmpeg) \
+		$(use_enable lame) \
+		$(use_enable gnome gnomeui) \
+		$(use_enable nls) \
+		$(use_with Xaw3d xaw3d) \
+		$(use_with alsa) \
+		$(use_with pulseaudio pulse) \
+		$(use_with png) \
+		$(use_with readline) \
+		$(use_with sdl sdlsound) \
+		$(use_enable ipv6) \
+		$(use_enable oss) \
+		$(use_enable memmap) \
+		$(use_enable ethernet) \
+		$(use_with zlib) \
+		$(use_with X x)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog FEEDBACK README
+	prepgamesdirs
+}