No Revbump needed, Duh

Package-Manager: portage-2.1_pre7-r3

5 files changed, 15 insertions, 88 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/Manifest b/x11-libs/wxGTK/Manifest
index 863545d9ba4a..818bf72ce35e 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,6 +1,6 @@
-MD5 d005fa638a200e4b8fd9ff9c4095cd50 ChangeLog 18073
-RMD160 b0600efba1dacf7f7c33b160071d7de4264c2d16 ChangeLog 18073
-SHA256 2130a7b9e6dbb0d294975cc70beb58284ae443268fdfbc9b42400e66986bc6fd ChangeLog 18073
+MD5 e6d4e73e155be89d5db0dd699f46b71d ChangeLog 18196
+RMD160 8bf7b53349cac9803a14d7d31335302fbd12929b ChangeLog 18196
+SHA256 96fb11b8ea721f2c3d1fd39882c8dec522484a4ed81453df18e168040be66a6b ChangeLog 18196
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r2 65
 RMD160 51232262c3e1ba5b29c3772d2ee61639c2c4cfb0 files/digest-wxGTK-2.4.2-r2 65
 SHA256 562f9f2432a97bab9206c13ef4cfa04eccdfe82413d5854163a4d63a1e9893d9 files/digest-wxGTK-2.4.2-r2 65
@@ -28,9 +28,6 @@ SHA256 3aa67760b842361b5e821998c67105521bfd9f8d23faf0c74784a229ff3a7a3f files/di
 MD5 697d7fa6ade210b6af8747e4cc5816cf files/digest-wxGTK-2.6.2-r1 143
 RMD160 64252847ab4ea5d4c525e8d275687c41d5294537 files/digest-wxGTK-2.6.2-r1 143
 SHA256 3aa67760b842361b5e821998c67105521bfd9f8d23faf0c74784a229ff3a7a3f files/digest-wxGTK-2.6.2-r1 143
-MD5 46c640a73873e599780242d2c29cdefc files/digest-wxGTK-2.6.2-r2 521
-RMD160 2b1487dd8ecd6c4e0789861a4bef9c35f75a1b90 files/digest-wxGTK-2.6.2-r2 521
-SHA256 5b793e6ce19b46528f537fd7e5ec07761b282ae7b4200dc04272315a9b8c709b files/digest-wxGTK-2.6.2-r2 521
 MD5 b0a51d86a603a6aa6b8447cd7ad8cc9b files/intl.cpp.diff 581
 RMD160 75ac177252f70210f10e6cec937d1c3782fff861 files/intl.cpp.diff 581
 SHA256 c70d00558c976c51fb00e6b487c811cefae0abef5005384b3674998e9d730217 files/intl.cpp.diff 581
@@ -88,12 +85,9 @@ SHA256 1996c846d9cbc70cd2206f5bfd30828441949cff8cb250c10af407ba624a98e5 wxGTK-2.
 MD5 56de842cb982e2aeb27abbfe3cb3d2ff wxGTK-2.6.1.ebuild 1922
 RMD160 e2f3f5f13d3be95b7db3442f5b81bfd39048c2bb wxGTK-2.6.1.ebuild 1922
 SHA256 6b3e456121ed88b0a934657361b9dbe25add4c35cb0d5f1297b2c6a0a7f67d5d wxGTK-2.6.1.ebuild 1922
-MD5 13eac5b6f714eff0fa3ab59b59faaf3e wxGTK-2.6.2-r1.ebuild 1571
-RMD160 ba541b95a6ef74a8a8e667ef79003d9e17c99bc5 wxGTK-2.6.2-r1.ebuild 1571
-SHA256 b487121b03a3a4a9a93b6f337539aa9d98747568da54f6029e352f8b3c81215b wxGTK-2.6.2-r1.ebuild 1571
-MD5 4f15662397ecd88d09e6c3cee373d4ee wxGTK-2.6.2-r2.ebuild 1581
-RMD160 4d9d462697b172f04377f5165a8593fec5f1a828 wxGTK-2.6.2-r2.ebuild 1581
-SHA256 5d79e877e956427f2edc5b763528c27a51dc48bead60b6e61ee4f9dd98b1c1a7 wxGTK-2.6.2-r2.ebuild 1581
+MD5 2480dd44996d4d9544d0812b45dfa477 wxGTK-2.6.2-r1.ebuild 1582
+RMD160 f92f1cb58bb9f4b072ce8efa7d43ef2e3fe94771 wxGTK-2.6.2-r1.ebuild 1582
+SHA256 c33d8712e4ef1672a9ff0da28808b23e08a8288512ff33049b64d01dafbdf3c8 wxGTK-2.6.2-r1.ebuild 1582
 MD5 5160fec1fb87f760b1cd6cc0a25860b8 wxGTK-2.6.2.ebuild 1531
 RMD160 0caf5f3409224a0542e2386411ddfe6819765cb8 wxGTK-2.6.2.ebuild 1531
 SHA256 c3f69c6446d36b8b1880141adac5b3f8d49365308a378a5f5fdad824e1e22ffb wxGTK-2.6.2.ebuild 1531
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"
-}