remove static useflag, backport patch from upstream to fix #152798

(Portage version: 2.1.2_pre3-r8)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 51 deletions

diff --git a/gnome-extra/nautilus-cd-burner/Manifest b/gnome-extra/nautilus-cd-burner/Manifest
index f67a68d994c7..dcc9ac8293ae 100644
--- a/gnome-extra/nautilus-cd-burner/Manifest
+++ b/gnome-extra/nautilus-cd-burner/Manifest
@@ -1,3 +1,7 @@
+AUX nautilus-cd-burner-2.16.1-make_iso_c.patch 1341 RMD160 1313d93b45968ea1f19dc5ce88c58905923fba02 SHA1 594b51fc6bb1bd0e1ad021784d9064c10a3d485f SHA256 8f4331b8986fd034b2d25cfb733e1e4ca343c456474ec0f8a8e76ef3648e7ea7
+MD5 1516af1f818240afe62f82cfedb7d2d6 files/nautilus-cd-burner-2.16.1-make_iso_c.patch 1341
+RMD160 1313d93b45968ea1f19dc5ce88c58905923fba02 files/nautilus-cd-burner-2.16.1-make_iso_c.patch 1341
+SHA256 8f4331b8986fd034b2d25cfb733e1e4ca343c456474ec0f8a8e76ef3648e7ea7 files/nautilus-cd-burner-2.16.1-make_iso_c.patch 1341
 DIST nautilus-cd-burner-2.12.3.tar.bz2 615109 RMD160 05c34312d794b1cfeb3df07618a84e276aa86d8e SHA1 b6f763f4cab664ad68fa20943c62a60915121775 SHA256 174806266488be5b56f1ec6b89ebe0b017dd96f72c6233398670d2f12ea03786
 DIST nautilus-cd-burner-2.14.2.tar.bz2 679714 RMD160 c491dbcd3e281877d1fbf0ba84186d326a75c6a0 SHA1 75d2e43f8d3df2f2ea8eb30b1c694e5bea84b094 SHA256 71defc9add32d83d2233e6265514de53b5fcd714b3b8889f2e7c4f9a2494c21d
 DIST nautilus-cd-burner-2.16.1.tar.bz2 703744 RMD160 bccc2b7513e71c0c15195628c4dfceeaebe5d1f3 SHA1 541e4b7763c26a574970496d2ac1b865248a126d SHA256 5cc224a8dfb3bbe005f06ac6b9466e4b97bde122c5db8064b25f663e3dac8e2e
@@ -9,14 +13,14 @@ EBUILD nautilus-cd-burner-2.14.2.ebuild 984 RMD160 c0462b5ca65c481118437c4b59a12
 MD5 4ff03017441d5410a8500cabf9715d35 nautilus-cd-burner-2.14.2.ebuild 984
 RMD160 c0462b5ca65c481118437c4b59a12c9ecad9d448 nautilus-cd-burner-2.14.2.ebuild 984
 SHA256 0321775fbd50059f77a5279ab5f075469242957ca9ee784896cfbc5727c21f4d nautilus-cd-burner-2.14.2.ebuild 984
