Version bump.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

diff --git a/media-gfx/feh/ChangeLog b/media-gfx/feh/ChangeLog
index d2c73e89a3718786c6a2a1828b2bc228af07f658..951bec5780a4bdc464d51392f0435f217127b3c7 100644 (file)
--- a/media-gfx/feh/ChangeLog
+++ b/media-gfx/feh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/feh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.34 2010/03/01 17:00:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.35 2010/03/07 13:49:06 ssuominen Exp $
+
+*feh-1.4 (07 Mar 2010)
+
+  07 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> +feh-1.4.ebuild:
+  Version bump.
 
 *feh-1.3.5_p20100301 (01 Mar 2010)
 

diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 01acb7368cd398907a6c32f7e941715d9ce03477..ff66a1e16780e780698c95b56bab168e48984a56 100644 (file)
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,10 +1,8 @@
 AUX feh-1.3.4-headers.patch 321 RMD160 80f5a6a37e05d73627a176bd516d3fd06428830d SHA1 7eb1698611968f92d7bc235234e19e9622c77e91 SHA256 58441ad19defbfff523ec296d715e726b82a0b2e44ccc92596c1b955614bbf16
 AUX feh-1.3.4-xinerama.patch 1325 RMD160 cec72da1d1615b137fcd0be6f866368f271fc060 SHA1 469dc6e439c715023449c5ec08fb955248d9966f SHA256 ffb99685611e6fb186dba59bfe17b266b1f9c49999c52c64b4eb3b1548baccf4
 DIST feh-1.3.4.tar.gz 409530 RMD160 7e27d31cf974b30fc321d4dbef2fd46fbd21d34c SHA1 cf02fd48325ba02467c7f791634a28e98edbe801 SHA256 81b9f2bbc15ffda4640958701753447b95cd2cbf11bc8e85dd00fdd2a2f83124
-DIST feh-1.3.5_p20100301.tar.bz2 337500 RMD160 a869a4d1988b011a48b44bf8d0350bd3c7565907 SHA1 ce9406e8073527d96f83fb0077a15a4faece2db8 SHA256 b75cce5774a097e17fd50fa861a53d3d1ba5133dab728681379d1993f174642c
-DIST feh_1.3.5.orig.tar.bz2 351829 RMD160 e607b45351b55f7e9a49387e55f37e49d0a57a16 SHA1 237a2febfa1eab04cf08f3411154aa5f60719955 SHA256 f6d42a125839d02945c03c2432e66696153a11d28827d8e50cc4d8d6a5f87ecb
+DIST feh-1.4.tar.bz2 336586 RMD160 e43a146f1cc2b78561b776d8ce6fd0977bc75fc8 SHA1 19e542414df346c2e71e4c8fbdce17caf863e144 SHA256 dc99be6d9f4a689960b37f65d373d32fff838db676c3fb9030b5d9f66a3c617d
 EBUILD feh-1.3.4.ebuild 1287 RMD160 4ed2ad2bd46a811b2147378ed809a1e366577b6c SHA1 0c9f7c8c7c30d53ef687b812c1874c5f0b2695fc SHA256 0f8b6f1d81627faee9dd52e54252dc08b52b0071942cfb2f891eaa78ab3b9422
-EBUILD feh-1.3.5.ebuild 1299 RMD160 78af5ad79650ed81c09c35b5381c89d3954bff2c SHA1 b26bcde26404537c79c858362545d8c46a0e4e91 SHA256 0b1fe6b4ab9e8c909143e3e1649833bacdb0022bdeaadcdc53e837786d879b71
-EBUILD feh-1.3.5_p20100301.ebuild 1087 RMD160 815e5b7fdde890f4377d75a03866b46877952b01 SHA1 fe6e0f6e57ec6df87d7f640dbd8a4c675ca21090 SHA256 2feeced920568e867c1f7d5a8823cf93c9341f6585529f2806178bb6e8e2d60c
-MISC ChangeLog 4243 RMD160 4b54a3963dd9701e86744ad1be398158d3a260dc SHA1 9da7fb41bc589853081be43b2d6e0a8b0b225bb8 SHA256 d40acc0034c9f3632da66b4169ff6bf0012eff463aa75427d2907ff6fc3c3540
+EBUILD feh-1.4.ebuild 1078 RMD160 6f1c87ee60d1bfe29b0645db80acf2a78df53b3c SHA1 d38517adca76fe4a1f88a3adcd8c5b5c7d86388c SHA256 881b9139ad19df94e4aead68710bb08fd1177444e25d726be8b802c15717074a
+MISC ChangeLog 4355 RMD160 ae3e5c401afb221be1e05dfe44ff47b7131b5a70 SHA1 fcd26b8ab36cad13a49c1588c38854a46a637ad3 SHA256 d30cea809adeab28f0819770f2c38c631a1c6fe967b24b5629d2a6ca2d15ac36
 MISC metadata.xml 264 RMD160 ea7162513d37cd633ba9ebf1c162de4cc708ba13 SHA1 ff7da2e986f49904ca02ce36ff96ae29204a341d SHA256 da9c51808676fe2ddfb7534289878496a7c4d921d88fcdd1931dfdbbe6549141

