gentoo resync : 03.11.2017

3 files changed, 2 insertions, 57 deletions

diff --git a/app-misc/pal/Manifest b/app-misc/pal/Manifest
index c26fd06bdef1..0f2a8de4fb3a 100644
--- a/app-misc/pal/Manifest
+++ b/app-misc/pal/Manifest
@@ -4,8 +4,7 @@ AUX fix-Wformat-security-errors.patch 1909 SHA256 1df7021da5ebb417a93593bb7c0d06
 AUX pal-0.4.3-pkg_config.patch 521 SHA256 588701828764e094f87872cccfc4355d821bf40b4016cba688d5b32f54fe8ad4 SHA512 216d34abd73cdfd7f539d4881c25717ae2bdf919df05ad553bf4ed3a0a8e8a616dcb688f06f6beee6b2f5943f3accf1d144ae3a226ee5a2d0078d5450640eaa5 WHIRLPOOL 6a7e420364d8b5fe963ea5774f6b98369103f0a2f4b9da2bc15eb7fc327977ed541a51659d36c1c1f7c99e3a25cad32fc7baf0a07909828a55e395ce84fcd43d
 AUX pal-0.4.3-prefix.patch 1519 SHA256 535f83042a6faaad01603e56a7c7c66f3e3eeadfc9d4f2627878926d6eafd39f SHA512 428cc71d6775f33916e6b9025627027dc8b75fa66dadb4cef42b3e2167a662e04d94fff7edec68916efc3a1944f3579fa88e3324e0a131b7bc10d7f3105ea2c9 WHIRLPOOL 6c322e0bf3ef6390c7fc78e28d3774339a24446e5e95249f2941f6e74275efce12e32531699528b7925a8817f8c43310156f14c11c4b20ec1793b4090eb538e0
 DIST pal-0.4.3.tgz 130865 SHA256 ce470cb7be76522ff58cd0325ad7817b6cc2132a5e0cea55de8c9eb63b54551c SHA512 8d543706e6dcabbdeb246ff18917b490da43c3211266dc67417906eb92602a107b066e2cb156da2b5362a19ac4992d1f21dc873485d3250912a53143f8257bf8 WHIRLPOOL ffe71469258a9f78ce47deed4b488b49df466c6ed2144186852ade1a55ee670747580ff18140dba92b007c148701bfa8a2c68a260259831f5eb357f5c8bf4d5c
