Respect LDFLAGS, #335716 thank Diego Elio Pettenò for report. Add missing dep, #352950,thank Nikoli for report and all this job.

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

4 files changed, 95 insertions, 23 deletions

diff --git a/net-im/psimedia/ChangeLog b/net-im/psimedia/ChangeLog
index f0cb28dff62e..1f3998f51c15 100644
--- a/net-im/psimedia/ChangeLog
+++ b/net-im/psimedia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/psimedia
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/ChangeLog,v 1.14 2010/11/06 19:04:49 halcy0n Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/ChangeLog,v 1.15 2011/02/01 06:34:35 pva Exp $
+
+*psimedia-1.0.3-r1 (01 Feb 2011)
+
+  01 Feb 2011; Peter Volkov <pva@gentoo.org> +psimedia-1.0.3-r1.ebuild:
+  Respect LDFLAGS, #335716 thank Diego Elio Pettenò for report. Add missing
+  dep, #352950,thank Nikoli for report and all this job.
 
   06 Nov 2010; Mark Loeser <halcy0n@gentoo.org> psimedia-1.0.3.ebuild:
   Stable for ppc64; bug #322353
diff --git a/net-im/psimedia/Manifest b/net-im/psimedia/Manifest
index 02cb9b57f2e9..59bdaac87b4f 100644
--- a/net-im/psimedia/Manifest
+++ b/net-im/psimedia/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST psimedia-1.0.3.tar.bz2 236134 RMD160 c5c13cdd1606e38f75852ea134478ee3d2d449a2 SHA1 75428d427227ffa87ca40d7e29567a2d410fb9ff SHA256 019d18034fa94299d896448841d129fd1bad5f58daeb2aba7be540a7d06fb23b
+EBUILD psimedia-1.0.3-r1.ebuild 1858 RMD160 c04c95a965613d36ef29cb527fab179849c22904 SHA1 41002ccd8fa5d114a7aa1984b1532a5c1039c1d5 SHA256 7924361f1f6eb3b3b73e9ec1e60ce6dd2713b6aa958b16189da7a09db3e5c044
 EBUILD psimedia-1.0.3.ebuild 1790 RMD160 a19afa89956282851bbb44c6725c0f88e345a9e2 SHA1 db9e646a9b9d627e5b07ba6b5c94d5f3b2c96d1a SHA256 b68c8b5f9a5b2d8ac75b64db54efb98cf0d0e62935972376c91ef70bb5f31a9b
-MISC ChangeLog 1907 RMD160 74dc67d32d7c31ca1ea42b5f2df2a3521e3feb70 SHA1 218dd81bd626371e83dba99c499660abb179ec3b SHA256 de7bd5523a36a07ed664582ac4bb7fe729bdabfd343a7f0ee1db35370ea3123a
-MISC metadata.xml 328 RMD160 9e67dd62170b393da8a9957e1531e20e339ce525 SHA1 b1a3668bc9a5b0a51e4a57d2dc86583cf79d3662 SHA256 e90811663b9dad76cf6ef9fb86d9449dd3b0e86ac2edb961513ce3e39ce12274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzVptcACgkQCRZPokWLroQQOwCdHcdK2oNFMFs7/F+0rDfVr774
-RM0An0SGI6pfWFAT+Im4lMc28Fn0dayN
-=hQbk
------END PGP SIGNATURE-----
+MISC ChangeLog 2144 RMD160 069672601eb6f971593a55b478cd0121f2e95ee0 SHA1 c9f1f3286c033a83e2323506b2ab6410c69bad9a SHA256 1a62b5e78d7d56db8257a8d9ca2b0bab98f17adbfe9837f1aff87c66f082295a
+MISC metadata.xml 396 RMD160 9eb1165592bbcc58bae1d5679427bc820c9792e2 SHA1 5ee7920f2fbd2d748ca0864b48e6fd6416c3135e SHA256 cbd143bdce40949837ccb6d7e405f8e9ae3cd0370fc4afde0e6f3e08b39a9966
diff --git a/net-im/psimedia/metadata.xml b/net-im/psimedia/metadata.xml
index dba2b972fc66..5e34ba6154cc 100644
--- a/net-im/psimedia/metadata.xml
+++ b/net-im/psimedia/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
-	<maintainer>
-		<email>pva@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name='demo'>
-		    build simple test application for the PsiMedia system.
-		</flag>
-	</use>
+<herd>net-im</herd>
+<maintainer>
+  <email>pva@gentoo.org</email>
+</maintainer>
+<maintainer>
+  <email>nikoli@lavabit.com</email>
+  <name>Nikoli</name>
+</maintainer>
+<use>
+	<flag name='demo'>build simple test application for the PsiMedia system</flag>
+</use>
 </pkgmetadata>
diff --git a/net-im/psimedia/psimedia-1.0.3-r1.ebuild b/net-im/psimedia/psimedia-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..08850917ddd8
--- /dev/null
+++ b/net-im/psimedia/psimedia-1.0.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/psimedia-1.0.3-r1.ebuild,v 1.1 2011/02/01 06:34:35 pva Exp $
+
+EAPI="2"
+
+inherit eutils qt4-r2 multilib
+
+DESCRIPTION="Psi plugin for voice/video calls"
+HOMEPAGE="http://delta.affinix.com/psimedia/"
+SRC_URI="http://delta.affinix.com/download/psimedia/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="demo"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18
+	>=media-libs/gstreamer-0.10.22
+	>=media-libs/gst-plugins-base-0.10.22
+	media-libs/gst-plugins-good
+	>=dev-libs/liboil-0.3
+	>=x11-libs/qt-gui-4.4:4
+	>=media-libs/speex-1.2_rc1
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-speex
+	>=media-plugins/gst-plugins-vorbis-0.10.22
+	>=media-plugins/gst-plugins-theora-0.10.22
+	>=media-plugins/gst-plugins-alsa-0.10.22
+	>=media-plugins/gst-plugins-ogg-0.10.22
+	>=media-plugins/gst-plugins-v4l-0.10.22
+	media-plugins/gst-plugins-v4l2
+	media-plugins/gst-plugins-jpeg
+	!<net-im/psi-0.13_rc1
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+"
+
+
+src_prepare() {
+	sed -e '/^TEMPLATE/a CONFIG += ordered' -i psimedia.pro || die
+	# Don't build demo if we don't need that.
+	use demo || { sed -e '/^SUBDIRS[[:space:]]*+=[[:space:]]*demo[[:space:]]*$/d;' -i psimedia.pro || die; }
+}
+
+src_configure() {
+	# qconf generaged configure script...
+	./configure || die
+
+	eqmake4
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/psi/plugins
+	doins gstprovider/libgstprovider.so || die
+
+	if use demo; then
+		exeinto /usr/$(get_libdir)/${PN}
+		newexe demo/demo ${PN} || die
+
+		# Create /usr/bin/psimedia
+		cat <<-EOF > "demo/${PN}"
+		#!/bin/bash
+
+		export PSI_MEDIA_PLUGIN=/usr/$(get_libdir)/psi/plugins/libgstprovider.so
+		/usr/$(get_libdir)/${PN}/${PN}
+		EOF
+
+		dobin demo/${PN} || die
+	fi
+}