Install FLTKConfig.cmake and FLTKUse.cmake for bug 175006.

Package-Manager: portage-2.1.2.7

5 files changed, 167 insertions, 15 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index bd01388f93e6..8ba25f1ff4aa 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.78 2007/04/09 23:33:34 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.79 2007/05/16 09:47:42 drac Exp $
+
+*fltk-1.1.7-r1 (16 May 2007)
+
+  16 May 2007; Samuli Suominen <drac@gentoo.org> +files/FLTKConfig.cmake,
+  +fltk-1.1.7-r1.ebuild:
+  Install FLTKConfig.cmake and FLTKUse.cmake for bug 175006.
 
   09 Apr 2007; David Shakaryan <omp@gentoo.org> fltk-1.1.7.ebuild:
   Use doenvd. (bug #173884)
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 115b5bf12d37..ca365fc01983 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX FLTKConfig.cmake 1217 RMD160 5dd0903afe144b63c17dfb50b318b9d994787697 SHA1 2b09f60de6ae8ba1c1d625240e734b0413e643ca SHA256 cefffd18b6320c83aa546c953790b3dab9e4b99c0f43633b6994bdb7db69877e
+MD5 8a94e00bc66035bbd574a197b107a950 files/FLTKConfig.cmake 1217
+RMD160 5dd0903afe144b63c17dfb50b318b9d994787697 files/FLTKConfig.cmake 1217
+SHA256 cefffd18b6320c83aa546c953790b3dab9e4b99c0f43633b6994bdb7db69877e files/FLTKConfig.cmake 1217
 AUX fltk-1.1.7-amd64.patch 2433 RMD160 fb625474ff36b75a35394862b45653c30c6728e5 SHA1 f28f8a87f62e006a7544ff029d62e89a8d87a39c SHA256 25619bc596b59824d4e5737b0796f2e79ea6f2ca1dc4aabaa69702be1bf80e10
 MD5 1f3423427a6ce99b42ffb62c19b1c45d files/fltk-1.1.7-amd64.patch 2433
 RMD160 fb625474ff36b75a35394862b45653c30c6728e5 files/fltk-1.1.7-amd64.patch 2433
@@ -18,14 +19,18 @@ MD5 29c93504c8cba00eee5622ecbf61f134 files/libs-1.7.diff 960
 RMD160 3874beff965b46c4a60e99ba5bb90c563b3501f7 files/libs-1.7.diff 960
 SHA256 bd95ae19749cdeb04701ff91cc97e5c6c4b7bad5c9d07a80af02d98f01d88330 files/libs-1.7.diff 960
 DIST fltk-1.1.7-source.tar.bz2 2060757 RMD160 a539a1c6bb3363e54bc82c7995037c5d8ede9dd7 SHA1 16b174522920403af1e4ccddd36daaefda3765c8 SHA256 855a97e35da823f205253b865758715872cd2c7720e4dcf134a3b6dc18bfb96a
+EBUILD fltk-1.1.7-r1.ebuild 2714 RMD160 bf2dd08d007a3fd2e43113af672a98618a76e3e4 SHA1 9ad7aa78f420780e909fa18cbb27bb93379a5780 SHA256 f0ea1543d4e774f7d1e572a631f82f9e0443e32a3d4d83a17901e4ee09f37872
+MD5 7adf39ba885720b74a89a484fb35ce40 fltk-1.1.7-r1.ebuild 2714
+RMD160 bf2dd08d007a3fd2e43113af672a98618a76e3e4 fltk-1.1.7-r1.ebuild 2714
+SHA256 f0ea1543d4e774f7d1e572a631f82f9e0443e32a3d4d83a17901e4ee09f37872 fltk-1.1.7-r1.ebuild 2714
 EBUILD fltk-1.1.7.ebuild 2609 RMD160 fab22556acb545faa0eaefcc9c9566be784a711b SHA1 f7fc90d0edfdbfba5be8d37fb9c5cecfc3d8d6ad SHA256 ce4ed7c848e37be4382f78c4c025e1c1e1b6c93a20c23da5cd6bb9bfa98e870b
 MD5 76655e9fac3586b9e3886a9927f0398c fltk-1.1.7.ebuild 2609
 RMD160 fab22556acb545faa0eaefcc9c9566be784a711b fltk-1.1.7.ebuild 2609
 SHA256 ce4ed7c848e37be4382f78c4c025e1c1e1b6c93a20c23da5cd6bb9bfa98e870b fltk-1.1.7.ebuild 2609
-MISC ChangeLog 10335 RMD160 ab1f6cece494a66d1234303f94d109849ef6c405 SHA1 bf8cfe1ed2fecbfb3c0fad96a9f8ff44ddbd6f3a SHA256 4988d3196eeaca9047af5e2aee864eb5e74b1caf2c0d3e9f7d3576b2dfd934a5
-MD5 8576b583b5ff877cd86ec1eb3d968bd4 ChangeLog 10335
-RMD160 ab1f6cece494a66d1234303f94d109849ef6c405 ChangeLog 10335
-SHA256 4988d3196eeaca9047af5e2aee864eb5e74b1caf2c0d3e9f7d3576b2dfd934a5 ChangeLog 10335
+MISC ChangeLog 10527 RMD160 6d993927766eab7c41a9c2df0b9e53ff05f3e550 SHA1 085a80ab1bb7ff63c3a341ed2eeba7c280fe36ed SHA256 29db6bdd256dc0da40114c9a0fb2947f11018d4a07ec75d8768db0b703eeb6d4
+MD5 dd7d7ec7101c44eff80428ff967d6191 ChangeLog 10527
+RMD160 6d993927766eab7c41a9c2df0b9e53ff05f3e550 ChangeLog 10527
+SHA256 29db6bdd256dc0da40114c9a0fb2947f11018d4a07ec75d8768db0b703eeb6d4 ChangeLog 10527
 MISC metadata.xml 314 RMD160 24115a7758bbd2c07da47a2ffe4b79bc31cefa59 SHA1 1a4ff85c48bc39f8fac4fafc8ae06c34a290bab2 SHA256 91972db8a2f941249874f23c38338b0c7aa06cc29802074571a3582fb5269516
 MD5 aeb16984ffc07732d37c5974c14f28de metadata.xml 314
 RMD160 24115a7758bbd2c07da47a2ffe4b79bc31cefa59 metadata.xml 314
@@ -33,10 +38,6 @@ SHA256 91972db8a2f941249874f23c38338b0c7aa06cc29802074571a3582fb5269516 metadata
 MD5 b91980ec72860ef3acc1a9256d24aa96 files/digest-fltk-1.1.7 259
 RMD160 d7c0cd6b9f600e0c120baae3f417368b27eb7e09 files/digest-fltk-1.1.7 259
 SHA256 613c60277ccfb5adef1c1a6e37c073066872fcf368b663f2ee04193ee1821276 files/digest-fltk-1.1.7 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGGs1XvSApE0uP4UsRAgTVAKCY3Y7oS1AzAai8qDihN9zxe57BhwCeL/Xa
-mWi9UnPEFEjPnIcu8odfk2E=
-=1Mw+
------END PGP SIGNATURE-----
+MD5 b91980ec72860ef3acc1a9256d24aa96 files/digest-fltk-1.1.7-r1 259
+RMD160 d7c0cd6b9f600e0c120baae3f417368b27eb7e09 files/digest-fltk-1.1.7-r1 259
+SHA256 613c60277ccfb5adef1c1a6e37c073066872fcf368b663f2ee04193ee1821276 files/digest-fltk-1.1.7-r1 259
diff --git a/x11-libs/fltk/files/FLTKConfig.cmake b/x11-libs/fltk/files/FLTKConfig.cmake
new file mode 100644
index 000000000000..09427aac2aa5
--- /dev/null
+++ b/x11-libs/fltk/files/FLTKConfig.cmake
@@ -0,0 +1,37 @@
+#-----------------------------------------------------------------------------
+#
+# FLTKConfig.cmake - FLTK CMake configuration file for external projects.
+#
+# This file is configured by FLTK and used by the UseFLTK.cmake module
+# to load FLTK's settings for an external project.
+
+# The FLTK source tree.
+# SET(FLTK_SOURCE_DIR "@FLTK_SOURCE_DIR@")
+
+# The FLTK include file directories.
+SET(FLUID_COMMAND "/usr/bin/fluid")
+SET(FLTK_EXECUTABLE_DIRS "/usr/bin")
+SET(FLTK_LIBRARY_DIRS "/usr/lib")
+SET(FLTK_LIBRARIES "fltk_images;fltk_gl;fltk_forms;fltk")
+SET(FLTK_INCLUDE_DIRS "/usr/include")
+
+# The C and C++ flags added by FLTK to the cmake-configured flags.
+SET(FLTK_REQUIRED_C_FLAGS "")
+SET(FLTK_REQUIRED_CXX_FLAGS "")
+
+# The FLTK version number
+SET(FLTK_VERSION_MAJOR "1")
+SET(FLTK_VERSION_MINOR "1")
+SET(FLTK_VERSION_PATCH "7")
+
+# Is FLTK using shared libraries?
+SET(FLTK_BUILD_SHARED_LIBS "ON")
+# SET(FLTK_BUILD_SETTINGS_FILE "@FLTK_BUILD_SETTINGS_FILE@")
+
+# The location of the UseFLTK.cmake file.
+SET(FLTK11_USE_FILE "/usr/share/cmake/Modules/FLTKUse.cmake")
+
+# # The ExodusII library dependencies.
+# IF(NOT FLTK_NO_LIBRARY_DEPENDS)
+#   INCLUDE("@FLTK_LIBRARY_DEPENDS_FILE@")
+# ENDIF(NOT FLTK_NO_LIBRARY_DEPENDS)
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.7-r1 b/x11-libs/fltk/files/digest-fltk-1.1.7-r1
new file mode 100644
index 000000000000..f20ba91db664
--- /dev/null
+++ b/x11-libs/fltk/files/digest-fltk-1.1.7-r1
@@ -0,0 +1,3 @@
+MD5 2e29319119adc9d63b2f26b72cae0a88 fltk-1.1.7-source.tar.bz2 2060757
+RMD160 a539a1c6bb3363e54bc82c7995037c5d8ede9dd7 fltk-1.1.7-source.tar.bz2 2060757
+SHA256 855a97e35da823f205253b865758715872cd2c7720e4dcf134a3b6dc18bfb96a fltk-1.1.7-source.tar.bz2 2060757
diff --git a/x11-libs/fltk/fltk-1.1.7-r1.ebuild b/x11-libs/fltk/fltk-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..5594b26cc2cd
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.1.7-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7-r1.ebuild,v 1.1 2007/05/16 09:47:42 drac Exp $
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL."
+HOMEPAGE="http://www.fltk.org"
+SRC_URI="http://ftp.easysw.com/pub/${PN}/${PV}/${P}-source.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="FLTK LGPL-2"
+
+PV_MAJOR=${PV/.*/}
+PV_MINOR=${PV#${PV_MAJOR}.}
+PV_MINOR=${PV_MINOR/.*}
+SLOT="${PV_MAJOR}.${PV_MINOR}"
+
+INCDIR=/usr/include/fltk-${SLOT}
+LIBDIR=/usr/$(get_libdir)/fltk-${SLOT}
+
+IUSE="noxft opengl debug"
+
+DEPEND="|| ( (
+		x11-libs/libXext
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXt
+		x11-proto/xextproto )
+	virtual/x11 )
+	!noxft? ( virtual/xft )
+	media-libs/libpng
+	media-libs/jpeg
+	opengl? ( virtual/opengl )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/libs-1.7.diff" || die "patch failed"
+	use amd64 && {
+		epatch "${FILESDIR}/${P}-amd64.patch" || die "patch failed"
+	}
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch "${FILESDIR}/${P}-dieonerrors.patch"
+}
+
+src_compile() {
+	local myconf
+	myconf="--enable-shared --enable-xdbe --enable-static --enable-threads"
+
+	if ! use noxft; then
+		myconf="${myconf} --enable-xft"
+	else
+		myconf="${myconf} --disable-xft"
+	fi
+
+	use debug && myconf="${myconf} --enable-debug"
+
+	use opengl || myconf="${myconf} --disable-gl"
+
+	# needed for glibc-2.3.1 (as far as i can test)
+	# otherwise libstdc++ won't be linked. #17894 and #15572
+	# doesn't happen for glibc-2.3.2 - <liquidx@gentoo.org>
+	export CXX=$(tc-getCXX)
+	export CC=$(tc-getCC)
+
+	# bug #19894
+	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
+	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
+
+	econf \
+		--includedir=${INCDIR}\
+		--libdir=${LIBDIR} \
+		${myconf} || die "Configuration Failed"
+
+	emake || die "Parallel Make Failed"
+}
+
+src_install() {
+	einstall \
+		includedir=${D}${INCDIR} \
+		libdir=${D}${LIBDIR} || die "Installation Failed"
+
+	ranlib ${D}${LIBDIR}/*.a
+
+	insinto /usr/share/cmake/Modules
+	doins "${FILESDIR}"/FLTKConfig.cmake CMake/FLTKUse.cmake
+
+	dodoc CHANGES README
+
+	echo "LDPATH=${LIBDIR}" > 99fltk-${SLOT}
+	echo "FLTK_DOCDIR=/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
+
+	doenvd 99fltk-${SLOT}
+
+	dodir /usr/share/doc/${P}/html
+	mv ${D}/usr/share/doc/fltk/* ${D}/usr/share/doc/${PF}/html
+	rmdir ${D}/usr/share/doc/fltk
+	rm -rf ${D}/usr/share/man/cat{1,3}
+}
+
+pkg_postinst() {
+	ewarn "the xft USE flag has been changed to noxft. this was because most"
+	ewarn "users want xft, but if you do not, be sure to change the flag"
+}