Version bump.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 50 insertions, 34 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 9cb38d041bbf..661724edb64b 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.240 2014/08/21 11:25:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.241 2014/11/08 14:15:15 jer Exp $
+
+*fltk-1.3.3 (08 Nov 2014)
+
+  08 Nov 2014; Jeroen Roovers <jer@gentoo.org> -fltk-1.3.2_p10088.ebuild,
+  +fltk-1.3.3.ebuild, +files/fltk-1.3.3-visibility.patch:
+  Version bump.
 
   21 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
   +files/fltk-1.3.2-jpeg-9a.patch, fltk-1.3.2_p10088.ebuild:
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index f691de39a50d..591e184ad6a2 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -8,20 +8,17 @@ AUX fltk-1.3.1-as-needed.patch 5672 SHA256 46931bde1b60bbc82d12b638d9e1dddaf98e6
 AUX fltk-1.3.2-conf-tests.patch 2259 SHA256 f309d0871780ebb830ede6dfc99c660eb48878c830aada0d8264aae3d9abbde6 SHA512 35d0ae931ef055066f71e674c2efe57b7f8d000a05632842e70c9dbf6736fe28810be25eb7a0a06ad739e72c758f60391373ce43be81ae4638e67f4d20852459 WHIRLPOOL c56189507b1b81aa87c520de4ac01915c5de9a12412b54ca7d5ab8f30f7f4ae3270171fdb66e3608ce514328958cef820d4271d9570037d77512286205e3c697
 AUX fltk-1.3.2-desktop.patch 456 SHA256 6e519612de37f4cea83bded50dc3bf856c13af53da108def188a5edcbf3d506f SHA512 405b604471f86d2eb013b1e7ee2d73574cb322ee3e519092c984bbb0fe46cf2438762c63ff6a1c31467e92257dc84fa4d1725ff50238379273ca28c687f1bc13 WHIRLPOOL 613bd7ae2ba18f3d68fedb9bd32a771a8b242395d494ac139c26da9175ccb454f24baad1d4715fed7f369a3e0ae73f1ab1d7811e270d0fe3061df8dd3bf6ca11
 AUX fltk-1.3.2-jpeg-9a.patch 583 SHA256 5dd7ddcf9c393e0d73f361a06e190e1abcb9b2c1fd04753cae03a3dac8da1c96 SHA512 faf615c5f65e4f0ffbe6131469a971fc60bb1c376d71c59182d406b8481c55ff4e5264dac168a9cd1164b00b86678fb7141b119f91dee83307eb7ee6522a35ee WHIRLPOOL 31d4729b1aa5eb1aa32df453a589a1c23f50d96889e04992338d7ee0ddec5dc75287833ed8956e052ae026997a0a7c059f8e0cbbdceef4e8a6143380d022e6c2
+AUX fltk-1.3.3-visibility.patch 302 SHA256 ac6d73daadd6d0310e3cf32c4edac1c06f45334088d71c7a51720406b901e855 SHA512 f643b472f91972a49c3f2b7f7084d5f1ee2e4cbcca033226b03c516e6393341416f37e5b05ad2744ffb18581483a13ef052fcf62f1e8ebee70980d820b55fa72 WHIRLPOOL 8b34feb00a598afed90185ebfed82c00bf517cddb9342b37f064d8f22a8525dab485586d8fc154265b7ad9c9c026a25c4a53fc93ad7f0d83d33e1db9925cf5cb
 DIST fltk-1.3.2-source.tar.gz 4260874 SHA256 176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4 SHA512 9372a34d8dfc4b4ece7632683c1c92f9ea9e538ba6eec08bec69615e2b2c885957d229a5ec495830f673b6a059f55a94b61727e8eb1fb7b3bd37005dc0b8312e WHIRLPOOL 10c85d1ae50ccd3d9f66285483d39bc0e61b9f3306f87412841ceed9a45fd45f0476b28f7e7652658f6fcc48533d1ec4974a9eb98ca0f535b662a70209c1f781
-DIST fltk-1.3.2_p10088.tar.bz2 3679398 SHA256 76fc7a63adfdc7c20fd4779d4d02adb4c8fb74913af3b52a38f07954d8ff439d SHA512 c27b9a50ab0bf5fb4c7e4e502de90a39008805833846a98460b1fac771018b234100e6168d95da2ac3168b8f3c9a42dbc03cc451773ed83e8371e72128f2d690 WHIRLPOOL ef788f3dc5b78bd3586637fedc2678003c0d66bde35ca6b596e973019c232db51d3a416823b1a71eda857f88c3435365e061dbd33de57a6b367e1077342ff07f
+DIST fltk-1.3.3-source.tar.gz 4986376 SHA256 f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d WHIRLPOOL 876a92e44dac20e6a2d86e4339a87185e708718d4cc59983bd81d5c3f0100d52230ef34d9c92800a2a07f6e7ed26e2ba9212c01ce898e7a184a7a35c40837761
 EBUILD fltk-1.3.2.ebuild 3667 SHA256 2f6dafa4899ec2c5512925f09a8cbe2fcc70fb4086aef380d8a3b7958eefa77b SHA512 0725a2cf279f964295e16b29d1eab5d8653553d6499ac4f8a8e970e4a75f701b1593df8a1c271456e8e66d27506a30c1d9949f8cf0c33c7140d8ea0f54f49bfb WHIRLPOOL cb605e2d62a4980110402f6f2d212e60ee4f017d3eb0da998cebb5e8f71f086d5bd7a41aa7bb9f5c9d1ad01b35d2c3623c8c6bdf118e6267ed217ac317b22a23
