Revbump to properly respect CFLAGS (bug #439456) and use verbose build output.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 96 insertions, 13 deletions

diff --git a/media-gfx/sxiv/ChangeLog b/media-gfx/sxiv/ChangeLog
index e9151b5e3b16..cfe03819b876 100644
--- a/media-gfx/sxiv/ChangeLog
+++ b/media-gfx/sxiv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/sxiv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sxiv/ChangeLog,v 1.9 2012/06/24 03:14:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sxiv/ChangeLog,v 1.10 2012/10/24 03:30:29 radhermit Exp $
+
+*sxiv-1.0-r1 (24 Oct 2012)
+
+  24 Oct 2012; Tim Harder <radhermit@gentoo.org> +sxiv-1.0-r1.ebuild,
+  +files/sxiv-1.0-makefile.patch:
+  Revbump to properly respect CFLAGS (bug #439456) and use verbose build
+  output.
 
   24 Jun 2012; Tim Harder <radhermit@gentoo.org> -sxiv-0.9-r1.ebuild:
   Remove old.
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index 7cc5f8ee7f2d..685fc412b97b 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST sxiv-1.0.tar.gz 33568 RMD160 d2bef62119b691cbb5ec8e81de5d53e09e573e64 SHA1 e29e33c38fd2a6c8a2cb3b270776859328aa8e0e SHA256 fa49189d7bc139bd3dc50aa4e939fe4480c524117ed89dba7a3f54da5013885f
-EBUILD sxiv-1.0.ebuild 825 RMD160 5e90514c164cc1e0df5b894ac4f3eb317e5dd87b SHA1 c4b7eceb4c0a92ea4ef83ad333359a39282a2c3e SHA256 bdba88410dc9f6534983444bb49334128247dfea2ce014488b8c8b261063050a
-MISC ChangeLog 1269 RMD160 a010b85b8dd427f12896145456f539419d5f9cfc SHA1 4c180a70cb42d441554486aa404ab94baa2600fb SHA256 62512ce458e0d35478d731e32eaeb8aa7d015b3139f65a9c78dd961264e9c970
-MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564
+AUX sxiv-1.0-makefile.patch 835 SHA256 ec5bfcf71e455f6ea23b1ff9d22dcf9363123e15b0b15795ce058e29fe400880 SHA512 c88d5b8886366df7939b0d2b1490060fc3254837b09bb2de23642a0517a2c406c01597fd2ed5d56a280e6f73037c4d0d9faac2f8936921de9fd03530a2ad1e86 WHIRLPOOL ba82b28ea96d4c87aaf13c81cc7389a4b3bc25ef319732cedf3f7fa6fcb757f8bcf24ce3d03c3cf98631ccc43b596798f925fddeea6a4c01fed3ea4ab7b72034
+DIST sxiv-1.0.tar.gz 33568 SHA256 fa49189d7bc139bd3dc50aa4e939fe4480c524117ed89dba7a3f54da5013885f SHA512 c826f7612aacae277c819976f2888b7248788b5262b267797fb2c18bcc6d8216324bb3ecad7f9badc5afcfaf4ee44e2d0dc3e8bf8932758aaebcdd824243c0a3 WHIRLPOOL dc08076afa91fd38bb621f60df2fbf13e465b51be03bfde2398999b77f2b1acafcf22ae431377676b622bbc6406dc2eddc6634769f46715fa767c26ea23c59e8
+EBUILD sxiv-1.0-r1.ebuild 757 SHA256 ccdd5683e10d7c1087547ef2a75649c0770161e212a8166bcaf6a54ecbf9c8bf SHA512 9a1041782ffa292303a40921c00bfcb4b0231fd5092e9b124f19eb188457d2da7f0db3a59a5c1494f6542ebb54a5097a043dc4a1fcabd2bfa66af8b3eed43e23 WHIRLPOOL a8c40afa633f26566a5e7affe41ff59fbb1473700c4a50939a31a2dcf632ed54eaa5645743b8dd2ed57fb43bf1dde78b511b82827c6449ab34a3ed5e01bdb46d
+EBUILD sxiv-1.0.ebuild 825 SHA256 bdba88410dc9f6534983444bb49334128247dfea2ce014488b8c8b261063050a SHA512 78c4183424058fcb2627beb9ecb771d92943310faf28082da1a636b4bb908f26b7c91941e280e5af69b52e0b796a631acd065619871554b10a768c31981ae351 WHIRLPOOL 2328dd8c9aebcce78ca1faf4d16fdb2d915c1dbb3ea16aa6d1a3161a8505bd3877c0d14fd58eb4b5bd240ed292cbae4ea051779d06efc1e2d1b401efbfd2be86
+MISC ChangeLog 1486 SHA256 5cdf91cae21e83ff502a98199712c35c58da8bf331a8df7b78d362b30f2c268b SHA512 b65ee7555c5f86d1c7196d6a4cc1b9a3ec820ae3218420fbd1dee6480605d49d2b970873620174859b92cdbd9800d573f46fd54669d5949a3965b0872b750e00 WHIRLPOOL a4e46881a326e15c36e12a52ca95c30816c55ee48992ad684e478786f1ebeed9bdeaedb24b81407c9eaceeea50570019e521a856dbd0fb505d142de020f22fab
+MISC metadata.xml 163 SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564 SHA512 ff4552bc5fce771795ba67e190fc9eb90ac70aaff219130e7ff9a36cde348cd4a771d8b61e158ce9390771d29e2e0ffe17618746ff1843b2af7322e0f21cdf2c WHIRLPOOL b0db778b8dab215f2790081db3d51586e43bbc790ab06f704ef4ddd6e83e90e53685d3483feff33ed1763945fca36e934e7813bff822713869d0d7f208678fb1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP5oYwAAoJEEqz6FtPBkyj+XwIALCfwrZmwV84WesqO++8dsuf
-RAJ9x2jykLla0sh2vMjHgscynaQyhwPw4gKP//fQ/4NdkqkTa8a7P2wN3GMv8Vgm
-KmE7XbuwIrJtJ0apNeaLFDBMlKn00XqPRQFMuze1qIQXgfqe4/hUSEV8VJzqHK+2
-MOKVzATKI724LYtQvt+0+BnOLve26cUgeFDU6yRxx1P1kaCC4RI8Qz/atOo+GuJ3
-/HT0uLjHxK8REXv7sPDKMRfFn8Y17AeLD3Uyjhp86+SwVlIdaUI2/wMkPrrAyYeq
-k7iR41f9CWbbjpy4SMvLZKZUmU1GfSvIyWnvWY4Vz56pjwXk7op7OfBKBYJXxvI=
-=GeyY
+iQEcBAEBCAAGBQJQh2DdAAoJEEqz6FtPBkyjIi8H/2nKLLFrRF6iubddCMab0CCb
+IV85e8PfhV1e3qkTu3XjtqP9j9r+P1yAwPjO65eg7knkSNcULEUIY+dQGGPPwwmq
+IAONCnIhCojC5PLvF68L7NAd5V5USvHTvQ4FCx5SmLV/iSIUyfPyvRD8wmxIF2up
+ppFPZ6vD08ps/nLl/csXNldQU/REAIRrSyvCcy7T5xDgFlWNDk23jbMRGzCcPNSw
+cmqyxkuMwOiuN+wyXyAzVRR5EDkLyKXCzd1+cjh4Cx1wUG0HjEDovfc9sZtjRIA1
+TvNf/dFbM6fFY7qMip4xoA1kUeiaH+liTIEO9q7R1mI8Dn9gmwT1+dTaFWsBSlI=
+=4h5C
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/sxiv/files/sxiv-1.0-makefile.patch b/media-gfx/sxiv/files/sxiv-1.0-makefile.patch
new file mode 100644
index 000000000000..783f0a522971
--- /dev/null
+++ b/media-gfx/sxiv/files/sxiv-1.0-makefile.patch
@@ -0,0 +1,40 @@
+--- sxiv-1.0/Makefile
++++ sxiv-1.0/Makefile
+@@ -1,8 +1,8 @@
+ VERSION = 1.0
+ 
+-CC      = gcc
+-CFLAGS  = -ansi -Wall -pedantic -O2
+-LDFLAGS =
++CC      ?= gcc
++CFLAGS  += -ansi -Wall -pedantic
++LDFLAGS +=
+ LIBS    = -lX11 -lImlib2
+ 
+ PREFIX    = /usr/local
+@@ -21,21 +21,18 @@
+ 	@echo "PREFIX  = $(PREFIX)"
+ 
+ .c.o:
+-	@echo "CC $<"
+-	@$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
++	$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
+ 
+ $(OBJ) config: Makefile config.h
+ 
+ config: config.c
+-	@$(CC) $(CFLAGS) -o $@ $@.c
++	$(CC) $(CFLAGS) -o $@ $@.c
+ 
+ config.h:
+-	@echo "creating $@ from config.def.h"
+-	@cp config.def.h $@
++	cp config.def.h $@
+ 
+ sxiv:	$(OBJ) config
+-	@echo "CC -o $@"
+-	@$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $$(./config -l)
++	$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $$(./config -l)
+ 
+ clean:
+ 	@echo "cleaning"
diff --git a/media-gfx/sxiv/sxiv-1.0-r1.ebuild b/media-gfx/sxiv/sxiv-1.0-r1.ebuild
new file mode 100644
index 000000000000..efe054ffddef
--- /dev/null
+++ b/media-gfx/sxiv/sxiv-1.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sxiv/sxiv-1.0-r1.ebuild,v 1.1 2012/10/24 03:30:29 radhermit Exp $
+
+EAPI=4
+
+inherit eutils savedconfig toolchain-funcs
+
+DESCRIPTION="Simple (or small or suckless) X Image Viewer"
+HOMEPAGE="https://github.com/muennich/sxiv/"
+SRC_URI="mirror://github/muennich/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="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
+}