Revision bump: fix pkgconfig file generation, respect lib directory, wrt bug #496430. Thanks to Nikoli <nikoli AT gmx.us> for discovering this issues

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 153 insertions, 10 deletions

diff --git a/net-libs/pjsip/ChangeLog b/net-libs/pjsip/ChangeLog
index a3ac0c5729ba..4015aa471dfb 100644
--- a/net-libs/pjsip/ChangeLog
+++ b/net-libs/pjsip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/pjsip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/ChangeLog,v 1.14 2013/06/17 07:19:34 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/ChangeLog,v 1.15 2013/12/31 10:15:54 pinkbyte Exp $
+
+*pjsip-2.1-r2 (31 Dec 2013)
+
+  31 Dec 2013; Sergey Popov <pinkbyte@gentoo.org> +pjsip-2.1-r2.ebuild,
+  +files/pjsip-2.1-multilib.patch:
+  Revision bump: fix pkgconfig file generation, respect lib directory, wrt bug
+  #496430. Thanks to Nikoli <nikoli AT gmx.us> for discovering this issues
 
 *pjsip-2.1-r1 (17 Jun 2013)
 
diff --git a/net-libs/pjsip/Manifest b/net-libs/pjsip/Manifest
index 9aa3aecf77c5..91f4b09b51dd 100644
--- a/net-libs/pjsip/Manifest
+++ b/net-libs/pjsip/Manifest
@@ -1,22 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pjsip-2.1-multilib.patch 2061 SHA256 75d3a78b10c5012ad54b82625b64e71e9c3800bd4135f2c1784f6c1a789616e0 SHA512 bc347219914c562bb8e4d758f824e0289b9ec22ebc786872519ccdf2366d90680c4b10e13e191ed999f1b32664bbb98bc56196aec163b95e607b8b452b341c14 WHIRLPOOL 032b5d7b1497257889919ccb10b13913a5dc447f60e0e14eb175e02fd39aea7073998f6158ab837bfeb7c7dec32c0ec77b4c8b41b891f7e30b56f574ed1e53e8
 AUX pjsip-2.1-new-ffmpeg-workaround.patch 380 SHA256 8a288b0e80a176446fcb3a7ac3a590370d32ff2c36d814a9df7d0663b73858b8 SHA512 e431170adfd8364e0547bde13bf0ab6e0e8b289fd26d23add08bb15776f342d4b0d5a6de0d694ca5a841225825a1465073b33b130921837e8183b3f410a12222 WHIRLPOOL 3ebdd6a87599e0807d7848332d0a7e1ec8d25fbcc905a616a942423a862360e6e1d7724bfa0f774052ea7ba1dd9f4947167591a831b63f9476d322b03f624804
 DIST pjproject-1.14.tar.bz2 3861992 SHA256 d5e394c08572231e68866c86697cef9d86ecc4d9b873705fa5e5ae56817d0656 SHA512 885802f2d8ab314c4bf62678162c6bc7c830e1279c5df2888c16fc65c698e26ae7190f2736917c289d4430e5675e865c15e9dce0843542344d8084197238bb46 WHIRLPOOL 24fb5644a811f283dac1330b842166167655ae5c1715da938fe36f46008ae4c43d30d8abe13dc3a5f08aafefd1d9ffe78f40f8cf4ae319d29c7690557e01a131
 DIST pjproject-2.1.tar.bz2 4111835 SHA256 ac86d2401e1cb4a4f0207e4fd58921f869d0b5ee65a26aa438039a107ba415a5 SHA512 a31c33fb45b074bb43ecf8f579d140cf2d7fe2d508edad5643a9124e7e85dc50e1ecc860e2e52ca42e82c92121b08e7e3691b5dd99db844b21749e03afbc2f94 WHIRLPOOL 5363b206186d08e9446ca4c0cf8bbe668816944cfc06c7e0f30cdbeccfae0771813dbc02aa2151fa185a508e3a1b86a22a1e0126f13b965282ce036f31e9fd08
 EBUILD pjsip-1.14.ebuild 2753 SHA256 40ce41f4a03aab3620dc4fed86475513fab4a5f9b40f90e9ba9d214fa5024bfb SHA512 8f8318986bdfd87fd6fde8f21c514a0eb7473b6d3b07fb836afd9512396601eceee37747ee40d39a9399629c983b971a604438ed5e87d7955b2afb3801a7da09 WHIRLPOOL 64066da9433df887b2554e430e815eb2fa89172ff76c22663cbe1ee490c88dbe45bb6a284d2936c4e4b7ea4fadc165a75aaa7f8db109dec38801e773db534e72
 EBUILD pjsip-2.1-r1.ebuild 1990 SHA256 c4fe4d01ea468a59ead9c9a86ad968e501fd967147db903f1f781e52c4c8114e SHA512 7c8e473c64a62deb70f7a83ddbdeb280802dc411aa0180c2f595a3e22c2b439759a56185cd8e7114a18cb1dde91f51b02de176b9c3d6b5e621713743a2f28728 WHIRLPOOL a94a7a6b9655404150a2aae7989612cd5aeb3dc2bc6f6be6fae2d612e5cecb53c0972583ee35c6325cbcc29e7b9eb008bf1af4aca23e9fa6e0b144e19e198a40