-EBUILD fltk-1.3.2_p10088.ebuild 3950 SHA256 a26b72122dc3865ba9ce726b0bc86f4db040ffa69a4bbabd4b09c1ecacfafd7a SHA512 3e6feb2b555aed1bed61280ac2def2124ded02525ffe3604a01d8d1313ba352cfd0d1b631bfcdd38c8e6fdd73d40356e591e36cd6f47c693381564daf9fea342 WHIRLPOOL dcb56dffe2afdb3b79ca313fb1b0a7e65b0b1589c12b25e2cc146543fd82cca5fcb666392e1c0532ce140edef8903f2765f75e3963971a1656675ea2f3635b09
-MISC ChangeLog 33418 SHA256 846058d3a3438aff27e2d4344c723ba62a45ecc53e596ce9eec09390e480fa23 SHA512 0af07f38af5a60bdcb7dccc2376b82475bbb05c6835302dfdf63eeff2e57e9754cb9be2cb47d10c038e248c07df580e80861f435df1ac3af392496bdce0fca21 WHIRLPOOL bf651d5ff0b12d1d89a3fef753e3016a7f5d848a30ac8889984e722e532ac3147d4ab85957e774857ec4c4cf216208e896aa9046a3ecb01bfae1c621d913b1a1
+EBUILD fltk-1.3.3.ebuild 3697 SHA256 d21d3a87cbf7aafbca95395cd9b67c43bfbbc59488c46db96fe07297406d23f0 SHA512 097b4569e2813dfab5945503662a0468b0b1f398e3e31d634d731d7339fa8d0aa178ddec664ac84ab7b54b986e4aefc4c806cfa080b189b9ea190379de0e85b2 WHIRLPOOL 47f5905210475b070371cc4877fc272ef6a3c7e4f183e6cb2e8a25c140febcd17450e468b2fe6e1ed3eaf09f229bcccb998038502c6f885b035de80a0be69b14
+MISC ChangeLog 33588 SHA256 789de96c9a47ac041eb79242473b4a9d48a4422b4de13145aa84c40b317f4d36 SHA512 1949d8de25e6f22b05056a88b6a24305b3080b29f4c88600c3ae485ebc981b4359666ceb2686b933a1f8c7cbc94ad6d5cba943f3813010c6c407c65fb26ab32e WHIRLPOOL c0497abff589efdb40169e633f0da549652f80e4878ca84f35cf2cea6e362ae57eac14547f9f8aec870e601551e9052167b46aea590faf338681d9f6bc2ef7ff
 MISC metadata.xml 589 SHA256 46e3321a6cd7d0a7a4810a9db46b9d45fdc2bf72ae8ada22b9b37438c1a6b7f5 SHA512 d346f5c21cba93ebe8b86091483aae647d4f84913c886bcf59d6e75b2a1dee3dbd76313f590f86ccec01195cea6ed40ec22240ee530921f3490f786263f4b65c WHIRLPOOL c46e8e6f6b98c8caf2cc41773582e0fe6be822cd55acc89ee8f8f0e3716841ab64553cfbde024c782194bd3b45c04535903859f2eeb0d987b4e7708d5567067b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT9da/AAoJEEdUh39IaPFN/zMIAJ5waY/JLfHVoZMTpU7lMWC4
