Version bump.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

4 files changed, 93 insertions, 10 deletions

diff --git a/media-gfx/feh/ChangeLog b/media-gfx/feh/ChangeLog
index ca907febaf75..4d0b0a7c3aaf 100644
--- a/media-gfx/feh/ChangeLog
+++ b/media-gfx/feh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/feh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.112 2012/09/13 12:39:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.113 2012/09/26 22:18:24 radhermit Exp $
+
+*feh-2.6.2 (26 Sep 2012)
+
+  26 Sep 2012; Tim Harder <radhermit@gentoo.org> +feh-2.6.2.ebuild,
+  +files/feh-2.6.2-debug-cflags.patch:
+  Version bump.
 
 *feh-2.6.1 (13 Sep 2012)
 
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 60a7fbbd9faa..d99fbd145050 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST feh-2.5.tar.bz2 2227722 SHA256 529a6a349bfec87a8a07b17752686149b702cf2468ac56d7306b2f0400f077aa
+AUX feh-2.6.2-debug-cflags.patch 197 SHA256 77a833f28852c3ad6b0fbd03ce93098f31efd3ecdaf9a50a14e3d0b032b04873 SHA512 eb09a90a9ff3ba2ae7a40c8ef9e5b361d42bb045e194ddb5823111d780da265371ee087c6f80963d80f5cd1d0427478f46fec9b0f0607ad2bb122415a9c2e397 WHIRLPOOL 6a95e12ea4c3fc4a4f552740527155437df6a3a4ba0e848bc976de3c9b985f3dbaa5f43016bfa4444647d1253760531b9de10d5bf2c5176383e3b57d5b5e3fe7
+DIST feh-2.5.tar.bz2 2227722 SHA256 529a6a349bfec87a8a07b17752686149b702cf2468ac56d7306b2f0400f077aa SHA512 0371185612ad052bd74b9056c2820b60a9529727130910abb55e7df1f2440fe00f1e04448428cf2c33624c467b486c6c66528d5dc116fef92cd6e879f28c77f6 WHIRLPOOL 9373d85815c237f41393bf00351a16bc3f824dbe98298ceb56f69b941e5cf34376ce20ff213a0f419283c873c81ba7504ec21299aff14dceeb6ad85711bb8cfd
 DIST feh-2.6.1.tar.bz2 2238724 SHA256 36edacec2f8d0d13035202e68f09ccf5d2ee5dc1d95157e8ee6bcde9c0a5283a SHA512 821fd1a5965cc66c1fe74f14b3dbf059379504c0d2d85b0299505c9616dfe340e61e07efc7b9317b9a556d687f9059c628b0afc738acee3c634aad2f9a097266 WHIRLPOOL 785b74065958757026f8e0775194cf3ae77f817058cc0b35179f002e7ea3e51c07006b8a3371c48f5b70979a13a81a298a35fd9a69b78ad401d962a0ef78ef1e
