Drop encoding set from POTFILES.skip. Fix bug 313351

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

5 files changed, 35 insertions, 59 deletions

diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index 58dcd64dd5a7..1213f84554d1 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/gnome-disk-utility
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.2 2009/11/04 21:27:40 eva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.3 2010/04/19 18:18:17 pacho Exp $
+
+  19 Apr 2010; Pacho Ramos <pacho@gentoo.org>
+  -gnome-disk-utility-2.28.0.ebuild, gnome-disk-utility-2.28.1.ebuild,
+  +files/gnome-disk-utility-2.28.1-fix-potfiles_skip.patch:
+  Drop encoding set from POTFILES.skip since it doesn't need it and causes
+  'intltool-update -m' to fail (see bug #313351 , thanks to Diego for
+  reporting). Removing old testing version.
 
 *gnome-disk-utility-2.28.1 (04 Nov 2009)
 
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 3f566fcc36da..af54593e196c 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST gnome-disk-utility-2.28.0.tar.bz2 1495693 RMD160 fc32f0026c28eb35295d211739b6d882a775f960 SHA1 174e068a85f2290b6c4715a52bdb353131673525 SHA256 624feb5249ae839464930a1d9d1103e2bd50cdaec18443b2a97ffbdeb068b9e6
+AUX gnome-disk-utility-2.28.1-fix-potfiles_skip.patch 316 RMD160 fabe483052e34e6ed89b5a5cc6cee04bda321efb SHA1 2289c9826fb04b657f622878e14d6d3dcde0a165 SHA256 1afc5c0228a725a079fd86f65ffa687f48678c65b72e97468e6d4082428baebc
 DIST gnome-disk-utility-2.28.1.tar.bz2 1539892 RMD160 a8c1586694fe567e759c3c6993b57bbb4d633870 SHA1 9e7951d810493fd3b2cfaf780c009dd8f9d5d718 SHA256 ed7d75f16b84cd251ad24385d57ea73805e3e8f193e517df42b0407004066db8
-EBUILD gnome-disk-utility-2.28.0.ebuild 1145 RMD160 a1a95bb6d205944405f805e285f9ade4ce63ef6e SHA1 f065cf62d0862820d55b3b11a92a341c730a840c SHA256 d73cc29fad4d3170ff7592d160c56321637db30013b9797cd263ac1422f4d9a2
-EBUILD gnome-disk-utility-2.28.1.ebuild 1197 RMD160 c01f90a4173ec03dd46749f77153eb29f43e7db8 SHA1 a25b8da29c574a9c5a5fdecc212f5b21b1922aca SHA256 48db0f4bacac257468f65ad43881ad5b4d4b65aaf5ca9b43a36919f8ae64b129
-MISC ChangeLog 681 RMD160 edbf790fee8022c2db2c7dc201f056b7095c9995 SHA1 8e2add73b93dc8f4c2f374704e096d8743e044c4 SHA256 d9e3f6a36dce3b81991eab7b605a424eff93547f9ece0527d79fdd509a535d54
+EBUILD gnome-disk-utility-2.28.1.ebuild 1358 RMD160 a922c619a791bd178d14454b217d1bd2f9a0baf1 SHA1 430b39ba8b25c2f00c06728ffbb7c349e9ab0c91 SHA256 5be0473987af2da4476789f92b3ef96ad0dc25c3c2628941216797ca0170a0df
+MISC ChangeLog 1050 RMD160 c1176ab84932cda9a5f4ac5185416870befbafa2 SHA1 88805f1931b2f27b435022b7dad0c9c6512c7bdc SHA256 45d4ea4ce5f481cbb44df5e8a5c5c04b24d87ce04c2e3770ef778e7ad0b400fa
 MISC metadata.xml 250 RMD160 3f04396c27a3d77bbdfb050c9bd5c8da4f77e43f SHA1 ed477831adf1e3a89f3bd960c11bb2a4a906fab2 SHA256 283585904d02b43e6c0bff1c16fa383743a574d99450c777d7b0e373fb6dbe05
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkrx8i4ACgkQ1fmVwcYIWAYFRACeLgggZ0Y8O73H1bVrVeHo7Owv
-+1wAoIMnddf4u6+HRFi5Xt/CkgnuAbUX
-=e+cS
+iEYEARECAAYFAkvMnnEACgkQCaWpQKGI+9R6xQCfaLQMzMYxttMVUhf1I3NQTEUL
+1FQAn0VHrhc/8IBq5J0gUmsWi5M7WA/2
+=WyVF
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.28.1-fix-potfiles_skip.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.28.1-fix-potfiles_skip.patch
new file mode 100644
index 000000000000..645933c2fd6e
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.28.1-fix-potfiles_skip.patch
@@ -0,0 +1,9 @@
+Gentoo bug 313351
+GNOME #616019
+--- po/POTFILES.skip~	2009-09-11 17:48:29.000000000 +0200
++++ po/POTFILES.skip	2010-04-19 19:54:00.000000000 +0200
+@@ -1,4 +1,3 @@
+-[encoding: UTF-8]
+ # List of files where to skip translations.
+ # Please keep this file sorted alphabetically.
+ data/gdu-notification-daemon.desktop.in
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.28.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.28.0.ebuild
deleted file mode 100644
index 13518dcaf1a0..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.28.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.28.0.ebuild,v 1.1 2009/10/29 21:50:37 eva Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Disk Utility for GNOME using devicekit-disks"
-HOMEPAGE="http://git.gnome.org/cgit/gnome-disk-utility/"
-SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +nautilus"
-
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/dbus-glib-0.71
-	>=dev-libs/libunique-1.0
-	>=x11-libs/gtk+-2.17
-	>=sys-apps/devicekit-disks-007
-	>=dev-libs/libatasmart-0.14
-	>=gnome-base/gnome-keyring-2.22
-
-	nautilus? ( >=gnome-base/nautilus-2.24 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.3 )"
-DOCS="AUTHORS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable nautilus)"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.28.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.28.1.ebuild
index 38c6a3ff2ba0..cd14c95a9ba8 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.28.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.28.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.28.1.ebuild,v 1.1 2009/11/04 21:27:40 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.28.1.ebuild,v 1.2 2010/04/19 18:18:17 pacho Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Disk Utility for GNOME using devicekit-disks"
 HOMEPAGE="http://git.gnome.org/cgit/gnome-disk-utility/"
@@ -42,6 +42,13 @@ pkg_setup() {
 		$(use_enable nautilus)"
 }
 
+src_prepare() {
+	gnome2_src_prepare
+
+	# Drop encoding from POTFILES.skip, see bug #313351
+	epatch "${FILESDIR}/${PN}-2.28.1-fix-potfiles_skip.patch"
+}
+
 src_install() {
 	gnome2_src_install
 	find "${D}" -name "*.la" -delete || die "remove of la files failed"