Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/adplay/files/, media-sound/adplay/
Date: Fri, 28 Feb 2020 08:11:18
Message-Id: 1582877467.429988cc6edf4e067ddfe71eb98097a6b77830b8.zlogene@gentoo
1 commit: 429988cc6edf4e067ddfe71eb98097a6b77830b8
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 28 08:10:55 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 28 08:11:07 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429988cc
7
8 media-sound/adplay: cleanup
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11
12 media-sound/adplay/Manifest | 2 --
13 media-sound/adplay/adplay-1.7.ebuild | 31 ----------------------
14 media-sound/adplay/adplay-1.8.ebuild | 30 ---------------------
15 .../adplay/files/adplay-1.7-fix-c++14.patch | 22 ---------------
16 media-sound/adplay/metadata.xml | 12 ---------
17 5 files changed, 97 deletions(-)
18
19 diff --git a/media-sound/adplay/Manifest b/media-sound/adplay/Manifest
20 deleted file mode 100644
21 index 95a5684f778..00000000000
22 --- a/media-sound/adplay/Manifest
23 +++ /dev/null
24 @@ -1,2 +0,0 @@
25 -DIST adplay-1.7.tar.bz2 264340 BLAKE2B ea9231c66a8233ee1d026bccd073440cbbc0e8868469aee33ec0e18c7d893fa24dd20bb4fe960f908db0666e7ee5c6a4afd14051b851b011418796cc0cc2c939 SHA512 854a9bee1057d3a42308d9149e74a8abae0b6bdfda5e1466086df9d6aeed4bbc92a045bca02917fc699b43195572b39c6316ddf56ee3441add1a01d6cbbdfcbe
26 -DIST adplay-1.8.tar.bz2 333582 BLAKE2B e5d0e3baf3f37adb1a2f42eee368fbbcb3947b0c651415b60d5f1d648d004789eae0ef75b7e6ac8ad9f90ac9941332e713e36555167648a40a871659083d1b59 SHA512 6a82b10fa73ad9317303da03d2fcb1fa97772d850f3f78f53c554b9daaa9ae5d04bc2f0a1b1d25fd5d3a1eab073641d6fa0589070721612987d57762f03363c7
27
28 diff --git a/media-sound/adplay/adplay-1.7.ebuild b/media-sound/adplay/adplay-1.7.ebuild
29 deleted file mode 100644
30 index f74ad97918c..00000000000
31 --- a/media-sound/adplay/adplay-1.7.ebuild
32 +++ /dev/null
33 @@ -1,31 +0,0 @@
34 -# Copyright 1999-2016 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -DESCRIPTION="A console player for AdLib music"
40 -HOMEPAGE="http://adplug.sourceforge.net"
41 -SRC_URI="mirror://sourceforge/adplug/${P}.tar.bz2"
42 -
43 -LICENSE="GPL-2"
44 -SLOT="0"
45 -KEYWORDS="amd64 ~ppc x86"
46 -IUSE="alsa ao oss sdl"
47 -
48 -RDEPEND=">=media-libs/adplug-2.2.1
49 - dev-cpp/libbinio
50 - alsa? ( media-libs/alsa-lib )
51 - ao? ( media-libs/libao )
52 - sdl? ( media-libs/libsdl )"
53 -DEPEND="${RDEPEND}
54 - virtual/pkgconfig"
55 -PATCHES=( "${FILESDIR}/${PN}-1.7-fix-c++14.patch" )
56 -
57 -src_configure() {
58 - econf \
59 - --disable-output-esound \
60 - $(use_enable alsa output-alsa) \
61 - $(use_enable ao output-ao) \
62 - $(use_enable oss output-oss) \
63 - $(use_enable sdl output-sdl)
64 -}
65
66 diff --git a/media-sound/adplay/adplay-1.8.ebuild b/media-sound/adplay/adplay-1.8.ebuild
67 deleted file mode 100644
68 index 8803bc8d8db..00000000000
69 --- a/media-sound/adplay/adplay-1.8.ebuild
70 +++ /dev/null
71 @@ -1,30 +0,0 @@
72 -# Copyright 1999-2019 Gentoo Authors
73 -# Distributed under the terms of the GNU General Public License v2
74 -
75 -EAPI=7
76 -
77 -DESCRIPTION="A console player for AdLib music"
78 -HOMEPAGE="https://adplug.github.io/"
79 -SRC_URI="https://github.com/adplug/adplay-unix/releases/download/v${PV}/${P}.tar.bz2"
80 -
81 -LICENSE="GPL-2"
82 -SLOT="0"
83 -KEYWORDS="amd64 ~ppc x86"
84 -IUSE="alsa ao oss sdl"
85 -
86 -RDEPEND=">=media-libs/adplug-2.2.1
87 - dev-cpp/libbinio
88 - alsa? ( media-libs/alsa-lib )
89 - ao? ( media-libs/libao )
90 - sdl? ( media-libs/libsdl )"
91 -DEPEND="${RDEPEND}
92 - virtual/pkgconfig"
93 -
94 -src_configure() {
95 - econf \
96 - --disable-output-esound \
97 - $(use_enable alsa output-alsa) \
98 - $(use_enable ao output-ao) \
99 - $(use_enable oss output-oss) \
100 - $(use_enable sdl output-sdl)
101 -}
102
103 diff --git a/media-sound/adplay/files/adplay-1.7-fix-c++14.patch b/media-sound/adplay/files/adplay-1.7-fix-c++14.patch
104 deleted file mode 100644
105 index aedbbc0ab1c..00000000000
106 --- a/media-sound/adplay/files/adplay-1.7-fix-c++14.patch
107 +++ /dev/null
108 @@ -1,22 +0,0 @@
109 -From 48dcaa87ff91369eb41998abd72e226fe138b528 Mon Sep 17 00:00:00 2001
110 -From: Adam Nielsen <malvineous@×××××××.net>
111 -Date: Sun, 22 May 2016 08:49:47 +1000
112 -Subject: [PATCH] Cast -1 to unsigned int to prevent compiler error
113 -
114 ----
115 - src/adplay.cc | 2 +-
116 - 1 file changed, 1 insertion(+), 1 deletion(-)
117 -
118 -diff --git a/src/adplay.cc b/src/adplay.cc
119 -index d73ec25..da00730 100644
120 ---- a/src/adplay.cc
121 -+++ b/src/adplay.cc
122 -@@ -90,7 +90,7 @@ static struct {
123 - 1, 16, 0, // Else default to mono (until stereo w/ single OPL is fixed)
124 - #endif
125 - MSG_NOTE,
126 -- -1,
127 -+ (unsigned int)-1,
128 - NULL,
129 - NULL,
130 - true, false, false, false,
131
132 diff --git a/media-sound/adplay/metadata.xml b/media-sound/adplay/metadata.xml
133 deleted file mode 100644
134 index dc329baaf1b..00000000000
135 --- a/media-sound/adplay/metadata.xml
136 +++ /dev/null
137 @@ -1,12 +0,0 @@
138 -<?xml version="1.0" encoding="UTF-8"?>
139 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
140 -<pkgmetadata>
141 - <maintainer type="project">
142 - <email>sound@g.o</email>
143 - <name>Gentoo Sound project</name>
144 - </maintainer>
145 - <upstream>
146 - <remote-id type="sourceforge">adplug</remote-id>
147 - <remote-id type="github">adplug/adplay-unix</remote-id>
148 - </upstream>
149 -</pkgmetadata>