gentoo resync : 30.06.2019

7 files changed, 56 insertions, 94 deletions

diff --git a/games-util/deutex/Manifest b/games-util/deutex/Manifest
index ffcef0eb43a3..d6aa09ad66f0 100644
--- a/games-util/deutex/Manifest
+++ b/games-util/deutex/Manifest
@@ -1,6 +1,3 @@
-AUX deutex-4.4.0-64bit.patch 524 BLAKE2B 4d95f5cdf0e184b56ed56d0039e38caaebd9ebfcfa1673f72d0182f4eb618540905ae614e7d388c7cf0ab10c00dddbd0918b91ecb929520cca042a5f3d3d1fa4 SHA512 c9ea2a50e5f3fe0cedfd1fb2494a3d4ab11a0d2d4505a9bcbc262ae8934db29f15ec2342d45d812e582380f3831b5f825c293b8bedb529373a903ea0393e88cd
-AUX deutex-4.4.0-makefile.patch 621 BLAKE2B 90d3f8fdd25a01ddd36bc23668a4ace971e16a92de10cd44b46331c26cf8ac5c1fa0ac4b8ab69a0e4df80c15f359a683185b0f8149d289ea118241b2b30efa75 SHA512 57872ee7c41f50db0d62385af10c1c27b6460050520c1403db075ea7e8b418000f2356f7db5b7393071708936e78728d5d23aea782dfa72a9ca355214f24fc6a
-AUX deutex-4.4.0-ovflfix.patch 695 BLAKE2B f3ae1908aa72797317aba2fa3e4d814e7a0f605817508336cecb9b846fd3b4b5e645dda7880da8fd1fbcaa7d0b2f4da2dd5c1795d6b55b49eccb55ea67d37765 SHA512 25e7930b422a565e732da80b183cb3270e7072ae77858319dde657c9439f0854c175f7fe93b4ca3627eda52b4e433a62369163537db396a1c8412c8678fc07e4
-DIST deutex-4.4.0.tar.gz 215945 BLAKE2B f1f2fffa5655cde9ccd04e4045890a41878d85ec76b9c0a3e13e5d67d4e312b13e7b83916961709863fceede90a94731e8351737f94928ef465681d1a7abcdd0 SHA512 fc9aaf399bc9d8ea812102decdf6b3c6d5f4c4a69e925e02fe0e75fa8dc9e54ad36afc352e83819ba13b9ae5dda90bb65c1856825c3ee17c7bd370909b866fb5
-EBUILD deutex-4.4.0.ebuild 648 BLAKE2B 196ffc33dd805ec37aa7193ca0cfa344b1b5a72dac19f25814947efb884600fa1589fabe6f19d2077a8aa1a523e075ab04bf71aff9b9672c24c7e4372413ecf4 SHA512 a26f6c621bb36040626f2edae7ed5330e0bc67c7c8ef129089e335da18af743e253b40db7543f11dd38b329f703f7ff65373dc014ae9de7cec7a2c5229da63d6
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+DIST deutex-5.2.0.tar.xz 165772 BLAKE2B 4451e6abc13d3d6e9176a5d8aad6a5d3d986b2b280b2094d89876ec9bea68db5aa9179f8d650932499a2f8853fb57644f723e4214f5a973f217ef34e236e57a9 SHA512 5baa3e06e8562e36e9e520a52a7b4407277e7741deb543eb7b68587a9aab3f409c574415654e8a1ef15d2afb7750aa603189f8de749353666295c6a292b92a33
+EBUILD deutex-5.2.0.ebuild 560 BLAKE2B 6ebbe70524efd07d676e51453aa16a2ead731dc30013b52517df31cd673356a8644867dc7d60fe4bb6f27b80d0ef829a4c255fcd1eee3f0b1d544f2cb2b40aa7 SHA512 e10c9341be1cdb7db1f57b1b2b69e7814039110266c84ede873628ae92e54c19b371582e778a8c12bd00f8c70c000ee66c45697310d34a066b1b77e159bdbb50
+MISC metadata.xml 1225 BLAKE2B 5c2a69f813915309ef9da4cdc45c5b6e25cec5c742f6abe321c06245786055c176698ae7275dd507ad06dfb37b6eb093778aa4593a472c9324c97d35ef1c4e27 SHA512 65ab35a0d9b12e6e5dda98b5277bf17ab2f6c655c2fdb09c9b9bed3684a338b7bdf655f864390b6d74207c94ac8baa6776e825db7f8b1f3060c9ca3983885602
diff --git a/games-util/deutex/deutex-4.4.0.ebuild b/games-util/deutex/deutex-4.4.0.ebuild
deleted file mode 100644
index 9ef3310f618d..000000000000
--- a/games-util/deutex/deutex-4.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs eutils
-
-DESCRIPTION="A wad composer for Doom, Heretic, Hexen and Strife"
-HOMEPAGE="http://www.teaser.fr/~amajorel/deutex/"
-SRC_URI="http://www.teaser.fr/~amajorel/deutex/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-64bit.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch
-	tc-export CC
-}
-
-src_install() {
-	dobin deusf deutex
-	doman deutex.6
-	dodoc CHANGES README TODO
-}
diff --git a/games-util/deutex/deutex-5.2.0.ebuild b/games-util/deutex/deutex-5.2.0.ebuild
new file mode 100644
index 000000000000..f4802fcadd48
--- /dev/null
+++ b/games-util/deutex/deutex-5.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WAD composer for Doom, Heretic, Hexen, and Strife"
+HOMEPAGE="https://github.com/Doom-Utils/deutex"
+SRC_URI="https://github.com/Doom-Utils/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2+ HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="man png"
+
+DEPEND="png? ( media-libs/libpng:0= )"
+RDEPEND="${DEPEND}"
+BDEPEND="man? ( app-text/asciidoc )"
+
+src_configure() {
+	econf \
+		$(use_enable man) \
+		$(use_with png libpng)
+}
diff --git a/games-util/deutex/files/deutex-4.4.0-64bit.patch b/games-util/deutex/files/deutex-4.4.0-64bit.patch
deleted file mode 100644
index b5028cd4ffbd..000000000000
--- a/games-util/deutex/files/deutex-4.4.0-64bit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/deutex.h b/src/deutex.h
-index 0a26df5..7af321c 100644
---- a/src/deutex.h
-+++ b/src/deutex.h
-@@ -31,7 +31,7 @@ Place, Suite 330, Boston, MA 02111-1307, USA.
- #define DeuSF   for DOS .EXE  Unix Linux OS/2
- *********************************************/
- 
--#if defined (__alpha)        /*__ALPHA__ for Alpha processor?*/
-+#if defined (__alpha) || defined (__x86_64__)        /*__ALPHA__ for Alpha processor?*/
- /*long = int64 on a 64bit processor*/
- typedef char           Int8;
- typedef short          Int16;
diff --git a/games-util/deutex/files/deutex-4.4.0-makefile.patch b/games-util/deutex/files/deutex-4.4.0-makefile.patch
deleted file mode 100644
index 49265e14f3fb..000000000000
--- a/games-util/deutex/files/deutex-4.4.0-makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ru deutex-4.4.0.orig/Makefile deutex-4.4.0/Makefile
---- deutex-4.4.0.orig/Makefile	1999-12-24 07:50:16.000000000 -0500
-+++ deutex-4.4.0/Makefile	2010-03-05 14:53:23.763604022 -0500
-@@ -16,11 +16,6 @@
- 
- PREFIX=/usr/local
- 
--# Compiled by users
--CFLAGS   = -O2
--CC       = cc
--LDFLAGS  =
--
- # Compiled by developers
- DCFLAGS  = -g -Wall -Wpointer-arith -Wstrict-prototypes
- DCC      = gcc
-@@ -182,11 +177,11 @@
- 	(sleep 1; mkdir -p tmp; touch tmp/_deusf) &
- 
- tmp/_deutex:
--	-mkdir tmp
-+	@mkdir tmp 2> /dev/null || true
- 	touch $@
- 
- tmp/_deusf:
--	-mkdir tmp
-+	@mkdir tmp 2> /dev/null || true
- 	touch $@
- 
- install:
diff --git a/games-util/deutex/files/deutex-4.4.0-ovflfix.patch b/games-util/deutex/files/deutex-4.4.0-ovflfix.patch
deleted file mode 100644
index 32a7dce0d97c..000000000000
--- a/games-util/deutex/files/deutex-4.4.0-ovflfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sound.c.old	2010-10-27 12:32:28.000000000 +0200
-+++ src/sound.c	2010-10-27 12:32:52.000000000 +0200
-@@ -309,7 +309,7 @@
-   if(fread(&headv,sizeof(struct VOCHEAD),1,fp)!=1) ProgError("VOC: can't read header");
-   if(strncmp(VocId,headv.ident,VOCIDLEN)!=0) ProgError("VOC: bad header");
-   if(fseek(fp,headv.block1,SEEK_SET)) ProgError("VOC: bad header");
--  if(fread(&blockv,sizeof(struct VOCHEAD),1,fp)!=1) ProgError("VOC: can't read block");
-+  if(fread(&blockv,sizeof(struct VOCBLOCK1),1,fp)!=1) ProgError("VOC: can't read block");
-   if(blockv.type!=1) ProgError("VOC: first block is not sound");
-   datasize= ((blockv.sizeU)<<16)&0xFF0000L;
-   datasize+=((blockv.sizeM)<<8)&0xFF00L;
diff --git a/games-util/deutex/metadata.xml b/games-util/deutex/metadata.xml
index 78274e0fa550..9a0a48fe7f21 100644
--- a/games-util/deutex/metadata.xml
+++ b/games-util/deutex/metadata.xml
@@ -1,8 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<longdescription lang="en">
+		DeuTex can do many things with Doom, Freedoom, Heretic, Hexen,
+		and Strife “WAD” files, such as extracting and inserting
+		graphics, sounds, levels, and other resources. It can be used
+		for creating and modifying IWAD (“Internal WAD”) and PWAD
+		(“Patch WAD”) files both.
+
+		It is a command-line driven program and as such, is suitable for
+		scripting such as from a shell script or Makefile.
+	</longdescription>
+	<maintainer type="person">
+		<email>vilhelm.gray@gmail.com</email>
+		<name>William Breathitt Gray</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="man">Build and install man pages</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://github.com/Doom-Utils/deutex/issues</bugs-to>
+		<doc lang="en">https://github.com/Doom-Utils/deutex</doc>
+		<remote-id type="github">Doom-Utils/deutex</remote-id>
+	</upstream>
 </pkgmetadata>