gentoo resync : 05.04.2018

4 files changed, 19 insertions, 25 deletions

diff --git a/app-editors/leafpad/Manifest b/app-editors/leafpad/Manifest
index 3bb65f05aae0..ca0da40611f4 100644
--- a/app-editors/leafpad/Manifest
+++ b/app-editors/leafpad/Manifest
@@ -1,5 +1,5 @@
-AUX leafpad-0.8.18.1-fdo.patch 553 BLAKE2B 5ff80867ce1e325adfdbf08aa4be605842fd5db7ea74b91e9a6ff677d7882239245b8f876d46f284f5a968fb93a597f795ae4418ebc13831cf5844e36e782b03 SHA512 b22900988573d962068d4e328e208aac2495c1b463151ec43f5fe1d7159a69a317f3ba1d882bf8d471908951852631bdecbbfee3c2eea5ca4ef1072e3c411268
-AUX leafpad-0.8.18.1-format-security.patch 813 BLAKE2B 2f9eb76f90ed1e17b4958d369631234a83f809160b8142ea418db60712f268b59b35780bcdea3e484ab7091583d8559ca12eb92622ff08ac1085dce7e355c238 SHA512 934c29cab4684fa9d33a6028d7edbf5b15bdf4591ea2ae5f9d071d2252a32670a8fda3ec44d55e026b0897814113234942423d886c2d479e73aa45c96272a99b
+AUX leafpad-0.8.18.1-fdo.patch 557 BLAKE2B be91b5e3c6159701303254d6c7c753dce3b19eb05046f097470b83ac0f21c52bc05da4862dedb05f658fd47efa8d349a4ee5b3361192076abe6ed451497ae7e3 SHA512 db3badb11cb1244035f988c7a512a0fc2559fdd0afa4c7fe432e3d600648526f9f19d42c939466325931819e229eecafb49b4c75837a01d122eac214fd66de32
+AUX leafpad-0.8.18.1-format-security.patch 821 BLAKE2B 2b26cdc2ddc6cd0047c40fcf0b4c1f4bab4aedd422169ccfcf88c58db60320f7fa75367ba6a6d46ba9fa28c6d7275f79dbadafb393e0e7e8f78352ebc7574c03 SHA512 d8a39dc2412055a41eeb7966ff7e3884489d584726501233f67d8d56bded6e50467bcc60a4c2d0be972c0eb6732d9bdc7d00f69845737b049e8b0cc046f87a64
 DIST leafpad-0.8.18.1.tar.gz 289117 BLAKE2B 41f01f9b9e031c749a4b1a06d32edbcf9b0f0a694141c79bb462fce29d59f87efa52bc4a7faf270ce28f04697deb6350fe4e26317d28450d7d785a01007c06c2 SHA512 1caad712967f634f585ab32e406534b5ce2c5621008c1eb5b2b48f17ca0f48cd834ea2ea1c67eda4053fa84e8727ff0e708e99d3b5dad838dcf0701389788257
-EBUILD leafpad-0.8.18.1.ebuild 940 BLAKE2B b8f35e9ed93ebae4bbc2a134243a0abfdd18f0993dc0a4e4f97035d0c64703a20a57fb9fa448c3d7617ace31eefeeea25d84be5d13fcc65f49fa0a5da3e5eb95 SHA512 c69c9dd650f368ef0525b971ae51f9e760b5abeb04d95e0e7b862b0f4428ed12b894cac2e2523644f040d10b09981eae693799f7ec2acbe79acf83f5e18931ca
+EBUILD leafpad-0.8.18.1.ebuild 826 BLAKE2B 51a19dda328c9d214a88a45f1df00462730fcfc758cf29650c4e587d2e8b2e0c6371f556f2aec9150ad6eb2dec2d6534122d63cfeed4701d7e9a0c2e9cef075b SHA512 08dc550cdec48dc11200f548341120674c6f81c17808dd99792f14d9b67191335a60d6b28b7ef80b86434d11fc3dbc7a7382944228bfed678e74f1b769a6e840
 MISC metadata.xml 205 BLAKE2B 14c07c010c87fb27c21a84c8c1a03a4f7a145a8de84571b9a112a7bbf9f0677a8cb7e02a61d9d9dc322174839e0f5e6c721a07988a835b189ac6fb97c39527ce SHA512 e94eb3d2eec0ffa8543112e75899eb7f2c582d2e5615a82b568e907e488f0a8b400946550ae39c7d278a8fa8c8912e6221e3013868ce7e218abbcf76b57cb693
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
index f978275ce399..6aaf4352632b 100644
--- a/app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch
+++ b/app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch
@@ -5,8 +5,8 @@ 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
+--- a/data/leafpad.desktop.in
++++ b/data/leafpad.desktop.in
 @@ -1,10 +1,9 @@
  [Desktop Entry]
 -Encoding=UTF-8
diff --git a/app-editors/leafpad/files/leafpad-0.8.18.1-format-security.patch b/app-editors/leafpad/files/leafpad-0.8.18.1-format-security.patch
index 07f1e2ee111d..4ea3b39fde02 100644
--- a/app-editors/leafpad/files/leafpad-0.8.18.1-format-security.patch
+++ b/app-editors/leafpad/files/leafpad-0.8.18.1-format-security.patch
@@ -1,7 +1,7 @@
 - dialog.c:39:3: error: format not a string literal and no format arguments [-Werror=format-security]
 
---- src/dialog.c
-+++ src/dialog.c
+--- a/src/dialog.c
++++ b/src/dialog.c
 @@ -36,6 +36,7 @@
  		GTK_DIALOG_DESTROY_WITH_PARENT,
  		type,
@@ -18,8 +18,8 @@
  		str);
  	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
  	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
---- src/gtkprint.c
-+++ src/gtkprint.c
+--- a/src/gtkprint.c
++++ b/src/gtkprint.c
 @@ -165,6 +165,7 @@
  		GTK_DIALOG_DESTROY_WITH_PARENT,
  		GTK_MESSAGE_ERROR,
diff --git a/app-editors/leafpad/leafpad-0.8.18.1.ebuild b/app-editors/leafpad/leafpad-0.8.18.1.ebuild
index da4ae0fc45eb..9497f53825fb 100644
--- a/app-editors/leafpad/leafpad-0.8.18.1.ebuild
+++ b/app-editors/leafpad/leafpad-0.8.18.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils fdo-mime gnome2-utils
+EAPI=6
+
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="A simple GTK2 text editor"
 HOMEPAGE="http://tarot.freeshell.org/leafpad/"
@@ -20,13 +21,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-fdo.patch \
-		"${FILESDIR}"/${P}-format-security.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fdo.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
 
 src_configure() {
 	econf \
@@ -35,16 +33,12 @@ src_configure() {
 		$(use_enable emacs)
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }