media-radio/unixcw: fix for some parallel make issues and -fPIC problems

svn path=/sunrise/; revision=9199

6 files changed, 88 insertions, 8 deletions

diff --git a/media-radio/unixcw/ChangeLog b/media-radio/unixcw/ChangeLog
index cf9862086..907758f48 100644
--- a/media-radio/unixcw/ChangeLog
+++ b/media-radio/unixcw/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Sep 2009; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
+  unixcw-2.3-r2.ebuild, files/unixcw-2.3-destdir.patch,
+  +files/unixcw-2.3-fPIC.patch, files/unixcw-2.3-parallel-make.patch:
+  fix for some parallel make issues and -fPIC problems
+
   30 Jul 2009; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
   -unixcw-2.3-r1.ebuild, +unixcw-2.3-r2.ebuild:
   Drop installing some binaries suid by default. Make that optional by USE=suid
diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index 32e39ffe5..e213ff073 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,9 +1,10 @@
 AUX unixcw-2.3--as-needed.patch 527 RMD160 47d2b22e6c8b211abae913e32576408a6a2c8a69 SHA1 ffae50431bc25e4b4b9f9264c0aef44300a82316 SHA256 b72add7559a0a9df10adc0efa885377ac02ccc2fa840366c1185cbb2485c35e8
 AUX unixcw-2.3-config.patch 1651 RMD160 fc7d2be6f85f60bb841a2c703d303c293af3e6a0 SHA1 69bdd9a053828c8f9548ab73279fd0919445cb7d SHA256 99b79225693636327841948408cc5b7289a39c5ca89bc26c55a08743eb42c8cb
-AUX unixcw-2.3-destdir.patch 420 RMD160 e51ea34244dca4a8fb62d87cd2186280e7ad2263 SHA1 4ef438bf681d5ef31c47113b7eb0227db6a5dc02 SHA256 beb45ffca273ec6ee55484234a808fde7973643de8bd943fd2db6eac45d14bf0
+AUX unixcw-2.3-destdir.patch 480 RMD160 40579e2f3ff874cfd98ca18f2956451e4a197e5a SHA1 926ff70e9067f74c14919b7519b7b99579d51534 SHA256 ba6c84abcaebe9c16cdac636626bbd3c74a7afc6d115985767377878c13ca64c
+AUX unixcw-2.3-fPIC.patch 1866 RMD160 fd3dcaa906a308d15baa738dca5f01e3767cd6dd SHA1 c5ad38457125086d56526de28022ca68c9350dbd SHA256 2cd8aa8759df1c40742c57f5e65c2a9093c587e83345e01a26ac8f46c5953053
 AUX unixcw-2.3-ldflags.patch 1440 RMD160 d198c5325152b93822a0a3d59516b48c7b6d53f2 SHA1 741a61a083d350d84743f6cde9c18923c7d2acb5 SHA256 41d40ceb0accb8c971bbc69eb00d7c17aa2d62ed8d907d46a310f3ec3b6ff662
-AUX unixcw-2.3-parallel-make.patch 847 RMD160 79664f4fa7f254ef9752df45b018347997fd67e6 SHA1 1440b3012e2482d24d687d83b45871754fab1c87 SHA256 feeb5517239b759e32e0f0d9bdea6882dae1fb924ebcbadec474c66f9480e6a1
+AUX unixcw-2.3-parallel-make.patch 1200 RMD160 302a1947d21a3b1013d124edc380fcaddbbb7272 SHA1 a15e1bc58c64421b93a73c9ff46dfdbeb2d3a6f6 SHA256 53b8c6e12de88ed2c915617206220350c3e08eebd83d748469bc23c801ed108c
 DIST unixcw-2.3.tgz 202048 RMD160 1ba7944d7a7fc92adf7ed1a83d706546e9eaa8be SHA1 2aece1e4b0660618537a94561344dd97026b7924 SHA256 124c60c6c7ef596a7c96c94a0e76204c7d986373564121155f0f206ad71f30a0
