drop old to avoid useless reports like bug 390021

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog
index a8a53090d16748396c0ca0650fa63d967a0dc154..03ee73ab6c0b04752108211f5a74d8e8a1c7fe02 100644 (file)
--- a/app-emulation/vice/ChangeLog
+++ b/app-emulation/vice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/vice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.78 2011/10/24 04:12:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.79 2011/11/10 03:42:00 ssuominen Exp $
+
+  10 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> -vice-2.2.ebuild,
+  -files/vice-2.2-xshm.patch:
+  old
 
   24 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org> vice-2.3.ebuild,
   +files/vice-2.3-notexi.patch:

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 2624b65b2ab669614c25ba142737eb94a0f36cf9..522b5ea27ffb9adb83c8dea34708e8394cfe9f15 100644 (file)
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,8 +1,19 @@
-AUX vice-2.2-xshm.patch 1691 RMD160 b5a99eb56e6f89404da4ac7fb72c123beb500a52 SHA1 731b29e46f30411d532cf57ea674b48acfe7cb7e SHA256 58d6aeaebec1fe4a52a434b8f6874b67aa7ebea40339796f1b164726a864e27a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vice-2.3-notexi.patch 395 RMD160 7826ca7349482120daea173be5c838ff00d3776c SHA1 9fcb7442b97db56ecb16d5b0c8c11387f9434581 SHA256 15897692063aac52306082f5ce933a17ba94ecfe8a5c3b65f72db62d478cefbc
-DIST vice-2.2.tar.gz 9597027 RMD160 d3fb33deb776ffcae297df413849437fb4e49840 SHA1 88ec1f4fefc708957b242805a28ca9b26a3e2738 SHA256 5d581bf817c97f1887651f92e73dd1f5e3c14627fa86fc70732491be7cba1551
 DIST vice-2.3.tar.gz 11602378 RMD160 056e48ffedfaecd470892c73b97af89c1e002ff9 SHA1 5e7e1a375a4ca8c4895dc1552162955fdffce296 SHA256 b1817c8dce023069d5c15234c2b4da0a152d297ee8ed01f0b361795c4beeb50e
-EBUILD vice-2.2.ebuild 2940 RMD160 09401e4aab6f5bc3a966f54bc638d724a1bbd796 SHA1 61e223ae61c5395829212feb177a660d98c8aba7 SHA256 ec434770e7b796271b3ae1bc3407fff99fb214b844964ad64e982bdb73a509ec
 EBUILD vice-2.3.ebuild 2901 RMD160 fd8bfb9492bd89d4aaece9ebcdb3565b577eb7da SHA1 a3e75d11fcf615cdad3ac1ee26d0ce16d0c5fc0c SHA256 827e1ef6703108c70e35448e7d7abc98a2e39e1fa448db6350d9ef4a75f0b4c6
-MISC ChangeLog 10208 RMD160 aa27425fe669b1558dee2ee6a3f524e37906ede0 SHA1 c3528531edbc644bfc3e32e0984a13329ea0d850 SHA256 774d27084c3453cba446393c24d6252c2059b402a6f904a8ad4d8972114b64a9
+MISC ChangeLog 10317 RMD160 eeb982f2cb96841840a8abce064e1fb385dc848e SHA1 f02250b8596eec84ce859f6294dde8cb3e4f0f96 SHA256 54e44437784c7640d37deaadbf881a09d91e0fd0810f81d7e025bcbb8c035121
 MISC metadata.xml 355 RMD160 2be86be120d60193f7debc4eac5b87274ea71d0e SHA1 47edf967eca28ee36ba41788a9f2f55330b6a1b4 SHA256 74dd1a42d4949ea4d7e8f1267fb2b6d0f63b8cee0f1aa2cb9278f674192edb1f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJOu0fUAAoJEEdUh39IaPFNXdcH/2qY+5HQnmZeMIELCoIkJPNw