-EBUILD nautilus-cd-burner-2.16.1.ebuild 1043 RMD160 50204af24ce5d3e02d9b3228ac9f62a02f1fb4da SHA1 672a128a519580733bbb4400afd426859a7743d3 SHA256 da52bb025b9ee026d4099184287a6d957c4055402416ed5d56ff4118c3d5415f
-MD5 5d33c47490a00ba4849ce70b5f3468f4 nautilus-cd-burner-2.16.1.ebuild 1043
-RMD160 50204af24ce5d3e02d9b3228ac9f62a02f1fb4da nautilus-cd-burner-2.16.1.ebuild 1043
-SHA256 da52bb025b9ee026d4099184287a6d957c4055402416ed5d56ff4118c3d5415f nautilus-cd-burner-2.16.1.ebuild 1043
-MISC ChangeLog 18930 RMD160 a9aa44c2e9d574db738e18162961a4863eb04d04 SHA1 1669115a824fb90a3ee4e8e4f0fe08a28f9b94a2 SHA256 62ea003111c16094406fa31cc6cbd6db7769efdeab24824133c16a95ab3df735
-MD5 f49388292b84c141cb2557874fe90837 ChangeLog 18930
-RMD160 a9aa44c2e9d574db738e18162961a4863eb04d04 ChangeLog 18930
-SHA256 62ea003111c16094406fa31cc6cbd6db7769efdeab24824133c16a95ab3df735 ChangeLog 18930
+EBUILD nautilus-cd-burner-2.16.1-r1.ebuild 1129 RMD160 9dc8521d45e5ec098a7e283c50339f23f75920eb SHA1 8a25fb84257a108b0b1684f73b5ce180eaf16ef8 SHA256 dbf9a2bc8d10524cd8fb0609372bbda6e0a0cd61f075da0d7f081ac882094dd3
+MD5 4231f338955325861b48b1596a4a16f9 nautilus-cd-burner-2.16.1-r1.ebuild 1129
+RMD160 9dc8521d45e5ec098a7e283c50339f23f75920eb nautilus-cd-burner-2.16.1-r1.ebuild 1129
+SHA256 dbf9a2bc8d10524cd8fb0609372bbda6e0a0cd61f075da0d7f081ac882094dd3 nautilus-cd-burner-2.16.1-r1.ebuild 1129
+MISC ChangeLog 19230 RMD160 19e315d64cf7146870dedbae384a315aa8451190 SHA1 a9af53265c096e21ff0b56288bf672cad414a330 SHA256 ab4cb5374c0a3c88c120ea12c10c0ffa7b1ddc0e990dd63560eeb4a8a6ab937e
+MD5 8707a1e6aa54692a0ef24695817dbf73 ChangeLog 19230
+RMD160 19e315d64cf7146870dedbae384a315aa8451190 ChangeLog 19230
+SHA256 ab4cb5374c0a3c88c120ea12c10c0ffa7b1ddc0e990dd63560eeb4a8a6ab937e ChangeLog 19230
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -27,6 +31,6 @@ SHA256 ee5ffdd52cfef4c826ea04f345988136dca27f204b25e57709842e35a982bbb6 files/di
 MD5 fb8588af186d9af56bf02285be7253d3 files/digest-nautilus-cd-burner-2.14.2 280
 RMD160 089672639c6de51a754b630dce5ab1a010de6ded files/digest-nautilus-cd-burner-2.14.2 280
 SHA256 daae505f3e73167a7c921ec2c99c3ced67fd0678d3cd8f3fe38c65b02805de85 files/digest-nautilus-cd-burner-2.14.2 280
-MD5 36a3ab566070f924b7f2f2b024146c2f files/digest-nautilus-cd-burner-2.16.1 280
-RMD160 b21b24d1e4441377cd94977f9c4826cd005ccdf8 files/digest-nautilus-cd-burner-2.16.1 280
-SHA256 ac5481c3d948a0b98030613c4e5ae892d0bda66faee1f69aafeecdb3f344976c files/digest-nautilus-cd-burner-2.16.1 280
+MD5 36a3ab566070f924b7f2f2b024146c2f files/digest-nautilus-cd-burner-2.16.1-r1 280
+RMD160 b21b24d1e4441377cd94977f9c4826cd005ccdf8 files/digest-nautilus-cd-burner-2.16.1-r1 280
+SHA256 ac5481c3d948a0b98030613c4e5ae892d0bda66faee1f69aafeecdb3f344976c files/digest-nautilus-cd-burner-2.16.1-r1 280
diff --git a/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.16.1 b/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.16.1
deleted file mode 100644
index 50655748e2a0..000000000000
--- a/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.16.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f64e98c9b3d3a21cb54dc4d4d3983de2 nautilus-cd-burner-2.16.1.tar.bz2 703744
-RMD160 bccc2b7513e71c0c15195628c4dfceeaebe5d1f3 nautilus-cd-burner-2.16.1.tar.bz2 703744
-SHA256 5cc224a8dfb3bbe005f06ac6b9466e4b97bde122c5db8064b25f663e3dac8e2e nautilus-cd-burner-2.16.1.tar.bz2 703744
diff --git a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1.ebuild b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1.ebuild
deleted file mode 100644
index 448de67dc0e1..000000000000
--- a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1.ebuild,v 1.2 2006/10/14 21:04:28 vapier Exp $
-
-inherit gnome2
-
-DESCRIPTION="CD and DVD writer plugin for Nautilus"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="cdr dvdr static"
-
-RDEPEND=">=gnome-base/gnome-vfs-2.1.3.1
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/eel-2.14
-	>=gnome-base/nautilus-2.15.3
-	>=gnome-base/gconf-2
-	>=gnome-base/gnome-mount-0.4
-	>=sys-apps/hal-0.5.7
-	>=sys-apps/dbus-0.6.0
-	cdr? ( virtual/cdrtools )
-	dvdr? ( >=app-cdr/dvd+rw-tools-6.1 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-gnome-mount $(use_enable static)"
-}