Fix desktop file

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

3 files changed, 84 insertions, 15 deletions

diff --git a/media-gfx/feh/ChangeLog b/media-gfx/feh/ChangeLog
index 27b8aa0f62ac..9eca1c0ae8cb 100644
--- a/media-gfx/feh/ChangeLog
+++ b/media-gfx/feh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/feh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.124 2013/02/15 21:58:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.125 2013/02/16 23:06:07 hwoarang Exp $
+
+*feh-2.9.1-r1 (16 Feb 2013)
+
+  16 Feb 2013; Markos Chandras <hwoarang@gentoo.org> +feh-2.9.1-r1.ebuild:
+  Fix desktop file
 
 *feh-2.9.1 (15 Feb 2013)
 
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 7ecb2d90867e..96e8d4dab271 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -12,24 +12,25 @@ EBUILD feh-2.5.ebuild 1243 SHA256 71906e3c6465d660bd6f64471361746689a03c21dbdb1b
 EBUILD feh-2.6.3.ebuild 1402 SHA256 49c4c7c510162661bd82839b03fbdce7bb37cb437a4d90b87a131552affed1b6 SHA512 4d57e8ab40c6efdbaa21afa6ead8274415c93c317a3265992c0612e403a7f9ea493f32f83b3df3398140657f1ea16d3767a377c36ba855232c8043b80d4bfb57 WHIRLPOOL 64d330a0b39134b4adda61e0109340945af362c2609a5adbade4d78618cf3a65ce9ec8ec1493aeb5e244d6480a12d542609e859ca1a70634d68e1ec52d93947d
 EBUILD feh-2.7.ebuild 1319 SHA256 1ae34f0fd39e0dec9fa67b086ddbe51a3c0742ee02101b5e9ec7ab5413c6b807 SHA512 9969e860fbc422cb815db4228342e555607521a6d0d62d5b5a1add47008486991d153ad90a663e37f94e85df72fa1de1ceb0372234eafaf17794790e95011217 WHIRLPOOL 388e7a865013c9f2c4721efc58a65c28423c406b30b3267f068f539fa5b892051e551dc7dd82bf2561fda2dced4126d4be9772294cb754c364255ede82bc1880
 EBUILD feh-2.8.ebuild 1315 SHA256 71fdfc9be897ba8e69a4d22018616b5c3ff4b63163861505ae82b1efd6318e1e SHA512 bf93cab303976b506ff1b5a5f2b471f8777a1e04133756954a237e8213ed301068b671a27deca4d486f972ed49a3581795a7f7767037aaf54bf3ab449dd3013c WHIRLPOOL 37b8b9cdf0b3f707fa31c76df723e7fac9f2906de1af139eaea7e6ee63e55f4a246dfd48fd7cf967378eb604723648aedb6d4db6461dc60c2ec6ed6b01cb629d
+EBUILD feh-2.9.1-r1.ebuild 1450 SHA256 a399d12a259ea450c85c87c5743f5ab73f60e104d303a7df6993e9e05a493913 SHA512 aeaaeecfd8d71de2bf76227ba5853b8b9639c758b394f376ade107cd54eb2824783babcef4d3176cea3d756b3ea8dfdec62b8fc945a284a6c546fdd640cddbae WHIRLPOOL 5682eb73e6a039e7d747be247607517dd283f670af091f47ad1f48666ffe2e742a0e4df1f945b5db786aa182d3024d3c0f3dfb022c66236eae4324f2d040a6df
 EBUILD feh-2.9.1.ebuild 1326 SHA256 b715ef56dab30b4c2bf161baa3d2564732b2bdc7a64d73538d3f07927fc20e63 SHA512 e2d0ef9215a32f8357b304e5bcc926467d91a5af10c1fe2308bae44381f8060babe6f30564b763912e7c902d9f4fd8784b83b7d30ff70c7b7be2c37df6554045 WHIRLPOOL 2cc0dedc495d5ef9fb4c0795b40e0abdb7a941ba5a3167d137f3e3fd6b8bb5662a80683d3fadf63abea96b45aa87a00aa9e8f26b2d7d9e717a348327c0b2631b
 EBUILD feh-2.9.ebuild 1325 SHA256 081ca16341e6d87900684c0fb6e910741af2dc42caf376b97add2e7835c00977 SHA512 49a57f400b9979f9fc3059ae36c2d1c2d521222a699f208a7a6cb709478f2504cf291e145647b3a1bd3dfa1d2f697d5c80aadc871d6900009c89d28a934b1adb WHIRLPOOL 17e248e27cc29af8f6df3e57f0a11ae09cdd3d68c8ef7945e93aad4795b527790ec4bdb611a1b3c62f0166c77100a3c9428335b61071cb4e1a53ddc34ab543ff
