From 1db00cc6e94b90c08090bb5b8c406622946c4ae5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 31 Jan 2019 16:00:27 +0000
Subject: gentoo resync 31.01.2019

---
 x11-wm/vtwm/Manifest             |  2 +-
 x11-wm/vtwm/vtwm-5.4.7-r1.ebuild | 71 ----------------------------------------
 x11-wm/vtwm/vtwm-5.4.7-r2.ebuild | 71 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 72 deletions(-)
 delete mode 100644 x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
 create mode 100644 x11-wm/vtwm/vtwm-5.4.7-r2.ebuild

(limited to 'x11-wm/vtwm')

diff --git a/x11-wm/vtwm/Manifest b/x11-wm/vtwm/Manifest
index bad263786983..fab554f8a9df 100644
--- a/x11-wm/vtwm/Manifest
+++ b/x11-wm/vtwm/Manifest
@@ -3,5 +3,5 @@ AUX vtwm-5.4.7-do-not-rm.patch 1039 BLAKE2B ae8b28056e353f2b36e61935c32ef58e74cf
 DIST vtwm-5.4.6a.tar.gz 992488 BLAKE2B 15a28556c78a9fc81f656eb6d50a2bf9f2d86ef6938cb8926cbb909c2c0edce6cbbe09270e72dfc29f9c665aecc36dcd57bcbf26af96b1f3b24518427b652395 SHA512 2500dfe50fae90cbceeee2b3dcf1dd05c330abd978a51abdf2768b3231fabdd71975f3bbdc341ebe25101773009cbf7cb12f263a013165bbda5c048e8b602686
 DIST vtwm-5.4.7.tar.gz 1021160 BLAKE2B a669e21d2fad5a93036c866053fb73db25f3ab1e877256650d4cc295db3861bd6ff90517e00d7042b00621c05d1947b9747380eac72fec85cfc1d68c8a6b59bb SHA512 abd9a1b1d077232eef7f39521823446f2674d69a071333209a808ff651dfa83a7f6fa00dab06356897d9e7a88fd6616e5920af030e24541bd4703b3351628728
 EBUILD vtwm-5.4.6a.ebuild 961 BLAKE2B 2d61bc4d825ad2437f3cacf56eb9e58d7ec78b73677cb82e44bfb4dd91d99d2c774d9c72d8c2066aff020185d587d053f4e4d1f10bb407acf74127a3ad23d0eb SHA512 c88fc5582e4067e16d4d447bbf4ca1c603014c198c13dc225a68c11743971f694680db6c96ffd06801faca94a0850e427f44339168fc9faffd445ee35374da93
-EBUILD vtwm-5.4.7-r1.ebuild 1599 BLAKE2B 2823d7eb3e35da76ed5a0f6c965d337e9639f6ed44618e3bb1f414956094e91ebdfa42d72ec664d4d1c2b2f3faf128ff2e4a99f73dec070daa8a06af9e8b89ed SHA512 7ebebb8bce9b391df99a557a6e990a4471190540013bd40a9887c4d204d98a9482576b4e3a1c26340e05e207878d8d16b3badef930537f83fa2ca0de893d7c6c
+EBUILD vtwm-5.4.7-r2.ebuild 1499 BLAKE2B d2cf69f4a2a59f7d0fe68ffe486efef3bef63bfe7c1302d8bfcd8b362255b7b9b731ef448b805e334ad00c9188395f7d2bf1705c7e0faf43a36bb2f8ef79d9b4 SHA512 78b32a43199954cc89670a5402ae3348d2fed59df1469dc2111c32b35f493924b1cd723e1bd3c6727550a55ff31854c96b90bc3c1a2e98fd877b7c8bfcbe231c
 MISC metadata.xml 636 BLAKE2B c49eb363f70a7d86906e229d5b9275ad5192068b61f3d4aa46a0c6711e4e3b46e27099ce1bb53e57b9476cda6bbf67fac55cb7eb6c70b37aa35bf08081f7a397 SHA512 5b71984f85b57680ea4d9432ee9aac7c4ed9d0df7082425fb650099338dad971985a56f8278ebb6c2eebe45d58272753682ffdbb9dfebeb54d6fd5d9539b77a4
diff --git a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
deleted file mode 100644
index 4fb624a7bec4..000000000000
--- a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="one of many TWM descendants and implements a Virtual Desktop"
-HOMEPAGE="http://www.vtwm.org/"
-SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
-IUSE="rplay"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXpm
-	rplay? ( media-sound/rplay )"
-DEPEND="${RDEPEND}
-	app-text/rman
-	sys-devel/bison
-	sys-devel/flex
-	x11-base/xorg-proto
-	x11-misc/imake"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-do-not-rm.patch
-	sed -i Imakefile \
-		-e 's:-L/usr/local/lib::g' \
-		-e 's:-I/usr/local/include::g' \
-		|| die "sed Imakefile"
-	if ! use rplay ; then
-		sed -i Imakefile \
-			-e 's:^XCOMM\ \(.*NO_SOUND\):\1:' \
-			-e 's:^\(SOUNDLIB.*\):XCOMM\ \1:' \
-			-e 's:sound\..::g' \
-			|| die "sed Imakefile"
-		epatch "${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch
-	fi
-}
-
-src_configure() {
-	xmkmf || die "xmkmf failed"
-	emake depend || die "emake depend"
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CCOPTIONS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake BINDIR=/usr/bin \
-		LIBDIR=/etc/X11 \
-		MANPATH=/usr/share/man \
-		DESTDIR="${D}" install || die "emake install failed"
-
-	echo "#!/bin/sh" > vtwm
-	echo "xsetroot -cursor_name left_ptr &" >> vtwm
-	echo "/usr/bin/vtwm" >> vtwm
-	exeinto /etc/X11/Sessions
-	doexe vtwm || die
-	dodoc doc/{4.7.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST} || die
-}
diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
new file mode 100644
index 000000000000..449d88600609
--- /dev/null
+++ b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="TWM descendant that implements a Virtual Desktop"
+HOMEPAGE="http://www.vtwm.org/"
+SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="rplay"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm
+	rplay? ( media-sound/rplay )"
+DEPEND="${RDEPEND}
+	app-text/rman
+	sys-devel/bison
+	sys-devel/flex
+	x11-base/xorg-proto
+	x11-misc/imake"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-do-not-rm.patch
+	sed -i Imakefile \
+		-e 's:-L/usr/local/lib::g' \
+		-e 's:-I/usr/local/include::g' \
+		|| die "sed Imakefile"
+	if ! use rplay ; then
+		sed -i Imakefile \
+			-e 's:^XCOMM\ \(.*NO_SOUND\):\1:' \
+			-e 's:^\(SOUNDLIB.*\):XCOMM\ \1:' \
+			-e 's:sound\..::g' \
+			|| die "sed Imakefile"
+		eapply "${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch
+	fi
+	default
+}
+
+src_configure() {
+	xmkmf || die "xmkmf failed"
+	emake depend
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	emake BINDIR=/usr/bin \
+		LIBDIR=/etc/X11 \
+		MANPATH=/usr/share/man \
+		DESTDIR="${D}" install
+
+	echo "#!/bin/sh" > vtwm
+	echo "xsetroot -cursor_name left_ptr &" >> vtwm
+	echo "/usr/bin/vtwm" >> vtwm
+	exeinto /etc/X11/Sessions
+	doexe vtwm
+	dodoc doc/{4.7.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST}
+}
-- 
cgit v1.2.3