gentoo resync : 30.06.2018

4 files changed, 16 insertions, 93 deletions

diff --git a/app-office/calcurse/Manifest b/app-office/calcurse/Manifest
index ce52cf0d509a..53a09b6fcb62 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -1,8 +1,4 @@
 AUX calcurse-4.2.1-tinfo.patch 644 BLAKE2B e304953d56dc8891138e909f0b7b31b85b89a16800a1e8efc64a199cb884b730c3123f902ffe2095d392c41cbf0f65b88d440fff2133816b2763ea74a5e44770 SHA512 099ead1b288717e9d9eff331c2fbb9ff8deb19b1843109549ebdab30e8e59cc9cbb01a89c87e84e9283003ce70fc595e2305936a8a0918b0996b5fab1854cb5f
-DIST calcurse-4.2.1.tar.gz 612593 BLAKE2B 7c8fb995ea16abcdd5ae768cda09298e4bdeb64d8476657b3d1320394a269add3b1c4279e8a6b7a089f27404d43ec3acfbab6222cfce74dc422042247109fb00 SHA512 77f7fd23fe28e34ace29239530948c7576196339e4c603952dd5d48a201fa2e52bfcfaf411edf3f299c9d8b30d659febade68679fc65a2b87afb305bbf5db8df
-DIST calcurse-4.2.2.tar.gz 612456 BLAKE2B b73e876f671b75d362bf32bfc341fd985796a6be6b5c4164464bdef1f35d26fbecec3bb7f5dcd54a1ab9e3405186ea2d791484902643362738db38d647d786b3 SHA512 d54d5a1ca457499ff82fe0b6a945f5f54c0f93f84b34d5a69579dd42d4d44edda0b81a165d29b4f3d77ef7219b2e815b5858eaa744eb418e9549abf58eb2f958
 DIST calcurse-4.3.0.tar.gz 597490 BLAKE2B 7fe31fc09cae12438173d4846a1e4b0a55f9e9416ab23ffc8b78e9d0f621072d8aca96b4161d5659db088e1007f685228e9669aae2d5606939c6564252826e1d SHA512 d948354b512d406f4915ce37107d3f529031e7698d7b38465913ff37120a93283e01f09f5267ebb19bf39ea133d6fac579b218d6dfd6056003b6222f9038f4b3
-EBUILD calcurse-4.2.1.ebuild 755 BLAKE2B 777a0304803bac5ce78e5c63f65b9543020cd8f6af345c2e8a68faedc35225d0cb8b69ff93364c42a712332add8fff3be8c22d6248d58e7cdade2414e55f3b52 SHA512 5bec3709ae73bb6ce5d8ecd55b286664056a15a104d9e86b24be81f27fc3e693bb22e32255f998a4114af73e5f6b79ca616eb9c1296cd7317228dea66a12d984
-EBUILD calcurse-4.2.2.ebuild 759 BLAKE2B 8c5df80a4bcfc6bf940edbe929f99ce62ced7e2020586ce70d0f9b4d63379b757e4aaf9341e1d2a86bfb964df4489680c30700c7a41759bb6156e8fb3771ae97 SHA512 1d04f100080fa5b77ac3044185d6da3f7d54104e3313c4cacd373906aef8465624d01f7e1f7e616a2914ec8bb72871f5730ec97d268368df1c49057d84fb756e
-EBUILD calcurse-4.3.0.ebuild 597 BLAKE2B eea77ab7b4e2adb02d4da09421e9d0d3850ff92222a153e4bd742db71b4643c2509bf2aa97dbab0be4cdc513b7c1db75008a188e0d9251cc5f4ff18f67f03a2d SHA512 ca182b770abe8b937d8dd254d151996888d2c731eb6ea7200ecd01a6c16e86389350a66267b4e3b3ed27e5b009949b39ab9d12982fb03055856e671d754ae155
+EBUILD calcurse-4.3.0.ebuild 700 BLAKE2B b39cb1fb7507d34fdd3aca5255d27f803e30ecbac408f293c28889106a829674f30088881d4bf39ccef25bb1e6b86c60eca492138a2e872363cf35c898d74ed2 SHA512 8a68cdbee97c475c7813677824c9d04a76d4d62ae7a54532d496c3a413b282dfd84607516801bdbddad65efa653131158e8ede34ecd824ef9e40e8b94ebdd5fc
 MISC metadata.xml 593 BLAKE2B 313dee286f4f73406dc3a9a00c8bb59df524df4ac3ced089fea16522d22d99580972c1e52822df1d4c7b527b3c48dce3b825d662458e6194343ec66f2024f73b SHA512 41f0c2a630723427fb5f4033b928c1dc0e4c7bd08f301240458129b08e9baab02141e214b73a393a8c7af58ef1b6f785f701407e111a49b825e5006078caa9a8
diff --git a/app-office/calcurse/calcurse-4.2.1.ebuild b/app-office/calcurse/calcurse-4.2.1.ebuild
deleted file mode 100644
index 27a9fb9d46a4..000000000000
--- a/app-office/calcurse/calcurse-4.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools multilib-minimal
-
-DESCRIPTION="a text-based calendar and scheduling application"
-HOMEPAGE="https://calcurse.org/"
-SRC_URI="https://calcurse.org/files/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-PATCHES=( "${FILESDIR}"/"${PN}-4.2.1-tinfo.patch" )
-
-src_prepare() {
-	default
-
-	# Dubious tests.
-	rm -v "${S}/test"/ical-00{2,4,6}.sh || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-}
-
-src_install() {
-	multilib-minimal_src_install
-}
diff --git a/app-office/calcurse/calcurse-4.2.2.ebuild b/app-office/calcurse/calcurse-4.2.2.ebuild
deleted file mode 100644
index 29a53449ca58..000000000000
--- a/app-office/calcurse/calcurse-4.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools multilib-minimal
-
-DESCRIPTION="a text-based calendar and scheduling application"
-HOMEPAGE="https://calcurse.org/"
-SRC_URI="https://calcurse.org/files/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-PATCHES=( "${FILESDIR}"/"${PN}-4.2.1-tinfo.patch" )
-
-src_prepare() {
-	default
-
-	# Dubious tests.
-	rm -v "${S}/test"/ical-00{2,4,6}.sh || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-}
-
-src_install() {
-	multilib-minimal_src_install
-}
diff --git a/app-office/calcurse/calcurse-4.3.0.ebuild b/app-office/calcurse/calcurse-4.3.0.ebuild
index 4b4729db868c..e772e98c93f2 100644
--- a/app-office/calcurse/calcurse-4.3.0.ebuild
+++ b/app-office/calcurse/calcurse-4.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils multilib-minimal
+inherit autotools eutils multilib-minimal
 
 DESCRIPTION="a text-based calendar and scheduling application"
 HOMEPAGE="https://calcurse.org/"
@@ -11,14 +11,25 @@ SRC_URI="https://calcurse.org/files/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+KEYWORDS="amd64 x86 ppc ppc64"
 
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
+RDEPEND="
+	sys-libs/ncurses:0="
+
+DEPEND="
+	${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.1-tinfo.patch
+)
 
 # Most tests fail.
 RESTRICT="test"
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
 }