diff options
author | John N. Laliberte <allanonjl@gentoo.org> | 2005-12-04 23:44:10 +0000 |
---|---|---|
committer | John N. Laliberte <allanonjl@gentoo.org> | 2005-12-04 23:44:10 +0000 |
commit | e9d5ae647911360eb1966523ee725c6764796f5d (patch) | |
tree | df7ef9b0d2f26423839437ede02ad7dec3e4ebd2 /media-gfx | |
parent | add back in ia64 (diff) | |
download | gentoo-2-e9d5ae647911360eb1966523ee725c6764796f5d.tar.gz gentoo-2-e9d5ae647911360eb1966523ee725c6764796f5d.tar.bz2 gentoo-2-e9d5ae647911360eb1966523ee725c6764796f5d.zip |
backport patch from cvs to solve parallel build issues, should fix #112129. general ebuild cleanup.
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/gthumb/ChangeLog | 9 | ||||
-rw-r--r-- | media-gfx/gthumb/Manifest | 9 | ||||
-rw-r--r-- | media-gfx/gthumb/files/digest-gthumb-2.6.8-r1 | 1 | ||||
-rw-r--r-- | media-gfx/gthumb/files/gthumb-2.6.8-Makefile.patch | 27 | ||||
-rw-r--r-- | media-gfx/gthumb/gthumb-2.6.8-r1.ebuild | 56 |
5 files changed, 98 insertions, 4 deletions
diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog index 74b416cd63a7..efb4c9654d71 100644 --- a/media-gfx/gthumb/ChangeLog +++ b/media-gfx/gthumb/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/gthumb # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.50 2005/09/26 16:23:51 obz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.51 2005/12/04 23:44:10 allanonjl Exp $ + +*gthumb-2.6.8-r1 (04 Dec 2005) + + 04 Dec 2005; John N. Laliberte <allanonjl@gentoo.org> + +files/gthumb-2.6.8-Makefile.patch, +gthumb-2.6.8-r1.ebuild: + backport patch from cvs to solve parallel build issues, should fix #112129. + general ebuild cleanup. *gthumb-2.6.8 (26 Sep 2005) diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest index 8a4a04cbbce5..b78999b24612 100644 --- a/media-gfx/gthumb/Manifest +++ b/media-gfx/gthumb/Manifest @@ -1,10 +1,13 @@ -MD5 e93340b848737ff027b3c0294fffd44a ChangeLog 6701 +MD5 e8832f4939588dafedc35ad84a6caaf5 gthumb-2.6.8.ebuild 1420 MD5 ecbc2445d140c88c4b9dadf6864234e9 gthumb-2.6.3.ebuild 1238 MD5 1731ed0607bbfef20841efbdce0e9de0 gthumb-2.6.5.ebuild 1421 -MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222 +MD5 b577eb0003263ef659176fc885f3c6bd gthumb-2.6.8-r1.ebuild 1362 MD5 3ba57378f8e6afa48c15e146dac59776 gthumb-2.6.7.ebuild 1425 -MD5 e8832f4939588dafedc35ad84a6caaf5 gthumb-2.6.8.ebuild 1420 +MD5 a2497f69b8dce3e2d3a21d2faa51e7bf ChangeLog 6957 +MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222 +MD5 cd9083444eead56335b292b89897ff68 files/digest-gthumb-2.6.8-r1 66 MD5 c1d4c50442ad19c29af3bb85dd427716 files/digest-gthumb-2.6.3 66 MD5 1724520898546aadcf150ec88c8a2e7a files/digest-gthumb-2.6.5 66 MD5 af2acaad904b53afb8e81cc75c772af0 files/digest-gthumb-2.6.7 66 MD5 cd9083444eead56335b292b89897ff68 files/digest-gthumb-2.6.8 66 +MD5 ee3d9e84ae0099f382f5ebf3e922c5b4 files/gthumb-2.6.8-Makefile.patch 1326 diff --git a/media-gfx/gthumb/files/digest-gthumb-2.6.8-r1 b/media-gfx/gthumb/files/digest-gthumb-2.6.8-r1 new file mode 100644 index 000000000000..012b049935ae --- /dev/null +++ b/media-gfx/gthumb/files/digest-gthumb-2.6.8-r1 @@ -0,0 +1 @@ +MD5 9dcc9600feb5e1cab9d876f1a047a621 gthumb-2.6.8.tar.bz2 2343475 diff --git a/media-gfx/gthumb/files/gthumb-2.6.8-Makefile.patch b/media-gfx/gthumb/files/gthumb-2.6.8-Makefile.patch new file mode 100644 index 000000000000..7ea5a9c96718 --- /dev/null +++ b/media-gfx/gthumb/files/gthumb-2.6.8-Makefile.patch @@ -0,0 +1,27 @@ +=================================================================== +RCS file: /cvs/gnome/gthumb/components/catalog-view/Makefile.am,v +retrieving revision 1.6 +retrieving revision 1.7 +diff -u -r1.6 -r1.7 +--- gthumb-2.6.8/components/catalog-view/Makefile.am 2005/08/07 10:51:41 1.6 ++++ gthumb-2.6.8.new/components/catalog-view/Makefile.am 2005/11/15 09:13:05 1.7 +@@ -47,15 +47,15 @@ + server_DATA = GNOME_GThumb_CatalogView.server + GNOME_GThumb_CatalogView.server.in: GNOME_GThumb_CatalogView.server.in.in Makefile + sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|g" \ +- < $(srcdir)/GNOME_GThumb_CatalogView.server.in.in > temp \ +- && mv temp GNOME_GThumb_CatalogView.server.in ++ < $(srcdir)/GNOME_GThumb_CatalogView.server.in.in > GNOME_GThumb_CatalogView.server.in.temp \ ++ && mv GNOME_GThumb_CatalogView.server.in.temp GNOME_GThumb_CatalogView.server.in + + @INTLTOOL_SERVER_RULE@ + + GNOME_GThumb_CatalogView.xml: GNOME_GThumb_CatalogView.xml.in Makefile + sed -e 's?\@ICONSDIR\@?$(datadir)/gthumb/icons?g' \ +- < $(srcdir)/GNOME_GThumb_CatalogView.xml.in > temp \ +- && mv temp GNOME_GThumb_CatalogView.xml ++ < $(srcdir)/GNOME_GThumb_CatalogView.xml.in > GNOME_GThumb_CatalogView.xml.temp \ ++ && mv GNOME_GThumb_CatalogView.xml.temp GNOME_GThumb_CatalogView.xml + + uidir = $(datadir)/gnome-2.0/ui + ui_DATA = GNOME_GThumb_CatalogView.xml diff --git a/media-gfx/gthumb/gthumb-2.6.8-r1.ebuild b/media-gfx/gthumb/gthumb-2.6.8-r1.ebuild new file mode 100644 index 000000000000..e4f92313c19b --- /dev/null +++ b/media-gfx/gthumb/gthumb-2.6.8-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.6.8-r1.ebuild,v 1.1 2005/12/04 23:44:10 allanonjl Exp $ + +inherit gnome2 eutils autotools + +DESCRIPTION="Image viewer and browser for Gnome" +HOMEPAGE="http://gthumb.sourceforge.net/" +LICENSE="GPL-2" + +IUSE="jpeg tiff png gphoto2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~x86" + +# FIXME : configure switches, no autodetection + +RDEPEND=">=dev-libs/glib-2.4 + >=x11-libs/gtk+-2.4 + >=dev-libs/libxml2-2.4 + >=gnome-base/libgnome-2.6 + >=gnome-base/libgnomeui-2.6 + >=gnome-base/libgnomecanvas-2.6 + >=gnome-base/gnome-vfs-2.6 + >=gnome-base/libglade-2.4 + >=gnome-base/libgnomeprint-2.6 + >=gnome-base/libgnomeprintui-2.6 + >=gnome-base/libbonobo-2.6 + >=gnome-base/libbonoboui-2.6 + >=gnome-base/gconf-2.6 + png? ( media-libs/libpng ) + tiff? ( media-libs/tiff ) + jpeg? ( media-libs/jpeg + >=media-libs/libexif-0.5.12 ) + gphoto2? ( >=media-libs/libgphoto2-2.1.3 )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9.0 + app-text/scrollkeeper + >=dev-util/intltool-0.29" + +DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README" + +USE_DESTDIR="1" + +src_unpack() { + + unpack ${A} + cd ${S} + + # fix for bug #112129, backported from CVS upstream + epatch ${FILESDIR}/gthumb-2.6.8-Makefile.patch + + gnome2_omf_fix doc/*/Makefile.in + + eautoreconf +} |