-MISC ChangeLog 14335 SHA256 56abc6c1dea0d0ed7a742c3da42de06ce48b76154fb254e7d6b8711819689daa SHA512 74be3b15aa99a6695685779f78f8b4a2c9c7e6439cf78647f55746bcfc3bf46fb760c077f4364109abf3e660f8972f0557d7084ce750e60a4e9abf729a6c1c79 WHIRLPOOL a9c3dd53398036026356bd675b40eb1344499944d140c4c2600121f54b86722d67b808765adbff487becb9073b3cb9df9a1a34a082d6deb4e77f99b5ea3c2bb1
+MISC ChangeLog 14459 SHA256 15960f96e0b8b5224527f138b3ca93022f5b2db45742b116bd829fbd22019ad3 SHA512 392027920691070c03d0529d10bd9e2419d6e4aec19809c07cd6acb858f59c2652bb936bc01a876c445547d66df384861ba0c9a911a6d15f3ce778f6d04c2eee WHIRLPOOL 17a19656825ef2e304bd5e5e7697100c8d7a8ce8b99f391727e80919ff8f30602d2f4104d3d5743579a025115d5c49d86338d383419fb7b64b5faa500c4e3305
 MISC metadata.xml 357 SHA256 91c6ea742ef1f0bf7cf47634ccb91eadcb32624c300f782511121d7420e322bd SHA512 db8eb56cb6d97712ca557dacd10c8705058cfdae7a3136721606096580c89bf3199575ddae0e0b37389885e98abd60946ef106ec9e5f392091a965705f8f6719 WHIRLPOOL c703225cac865456c5c63d7d777dc04df9e556bb7661fe4137fbfafab65bc76c7a6e9b7ca7e12aef184d521cc22a2123f4abdb178241d3fcf27ef6c3773696df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRHq+DAAoJEPqDWhW0r/LChrEP/RgfC2+EnjBFe1IhGjihR2cN
-azm2+ZdL4xUGh/RDmSNEDoM3915H0426lTK5w8pi796WE8OIE282pC6KfvTwLhFm
-wrXaD0lXJ0YJ6e6n/mFOw/ObZiTcup9zGjX+T20lAn+hNjNR3U9AtmiYQYbKo4Dp
-LGJUtQP9fE6HWXk4izUYqBNziHJDIDvPA/n6csfmQzxxplRSjvZJrNtUDfOTt/FD
-bAk1ft6CA0nINSxIdT5jsXKew/0JpZe1R6vvfd7A5DxEJ8FCRd4vGQ79CDmUaVl6
-pLT2My8ocBY1DIn4hKnc4HgWfx2rdJt1GE8hQ3jWgUVMzxkn+PWEpN6RCwD9Pw/F
-jyv7+HvGDDaaexG3jloHdg7lCeLQNGVj5J0413EyrrkejCEVJK42LnYzAbo8WBI/
-GFgDc8U9Ms+z2IHC0BZS3GCv7A5KszonUZRl+gJQIfOt34oaa6/rDxCMgZIo5h+K
-eJkPdYqIxsjIIeprqMAd7mCO7IwlYr8khxrpTMNZdJSh+q+0YsooqBDz1Xr8s7r7
-d+nPbvCFpZhxw52CCv82xDBocLgaLExFp6c6WtoWoGbP9ThpkPpytKyMrqyp5tqm
-Cfu4sUEMVE53DfoKu0r3W06qAucPg6OeUrtIR882Orjz6zcKqmMIKMJ8W0z79RfL
-rWuayr03u6i3xOuEGPu8
-=J2RR
+iQIcBAEBCAAGBQJRIBDgAAoJEPqDWhW0r/LCvqkP/RxFtb23Fi0cBkgrxD47Mojt
+177bH+iDRMfIsejqRUyTMsx57RNosAg4tjJTSgoi08HGCctY+AS7BrOzjyKDsTou
+4IxTDq41tyP7s2/aV3jYqm+YdGGxCqCSoSBE3YRtMiAESVZUD14mAQAW1FVgl7ly
+H1zFPZZQUcXkVrgv/L6LjCIamoj+LbVfg/+5a4FpUIUUngFvhuxTX+y/QPVfihFK
+pGs5HxBBoWu9M/iGJkFadEYx4Z4gWm78uu3hSc0bQp9N/yftQs2qkrtPVnnvmVpN
+yva7fbxP1p/xCJyIlVHdcMBfbrinkSzctCp1Yd4B7xu70hfoTazhX0RBVHpyE+RN
+iI72EtR9EovbA9xOZQl0ZOq63DUkq4Nk7wPLlvEaeDKvXe2H7gCwu92t+mH/0ITF
+uWso93t+a7AK4AVqgkdvM9m6991RUlWKkZvcXfK0JY+cP1/h1E8YdfANAbQv/iuD
+JDAug+Kf/Hms6Lf2zAJeftNz2+RvoBTd0I5YhzK+zae9oFFst9FWvhmncVZ63GDR
+CNBL7mLzaK6tq+QlO/RygguPfQvbMvmiPSQmMabeBTnBtwQC9bSkN/UmbF8W+GDL
+zRFR4HnyYRCkqnwtOVXePTXvRXoq68OXF94RF1fZgu5wd5C4fzwFtQ4qEduSy8lc
+vEoQbRjDZJATnI33sBIr
+=B/of
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/feh/feh-2.9.1-r1.ebuild b/media-gfx/feh/feh-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..4815f729c3f6
--- /dev/null
+++ b/media-gfx/feh/feh-2.9.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-2.9.1-r1.ebuild,v 1.1 2013/02/16 23:06:07 hwoarang Exp $
+
+EAPI=5
+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="feh"
+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
+		)"
+
+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}"/${PN}-2.6.2-debug-cflags.patch
+	# fix desktop file
+	sed -i -e "s:^Icon=.*:Icon=/usr/share/feh/images/logo.svg:" \
+		share/applications/${PN}.pre || die
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}