Apply dadadir fix from bug #315531.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 184 insertions, 2 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 43b28c44a90f..76ca5e6de8fd 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.156 2010/05/28 19:52:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.157 2010/05/30 10:44:20 hwoarang Exp $
+
+*fltk-1.1.9-r2 (30 May 2010)
+
+  30 May 2010; Markos Chandras <hwoarang@gentoo.org> +fltk-1.1.9-r2.ebuild,
+  +files/fltk-1.1.9-share.patch:
+  Apply dadadir fix from bug #315531. Thanks to Johan Hattne
+  <johan.hattne@utsouthwestern.edu>
 
   28 May 2010; Markos Chandras <hwoarang@gentoo.org> -fltk-1.1.7.ebuild,
   -fltk-1.1.7-r2.ebuild, -fltk-1.1.7-r3.ebuild:
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 2ab7a5965c60..b2b22303c65c 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -9,6 +9,7 @@ AUX fltk-1.1.9-conf-tests.patch 3086 RMD160 7fe5307dfe6b771dffdd28f87751a1529ca3
 AUX fltk-1.1.9-consts.patch 920 RMD160 efde1c9cefc08dd2829aadc536f55822f3ffd147 SHA1 d470b0a87839d6cde6ee5f0034a4cfdb6bb87d73 SHA256 366dd980d8d0bcfd0e5b1010316caf9103437976a8a10a0dd7b12943782dc082
 AUX fltk-1.1.9-desktop.patch 400 RMD160 c287cade8fe936db0334e1c364c8165512da9bd4 SHA1 44fd58b743698b97c38eea4bc1580a14d1c60916 SHA256 d1e073793cab3c5d7c88a95ae7e3e0e8e0014524bb53a1ae76f6526c41e4c191
 AUX fltk-1.1.9-glibc2.10-scandir.patch 736 RMD160 d2d28d50a5704bc64639a82ab2d7910220efd2b2 SHA1 72460b2d9e6e049b5e37fbe73930712e9ded8051 SHA256 bc7ba1695141ccd35908656e310577f10ac0a8866d8bdea6225e38970c82c7c7
+AUX fltk-1.1.9-share.patch 1892 RMD160 90f3939425ac31868a5cbbb01b66dcdb41a26e0d SHA1 12d37ac1dd6d2425b03ac964464049af3a048139 SHA256 3818c7b31ebc06e545facd409268dfb89dff8d889083b00f32fe79baafb7d56f
 AUX fltk-2.0_pre6970-libpng14.patch 339 RMD160 a6fe78f6518b31fd93410df1859832681945e7a3 SHA1 7dc0edee28c336e6ee6ddf4a6a4a45c086e39912 SHA256 ff4b1a7da84cbf1dc3a974a2461a5e1c02965a61b13e6b2a34904f731854a4a6
 AUX fltk2-asneeded.patch 1902 RMD160 750e9ca9a57237f2c693d29422352778abf6135f SHA1 d7273b03085d69b35ae332cf2e2e215480ec4ad7 SHA256 aa532cba342f7315efd08578431acab746bb3a499eada984b35a44fe6b30580f
 AUX fltk2-fluid2.patch 948 RMD160 943d7843f7258ed9e26ca9ce281c226f75a30580 SHA1 44f94f7c823749f33feb11d8b93b85ee5ec33a3d SHA256 a5c5d7f2b24bb19ee5d4d03ccead551da4b668e35a21f9761983085ae0faa2c1
@@ -23,10 +24,11 @@ DIST fltk-2.0.x-r6786.tar.bz2 2527307 RMD160 aa9199bd7ed15b4b2fc2da976d88f7396f2
 DIST fltk-2.0.x-r6970.tar.bz2 2529193 RMD160 5d114b5861807a15638d2b0f7ac55a909c1b6870 SHA1 0aaa688786a858b7af84e992d5438aab4ba84b0e SHA256 0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3
 EBUILD fltk-1.1.10.ebuild 3752 RMD160 2bac639bb97d54bb5f6ff1255d582e3db8962266 SHA1 d50fae926dc4dde956b2ae2faf9214e8bd8243b1 SHA256 04e56cea60b627f658c751394402dc51ea547e219e96d29ea236984272dbd729
 EBUILD fltk-1.1.9-r1.ebuild 3660 RMD160 609891fc64a6887a8a1fa6b9a1e2329255acd187 SHA1 6d8468c3ffa28c1687dd1f926cc4490ddfe307d3 SHA256 04fe6647d6fc90281c84e142599cacd102a1431ce26f32da4e894b3cc3746c96
