Version bump.

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 190 insertions, 9 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index d838a93642cb..cdace046ab64 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.225 2012/12/15 05:56:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.226 2012/12/15 06:05:47 radhermit Exp $
+
+*fltk-1.3.2 (15 Dec 2012)
+
+  15 Dec 2012; Tim Harder <radhermit@gentoo.org> +fltk-1.3.2.ebuild,
+  +files/fltk-1.3.2-desktop.patch:
+  Version bump.
 
   15 Dec 2012; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Remove redundant maintainer from metadata.
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 925a6d2007f4..0c8342277840 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -7,20 +7,23 @@ AUX fltk-1.3.0-conf-tests.patch 2862 SHA256 880037a60db7d120a87d9d90557cad4f0298
 AUX fltk-1.3.0-share.patch 2015 SHA256 9d756497b7c880b8eac8ab4a60de279cad36ef0a932e6a4d6364117d5003502a SHA512 41693b7f7cd288aa12172a71a2c46a639f0121a238687696a0a77a7e7dafb994dc53e7597c70239400fcfd80c071a53db481d799467fe6a392e8a14d6548a3fc WHIRLPOOL b742366ef869afa90cb8f86132628bbecd103729854424919601ad411e80b1cc6d91c463df0715ccf0b32a2037d1bef1163ba90a4effa52776f14afd6965cef2
 AUX fltk-1.3.1-as-needed.patch 5672 SHA256 46931bde1b60bbc82d12b638d9e1dddaf98e671c74b13154e05a79ebe877e1f1 SHA512 710051e55183eaa212ff9480a6e4c68a1c5331d80cbaff366cd362fc9d8b5ad10521c38ce684abe2a2f48ae0df448eb0c87f0b0db88a1f46a91f9650aa09a0fa WHIRLPOOL ee97f40e8bc48608c088a23b97ab3d80ce0317575bb51d5c4ef1c300ef7362484ed607a7d25f0ebfc7e50e33fe75335f47406d3c40ab8f257133366baf6071f3
 AUX fltk-1.3.1-desktop.patch 208 SHA256 1888fc817b1a248c66efff7d2627ba022201df32673a13b3b85593990d025f29 SHA512 0b783c17017f41a423513255135ebae253181b3ad237db7ee13f387e92fb41786e6495835f52976ef70de28bc2181a895b3b334ef2552c02a0a14ed444b97711 WHIRLPOOL 748e90f34338f7eb01c596f8a72d81b0da21efdd21057fdfd1bd2aecc72f10a83c0a7bc8c17f54abeb0132f6c67f615502fb0d0320e0ff4bc2b5bdf955b6e0f9
+AUX fltk-1.3.2-desktop.patch 456 SHA256 6e519612de37f4cea83bded50dc3bf856c13af53da108def188a5edcbf3d506f SHA512 405b604471f86d2eb013b1e7ee2d73574cb322ee3e519092c984bbb0fe46cf2438762c63ff6a1c31467e92257dc84fa4d1725ff50238379273ca28c687f1bc13 WHIRLPOOL 613bd7ae2ba18f3d68fedb9bd32a771a8b242395d494ac139c26da9175ccb454f24baad1d4715fed7f369a3e0ae73f1ab1d7811e270d0fe3061df8dd3bf6ca11
 DIST fltk-1.3.0-source.tar.gz 4111004 SHA256 990676808294cea4cca3de833ad5a5de08073c11b665356d4ecf35d22535b21c SHA512 a7adf9def90b143bc7ff54ac82fe9f6812b49209ab4145aada45210a3c314f9d91ae413240a8c57492826eca011aa147c68a131a9fe20bf221e7bc70c6c908ee WHIRLPOOL 99906609fb8cb1d1a7bbaaddea735dc6ae986bafb3210aeb7727858951f8117771dd7f92d977e841daf7ce42eaac8d9353129674e8f28aaa7cabc78f6a2f8ddc
 DIST fltk-1.3.1-source.tar.gz 4257291 SHA256 49006c148fad8c31a3a961c74486fb485c7878b9d0d084e597f30e354d7cf549 SHA512 f0f5ed1127f30cccb6a9f06f5ec1618c379a9e40376f79971f5fe91c554c4efd5c8c4eafaa2640db39b87a07fba33a411aa88061bb8bab91541d7c11fab3e465 WHIRLPOOL 48e2da7e34054f5e54c09e9666e8a101fc1b17ea4490bd6b6a4b82e7f838e08966245cc2f3b9499f5bb372560aa57afbc1e8910dda10400fcd7ecd83b10edb0b
