Fix --as-needed (bug #210624, thanks to Christian Ruppert), X11 path, don't strip binary, use pkg-config for Xft, and avoid automagic deps on Xpm and Xft.

(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r2 x86_64)

4 files changed, 175 insertions, 2 deletions

diff --git a/x11-misc/fspanel/ChangeLog b/x11-misc/fspanel/ChangeLog
index 2f5a8890db8b..0e7379b279de 100644
--- a/x11-misc/fspanel/ChangeLog
+++ b/x11-misc/fspanel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/fspanel
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/ChangeLog,v 1.16 2007/08/02 12:43:41 uberlord Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/ChangeLog,v 1.17 2008/12/07 13:04:53 coldwind Exp $
+
+*fspanel-0.8_beta1-r3 (07 Dec 2008)
+
+  07 Dec 2008; Santiago M. Mola <coldwind@gentoo.org>
+  +files/fspanel-0.8_beta1-configure.patch, +fspanel-0.8_beta1-r3.ebuild:
+  Fix --as-needed (bug #210624, thanks to Christian Ruppert), X11 path,
+  don't strip binary, use pkg-config for Xft, and avoid automagic deps on
+  Xpm and Xft.
 
   02 Aug 2007; Roy Marples <uberlord@gentoo.org>
   fspanel-0.8_beta1-r2.ebuild:
diff --git a/x11-misc/fspanel/files/fspanel-0.8_beta1-configure.patch b/x11-misc/fspanel/files/fspanel-0.8_beta1-configure.patch
new file mode 100644
index 000000000000..af75f2890343
--- /dev/null
+++ b/x11-misc/fspanel/files/fspanel-0.8_beta1-configure.patch
@@ -0,0 +1,113 @@
+Source: Christian Ruppert <spooky85@gmail.com>
+	and Santiago M. Mola <coldwind@gentoo.org>
+Upstream: yes
+Reason: Fix --as-needed (Gentoo bug #210624), X11 path,
+	don't strip binary, use pkg-config for Xft, and
+	avoid automagic deps on Xpm and Xft.
+
+--- a/configure	2008-12-07 13:15:16.000000000 +0100
++++ b/configure	2008-12-07 13:46:28.000000000 +0100
+@@ -8,7 +8,7 @@
+ 	LDFLAGS="$LDFLAGS -L/usr/X/lib"
+ 	CFLAGS="$CFLAGS I/usr/include/X11"
+ else
+-	X11_PATH="/usr/X11R6"
++	X11_PATH="/usr"
+ fi
+ if test -e "$X11_PATH"; then
+ 	echo $X11_PATH
+@@ -20,7 +20,8 @@
+ fi
+ 
+ CFLAGS="$CFLAGS -I$X11_PATH/include"
+-LDFLAGS="$LDFLAGS -L$X11_PATH/lib -lX11"
++LDFLAGS="$LDFLAGS -L$X11_PATH/lib"
++LIBS="-lX11"
+ 
+ if test "_$CC" = "_"; then
+ 	CC="cc"
+@@ -37,26 +38,44 @@
+ 	exit 1
+ fi
+ 
+-echo -n "checking for X11/xpm.h... "
+-xpm=no
+-if test -e "$X11_PATH/include/X11/xpm.h"; then
+-	echo yes
+-	LDFLAGS="$LDFLAGS -lXpm"
+-	CFLAGS="$CFLAGS -DHAVE_XPM"
+-	xpm=yes
++if test "x$USE_XPM" = "xno"; then
++	xpm=no
+ else
+-	echo no
+-fi
+-
+-echo -n "checking for X11/Xft/Xft.h... "
+-xft=no
+-if test -e "$X11_PATH/include/X11/Xft/Xft.h"; then
+-	echo yes
+-	LDFLAGS="$LDFLAGS -lXft"
+-	CFLAGS="$CFLAGS -DXFT"
+-	xft=yes
+-else
+-	echo no
++	echo -n "checking for X11/xpm.h... "
++	xpm=no
++	if test -e "$X11_PATH/include/X11/xpm.h"; then
++		echo yes
++		LIBS="${LIBS} -lXpm"
++		CFLAGS="$CFLAGS -DHAVE_XPM"
++		xpm=yes
++	else
++		echo no
++		if test "x$USE_XPM" = "xyes"; then
++			echo
++			echo Cannot find xpm header\, aborting.
++			exit 1
++		fi
++	fi
++fi
++
++if test "x$USE_XFT" = "xno"; then
++	xft=no
++else
++	echo -n "checking for X11/Xft/Xft.h... "
++	xft=no
++	if pkg-config xft; then
++		echo yes
++		LIBS="${LIBS} `pkg-config --libs xft`"
++		CFLAGS="$CFLAGS -DXFT `pkg-config --cflags xft`"
++		xft=yes
++	else
++		echo no
++		if test "x$USE_XFT" = "xyes"; then
++			echo
++			echo Cannot find xft header\, aborting.
++			exit 1
++		fi
++	fi
+ fi
+ 
+ echo -n "checking for Linux... "
+@@ -72,16 +91,15 @@
+ echo CC="$CC" > Makefile
+ echo CFLAGS="$CFLAGS" >> Makefile
+ echo LDFLAGS="$LDFLAGS" >> Makefile
++echo LIBS="${LIBS}" >> Makefile
+ echo PROGNAME="$PROGNAME" >> Makefile
++echo BINDIR="${BINDIR}" >> Makefile
+ echo >> Makefile
+ echo $\(PROGNAME\): Makefile fspanel.c fspanel.h icon.xpm >> Makefile
+-echo \	$\(CC\) $\(CFLAGS\) $\(LDFLAGS\) fspanel.c -o $\(PROGNAME\) >> Makefile
+-echo \	@ls -l $\(PROGNAME\) >> Makefile
+-echo \	strip $\(PROGNAME\) >> Makefile
+-echo \	@ls -l $\(PROGNAME\) >> Makefile
++echo \	$\(CC\) $\(CFLAGS\) $\(LDFLAGS\) fspanel.c -o $\(PROGNAME\) $\(LIBS\) >> Makefile
+ echo >> Makefile
+ echo install: >> Makefile
+-echo \	install $\(PROGNAME\) /usr/local/bin >> Makefile
++echo \	install -D $\(PROGNAME\) $\(BINDIR\)/$\(PROGNAME\) >> Makefile
+ 
+ echo done
+ echo
diff --git a/x11-misc/fspanel/fspanel-0.8_beta1-r3.ebuild b/x11-misc/fspanel/fspanel-0.8_beta1-r3.ebuild
new file mode 100644
index 000000000000..39c9c0fb451b
--- /dev/null
+++ b/x11-misc/fspanel/fspanel-0.8_beta1-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/fspanel-0.8_beta1-r3.ebuild,v 1.1 2008/12/07 13:04:53 coldwind Exp $
+
+inherit eutils
+
+MY_P=${P/_beta/beta}
+
+DESCRIPTION="F***ing Small Panel. Good (and small) replacement for gnome-panel"
+HOMEPAGE="http://www.chatjunkies.org/fspanel"
+SRC_URI="http://www.chatjunkies.org/fspanel/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="xft xpm"
+
+RDEPEND="x11-libs/libX11
+	xpm? ( x11-libs/libXpm )
+	xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-configure.patch
+}
+
+myuse() {
+	use $1 && echo yes || echo no
+}
+
+src_compile() {
+	export USE_XFT=$(myuse xft)
+	export USE_XPM=$(myuse xpm)
+
+	./configure || die "./configure failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	dobin fspanel
+	dodoc README
+}
diff --git a/x11-misc/fspanel/metadata.xml b/x11-misc/fspanel/metadata.xml
index 72335b4f9bac..d504861de3d5 100644
--- a/x11-misc/fspanel/metadata.xml
+++ b/x11-misc/fspanel/metadata.xml
@@ -5,4 +5,8 @@
 <maintainer>
 <email>desktop-misc@gentoo.org</email>
 </maintainer>
+<use>
+	<flag name='xft'>Build with support for XFT font renderer
+		(<pkg>x11-libs/libXft</pkg>)</flag>
+</use>
 </pkgmetadata>