+EBUILD pjsip-2.1-r2.ebuild 2047 SHA256 d4571efce1baf0b6fb34e6b72d899d45a77c05fabef311be542a1778da1bb230 SHA512 8b67a299983639d3531284dab793c940e2b7c175f74d34a36e13d6516ad468ab0549ee28a5b2d8f49bcdd1ae6f457c720f2f7cc3e909a656a63a9c9ff33c90b2 WHIRLPOOL 22df1560d2d86c45ba7ee069b897c67fec9f0f5c4aa708aa865fc12cc270b16bd680150b3cda4d9a3f46d5b555133e4e52d213ebe38be5bb89093b9eeb72eaf7
 EBUILD pjsip-2.1.ebuild 1954 SHA256 1d01f240117de30662451812f6d9892972b1e50e23a4a1cbb53ed3ea7dbfe84f SHA512 8139fcac23beb604e0ef424dc846005b8bc22c10707ce53dda181444a70f3a7ae5899af43a9bf32153d6430cb853a64a499d8746eefe1935f4a5737179372dac WHIRLPOOL 8dc1ad929ac713619f619287aa59ca2e1d4f93490e6b29d342b91424d2358be9daafd4d1fd77fd49139f182408c13246389f180c3e8f05d31208b2b5c3c23637
-MISC ChangeLog 1961 SHA256 7e0669064ef13aa55ee6c410a0ae43c2be9d1fd148a4707a3250b098beb5c58e SHA512 6b0f968ef0e3db1040bd3748dcd0bb03fa0ae32b36162c6e173f3ee53e8a59814d6f63e1543afe34718a56f7d68fd7ec999259948cca946605b12f68470f0241 WHIRLPOOL d58093dfde908113d2c459a7afaa92895e76e2aa89bc4f0c8f53df1d5f8766284a4d6716b0f9d4c25e71d5d81e26baa94cccecd06e4c76f13d5176a44ece60b4
+MISC ChangeLog 2252 SHA256 e48cc27e237a2ed51f692ab2517516f3220748aa7a63b848a2082d2eae8936f1 SHA512 b6f8699690bcbf0208cd4b6877b57f561e02599fa588dcbce9d40b91947d219744e97e215bed4e504e03cba9b06baba9047317cabb9e9f1e535dd7d8e984da71 WHIRLPOOL 9476a9ee24ff3bce3f1f19ec1e78008416526f01c1fa9d9b6d3880b7397602dc5c7493cd20532586f0c8f653a5ff939b1f9046e055de9d70119ff2669390d65d
 MISC metadata.xml 902 SHA256 7d33c28a8c43039e371c9a519da699a4d7a07d701b8b4d09fb4f260b1da8e4ae SHA512 e9d07891cb7595bc13a15bacd52ac874f2e4f5fc4e983dea9c9b00c61fdc6641b1a24748baeac294e5508fe500f5840c13d6b96b6e67ac1ed1663589273d7282 WHIRLPOOL afeb81ec264b366bd5b9c0a1c88ab80a8aa4cde63ad0c42482bcb30ac4346b4c4a7d6fe217cba7efd1cd5576a4f511129dd42a529b92d596d2ae023ebf0320a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRvrj+AAoJECo/aRed9267jfcIAJoPan7rI7Plk1PP0G025WzR