+x3U08fGiao7rRSkJY3p8PBYStugapla6bZ2TVt/89eunnU52y/kgQBWQUtvODRbJ
+IiE4UUvK405I5Fh+iRUTah0QbK8OhAuXkSDDhrlNKc4a6L/SwAMyW2MtFqZ3V9Bb
+yN8LRrx2KyksnmKmXjAf2fji6OlqFn+jDpZOyeS2X2pxHM7HqlVwmtCEdh1/2q6N
+UNEvmpgeVu4pKVbKD1AvRZQF3n9dxI1nWvYSu6Q5lrFinWrZrYElimMcemG+YHoN
+J3tOx8eglLMqDi7BmBEQlDu0O0P13Cd9QQtcdd09yCvrWpzmIAORm0K9yH3kruI=
+=EtN+
+-----END PGP SIGNATURE-----

diff --git a/app-emulation/vice/files/vice-2.2-xshm.patch b/app-emulation/vice/files/vice-2.2-xshm.patch
deleted file mode 100644 (file)
index e0bc396..0000000
--- a/app-emulation/vice/files/vice-2.2-xshm.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Patch from upstream trunk for xextproto >= 7.0.99.1 compability.
-
---- configure.in
-+++ configure.in
-@@ -2192,6 +2192,11 @@
-                  [ X_LIBS="-lXext $X_LIBS";
-                    LINK_X_LIBS="-lXext $LINK_X_LIBS"],,$X_LIBS)
- 
-+    PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-+                HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-+                HAVE_XEXTPROTO_71="no")
-+    AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
-+
-     AC_MSG_CHECKING(for X11/extensions/Xvlib.h)
-     AC_TRY_LINK([#include <X11/Xlib.h>
-                  #include <X11/extensions/Xvlib.h>],
-@@ -2391,6 +2396,11 @@
-   AC_DEFINE(HAS_TRANSLATION,,[Enable internationalization support])
- fi
- 
-+dnl Handle the xextproto conditinal for the systems that don't use it
-+if test x"$is_unix_x11" != "xyes" -o x"$enable_sdlui" = "xyes" -o x"$enable_gnomeui" = "xyes"; then
-+    AM_CONDITIONAL(HAVE_XEXTPROTO_71, false)
-+fi
-+
- dnl CBM4Linux/OpenCBM
- AC_MSG_CHECKING([for OpenCBM support])
- if test x"$enable_realdevice" != "xno"; then
---- src/arch/unix/x11/xaw/x11video.c
-+++ src/arch/unix/x11/xaw/x11video.c
-@@ -56,6 +56,7 @@
- #include "vice.h"
- 
- #include <X11/Xlib.h>
-+#include <X11/Xlibint.h>
- #include <X11/Xutil.h>
- #include <X11/Intrinsic.h>
- #include <X11/cursorfont.h>
-@@ -95,6 +96,10 @@
- #endif
- 
- #ifdef USE_MITSHM
-+#ifdef HAVE_XEXTPROTO_71
-+#include <X11/extensions/shmproto.h>
-+#include <X11/extensions/XShm.h>
-+#endif
- extern int shmhandler(Display* display, XErrorEvent* err);
- extern int mitshm_failed; /* will be set to true if XShmAttach() failed */
- extern int shmmajor;          /* major number of MITSHM error codes */

diff --git a/app-emulation/vice/vice-2.2.ebuild b/app-emulation/vice/vice-2.2.ebuild
deleted file mode 100644 (file)
index 858e9c2..0000000
--- a/app-emulation/vice/vice-2.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2011 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.7 2011/08/02 05:44:43 mattst88 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/libXaw3d )
-       !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? ( virtual/ffmpeg )
-       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? ( virtual/jpeg )
-       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() {
-       epatch "${FILESDIR}"/${P}-xshm.patch
-       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"
-       sed -i \
-               -e "s:\(#define LIBDIR \).*:\1\"${GAMES_DATADIR}/${PN}\":" \
-               -e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
-               src/arch/unix/archdep.h \
-               src/arch/sdl/archdep_unix.h
-       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
-}