1 |
commit: 3510c4511535a1cb22340f2016e164e1b17295b5 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 15 19:39:28 2019 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 15 19:39:51 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3510c451 |
7 |
|
8 |
media-gfx/aview: Drop old |
9 |
|
10 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
media-gfx/aview/aview-1.3.0_rc1-r1.ebuild | 39 ---------------- |
14 |
.../files/aview-1.3.0_rc1-filename-spaces.patch | 53 ---------------------- |
15 |
.../aview/files/aview-1.3.0_rc1-tmp_creation.patch | 46 ------------------- |
16 |
3 files changed, 138 deletions(-) |
17 |
|
18 |
diff --git a/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild |
19 |
deleted file mode 100644 |
20 |
index d7700f08235..00000000000 |
21 |
--- a/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild |
22 |
+++ /dev/null |
23 |
@@ -1,39 +0,0 @@ |
24 |
-# Copyright 1999-2018 Gentoo Foundation |
25 |
-# Distributed under the terms of the GNU General Public License v2 |
26 |
- |
27 |
-EAPI=0 |
28 |
- |
29 |
-inherit base |
30 |
- |
31 |
-MY_P=${P/_/} |
32 |
-S=${WORKDIR}/${MY_P/rc*/} |
33 |
-DESCRIPTION="An ASCII Image Viewer" |
34 |
-SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz" |
35 |
-HOMEPAGE="http://aa-project.sourceforge.net/aview/" |
36 |
- |
37 |
-SLOT="0" |
38 |
-LICENSE="GPL-2" |
39 |
-KEYWORDS="amd64 ppc x86" |
40 |
-IUSE="" |
41 |
- |
42 |
-DEPEND=">=media-libs/aalib-1.4_rc4" |
43 |
-RDEPEND="${DEPEND}" |
44 |
- |
45 |
-PATCHES=( |
46 |
- "${FILESDIR}"/${P}-filename-spaces.patch |
47 |
- "${FILESDIR}"/${P}-tmp_creation.patch |
48 |
- "${FILESDIR}"/${P}-includes.patch |
49 |
-) |
50 |
- |
51 |
-src_compile() { |
52 |
- econf || die |
53 |
- make aview || die |
54 |
-} |
55 |
- |
56 |
-src_install() { |
57 |
- into /usr |
58 |
- dobin aview asciiview |
59 |
- |
60 |
- doman *.1 |
61 |
- dodoc ANNOUNCE ChangeLog README TODO |
62 |
-} |
63 |
|
64 |
diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch b/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch |
65 |
deleted file mode 100644 |
66 |
index e42ed0d5c58..00000000000 |
67 |
--- a/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch |
68 |
+++ /dev/null |
69 |
@@ -1,53 +0,0 @@ |
70 |
-diff -ur aview-1.3.0-orig/asciiview aview-1.3.0/asciiview |
71 |
---- aview-1.3.0-orig/asciiview 2005-08-15 21:20:16.000000000 -0400 |
72 |
-+++ aview-1.3.0/asciiview 2005-08-15 21:20:19.000000000 -0400 |
73 |
-@@ -7,9 +7,9 @@ |
74 |
- } |
75 |
- myconvert() |
76 |
- { |
77 |
-- if anytopnm $1 >/tmp/aview$$.pgm 2>/dev/null ; then |
78 |
-+ if anytopnm "$1" >/tmp/aview$$.pgm 2>/dev/null ; then |
79 |
- exit |
80 |
-- elif convert -colorspace gray $1 pgm:- 2>/dev/null ; then |
81 |
-+ elif convert -colorspace gray "$1" pgm:- 2>/dev/null ; then |
82 |
- exit |
83 |
- fi |
84 |
- echo "Failed to convert file format to PNM by both convert and anytopnm" >&2 |
85 |
-@@ -44,8 +44,13 @@ |
86 |
- options="$options $1" |
87 |
- shift |
88 |
- ;; |
89 |
-- *) |
90 |
-- filenames="$filenames $1" |
91 |
-+ *) |
92 |
-+ if [ "$filenames" = "" ] |
93 |
-+ then |
94 |
-+ filenames=$1 #avoid leading null |
95 |
-+ else |
96 |
-+ filenames=$(echo -e "$filenames\000$1") |
97 |
-+ fi |
98 |
- shift |
99 |
- ;; |
100 |
- esac |
101 |
-@@ -53,15 +58,16 @@ |
102 |
- trap clear 0 |
103 |
- mkfifo /tmp/aview$$.pgm |
104 |
- outfile=/tmp/aview$$.pgm |
105 |
--for name in $filenames ; do |
106 |
--if test -r $name ; then |
107 |
--case $name in |
108 |
-+IFS=$(echo -e "\000") |
109 |
-+echo $filenames | while read name; do |
110 |
-+if test -r "$name" ; then |
111 |
-+case "$name" in |
112 |
- *.fli | *.lfc | *.flic ) |
113 |
- PATH="$PATH:." |
114 |
-- aaflip $options $name |
115 |
-+ aaflip $options "$name" |
116 |
- ;; |
117 |
- *) |
118 |
-- myconvert $name >/tmp/aview$$.pgm & |
119 |
-+ myconvert "$name" >/tmp/aview$$.pgm & |
120 |
- pid=$! |
121 |
- PATH="$PATH:." |
122 |
- aview $options /tmp/aview$$.pgm |
123 |
|
124 |
diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch b/media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch |
125 |
deleted file mode 100644 |
126 |
index f792e8bfebb..00000000000 |
127 |
--- a/media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch |
128 |
+++ /dev/null |
129 |
@@ -1,46 +0,0 @@ |
130 |
-Fix insecure temporary file creation, see: |
131 |
-https://bugs.gentoo.org/show_bug.cgi?id=235808 |
132 |
- |
133 |
-Index: aview-1.3.0/asciiview |
134 |
-=================================================================== |
135 |
---- aview-1.3.0.orig/asciiview |
136 |
-+++ aview-1.3.0/asciiview |
137 |
-@@ -3,11 +3,11 @@ |
138 |
- clear() |
139 |
- { |
140 |
- kill $! 2>/dev/null |
141 |
-- rm -f /tmp/aview$$.pgm 2>/dev/null |
142 |
-+ rm -rf $tmpdir 2>/dev/null |
143 |
- } |
144 |
- myconvert() |
145 |
- { |
146 |
-- if anytopnm "$1" >/tmp/aview$$.pgm 2>/dev/null ; then |
147 |
-+ if anytopnm "$1" >"$2" 2>/dev/null ; then |
148 |
- exit |
149 |
- elif convert -colorspace gray "$1" pgm:- 2>/dev/null ; then |
150 |
- exit |
151 |
-@@ -56,8 +56,9 @@ while [ "$1" != "" ]; do |
152 |
- esac |
153 |
- done |
154 |
- trap clear 0 |
155 |
--mkfifo /tmp/aview$$.pgm |
156 |
--outfile=/tmp/aview$$.pgm |
157 |
-+tmpdir=`mktemp -t -d` |
158 |
-+outfile=$tmpdir/aview.pgm |
159 |
-+mkfifo $outfile |
160 |
- IFS=$(echo -e "\000") |
161 |
- echo $filenames | while read name; do |
162 |
- if test -r "$name" ; then |
163 |
-@@ -67,10 +68,10 @@ case "$name" in |
164 |
- aaflip $options "$name" |
165 |
- ;; |
166 |
- *) |
167 |
-- myconvert "$name" >/tmp/aview$$.pgm & |
168 |
-+ myconvert "$name" "$outfile" >"$outfile" & |
169 |
- pid=$! |
170 |
- PATH="$PATH:." |
171 |
-- aview $options /tmp/aview$$.pgm |
172 |
-+ aview $options $outfile |
173 |
- kill $pid 2>/dev/null |
174 |
- esac |
175 |
- else |