-ABOMy0EzAhaREI91HyGhuo23D0PnbNdnKkLPHK73/5ACJgh/u9+aQKTxEQVDPP28
-jOKshiz/PRYIQGydA1EjggdHjAmTvL1zL9+4Lrnif7jl9mHo4iCUXryQtQMn1LDv
-CVwl/LFyiTjrKuN25JD5+BzOp9MuXwB/75MyK1etH9oZ69AwhejhwPR0nZ2z73Nh
-cmjPTbznGBY9PZEVVWSaFI1u3vwIY3kGjpbAR6iQ+omAZK8iHgLeVU/CqpzObjaa
-8YntKsDNpJzoHPFx8itP+aRuoYu49KcNi4muxl40U6GrVZ12NWlOkiR9pRieuIk=
-=gpm6
+iQEcBAEBCAAGBQJSwplbAAoJECo/aRed9267CvEH/3hk6hN/dDii20jL0aHSrejC
+c4aN0NoU/ezO9syKiGZSDslbn8g85pR14ZyCGck6XI/Z2dHvsItjB9Pul9tOHkxu
+XVLb5UuwynK/mmzO3fOZS6wrMuBK2RkuNU2SzD/AL2yevFpVaWOn4SQfJBChAtOA
+W+SsDX3fUo8GG+cT1JGRCCBR6Yef50Mukbw+8exChC8K5sUjnGYqak3B+UWbLNHU
+WL98tLFUc3WcLEB+htNiKpwUhDb1Yg+Swa6mZXTxTtGl2Jrh+Y0fz1g0xHPcjs1i
+DJDlqgVhdVOgQIhiTnNJV2+5XNs84syxsuSJww3wAFayFbWYU+4WCko4Vt3Yy44=
+=cVgb
 -----END PGP SIGNATURE-----
