n-c-b requires USE='unicode' cdrtools, added a pkg_setup() check for 2.8.7, see bug #80053

Package-Manager: portage-2.0.51.20-r4

3 files changed, 25 insertions, 17 deletions

diff --git a/gnome-extra/nautilus-cd-burner/ChangeLog b/gnome-extra/nautilus-cd-burner/ChangeLog
index a7a556d4f96a..83c78cf48a3e 100644
--- a/gnome-extra/nautilus-cd-burner/ChangeLog
+++ b/gnome-extra/nautilus-cd-burner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/nautilus-cd-burner
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.66 2005/04/19 02:41:45 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.67 2005/04/25 08:18:16 obz Exp $
+
+  25 Apr 2005; Mike Gardiner <obz@gentoo.org>
+  nautilus-cd-burner-2.8.7.ebuild:
+  n-c-b requires USE='unicode' cdrtools, added a pkg_setup() check for 2.8.7,
+  see bug #80053. 
 
 *nautilus-cd-burner-2.10.1 (18 Apr 2005)
 
diff --git a/gnome-extra/nautilus-cd-burner/Manifest b/gnome-extra/nautilus-cd-burner/Manifest
index 72986d1c1b6e..764bdbee6ea4 100644
--- a/gnome-extra/nautilus-cd-burner/Manifest
+++ b/gnome-extra/nautilus-cd-burner/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 d67a4a685aaca2e1f7c519498a86be0a ChangeLog 8604
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 aa9ae7aba0c5d850e7b3ab27fbafb632 nautilus-cd-burner-0.6.1.ebuild 1086
 MD5 5eb2ecd0d94100a8dd2bbca718de79d9 nautilus-cd-burner-2.6.0.ebuild 907
@@ -8,25 +6,17 @@ MD5 d852be913dbb99b634ce3d92ba051a3c nautilus-cd-burner-2.6.1.ebuild 906
 MD5 63a1e1a52c71d207683b44ac69512b93 nautilus-cd-burner-2.8.2.ebuild 1015
 MD5 c8c983d4c1846baff2ea69bfcb896791 nautilus-cd-burner-2.8.5.ebuild 901
 MD5 7b301c0d977d31e284009395294ec023 nautilus-cd-burner-2.8.6.ebuild 900
-MD5 fec90eb10e14333fa56861f84a8fa497 nautilus-cd-burner-2.8.7.ebuild 905
 MD5 c88ec070b6c4281ec586602badcfce1c nautilus-cd-burner-2.10.0.ebuild 909
-MD5 13daf845619d73ed893257c0cfd17590 ChangeLog 8426
+MD5 ac565992aefb31c595c95dbb0a7450c4 nautilus-cd-burner-2.8.7.ebuild 1251
 MD5 9a7629c619395deb365a8853e5b4c477 nautilus-cd-burner-2.10.1.ebuild 909
 MD5 5c5b2951cc6f2fe0138c0f5ac4bc97d4 files/digest-nautilus-cd-burner-0.6.1 77
 MD5 702d573787368750b57e5684afc42a5e files/digest-nautilus-cd-burner-2.6.0 77
 MD5 1fc86a0e02dd11f81a22586a0abccbb9 files/digest-nautilus-cd-burner-2.6.1 77
 MD5 06ac71ea5d2c3f7bf0af8dec2c53fdc8 files/digest-nautilus-cd-burner-2.8.2 77
 MD5 769e21ec171cf58b707de597c54e7ef4 files/digest-nautilus-cd-burner-2.8.5 77
-MD5 4622843aff8b07508fce38211ee61327 files/digest-nautilus-cd-burner-2.8.6 77
-MD5 239981725a809a760a89b6915cc02a48 files/digest-nautilus-cd-burner-2.8.7 77
 MD5 0cc10acbcdaa96ade28aa3b589287e72 files/nautilus-cd-burner-0.6.1-gcc2_fix.patch 3099
 MD5 b3b37b460d957cfd8119734f70ea599a files/nautilus-cd-burner-2.8.2-bacon_nodrive.patch 1456
+MD5 4622843aff8b07508fce38211ee61327 files/digest-nautilus-cd-burner-2.8.6 77
 MD5 86395a29bcac00ddc56fd80e232bebb5 files/digest-nautilus-cd-burner-2.10.0 78
+MD5 239981725a809a760a89b6915cc02a48 files/digest-nautilus-cd-burner-2.8.7 77
 MD5 fbad76c0bddc48265b9de05e9bbb6a7d files/digest-nautilus-cd-burner-2.10.1 78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCZG/CXjcVihsel0ERAl9/AJ4xh8Yek8FWudLwAN25jhEDdBq5JgCghInj
-EB6IX3qZKa0gCYNtAkMss2k=
-=V5ib
------END PGP SIGNATURE-----
diff --git a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.7.ebuild b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.7.ebuild
index bdb2768ce7ee..f06b7fb44d32 100644
--- a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.7.ebuild
+++ b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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.8.7.ebuild,v 1.1 2005/02/17 05:53:33 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.7.ebuild,v 1.2 2005/04/25 08:18:16 obz Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="CD and DVD writer plugin for Nautilus"
 HOMEPAGE="http://www.gnome.org/"
@@ -31,3 +31,16 @@ DEPEND=">=dev-util/intltool-0.29
 G2CONF="${G2CONF} $(use_enable hal)"
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 USE_DESTDIR="1"
+
+pkg_setup() {
+
+	# Check for USE="unicode" cdrtools, see bug #80053
+	if built_with_use cdrtools unicode; then
+		echo ""
+		eerror "mkisofs needs to support utf8 for ${P}"
+		einfo "Please remerge cdrtools with unicode (utf8) support,"
+		einfo "     USE=\"unicode\" emerge cdrtools"
+		die "mkisofs does not support -input-charset utf8"
+	fi
+
+}