+DIST fltk-1.3.2-source.tar.gz 4260874 SHA256 176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4 SHA512 9372a34d8dfc4b4ece7632683c1c92f9ea9e538ba6eec08bec69615e2b2c885957d229a5ec495830f673b6a059f55a94b61727e8eb1fb7b3bd37005dc0b8312e WHIRLPOOL 10c85d1ae50ccd3d9f66285483d39bc0e61b9f3306f87412841ceed9a45fd45f0476b28f7e7652658f6fcc48533d1ec4974a9eb98ca0f535b662a70209c1f781
 EBUILD fltk-1.3.0-r1.ebuild 4071 SHA256 94a463ad88aa4addbe248cb4598f8719dec21a9c06e0a47128da31653b46dd40 SHA512 5146d36916e18df8206b29aede9c2f7d3f28abe0357465be5c7d8ffe4eaef03c4e29e7a0572c9f6263a54c6b17499c57ae83af9da6f6e89c342007acfe7d7dd6 WHIRLPOOL 254aed407a8624be7a7f9ed74c05009321a9a0faffc49ad67595189926dcea07618f552d2c1c1f801977b72d374a30f7ccbd4238d3988d07b38bbe3f3931fdaa
 EBUILD fltk-1.3.1.ebuild 3969 SHA256 58c332fb7c5b4bd1857c0e78a09b595d8ba3470b4b60775d3381c33b512a3ed2 SHA512 06177ec5144e2cd15f3b08f0829d8a56a3fb1f35917e864c45ba395493e63b6031a6788043c1f0a52cad1dc5c4ea0d933d692a839fbf76fe017fdc028b812be6 WHIRLPOOL 189865e77cb01040959683b50d6b19c5f40b4eacde44255ebb06d9ad735af0efa78a0c0a0dad685404e37da4f3159d187086055e687fdf6d5b06e2b7a205f693
-MISC ChangeLog 31426 SHA256 de0de0439825178fb156eaf36591d265319e1bb061560268a4b3baa47dca501c SHA512 a9ea7806c97a80c2b4043ed227a3f92bb14674d4e885f3c54f2dc9607c4e1e28f69ce102d912f385fff10e9b34c1afb2016583883b5938aa834609f41949c238 WHIRLPOOL eab526c391315a568728cd0634d0832fcfbf3e658e9783cd39150ffd3243b82d2eb59dcb95a65e22e4f72e7147285a059d5c05bf739d1a7c44a779ac2f97bf8e
+EBUILD fltk-1.3.2.ebuild 3671 SHA256 a163df5ef981b4c2741aec823428dfde64f3d53981889afda0c00bb034bc2972 SHA512 08b2ce88e1da4a0dfd3c27b5f5a13b3d2c4f465e7a0bf54f8a98ddd970db5a61719141fac9e8e6e76a53ad36b452da8c659db344046f644736f82bb4821304ab WHIRLPOOL ca6fec7b07fcef0f834d1510e1c51ba043d3f94f7be4c5d684849f41e3cab3c814d9c8ded1b5287feea92f6e85018f018acda8c02e088bf0fb375857ee0d043a
+MISC ChangeLog 31574 SHA256 a82cc34e863cc87a5e33d76c79a75b571ddf28dec7c61d6fc7917a043d43ec9b SHA512 02d93fc154945ca721a80e44371c3b1a4fbf9d219b6326244d90d865af18cd645c23dcea2ee0060caad6cad70fe2947f4f521b5864a697b444d3564e90a45225 WHIRLPOOL 8ea481d1d969c84ac9292210aee011c6db42340cb1d3c3af63ed26f391fdc848ea0264a3105c264fb4f719169af7a0ede9de5f755945f85966e4f21c2041d4ca
 MISC metadata.xml 589 SHA256 46e3321a6cd7d0a7a4810a9db46b9d45fdc2bf72ae8ada22b9b37438c1a6b7f5 SHA512 d346f5c21cba93ebe8b86091483aae647d4f84913c886bcf59d6e75b2a1dee3dbd76313f590f86ccec01195cea6ed40ec22240ee530921f3490f786263f4b65c WHIRLPOOL c46e8e6f6b98c8caf2cc41773582e0fe6be822cd55acc89ee8f8f0e3716841ab64553cfbde024c782194bd3b45c04535903859f2eeb0d987b4e7708d5567067b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQzBEkAAoJEEqz6FtPBkyjcs0H/0MR4fyblwzvuCUCczK9ihcK