-EBUILD pal-0.4.3-r1.ebuild 1159 SHA256 4bcd1763e1787520bd1999b9f2ad056b745b58049c2c526d27e09743a1e157da SHA512 5eca53d7c34dd7e6c4b117234aa60609615c7630b01be8b01189e6e3c6759649c55d0235687b975c4f417778db2ef22e4d2d01740c723276859cd753e8c1784c WHIRLPOOL 517dc2f9ee32d645b39f9f835b25a5c442c1e61ac76ae4742d93a06b76d75c18b4cdd1dc49530bb4ba32ba89f99a964540f57c7b9c4ce2d5a3e475d5a8e394fa
-EBUILD pal-0.4.3-r2.ebuild 1356 SHA256 63d334c8b8c36e58091a76e20b803ad76cb0f955060e66632206c2f8ef5b2a13 SHA512 d2e331b5eba924feeef2344a7d22d40ddaade85441af0e5bf595cbd1202fae86288fd2a6a6afa7665bf97ebdcc3bb85f56ef97383876994c84702ef9ebe23f90 WHIRLPOOL 060f057fedf2759c4af1129e9dbfd569c348fd5ddd3366cd7492bafd230e45e121be4808992a5a68f48d4e75015834251a05ee27e014d7ac4ac2c2c6feed7065
+EBUILD pal-0.4.3-r2.ebuild 1355 SHA256 07d352ce3b570507ea96eb8d0f785c792941f222cb7aa6bb41dace48869c04c4 SHA512 5c15a133be6a2adbaa5634128b4706e0f189942d102edb05450350b2b869e3e8e03f0fbca99953793149a44620f95699f3f0a5d8a3239db9fafb6b28df132d4d WHIRLPOOL 336c73398c26d1f5fbb483f8bafbe2dadd1c5ef23a8664384d89bcbacf9cf29e72b2055020e35bd6bc515cce29f88a391db836c49af8be9d355a05ffb7688197
 MISC ChangeLog 2892 SHA256 c6b4a108cd2469d9af62766e85b615a4d5e4d10ecb5458db2f770e90f38aa5de SHA512 d32fb43986b2a6a2e8134d60ac3bb6cb7a5b2cabe6e4cccf2aee04d0dcd427acab8ef913d5c928f0c7b3398e297887cf967a161ca78c37fcc1cc3e4328c86aec WHIRLPOOL e41bbfc850f7f58aadd228e57adb214c351efade7d4501e6822cb5200d3967126f1ed4676b6803c126e06c9ea26c871ee2da0b00705487e912f3b26bee4e9f21
 MISC ChangeLog-2015 4937 SHA256 fe677cbc3f048730c8537a077fcf5ad31b750e70cf5db4d404d048f0a948110f SHA512 2e8cea7d7826e2a39a7a13d28a9c2ac60b240651b9f9827c8d04be5e1e612855b22269fd13ec706f1f536a79ef6fbb37b628ce55466461d7f76992df744d4637 WHIRLPOOL 042445d74b98aee99391a6a2e3613a59dffef2766117dabeb512bf694d19e2519de55244a619221f57f40487ba69626a63fc099307bd0c75a87b1d4a6bd68121
 MISC metadata.xml 509 SHA256 ded4548aab2080a1cc58bf812fd442839d6c6d7328902866ddf8b1571b25f4ca SHA512 cea3652f00f870d6db65ed87bc3b37b429cc4d3c8cb91d40742ca0dda93961d14779d348a84fe43d432e5a8dd4deb67ae2439151a8cb5c249fcf3b4e4ed2dcb4 WHIRLPOOL a6f51c2eb1d67577d368ebd86ad84dc0becb5ddb5d8f5c88e1ca22d85bbfefb7bdf75c524c1b5ab4e8e215f6551604926ad952bb9ac43fc67c216a467918bca3
diff --git a/app-misc/pal/pal-0.4.3-r1.ebuild b/app-misc/pal/pal-0.4.3-r1.ebuild
deleted file mode 100644
index 132f917792be..000000000000
--- a/app-misc/pal/pal-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils prefix toolchain-funcs
-
-DESCRIPTION="pal command-line calendar program"
-HOMEPAGE="http://palcal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/palcal/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="nls"
-
-RDEPEND="
-	>=dev-libs/glib-2.0
-	nls? ( virtual/libintl )
-	sys-libs/ncurses
-	sys-libs/readline
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-strip.patch
-	epatch "${FILESDIR}"/${PV}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-pkg_config.patch
-	epatch "${FILESDIR}"/${P}-prefix.patch
-
-	eprefixify Makefile.defs input.c Makefile
-	sed -i -e 's/ -o root//g' {.,convert}/Makefile || die
-
-	tc-export PKG_CONFIG
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" OPT="${CFLAGS}" LDOPT="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-man install-bin install-share
-
-	if use nls; then
-		emake DESTDIR="${D}" install-mo
-	fi
-
-	dodoc "${WORKDIR}"/${P}/{ChangeLog,doc/example.css}
-}
diff --git a/app-misc/pal/pal-0.4.3-r2.ebuild b/app-misc/pal/pal-0.4.3-r2.ebuild
index 75d5f9254a67..4b730ffb3e7c 100644
--- a/app-misc/pal/pal-0.4.3-r2.ebuild
+++ b/app-misc/pal/pal-0.4.3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/palcal/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="nls"
 
 RDEPEND="