Version bump (bug #515120)

Package-Manager: portage-2.2.10/cvs/Linux x86_64

3 files changed, 179 insertions, 16 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index ecef9b67f4e4..746d2e2070d4 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.314 2014/05/23 08:21:26 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.315 2014/10/06 01:06:16 leio Exp $
+
+*wxGTK-3.0.1.1 (06 Oct 2014)
+
+  06 Oct 2014; Mart Raudsepp <leio@gentoo.org> +wxGTK-3.0.1.1.ebuild:
+  Version bump (bug #515120)
 
   23 May 2014; Ryan Hill <rhill@gentoo.org> -wxGTK-2.8.12.1.ebuild,
   wxGTK-2.8.12.1-r1.ebuild, wxGTK-3.0.0.0.ebuild:
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 7fa676ab2fb4..6b232b3912a5 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX wxGTK-2.8.10.1-odbc-defines.patch 1341 SHA256 db875bf122cac00b1283debe3a92851ec7d91f481198736041bba5e4dce22698 SHA512 119e99f06f238d0982bc1a5fac834ef0ca7c09dc5a97f612cf3f0fffd9e01eebb0d8bfe122ebff6f3857cf6518a226477d2cb5959c47c4fd5c50ea5040abe6b2 WHIRLPOOL ac8f565adeaee0110e6e2b229cd9c5afd3edf3bc3b7abb8aba5347dac64021a255a63dbf879b5ddcbc658f6f78518c988435399af0af1f5fd437f36dc102cfc8
 AUX wxGTK-2.8.11-collision.patch 5710 SHA256 b4a34748a0e3c8f784d777b197f903de9d681baf12395fa1b8a5d2b2636c9ffe SHA512 9eb4fd8f783d073236364acb322c2d3315d75d01197d119ae4760a97e5ce6d3c700b28b5516ffda856c9decd1ad05ec063941855fa18cf5f9927a5a72fcaf4ae WHIRLPOOL 391a8c2e319742bca1a32f71c82f8b14653a3c91dc0b11ba87e8cd99905ffe5ed6897da67c5e5ae2711e30ae0aea5d9d3bc93a7275f39aca5ef6635a771feacd
 AUX wxGTK-2.8.11-unicode-odbc.patch 624 SHA256 2e2cbeb2240770497611bf845127f737e67311c4b898d21446fc3d739941cb65 SHA512 e58e661ae95deb7da31c7742088c6e8b8705494261d00975a7dd0eba0fc720ae7d91017616152915849b747c96f3a0302cd958946db886d7491520883f311a86 WHIRLPOOL 710ac8ada38a42d762ea1d271540b9eb47aae36a072b1b63310b4c1e970afc7b0b485cc55a50691d69f92712e3b772d35d72ae1e24dc550a9e0b60db8c20ace5
@@ -10,23 +7,15 @@ AUX wxGTK-2.9.4.1-collision.patch 6099 SHA256 bdef409ca229c6c28f65fbd6a177a55aea
 AUX wxGTK-3.0.0.0-collision.patch 6235 SHA256 ec7d88fed44fac6916d631329b0950e82a7c646ac35fa495de1c691ef52c1d58 SHA512 d2fb995860bd65a8dfc10aa520ab35abf073dc2f10d6ecf8b778620814ff8839aab193038fc63d303f3378bf9ecf9a45da2a5e4034ed3479eb93ec1454f3dc02 WHIRLPOOL a9c54029b949fe4ecf97c2ad6ad4dad8be3600cf1b8d0dd91f0d11dbea22674c81486fac28c28c882fe76dac93f72da033ea19d3fa88afe9137f87bac5eb2943
 DIST wxPython-docs-2.9.4.0.tar.bz2 15477636 SHA256 42a1683f253aa36ae9ee20b8d511d8704b4e45ba124fec256a7dfce38da9f75f SHA512 f996e69f24baaa8d35bf94ef77f31f6beda5dd4ddd65d6b71558e8dbe33098c951f995172b4ccd93ad08c81df07a9b529813eac5d39ffa06290f2a9ccc87620c WHIRLPOOL b6f6d65d319683f44b1eb4708077abaecd1a972a0d79fb6293b055099a0720d36e83506df6d075243f9e8b180849ae0d44badc8a22d5c764c956d5ecfe0cc6da
 DIST wxPython-docs-3.0.0.0.tar.bz2 21411087 SHA256 4bb98d37ac9fc68a1cbde45efa03f06c4bd167719249d1cba15ac8a6f8e2dcb8 SHA512 30d680edeb88f5cea096cfeb4324ee554aff4bab233557c1155b81b08baea60601d6f8499f03dd603111a181003e00581686ce45a187cbf608eb003388eaf193 WHIRLPOOL 5db92780fc3815333d68a70b66032356dac5f248e9afa948b27ece6bc8bc8794ae877477bf92f0c38ea0875ec99a7db98211d820bc7226db961a0516b0de1b86
+DIST wxPython-docs-3.0.1.1.tar.bz2 21447868 SHA256 c283db35ebd7dec4f83402b9fe9bb12c99ac66923dab95277bb4843617a8d6d3 SHA512 5886341f8e238b6de94d655dbc25572edac49a2ee33f545482b8be24b008aba69eb4cbbacbecc4df74eff1e1b440e5f2618a7aeeadc7ce358f40e16133223dc5 WHIRLPOOL d73998e83882e9be43bd6f9e1e529ae4c46d35137a9d3017eba9ed72cb1d91d7f917e869027721e9e9e6323d2433815cd5b49a41405e05cc668c91ffa4f6615a
 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d
 DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507
 DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811
 DIST wxPython-src-3.0.0.0.tar.bz2 57831792 SHA256 af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11 SHA512 9328f46817e0c1670a6be5d10347c8a7110c42a5332c5c35eb11ed0412d8dddeb15727d98606bb6c699af961cee171c41b82b1f24f3de25463259106660f7387 WHIRLPOOL 7865997e22db366a41bae8a5d5c47e4f46b20d17871377243abced3a6550c46588ea1d5a426d826ccf011c62898f87d6a55a14ac9b4153af4e0795d5f180a647
+DIST wxPython-src-3.0.1.1.tar.bz2 58139645 SHA256 d51463fe760e2fc00271678700c216809f9db32a6081a1808bd4b7c884dc0a32 SHA512 71f75c1e36c9ac27c15d768f69662b18ff1c66ad111ef6ef8579dfdb5296d7c37ffce9f60000afeac289cd6288980037d3a7eb3ea8d6d25e619d8692cf41b914 WHIRLPOOL bb03b78048b368b1c2f5a8b8689aecf412953ff789b2a8d2ef4826112fdc6bff8ed881255d05859ac07f915dd1070f6147d6bfdd97b0ab4b0939c024df3b855a
 EBUILD wxGTK-2.8.12.1-r1.ebuild 4283 SHA256 a49d689c730ed51e3d63ca2725942a48fe9bda448537a19a1d1b11df41290dc5 SHA512 d7291a3ff12b963bbc3aa223ad5a1595546e0c1b5cd4eab24eb8b44f4d56c5c9d305a0b7702dbf83cbe1c2bb99d32d33d776375c5b341874396285526f705f19 WHIRLPOOL 2b4a208d3ef288a8561cce345ea2992d298b9d3906538968609ff52cdf7fba4b57d1942efd712329655e6284a6140cc3cd00d4c3ffe68b41d1ea953eadad82db
 EBUILD wxGTK-2.9.4.1-r1.ebuild 4429 SHA256 273c5ecd1b39f848dc92d8a31ab6e0a4426de8d04d1252feb0c1bc67a876333d SHA512 034f9b9054daed770e0e749f88f16faeb53c378e1dd989daaebacfb7b6f8da5f2d7ebc19105f49ec5ade803b8b8d2685e9da51813ea84f740f9f0138f4d595ca WHIRLPOOL 98a45e0c80b1bf5fddc2109d7bccdbff1012ecb9fdc58fdebdddff3385958f51679fc6439801ded6f9cc1cfb09809629765aa5a71c27667549d6b76cb9a20f3f
 EBUILD wxGTK-3.0.0.0.ebuild 4053 SHA256 4a8505666e109f4a2122870022977c556540a6cc88d9e08d13fe83747f443ca5 SHA512 574e0d41210a346bd576b55e04009ed2b2931b60f82950dff6ab83603b459d23e5cc2dc74c591f44e59e51f565ebc5a9a637b4cb003550587f8b42c75845e65c WHIRLPOOL a6e3fa63abcce49ea1415ca99527e5a30ea7531d228eb387592f78273cbf19cceedc8afbcedf4cbab4572b4beaed1329a0ff75db80ef2be8bed370b7760c7b01
-MISC ChangeLog 49322 SHA256 c0c6e4f23998fff0fcfd323eb07a74d3e23412dfb83a7e43b61f8eb9b96ecc33 SHA512 c00b89435255cb07c74d06210f9d806aca8cc19d429b32182bd616a615872623da657fbe3cf64cb435981f6adcdd79c74a0d55e2ff101899c9b604c3866a3a74 WHIRLPOOL d29913aad82c7eb4080964c3d8bfbea3c4b386492ebccc6afa3ca1bc40d540e9688f73d55cad363fa2ffbf070402a2e24b0d17df6800f944e697b7f3d5428f6d
+EBUILD wxGTK-3.0.1.1.ebuild 4061 SHA256 cf2c823b180178390c177da563d7aae9c1f545a75250f9991d8cc23fb5d3bc50 SHA512 cd6b0a10670e7ee0f3b408b02b4aa02d78cdc882803cc5f6d4b8c8586705a199298c987c1997dc40b01db0ed9074c6952c66c60e229d708d28a3f9d9aa8a44aa WHIRLPOOL 08e17a4ca619d14e2aa3581452d4e3488bab1b694ff8817e862c1c2f96dcfe575b828dab6eeb0e5570683839b9fa6a2303e49c2616403d619c623fce6b1ce4fe
+MISC ChangeLog 49451 SHA256 4d6ba84678cc27c53bd1ed6f5aedd3d27d736a63d1227eea23360cf24a981855 SHA512 add34c99869e075d849e965e7cbac137a3033b157a189fea5c0e9055f91df170cfd50574c0fdc8806945f2acd81233b778129329d363dba403722f2e391490c5 WHIRLPOOL 551946fd7985fbe7c17d31cb42bab577801673e1c5f05117d6f4b36847b2772e6cb436bf7aed8e94204fb1dbf3f255fb7aa9a28b4c01598a0f0f8874b01615dd
 MISC metadata.xml 670 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75 SHA512 37ec56d00b488857a285a61c894f8c28dde61efce48d79b7767a207f5c533ad01f2ef09ebecc98dd5b803b4545e1d7f513ffb48e5ead4818ecb607129339c907 WHIRLPOOL cbcc9d2aea988f0b8e1a0615918903cf332976b192156296051c9f5ac5563e9ab512376453a52ad02db0fe3465b9b30d88d6808e38bea52bb58abe6fed316586
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAEBCAAGBQJTfwUOAAoJEO04vUmVeoRjvB4H/0tClLAx/obrsB7aLQwsPx2+
-cuGfLbPhwb1/xAJW2860J2KLcUOyJjGM1J+oC+LzNYhY4DelejlMrYNibP6mBiUI
-Egz1BUb04HExSfSWucOObtFUrM4GHmMwofCvXlSAb7AtcXXCge+ATzkpS3daNABB
-r9cW+pdbUUDaF5lqZmNYVsq/mBXXK9/5fbUa9KN6BGkRpCUkZsSlt9gbV04H6G4n
-f7jcnuvvGGu7P/yokylNlMPwp/cKisMXlVABp9V1roVX0whsijwUUCJSzagrbNQG
-/Zr67eV7Z6JaLr8wyNU5eeNnq9LhR4ThPXbDsftsXZARZbR3jiE1RkqJxrnwKMQ=
-=7J5W
------END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/wxGTK-3.0.1.1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.1.1.ebuild
new file mode 100644
index 000000000000..e09783b54c18
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.1.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.1.1.ebuild,v 1.1 2014/10/06 01:06:16 leio Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# 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
+	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
+
+SLOT="3.0"
+
+RDEPEND="
+	dev-libs/expat
+	sdl?    ( media-libs/libsdl )
+	X?  (
+		>=dev-libs/glib-2.22:2
+		media-libs/libpng:0=
+		sys-libs/zlib
+		virtual/jpeg
+		>=x11-libs/gtk+-2.18:2
+		x11-libs/gdk-pixbuf
+		x11-libs/libSM
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		gstreamer? (
+			media-libs/gstreamer:0.10
+			media-libs/gst-plugins-base:0.10 )
+		libnotify? ( x11-libs/libnotify )
+		opengl? ( virtual/opengl )
+		tiff?   ( media-libs/tiff:0 )
+		webkit? ( net-libs/webkit-gtk:2 )
+		)
+	aqua? (
+		>=x11-libs/gtk+-2.4[aqua=]
+		virtual/jpeg
+		tiff?   ( media-libs/tiff:0 )
+		)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	opengl? ( virtual/glu )
+	X?  (
+		x11-proto/xproto
+		x11-proto/xineramaproto
+		x11-proto/xf86vidmodeproto
+		)"
+
+PDEPEND=">=app-admin/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+		GPL-2
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
+
+	# https://bugs.gentoo.org/421851
+	# https://bugs.gentoo.org/499984
+	sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+
+	# X independent options
+	myconf="
+			--with-zlib=sys
+			--with-expat=sys
+			--enable-compat28
+			$(use_with sdl)"
+
+	# debug in >=2.9
+	# there is no longer separate debug libraries (gtk2ud)
+	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+	# http://docs.wxwidgets.org/3.0/overview_debugging.html
+	# http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+	use debug \
+		&& myconf="${myconf} --enable-debug=max"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--with-gtkprint
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--without-gnomevfs
+			$(use_enable gstreamer mediactrl)
+			$(use_enable webkit webview)
+			$(use_with libnotify)
+			$(use_with opengl)
+			$(use_with tiff libtiff sys)"
+
+	use aqua && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-mac
+			--with-opengl"
+			# cocoa toolkit seems to be broken
+
+	# wxBase options
+	if use !X && use !aqua ; then
+		myconf="${myconf}
+			--disable-gui"
+	fi
+
+	mkdir "${S}"/wxgtk_build
+	cd "${S}"/wxgtk_build
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+	cd "${S}"/wxgtk_build
+	emake
+}
+
+src_install() {
+	cd "${S}"/wxgtk_build
+
+	emake DESTDIR="${D}" install
+
+	cd "${S}"/docs
+	dodoc changes.txt readme.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dohtml -r "${S}"/docs/doxygen/out/html/*
+	fi
+
+	# Stray windows locale file, causes collisions
+	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}