* [gentoo-commits] repo/gentoo:master commit in: media-gfx/sxiv/files/, media-gfx/sxiv/
@ 2016-08-08 6:59 Tim Harder
0 siblings, 0 replies; 2+ messages in thread
From: Tim Harder @ 2016-08-08 6:59 UTC (permalink / raw
To: gentoo-commits
commit: 362e1952db2745d5a1641919725baeffb6e9130f
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 8 06:59:16 2016 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Aug 8 06:59:16 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362e1952
media-gfx/sxiv: remove old
media-gfx/sxiv/Manifest | 3 ---
media-gfx/sxiv/files/sxiv-1.1-makefile.patch | 14 -----------
media-gfx/sxiv/files/sxiv-1.2-makefile.patch | 16 ------------
media-gfx/sxiv/files/sxiv-1.3-makefile.patch | 30 ----------------------
media-gfx/sxiv/sxiv-1.1.1.ebuild | 34 -------------------------
media-gfx/sxiv/sxiv-1.2.ebuild | 34 -------------------------
media-gfx/sxiv/sxiv-1.3.ebuild | 37 ----------------------------
7 files changed, 168 deletions(-)
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index c262777..66933eb 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,5 +1,2 @@
-DIST sxiv-1.1.1.tar.gz 37251 SHA256 30569b7cb1568a7f60d102f6eb21f25c93de42243a1c8ac3c1a521d58b08281f SHA512 066264b3388114b022d11377c3dae5b04d5f4d6916c78276c478550f3194e0dc80cd8158a366689d4415cef94521ad018b5183dd2ae66c320770033b082094ad WHIRLPOOL 65e643a1f6aad84aa06bf7373ad74409dd552dbeb16ae961711341f8b5d7a1861d4142f8b80536e31f09c8a56130ea06c8ce501819cdfe9dd55af766ac925f6b
-DIST sxiv-1.2.tar.gz 47775 SHA256 ac76b69e4889137f2ce531ec4dc5ce9c4916bc575a30d351ebc7b0a684ef8cf3 SHA512 6058a8f89c540083549d91fe469f8f9d1a4acf60a19dc1d7115b7fe9a807143c9f8c0e8320e7695f7b6afe8d9ae040e9daaa09a976219228afb929133c8a6957 WHIRLPOOL f610805192379c31bd682c32c41a04ccf5e15aee1604577810df0e6a4ef21283635da92ce6c20c6f063f9da3e96611947341ca8e4e33f4714a5142315fd41334
DIST sxiv-1.3.1.tar.gz 47171 SHA256 9a30a1b036e1c17212128554709da3f2d65d3beaef2e0a73097af5e35cf11d0e SHA512 a3ffeea7fb85188c844ec8fabf8a162aa6c4f695674b44db7c60a4608956051ff5963cb85aba86cd4f16ab63a0cf84cd2309c325e22075537175bf1b65327b77 WHIRLPOOL c38815c882a198152bde4c6b4a790ddcfb8a895a1cb1be20a2cb384d3c22a3bded2c50534a9ba9fc2633cc6f7d4ce3f153f1b6004b33725b3a40e3117070a425
DIST sxiv-1.3.2.tar.gz 46560 SHA256 9f5368de8f0f57e78ebe02cb531a31107a993f2769cec51bcc8d70f5c668b653 SHA512 3bcf67a778a3e40cb6ae6b6fcc685cd57e303265df34c8a56d6ebb8ad0237e7136e738c44fee5c5504c73e4722d017f1e746691fac482568b2a960931f1ecdd5 WHIRLPOOL 8b02d693cbe8be31f81de8a0d69f218fbf2919f937fadc93657db4837bcb41e05c7b41ecbb24bfc559a1edda2d8b9f0ad14cb2118264ae52d14ac883e82dc56a
-DIST sxiv-1.3.tar.gz 48995 SHA256 4c9d6dfa0c914ea20a80dff6cb376834ab1c765623496b8266f6a882a6b80708 SHA512 ca7ea9894808b1ba2752d7b53701cf2c6c8039eb170aa9e0ee6c2b90743f20870670d986a9a7465d230f6c1e6a05bc40bebd7f8b1151066cbabe8da1a937e828 WHIRLPOOL 5c4fc1d7628cdcaf205f626587975d7a14cc6379163fa3b13110f8ac8633ce0c8aa8939141b52fb212dfe24ef3875f9e94569eb624a245c3509984c3b2482a16
diff --git a/media-gfx/sxiv/files/sxiv-1.1-makefile.patch b/media-gfx/sxiv/files/sxiv-1.1-makefile.patch
deleted file mode 100644
index 159173d..0000000
--- a/media-gfx/sxiv/files/sxiv-1.1-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- sxiv-1.1/Makefile
-+++ sxiv-1.1/Makefile
-@@ -3,9 +3,8 @@
- PREFIX = /usr/local
- MANPREFIX = $(PREFIX)/share/man
-
--CC = gcc
--CFLAGS = -std=c99 -Wall -pedantic -O2 -I$(PREFIX)/include -DHAVE_GIFLIB
--LDFLAGS = -L$(PREFIX)/lib
-+CC ?= gcc
-+CFLAGS += -std=c99 -Wall -pedantic -DHAVE_GIFLIB
- LIBS = -lX11 -lImlib2 -lgif
-
- SRC = commands.c exif.c image.c main.c options.c thumbs.c util.c window.c
diff --git a/media-gfx/sxiv/files/sxiv-1.2-makefile.patch b/media-gfx/sxiv/files/sxiv-1.2-makefile.patch
deleted file mode 100644
index 333f4cd..0000000
--- a/media-gfx/sxiv/files/sxiv-1.2-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- sxiv-1.2/Makefile
-+++ sxiv-1.2/Makefile
-@@ -3,10 +3,9 @@
- PREFIX = /usr/local
- MANPREFIX = $(PREFIX)/share/man
-
--CC = gcc
--CFLAGS = -std=c99 -Wall -pedantic -O2
--CPPFLAGS = -I$(PREFIX)/include -D_XOPEN_SOURCE=500 -DHAVE_GIFLIB
--LDFLAGS = -L$(PREFIX)/lib
-+CC ?= gcc
-+CFLAGS += -std=c99 -Wall -pedantic -O2
-+CPPFLAGS += -D_XOPEN_SOURCE=500 -DHAVE_GIFLIB
- LIBS = -lX11 -lImlib2 -lgif
-
- SRC = commands.c exif.c image.c main.c options.c thumbs.c util.c window.c
diff --git a/media-gfx/sxiv/files/sxiv-1.3-makefile.patch b/media-gfx/sxiv/files/sxiv-1.3-makefile.patch
deleted file mode 100644
index 0640bf7..0000000
--- a/media-gfx/sxiv/files/sxiv-1.3-makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- sxiv-1.3/Makefile
-+++ sxiv-1.3/Makefile
-@@ -3,10 +3,9 @@
- PREFIX = /usr/local
- MANPREFIX = $(PREFIX)/share/man
-
--CC = gcc
--CFLAGS = -std=c99 -Wall -pedantic -O2
--CPPFLAGS = -I$(PREFIX)/include -D_XOPEN_SOURCE=500 -DHAVE_LIBEXIF -DHAVE_GIFLIB
--LDFLAGS = -L$(PREFIX)/lib
-+CC ?= gcc
-+CFLAGS += -std=c99 -Wall -pedantic
-+CPPFLAGS += -I$(PREFIX)/include -D_XOPEN_SOURCE=500 -DHAVE_LIBEXIF -DHAVE_GIFLIB
- LIBS = -lX11 -lImlib2 -lexif -lgif
-
- SRC = commands.c image.c main.c options.c thumbs.c util.c window.c
-@@ -18,11 +17,11 @@
-
- depend: .depend
-
--.depend: $(SRC)
-+.depend: $(SRC) config.h
- rm -f ./.depend
- $(CC) $(CFLAGS) -MM $^ >./.depend
-
--include .depend
-+-include .depend
-
- .c.o:
- $(CC) $(CFLAGS) $(CPPFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
diff --git a/media-gfx/sxiv/sxiv-1.1.1.ebuild b/media-gfx/sxiv/sxiv-1.1.1.ebuild
deleted file mode 100644
index c26d605..0000000
--- a/media-gfx/sxiv/sxiv-1.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils savedconfig toolchain-funcs
-
-DESCRIPTION="Simple (or small or suckless) X Image Viewer"
-HOMEPAGE="https://github.com/muennich/sxiv/"
-SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="media-libs/giflib
- media-libs/imlib2[X]
- x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1-makefile.patch
- tc-export CC
-
- restore_config config.h
-}
-
-src_install() {
- emake DESTDIR="${ED}" PREFIX=/usr install
- dodoc README.md
-
- save_config config.h
-}
diff --git a/media-gfx/sxiv/sxiv-1.2.ebuild b/media-gfx/sxiv/sxiv-1.2.ebuild
deleted file mode 100644
index fbaa76d..0000000
--- a/media-gfx/sxiv/sxiv-1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils savedconfig toolchain-funcs
-
-DESCRIPTION="Simple (or small or suckless) X Image Viewer"
-HOMEPAGE="https://github.com/muennich/sxiv/"
-SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="media-libs/giflib
- media-libs/imlib2[X]
- x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
- tc-export CC
-
- restore_config config.h
-}
-
-src_install() {
- emake DESTDIR="${ED}" PREFIX=/usr install
- dodoc README.md
-
- save_config config.h
-}
diff --git a/media-gfx/sxiv/sxiv-1.3.ebuild b/media-gfx/sxiv/sxiv-1.3.ebuild
deleted file mode 100644
index 8a3ace3..0000000
--- a/media-gfx/sxiv/sxiv-1.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils savedconfig toolchain-funcs
-
-DESCRIPTION="Simple (or small or suckless) X Image Viewer"
-HOMEPAGE="https://github.com/muennich/sxiv/"
-SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- media-libs/libexif
- media-libs/giflib
- media-libs/imlib2[X]
- x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
- tc-export CC
-
- restore_config config.h
-}
-
-src_install() {
- emake DESTDIR="${ED}" PREFIX=/usr install
- dodoc README.md
-
- save_config config.h
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/sxiv/files/, media-gfx/sxiv/
@ 2019-04-02 19:17 Tim Harder
0 siblings, 0 replies; 2+ messages in thread
From: Tim Harder @ 2019-04-02 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 6c561663751de7275cc4e9dcb4650ef84fca99da
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 2 19:16:24 2019 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Apr 2 19:16:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c561663
media-gfx/sxiv: don't try to rebuild sxiv during install phase
Closes: https://bugs.gentoo.org/677684
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
media-gfx/sxiv/files/sxiv-25-makefile.patch | 13 +++++++++++++
media-gfx/sxiv/sxiv-25.ebuild | 2 ++
2 files changed, 15 insertions(+)
diff --git a/media-gfx/sxiv/files/sxiv-25-makefile.patch b/media-gfx/sxiv/files/sxiv-25-makefile.patch
new file mode 100644
index 00000000000..01a8ddf2c19
--- /dev/null
+++ b/media-gfx/sxiv/files/sxiv-25-makefile.patch
@@ -0,0 +1,13 @@
+Don't try to rebuild sxiv during install.
+
+--- sxiv-25/Makefile
++++ sxiv-25/Makefile
+@@ -62,7 +62,7 @@
+ clean:
+ rm -f *.o sxiv
+
+-install: all
++install:
+ @echo "INSTALL bin/sxiv"
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+ cp sxiv $(DESTDIR)$(PREFIX)/bin/
diff --git a/media-gfx/sxiv/sxiv-25.ebuild b/media-gfx/sxiv/sxiv-25.ebuild
index 3b3917053a8..d1cdfacac94 100644
--- a/media-gfx/sxiv/sxiv-25.ebuild
+++ b/media-gfx/sxiv/sxiv-25.ebuild
@@ -29,6 +29,8 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
src_prepare() {
restore_config config.h
default
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-02 19:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-02 19:17 [gentoo-commits] repo/gentoo:master commit in: media-gfx/sxiv/files/, media-gfx/sxiv/ Tim Harder
-- strict thread matches above, loose matches on Subject: below --
2016-08-08 6:59 Tim Harder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox