Fix pax-marking of multilib gst-plugin-scanner

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 29 insertions, 7 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index 7b369b20e801..23c71a4963ac 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/gstreamer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.368 2014/06/10 18:32:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.369 2014/06/16 10:25:36 tetromino Exp $
+
+*gstreamer-1.2.4-r2 (16 Jun 2014)
+*gstreamer-0.10.36-r2 (16 Jun 2014)
+
+  16 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gstreamer-0.10.36-r1.ebuild, +gstreamer-0.10.36-r2.ebuild,
+  -gstreamer-1.2.4-r1.ebuild, +gstreamer-1.2.4-r2.ebuild:
+  Fix pax-marking of multilib gst-plugin-scanner
 
 *gstreamer-1.2.4-r1 (10 Jun 2014)
 *gstreamer-0.10.36-r1 (10 Jun 2014)
diff --git a/media-libs/gstreamer/gstreamer-0.10.36-r1.ebuild b/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild
index e9b3fbd91a12..0b91e4f8b9d1 100644
--- a/media-libs/gstreamer/gstreamer-0.10.36-r1.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.36-r1.ebuild,v 1.1 2014/06/10 18:32:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild,v 1.1 2014/06/16 10:25:36 tetromino Exp $
 
 EAPI=5
 
@@ -91,6 +91,14 @@ multilib_src_configure() {
 	fi
 }
 
+multilib_src_install() {
+	# can't do "default", we want to install docs in multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
 multilib_src_install_all() {
 	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
 	einstalldocs
@@ -108,6 +116,5 @@ multilib_src_install_all() {
 	prune_libtool_files --modules
 
 	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}" \
-		"${ED}usr/libexec/gstreamer-${SLOT}/gst-plugin-scanner"
+	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
 }
diff --git a/media-libs/gstreamer/gstreamer-1.2.4-r1.ebuild b/media-libs/gstreamer/gstreamer-1.2.4-r2.ebuild
index 27f10af3a5cc..7f73c1c96ea5 100644
--- a/media-libs/gstreamer/gstreamer-1.2.4-r1.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.2.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-1.2.4-r1.ebuild,v 1.1 2014/06/10 18:32:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-1.2.4-r2.ebuild,v 1.1 2014/06/16 10:25:36 tetromino Exp $
 
 EAPI="5"
 
@@ -72,12 +72,19 @@ multilib_src_configure() {
 	fi
 }
 
+multilib_src_install() {
+	# can't do "default", we want to install docs in multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
 multilib_src_install_all() {
 	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
 	einstalldocs
 	prune_libtool_files --modules
 
 	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}" \
-		"${ED}usr/libexec/gstreamer-${SLOT}/gst-plugin-scanner"
+	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
 }