Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/fbv/, media-gfx/fbv/files/
Date: Thu, 14 Jul 2016 19:29:43
Message-Id: 1468524545.02cbdb8b2a5dd8cb97daa1a39fb0b192ccdd74b3.kensington@gentoo
1 commit: 02cbdb8b2a5dd8cb97daa1a39fb0b192ccdd74b3
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 14 19:25:34 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 14 19:29:05 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02cbdb8b
7
8 media-gfx/fbv: remove last rited package
9
10 Gentoo-bug: 571686
11
12 media-gfx/fbv/Manifest | 1 -
13 media-gfx/fbv/fbv-1.0b.ebuild | 55 ---------------
14 media-gfx/fbv/files/fbv-1.0b-cc.patch | 97 --------------------------
15 media-gfx/fbv/files/fbv-1.0b-libpng15.patch | 20 ------
16 media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff | 13 ----
17 media-gfx/fbv/metadata.xml | 8 ---
18 6 files changed, 194 deletions(-)
19
20 diff --git a/media-gfx/fbv/Manifest b/media-gfx/fbv/Manifest
21 deleted file mode 100644
22 index 3d50387..0000000
23 --- a/media-gfx/fbv/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST fbv-1.0b.tar.gz 18989 SHA256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c SHA512 18c833894ab2da74dd0e124829221081ff226ce19e9c5eac2f8273faba3e72239a4291403df5c19a66cb442736a27dfc3472d474720ceff2b9af460e4f2f9e91 WHIRLPOOL f679e13e3bb426372a947f089d1f8b67cb9ea27b5dc3b74cfdf80e8578c611969b9f2755eccf944730123212427903479f87e557dd95f5b72ccf6024d730cf25
27
28 diff --git a/media-gfx/fbv/fbv-1.0b.ebuild b/media-gfx/fbv/fbv-1.0b.ebuild
29 deleted file mode 100644
30 index 50f388a..0000000
31 --- a/media-gfx/fbv/fbv-1.0b.ebuild
32 +++ /dev/null
33 @@ -1,55 +0,0 @@
34 -# Copyright 1999-2016 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=4
39 -inherit eutils toolchain-funcs
40 -
41 -DESCRIPTION="simple program to view pictures on a linux framebuffer device"
42 -HOMEPAGE="http://freshmeat.net/projects/fbv/"
43 -SRC_URI="http://s-tech.elsat.net.pl/${PN}/${P}.tar.gz"
44 -
45 -LICENSE="GPL-2"
46 -SLOT="0"
47 -KEYWORDS="~amd64 arm ~arm64 ~ppc ppc64 sh x86"
48 -IUSE="gif jpeg png"
49 -
50 -RDEPEND="gif? ( media-libs/giflib )
51 - jpeg? ( virtual/jpeg )
52 - png? ( media-libs/libpng )"
53 -DEPEND="${RDEPEND}"
54 -
55 -src_prepare() {
56 - epatch \
57 - "${FILESDIR}"/oob-segfault-fbv-${PV}.diff \
58 - "${FILESDIR}"/${P}-libpng15.patch \
59 - "${FILESDIR}"/${P}-cc.patch
60 -
61 - sed -i -e 's:-lungif:-lgif:g' configure Makefile || die
62 -}
63 -
64 -src_configure() {
65 - local myconf="--without-bmp"
66 -
67 - use png || myconf="${myconf} --without-libpng"
68 - use gif || myconf="${myconf} --without-libungif"
69 - use jpeg || myconf="${myconf} --without-libjpeg"
70 -
71 - ./configure \
72 - --cc="$(tc-getCC)" \
73 - --libs="${LDFLAGS}" \
74 - --prefix=/usr \
75 - --mandir=/usr/share/man \
76 - --infodir=/usr/share/info \
77 - ${myconf} || die
78 -}
79 -
80 -src_compile() {
81 - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
82 -}
83 -
84 -src_install() {
85 - dobin fbv
86 - doman fbv.1
87 - dodoc ChangeLog README TODO VERSION
88 -}
89
90 diff --git a/media-gfx/fbv/files/fbv-1.0b-cc.patch b/media-gfx/fbv/files/fbv-1.0b-cc.patch
91 deleted file mode 100644
92 index 531148f..0000000
93 --- a/media-gfx/fbv/files/fbv-1.0b-cc.patch
94 +++ /dev/null
95 @@ -1,97 +0,0 @@
96 -# --- T2-COPYRIGHT-NOTE-BEGIN ---
97 -# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
98 -#
99 -# T2 SDE: package/.../fbv/cc.patch
100 -# Copyright (C) 2007 The T2 SDE Project
101 -#
102 -# More information can be found in the files COPYING and README.
103 -#
104 -# This patch file is dual-licensed. It is available under the license the
105 -# patched project is licensed under, as long as it is an OpenSource license
106 -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
107 -# of the GNU General Public License as published by the Free Software
108 -# Foundation; either version 2 of the License, or (at your option) any later
109 -# version.
110 -# --- T2-COPYRIGHT-NOTE-END ---
111 -
112 -Imported from Atmel.
113 -
114 - - Rene Rebe <rene@×××××××××.de>
115 -
116 -diff -ur fbv-1.0b/configure fbv-1.0b-avr32/configure
117 ---- fbv-1.0b/configure 2004-09-07 13:29:27.000000000 +0200
118 -+++ fbv-1.0b-avr32/configure 2006-05-04 11:10:06.000000000 +0200
119 -@@ -21,6 +21,7 @@
120 - unset png
121 - unset bmp
122 - unset dfb
123 -+unset CC
124 -
125 - help(){
126 - cat << EOF >&2
127 -@@ -33,6 +34,7 @@
128 - General:
129 - --help print this message
130 - --libs=LIBS additional libraries required (try -lX11 for ungif, -lz for PNG)
131 -+ --cc=CC specify compiler to use
132 -
133 - Directory and file names:
134 - --prefix=PREFIX install files in PREFIX [/usr/local]
135 -@@ -53,7 +55,7 @@
136 - --long help,\
137 - prefix:,srcdir:,bindir:,\
138 - infodir:,mandir:,\
139 --without-libungif,without-libjpeg,without-libpng,without-bmp,libs: \
140 -+without-libungif,without-libjpeg,without-libpng,without-bmp,libs:,cc: \
141 - -n "$BASENAME" -- "$@")
142 -
143 - if [ $? != 0 ] ; then help ; exit 1 ; fi
144 -@@ -65,6 +67,7 @@
145 - case "$1" in
146 - -h|--help) help ; exit 0 ;;
147 - --libs) libs="$2"; shift 2 ;;
148 -+ --cc) CC="$2"; shift 2 ;;
149 - --prefix) prefix="$2" ; shift 2 ;;
150 - --srcdir) srcdir="$2" ; shift 2 ;;
151 - --bindir) bindir="$2" ; shift 2 ;;
152 -@@ -80,6 +83,7 @@
153 - esac
154 - done
155 -
156 -+[ -z "$CC" ] && CC=cc
157 - [ -z "$prefix" ] && prefix="/usr/local"
158 - [ -z "$bindir" ] && bindir="${prefix}/bin"
159 - [ -z "$mandir" ] && mandir="${prefix}/man"
160 -@@ -106,12 +110,12 @@
161 - ungif="no"
162 - echo "libungif check" >>./config.log
163 - echo " 1st:" >>./config.log
164 --cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
165 -+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
166 - if [ -e \$\$~test ]; then
167 - libs="-lungif $libs" ; ungif="yes"
168 - else
169 - echo " 2nd: -lX11 -L$xdir/lib" >>./config.log
170 -- cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
171 -+ $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
172 - if [ -e \$\$~test ]; then
173 - libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes"
174 - fi
175 -@@ -124,7 +128,7 @@
176 - echo -n "checking for libjpeg presence... "
177 - if [ "$jpeg" != "disabled" ]; then
178 - jpeg="no"
179 --cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
180 -+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
181 - if [ -e \$\$~test ]; then
182 - libs="-ljpeg $libs" ; jpeg="yes"
183 - fi
184 -@@ -135,7 +139,7 @@
185 - echo -n "checking for libpng presence... "
186 - if [ "$png" != "disabled" ]; then
187 - png="no"
188 --cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
189 -+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
190 - if [ -e \$\$~test ]; then
191 - libs="-lpng $libs" ; png="yes"
192 - fi
193
194 diff --git a/media-gfx/fbv/files/fbv-1.0b-libpng15.patch b/media-gfx/fbv/files/fbv-1.0b-libpng15.patch
195 deleted file mode 100644
196 index dffbe48..0000000
197 --- a/media-gfx/fbv/files/fbv-1.0b-libpng15.patch
198 +++ /dev/null
199 @@ -1,20 +0,0 @@
200 ---- png.c
201 -+++ png.c
202 -@@ -69,7 +69,7 @@
203 - fclose(fh); return(FH_ERROR_FORMAT);
204 - }
205 - rp=0;
206 -- if (setjmp(png_ptr->jmpbuf))
207 -+ if (setjmp(png_jmpbuf(png_ptr)))
208 - {
209 - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
210 - if(rp) free(rp);
211 -@@ -161,7 +161,7 @@
212 - fclose(fh); return(FH_ERROR_FORMAT);
213 - }
214 - rp=0;
215 -- if (setjmp(png_ptr->jmpbuf))
216 -+ if (setjmp(png_jmpbuf(png_ptr)))
217 - {
218 - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
219 - if(rp) free(rp);
220
221 diff --git a/media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff b/media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff
222 deleted file mode 100644
223 index 8713cb6..0000000
224 --- a/media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff
225 +++ /dev/null
226 @@ -1,13 +0,0 @@
227 -Index: fb_display.c
228 -===================================================================
229 ---- fb_display.c (revision 4)
230 -+++ fb_display.c (working copy)
231 -@@ -92,7 +92,7 @@
232 - #if 0
233 - blit2FB(fh, fbbuff, alpha, x_size, y_size, x_stride, var.yres, x_pan, y_pan, x_offs, y_offs, bp);
234 - #else
235 -- blit2FB(fh, fbbuff, alpha, x_size, y_size, x_stride, var.yres_virtual, x_pan, y_pan, x_offs, y_offs + var.yoffset, bp);
236 -+ blit2FB(fh, fbbuff, alpha, x_size, y_size, x_stride, var.yres, x_pan, y_pan, x_offs, y_offs + var.yoffset, bp);
237 - #endif
238 - free(fbbuff);
239 -
240
241 diff --git a/media-gfx/fbv/metadata.xml b/media-gfx/fbv/metadata.xml
242 deleted file mode 100644
243 index 1614cb9..0000000
244 --- a/media-gfx/fbv/metadata.xml
245 +++ /dev/null
246 @@ -1,8 +0,0 @@
247 -<?xml version="1.0" encoding="UTF-8"?>
248 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
249 -<pkgmetadata>
250 - <!-- maintainer-needed -->
251 - <upstream>
252 - <remote-id type="freshmeat">fbv</remote-id>
253 - </upstream>
254 -</pkgmetadata>