From 2d446203bcf1a0db08e99abca43513d246dfa73d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Apr 2018 21:52:00 +0100 Subject: gentoo resync : 05.04.2018 --- app-editors/Manifest.gz | Bin 14050 -> 14051 bytes app-editors/efte/Manifest | 2 +- app-editors/efte/efte-1.1-r1.ebuild | 14 +++++------ app-editors/leafpad/Manifest | 6 ++--- .../leafpad/files/leafpad-0.8.18.1-fdo.patch | 4 ++-- .../files/leafpad-0.8.18.1-format-security.patch | 8 +++---- app-editors/leafpad/leafpad-0.8.18.1.ebuild | 26 ++++++++------------- 7 files changed, 27 insertions(+), 33 deletions(-) (limited to 'app-editors') diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz index 5b5ccb3b7628..e9be1a182c0c 100644 Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ diff --git a/app-editors/efte/Manifest b/app-editors/efte/Manifest index 955910d0faed..95c8b16ee267 100644 --- a/app-editors/efte/Manifest +++ b/app-editors/efte/Manifest @@ -1,5 +1,5 @@ AUX efte-1.1-desktopfile.patch 619 BLAKE2B 54b0c42d032acbd9588005ee83863f08899fd48a012fd232b9a71ea8b80246341b116f49c45db570be3839fcfc4f6b2526a728e60ca9b0c8aed59a36d5457faf SHA512 e48df45d0daa6264503c94a7d2d6c886b6101f5d258fbc3a3825377f25b601b3f8869a4337330ea325a44086db20b2c2906f3556b5e066b1f399afe3aadcdc98 AUX efte-1.1-flags.patch 657 BLAKE2B 2e38c0635739a6bb1ad679e97e571d04868bad3b950e63bb9770e134016be2c4982860204b8863979fc91374929762c442ebf5dd955dea0f522c13f25e415f49 SHA512 7721010873e2030428f2c855d35b18ce6c6ab2d884c25e1611045e8d3209cb0baf94a7d90661de6ea86d084e9b73cf4b8ac724308f94263adbad12db2507a870 DIST efte-1.1.tar.bz2 429919 BLAKE2B 67a9d40e0aaebf024f7889324da6eaa96efe2abbc290f7f4397410f1a2975baf70c527eb238bcbc2b9b0bc8ab3dcdd1611c219f3429588f06f9ec220a56426cb SHA512 4dbfcaaadc56996d1b4659db2a82ec5132cf45b6f65ef545274769aa47f44ba27a8af1488ed57e5ffec2d9f5f1d1ef4cb9ee97514414796f176c2272a6bb6661 -EBUILD efte-1.1-r1.ebuild 1070 BLAKE2B eac03fb76c7d239a51442ca275db4662bb861c887bafaacaa5e0f5132b1e6319a0dfdb198163a8efb0dc77a64ed4aee6f58106214e52a19f5871b2cb8a39b074 SHA512 13e8409a76e98043927507a173f2fc742ba6ab3d65ed8c81fd3127683c34b147dfa6b2250d5832b42680325f85c18262bad3d032c7a9a8d087e1f355a3c45c38 +EBUILD efte-1.1-r1.ebuild 1041 BLAKE2B d00aa6eee809552f859047054453081f7988a3dda7e6a04a4e85ef8919fc4dd7af0d818ca4a838ed49bce2b9965ed1b5256b7ae6c0b851f6f3511395247c8edc SHA512 9a4dca0de314dd4615e28b50a0fb8bbfad62500c67349092cf2a58b0300bcbf78baa0ec940029dfa506da1d65746102ffb004fa1f8035f6c69cc3f3958b0579e MISC metadata.xml 241 BLAKE2B 735c46492d75e210ca0d6e814fdb2a7d96fe8901cdadcd168ccbb8720374cde0159e4a5edcfe6ef0ee78ca2b2f0e677e8d1a3a585e4d847f3098b519f61cfc8b SHA512 e2cf99ff1a4a6d577eb0fdd2a097cbfd71e60d860d6294d59ef4ec596eba2c85a50ed4f50944356637e145f0d3b38d0da90d87bcdf1f51eb76e93345cadbee52 diff --git a/app-editors/efte/efte-1.1-r1.ebuild b/app-editors/efte/efte-1.1-r1.ebuild index 9e1f72bdfdec..b62580bce0a6 100644 --- a/app-editors/efte/efte-1.1-r1.ebuild +++ b/app-editors/efte/efte-1.1-r1.ebuild @@ -1,9 +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 +EAPI=6 -inherit eutils cmake-utils fdo-mime +inherit cmake-utils xdg-utils DESCRIPTION="A fast text editor supporting folding, syntax highlighting, etc." HOMEPAGE="https://github.com/lanurmi/efte" @@ -32,8 +32,8 @@ PATCHES=( src_configure() { local mycmakeargs=( - $(cmake-utils_use_build gpm) - $(cmake-utils_use_build X) + -DUSE_GPM=$(usex gpm) + -DBUILD_X=$(usex X ) ) cmake-utils_src_configure } @@ -45,9 +45,9 @@ src_install() { } pkg_postinst() { - fdo-mime_desktop_database_update + xdg_desktop_database_update } pkg_postrm() { - fdo-mime_desktop_database_update + xdg_desktop_database_update } 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 } -- cgit v1.2.3