From 7014a5a3ea0feffab9701fdd6b64cc7667a985af Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 30 Jun 2019 17:36:28 +0100
Subject: gentoo resync : 30.06.2019

---
 dev-lang/mmix/Manifest                |  3 +--
 dev-lang/mmix/mmix-20131017.ebuild    | 47 ----------------------------------
 dev-lang/mmix/mmix-20160804-r1.ebuild | 48 +++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 49 deletions(-)
 delete mode 100644 dev-lang/mmix/mmix-20131017.ebuild
 create mode 100644 dev-lang/mmix/mmix-20160804-r1.ebuild

(limited to 'dev-lang/mmix')

diff --git a/dev-lang/mmix/Manifest b/dev-lang/mmix/Manifest
index b8d0bfe0d3f9..3053e85980e8 100644
--- a/dev-lang/mmix/Manifest
+++ b/dev-lang/mmix/Manifest
@@ -1,7 +1,6 @@
 AUX mmix-20110420-makefile.patch 1636 BLAKE2B f4acfc952dea9671ec5507f4d86a1462131dae835318362b17f341e9575fe1dccda5cd44d257127a27232a197e05f79de5d7a8200d7a2b943161fa38de83937f SHA512 e5cd4944847c00ad7c6b3a87fa6f9a242f7f0b13c31f82e80c49b3b9ec07d7c0106669dce2868705dca073774826c5acc6f8ea1464c1a5c739145f1c2b28eb10
 AUX mmix-20131017-format-security.patch 2256 BLAKE2B 2481c33c024d84af03b289ec9f22c9b98cb27537c32ea9ef020943aa424efac5267d81326241b2d764eb292f373ed51cc30c3ddbdb55f8fa444154cf6cc5fe0d SHA512 e77cdf3d196356cc0cb09f322cc979e4c603592c8f9421764d6830df27fe627958badbd6726021f97bc42a0d9551e4d3b39ca7b1d677b44a543ffcc04028eaea
-DIST mmix-20131017.tgz 308016 BLAKE2B 195c4945c61584842af08af891dc2e26672194aef66ff71ba6dfa18bab4e7349de013aa1c3ae195d9d6a69ee4ebc61403acf558a06af86393d5b053920ebad55 SHA512 e816b1ee9205b9f4a2e25ff183c48736ea66e63721a49f0b574850c5872ae85a6e847d802a01b5aa120ac969638d5d05e9b3135512d9362a4d672564f1228922
 DIST mmix-20160804.tgz 308410 BLAKE2B 8bbde51921fe23f016e35bd51346e6445d530815e5e87bff44cf17e081c6b8e55dd6bd24f1ce1621851d2eac309fa44d71aa33d93d3ddfce5213c6643181d38c SHA512 35c518227a4ee40d0aa3be02eda2ab8b2a27696fa789f5007a978419d07b3deebb7f391895e63e3556aeb38dc1ded3bddf2b860125ebf8f7848375e90dc7af75
-EBUILD mmix-20131017.ebuild 919 BLAKE2B cf768d35c5cc4ef369d330bbe79a6651d4ed70b283a866cd3a9750b2a2b9e2f62fcaf6d6352c0db6d34131d5262a8799c8baae103620ca30dccd2956d5328017 SHA512 a963ff9532745b5b974d594fe0790e210f532d20ae0e15edcedc98c815c610a48f05187412658ed12971d947f4902f77c64769ab4414119c255f2d16c8860f81
+EBUILD mmix-20160804-r1.ebuild 983 BLAKE2B ca15f7f49483f7317134f0f73988d7f0d76a64ada9ff48e0816b98bb54b0cb4878dc548287f3d826955c5e9073d4f28defb3d4c6086888bb45d60e21f215795f SHA512 f343cb4a877fdfbf4db9b881035e038433c53e8f87805ff6fc8b8113cfc83808f8d3d6961393b5eb91ddc373af28e5f33eecd7e036d8303ff91163d60b83366a
 EBUILD mmix-20160804.ebuild 897 BLAKE2B 73ed5c7dd58a01f3add173362531ceb2b580dc143ab38dff075803d0b57b9fc4f16492eef64bcf2a0a5f0e41d948c2b9daf69b2a154178c4854360bc9c4a572b SHA512 a7a1e09dcc81b30e124816c33c61d2686ff958bc85f6a15010c2964e6ef3261a54a5bf7656dd1afbd8b5e409fda609fb4ec45cabba3543bf99df284cefd303d4
 MISC metadata.xml 359 BLAKE2B 8e1746961e93d5df12f25907921a6186e3ae082de593f976cc4a253a0fbe9f33e78b6538b4a33e958f73bab2d20179eca1b54301240d83d16471c4acee95426c SHA512 70c8cf6e10f42baf6d223ef0f622465a8f196b2935276c793d5961e6304478c0f03231ade7c3e776e9bffb70bf53c550aa23c8a65ddfac1562c71314d85fb622
diff --git a/dev-lang/mmix/mmix-20131017.ebuild b/dev-lang/mmix/mmix-20131017.ebuild
deleted file mode 100644
index 7e736d6cecff..000000000000
--- a/dev-lang/mmix/mmix-20131017.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Donald Knuth's MMIX Assembler and Simulator"
-HOMEPAGE="https://www-cs-faculty.stanford.edu/~knuth/mmix.html http://mmix.cs.hm.edu"
-SRC_URI="http://mmix.cs.hm.edu/src/${P}.tgz"
-
-DEPEND="virtual/tex-base
-	doc? ( dev-texlive/texlive-plaingeneric )"
-RDEPEND=""
-
-SLOT="0"
-LICENSE="${PN}"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20110420-makefile.patch
-	epatch "${FILESDIR}"/${PN}-20131017-format-security.patch
-}
-
-src_compile() {
-	export VARTEXFONTS=${T}/fonts
-	emake all \
-		CFLAGS="${CFLAGS}" \
-		CC="$(tc-getCC)"
-
-	if use doc ; then
-		emake doc
-	fi
-}
-
-src_install () {
-	dobin ${PN} ${PN}al m${PN} mmotype abstime
-	dodoc README ${PN}.1
-
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins *.ps
-	fi
-}
diff --git a/dev-lang/mmix/mmix-20160804-r1.ebuild b/dev-lang/mmix/mmix-20160804-r1.ebuild
new file mode 100644
index 000000000000..3d8f806d1bb8
--- /dev/null
+++ b/dev-lang/mmix/mmix-20160804-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Donald Knuth's MMIX Assembler and Simulator"
+HOMEPAGE="https://www-cs-faculty.stanford.edu/~knuth/mmix.html http://mmix.cs.hm.edu"
+SRC_URI="http://mmix.cs.hm.edu/src/${P}.tgz"
+
+DEPEND="virtual/tex-base
+	doc? ( dev-texlive/texlive-plaingeneric )"
+# media-sound/mmix and dev-lang/mmix both install 'mmix' binary, bug #426874
+RDEPEND="!!media-sound/mmix"
+
+SLOT="0"
+LICENSE="${PN}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20110420-makefile.patch
+	"${FILESDIR}"/${PN}-20131017-format-security.patch
+)
+
+src_compile() {
+	export VARTEXFONTS=${T}/fonts
+	emake all \
+		CFLAGS="${CFLAGS}" \
+		CC="$(tc-getCC)"
+
+	if use doc ; then
+		emake doc
+	fi
+}
+
+src_install() {
+	dobin ${PN} ${PN}al m${PN} mmotype abstime
+	dodoc README ${PN}.1
+
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins *.ps
+	fi
+}
-- 
cgit v1.2.3