-BzkMpvisGztBUOJwGWUvGZQAdZBXitCPI5Bfgirs5PDazMFPtlEKiC+QpcoH0pA/
-L2x+PVSvWJyWZG7xGGVYPr2Qcb8Ctn5Vw/AK7KjaUR2ptYjhafCPJDZLUiu6VAH4
-LfatGM4BqBw+0goAwLaIM1FWyNoAt/d55gW/9n4TlHZKje2iiKYZYCFNclK67npf
-phSwXXkfd/3TvUSFj10aztbpPIYiMp9zJkbyjiDFpYgMFFTUTQwN/C/VpBVBUoSH
-Rj2mCfL67XlO0DEGeFcLr/fmkcRQ5PhQhau8EMa4HIm285gx+BfLnQ4Krf12voU=
-=OoVx
+iQEcBAEBCAAGBQJQzBM8AAoJEEqz6FtPBkyj++UH/i6/uyY9qCn/QvPxN/xrgj0I
+SaEFQSxWEHGXznNzkNxpYdXn9CPvZNuuZxR4uWjcM7Gv7HWhOczptXMBHHUJrbP2
+y9bPZA+GZHF27pu8JOOIQaCnlK2tP93IRnLAaESeV74i/YP2EQePJdynLNPvDPo3
+3oCZCmV/Vy9LXXWqSsQlorbp+/7BYJLPlfm8qlZ9HbBPVzW1OmdfQRlCjNAN3fBk
+gaVKmMacO+xzTsHjK9BZwBibHq5BCghlQjo9yhoM9qM2OdOx36XFkHaetL7W0lGj
+/fEi2knNDZmMjOtrMj768TT5e2plNtWYl98XZsxXiI/SCs7ZMmmfEPOzxJOppCE=
+=jAd/
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
new file mode 100644
index 000000000000..abec41a4b057
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
@@ -0,0 +1,19 @@
+--- fltk-1.3.2/fluid/fluid.desktop
++++ fltk-1.3.2/fluid/fluid.desktop
+@@ -6,5 +6,5 @@
+ Icon=fluid
+ Terminal=false
+ Type=Application
+-MimeType=application/x-fluid
++MimeType=application/x-fluid;
+ Categories=Development;GUIDesigner;
+--- fltk-1.3.2/fluid/x-fluid.desktop
++++ fltk-1.3.2/fluid/x-fluid.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Type=MimeType
+-MimeType=application/x-fluid
++MimeType=application/x-fluid;
+ Icon=fluid.png
+ Patterns=*.fl
+ Name=FLUID
diff --git a/x11-libs/fltk/fltk-1.3.2.ebuild b/x11-libs/fltk/fltk-1.3.2.ebuild
new file mode 100644
index 000000000000..52d8ff6660c8
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2012 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.ebuild,v 1.1 2012/12/15 06:05:47 radhermit Exp $
+
+EAPI=4
+
+inherit autotools eutils fdo-mime flag-o-matic versionator
+
+MY_P=${P/_}
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org/"
+SRC_URI="mirror://easysw/${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"
+
+RDEPEND="
+	>=media-libs/libpng-1.2:0
+	virtual/jpeg
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	cairo? ( x11-libs/cairo )
+	opengl? ( virtual/opengl )
+	xinerama? ( x11-libs/libXinerama )
+	xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	doc? (
+		app-doc/doxygen
+		pdf? ( dev-texlive/texlive-latex )
+	)
+	xinerama? ( x11-proto/xineramaproto )"
+
+INCDIR=${EPREFIX}/usr/include/fltk-${SLOT}
+LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk-${SLOT}
+
+S=${WORKDIR}/${MY_P}
+
+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.0-conf-tests.patch
+	sed \
+		-e 's:@HLINKS@::g' -i FL/Makefile.in || die
+	sed -i \
+		-e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
+		-e '/^LDFLAGS=/d' \
+		"${S}/fltk-config.in" || die
+	# some fixes introduced because slotting
+	sed -i \
+		-e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \
+		src/Makefile || die
+	# docs in proper docdir
+	sed -i \
+		-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:-Os::g' -i configure.in || die
+	use prefix && append-ldflags -Wl,-rpath "${LIBDIR}"
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--includedir=${INCDIR}\
+		--libdir=${LIBDIR} \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xdbe \
+		--disable-localjpeg \
+		--disable-localpng \
+		--disable-localzlib \
+		$(use_enable debug) \
+		$(use_enable cairo) \
+		$(use_enable opengl gl) \
+		$(use_enable threads) \
+		$(use_enable xft) \
+		$(use_enable xinerama)
+}
+
+src_compile() {
+	default
+	if use doc; then
+		cd "${S}"/documentation
+		emake html
+		if use pdf; then
+			emake pdf
+		fi
+	fi
+	if use games; then
+		cd "${S}"/test
+		emake blocks checkers sudoku
+	fi
+}
+
+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 \
+			DESTDIR="${D}" install-linux
+		emake -C documentation \
+			DESTDIR="${D}" install-linux
+		apps="${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
+		insinto /usr/share/doc/${PF}/examples
+		doins test/*.{h,cxx,fl} test/demo.menu
+	fi
+
+	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}
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/lib*/fltk-1/*.a || die
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}