Respect CC. Fix underlinking. Install plugins into proper multilib-strict dir. Warn about missing /dev/mixer.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 63 insertions, 23 deletions

diff --git a/x11-misc/fbpanel/ChangeLog b/x11-misc/fbpanel/ChangeLog
index dd4e03fc6237..05f55263431e 100644
--- a/x11-misc/fbpanel/ChangeLog
+++ b/x11-misc/fbpanel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/fbpanel
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpanel/ChangeLog,v 1.54 2012/05/05 04:53:39 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpanel/ChangeLog,v 1.55 2013/08/26 19:07:52 jer Exp $
+
+*fbpanel-6.1-r1 (26 Aug 2013)
+
+  26 Aug 2013; Jeroen Roovers <jer@gentoo.org> +fbpanel-6.1-r1.ebuild,
+  -files/fbpanel-6.0-configure-LANG.patch,
+  +files/fbpanel-6.1-underlinking.patch:
+  Respect CC. Fix underlinking. Install plugins into proper multilib-strict
+  dir. Warn about missing /dev/mixer.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> fbpanel-6.1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/x11-misc/fbpanel/fbpanel-6.1-r1.ebuild b/x11-misc/fbpanel/fbpanel-6.1-r1.ebuild
new file mode 100644
index 000000000000..6a58e42f9b72
--- /dev/null
+++ b/x11-misc/fbpanel/fbpanel-6.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpanel/fbpanel-6.1-r1.ebuild,v 1.1 2013/08/26 19:07:52 jer Exp $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="light-weight X11 desktop panel"
+HOMEPAGE="http://fbpanel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( CHANGELOG CREDITS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	sed -i -e "/libdir/s|/lib|/$(get_libdir)|g" configure || die
+	tc-export CC
+}
+
+src_configure() {
+	# not autotools based
+	./configure || die
+}
+
+pkg_postinst() {
+	elog "For the volume plugin to work, you need to configure your kernel"
+	elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means"
+	elog "that provide the /dev/mixer device node."
+}
diff --git a/x11-misc/fbpanel/files/fbpanel-6.0-configure-LANG.patch b/x11-misc/fbpanel/files/fbpanel-6.0-configure-LANG.patch
deleted file mode 100644
index 21148d498eb7..000000000000
--- a/x11-misc/fbpanel/files/fbpanel-6.0-configure-LANG.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	2010-03-25 20:36:48.000000000 +0200
-+++ configure	2010-03-25 20:37:46.000000000 +0200
-@@ -1,6 +1,17 @@
- #!/bin/bash
- 
--export LANG="POSIX"
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    unset $as_var
-+  fi
-+done
- 
- CMD="$@"
- 
diff --git a/x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch b/x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch
new file mode 100644
index 000000000000..74c04d55f76d
--- /dev/null
+++ b/x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch
@@ -0,0 +1,15 @@
+--- a/scripts/custom.sh
++++ b/scripts/custom.sh
+@@ -18,10 +18,10 @@
+ add_feature dependency "disable dependency tracking" disabled
+ 
+ add_var glib_cflags "glib cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags glib-2.0`'
+-add_var gtk_cflags "gtk cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags gtk+-2.0`'
++add_var gtk_cflags "gtk cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags gtk+-2.0 x11`'
+ 
+ add_var glib_libs "glib libs" '`RFS=$rfs scripts/rfs-pkg-config --libs glib-2.0`'
+-add_var gtk_libs "gtk libs" '`RFS=$rfs scripts/rfs-pkg-config --libs gtk+-2.0`'
++add_var gtk_libs "gtk libs" '`RFS=$rfs scripts/rfs-pkg-config --libs gtk+-2.0 x11` -lm'
+ 
+ add_var cflagsx "C flags" '-I$topdir/panel $glib_cflags $gtk_cflags -fPIC'
+ add_var ldflagsx "linker flags" '$glib_libs $gtk_libs'