+DIST feh-2.6.2.tar.bz2 2239073 SHA256 6758b68ec133bbedc3373966129a521f35dea2f354ed6a571dbe7a9bd4ddf5ca SHA512 4a4f7d905bd922857e08b4422f8c5b019c9e62cb56022f0c29dabec1ca60ccab4b0f73387d782962aef8bbcd3d37f86d5e287f329e40fb4edfc3e5cc3edfe499 WHIRLPOOL 63f6df47197f0d546d64167554333622bc70d858be229e5bbd9182a33b6e3dd7afc4af3629c139f2ba25c4e65f6d1ab92c8f666f5fe1e18a5e2d7363d1c5fe5e
 DIST feh-2.6.tar.bz2 2238237 SHA256 172e248a2f2f2b87652598823a3bc51058ea9d4f0378e6900723bfa34e345e7c SHA512 34da10440843ee55a5a3e35de33bdb47e868c9f4081772bb53c012eedd64f02ba28eb646d6e5efa61b4e5462d3c5d035ccb02becce2604fb4f6bcf71ff76a461 WHIRLPOOL 62879c942c2de155451c24d05cb21456b24f0b7052545e665b43c287a8524e17c48739d74e99b5ff66ccaa2c53505971fc8df75234b0fa61790a6d8a958cbf09
 EBUILD feh-2.5.ebuild 1248 SHA256 cee28f8f1c0317bb029acefd20ac40d8f345545a4947f4a5ed7dde92b5c00098 SHA512 38c90166f24e1358f10ee6e5535dc04f8fcad608ad3c521ecbfbbdd3069e4954ba321e6e7a33004d8c7fd91a5a247abc6f624c8b0f677987f8dde924eeb05292 WHIRLPOOL 09a40d65b43293eec2da33057f805d7d758248934ad871cb491400c4fcc6ff557da1ee44b965a6c29ac2ea7fe5bbc4dc9c4685ce5901ce757b2db190934dc559
 EBUILD feh-2.6.1.ebuild 1338 SHA256 6960ce91c95240fb73e7e5d4f77ed423850172313817a6c1cc671106b35d9653 SHA512 52b8cd382bf5837c36d9b07610fa3bc371fd333c7150cf7ad6747201c263279bad150e4cd151ef5980576a61d5de598cdc769d5c3e42cf19ca09a4ea3e45ec2f WHIRLPOOL c065880866d909fd984b44fdfcd3655db5ab8714453401655cdc2e9cc4f825faebbe5e8d72473c248659f64f0300a5102127f07706f048839d437e591f339caf
+EBUILD feh-2.6.2.ebuild 1403 SHA256 df2a7819c00e50d8e85c1d1cb02e183d7a9c4b68e1b884c9f30b133a4ef2d935 SHA512 1a4ef4a0ed671062d36eae9faf85d5786876c57d703c7df39fdecb9510e2a4139754de9cc83db25e73a8c213776c952f4eedc4045b4e37b2529395d1148d1028 WHIRLPOOL ba4aa4e34ae030d91aee835576768006c266a76d5ede09fbf8973fd72e7950de147cf49bc20f16e518970f0fa1fd68b7e82aaebe47b3eda59cc0762abb018c18
 EBUILD feh-2.6.ebuild 1335 SHA256 d0b19e1ec2307a0bcc12b7c5e0866fd227554fd819d1385c34ebf0f2e5d0b4ed SHA512 e39df967709760f9f504e632bbef9899e7983411eb3d022a8e3fe9a17f7b3661db8a88153b9808bfe352636c61dbe89c90ffe31a700741ea9d69d3ae2d3f7a36 WHIRLPOOL 119b90eb35f60598742684ac3458d5aa33b07b7f38e25b693b7d188fab8747c5fcd74531fe5dbc263605bfb2722b40530d9586b3436b6162557072974791aab4
-MISC ChangeLog 12975 SHA256 373f78fd377a7cad4443dcde28b9c20fb80060b9f657b39cd48ab5065f8510ce SHA512 e9f9e79eed0fd6b6252a40b87aeab905f8a8e59985c5968580fc5a3a5c4223d05908f4ca5799a025f39b472f5eb3b17ded460dc40f7077762424e0926edfa969 WHIRLPOOL 74e3c6f8762b09280e751f41bcf6598706c2540d1fbd6bd70c38699d681771811b689aebd0b7ed478b7e140af3686c8112340a4eeb3d791ee54d6eab43dacd94
+MISC ChangeLog 13125 SHA256 0ca39dde52dfab232b9765889e299ee8a50fef270b1c311ce28de9874cf4e598 SHA512 ea966d2eeb5083d822eaf8ea618bd14a69a10ddc003596be6023afa824157c38b100f13172cf4c580b6161a34327cdb69a441de9f2942b8004d1adee55314f23 WHIRLPOOL 5b5abc5569e4aa1e200dfa377b3909d53cf696a8553fcde7f090eb90cca9ff07fcc3bda96cd036262ba145a0087a0c0afff639dbf95214d493ba8f7b2b0023fd
 MISC metadata.xml 357 SHA256 91c6ea742ef1f0bf7cf47634ccb91eadcb32624c300f782511121d7420e322bd SHA512 db8eb56cb6d97712ca557dacd10c8705058cfdae7a3136721606096580c89bf3199575ddae0e0b37389885e98abd60946ef106ec9e5f392091a965705f8f6719 WHIRLPOOL c703225cac865456c5c63d7d777dc04df9e556bb7661fe4137fbfafab65bc76c7a6e9b7ca7e12aef184d521cc22a2123f4abdb178241d3fcf27ef6c3773696df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQUdO8AAoJEEdUh39IaPFNqQMH/j2TPPqE+PkEIhK2GPFIcjML
