3 files changed, 46 insertions, 34 deletions
diff --git a/app-editors/leafpad/ChangeLog b/app-editors/leafpad/ChangeLog
index e89455cf98ab..8d185d45e9a3 100644
--- a/app-editors/leafpad/ChangeLog
+++ b/app-editors/leafpad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/leafpad
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leafpad/ChangeLog,v 1.32 2012/05/03 18:33:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leafpad/ChangeLog,v 1.33 2012/09/13 21:14:54 ssuominen Exp $
+
+  13 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> leafpad-0.8.18.1.ebuild,
+  +files/leafpad-0.8.18.1-fdo.patch:
+  Fix desktop-file-validate errors and use nongnu mirrors.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> leafpad-0.8.18.1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch b/app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch
new file mode 100644
index 000000000000..f978275ce399
--- /dev/null
+++ b/app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch
@@ -0,0 +1,21 @@
+desktop-file-validate:
+
+leafpad.desktop: error: value "text/plain" for string list key "MimeType" in group "Desktop Entry"
+does not have a semicolon (';') as trailing character
+
+leafpad.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated
+
+--- data/leafpad.desktop.in
++++ data/leafpad.desktop.in
+@@ -1,10 +1,9 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=Leafpad
+ _Comment=Simple text editor
+ Exec=leafpad %f
+ Icon=leafpad
+ Terminal=false
+ Type=Application
+-MimeType=text/plain
++MimeType=text/plain;
+ Categories=GTK;Utility;TextEditor;
diff --git a/app-editors/leafpad/leafpad-0.8.18.1.ebuild b/app-editors/leafpad/leafpad-0.8.18.1.ebuild
index c370a54644cb..a74d57ceffd4 100644
--- a/app-editors/leafpad/leafpad-0.8.18.1.ebuild
+++ b/app-editors/leafpad/leafpad-0.8.18.1.ebuild
@@ -1,49 +1,36 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leafpad/leafpad-0.8.18.1.ebuild,v 1.4 2012/05/03 18:33:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leafpad/leafpad-0.8.18.1.ebuild,v 1.5 2012/09/13 21:14:54 ssuominen Exp $
 
-EAPI=3
-inherit fdo-mime gnome2-utils
+EAPI=4
+inherit eutils fdo-mime gnome2-utils
 
-DESCRIPTION="Simple GTK+ Text Editor"
+DESCRIPTION="Legacy (stable) release of the GTK+ 2.x based codebase"
 HOMEPAGE="http://tarot.freeshell.org/leafpad/"
-SRC_URI="http://savannah.nongnu.org/download/leafpad/${P}.tar.gz"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="emacs"
+LICENSE=GPL-2
+SLOT=0
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE=emacs
 
-RDEPEND=">=x11-libs/gtk+-2.10:2
-	virtual/libintl"
+RDEPEND="virtual/libintl
+	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
 	dev-util/intltool
+	sys-devel/gettext
 	virtual/pkgconfig"
 
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--enable-chooser \
-		--enable-print \
-		$(use_enable emacs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
+DOCS="AUTHORS ChangeLog NEWS README"
 
-pkg_preinst() {
-	gnome2_icon_savelist
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fdo.patch
 }
 
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
+src_configure() {
+	econf --enable-chooser --enable-print $(use_enable emacs)
 }
 
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { fdo-mime_desktop_database_update; gnome2_icon_cache_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; gnome2_icon_cache_update; }