From b84f570e7c94e5a7f1ac710782c29477b3b99ab5 Mon Sep 17 00:00:00 2001 From: Andrey Grozin Date: Wed, 25 Apr 2012 19:58:18 +0000 Subject: Version bump Package-Manager: portage-2.2.0_alpha101/cvs/Linux i686 --- media-gfx/fotoxx/ChangeLog | 8 ++++++- media-gfx/fotoxx/Manifest | 8 +++---- media-gfx/fotoxx/files/fotoxx-12.03.patch | 34 --------------------------- media-gfx/fotoxx/files/fotoxx-12.05.patch | 34 +++++++++++++++++++++++++++ media-gfx/fotoxx/fotoxx-12.03.ebuild | 38 ------------------------------- media-gfx/fotoxx/fotoxx-12.05.ebuild | 38 +++++++++++++++++++++++++++++++ 6 files changed, 83 insertions(+), 77 deletions(-) delete mode 100644 media-gfx/fotoxx/files/fotoxx-12.03.patch create mode 100644 media-gfx/fotoxx/files/fotoxx-12.05.patch delete mode 100644 media-gfx/fotoxx/fotoxx-12.03.ebuild create mode 100644 media-gfx/fotoxx/fotoxx-12.05.ebuild (limited to 'media-gfx/fotoxx') diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog index f77cb6733540..9fb137881d3f 100644 --- a/media-gfx/fotoxx/ChangeLog +++ b/media-gfx/fotoxx/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/fotoxx # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.30 2012/04/02 09:16:01 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.31 2012/04/25 19:58:18 grozin Exp $ + +*fotoxx-12.05 (25 Apr 2012) + + 25 Apr 2012; Andrey Grozin -fotoxx-12.03.ebuild, + -files/fotoxx-12.03.patch, +fotoxx-12.05.ebuild, +files/fotoxx-12.05.patch: + Version bump *fotoxx-12.04 (02 Apr 2012) diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest index 2562a9ae6428..27d10304089a 100644 --- a/media-gfx/fotoxx/Manifest +++ b/media-gfx/fotoxx/Manifest @@ -1,12 +1,12 @@ AUX fotoxx-11.08.1-docdir.patch 552 RMD160 d67a99dfb2f66f4e56dd516a965391fc5fba6183 SHA1 0a4d2196de9f2439514d8e98dc9eca1f89df2390 SHA256 d0aa130f9b1cd06e299a73922767cab712d2443c0f1f96b0179abb4e511ae282 AUX fotoxx-11.08.1-makefile.patch 739 RMD160 8786c71dc6f4748ec26c55c7948cbd88a9103633 SHA1 c323f7b4fcad8dd3427189a68b32d6b58db97a9b SHA256 e76d6764113be7c51df2ceb61cba82fe4d95cc43a78c5ccdef5313f5a620162f -AUX fotoxx-12.03.patch 1469 RMD160 3aa49dddb2312981405e256483821e6576456923 SHA1 8b061d113188dc4c5d2e1a233fe7fe437f5e2e0f SHA256 1d0fdaf510f548ea4c65597271aa6b4cd30c264de1c706d72aeb4df4b221e2b7 AUX fotoxx-12.04.patch 1469 RMD160 3aa49dddb2312981405e256483821e6576456923 SHA1 8b061d113188dc4c5d2e1a233fe7fe437f5e2e0f SHA256 1d0fdaf510f548ea4c65597271aa6b4cd30c264de1c706d72aeb4df4b221e2b7 +AUX fotoxx-12.05.patch 1469 RMD160 3aa49dddb2312981405e256483821e6576456923 SHA1 8b061d113188dc4c5d2e1a233fe7fe437f5e2e0f SHA256 1d0fdaf510f548ea4c65597271aa6b4cd30c264de1c706d72aeb4df4b221e2b7 DIST fotoxx-11.08.1.tar.gz 1477220 RMD160 640ea896325383b495702577c274dfbd75e4dc5f SHA1 cad763c6e6b295166ad8c54c0f74ea0ad47e2254 SHA256 5d161f5311b7dadfb32c03bff6b97cafab1019ac462ea6bb8031c2ea1d341f70 -DIST fotoxx-12.03.tar.gz 1713624 RMD160 0323beead89795cd3a8b06e4a8a7b5ff548b30fd SHA1 494e1e946dae47d2245ad366c7e2da0f92ac9f43 SHA256 e6f5ee627bb8d718864295ea7ce3f50bbdc6ad555eb6fba04743c98282503a44 DIST fotoxx-12.04.tar.gz 1694180 RMD160 88bd3f36caf46c574b9ef0c72813517189a319c2 SHA1 3dfb17b1b63c04807613b26effacd0e86a7d9d87 SHA256 a80c83e347a2e38cc8ff0d39137846c5a729a4a551f1b272ee30a280d41169f3 +DIST fotoxx-12.05.tar.gz 1732834 RMD160 c6d8e1b205dbf7fd372fa50df6d55c1277258e96 SHA1 ea06867945aa22b3315326469d418959096460a6 SHA256 e6c3f8df138e5dc46373caa61d8efb04b5af17594b2db3d0f2344655694ef776 EBUILD fotoxx-11.08.1.ebuild 1120 RMD160 f0b556812abcf1dfef6cfddd3423e6ca1e4bd0ce SHA1 5b8942c4487ef4780b51a0461ee4ecfe40c1fd2e SHA256 e0e29e109ef7c7f99f7396ed93501b1baab6cd44e0c6b9a52e4b20123f305189 -EBUILD fotoxx-12.03.ebuild 1070 RMD160 672e122a134286f37b0f0ad77637c5f32f281db9 SHA1 ab9e6fef2dd522c5a602448cf84a059fcafd53fc SHA256 69ec35faf36ca1762808c39e897fe0f652909b0103879480f218c7713d43788b EBUILD fotoxx-12.04.ebuild 1070 RMD160 18b71f826761226b3b23b5d703cf149f731d1ee8 SHA1 32f9422f69e3152deb1d4a69998566eb311e8ca5 SHA256 10259d01e143ebffc9a6762ce18690881b26806cb4428c422d38e5a0342e8bc2 -MISC ChangeLog 6183 RMD160 022bae504eb4b08e6f22ae965a9a6729a3ecfb95 SHA1 af0e6876409b5f577d5aa4533091bf8ae735c399 SHA256 dd8b00b311aabf282948da43a870cdf7ccc84218002707e0d4f5e114e5681d3c +EBUILD fotoxx-12.05.ebuild 1070 RMD160 0aaa1e7e70d6f7086e981ba3ce1d9be4692e2c3e SHA1 773d115fed973978d57b9c33381104a21fbab50b SHA256 640c15ff2bb11c11c724b34016f43ec6b57db0c04ade9c2c097ef2cb700ad180 +MISC ChangeLog 6377 RMD160 f9f25db088829a8159bc7f145fda501638b16429 SHA1 8c6c45af88100c9b109b8db367abf9b5d51f1376 SHA256 1aeb1e38976f1e9c008d9137fddd102e22502f84111a07ea7d1cf5712a97dbff MISC metadata.xml 846 RMD160 38cd87d0455a77e2d4f4c8d3a3f0ef918ddf97ca SHA1 784b23036f4b98e161f2a499a04da565d24c5d6f SHA256 ff01900af25b8eff99bd0e031c99608cd77d762a293a0432fd2161ad30aee020 diff --git a/media-gfx/fotoxx/files/fotoxx-12.03.patch b/media-gfx/fotoxx/files/fotoxx-12.03.patch deleted file mode 100644 index d1ce6b3261fd..000000000000 --- a/media-gfx/fotoxx/files/fotoxx-12.03.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -r -U1 fotoxx-12.03.orig/Makefile fotoxx-12.03/Makefile ---- fotoxx-12.03.orig/Makefile 2012-03-01 01:57:48.000000000 +0700 -+++ fotoxx-12.03/Makefile 2012-03-03 03:56:44.000000000 +0700 -@@ -5,4 +5,4 @@ - # defaults for parameters that may be pre-defined --CXXFLAGS ?= -O3 -g -Wall -Wno-deprecated-declarations --LDFLAGS ?= -O3 -g -Wall -rdynamic -+CXXFLAGS += -Wall -Wno-deprecated-declarations -+LDFLAGS += -rdynamic - PREFIX ?= /usr -@@ -14,3 +14,3 @@ - LOCALESDIR = $(SHAREDIR)/locales --DOCDIR = $(PREFIX)/share/doc/fotoxx -+DOCDIR = $(PREFIX)/share/doc/$(PF) - MANDIR = $(PREFIX)/share/man/man1 -@@ -18,3 +18,3 @@ - --CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0` -+CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0` - LIBS = `pkg-config --libs gtk+-3.0` -@@ -77,5 +77,2 @@ - rm -f fotoxx.1.gz -- # menu (desktop) file -- cp -f desktop $(DESTDIR)$(MENUFILE) -- xdg-desktop-menu install $(DESTDIR)$(MENUFILE) - -diff -r -U1 fotoxx-12.03.orig/zfuncs.cc fotoxx-12.03/zfuncs.cc ---- fotoxx-12.03.orig/zfuncs.cc 2012-03-01 01:57:48.000000000 +0700 -+++ fotoxx-12.03/zfuncs.cc 2012-03-03 03:58:13.000000000 +0700 -@@ -3194,3 +3194,3 @@ - strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /prefix/share/appname/locales -- strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /prefix/share/doc/appname -+ strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /prefix/share/doc/${PF} - diff --git a/media-gfx/fotoxx/files/fotoxx-12.05.patch b/media-gfx/fotoxx/files/fotoxx-12.05.patch new file mode 100644 index 000000000000..d1ce6b3261fd --- /dev/null +++ b/media-gfx/fotoxx/files/fotoxx-12.05.patch @@ -0,0 +1,34 @@ +diff -r -U1 fotoxx-12.03.orig/Makefile fotoxx-12.03/Makefile +--- fotoxx-12.03.orig/Makefile 2012-03-01 01:57:48.000000000 +0700 ++++ fotoxx-12.03/Makefile 2012-03-03 03:56:44.000000000 +0700 +@@ -5,4 +5,4 @@ + # defaults for parameters that may be pre-defined +-CXXFLAGS ?= -O3 -g -Wall -Wno-deprecated-declarations +-LDFLAGS ?= -O3 -g -Wall -rdynamic ++CXXFLAGS += -Wall -Wno-deprecated-declarations ++LDFLAGS += -rdynamic + PREFIX ?= /usr +@@ -14,3 +14,3 @@ + LOCALESDIR = $(SHAREDIR)/locales +-DOCDIR = $(PREFIX)/share/doc/fotoxx ++DOCDIR = $(PREFIX)/share/doc/$(PF) + MANDIR = $(PREFIX)/share/man/man1 +@@ -18,3 +18,3 @@ + +-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0` ++CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0` + LIBS = `pkg-config --libs gtk+-3.0` +@@ -77,5 +77,2 @@ + rm -f fotoxx.1.gz +- # menu (desktop) file +- cp -f desktop $(DESTDIR)$(MENUFILE) +- xdg-desktop-menu install $(DESTDIR)$(MENUFILE) + +diff -r -U1 fotoxx-12.03.orig/zfuncs.cc fotoxx-12.03/zfuncs.cc +--- fotoxx-12.03.orig/zfuncs.cc 2012-03-01 01:57:48.000000000 +0700 ++++ fotoxx-12.03/zfuncs.cc 2012-03-03 03:58:13.000000000 +0700 +@@ -3194,3 +3194,3 @@ + strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /prefix/share/appname/locales +- strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /prefix/share/doc/appname ++ strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /prefix/share/doc/${PF} + diff --git a/media-gfx/fotoxx/fotoxx-12.03.ebuild b/media-gfx/fotoxx/fotoxx-12.03.ebuild deleted file mode 100644 index 7743ca5bd8f4..000000000000 --- a/media-gfx/fotoxx/fotoxx-12.03.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-12.03.ebuild,v 1.1 2012/03/02 21:26:14 grozin Exp $ -EAPI=3 -inherit eutils toolchain-funcs - -DESCRIPTION="Program for improving image files made with a digital camera." -HOMEPAGE="http://kornelix.squarespace.com/fotoxx" -SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="x11-libs/gtk+:3 - media-libs/tiff" -RDEPEND="${DEPEND} - media-libs/exiftool - media-gfx/ufraw - x11-misc/xdg-utils" - -src_prepare() { - epatch "${FILESDIR}"/${PF}.patch -} - -src_compile() { - tc-export CXX - emake || die "emake failed" -} - -src_install() { - # For the Help menu items to work, *.html must be in /usr/share/doc/${PF}, - # and README, CHANGES, TRANSLATIONS must not be compressed - emake DESTDIR="${D}" install || die "emake install failed" - make_desktop_entry ${PN} "Fotoxx" /usr/share/${PN}/icons/${PN}.png \ - "Application;Graphics;2DGraphics" -} diff --git a/media-gfx/fotoxx/fotoxx-12.05.ebuild b/media-gfx/fotoxx/fotoxx-12.05.ebuild new file mode 100644 index 000000000000..1a03bb8b7e79 --- /dev/null +++ b/media-gfx/fotoxx/fotoxx-12.05.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-12.05.ebuild,v 1.1 2012/04/25 19:58:18 grozin Exp $ +EAPI=3 +inherit eutils toolchain-funcs + +DESCRIPTION="Program for improving image files made with a digital camera." +HOMEPAGE="http://kornelix.squarespace.com/fotoxx" +SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="x11-libs/gtk+:3 + media-libs/tiff" +RDEPEND="${DEPEND} + media-libs/exiftool + media-gfx/ufraw + x11-misc/xdg-utils" + +src_prepare() { + epatch "${FILESDIR}"/${PF}.patch +} + +src_compile() { + tc-export CXX + emake || die "emake failed" +} + +src_install() { + # For the Help menu items to work, *.html must be in /usr/share/doc/${PF}, + # and README, CHANGES, TRANSLATIONS must not be compressed + emake DESTDIR="${D}" install || die "emake install failed" + make_desktop_entry ${PN} "Fotoxx" /usr/share/${PN}/icons/${PN}.png \ + "Application;Graphics;2DGraphics" +} -- cgit v1.2.3-65-gdbad