Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/apngasm/, media-gfx/apngasm/files/
Date: Sun, 20 Feb 2022 05:27:36
Message-Id: 1645334743.659acda4b77ece747c4d3d54f34ec9a4657d0a37.sam@gentoo
1 commit: 659acda4b77ece747c4d3d54f34ec9a4657d0a37
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 20 05:11:02 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 20 05:25:43 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659acda4
7
8 media-gfx/apngasm: drop 2.91-r1
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 media-gfx/apngasm/Manifest | 1 -
13 media-gfx/apngasm/apngasm-2.91-r1.ebuild | 52 ----------------------
14 .../apngasm/files/apngasm-2.91-makefile.patch | 22 ---------
15 media-gfx/apngasm/metadata.xml | 4 --
16 4 files changed, 79 deletions(-)
17
18 diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
19 index d29bfb20fae9..0cecabb76b20 100644
20 --- a/media-gfx/apngasm/Manifest
21 +++ b/media-gfx/apngasm/Manifest
22 @@ -1,2 +1 @@
23 -DIST apngasm-2.91-src.zip 597267 BLAKE2B a34a765fef49aa0ac29973b8dc450bfcdfe7aa83dffe19919f916a136db3d0bfebf3c1fac79bfb81a3900cee87afd888469e5432500d181a9539696b4573a42b SHA512 2415389a989f7a7ff7f3e1328f7920c7515c9a492c89ef216ff53db68fe2f1a674ff60d5f4bfd5a8c710f625456557ae7d5b25f486ac826e3113976cd9fc11dc
24 DIST apngasm-3.1.10.tar.gz 620031 BLAKE2B 6885b87815e76e8b9eed58548568bf821dfdf61579f83fc1aa977638f34c2112ebbfebba3454b0a2cfc01b465e570a7976e0fb8046a0762e9d35cf30e3d3f4cd SHA512 670d75251ddc771f9b2b4a1f401066f2012a6814bec781b918f1d9e8960835654c66c3d19b4c8920d5186d85af12cdc4bba8b61c8f3d349b4fc70513d8ecb34e
25
26 diff --git a/media-gfx/apngasm/apngasm-2.91-r1.ebuild b/media-gfx/apngasm/apngasm-2.91-r1.ebuild
27 deleted file mode 100644
28 index ef084fbd4c98..000000000000
29 --- a/media-gfx/apngasm/apngasm-2.91-r1.ebuild
30 +++ /dev/null
31 @@ -1,52 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -inherit flag-o-matic toolchain-funcs
38 -
39 -DESCRIPTION="create an APNG from multiple PNG files"
40 -HOMEPAGE="https://sourceforge.net/projects/apngasm/"
41 -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
42 -
43 -LICENSE="ZLIB 7z? ( LGPL-2.1 )"
44 -SLOT="0"
45 -KEYWORDS="amd64 x86"
46 -IUSE="7z zopfli"
47 -
48 -RDEPEND="media-libs/libpng:0=
49 - sys-libs/zlib
50 - zopfli? ( app-arch/zopfli:= )"
51 -DEPEND="${RDEPEND}
52 - app-arch/unzip"
53 -
54 -S=${WORKDIR}
55 -
56 -PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
57 -
58 -src_prepare() {
59 - default
60 -
61 - # remove bundled libs
62 - rm -r zopfli zlib libpng || die
63 -
64 - if use 7z; then
65 - append-cflags -DFEATURE_7ZIP
66 - else
67 - sed -i '/^SRC_DIRS\s\+=/s/7z//' Makefile || die
68 - fi
69 -
70 - if use zopfli; then
71 - append-cflags -DFEATURE_ZOPFLI
72 - sed -i '/^LIBS\s\+=/s/$/ -lzopfli/' Makefile || die
73 - fi
74 -}
75 -
76 -src_compile() {
77 - emake CC="$(tc-getCC)"
78 -}
79 -
80 -src_install() {
81 - dobin ${PN}
82 - dodoc readme.txt
83 -}
84
85 diff --git a/media-gfx/apngasm/files/apngasm-2.91-makefile.patch b/media-gfx/apngasm/files/apngasm-2.91-makefile.patch
86 deleted file mode 100644
87 index b9fb9c20ee89..000000000000
88 --- a/media-gfx/apngasm/files/apngasm-2.91-makefile.patch
89 +++ /dev/null
90 @@ -1,22 +0,0 @@
91 ---- apngasm-2.91-src/Makefile
92 -+++ apngasm-2.91-src/Makefile
93 -@@ -1,8 +1,7 @@
94 - PACKAGE = apngasm
95 - CC = gcc
96 --SRC_DIRS = . 7z zopfli
97 --CFLAGS = -Wall -pedantic -DFEATURE_7ZIP -DFEATURE_ZOPFLI
98 --CFLAGS_OPT = -O2
99 -+SRC_DIRS = . 7z
100 -+CFLAGS += -Wall -pedantic
101 - CFLAGS_7Z = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
102 - LIBS = -lstdc++ -lm -lpng -lz
103 -
104 -@@ -16,7 +15,7 @@
105 - all : $(PACKAGE)
106 -
107 - $(PACKAGE) : objdirs $(OBJECTS)
108 -- $(CC) -o $@ $(OBJECTS) -s $(LIBS)
109 -+ $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LIBS)
110 -
111 - objdirs :
112 - mkdir -p $(OBJ_DIRS)
113
114 diff --git a/media-gfx/apngasm/metadata.xml b/media-gfx/apngasm/metadata.xml
115 index d31bd859a4ec..cff2266b257f 100644
116 --- a/media-gfx/apngasm/metadata.xml
117 +++ b/media-gfx/apngasm/metadata.xml
118 @@ -2,10 +2,6 @@
119 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
120 <pkgmetadata>
121 <!-- maintainer-needed -->
122 - <use>
123 - <flag name="7z">Enable support for 7zip compression</flag>
124 - <flag name="zopfli">Enable support for Zopfli compression</flag>
125 - </use>
126 <upstream>
127 <remote-id type="sourceforge">apngasm</remote-id>
128 </upstream>