Fix static libs, fix ldflags for plugins (bug 397681), and fix ptlib dep for vxml

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 84 insertions, 10 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index f2fcd2350b57..73ce6ec8fdfd 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/opal
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.73 2011/05/24 13:30:06 pva Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.74 2012/01/04 20:35:06 nirbheek Exp $
+
+  04 Jan 2012; Nirbheek Chauhan <nirbheek@gentoo.org> opal-3.6.8-r2.ebuild,
+  +files/opal-3.6.8-lid-plugins-ldflags.patch:
+  Fix static libs, fix ldflags for plugins (bug 397681), and fix ptlib dep for
+  vxml
 
   24 May 2011; Peter Volkov <pva@gentoo.org> opal-3.6.8-r2.ebuild:
   Update another occurence of media-video/ffmpeg to virtual/ffmpeg.
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index c4e15089eb8c..6714266feac2 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -1,13 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX opal-2.1.1-notrace.diff 263 RMD160 17b6887acd196af52de8dfec8d5accfd654d1fc7 SHA1 079474507fe63a9019a293a5a529c23788221196 SHA256 3abf99ab2a7bde2e1a2380e22a9c5e15240439bdf7766b4715c78cacd46961c0
 AUX opal-3.6.4-jdkroot.patch 507 RMD160 eeda20caf4697efa51dd24527c619f3ec0e2d3ca SHA1 72c4d9ea9f5867567a24f5a92cd66d1394b58129 SHA256 c2e930565cd91a7ec75a1ed1657ba524dad810ec934ef854c39331388661f2f6
 AUX opal-3.6.8-build-fix.patch 992 RMD160 102a98bd4a255d6414f4adc4713eb8ffa9a08e67 SHA1 cd33c6524be1ee8d65e2f3929d6a9608c84a63eb SHA256 cbd011cf42b7d691f5b8d71e02f5b317d50ea8c51a7b03e38887119dc07b58c8
 AUX opal-3.6.8-ldflags.patch 7345 RMD160 f772634775e8ad0fda21971f527a3b4c96940d46 SHA1 fa0a89e57170ada07af34053fa816773071b745d SHA256 c7ecb726688eadbb24d09238c86de8874edc488d82503dbc64802d3d8878e411
+AUX opal-3.6.8-lid-plugins-ldflags.patch 1146 RMD160 d8cbfc784886877467e049436bb0b19c5f1f6dcd SHA1 814d84e63922f3f0cb48eaca4b5c8b6267144e9c SHA256 d4c8662afa93b5651f132280edd56ab87253ce91b829cfeff6ac0f322dffbd9b
 DIST opal-2.2.11.tar.gz 4165191 RMD160 7ef2d505cc52eca9136ca10a865c7b7f3a8dc2b5 SHA1 f8638a7dce8e9c32abd8c69c69ba2d61dfca05f0 SHA256 0990ead39728f23a1ce39997f41a8484c59809ccec0e770b9bc4f795a85a29c4
 DIST opal-3.6.7-htmldoc.tar.bz2 5842269 RMD160 039b138991334e0ecdc243d73a8dbca6d13c4df4 SHA1 cb2c5ee78f8461a2e027f0142c96c0c5a70a55c1 SHA256 d6c11b162b4b26cfc3df2c2c12b5d8a0e1b2dfa5c6869995b0fafa2f2a716e7b
 DIST opal-3.6.8.tar.bz2 6837993 RMD160 3a1693de75cfe1e6d6c1f6f4635cb7447d43a2e9 SHA1 c43826bc3e273df048f47a77c4affb36614f2b7e SHA256 8cbfabb33e5c5563fdafacf1adde536c78638d6d020fae496a52e19e2be6a90c
 EBUILD opal-2.2.11.ebuild 2604 RMD160 2dadccb1206d340d3c33987aa1147a43ab622463 SHA1 b3b29f137eae3437cc19118ea59d6d8ee8adba3a SHA256 8595bd00d707830cfc52f7de3b8993c0658f50306ddef296dea97c74d0285ba7
 EBUILD opal-3.6.8-r1.ebuild 8367 RMD160 6cff20c1818429248485f050da5507497b7c6809 SHA1 37c643d025f2109c32619424f8afe0e93b70bfe7 SHA256 a0ec988752f04376910b8e8c60b06003a64db4107151ea1b1917a8d59c6414dd
