No Revbump needed, Duh

(Portage version: 2.1_pre7-r3)

4 files changed, 9 insertions, 76 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index f23ac75ff3d0..ecec637123ab 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.116 2006/04/01 06:09:14 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.117 2006/04/01 06:27:00 antarus Exp $
+
+  01 Apr 2006; Alec Warner <antarus@gentoo.org> wxGTK-2.6.2-r1.ebuild,
+  -wxGTK-2.6.2-r2.ebuild:
+  No Revbump needed, Duh
 
 *wxGTK-2.6.2-r2 (01 Apr 2006)
 
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.2-r2 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.2-r2
deleted file mode 100644
index 6d8c96036644..000000000000
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.6.2-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1e2bbd9d858c426ae667b017d8bdd4f6 wxWidgets-2.6.2-HTML.tar.gz 1440455
-RMD160 6ad8767efcc2d0881ce202e333d9f0f5b393866a wxWidgets-2.6.2-HTML.tar.gz 1440455
-SHA256 eeb47240ccc56a8eb14d09153e1cfaa9ad9c3f71ea67b21ac62790e59c405312 wxWidgets-2.6.2-HTML.tar.gz 1440455
-MD5 ee0aa211febd992c8540e6c9df749b51 wxWidgets-2.6.2.tar.bz2 13060077
-RMD160 bcbf4adbc5dab79643eeb036f94b18e24ee76217 wxWidgets-2.6.2.tar.bz2 13060077
-SHA256 e6edc7fbf3523290d6f08767a00979785205227e7bf634eeeb6393e65bb4abd6 wxWidgets-2.6.2.tar.bz2 13060077
diff --git a/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild
index 7b3063d8eeef..c37bccfccea3 100644
--- a/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild,v 1.10 2006/03/22 22:04:49 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild,v 1.11 2006/04/01 06:27:00 antarus Exp $
 
 inherit wxlib gnuconfig
 
@@ -16,7 +16,9 @@ RDEPEND="${RDEPEND}
 	>=dev-libs/glib-2.0
 	media-libs/tiff
 	odbc? ( dev-db/unixODBC )
-	!mips? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !alpha? ( !sparc? ( sdl? ( media-libs/sdl-sound ) ) ) ) ) ) ) )"
+	x86? ( sdl? ( media-libs/sdl-sound ) )
+	amd64? ( sdl? ( media-libs/sdl-sound ) )
+	ppc? ( sdl? ( media-libs/sdl-sound ) )"
 
 DEPEND="${RDEPEND}
 	${DEPEND}
diff --git a/x11-libs/wxGTK/wxGTK-2.6.2-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.6.2-r2.ebuild
deleted file mode 100644
index 51cac65bf74e..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.6.2-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2-r2.ebuild,v 1.1 2006/04/01 06:09:14 antarus Exp $
-
-inherit wxlib gnuconfig
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and
-wxbase non-gui library"
-
-SLOT="2.6"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="gnome joystick odbc opengl sdl X"
-RDEPEND="${RDEPEND}
-	opengl? ( virtual/opengl )
-	>=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	media-libs/tiff
-	odbc? ( dev-db/unixODBC )
-	x86? ( sdl? ( media-libs/sdl-sound ) )
-	amd64? ( sdl? ( media-libs/sdl-sound ) )
-	ppc? ( sdl? ( media-libs/sdl-sound ) )"
-
-DEPEND="${RDEPEND}
-	${DEPEND}
-	dev-util/pkgconfig"
-S=${WORKDIR}/wxWidgets-${PV}
-
-pkg_setup() {
-	einfo "To install only wxbase (non-gui libs) use USE=-X"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/wxWidgets-2.6.2-gcc41.patch
-	epatch ${FILESDIR}/intl.cpp.diff
-}
-
-src_compile() {
-	gnuconfig_update
-	myconf="${myconf}
-		--with-png
-		--with-jpeg
-		--with-tiff
-		$(use_enable opengl)
-		$(use_with opengl)
-		$(use_with gnome gnomeprint)
-		$(use_with sdl)
-		$(use_enable joystick)"
-
-	use X && configure_build gtk2 unicode "${myconf} --with-gtk=2"
-	use X || configure_build base unicode "--disable-gui"
-}
-
-src_install() {
-	use X && install_build gtk2
-	use X || install_build base
-
-	wxlib_src_install
-}
-
-pkg_postinst() {
-	einfo "dev-libs/wxbase has been removed from portage and can be"
-	einfo "installed with wxGTK by specifying the USE flags"
-	einfo "-X"
-}