gentoo resync : 22.10.2018

4 files changed, 62 insertions, 37 deletions

diff --git a/media-sound/tk707/Manifest b/media-sound/tk707/Manifest
index 9d996aa9d029..0ab04254396f 100644
--- a/media-sound/tk707/Manifest
+++ b/media-sound/tk707/Manifest
@@ -1,6 +1,7 @@
 AUX tk707-0.8-asneeded.patch 644 BLAKE2B 240bb074707a26ea68e3a18b6cfedc5209fcc6b9176f649a4507b6a61cc05f0d5b80f42122362f833499e5463b726fcd94fd9490fa17492a2ab5c007ce80ca1d SHA512 eeb595cec305420eebeb01c10d7ecab8ae5b429e96470004c27da802f28fcd221064efe1d72fd67073f73b7d19238beb5b2619e18d568858d78f5858de0c3431
+AUX tk707-0.8-glibc-2.27.patch 466 BLAKE2B 1fd4c37d9ef1992da969d69a225cac875494ef96080d8cb6e89cb2a4a27e077ad86a5bf5e34f4ac7741d977ac2e7695aba0a14cc5a55b8c2dea55f2437054748 SHA512 b1324d02930325c7a9d22e720a74c28c9e53d29073ffc2a71fc59c1708868ce36158b6a4e8d57f550fda591d458fc4913b77f4348e3a90a664ae0319e5d5cf1e
 AUX tk707-0.8-nostrip.patch 501 BLAKE2B d70bf604b68185c7397429058a77c9b8b2f9a24e0e6446ad40f05b59ca9f072f624b9a31777b476bde94dc16fdf27611379968ffbb85e88e06886e4d243c605c SHA512 bb652d71029a74c3b487e40aeb1dcac66333033235ad4cf60a4ce1e0c515728792528364c35fae0ae6b071e028173c0f42bf794fa36855be1e1531deb02e5915
 DIST tk707-0.8-updated_tcl2c.patch.gz 7368 BLAKE2B 733fc4d30462d347d1583378d9f32786f6f8aa974d4741cdf3b7f903eecbe43b9eb07815dd3bd6a1fdb4a3cfab893dbec10e386b3fee32f5ec9f22eebea62e94 SHA512 b64a0303ad338863591993696bec1e8ad89473d20be5c08b8935ff8f577684af03f9bed46f0873c4a6d7839cfab583b918d0113ab12341e3b662560385720736
 DIST tk707-0.8.tar.gz 404862 BLAKE2B e99879bf504c3be6c450e7352b8977c572333dae378cc1c4ef96854e263e454350986399c8be72aa03cf8f19cdb0a3c204394a60d1ee10dfcacc62322ebe82f2 SHA512 af5a6958d3ae3fe5e53be5251ba2b3038447b898a3ec40e866a7a0c4d025e450effee7adfc528f01a581b3f7186a269480a4cc6104378f5fdff46ebe277c44c6
-EBUILD tk707-0.8-r1.ebuild 748 BLAKE2B 417668caa61e3cbe0000bc7909d385af4bf012b10378202c7184711683a8ba28893c531f7fcd2f57d100cba3ed23f13780dd7b8bbeee9e5decebc2539e44f230 SHA512 9905a6e10cdba3d652a23131113f184d15a7581b88b8901dce72ec07305eb66fddf676ddc2c634b79aa22b991f3471dd817ecd5a7be85b769d8cd70855d65fc3
+EBUILD tk707-0.8-r2.ebuild 861 BLAKE2B f17cb4bf5e185a597c57db2bd01ca3e21937fcba71147c2ec4001ba8e472797635235526837e4bb1d6f97fe2423ffb78a27b81d449b268ca1309c769de3deea8 SHA512 dd8deb44c237b30392e5696e8b74d12cf6db93f99f67e882b79ce661e9a7b08475092e3a94a00810fa23bae05e6db03b335259437b8da7833029b6d568081b9c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/tk707/files/tk707-0.8-glibc-2.27.patch b/media-sound/tk707/files/tk707-0.8-glibc-2.27.patch
new file mode 100644
index 000000000000..5a2c09bb704e
--- /dev/null
+++ b/media-sound/tk707/files/tk707-0.8-glibc-2.27.patch
@@ -0,0 +1,18 @@
+Bug: https://bugs.gentoo.org/648308
+
+--- a/tk707AppInit.c
++++ b/tk707AppInit.c
+@@ -31,13 +31,6 @@
+ extern int Init_tk707(Tcl_Interp *interp);
+ extern int Init_tk707_Scripts(Tcl_Interp *interp);
+ 
+-/*
+- * The following variable is a special hack that is needed in order for
+- * Sun shared libraries to be used for Tcl.
+- */
+-
+-int *tclDummyMathPtr = (int *) matherr;
+-
+ #ifdef TK_TEST
+ extern int		Tktest_Init _ANSI_ARGS_((Tcl_Interp *interp));
+ #endif /* TK_TEST */
diff --git a/media-sound/tk707/tk707-0.8-r1.ebuild b/media-sound/tk707/tk707-0.8-r1.ebuild
deleted file mode 100644
index 10c5456ac6c5..000000000000
--- a/media-sound/tk707/tk707-0.8-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION=" An \"7x7\" type midi drum sequencer for Linux"
-HOMEPAGE="http://www-lmc.imag.fr/lmc-edp/Pierre.Saramito/tk707"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	mirror://gentoo/${P}-updated_tcl2c.patch.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE=""
-
-RDEPEND=">=media-libs/alsa-lib-0.9.0
-		>=dev-lang/tcl-8.4
-		>=dev-lang/tk-8.4"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_SOURCE=${S} epatch ${P}-*.patch
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/media-sound/tk707/tk707-0.8-r2.ebuild b/media-sound/tk707/tk707-0.8-r2.ebuild
new file mode 100644
index 000000000000..03b31573728b
--- /dev/null
+++ b/media-sound/tk707/tk707-0.8-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop
+
+DESCRIPTION=" An 7x7 type midi drum sequencer for Linux"
+HOMEPAGE="http://www-ljk.imag.fr/membres/Pierre.Saramito/tk707/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	mirror://gentoo/${P}-updated_tcl2c.patch.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+RDEPEND="
+	>=media-libs/alsa-lib-0.9.0
+	>=dev-lang/tcl-8.4:0=
+	>=dev-lang/tk-8.4:0=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${WORKDIR}/${P}-updated_tcl2c.patch"
+	"${FILESDIR}/${P}-asneeded.patch"
+	"${FILESDIR}/${P}-nostrip.patch"
+	"${FILESDIR}/${P}-glibc-2.27.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	HTML_DOCS="tk707.html" default
+	rm -rf "${ED}"/usr/share/html/
+	make_desktop_entry "${PN}"
+}