[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/files/, media-gfx/xloadimage/

2023-12-25 Thread Viorel Munteanu
commit: 91a66474b005dae230f22c3c223ad550b338083c
Author: Pascal Jäger  leimstift  de>
AuthorDate: Fri Sep 22 10:42:15 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Mon Dec 25 08:07:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91a66474

media-gfx/xloadimage: fix incomp. func. pointer

Closes: https://bugs.gentoo.org/896232
Signed-off-by: Pascal Jäger  leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/32988
Signed-off-by: Viorel Munteanu  gentoo.org>

 ...age-4.1-fix-incomp-function-pointer-types.patch | 17 
 media-gfx/xloadimage/xloadimage-4.1-r16.ebuild | 93 ++
 2 files changed, 110 insertions(+)

diff --git 
a/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-types.patch
 
b/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-types.patch
new file mode 100644
index ..0ddd2da0f65f
--- /dev/null
+++ 
b/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-types.patch
@@ -0,0 +1,17 @@
+Inpompatible function pointers are an error instead of a warning by default 
since clang16
+
+Bug: https://bugs.gentoo.org/896232
+
+Pascal Jäger  (2023-09-22)
+
+--- a/window.c
 b/window.c
+@@ -833,7 +833,7 @@ char imageInWindow (Display *disp, int scrn, Image *image, 
OptionSet *global_opt
+   /* reset alarm to -delay seconds after every event */
+ #ifdef ENABLE_TIMEOUT
+   AlarmWentOff = 0;
+-  signal(SIGALRM, delayAlarmHandler);
++  signal(SIGALRM, (__sighandler_t)delayAlarmHandler);
+   alarm(delay);
+ #endif /* ENABLE_TIMEOUT */
+   }

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild
new file mode 100644
index ..461bdfe35a16
--- /dev/null
+++ b/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Utility to view many different types of images under X11"
+HOMEPAGE="https://sioseis.ucsd.edu/xloadimage.html 
https://tracker.debian.org/pkg/xloadimage;
+SRC_URI="
+   ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
+   mirror://gentoo/${P}-gentoo-r1.diff.bz2
+   
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-fix-build-for-clang16.patch.xz
+"
+S="${WORKDIR}"/${P/-/.}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="tiff jpeg png"
+
+RDEPEND="x11-libs/libX11
+   tiff? ( media-libs/tiff:= )
+   png? ( media-libs/libpng:= )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   !media-gfx/xli"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${WORKDIR}"/${P}-gentoo-r1.diff
+   "${FILESDIR}"/${P}-zio-shell-meta-char.diff
+   "${FILESDIR}"/${P}-endif.patch
+   # Do not define errno extern, but rather include errno.h
+   #  (1 Jan 2003)
+   "${FILESDIR}"/${P}-include-errno_h.patch
+   "${FILESDIR}"/xloadimage-gentoo.patch
+   "${FILESDIR}"/${P}-unaligned-access.patch
+   "${FILESDIR}"/${P}-ldflags_and_exit.patch
+   "${FILESDIR}"/${P}-libpng15.patch
+   "${WORKDIR}"/${P}-fix-build-for-clang16.patch
+   # One of the previous patches screws up a bracket...
+   "${FILESDIR}"/${P}-bracket.patch
+   "${FILESDIR}"/${P}-fix-incomp-function-pointer-types.patch
+)
+
+src_prepare() {
+   default
+
+   sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die
+   sed -i -e "s:^#include :#include :" rlelib.c || die
+   # qa-sed sees no-op on the next sed on non-gentoo-prefix systems,
+   # but that is alright
+   sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die
+   sed -i \
+   -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
+   png.c || die
+
+   eautoreconf
+}
+
+src_configure() {
+   # Set TIFFHeader to TIFFHeaderCommon wrt #319383
+   has_version '>=media-libs/tiff-4.0.0_pre' && \
+   append-flags -DTIFFHeader=TIFFHeaderCommon
+
+   tc-export CC
+   econf $(use_with jpeg) \
+   $(use_with png) \
+   $(use_with tiff)
+}
+
+src_compile() {
+   emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage
+}
+
+src_install() {
+   dobin xloadimage uufilter
+
+   dosym xloadimage /usr/bin/xsetbg
+   dosym xloadimage /usr/bin/xview
+
+   insinto /etc/X11
+   doins xloadimagerc
+
+   newman xloadimage.man xloadimage.1
+   newman uufilter.man uufilter.1
+
+   echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die
+   doman "${T}"/xsetbg.1
+   newman "${T}"/xsetbg.1 xview.1
+
+   dodoc README
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2023-03-17 Thread Arthur Zamarin
commit: 9d0fc54bb9bcb2a8b084524cbc0bceed0449ca34
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 17 18:09:36 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 17 18:09:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d0fc54b

media-gfx/xloadimage: Stabilize 4.1-r15 ppc, #901895

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/xloadimage/xloadimage-4.1-r15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
index fbbc6714dbc7..b1ceb5b7a604 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2023-03-17 Thread Arthur Zamarin
commit: 99aba8e343df8dfad59d93a66426930c0e4d70f4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 17 18:04:31 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 17 18:04:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99aba8e3

media-gfx/xloadimage: Stabilize 4.1-r15 sparc, #901895

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/xloadimage/xloadimage-4.1-r15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
index 684d27daf63c..fbbc6714dbc7 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2023-03-17 Thread Sam James
commit: f5d2bb4ab5b5a37e757387ca347dff59b28173d6
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 17 16:58:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 17 16:59:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d2bb4a

media-gfx/xloadimage: Stabilize 4.1-r15 x86, #901895

Signed-off-by: Sam James  gentoo.org>

 media-gfx/xloadimage/xloadimage-4.1-r15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
index 8b0a545c572e..684d27daf63c 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2023-03-17 Thread Sam James
commit: 1ecb55998b1f03bb4d813aae88bf658259c13351
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 17 16:58:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 17 16:59:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ecb5599

media-gfx/xloadimage: Stabilize 4.1-r15 amd64, #901895

Signed-off-by: Sam James  gentoo.org>

 media-gfx/xloadimage/xloadimage-4.1-r15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
index bf994790332e..8b0a545c572e 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2023-03-17 Thread Arthur Zamarin
commit: bc13293ea4f0ae8d47bbfb18f00a1900b0c8d0e0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 17 16:45:03 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 17 16:45:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc13293e

media-gfx/xloadimage: Stabilize 4.1-r15 ppc64, #901895

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/xloadimage/xloadimage-4.1-r15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
index 5caa6899f7d9..bf994790332e 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2023-03-17 Thread Arthur Zamarin
commit: 01493c26c9115b519b3b8710ebf0536b38fe0042
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 17 16:29:27 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 17 16:29:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01493c26

media-gfx/xloadimage: Stabilize 4.1-r15 arm, #901895

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/xloadimage/xloadimage-4.1-r15.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
index e2159ce3b14b..5caa6899f7d9 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2022-12-15 Thread Sam James
commit: a43c991c799c2d283ecf0f2c53c439d4a39fdb60
Author: Pascal Jäger  leimstift  de>
AuthorDate: Sun Dec 11 20:44:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 05:08:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a43c991c

media-gfx/xloadimage: fix build for clang16

Closes: https://bugs.gentoo.org/875422
Signed-off-by: Pascal Jäger  leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/28642
Signed-off-by: Sam James  gentoo.org>

 media-gfx/xloadimage/Manifest  |  1 +
 media-gfx/xloadimage/xloadimage-4.1-r15.ebuild | 92 ++
 2 files changed, 93 insertions(+)

diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 5117253eca97..32fe79df1f93 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -1,2 +1,3 @@
+DIST xloadimage-4.1-fix-build-for-clang16.patch.xz 23800 BLAKE2B 
8417465020f06483c397dd86124297feb320530bd013d6f94b091ac2166da9dc45017b43a21e2ce7a6f03493188e2535294e9b79e7ebbe0062bf0f22166f13d7
 SHA512 
a8f40fe4a5e8750b2c2b98b1f7488275c1f0763d2814359ec8dce48d1201e78d87f189abf6fcb8fa4753828921fd0c593696ad1958345f954f740687502a896f
 DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 
77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112
 SHA512 
a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3
 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 
3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf
 SHA512 
2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
new file mode 100644
index ..e2159ce3b14b
--- /dev/null
+++ b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Utility to view many different types of images under X11"
+HOMEPAGE="https://sioseis.ucsd.edu/xloadimage.html 
https://tracker.debian.org/pkg/xloadimage;
+SRC_URI="
+   ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
+   mirror://gentoo/${P}-gentoo-r1.diff.bz2
+   
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-fix-build-for-clang16.patch.xz
+"
+S="${WORKDIR}"/${P/-/.}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="tiff jpeg png"
+
+RDEPEND="x11-libs/libX11
+   tiff? ( media-libs/tiff:= )
+   png? ( media-libs/libpng:= )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   !media-gfx/xli"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${WORKDIR}"/${P}-gentoo-r1.diff
+   "${FILESDIR}"/${P}-zio-shell-meta-char.diff
+   "${FILESDIR}"/${P}-endif.patch
+   # Do not define errno extern, but rather include errno.h
+   #  (1 Jan 2003)
+   "${FILESDIR}"/${P}-include-errno_h.patch
+   "${FILESDIR}"/xloadimage-gentoo.patch
+   "${FILESDIR}"/${P}-unaligned-access.patch
+   "${FILESDIR}"/${P}-ldflags_and_exit.patch
+   "${FILESDIR}"/${P}-libpng15.patch
+   "${WORKDIR}"/${P}-fix-build-for-clang16.patch
+   # One of the previous patches screws up a bracket...
+   "${FILESDIR}"/${P}-bracket.patch
+)
+
+src_prepare() {
+   default
+
+   sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die
+   sed -i -e "s:^#include :#include :" rlelib.c || die
+   # qa-sed sees no-op on the next sed on non-gentoo-prefix systems,
+   # but that is alright
+   sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die
+   sed -i \
+   -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
+   png.c || die
+
+   eautoreconf
+}
+
+src_configure() {
+   # Set TIFFHeader to TIFFHeaderCommon wrt #319383
+   has_version '>=media-libs/tiff-4.0.0_pre' && \
+   append-flags -DTIFFHeader=TIFFHeaderCommon
+
+   tc-export CC
+   econf $(use_with jpeg) \
+   $(use_with png) \
+   $(use_with tiff)
+}
+
+src_compile() {
+   emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage
+}
+
+src_install() {
+   dobin xloadimage uufilter
+
+   dosym xloadimage /usr/bin/xsetbg
+   dosym xloadimage /usr/bin/xview
+
+   insinto /etc/X11
+   doins xloadimagerc
+
+   newman xloadimage.man xloadimage.1
+   newman uufilter.man uufilter.1
+
+   echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die
+   doman "${T}"/xsetbg.1
+   newman "${T}"/xsetbg.1 xview.1
+
+   dodoc README
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2021-01-06 Thread Fabian Groffen
commit: d88b9bd589a0a643388e7cfe262a3823f36bcc27
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 14:07:22 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 14:07:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88b9bd5

media-gfx/xloadimage: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index 08077f10cde..09484d7f4b2 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2019-04-30 Thread Mikle Kolyada
commit: d0160c50a08d4c4118a0fb66f6d55981a7277db6
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Apr 30 09:04:32 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Apr 30 09:05:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0160c50

media-gfx/xloadimage: Drop old

Closes: https://bugs.gentoo.org/679450
Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 media-gfx/xloadimage/xloadimage-4.1-r11.ebuild | 94 --
 1 file changed, 94 deletions(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
deleted file mode 100644
index 88c8bacd127..000
--- a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="utility to view many different types of images under X11"
-HOMEPAGE="http://world.std.com/~jimf/xloadimage.html;
-SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
-   mirror://gentoo/${P}-gentoo-r1.diff.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="tiff jpeg png"
-
-RDEPEND="x11-libs/libX11
-   tiff? ( media-libs/tiff )
-   png? ( media-libs/libpng )
-   jpeg? ( virtual/jpeg:0 )"
-DEPEND="${RDEPEND}
-   !media-gfx/xli"
-
-S=${WORKDIR}/${P/-/.}
-
-src_prepare() {
-   epatch "${WORKDIR}"/${P}-gentoo-r1.diff
-   epatch "${FILESDIR}"/${P}-zio-shell-meta-char.diff
-   epatch "${FILESDIR}"/${P}-endif.patch
-
-   # Do not define errno extern, but rather include errno.h
-   #  (1 Jan 2003)
-   epatch "${FILESDIR}"/${P}-include-errno_h.patch
-
-   epatch "${FILESDIR}"/xloadimage-gentoo.patch
-
-   sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die
-   sed -i -e "s:^#include :#include :" rlelib.c || die
-
-   # On FreeBSD systems malloc.h is a false header asking for fixes.
-   # On MacOSX it would require malloc/malloc.h
-   # On other systems it's simply unneeded
-   sed -i -e 's,,,' vicar.c || die
-
-   epatch "${FILESDIR}"/${P}-unaligned-access.patch
-   epatch "${FILESDIR}"/${P}-ldflags_and_exit.patch
-
-   sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in
-
-   epatch "${FILESDIR}"/${P}-libpng15.patch
-   sed -i \
-   -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
-   png.c || die
-
-   # One of the previous patches screws up a bracket...
-   epatch "${FILESDIR}"/${P}-bracket.patch
-
-   chmod +x configure
-   eautoreconf
-}
-
-src_configure() {
-   # Set TIFFHeader to TIFFHeaderCommon wrt #319383
-   has_version '>=media-libs/tiff-4.0.0_pre' && \
-   append-flags -DTIFFHeader=TIFFHeaderCommon
-
-   tc-export CC
-   econf $(use_with jpeg) \
-   $(use_with png) \
-   $(use_with tiff)
-}
-
-src_compile() {
-   emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage || die
-}
-
-src_install() {
-   dobin xloadimage uufilter || die
-
-   dosym xloadimage /usr/bin/xsetbg || die
-   dosym xloadimage /usr/bin/xview || die
-
-   insinto /etc/X11
-   doins xloadimagerc || die
-
-   newman xloadimage.man xloadimage.1 || die
-   newman uufilter.man uufilter.1 || die
-
-   echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1
-   doman "${T}"/xsetbg.1 || die
-   newman "${T}"/xsetbg.1 xview.1 || die
-
-   dodoc README
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2019-04-30 Thread Mikle Kolyada
commit: e87d9ecdcce3782eb76b59cfbdacf30ee15638e2
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Apr 30 09:01:52 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Apr 30 09:05:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e87d9ecd

media-gfx/xloadimage: alpha stable wrt bug #679450

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="alpha"

 media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index f02fa7f780e..f4b8ed0839f 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2019-04-30 Thread Mikle Kolyada
commit: 699ebfbf3f1313d42c9e00cedf9d60055edc21c7
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Apr 30 09:02:20 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Apr 30 09:05:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699ebfbf

media-gfx/xloadimage: sh stable wrt bug #679450

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="sh"

 media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index f4b8ed0839f..8e6085e9cb7 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2019-04-01 Thread Thomas Deutschmann
commit: 2c6acbb895f5ce1ea3334043872142bfe7d62826
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Apr  1 19:56:20 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Apr  1 19:58:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c6acbb8

media-gfx/xloadimage: x86 stable (bug #679450)

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index d2619767a77..f02fa7f780e 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2019-03-20 Thread Mikle Kolyada
commit: e7a144f2a1b7eab32ec803e6b2f17fa5aa984f7c
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Mar 20 21:21:19 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Mar 20 21:21:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7a144f2

media-gfx/xloadimage: arm stable wrt bug #679450

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

 media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index f609119f578..d2619767a77 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2019-03-17 Thread Sergei Trofimovich
commit: 23252b172166bd7f5adbde12d99137052fca8de3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 17 23:01:33 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar 17 23:02:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23252b17

media-gfx/xloadimage: stable 4.1-r12 for ia64, bug #679450

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index eefbe854a03..f609119f578 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2019-03-17 Thread Sergei Trofimovich
commit: 7c68445aefd1730211a9f596e60bde5d1b7f9ecc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 17 10:18:42 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar 17 10:18:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c68445a

media-gfx/xloadimage: stable 4.1-r12 for hppa, bug #679450

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index 582845fc593..eefbe854a03 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2019-03-16 Thread Sergei Trofimovich
commit: 5903bed2464261cc3b4f6c3d0133c8ce379e3d6a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar 16 22:38:31 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar 16 22:55:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5903bed2

media-gfx/xloadimage: stable 4.1-r12 for ppc64, bug #679450

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index 3427df61522..582845fc593 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sh sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2019-03-16 Thread Sergei Trofimovich
commit: 4136c946fb0c8ff2ec90b0e95cb21aa429303cc8
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar 16 21:55:45 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar 16 21:56:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4136c946

media-gfx/xloadimage: stable 4.1-r12 for ppc, bug #679450

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index 7681c7cdc18..3427df61522 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sh sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2019-03-16 Thread Agostino Sarubbo
commit: d527342b433afc9f29c76cc97e77126999ce73b8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Mar 16 21:36:16 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Mar 16 21:36:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d527342b

media-gfx/xloadimage: amd64 stable wrt bug #679450

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index c13346db6ee..7681c7cdc18 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/

2019-03-16 Thread Sergei Trofimovich
commit: 6d16d53cb90b84ae9765b69e3c5fb4ab97f6915b
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Mar 16 09:34:22 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar 16 10:19:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d16d53c

media-gfx/xloadimage: stable 4.1-r12 for sparc, bug #679450

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index 7e9f5a36e1e..c13346db6ee 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/, media-gfx/xloadimage/files/

2019-01-17 Thread Andreas K. Hüttel
commit: 49f7781f888de99eddd4ef1a2b1f6af5dd4b0ace
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Thu Jan 17 22:02:18 2019 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Thu Jan 17 22:04:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f7781f

media-gfx/xloadimage: EAPI bump

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 .../xloadimage/files/xloadimage-4.1-libpng15.patch |  4 +-
 media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 96 ++
 2 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch 
b/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch
index ffd05f62b33..da222d68c25 100644
--- a/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch
+++ b/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch
@@ -1,5 +1,5 @@
 png.c
-+++ png.c
+--- a/png.c
 b/png.c
 @@ -75,7 +75,7 @@
  {
debug(" #error ");

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild 
b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
new file mode 100644
index 000..7e9f5a36e1e
--- /dev/null
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="utility to view many different types of images under X11"
+HOMEPAGE="https://tracker.debian.org/pkg/xloadimage;
+SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
+   mirror://gentoo/${P}-gentoo-r1.diff.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="tiff jpeg png"
+
+RDEPEND="x11-libs/libX11
+   tiff? ( media-libs/tiff:0= )
+   png? ( media-libs/libpng:0= )
+   jpeg? ( virtual/jpeg:0 )"
+DEPEND="${RDEPEND}
+   !media-gfx/xli"
+
+S=${WORKDIR}/${P/-/.}
+
+src_prepare() {
+   eapply "${WORKDIR}"/${P}-gentoo-r1.diff
+   eapply "${FILESDIR}"/${P}-zio-shell-meta-char.diff
+   eapply "${FILESDIR}"/${P}-endif.patch
+
+   # Do not define errno extern, but rather include errno.h
+   #  (1 Jan 2003)
+   eapply "${FILESDIR}"/${P}-include-errno_h.patch
+
+   eapply "${FILESDIR}"/xloadimage-gentoo.patch
+
+   sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die
+   sed -i -e "s:^#include :#include :" rlelib.c || die
+
+   # On FreeBSD systems malloc.h is a false header asking for fixes.
+   # On MacOSX it would require malloc/malloc.h
+   # On other systems it's simply unneeded
+   sed -i -e 's,,,' vicar.c || die
+
+   eapply "${FILESDIR}"/${P}-unaligned-access.patch
+   eapply "${FILESDIR}"/${P}-ldflags_and_exit.patch
+
+   sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die
+
+   eapply "${FILESDIR}"/${P}-libpng15.patch
+   sed -i \
+   -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
+   png.c || die
+
+   # One of the previous patches screws up a bracket...
+   eapply "${FILESDIR}"/${P}-bracket.patch
+
+   default
+
+   chmod +x configure || die
+   eautoreconf
+}
+
+src_configure() {
+   # Set TIFFHeader to TIFFHeaderCommon wrt #319383
+   has_version '>=media-libs/tiff-4.0.0_pre' && \
+   append-flags -DTIFFHeader=TIFFHeaderCommon
+
+   tc-export CC
+   econf $(use_with jpeg) \
+   $(use_with png) \
+   $(use_with tiff)
+}
+
+src_compile() {
+   emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage
+}
+
+src_install() {
+   dobin xloadimage uufilter
+
+   dosym xloadimage /usr/bin/xsetbg
+   dosym xloadimage /usr/bin/xview
+
+   insinto /etc/X11
+   doins xloadimagerc
+
+   newman xloadimage.man xloadimage.1
+   newman uufilter.man uufilter.1
+
+   echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die
+   doman "${T}"/xsetbg.1
+   newman "${T}"/xsetbg.1 xview.1
+
+   dodoc README
+}