Reverted removal of fltk-1.1.9-r1.ebuild

Package-Manager: portage-2.2.0_alpha17/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 142 insertions, 5 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 9dfc589e4590..d3d9cdfb7304 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.170 2011/01/18 20:38:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.171 2011/01/19 19:10:16 jlec Exp $
+
+  19 Jan 2011; Justin Lecher <jlec@gentoo.org> +fltk-1.1.9-r1.ebuild:
+  Reverted removal of fltk-1.1.9-r1.ebuild
 
   18 Jan 2011; Justin Lecher <jlec@gentoo.org> -fltk-1.1.9-r1.ebuild,
   -fltk-1.1.10.ebuild, fltk-1.3.0_rc3-r1.ebuild:
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 02519f56ea96..d48435d74e2c 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -29,17 +29,18 @@ DIST fltk-1.1.9-source.tar.bz2 2206178 RMD160 f22e83fc9fd5e8bc10f0eea55e1a4df2ba
 DIST fltk-1.3.0rc3-source.tar.gz 3783896 RMD160 716b9a91bc362125eb0a8356e176cd8b50f5fb94 SHA1 d7a31ab154f54a686a629f385ea5f5e2b71fd310 SHA256 4221ade5df9872e29d94f203c2eb69d778dcfd82beb39b781cb4036d993fcd6c
 DIST fltk-2.0.x-r6970.tar.bz2 2529193 RMD160 5d114b5861807a15638d2b0f7ac55a909c1b6870 SHA1 0aaa688786a858b7af84e992d5438aab4ba84b0e SHA256 0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3
 EBUILD fltk-1.1.10-r1.ebuild 3865 RMD160 4b54b20ec19f9d74a69d458e97c61feac2780234 SHA1 45b9ca04c575218727dc2b1f38877e24a6b13338 SHA256 4faba48907b2567cd91abcb1bf24e26177522aab1d02ecca192f142db2ca97c9
+EBUILD fltk-1.1.9-r1.ebuild 3643 RMD160 35e6726c4348308cfa840e1d2135919799266820 SHA1 a2ff46dfeabe614c0bfed868cb4eb3d9b3943340 SHA256 947ee4c247c7c59678f6e240665ec4d6f59cb264dd9136f0757ead4573db7ba1
 EBUILD fltk-1.1.9-r2.ebuild 3699 RMD160 84910cc165b10d3efa6f1daf7066309f1c20b785 SHA1 60c57278a0479d86b194ce9e3262f981ecb56523 SHA256 32fef260c7cf3e8758cda8cc2ae66d3bc4e6e985858f0c7749bffb01f33f51e0
 EBUILD fltk-1.1.9.ebuild 3503 RMD160 cbc9d3f31b1b1f0753123ea249d1619d0ccc9d5f SHA1 3b7b9f08800aab973baf9a0d50da6800fcf118c9 SHA256 f8e70040854225ea9cf99ae28d0d70b74d3246e91ba1ef04cf77a324592f5b6b
 EBUILD fltk-1.3.0_rc3-r1.ebuild 3843 RMD160 0efcbed9f94f7b5efc6908fa7055ae20e3dc1343 SHA1 c33da5c3c8d9d7c8cd2399f04b0bc81c6ca4c536 SHA256 0f4d824d82c6556df05989af367f5ae7924b7a3eadcafb31a21477e9aafd5989
 EBUILD fltk-2.0_pre6970-r1.ebuild 2603 RMD160 7da78392dac4142a49de36f55451d814fa6d5714 SHA1 9ceb19a02aad685422ccdc4e6d0118c769c09a44 SHA256 c0e4364d9301940f109a4243800809f3ffb30066ea37373df8dd2c8f523e54bd
 EBUILD fltk-2.0_pre6970.ebuild 2499 RMD160 473e33748481ede77d977856375059b48994667e SHA1 d4b27ae1b48a9573104cd62ca106ad2ff9359acb SHA256 9151a4aaf72a4d22301cd16c8cf06461410a5121939162347da14c3106c4bffd
