Fixed CFLAGS pollution (-g), bug #361449 thank Agostino Sarubbo (amd64 AT) for report.

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

3 files changed, 82 insertions, 12 deletions

diff --git a/net-im/psimedia/ChangeLog b/net-im/psimedia/ChangeLog
index dc42f62b5446..e02acfb754c8 100644
--- a/net-im/psimedia/ChangeLog
+++ b/net-im/psimedia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/psimedia
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/ChangeLog,v 1.16 2011/03/31 07:46:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/ChangeLog,v 1.17 2011/04/01 14:24:13 pva Exp $
+
+*psimedia-1.0.3-r2 (01 Apr 2011)
+
+  01 Apr 2011; Peter Volkov <pva@gentoo.org> +psimedia-1.0.3-r2.ebuild:
+  Fixed CFLAGS pollution (-g), bug #361449 thank Agostino Sarubbo (amd64 AT)
+  for report.
 
   31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> psimedia-1.0.3-r1.ebuild,
   +files/psimedia-1.0.3-linux-headers-2.6.38.patch:
diff --git a/net-im/psimedia/Manifest b/net-im/psimedia/Manifest
index 84d8276e1fe5..8e0842cad588 100644
--- a/net-im/psimedia/Manifest
+++ b/net-im/psimedia/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX psimedia-1.0.3-linux-headers-2.6.38.patch 2121 RMD160 3d4bc8d04866545f653d1e046b8aaffb231c4395 SHA1 858676241058e3c050315f92afef26fbc6430bf2 SHA256 1c07814003bf749dcd01b580546077d87573c4b947ae2b6f2176318790546036
 DIST psimedia-1.0.3.tar.bz2 236134 RMD160 c5c13cdd1606e38f75852ea134478ee3d2d449a2 SHA1 75428d427227ffa87ca40d7e29567a2d410fb9ff SHA256 019d18034fa94299d896448841d129fd1bad5f58daeb2aba7be540a7d06fb23b
 EBUILD psimedia-1.0.3-r1.ebuild 1969 RMD160 087d0b2ce455cf25f1ef7c126eea7ef739bbe6f9 SHA1 ebaee1fb3caef9a5a7cf0e19193fb33c05170d89 SHA256 69376fbdd1c2462865a48d5dada518cc6ab44b41775adca001355f46e0873c29
+EBUILD psimedia-1.0.3-r2.ebuild 1988 RMD160 74d11a155acc6dc6d5fab464c23df7536f4cb0e2 SHA1 92514c732bb8a2d0800db8425098446661772d15 SHA256 30a5f556aa17b7fdcf064fcb8574a4872773ed0f53d0b47e32a11acb741abaac
 EBUILD psimedia-1.0.3.ebuild 1751 RMD160 b6ddebd01c8ac6572111d550d0f3797653adc07b SHA1 a548120dee82186f92ddba54055ac4c26ad2f1de SHA256 596c280f4684ed867296e8cd374679df226e28dfc4e3ad972c4a80c057f4d13f
-MISC ChangeLog 2377 RMD160 6e6dd27ecac9705a858c2ba8be5c919019b2e364 SHA1 a1bf4ad00e31c7512675f06eb258e98d4fa2f931 SHA256 45ee87947fc9bf42e8f2a1c469f74ff0fbc44733c28e81f25586982bdf1f8bb2
+MISC ChangeLog 2569 RMD160 319aac4de1c79f4e88b13a0d54b6a5059472c5df SHA1 4ee7078b276e9f7cd9e64ea867cfbc8aae1f80d4 SHA256 8c2a55a8456a04e924a851d0c8e7f632060bb612bf8901a5d6f428fffed71291
 MISC metadata.xml 396 RMD160 9eb1165592bbcc58bae1d5679427bc820c9792e2 SHA1 5ee7920f2fbd2d748ca0864b48e6fd6416c3135e SHA256 cbd143bdce40949837ccb6d7e405f8e9ae3cd0370fc4afde0e6f3e08b39a9966
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk2UMZgACgkQXkR9YqOcLPF8mgD/YnAfhiDgCjjeUfidvsEDXOoG
-lG5WJFGCnZvFWRVhJy8BAKP7dlQ7ltR/mbDZ2ZOvuyO7oai/9H6wUm4Fy/RBBtw5
-=ubV9
------END PGP SIGNATURE-----
diff --git a/net-im/psimedia/psimedia-1.0.3-r2.ebuild b/net-im/psimedia/psimedia-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..5d2fb609ec39
--- /dev/null
+++ b/net-im/psimedia/psimedia-1.0.3-r2.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-r2.ebuild,v 1.1 2011/04/01 14:24:13 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-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; }
+	# Remove support for V4L v1 because linux-headers-2.6.38 stopped shipping linux/videodev.h.
+	epatch "${FILESDIR}"/${P}-linux-headers-2.6.38.patch
+}
+
+src_configure() {
+	# qconf generaged configure script...
+	./configure --no-separate-debug-info || 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
+}