-EBUILD unixcw-2.3-r2.ebuild 1807 RMD160 33bc9cfa604f1e1cc68d02760e61edabfbf5b781 SHA1 6bde698d02e8b707d1fbb84c9316a054a09ded13 SHA256 04a6be29ed84bd68b9a0c394e80ed3b1d3240680794095a03266a71126135db2
-MISC ChangeLog 1149 RMD160 3779f37ab5dda871b2758fe604540253e8d9c21b SHA1 54499caf0ea09d0673db4d1715702a5fbf24dfc0 SHA256 5f8f541a665fa839845b2e30fa2bbee5d95ec3857470142bef755e935a5c91a5
+EBUILD unixcw-2.3-r2.ebuild 1841 RMD160 e6fa03830c01462534000cf3b13f01add9f31e7f SHA1 011a93f7139d3669fe5e994c465ce6a622b662c7 SHA256 0356809ca0042bb5ff684cd6ca311175bc023092fd61864ca43c9b23640b2593
+MISC ChangeLog 1389 RMD160 be433bb271a758cb5e6a2c35af04c57612a15eaf SHA1 15d88fde593d52e58144325e5a8a078ced5c84ba SHA256 8e34dcf1ade758f251fe38a642705cfa9f884f2466bdbb0be19c62528d58c78f
 MISC metadata.xml 814 RMD160 c9b54021d4fad06a16d4cbf3a264fc2933cf8ee5 SHA1 35b1c62f63111e44d58ba3af19ea6449eaae4b5f SHA256 744881de9bf96a2c3013846d8fe954743ad55d2889f720b3b63d6091910c50d0
diff --git a/media-radio/unixcw/files/unixcw-2.3-destdir.patch b/media-radio/unixcw/files/unixcw-2.3-destdir.patch
index 91f8a1bc0..195b66505 100644
--- a/media-radio/unixcw/files/unixcw-2.3-destdir.patch
+++ b/media-radio/unixcw/files/unixcw-2.3-destdir.patch
@@ -1,6 +1,6 @@
 --- Makefile.inc.in.org	2008-05-01 09:49:18.000000000 +0200
 +++ Makefile.inc.in	2008-05-01 09:49:40.000000000 +0200
-@@ -42,9 +42,9 @@
+@@ -42,9 +42,10 @@
  INSTALL		= @INSTALL@
  INSTALL_PROGRAM	= @INSTALL_PROGRAM@
  INSTALL_DATA	= @INSTALL_DATA@
@@ -11,4 +11,6 @@
  bindir		= @bindir@
 -mandir		= @mandir@
 +mandir		= $(DESTDIR)@mandir@
