From a91dbcdb75ea02480aa4867fbca621a4089f9091 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 30 Mar 2015 04:27:56 +0000 Subject: [PATCH] Old. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- media-gfx/fbida/ChangeLog | 6 +- media-gfx/fbida/Manifest | 20 +-- media-gfx/fbida/fbida-2.09.ebuild | 120 ------------------ .../fbida/files/fbida-2.08-posix-make.patch | 49 ------- 4 files changed, 9 insertions(+), 186 deletions(-) delete mode 100644 media-gfx/fbida/fbida-2.09.ebuild delete mode 100644 media-gfx/fbida/files/fbida-2.08-posix-make.patch diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog index 0496ab97e146..b82d65580438 100644 --- a/media-gfx/fbida/ChangeLog +++ b/media-gfx/fbida/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/fbida # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.124 2015/02/24 08:51:59 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.125 2015/03/30 04:27:55 jer Exp $ + + 30 Mar 2015; Jeroen Roovers -fbida-2.09.ebuild, + -files/fbida-2.08-posix-make.patch: + Old. 24 Feb 2015; Agostino Sarubbo fbida-2.09-r4.ebuild: Stable for alpha, wrt bug #532902 diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest index f0b3dd9deaa9..f28d0b30ee44 100644 --- a/media-gfx/fbida/Manifest +++ b/media-gfx/fbida/Manifest @@ -1,7 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX fbida-2.08-posix-make.patch 1495 SHA256 7f8b0a7f46205efcb765133f287bfac7023e837f159364f8932ac146b4428c10 SHA512 ee7a6382d15ac90090c8f44e7cf674a0f924960ea1328bf1a783308f6414b1496aa50d0c97b3a5c10f4a2481c3c760e87a10358e92bf0740341eeabfbdce9314 WHIRLPOOL 36c857966aeea8c68822066e0971fa45ad6103daf967c1394d84096d257698002ea6a75d1cadb836dca2cbfa955ecbce93c8276745137bbaa75b16ee637ee1ac AUX fbida-2.09-giflib.patch 2402 SHA256 e4ab03707e126f31bf39db9e24ab14c748b2dff1d098a33b4cecf23b4f6aea15 SHA512 65b7dc8ba5f984ca81bb4a9c52cc6da3e7f309be07f7a1862e2bb1b76d2127c7d252c6fb35369c0836855bb59dc9be0d47bc8cdaaf1b5bc2abafcc96d2704c0c WHIRLPOOL d1998a433c2dc54698527db23ff9097bf6cbd6dc7a5d522f6e7fdfb962dfeb5198e90d4a657c3c0c372f545c1149e1375834f15c2aed3da1e5a5d37824d2f89f AUX fbida-2.09-make.patch 994 SHA256 ac11e8f072de7e36e41d42b5760cd99dcea9e19a951ed93e13880a2c69868f67 SHA512 e4bd6f16fc9ab51529d32f5c200867cc44ed418d0eb63a2649e3cfc17cdf0fa0cdbbb12d1031e855b86fe021345c1656dd53a6455851baf3d4a986719eb6013d WHIRLPOOL 23e7c8d188e2804f4646b2f783db6c0c94d807aa92de942d90e50b7d02c7eb8e0c481ee6459ddb9524f246074991b839646088e3f99ac90c02c91ececec94136 AUX ida-desktop.patch 384 SHA256 68b73ebe6ebc04dd3c205ee328c61c9d0b523c9ba87dda9301f82eab306b9e57 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737 WHIRLPOOL 5ff72a36831f60b2965964e53b105121c0de042e18abfc19d348c35496dada17c466d2e0d1cbeb778238a62380a4a2d7e3998e15565accf3b69dc19f80aa0e32 @@ -9,23 +8,12 @@ DIST fbida-2.09-jpeg-9a.patch.bz2 29392 SHA256 d0979bb7b33b34c2b01f0fe1482581231 DIST fbida-2.09.tar.gz 248086 SHA256 dd40b3572f79c6524480ac652c9b32e3867cb53e6c53db51415ddbb20f5231e6 SHA512 b939ca656fc28e3df652610821b9c11f7ab20ad1bd393c40de74f631fad0af463bfaf4f0520484edc12922b1fc288d08fae7c92789c711ce96b0caf50dde25ba WHIRLPOOL 222538f80fc7e878d142cd4dc44089d12b717ee8ae921e514bb3b85322b972cc96300594ae89d7cc1cb006868a0c75abacaa7ddff15041bc672c27d565a00a4b DIST ida.png.bz2 11928 SHA256 ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 WHIRLPOOL 1b5e7835aa8a555a231ca58da8e249974639b29b1e15586c2d2d5a33e96908df1a3782fbe61d0c51dc888b7304c9f7541a96af4ca2b956b393909feb534ab5be EBUILD fbida-2.09-r4.ebuild 2652 SHA256 8a2db57df7bcc5ecaa88a3da2bda437629e21b6e47f1f1c7e7dc9bb01da5e47f SHA512 46f456e99119473fcaf431f00dfab66b9ba4dff87e8dc9491d8e41858dea0e8a374e1c97bef030f82615995eaa8c2233453bf9b2deeb2caaffcbf00cb8832426 WHIRLPOOL 9250f3a8501fc2f96cbfbde40f6f73f0ee0d621126c77a70018aa0bcdd68707bc4234fabe872e3571405458886a34280c4bed31cf406513a9e3c99e368f962b3 -EBUILD fbida-2.09.ebuild 2597 SHA256 01ba79b5a8966788c0730ffc99607bda24ac022b25736d589f3ddcc8e20c2c62 SHA512 b44b11b35374c1f811cf6b50c3b992f2b4cdfffa73dd8c717cde8f7ece1cdb8d4cad9c987f6f6e2e4454b503be18376ad572d9ec868102d4b401198bedf49094 WHIRLPOOL 46be264669ecbe5b6c3ac36e6a3da7c5a32e138e3ee2bd4a417fbcc97f42216a177ccc53960ea2f60519c9cc47b70a07cef36f84fc77e99b2289fa481b53b7fe -MISC ChangeLog 15554 SHA256 c10860b4c65c28360c8b19af3184f2495d91e8e4f2c73e3ba871caa3d7450582 SHA512 c16dcd85649f3b91e4cdc1304b79cd2f92abe96e07eea8ded391d50368026d673a3f520099271108915f541140119fc6265cb39bc13c57b6187efe7f87babe89 WHIRLPOOL 4a6896c717b0141ad624ab90ceba5b8debf2255f53ec0899301086d8254b1d783d1c45e0ebe27eb9779bf7cd8aa2bb30d18233d658052b257b65bd953ef01959 +MISC ChangeLog 15667 SHA256 c6867bc8f348b4a14de198fd9166c6b8485e2870a1f61edcd4a65b36c13104f0 SHA512 941b8661cfce9c1934064ba2cca3c325c07cc9a58f23887ac4123ef28ae12f3d2b66bf4326b93da95af082678afdebd1f745b3a0f817d11a7cec60c3f137d97e WHIRLPOOL fd8fb030c616fa794c0feb5d0124aeafa8b26fc30e488a3f55741f8eddbff85732bd46530707d985a0e867b32710dd2c3c1a639f078f91dbb031d67d19efa67c MISC metadata.xml 409 SHA256 30adb8b77b731331a7981157faa6d76bb71beba7311635639ebfaf0d545af0c0 SHA512 48ddfb184fb23a70a73dcf9e3d5441fb0bf28956afea3eb69cacc1c4bf211a2571afdda83426c6be003b86ac9632acf14b87e9b518d0ed76e89a0b0a037b221e WHIRLPOOL cc8c6349745adb96e88a5e325ee37c170bee9055a3b2628ba2885cc53eb3e97f5dd3ae8b745c9385a0fbf37c219cc179cadb9ba80f3c1849c601b4e783ea8c3b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU7DuwAAoJELp701BxlEWfEFUP/RmHSs1Qj1+810wNUEyke+S6 -JipSxIj9n2TrJNbOKtqGaOV4BWzTLIqi1TCkY9JALQzQYSDQxGXqwZqfyAYAlnwU -HeH6a36hyvQvgvDCJnDD9Dz/AbCTfE1iZaVJ/Jd4gPL0h0sDZg/C8YX6UL9Y9OTq -aCrtD2Yic3+A5/+jkNLhy8Wq8imcAjHZNxXNwc6LFd/bMDcqwU4c7vbHcP0Ax7lz -S8GHPFLn7g+2ttm6s99OXQQI3dmLxSh6fH/aTspzfl4zhd7JOyQbD1+tix7MqIA1 -26nQu3ziCNxjaA6eLKbl2LsuhHyVWl6vpI91c8KwvWeqlkhvp+sDsaYSpWTim526 -dCik/7mf/JWe2cbJn1kyP7+tgAP1fSSKW83D6qXgIHFWRTOI+HqaYerkzuQe4B5z -Dwh+KAY107oj8jbpieo/dK3MbSNAIR+F7w3LKkxmBN3yrcXUjVRvPNdwHMIRcUna -FuAb3zl9bKvqwt3qjsOL9CXzFqmZ2kNeK/t+wGgxdz5TXc5AZQwrKhQm1aFCWeso -GY2aH+2xXdiK4j2C5C/MBKGX+FC4zgp7w2oq4F+JOXsK9a9jy0Tp3mKdZLPtz7Y2 -hcq5ivkZXl61C2mB/YxRfkfMbamI+yk4r4P78zd2N5aaRcmM3kaGjmDgQWvkALzj -ShnI9h0F4lml41Vu05kp -=X23a +iEYEAREIAAYFAlUY0MwACgkQVWmRsqeSphMc1QCeO98tPwNsVNENa/JbCYA+SXpP +sqIAn0tjVwv+3P9JB1UZebYEpwqOpBKC +=KrW5 -----END PGP SIGNATURE----- diff --git a/media-gfx/fbida/fbida-2.09.ebuild b/media-gfx/fbida/fbida-2.09.ebuild deleted file mode 100644 index 02c2f6d4d4af..000000000000 --- a/media-gfx/fbida/fbida-2.09.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09.ebuild,v 1.15 2014/08/10 21:14:20 slyfox Exp $ - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)" -HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/" -SRC_URI="http://www.kraxel.org/releases/${PN}/${P}.tar.gz - mirror://gentoo/ida.png.bz2" #370901 -LICENSE="GPL-2 IJG" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ppc ppc64 sh sparc x86" -IUSE="curl fbcon gif imagemagick lirc pdf png scanner tiff X" - -RDEPEND=" - curl? ( net-misc/curl ) - gif? ( media-libs/giflib ) - lirc? ( app-misc/lirc ) - pdf? ( app-text/ghostscript-gpl media-libs/tiff ) - png? ( media-libs/libpng ) - tiff? ( media-libs/tiff ) - imagemagick? ( - || ( - media-gfx/imagemagick - media-gfx/graphicsmagick[imagemagick] - ) - ) - scanner? ( media-gfx/sane-backends ) - X? ( - >=x11-libs/motif-2.3:0 - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXt - ) - !media-gfx/fbi - >=media-libs/fontconfig-2.2 - >=media-libs/freetype-2.0 - media-libs/libexif - virtual/jpeg - virtual/ttf-fonts -" - -DEPEND=" - ${RDEPEND} - X? ( x11-proto/xextproto x11-proto/xproto ) -" - -pkg_setup() { - tc-export CC -} - -src_prepare() { - sed -e 's:DGifOpenFileName,ungif:DGifOpenFileName,gif:' \ - -e 's:-lungif:-lgif:' -i "${S}/GNUmakefile" - - if [[ $(gcc-major-version) -lt 4 ]]; then - sed -e 's:-Wno-pointer-sign::' -i "${S}/GNUmakefile" || die - fi - - epatch "${FILESDIR}"/ida-desktop.patch - epatch "${FILESDIR}"/${PN}-2.08-posix-make.patch -} - -src_configure() { - # Let autoconf do its job and then fix things to build fbida - # according to our specifications - emake Make.config - - set_feat() { - local useflag=${1} - local config=${2} - - local option="yes" - if ! use ${useflag}; then - option="no" - fi - - sed -i \ - -e "s|${config}.*|${config} := ${option}|" \ - "${S}/Make.config" || die - } - - set_feat fbcon HAVE_LINUX_FB_H - set_feat X HAVE_MOTIF - set_feat tiff HAVE_LIBTIFF - - # The 'pdf' flag forces the use of libtiff. - set_feat pdf HAVE_LIBTIFF - set_feat png HAVE_LIBPNG - set_feat gif HAVE_LIBUNGIF - set_feat lirc HAVE_LIBLIRC - set_feat curl HAVE_LIBCURL - set_feat scanner HAVE_LIBSANE - set_feat imagemagick HAVE_LIBMAGICK -} - -src_compile() { - emake verbose=yes -} - -src_install() { - emake \ - DESTDIR="${D}" \ - STRIP="" \ - prefix=/usr \ - install - - dodoc README - - if ! use pdf; then - rm -f "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 - fi - - if use X ; then - doicon "${WORKDIR}"/ida.png - domenu desktop/ida.desktop - fi -} diff --git a/media-gfx/fbida/files/fbida-2.08-posix-make.patch b/media-gfx/fbida/files/fbida-2.08-posix-make.patch deleted file mode 100644 index 6add679bca6b..000000000000 --- a/media-gfx/fbida/files/fbida-2.08-posix-make.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e0c867a12fd3d49fd49ee348bcabe4eafc217082 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sun, 19 Jun 2011 10:24:55 +0200 -Subject: [PATCH] Use `printf' instead of `echo -[en]', to make the code POSIX - friendly. - ---- - GNUmakefile | 2 +- - mk/Autoconf.mk | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/GNUmakefile b/GNUmakefile -index c96e635..9de3f6c 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -30,7 +30,7 @@ include $(srcdir)/mk/Autoconf.mk - - ac_jpeg_ver = $(shell \ - $(call ac_init,for libjpeg version);\ -- $(call ac_s_cmd,echo -e '\#include \nJPEG_LIB_VERSION' \ -+ $(call ac_s_cmd,printf '\#include \nJPEG_LIB_VERSION' \ - | cpp | tail -n 1);\ - $(call ac_fini)) - -diff --git a/mk/Autoconf.mk b/mk/Autoconf.mk -index 7608ea5..513f449 100644 ---- a/mk/Autoconf.mk -+++ b/mk/Autoconf.mk -@@ -24,7 +24,7 @@ ifneq ($(verbose),no) - ac_fini = echo "... result is $${rc}" >&2; echo >&2; echo "$${rc}" - else - # normal -- ac_init = echo -n "checking $(1) ... " >&2; rc=no -+ ac_init = printf '%s' "checking $(1) ... " >&2; rc=no - ac_b_cmd = $(1) >/dev/null 2>&1 && rc=yes - ac_s_cmd = rc=`$(1) 2>/dev/null` - ac_fini = echo "$${rc}" >&2; echo "$${rc}" -@@ -162,7 +162,7 @@ config: Make.config - @true - - Make.config: $(srcdir)/GNUmakefile -- @echo -e "$(make-config-q)" > $@ -+ @printf '%b' "$(make-config-q)" > $@ - @echo - @echo "Make.config written, edit if needed" - @echo --- -1.7.5.3 - -- 2.26.2