Version bump (bug #363319).

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

3 files changed, 167 insertions, 6 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index a32e96fa0e3b..26c563e10cc5 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.261 2011/03/29 13:01:08 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.262 2011/04/20 07:33:44 dirtyepic Exp $
+
+*wxGTK-2.8.12.0 (20 Apr 2011)
+
+  20 Apr 2011; Ryan Hill <dirtyepic@gentoo.org> +wxGTK-2.8.12.0.ebuild:
+  Version bump (bug #363319).
 
   29 Mar 2011; Christoph Mende <angelos@gentoo.org> wxGTK-2.6.4.0-r6.ebuild:
   Fix gtk+ slot deps
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 5e4c695a104d..1326f4eaee0c 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX wxGTK-2.6.3-unicode-odbc.patch 729 RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa SHA1 3cdaf28a083316c20bbb2d72c4a1b606ce001d2c SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f
 AUX wxGTK-2.6.4-collision.patch 5778 RMD160 cbe029a606ec1f46ae7f29605631b8f05bd50cb4 SHA1 05a80154ad673b26a6e8dadc79c488ce5a0357b4 SHA256 0f7ac329ce24fbac7828a0b7c249ac0b376334da0f563456572172359ad78435
@@ -19,18 +19,20 @@ AUX wxGTK-2.9.1.1-collision.patch 5953 RMD160 a80b62e8a6c099d27ff7df6e63a0c55078
 DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
 DIST wxPython-src-2.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab268ced9aa958f SHA1 6598fbafd979a91f20100171fa23a91779f6dc62 SHA256 447690773279088e9d06dcfe56f00f310c0186de435969bb60b04ed0c3f25f5f
 DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a872037c44a7694a SHA1 18982edc236a1d87e4eef018928358c925aa5b17 SHA256 210c568bdec811b10fbf8274e9659c8e52823d31fdda9010dbba725194f66661
+DIST wxPython-src-2.8.12.0.tar.bz2 31156191 RMD160 6420a8e6e59386b344ac058435a4ae6693c2c04b SHA1 f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4 SHA256 6d5e82772b87981c2a0d78d7a08b3a4498529127be2f05016892e8866e98babd
 DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c357231d6fd5c SHA1 886196021bb7712ddf0f2a368137fde26e6e7823 SHA256 613ecb71dbb65b5938ea323bd5cd896b26853e46c4aa45fbf4837fc7e041583a
 DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
 EBUILD wxGTK-2.6.4.0-r6.ebuild 5003 RMD160 b97e1a497c2b66dfaeaf75c2760b7c63eda0320d SHA1 868a50150f12534aa51e5b29ea25cd40c43899fb SHA256 9006425be50b94f2724109e7119f1ba3ffeacd2d273da36082b33500d19e308e
 EBUILD wxGTK-2.8.10.1-r5.ebuild 3911 RMD160 a6789613db3edb542a6ac8a26a2d3c19375c70a7 SHA1 566cbd5fae5564534bfb9600b96a1911416c9745 SHA256 47a6d6fc2145160b4a5240568aca10dde15586e166f9916a956608928266ce68
 EBUILD wxGTK-2.8.11.0.ebuild 3601 RMD160 0f9c6382239dd8fcc63432fc7487841a1dc8270a SHA1 5133edae6226c0e0e5e63a0fe1b3b814b5ffe943 SHA256 006ff1bc24d25949ff155a7c1143f41a7dffc6c4bd750c451efa4867e8fa9fe0
+EBUILD wxGTK-2.8.12.0.ebuild 3527 RMD160 74cbb091689ac65a5fec479251d1dba019af3a19 SHA1 0ecd162cea399f3b86084fb19bc27cc127058da9 SHA256 5d21f4908b13c633359051cd4ec19b74264c36411e9bd066b8c067abae213980
 EBUILD wxGTK-2.9.1.1.ebuild 3658 RMD160 bd9ac22c5af59d8c6a6d84858396198f6958fdb6 SHA1 d516473fee9b104820fb108d2759a56079dcb5e9 SHA256 ebd79a56236a88b2ce6abcedece33c03e02ac3e903a43c1922ea92acc6dc79ad
-MISC ChangeLog 41201 RMD160 f8279b7604b768aa238a149c9c97091453389bb9 SHA1 85104e199a901f4f2725b95a0fbfe9dd60568e30 SHA256 128266135039e868e043257280a8df23f321fe53a1feec3739a2fad8ce27be92
+MISC ChangeLog 41337 RMD160 2b62cecb3a2be5532add1044013db860b37cc7d4 SHA1 6f03b3f8cb43199f3b63557dd9fc21eba4006d27 SHA256 41d77cc248c7afe3cb96a054ad3999012b59b32c49d22a23d9ce7e65ae27c168
 MISC metadata.xml 670 RMD160 fd336b73e871568e6ac86023a36923f497ee07f3 SHA1 e6a2a8aba2e72a9cb5020e36852742f85b20a5f0 SHA256 942586d9bdc5d1da6dbb785f62a2977cb6c2f710f34591a7b8861a9672a98296
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2R2BkACgkQmWq1bYTyC0OVfwD/Qx85NP5ugHej/3CgkUOZBri6
-oQjsEbXDWTQhTjHs/FkA/A72f1TFNANB3Rea16qye8frUSZ7+ETZnshstEy5iqjV
-=QhyT
+iEYEARECAAYFAk2ujd0ACgkQiqiDRvmkBmJsSACfdNL8SXbDm7PnykzbOhPnf+uZ
+hs4AoM0EZ3BfMfMP45aV+INIg+YMCI6J
+=/IUf
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild
new file mode 100644
index 000000000000..e93bee2948f3
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild,v 1.1 2011/04/20 07:33:44 dirtyepic Exp $
+
+EAPI="2"
+
+inherit eutils versionator flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+HOMEPAGE="http://wxwidgets.org/"
+
+BASE_PV="$(get_version_component_range 1-3)"
+BASE_P="${PN}-${BASE_PV}"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X doc debug gnome gstreamer odbc opengl pch sdl tiff"
+
+RDEPEND="
+	dev-libs/expat
+	odbc?   ( dev-db/unixODBC )
+	sdl?    ( media-libs/libsdl )
+	X?  (
+		>=x11-libs/gtk+-2.4:2
+		>=dev-libs/glib-2.4:2
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		gnome?  ( gnome-base/libgnomeprintui:2.2 )
+		gstreamer? (
+			gnome-base/gconf:2
+			>=media-libs/gstreamer-0.10 )
+		opengl? ( virtual/opengl )
+		tiff?   ( media-libs/tiff )
+		)"
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		X?  (
+			x11-proto/xproto
+			x11-proto/xineramaproto
+			x11-proto/xf86vidmodeproto
+			)"
+
+PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
+
+SLOT="2.8"
+LICENSE="wxWinLL-3
+		GPL-2
+		odbc?	( LGPL-2 )
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch
+	epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
+	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
+	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
+}
+
+src_configure() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-compat26
+			--enable-shared
+			--enable-unicode
+			--with-regex=builtin
+			--with-zlib=sys
+			--with-expat=sys
+			$(use_enable debug)
+			$(use_enable pch precomp-headers)
+			$(use_with odbc odbc sys)
+			$(use_with sdl)
+			$(use_with tiff libtiff sys)"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			$(use_enable gstreamer mediactrl)
+			$(use_enable opengl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			--without-gnomevfs"
+
+	# wxBase options
+	use X || \
+		myconf="${myconf}
+			--disable-gui"
+
+	mkdir "${S}"/wxgtk_build
+	cd "${S}"/wxgtk_build
+
+	ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed."
+}
+
+src_compile() {
+	cd "${S}"/wxgtk_build
+
+	emake || die "make failed."
+
+	if [[ -d contrib/src ]]; then
+		cd contrib/src
+		emake || die "make contrib failed."
+	fi
+}
+
+src_install() {
+	cd "${S}"/wxgtk_build
+
+	emake DESTDIR="${D}" install || die "install failed."
+
+	if [[ -d contrib/src ]]; then
+		cd contrib/src
+		emake DESTDIR="${D}" install || die "install contrib failed."
+	fi
+
+	cd "${S}"/docs
+	dodoc changes.txt readme.txt todo30.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dohtml -r "${S}"/docs/html/*
+	fi
+
+	# We don't want this
+	rm "${D}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}