- libdir		= @libdir@
+-libdir		= @libdir@
++libdir		= $(DESTDIR)@libdir@
++datarootdir	= @datarootdir@
diff --git a/media-radio/unixcw/files/unixcw-2.3-fPIC.patch b/media-radio/unixcw/files/unixcw-2.3-fPIC.patch
new file mode 100644
index 000000000..67e68bfec
--- /dev/null
+++ b/media-radio/unixcw/files/unixcw-2.3-fPIC.patch
@@ -0,0 +1,60 @@
+--- configure.ac.orig	2009-09-08 22:27:33.000000000 +0200
++++ configure.ac	2009-09-08 22:28:14.000000000 +0200
+@@ -212,7 +212,7 @@
+   cat >conftest.c <<-EOF
+   int so_test() { return 0; }
+ EOF
+-  $CC -c conftest.c >/dev/null 2>/dev/null
++  $CC $CFLAG_PIC -c conftest.c >/dev/null 2>/dev/null
+   $CC -shared -o conftest.so conftest.o >/dev/null 2>/dev/null
+   rm -f conftest.c conftest.o
+   if test -f conftest.so ; then
+@@ -239,7 +239,7 @@
+   cat >conftest.c <<-EOF
+   int so_test() { return 0; }
+ EOF
+-  $CC -c conftest.c >/dev/null 2>/dev/null
++  $CC $CFLAG_PIC -c conftest.c >/dev/null 2>/dev/null
+   $LD -G -o conftest.so conftest.o >/dev/null 2>/dev/null
+   rm -f conftest.c conftest.o
+   if test -f conftest.so ; then
+--- src/cwlib/Makefile.orig	2009-09-08 22:53:31.000000000 +0200
++++ src/cwlib/Makefile	2009-09-08 22:59:31.000000000 +0200
+@@ -19,7 +19,8 @@
+ 
+ include ../../Makefile.inc
+ CC	= $(AC_CC)
+-CFLAGS	= $(AC_CFLAGS) $(AC_CFLAG_PIC) $(AC_DEFS)
++CFLAGS	= $(AC_CFLAGS) $(AC_DEFS)
++CFLAGS_SL = $(AC_CFLAGS) $(AC_CFLAG_PIC) $(AC_DEFS)
+ AWK	= $(AC_AWK)
+ RANLIB	= $(AC_RANLIB)
+ LD	= $(AC_LD)
+@@ -40,14 +41,14 @@
+ 	rm -f libcw.a; ar -cr libcw.a cwlib.o
+ 	$(RANLIB) libcw.a
+ 
+-libcw.so.0.0.0: cwlib.o
++libcw.so.0.0.0: cwlib_sl.o
+ 	if [ "$(CC_LINKS_SO)" = "yes" ]; then				\
+ 		$(CC) $(LDFLAGS) -shared -Wl,-soname,libcw.so.0			\
+-			-o libcw.so.0.0.0 cwlib.o -lm;			\
++			-o libcw.so.0.0.0 cwlib_sl.o -lm;			\
+ 	else								\
+ 		if [ "$(LD_LINKS_SO)" = "yes" ]; then			\
+ 			$(LD) $(LDFLAGS) -G -Wl,-soname,libcw.so.0			\
+-				-o libcw.so.0.0.0 cwlib.o -lm;		\
++				-o libcw.so.0.0.0 cwlib_sl.o -lm;		\
+ 		fi							\
+ 	fi
+ 
+@@ -78,6 +79,9 @@
+ # Define dependencies related to header/include files.
+ cwlib.o: Makefile cwlib.h
+ 
++cwlib_sl.o: Makefile cwlib.h
++	$(CC) $(CFLAGS_SL) -c -o cwlib_sl.o cwlib.c
++
+ cwlibtest.o: Makefile cwlib.h
+ 
+ # Install targets.
diff --git a/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch b/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch
index 5660f6cbe..555c85406 100644
--- a/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch
+++ b/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch
@@ -26,3 +26,14 @@
  distclean mostlyclean maintainer-clean:
 -	$(DESCEND)
 +	+$(DESCEND)
+--- src/cwlib/Makefile.orig	2009-09-08 14:07:37.000000000 +0200
++++ src/cwlib/Makefile	2009-09-08 14:10:05.000000000 +0200
+@@ -65,7 +65,7 @@
+ 	rm -f signatures functions
+ 
+ # Build the unit test.
+-cwlibtest: cwlibtest.o
++cwlibtest: cwlibtest.o libcw.a libcw.so.0.0.0
+ 	$(CC) -o cwlibtest cwlibtest.o -L. -lcw -lm
+ 
+ # Build the pkgconfig metadata file.
diff --git a/media-radio/unixcw/unixcw-2.3-r2.ebuild b/media-radio/unixcw/unixcw-2.3-r2.ebuild
index 821cd26da..f7c3466aa 100644
--- a/media-radio/unixcw/unixcw-2.3-r2.ebuild
+++ b/media-radio/unixcw/unixcw-2.3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/apps/ham/morse/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="ncurses qt3 suid"
 
 RDEPEND="ncurses? ( sys-libs/ncurses )
@@ -24,7 +24,8 @@ src_unpack() {
 		"${FILESDIR}"/${P}-config.patch \
 		"${FILESDIR}"/${P}-parallel-make.patch \
 		"${FILESDIR}"/${P}--as-needed.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-fPIC.patch
 	eautoreconf
 }