-BtUeEo+MsLrYBAlfuInkSHJTPS+Jotlb6hU1DThFfm/eRgunGqQYGSd9I7M71fJZ
-ZG+xAwM8cSZHTa0cTWvwC652UwDOyWNnIyfqPaNGNwnMPQhaNTuGWuDCIpgxtYNu
-OkIzdg+o3U9B6VieNgzU+mWauR9RouVD33/GZK6I2NX4dZZxKSVzuXbgRUJKIox0
-kiQ7088q6QV27qgdPTp4I4zoPrhAf7ytbRzP863rFY3uJIzsrfldv4Sfr4Inr85J
-rh935AGqYfMKOVzNNJLPOzgfSDfVWYlzEweyRt50WY8F5aCEIVUz+yt5J9+Re0Y=
-=3+R6
+iEYEAREIAAYFAlReJXUACgkQVWmRsqeSphPlvQCeP8hS/Tp9cTcqIoWb/s1i7hcI
+zQ4AniLLEzQ3+egHFixsDBgd05IJYz1s
+=DRU6
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/fltk/files/fltk-1.3.3-visibility.patch b/x11-libs/fltk/files/fltk-1.3.3-visibility.patch
new file mode 100644
index 000000000000..99831e8d6815
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-visibility.patch
@@ -0,0 +1,11 @@
+--- a/src/Fl.cxx
++++ b/src/Fl.cxx
+@@ -928,7 +928,7 @@
+ 
+ ////////////////////////////////////////////////////////////////
+ 
+-Fl_Widget* fl_oldfocus; // kludge for Fl_Group...
++FL_EXPORT Fl_Widget* fl_oldfocus; // kludge for Fl_Group...
+ 
+ /**
+     Sets the widget that will receive FL_KEYBOARD events.
diff --git a/x11-libs/fltk/fltk-1.3.2_p10088.ebuild b/x11-libs/fltk/fltk-1.3.3.ebuild
index 61bf603c98ec..e48203653e5b 100644
--- a/x11-libs/fltk/fltk-1.3.2_p10088.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3.ebuild
@@ -1,22 +1,19 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.2_p10088.ebuild,v 1.2 2014/08/21 11:25:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.3.ebuild,v 1.1 2014/11/08 14:15:15 jer Exp $
 
 EAPI=5
 
-inherit autotools eutils fdo-mime flag-o-matic versionator
-
-MY_PV_MAJOR=$( get_version_component_range 1-2 )
-MY_PV_REV=$( get_version_component_range 4 )
+inherit autotools eutils fdo-mime flag-o-matic
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
 HOMEPAGE="http://www.fltk.org/"
-SRC_URI="http://${PN}.org/pub/${PN}/snapshots/${PN}-${MY_PV_MAJOR}.x-${MY_PV_REV/p/r}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="cairo debug doc examples games opengl pdf static-libs threads xft xinerama"
+IUSE="cairo debug doc examples games opengl pdf threads xft xinerama"
 
 RDEPEND="
 	>=media-libs/libpng-1.2:0
@@ -38,21 +35,20 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )"
 
-INCDIR=${EPREFIX}/usr/include/fltk-${SLOT}
-LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk-${SLOT}
-
-S=${WORKDIR}/${PN}-${MY_PV_MAJOR}.x-${MY_PV_REV/p/r}
+FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
 
 src_prepare() {
 	rm -rf zlib jpeg png || die
 	epatch \
-		"${FILESDIR}"/${PN}-1.3.1-as-needed.patch \
 		"${FILESDIR}"/${PN}-1.3.2-desktop.patch \
 		"${FILESDIR}"/${PN}-1.3.0-share.patch \
 		"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \
-		"${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch
-	sed \
-		-e 's:@HLINKS@::g' -i FL/Makefile.in || die
+		"${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \
+		"${FILESDIR}"/${PN}-1.3.3-visibility.patch
+
+	sed -i \
+		-e 's:@HLINKS@::g' FL/Makefile.in || die
 	sed -i \
 		-e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
 		-e '/^LDFLAGS=/d' \
@@ -66,10 +62,12 @@ src_prepare() {
 		-e "/^docdir/s:fltk:${PF}/html:" \
 		-e "/SILENT:/d" \
 		makeinclude.in || die
-	sed -e "s/7/$(get_version_component_range 3)/" \
-		"${FILESDIR}"/FLTKConfig.cmake > CMake/FLTKConfig.cmake
+	sed -e "s/7/${PV}/" \
+		< "${FILESDIR}"/FLTKConfig.cmake \
+		> CMake/FLTKConfig.cmake || die
 	sed -e 's:-Os::g' -i configure.in || die
-	use prefix && append-ldflags -Wl,-rpath -Wl,"${LIBDIR}"
+
+	use prefix && append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
 
 	# also in Makefile:config.guess config.sub:
 	cp misc/config.{guess,sub} . || die
@@ -79,8 +77,8 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--includedir=${INCDIR}\
-		--libdir=${LIBDIR} \
+		--includedir=${FLTK_INCDIR}\
+		--libdir=${FLTK_LIBDIR} \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--enable-largefile \
 		--enable-shared \
@@ -117,12 +115,14 @@ src_test() {
 
 src_install() {
 	default
+
 	emake -C fluid \
 			DESTDIR="${D}" install-linux
 	if use doc; then
 		emake -C documentation \
 			DESTDIR="${D}" install
 	fi
+
 	local apps="fluid"
 	if use games; then
 		emake -C test \
@@ -131,10 +131,12 @@ src_install() {
 			DESTDIR="${D}" install-linux
 		apps+=" sudoku blocks checkers"
 	fi
+
 	for app in ${apps}; do
 		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
 			/usr/share/pixmaps/${app}.png
 	done
+
 	dodoc CHANGES README CREDITS ANNOUNCEMENT
 
 	if use examples; then
@@ -145,9 +147,9 @@ src_install() {
 	insinto /usr/share/cmake/Modules
 	doins CMake/FLTK*.cmake
 
-	echo "LDPATH=${LIBDIR}" > 99fltk-${SLOT}
-	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
-	doenvd 99fltk-${SLOT}
+	echo "LDPATH=${FLTK_LIBDIR}" > 99fltk
+	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk
+	doenvd 99fltk
 
 	prune_libtool_files
 }