diff --git a/net-libs/pjsip/files/pjsip-2.1-multilib.patch b/net-libs/pjsip/files/pjsip-2.1-multilib.patch
new file mode 100644
index 000000000000..101476c362b6
--- /dev/null
+++ b/net-libs/pjsip/files/pjsip-2.1-multilib.patch
@@ -0,0 +1,49 @@
+Buildsystem fixes for proper respecting multilib-aware systems
+
+Gentoo bugreport: https://bugs.gentoo.org/show_bug.cgi?id=496430
+
+--- Makefile.orig	2012-03-22 15:15:59.000000000 +0400
++++ Makefile	2013-12-31 13:50:16.434307159 +0400
+@@ -108,14 +108,15 @@
+ prefix = $(ac_prefix)
+ 
+ install:
+-	mkdir -p $(DESTDIR)$(prefix)/lib
+-	cp -f $(APP_LIB_FILES) $(DESTDIR)$(prefix)/lib/
++	mkdir -p $(DESTDIR)$(PJ_INSTALL_LIB_DIR)
++	cp -f $(APP_LIB_FILES) $(DESTDIR)$(PJ_INSTALL_LIB_DIR)/
+ 	mkdir -p $(DESTDIR)$(prefix)/include
+ 	for d in pjlib pjlib-util pjnath pjmedia pjsip; do \
+ 		cp -RLf $$d/include/* $(DESTDIR)$(prefix)/include/; \
+ 	done
+-	mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
+-	sed -e "s!@PREFIX@!$(DESTDIR)$(prefix)!" libpjproject.pc.in | \
++	mkdir -p $(DESTDIR)$(PJ_INSTALL_LIB_DIR)/pkgconfig
++	sed -e "s!@PREFIX@!$(prefix)!" libpjproject.pc.in | \
++		sed -e "s!@LIBDIR@!$(PJ_INSTALL_LIB_DIR)!" | \
+ 		sed -e "s/@PJ_VERSION@/$(PJ_VERSION)/" | \
+ 		sed -e "s!@PJ_LDLIBS@!$(PJ_LDLIBS)!" | \
+-		sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)/$(prefix)/lib/pkgconfig/libpjproject.pc
++		sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)/$(PJ_INSTALL_LIB_DIR)/pkgconfig/libpjproject.pc
+--- libpjproject.pc.in.orig	2013-12-31 13:51:08.459302831 +0400
++++ libpjproject.pc.in	2013-12-31 13:51:16.857302132 +0400
+@@ -2,7 +2,7 @@
+ 
+ prefix=@PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: libpjproject
+--- build.mak.in.orig	2013-12-31 13:52:22.492296672 +0400
++++ build.mak.in	2013-12-31 13:52:06.722297984 +0400
+@@ -163,7 +163,7 @@
+ # library from the install location (i.e. --prefix)
+ export PJ_INSTALL_DIR := @prefix@
+ export PJ_INSTALL_INC_DIR := $(PJ_INSTALL_DIR)/include
+-export PJ_INSTALL_LIB_DIR := $(PJ_INSTALL_DIR)/lib
++export PJ_INSTALL_LIB_DIR := @libdir@
+ export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1	@CFLAGS@
+ export PJ_INSTALL_CXXFLAGS := $(PJ_INSTALL_CFLAGS)
+ export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(APP_LDLIBS)
diff --git a/net-libs/pjsip/pjsip-2.1-r2.ebuild b/net-libs/pjsip/pjsip-2.1-r2.ebuild
new file mode 100644
index 000000000000..cc367ca8877f
--- /dev/null
+++ b/net-libs/pjsip/pjsip-2.1-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/pjsip-2.1-r2.ebuild,v 1.1 2013/12/31 10:15:54 pinkbyte Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Multimedia communication libraries written in C language for building VoIP applications"
+HOMEPAGE="http://www.pjsip.org/"
+SRC_URI="http://www.pjsip.org/release/${PV}/pjproject-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cli doc examples ext-sound ffmpeg g711 g722 g7221 gsm ilbc l16 oss python speex"
+#small-filter large-filter speex-aec ssl
+
+DEPEND="alsa? ( media-libs/alsa-lib )
+	ffmpeg? ( virtual/ffmpeg )
+	gsm? ( media-sound/gsm )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	speex? ( media-libs/speex )"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/pjproject-${PV}.0"
+
+src_prepare() {
+	# bug #469582
+	epatch "${FILESDIR}/${P}-new-ffmpeg-workaround.patch"
+	# bug #496430
+	epatch "${FILESDIR}/${P}-multilib.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	# Disable through portage available codecs
+	econf --disable-gsm-codec \
+		--disable-speex-codec \
+		--disable-ilbc-codec \
+		--disable-speex-aec \
+		$(use_enable alsa sound) \
+		$(use_enable oss) \
+		$(use_enable ext-sound) \
+		$(use ffmpeg || echo '--disable-ffmpeg') \
+		$(use_enable g711 g711-codec) \
+		$(use_enable l16 l16-codec) \
+		$(use_enable g722 g722-codec) \
+		$(use_enable g7221 g7221-codec)
+		#$(use_enable small-filter) \
+		#$(use_enable large-filter) \
+		#$(use_enable speex-aec) \
+		#$(use_enable ssl tls) #broken? sflphone doesn't compile if enabled or disabled
+}
+
+src_compile() {
+	emake dep
+	emake -j1
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	if use cli; then
+		newbin pjsip-apps/bin/pjsua* pjsua
+	fi
+
+	if use python; then
+		pushd pjsip-apps/src/python
+		python setup.py install --prefix="${D}/usr/"
+		popd
+	fi
+
+	if use doc; then
+		dodoc README.txt README-RTEMS
+	fi
+
+	if use examples; then
+		docinto examples
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc pjsip-apps/src/samples/*
+	fi
+}