Version bump.

(Portage version: 2.0.51.22-r1)

4 files changed, 93 insertions, 20 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index d195991ca814..a900e6bec84d 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.84 2005/06/17 20:14:14 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.85 2005/07/12 18:39:03 pythonhead Exp $
+
+*wxGTK-2.6.1 (12 Jul 2005)
+
+  12 Jul 2005; Rob Cakebread <pythonhead@gentoo.org> +wxGTK-2.6.1.ebuild:
+  Version bump.
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> wxGTK-2.4.2-r3.ebuild:
   Stable on ppc.
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 8a98fb01f5a3..002b66123c98 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,26 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b8d2d1196e6c7f31335748286b926533 wxGTK-2.5.3.ebuild 4812
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
-MD5 b2544e112108097113205b4559e87ce7 wxGTK-2.6.0-r1.ebuild 2273
 MD5 62be82618a657fca19a51e0825e5e4e9 wxGTK-2.4.2-r2.ebuild 4249
 MD5 58a128b966a8c93bd4b1fbef17e044ed wxGTK-2.4.2-r3.ebuild 4733
-MD5 cf49a68d5ff16e587964f73eb73c3bd0 ChangeLog 13958
+MD5 b2544e112108097113205b4559e87ce7 wxGTK-2.6.0-r1.ebuild 2273
+MD5 53f5adb16a65a2475027a71e69e12371 ChangeLog 14077
+MD5 b8d2d1196e6c7f31335748286b926533 wxGTK-2.5.3.ebuild 4812
+MD5 05676471b95453751e59106da67cbcf6 wxGTK-2.6.1.ebuild 1925
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r2 65
-MD5 6c8af85a3bfec0c477a778258368de56 files/wxGTK-2.4.2-cleanup.patch 18162
-MD5 c8ab55f4ce498e00d800d420ba86ea08 files/digest-wxGTK-2.6.0-r1 143
+MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r3 65
+MD5 ddd05c3f9a18148cc4359579d4ad8a8a files/digest-wxGTK-2.6.1 143
 MD5 574b30817d120dcaf7e94832c64b003a files/wxGTK-2.4.1-contrib.patch 572
+MD5 522f6b3a771ea33a1af7ede9c795ab4c files/wxGTK-2.4.1-wxpython1.patch 1102
+MD5 1e85c1c970da32626580dfef7228b314 files/wxGTK-2.4.1-wxpython2.patch 8459
+MD5 6c8af85a3bfec0c477a778258368de56 files/wxGTK-2.4.2-cleanup.patch 18162
+MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442
 MD5 f3bc3ab73cb31c91683e3ed58f8ffabb files/wxGTK-2.4.2-menu.cpp.patch 2253
+MD5 c8ab55f4ce498e00d800d420ba86ea08 files/digest-wxGTK-2.6.0-r1 143
 MD5 d3163f84f4f7dbabab06613667542f9b files/digest-wxGTK-2.5.3 65
-MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442
-MD5 1e85c1c970da32626580dfef7228b314 files/wxGTK-2.4.1-wxpython2.patch 8459
-MD5 522f6b3a771ea33a1af7ede9c795ab4c files/wxGTK-2.4.1-wxpython1.patch 1102
-MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r3 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzKSZgIKl8Uu19MoRAo4gAKCBIs1yRhyCmvFHoyJ0a0hUDicodACfdM6h
-rEjJ7DVbaQg01ObgWHMBTLg=
-=NYT7
------END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.1 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.1
new file mode 100644
index 000000000000..67363e9d1b44
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.6.1
@@ -0,0 +1,2 @@
+MD5 045f0edad0988620a4aa36096bb16e28 wxWidgets-2.6.1.tar.bz2 12649487
+MD5 e05d64b92ba352cad4417b75082bc2be wxWidgets-2.6.1-HTML.tar.gz 1437702
diff --git a/x11-libs/wxGTK/wxGTK-2.6.1.ebuild b/x11-libs/wxGTK/wxGTK-2.6.1.ebuild
new file mode 100644
index 000000000000..c4856af42db6
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.6.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.1.ebuild,v 1.1 2005/07/12 18:39:03 pythonhead Exp $
+
+inherit wxlib gnuconfig
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and
+wxbase non-gui library"
+
+SLOT="2.6"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa ~ppc64"
+IUSE="gnome gtk2 joystick odbc opengl sdl wxgtk1"
+
+RDEPEND="${RDEPEND}
+	opengl? ( virtual/opengl )
+	gtk2? ( >=x11-libs/gtk+-2.0
+		>=dev-libs/glib-2.0 )
+	wxgtk1? ( =x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2* )
+	wxgtk1? ( gtk2? (media-libs/libpng
+		media-libs/jpeg
+		media-libs/tiff))
+	odbc? ( dev-db/unixODBC )
+	!mips? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !alpha? ( !sparc? ( sdl? ( media-libs/sdl-sound ))))))))"
+
+DEPEND="${RDEPEND}
+	${DEPEND}
+	gtk2? ( dev-util/pkgconfig )"
+S=${WORKDIR}/wxWidgets-${PV}
+
+pkg_setup() {
+	einfo "To install only wxbase (non-gui libs) use -gtk2 -wxgtk1"
+	if use unicode; then
+		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
+	fi
+}
+
+src_compile() {
+	gnuconfig_update
+	if use wxgtk1 || use gtk2; then
+		myconf="${myconf}
+			--with-png
+			--with-jpeg
+			--with-tiff
+			$(use_enable opengl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			$(use_with sdl)
+			$(use_enable joystick)"
+	fi
+
+	use wxgtk1 && \
+		configure_build gtk1 "" "${myconf} --with-gtk=1"
+
+	use gtk2 && \
+		configure_build gtk2 unicode "${myconf} --with-gtk=2"
+
+	! use gtk2 && ! use wxgtk1 && \
+		configure_build base unicode "--disable-gui"
+}
+
+src_install() {
+	use wxgtk1 && install_build gtk1
+	use gtk2 && install_build gtk2
+	! use gtk2 && ! use wxgtk1 && 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 "-gtk2 and -wxgtk1"
+}