diff --git a/media-gfx/feh/feh-1.3.5.ebuild b/media-gfx/feh/feh-1.3.5.ebuild
deleted file mode 100644 (file)
index 1fa5855..0000000
--- a/media-gfx/feh/feh-1.3.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.3.5.ebuild,v 1.1 2010/02/22 08:24:00 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://derf.homelinux.org/~derf/projects/feh/"
-SRC_URI="mirror://debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="xinerama"
-
-RDEPEND="!<sci-astronomy/xephem-3.7.3
-       >=media-libs/giblib-1.2.4
-       >=media-libs/imlib2-1.0.0
-       >=media-libs/jpeg-6b:0
-       media-libs/libpng
-       x11-libs/libX11
-       x11-libs/libXext
-       xinerama? ( x11-libs/libXinerama )
-       x11-libs/libXt"
-DEPEND="${RDEPEND}
-       x11-proto/xproto
-       x11-proto/xineramaproto"
-
-src_prepare() {
-       rm -f configure.ac
-       epatch "${FILESDIR}"/${PN}-1.3.4-xinerama.patch \
-               "${FILESDIR}"/${PN}-1.3.4-headers.patch
-       sed -i -e "/^docsdir =/s:doc/feh:share/doc/${PF}:" Makefile.am || die
-       # the bundled autotool code was generated with automake-1.4
-       # but there's no reason to restrict to that version #141427
-       eautoreconf
-}
-
-src_configure() {
-       econf \
-               $(use_enable xinerama)
-}
-
-src_install() {
-       emake install DESTDIR="${D}" || die
-       dodoc AUTHORS ChangeLog README TODO
-}

diff --git a/media-gfx/feh/feh-1.3.5_p20100301.ebuild b/media-gfx/feh/feh-1.4.ebuild
similarity index 58%
rename from media-gfx/feh/feh-1.3.5_p20100301.ebuild
rename to media-gfx/feh/feh-1.4.ebuild
index c162eed9d7870b266cd91b6bc100a7560ab59caf..3870be6d80a0068045b85f09bebee5c188fa4a8d 100644 (file)
--- a/media-gfx/feh/feh-1.3.5_p20100301.ebuild
+++ b/media-gfx/feh/feh-1.4.ebuild
@@ -1,34 +1,34 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.3.5_p20100301.ebuild,v 1.2 2010/03/02 01:35:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.4.ebuild,v 1.1 2010/03/07 13:49:06 ssuominen Exp $
 
 EAPI=2
 inherit autotools
 
 DESCRIPTION="A fast, lightweight imageviewer using imlib2"
 HOMEPAGE="https://derf.homelinux.org/~derf/projects/feh/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="xinerama"
 
-RDEPEND="!<sci-astronomy/xephem-3.7.3
-       >=media-libs/giblib-1.2.4
-       >=media-libs/imlib2-1.0.0
-       >=media-libs/jpeg-6b:0
+COMMON_DEPEND="x11-libs/libX11
        media-libs/libpng
-       x11-libs/libX11
-       x11-libs/libXext
-       xinerama? ( x11-libs/libXinerama )
-       x11-libs/libXt"
-DEPEND="${RDEPEND}
-       x11-proto/xproto
-       x11-proto/xineramaproto"
+       media-libs/imlib2
+       >=media-libs/giblib-1.2.4
+       xinerama? ( x11-libs/libXinerama
+               x11-libs/libXext )
+       !<sci-astronomy/xephem-3.7.3"
+RDEPEND="${COMMON_DEPEND}
+       media-libs/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+       x11-libs/libXt
+       x11-proto/xproto"
 
 src_prepare() {
-       rm -f configure.ac # configure.in is more recent
+       mv -vf configure.in configure.ac
        sed -i -e "/^docsdir =/s:doc/feh:share/doc/${PF}:" Makefile.am || die
        eautoreconf
 }