Build shared objects with -fPIC and keyword for ~amd64.

Package-Manager: portage-2.1.4.4

4 files changed, 33 insertions, 14 deletions

diff --git a/x11-misc/suxpanel/ChangeLog b/x11-misc/suxpanel/ChangeLog
index db00936f5b1b..dd1f43023e53 100644
--- a/x11-misc/suxpanel/ChangeLog
+++ b/x11-misc/suxpanel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/suxpanel
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/suxpanel/ChangeLog,v 1.5 2007/03/10 12:27:56 drac Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/suxpanel/ChangeLog,v 1.6 2008/02/18 20:25:43 drac Exp $
+
+  18 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  files/suxpanel-0.4b-Makefile.in.patch, suxpanel-0.4b.ebuild:
+  Build shared objects with -fPIC and keyword for ~amd64.
 
 *suxpanel-0.4b (10 Mar 2007)
 
diff --git a/x11-misc/suxpanel/Manifest b/x11-misc/suxpanel/Manifest
index caadbd84bd45..1236a48bde59 100644
--- a/x11-misc/suxpanel/Manifest
+++ b/x11-misc/suxpanel/Manifest
@@ -1,8 +1,8 @@
 AUX suxpanel-0.4a-Makefile.in.patch 717 RMD160 5f2b818596884352147e00a73a96c8cfd7f78eeb SHA1 84447b42dfa95a177f0b0e33e7a249a7afab0dfb SHA256 c6fbbbfa39d2450aa5c5cc0567c13de4f1a37b77ccb3e35be4a80eaed1f6f011
-AUX suxpanel-0.4b-Makefile.in.patch 473 RMD160 964d66c6dfe2c88d74061f239f76fa91e4883dd0 SHA1 c4545103b517396a8670c91c7bc3e2e7a1aa6a59 SHA256 62bc1e53d90b41044a863493f69c0e318616d07d5e611f0a970da796b121e2d5
+AUX suxpanel-0.4b-Makefile.in.patch 735 RMD160 4cda3e330909291744555e26dfc90d4bb992068f SHA1 6ae2700fdfe3aed179f2b674f1c5cfc756b08d2a SHA256 6f3da3995637e89d757fb85e6a09120687c899b6029907f6e1e44532eb90f865
 DIST suxpanel-0.4a.tar.bz2 86321 RMD160 da9560483cc5815789b1dd5ae9d66a4fc6a85aa9 SHA1 a6f881503a4ee164da041be7a3438314b1a2bdc2 SHA256 1958ef798c4f1cebe925d2414c0465fcc84e2125b003db92c5c157a3ddb032c1
 DIST suxpanel-0.4b.tar.bz2 86140 RMD160 fa709bafe7c4e92f3b83b0c867910d74efc698c8 SHA1 cb7e7d1e461667db95b777271f66956a77454584 SHA256 e2b3a2af3897595beff61cf563bc5506c5fd4c4ba3e3503b3124505031431060
 EBUILD suxpanel-0.4a.ebuild 779 RMD160 38e046b781c26fdfad8f8d2aad6e761825a6b36c SHA1 4efb896664b884374ae303c16e79911c5400e581 SHA256 dfc14b9cdde503d9cfa205453f0d564d0e5f1b73eb3fd0e335bc337cd5c4eba4
-EBUILD suxpanel-0.4b.ebuild 793 RMD160 0cbf21b6602aadd59734300cc83909e159f87799 SHA1 e84ffbf6125ff4ce260e07ab55416d090d4a6903 SHA256 d0fa0b5f8cb9e9d89e62ec771ec97198724e344abcc549c3e35d2b8da4db5b2f
-MISC ChangeLog 964 RMD160 fdb290ff18acd0151864c94c35c581f64d0c5b57 SHA1 27048def60146f18ac89df5665ff29d2a8d109ef SHA256 b7bde41221357a98dec8a78e27b52c8d6671e71b6aae78cdb8664d8a64c7999e
+EBUILD suxpanel-0.4b.ebuild 868 RMD160 5bf54c3e4e24b44401c7d612d52c05352863f8c0 SHA1 7bed811e5dbd007a8f290a7bb978b0990c43762e SHA256 10bf3dc6db0c6274929a17e1a6aeabcee3d1f54c1eecee4519b462c4a6b01c04
+MISC ChangeLog 1135 RMD160 fe58eeca4db337ccfc8ecb402fa55e9c359a861c SHA1 e58b0be6477ba4c57e00d5a3a6b3c91481a20df7 SHA256 e3e2daaad77b56ac6b788cd86c728e9fdab0c69e428b5741d0db3ce4d9340401
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/x11-misc/suxpanel/files/suxpanel-0.4b-Makefile.in.patch b/x11-misc/suxpanel/files/suxpanel-0.4b-Makefile.in.patch
index b328b5b2a580..ee42f50541e1 100644
--- a/x11-misc/suxpanel/files/suxpanel-0.4b-Makefile.in.patch
+++ b/x11-misc/suxpanel/files/suxpanel-0.4b-Makefile.in.patch
@@ -1,12 +1,22 @@
 diff -ur suxpanel-0.4b.orig/Makefile.in suxpanel-0.4b/Makefile.in
 --- suxpanel-0.4b.orig/Makefile.in	2005-07-21 19:06:25.000000000 +0300
-+++ suxpanel-0.4b/Makefile.in	2007-03-10 14:21:28.000000000 +0200
++++ suxpanel-0.4b/Makefile.in	2008-02-18 22:21:37.000000000 +0200
 @@ -1,7 +1,7 @@
  # ----------------------------------------------------------------------------
  
- CC = gcc
+-CC = gcc
 -CFLAGS = -Wall $(GTK_CFLAGS) -O2 -g
-+CFLAGS := -Wall $(GTK_CFLAGS) $(CFLAGS)
++CC ?= gcc
++CFLAGS += -Wall $(GTK_CFLAGS)
  
  # ----------------------------------------------------------------------------
  
+@@ -15,7 +15,7 @@
+ 
+ %.so: %.c 
+ 	@echo "compile module: $< ($@)"
+-	$(CC) $(CFLAGS) -o $@ -shared $< $(GTK_CFLAGS) $(GTK_LIBS) \
++	$(CC) $(CFLAGS) -o $@ -shared -fPIC $< $(GTK_CFLAGS) $(GTK_LIBS) \
+             $(WNCK_LIBS) $(WNCK_CFLAGS)
+ 
+ clean:
diff --git a/x11-misc/suxpanel/suxpanel-0.4b.ebuild b/x11-misc/suxpanel/suxpanel-0.4b.ebuild
index a1d73c8c60b7..19b0795a5123 100644
--- a/x11-misc/suxpanel/suxpanel-0.4b.ebuild
+++ b/x11-misc/suxpanel/suxpanel-0.4b.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/suxpanel/suxpanel-0.4b.ebuild,v 1.1 2007/03/10 12:27:56 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/suxpanel/suxpanel-0.4b.ebuild,v 1.2 2008/02/18 20:25:43 drac Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="SuxPanel is a complete rewrite of MacOS Style Panel, a light-weight X11 desktop panel"
 SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
@@ -10,19 +10,24 @@ HOMEPAGE="http://suxpanel.berlios.de"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2
 	x11-libs/libwnck"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
 	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-Makefile.in.patch"
+	epatch "${FILESDIR}"/${P}-Makefile.in.patch
+}
+
+src_compile() {
+	tc-export CC
+	econf
+	emake || die "emake failed."
 }
 
 src_install () {