-EBUILD opal-3.6.8-r2.ebuild 8265 RMD160 11ed399f5d1964ee9095bc466726b29f0c8e7a44 SHA1 a6dbc6069759fbfebdfc1b21ff6af3e5e91facb5 SHA256 f5dcf9d6ce51e770a6edc6991f7c29edf2807e8bf99f50d30b5b30da23695ff7
+EBUILD opal-3.6.8-r2.ebuild 8570 RMD160 3b93a2b75f2e8015c522def17283a3224b55ef12 SHA1 c1d7e2a142806374a185364b85b53360355029f6 SHA256 34be62aae9c75282e41a424589fc6687446b9fe750c722782f01425d9db0bb5a
 EBUILD opal-3.6.8.ebuild 8274 RMD160 7d367f3e5ae3ae9c811130fb5792ccf2c179dcb4 SHA1 407247f8dc3f7ff031217ef992d2fdf7dc54c0e3 SHA256 93081463a9c4938b1a457febb4eca992ca4f552ef4facefd63869503ee9a0748
-MISC ChangeLog 10189 RMD160 96fb1bbb2f0e8f68ba8d734b2961a118ac0eada9 SHA1 69a47577899c6e0927618c0c6361bab6826884d1 SHA256 fe89a19117819bad09fd87e7af0f3124d012b4736c8301231fe97ab9711ffd07
+MISC ChangeLog 10404 RMD160 55fdcebabd2ca83201ea5fa56ead5b28be198f36 SHA1 2eb97f410d558e8725e253802b9bd125f3db0dff SHA256 e6405fdaaa6e7917b4497c57d841ccfa74de34a690384294882c1f03297549a5
 MISC metadata.xml 2128 RMD160 c38412573df4b27a7dcc9e1a60f5b6eddef2c068 SHA1 8f5e7190b9f6c8250de024e260f0e3823ef71b82 SHA256 dc618dd4f5fa978f1f1f273b84ed39d3026d32ee222d2b90d6f3a7a66ff8ff6a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPBLgJAAoJEO/kOhxWD91kab8P/1gRi65jONFaEYWnHSou2D4F