-SqueLnFNiAX2FjuGPsn6LGPOGXAQ8TZyeV1/pAwRQIeJIKeu+PJ3wKOvwMG5HemA
-4CY/4PRJbWDA7fmHpmlvUIxB69Reaipw4ow0436eLIVngft3LDza7KSDxdRFrUD9
-+IcaCd//d58QZzB8YidQOJDuzsXGinsrBQ1A1Mw3/6vnGg95Nf8NviOKQZeBkOfC
-0/mdGTxqmTud+wX12UaXDOM5WDG1lVqy9p70TNbbDFVlSGKwcQDTNCXzPCIIconc
-PRPZDRiFT9VRNERKh5UOrdDsTHG7mM0YmwXfxifiCJgYdSzrH1TJCezMeUNmoSA=
-=FV5X
+iQEcBAEBCAAGBQJQY382AAoJEEqz6FtPBkyjmNUH/jDF2NZI/ehDeSkWBMMSXfMz
+98bycbRP+4IyEtnm9KqYJ94DPOENBTcOYbZKj+2qGJ3qsOlqYybPYMqnzpqcr1aQ
+n+aJohf7KVwGOIChQioxCERTaL0l5Y6Xvvr6ZA/+v/ufI1BMr7zeNoXSeZUWjSc9
+Fiih3xPa/XujvsLch5Q+s+UwimFLAM9gFEL2VUCN+i8Zg/zpsS9jtppsCjRPL6Wg
+EgmcreWIjlA5QBtDyeZYWeF6Br+Ysq6yMyfaspXCDDSEqM/cB4R/QMiGpa672rih
+dcdcHbIFmFpSZ82Lv/Rce2PukhaVdx6bPyemN0KALRZHHVjBVEwrH1izO5rDWe8=
+=PMSi
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/feh/feh-2.6.2.ebuild b/media-gfx/feh/feh-2.6.2.ebuild
new file mode 100644
index 000000000000..f7d04930a428
--- /dev/null
+++ b/media-gfx/feh/feh-2.6.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-2.6.2.ebuild,v 1.1 2012/09/26 22:18:24 radhermit Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="http://feh.finalrewind.org/"
+SRC_URI="http://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+
+COMMON_DEPEND=">=media-libs/giblib-1.2.4
+	media-libs/imlib2
+	>=media-libs/libpng-1.2:0
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXt
+	x11-proto/xproto
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+		)"
+
+# requires the mandoc utility which we don't have at the moment
+RESTRICT="test"
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX=/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+		)
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-debug-cflags.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
diff --git a/media-gfx/feh/files/feh-2.6.2-debug-cflags.patch b/media-gfx/feh/files/feh-2.6.2-debug-cflags.patch
new file mode 100644
index 000000000000..a4a71acef30c
--- /dev/null
+++ b/media-gfx/feh/files/feh-2.6.2-debug-cflags.patch
@@ -0,0 +1,11 @@
+--- feh-2.6.2/config.mk
++++ feh-2.6.2/config.mk
+@@ -32,7 +32,7 @@
+ endif
+ 
+ ifeq (${debug},1)
+-	CFLAGS += -DDEBUG -O0
++	CFLAGS += -DDEBUG
+ 	MAN_DEBUG = . This is a debug build.
+ else
+ 	MAN_DEBUG =