Fix fltk-config not to report the C(XX)FLAGS used to build fltk.

(Portage version: 2.1.3_rc3)

3 files changed, 117 insertions, 1 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 8ba25f1ff4aa..e40992e6ccf5 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,11 @@
 # 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.79 2007/05/16 09:47:42 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.80 2007/06/16 11:12:37 flameeyes Exp $
+
+*fltk-1.1.7-r2 (16 Jun 2007)
+
+  16 Jun 2007; Diego Pettenò <flameeyes@gentoo.org> +fltk-1.1.7-r2.ebuild:
+  Fix fltk-config not to report the C(XX)FLAGS used to build fltk.
 
 *fltk-1.1.7-r1 (16 May 2007)
 
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.7-r2 b/x11-libs/fltk/files/digest-fltk-1.1.7-r2
new file mode 100644
index 000000000000..f20ba91db664
--- /dev/null
+++ b/x11-libs/fltk/files/digest-fltk-1.1.7-r2
@@ -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-r2.ebuild b/x11-libs/fltk/fltk-1.1.7-r2.ebuild
new file mode 100644
index 000000000000..fd448e350fe0
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.1.7-r2.ebuild
@@ -0,0 +1,108 @@
+# 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-r2.ebuild,v 1.1 2007/06/16 11:12:37 flameeyes 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"
+
+	sed -i -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
+		"${S}/fltk-config.in" || die "unable to sed out compile flags"
+}
+
+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"
+}