-MISC ChangeLog 23667 RMD160 7350d1da4481435b4f9aa8e1b1fae894da66509d SHA1 b2bf030bd16066416b674684c99c6a9d810cecc3 SHA256 12910baac7d175e41324b09c41d5a67e8130352b0ed43d4f8106507e0812b8b5
+MISC ChangeLog 23781 RMD160 fbfe2f80393fffffd0abf807a395a60acb4e7589 SHA1 36c7290f21f20caa1cf74c4d3d59f85fa6c388a9 SHA256 5de5b5c149f4f016edb3cb16497c35cf7efbf53ed7aad82d529c003c7f4df922
 MISC metadata.xml 657 RMD160 24969ef07785738fc34d10c79dcc854d2a895ec3 SHA1 8afd06ddc3b01090acf0333f2ac41fc4a692f504 SHA256 f37b711686e55a32ab4a1e050ee6e98fbfd7e6d7839c53926b6103fff61c44b1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk01+lkACgkQgAnW8HDreRaT4ACfchpzWJDf7hTSmhvzCYnNH9Ri
-KsYAn1bk1SFNzYXStEO3F8gPLzLHledQ
-=nrIF
+iEYEARECAAYFAk03Nx0ACgkQgAnW8HDreRYR5QCgk1N67MuN0PiZZovm3rAz1m6o
+aekAn3kBgCoaIP/Io92oN7rEndz1mc/t
+=zbsv
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/fltk/fltk-1.1.9-r1.ebuild b/x11-libs/fltk/fltk-1.1.9-r1.ebuild
new file mode 100644
index 000000000000..5a31b53cc5ef
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.1.9-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.9-r1.ebuild,v 1.17 2011/01/19 19:10:16 jlec Exp $
+
+EAPI=2
+inherit eutils autotools versionator fdo-mime
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org"
+SRC_URI="mirror://easysw/${PN}/${PV}/${P}-source.tar.bz2"
+
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+LICENSE="FLTK LGPL-2"
+
+SLOT="$(get_version_component_range 1-2)"
+
+IUSE="doc examples games opengl threads xft xinerama"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXt
+	virtual/jpeg
+	media-libs/libpng
+	sys-libs/zlib
+	opengl? ( virtual/opengl )
+	xinerama? ( x11-libs/libXinerama )
+	xft? ( x11-libs/libXft )
+	>=sys-libs/glibc-2.10"   # glibc-2.10 patch breaks with 2.9, bug 276695
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	doc? ( app-text/htmldoc )
+	xinerama? ( x11-proto/xineramaproto )"
+
+INCDIR=/usr/include/fltk-${SLOT}
+LIBDIR=/usr/$(get_libdir)/fltk-${SLOT}
+
+src_prepare() {
+	#epatch "${FILESDIR}"/${P}-fromdebian.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	# prevent to run twice configure (needs eautoconf), to compile tests,
+	# remove forced -Os compile
+	epatch "${FILESDIR}"/${P}-conf-tests.patch
+	# fix stricter c++ handling in glibc-2.10/gcc-4.4 (bug 270487)
+	epatch "${FILESDIR}"/${P}-glibc2.10-scandir.patch
+	epatch "${FILESDIR}"/${P}-consts.patch
+	# remove forced flags from fltk-config
+	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:" \
+		makeinclude.in || die
+	sed -e "s/7/$(get_version_component_range 3)/" \
+		"${FILESDIR}"/FLTKConfig.cmake > CMake/FLTKConfig.cmake
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--includedir=${INCDIR}\
+		--libdir=${LIBDIR} \
+		--docdir=/usr/share/doc/${PF}/html \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xdbe \
+		$(use_enable opengl gl) \
+		$(use_enable threads) \
+		$(use_enable xft) \
+		$(use_enable xinerama)
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use doc; then
+		cd "${S}"/documentation
+		emake alldocs || die "emake doc failed"
+	fi
+	if use games; then
+		cd "${S}"/test
+		emake blocks checkers sudoku || die "emake games failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	emake -C fluid \
+			DESTDIR="${D}" install-linux || die "emake install fluid failed"
+	if use doc; then
+		emake -C documentation \
+			DESTDIR="${D}" install || die "emake install doc failed"
+	fi
+	local apps="fluid"
+	if use games; then
+		emake -C test \
+			DESTDIR="${D}" install-linux || die "emake install games failed"
+		emake -C documentation \
+			DESTDIR="${D}" install-linux || die "emake install doc games failed"
+		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=/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
+	doenvd 99fltk-${SLOT}
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}