commit: 1b8cebf4ee3ea5ebfd34a521e7d967cd10040225 Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com> AuthorDate: Sun Jun 16 06:20:20 2019 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Jun 23 21:12:11 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b8cebf4
games-util/deutex: version bump to deutex-5.2.0 Closes: https://bugs.gentoo.org/680460 Closes: https://bugs.gentoo.org/687678 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12262 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-util/deutex/Manifest | 2 +- games-util/deutex/deutex-4.4.0.ebuild | 31 -------------------- games-util/deutex/deutex-5.2.0.ebuild | 23 +++++++++++++++ games-util/deutex/files/deutex-4.4.0-64bit.patch | 13 --------- .../deutex/files/deutex-4.4.0-makefile.patch | 29 ------------------ games-util/deutex/files/deutex-4.4.0-ovflfix.patch | 11 ------- games-util/deutex/metadata.xml | 34 +++++++++++++++++++--- 7 files changed, 54 insertions(+), 89 deletions(-) diff --git a/games-util/deutex/Manifest b/games-util/deutex/Manifest index 32d4064a3f0..80a384510e1 100644 --- a/games-util/deutex/Manifest +++ b/games-util/deutex/Manifest @@ -1 +1 @@ -DIST deutex-4.4.0.tar.gz 215945 BLAKE2B f1f2fffa5655cde9ccd04e4045890a41878d85ec76b9c0a3e13e5d67d4e312b13e7b83916961709863fceede90a94731e8351737f94928ef465681d1a7abcdd0 SHA512 fc9aaf399bc9d8ea812102decdf6b3c6d5f4c4a69e925e02fe0e75fa8dc9e54ad36afc352e83819ba13b9ae5dda90bb65c1856825c3ee17c7bd370909b866fb5 +DIST deutex-5.2.0.tar.xz 165772 BLAKE2B 4451e6abc13d3d6e9176a5d8aad6a5d3d986b2b280b2094d89876ec9bea68db5aa9179f8d650932499a2f8853fb57644f723e4214f5a973f217ef34e236e57a9 SHA512 5baa3e06e8562e36e9e520a52a7b4407277e7741deb543eb7b68587a9aab3f409c574415654e8a1ef15d2afb7750aa603189f8de749353666295c6a292b92a33 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 9ef3310f618..00000000000 --- 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 00000000000..f4802fcadd4 --- /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 b5028cd4ffb..00000000000 --- 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 49265e14f3f..00000000000 --- 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 32a7dce0d97..00000000000 --- 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 78274e0fa55..9a0a48fe7f2 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>ga...@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.g...@gmail.com</email> + <name>William Breathitt Gray</name> + </maintainer> + <maintainer type="project"> + <email>proxy-ma...@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>ga...@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>