+lO//ihCUEWlJExzzl3HX+G4f9bbtfAR9D9PvcsDpPd8o1B2oLR94rKM8KpljkS6Z
+46uvFeAY3YY+gbWIZXwz0jf2x2LhP0yItWRIJuPuV/4dgbYu08mIlZS9pU71NFGI
+s8nORO2OMbLVwpiZpviZPv2aAupKL7GnDsdWk7r2bIObWKCRnyD9nw31NPwx/oAN
+NeuIesWRpcISLwrP226dklHMhyUfLpO6DxdVWRBLC8LcivGqQYRx238VXZLtBXWc
+HlXehMJ0bBGzOvBYAnlVdRZwNlVDyVoezlaasmJB26D5BFrV/ZBomQSNKHIPA2AU
+whK/+1w/ke57GnRvxnBhgBCIzaeuo5h1gxfZDRaSUQprDnWalBB79ileckKC8Fkq
+FVJ62HsGhkp3ekr7I1DI6RMw//VbgHRZe69NAD6oLo4HekojFfCjYf4DhFo5Gpg2
+bSn2lSEaf6oYLtNDCYk4i1hagiDcKx3iEeqN8vh0ua//DOs6FL/zFsDOh50FPZlO
+pGxW1TkXO/PlRarzmvC8ThIbdPfWmR8Myq7VXGIjagjejp/PQaDMWotAM94SiBKd
+K0R7VJuooGx+h6/OHKg7hkLABDBXE0LZRFS3fnf7B9EGZsoFBGX8vZmTR1s0twNt
+kLBv/fXje/cHqHnKVvAb
+=inJC
+-----END PGP SIGNATURE-----
diff --git a/net-libs/opal/files/opal-3.6.8-lid-plugins-ldflags.patch b/net-libs/opal/files/opal-3.6.8-lid-plugins-ldflags.patch
new file mode 100644
index 000000000000..071c7f066e65
--- /dev/null
+++ b/net-libs/opal/files/opal-3.6.8-lid-plugins-ldflags.patch
@@ -0,0 +1,40 @@
+Fix LID plugin ldflags
+
+https://bugs.gentoo.org/397681
+
+--- plugins/LID/CAPI/Makefile.in
++++ plugins/LID/CAPI/Makefile.in
+@@ -67,7 +67,7 @@
+ OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))
+ 
+ $(PLUGIN): $(OBJECTS)
+-	$(Q_LD)$(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
++	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
+ 
+ install:
+ 	mkdir -p $(DESTDIR)$(libdir)/$(LID_PLUGIN_DIR)
+--- plugins/LID/IxJ/Makefile.in
++++ plugins/LID/IxJ/Makefile.in
+@@ -72,7 +72,7 @@
+ OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))
+ 
+ $(PLUGIN): $(OBJECTS)
+-	$(Q_LD)$(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
++	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
+ 
+ install:
+ 	mkdir -p $(DESTDIR)$(libdir)/$(LID_PLUGIN_DIR)
+--- plugins/LID/VPB/Makefile.in
++++ plugins/LID/VPB/Makefile.in
+@@ -79,9 +79,9 @@
+ 
+ ifeq (solaris,$(findstring solaris,$(target_os)))
+ 
+-	$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
++	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
+ else	
+-	$(Q_LD)$(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)
++	$(Q_LD)$(CC) $(LDFLAGS) $(LDSO) -o $@ $^ $(EXTRALIBS)
+ 
+ endif	
+ 
diff --git a/net-libs/opal/opal-3.6.8-r2.ebuild b/net-libs/opal/opal-3.6.8-r2.ebuild
index 52afa40387af..353c59f6eacb 100644
--- a/net-libs/opal/opal-3.6.8-r2.ebuild
+++ b/net-libs/opal/opal-3.6.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.8-r2.ebuild,v 1.2 2011/05/24 13:30:06 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.8-r2.ebuild,v 1.3 2012/01/04 20:35:06 nirbheek Exp $
 
 EAPI="4"
 
@@ -16,8 +16,8 @@ LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+audio capi celt debug doc dtmf examples fax ffmpeg h224 h281 h323 iax
-ilbc ipv6 ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl stats swig
-theora +video vpb vxml wav x264 x264-static xml"
+ilbc ipv6 ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl static-libs
+stats swig theora +video vpb vxml wav x264 x264-static xml"
 
 REQUIRED_USE="x264-static? ( x264 )
 	h281? ( h224 )"
@@ -26,7 +26,7 @@ RDEPEND=">=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?
 	>=media-libs/speex-1.2_beta
 	fax? ( net-libs/ptlib[asn] )
 	h323? ( net-libs/ptlib[asn] )
-	ivr? ( net-libs/ptlib[xml,vxml] )
+	ivr? ( net-libs/ptlib[http,xml,vxml] )
 	java? ( >=virtual/jre-1.4 )
 	plugins? (
 		media-sound/gsm
@@ -39,7 +39,8 @@ RDEPEND=">=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?
 		theora? ( media-libs/libtheora )
 		x264? (	virtual/ffmpeg
 			media-libs/x264 ) )
-	srtp? ( net-libs/libsrtp )"
+	srtp? ( net-libs/libsrtp )
+	vxml? ( net-libs/ptlib[http,vxml] )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=sys-devel/gcc-3
@@ -88,6 +89,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${P}-build-fix.patch #343041
 	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}-lid-plugins-ldflags.patch #397681
 
 	# h224 really needs h323 ?
 	# TODO: get a confirmation in ml
@@ -227,6 +229,12 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
+	# Get rid of static libraries if not requested
+	# There seems to be no easy way to disable this in the build system
+	if ! use static-libs; then
+		rm -v "${D}"/usr/lib*/*.a || die
+	fi
+
 	if use doc; then
 		dohtml -r "${WORKDIR}"/html/* docs/* || die "dohtml failed"
 	fi