Fix desktop-file-validate errors and use nongnu mirrors.

Package-Manager: portage-2.2.0_alpha127/cvs/Linux x86_64

4 files changed, 63 insertions, 36 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/Manifest b/app-editors/leafpad/Manifest
index 7e89e89b2210..af62ca9b684e 100644
--- a/app-editors/leafpad/Manifest
+++ b/app-editors/leafpad/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX leafpad-0.8.18.1-fdo.patch 553 SHA256 bc90a7aa379f81616160768785e04e980272b3a7917c441d1be6f30689be1ed9 SHA512 b22900988573d962068d4e328e208aac2495c1b463151ec43f5fe1d7159a69a317f3ba1d882bf8d471908951852631bdecbbfee3c2eea5ca4ef1072e3c411268 WHIRLPOOL 74a689c62ae323b3f02de25a6da9ff09eff3522442f7b329a880b4cd851c532d9699d23d071f7d7c82382054e9d27dd91de89b01425ed38b1842cd42132be08e
 DIST leafpad-0.8.18.1.tar.gz 289117 SHA256 959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c SHA512 1caad712967f634f585ab32e406534b5ce2c5621008c1eb5b2b48f17ca0f48cd834ea2ea1c67eda4053fa84e8727ff0e708e99d3b5dad838dcf0701389788257 WHIRLPOOL a279cd431483595439fe79b3d842573d42c33b81d3d3a022ed2a54e490e508c1ad7f39c80467ec0175312de381680274c7c4b3c30a6300b739ffc47ab8da8cdd
-EBUILD leafpad-0.8.18.1.ebuild 1068 SHA256 a27d033d2bd263a5c80dec58499711cbc232e3e93a53d58aa567c0e4591cd131 SHA512 a915f0a2a54c6fa911b1a8a31b1524dd592ca8dcb96b8ed72fc0218920e678187f4daef933baf224bc9039ee82e2abf8f5df6417d3d169ec00c3032c0a7740f6 WHIRLPOOL 25b72f1c1ec4946ac2e86bc007b5c52e5e395c05a0e46542df087f89a6415f12fa8d30ba9b3847f9485ebce431084d183774035a894940e398e6230b8133e3fc
-MISC ChangeLog 3812 SHA256 a233492cf55006bc333dd6c6d956ccf0185486555e2f6420e7d3c4ab7b125ef0 SHA512 98c24f9613d17969d069a3eedcc64c1f90d9dc6193b8d99741a0f0be25de57e2f297d7d7d7852d75f3740118b2898245247ef4f136000f6f8a85926af8934eca WHIRLPOOL 5501000ba5f9a938fdfc71231d5982bfacaf938c8c75d1379676a42c6260a909d7d798fc8284e75fcd6aae19ae2d11a8c5175ddf536b78722a84aecaadaa86d3
+EBUILD leafpad-0.8.18.1.ebuild 1034 SHA256 49d5a46f0695deca2f17d6ab3dabbf8687c422eb729d5d63a81235f0e28785d9 SHA512 f8ae5d61373688b85b706555e290dbf6aedc79f3c0a8ce6c1edb2092bc1754356e91d228768170e14c0ee07c19c90b501c5efea279f154140675c64dfc1246ab WHIRLPOOL 657298c1dd286dd353a349b98841e7a832343607b64485ee5c07b2feb9f413681458a9c675e60f6970cf10362a3870c92db4cb9dff4bb38a5bb3855ffdd07c16
+MISC ChangeLog 3991 SHA256 3ee6dead4d0ff1f3c04dd04f5d6a2ff694e5f4c955f585e48160a80c345da23c SHA512 7257c13a0d6a1e5980c0275673b2c1ff65630255e3535b8dce6b04cdb020ab943a39895553a3fc84653efb007e4bc3ee34d00aacb9a5eae11fc0000be8d1e69c WHIRLPOOL afb5c57c38b41c965a08286fe9cb5ae39a4918f3bf8e788d896188367190f0cec2987d53bfd9378558f1d4a8a52190cbff37e65f1ea34f1837e6a6350de16356
 MISC metadata.xml 300 SHA256 7f237b8e1e139ac2abb646ed671bc3b5efa4e333e55925b9b8c68a6436774611 SHA512 fafb546c3fbf125b08d47ded23ab3a0f2d67d1157049ef48047588ff103e47c9b9e3cbd6372a266f5ebf1c78c8250d6ceabfc2444109f1292597e9038402df06 WHIRLPOOL 14954ade3a2c3557a5d1de4f1260272609ff408f8e20f12e507d9918a6388da21fb80ad362622315be3ec065e447713408d2c729c7d74d40f747d281ec1c7d63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQUkxuAAoJEEdUh39IaPFNC68H/00pt/ecza2JAwPuu323Bls7
+jrZAlfSBkoNHjnYTCEesswO6ukWrjfKfPlJgBu70yqNQX28Rv7vOGANVE4JwDK+S
+8zZouzq7Tn/46S6fxKxQeTWlJ3IQuDm8UP6Sdm7loDvKWQ38qFLww9Zxl3whrC7h
+bT+amykVwLi9W79hgUCPyIiHc2fcAP4H2QZdcXTxXFjKn5RpDUw6ulNdBYkF1Ci6
+/o32nni18bci3h5KgxUQTlv8TxbwPctVaWo7zA/sWa9ZFwhBoJ6YTAZQIU6G1atq
+u6HPyQtApYvnsNvDw3w+wDQQWI+AXkvJzOIdhVx5kFt8vlBS1LwSSXh4IkP0IFU=
+=pZA7
+-----END PGP SIGNATURE-----
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; }