summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-06-16 12:07:52 +0000
committerPacho Ramos <pacho@gentoo.org>2010-06-16 12:07:52 +0000
commite44e1860169db48a20de8df2a06b71284eebc868 (patch)
tree19dd9ae59cc498c9b8d87353c94794e76ec2bb91
parentNew license for version 10.1 (Bug #323837) (diff)
downloadgentoo-2-e44e1860169db48a20de8df2a06b71284eebc868.tar.gz
gentoo-2-e44e1860169db48a20de8df2a06b71284eebc868.tar.bz2
gentoo-2-e44e1860169db48a20de8df2a06b71284eebc868.zip
Reapply potfiles patch since upstream still didn't fix the issue.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
-rw-r--r--sys-apps/gnome-disk-utility/ChangeLog6
-rw-r--r--sys-apps/gnome-disk-utility/gnome-disk-utility-2.30.1.ebuild6
2 files changed, 10 insertions, 2 deletions
diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index f8700fa251e8..925cadbb546f 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/gnome-disk-utility
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.9 2010/06/13 20:14:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.10 2010/06/16 12:07:52 pacho Exp $
+
+ 16 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+ gnome-disk-utility-2.30.1.ebuild:
+ Reapply potfiles patch since upstream still didn't fix the issue.
13 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+files/gnome-disk-utility-2.30.1-optional-avahi.patch:
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.30.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.30.1.ebuild
index ba6650c83be1..0a744ef88122 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.30.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.30.1.ebuild
@@ -1,6 +1,6 @@
# 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.30.1.ebuild,v 1.1 2010/06/13 17:04:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.30.1.ebuild,v 1.2 2010/06/16 12:07:52 pacho Exp $
EAPI="2"
GCONF_DEBUG="no"
@@ -52,6 +52,10 @@ src_prepare() {
$(use_enable remote-access)"
epatch "${FILESDIR}/${P}-optional-avahi.patch"
+
+ # Drop encoding from POTFILES.skip, see bug #313351
+ epatch "${FILESDIR}/${PN}-2.28.1-fix-potfiles_skip.patch"
+
eautoreconf
}