+EBUILD fltk-1.1.9-r2.ebuild 3715 RMD160 09ea840feacc97b38d5f70aa6119025ada1b0c23 SHA1 f9c1d5ee143fd7e474026ef658cdd8dab80edba5 SHA256 dd4951e8fefbc9fe39a727f729d99b36a94aeaa2c57d56d04723d0d2f2d537aa
 EBUILD fltk-1.1.9.ebuild 3520 RMD160 346b6a158a2ce1acbc948edeb115d19681fd94d4 SHA1 b29180ba8d30ae85c522add42421e820043e1b6a SHA256 eacb337d6aeba4a61ef3eb7fe059f76f1541c599fe1b347892b0dafc2d9c37e5
 EBUILD fltk-2.0_pre6786-r1.ebuild 2450 RMD160 c75cd879f6c2ffe9afb1be44cce3091954bfecb7 SHA1 7b41522acb9718ddea49beecec32255b8c7a23d1 SHA256 7f9fdc758d13f5da5159d50bc2861485e348478e441a49addec67f6a4986baa6
 EBUILD fltk-2.0_pre6786-r2.ebuild 2511 RMD160 3812fc8227172e1cbd825abf905d40ce54826a46 SHA1 8a6235ab73d5c8be8561624ac7ec1ac953f85305 SHA256 71ab61a96646438dbee57b39732d2ce2d6970d8a1277816656c08acddb223523
 EBUILD fltk-2.0_pre6786.ebuild 2365 RMD160 5059444d13b972e3b4b6ab16eba0216f5149a32b SHA1 b76e516c4fe58eb8cd252fee880f26fb99e53827 SHA256 b460a491ca0d123b4b627f76f827f62a06e2667d5ffb5bbef159a4294821ea6e
 EBUILD fltk-2.0_pre6970.ebuild 2504 RMD160 df5b63eb932dc4bc9c0d3a3f547770c5ac172c08 SHA1 59b2d03e25b34a1c3617b80205d34c549bee7998 SHA256 02180e9dea176ff8b89329cf0bcb688532efb4d88ae1ff1b2ef29f02f3bf9fdb
-MISC ChangeLog 21205 RMD160 77b3112f5ecb0ad3a3335cf1ef1c9527328dfdfc SHA1 22bda7657678fe2c35d0cd0af1ce9adf3430dbda SHA256 57374474e64eb1943222e7c877b9e6c8a81dcded32449407953471e782c3a86b
+MISC ChangeLog 21442 RMD160 21c744ea402c76a64089266da99ca795a0aaa85b SHA1 a4137fb9ccf2d3e81b6a61b85ccd916d3a1d50b1 SHA256 89ba957283dab1ec09dab0693b2e059e81c4f1276128623bc20dd2a7b69a3be1
 MISC metadata.xml 730 RMD160 b71c483e2f90c8328a31e814ef7bf1cb62a75611 SHA1 4e5669b499c22fb4059161a0e8dd62735d460f06 SHA256 5695a1eced035e0f5c8d4160c855f68e85ad3b15978b9bf88d2df16a24e79e82
diff --git a/x11-libs/fltk/files/fltk-1.1.9-share.patch b/x11-libs/fltk/files/fltk-1.1.9-share.patch
new file mode 100644
index 000000000000..60980bb9e50c
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.1.9-share.patch
@@ -0,0 +1,39 @@
+--- fluid/Makefile.orig	2010-03-29 22:41:01.828043805 -0500
++++ fluid/Makefile	2010-03-29 22:43:57.973828814 -0500
+@@ -84,16 +84,16 @@
+ 	$(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+ 
+ install-linux:
+-	-$(INSTALL_DIR) $(DESTDIR)/usr/share/applications
+-	$(INSTALL_DATA) fluid.desktop  $(DESTDIR)/usr/share/applications
++	-$(INSTALL_DIR) $(DESTDIR)$(datadir)/applications
++	$(INSTALL_DATA) fluid.desktop  $(DESTDIR)$(datadir)/applications
+ 	for size in 16 32 48 64 128; do \
+-		if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \
+-			$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \
++		if test ! -d $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; then \
++			$(INSTALL_DIR) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \
+ 		fi; \
+-		$(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
++		$(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
+ 	done
+-	-$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application
+-	$(INSTALL_DATA) x-fluid.desktop  $(DESTDIR)/usr/share/mimelnk/application
++	-$(INSTALL_DIR) $(DESTDIR)$(datadir)/mimelnk/application
++	$(INSTALL_DATA) x-fluid.desktop  $(DESTDIR)$(datadir)/mimelnk/application
+ 
+ install-osx:
+ 	echo Installing Fluid in $(DESTDIR)/Applications...
+@@ -111,9 +111,9 @@
+ 	$(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+ 
+ uninstall-linux:
+-	$(RM) $(DESTDIR)/usr/share/applications/fluid.desktop
+-	$(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png
+-	$(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop
++	$(RM) $(DESTDIR)$(datadir)/applications/fluid.desktop
++	$(RM) $(DESTDIR)$(datadir)/icons/hicolor/*/fluid.png
++	$(RM) $(DESTDIR)$(datadir)/mimelnk/application/x-fluid.desktop
+ 
+ uninstall-osx:
+ 	$(RM) -r $(DESTDIR)/Applications/fluid.app
diff --git a/x11-libs/fltk/fltk-1.1.9-r2.ebuild b/x11-libs/fltk/fltk-1.1.9-r2.ebuild
new file mode 100644
index 000000000000..464488f4425d
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.1.9-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2010 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-r2.ebuild,v 1.1 2010/05/30 10:44:20 hwoarang 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
+	media-libs/jpeg
+	media-libs/libpng
+	sys-libs/zlib
+	opengl? ( virtual/opengl virtual/glu )
+	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}"/fltk-1.1.9-share.patch
+	#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
+}