From 6e0b4d1ef7d5500b2bd623bdd660600a9dc48d71 Mon Sep 17 00:00:00 2001 From: Andrey Grozin Date: Sun, 3 Aug 2014 08:04:02 +0000 Subject: Version bump (Portage version: 2.2.10/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!) --- media-gfx/fotoxx/ChangeLog | 8 ++++- media-gfx/fotoxx/files/fotoxx-14.05.patch | 46 -------------------------- media-gfx/fotoxx/files/fotoxx-14.08.patch | 50 ++++++++++++++++++++++++++++ media-gfx/fotoxx/fotoxx-14.05.ebuild | 55 ------------------------------- media-gfx/fotoxx/fotoxx-14.08.ebuild | 55 +++++++++++++++++++++++++++++++ 5 files changed, 112 insertions(+), 102 deletions(-) delete mode 100644 media-gfx/fotoxx/files/fotoxx-14.05.patch create mode 100644 media-gfx/fotoxx/files/fotoxx-14.08.patch delete mode 100644 media-gfx/fotoxx/fotoxx-14.05.ebuild create mode 100644 media-gfx/fotoxx/fotoxx-14.08.ebuild diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog index d3e728c97352..81c748d92443 100644 --- a/media-gfx/fotoxx/ChangeLog +++ b/media-gfx/fotoxx/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/fotoxx # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.63 2014/06/11 14:48:37 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.64 2014/08/03 08:04:02 grozin Exp $ + +*fotoxx-14.08 (03 Aug 2014) + + 03 Aug 2014; Andrey Grozin -fotoxx-14.05.ebuild, + +fotoxx-14.08.ebuild, -files/fotoxx-14.05.patch, +files/fotoxx-14.08.patch: + Version bump *fotoxx-14.06.1 (11 Jun 2014) diff --git a/media-gfx/fotoxx/files/fotoxx-14.05.patch b/media-gfx/fotoxx/files/fotoxx-14.05.patch deleted file mode 100644 index b202d0e66065..000000000000 --- a/media-gfx/fotoxx/files/fotoxx-14.05.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -r -U1 fotoxx-14.05.orig/Makefile fotoxx-14.05/Makefile ---- fotoxx-14.05.orig/Makefile 2014-05-01 02:17:41.000000000 +0700 -+++ fotoxx-14.05/Makefile 2014-05-05 21:46:49.059555103 +0700 -@@ -5,5 +5,4 @@ - # defaults for parameters that may be pre-defined --CXXFLAGS ?= -O2 -Wall -ggdb -- --LDFLAGS ?= -rdynamic -+CXXFLAGS += -Wall -Wno-deprecated-declarations -+LDFLAGS += -rdynamic - PREFIX ?= /usr -@@ -16,3 +15,3 @@ - LOCALESDIR = $(SHAREDIR)/locales --DOCDIR = $(PREFIX)/share/doc/fotoxx -+DOCDIR = $(PREFIX)/share/doc/$(PF) - MANDIR = $(PREFIX)/share/man/man1 -@@ -20,4 +19,4 @@ - --CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0` --LIBS = `pkg-config --libs gtk+-3.0` -+CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0` -+LIBS = `pkg-config --libs gtk+-3.0` -lpthread - -@@ -79,3 +78,2 @@ - rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz -- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE) - rm -f $(DESTDIR)$(MENUFILE) -@@ -99,6 +97,2 @@ - rm -f fotoxx.1.gz -- # menu (desktop) file -- cp -f desktop $(DESTDIR)$(MENUFILE) -- chmod +x $(DESTDIR)$(MENUFILE) -- xdg-desktop-menu install --novendor $(DESTDIR)$(MENUFILE) - -@@ -109,3 +103,2 @@ - rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz -- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE) - rm -f $(DESTDIR)$(MENUFILE) -diff -r -U1 fotoxx-14.05.orig/zfuncs.cc fotoxx-14.05/zfuncs.cc ---- fotoxx-14.05.orig/zfuncs.cc 2014-05-01 02:17:41.000000000 +0700 -+++ fotoxx-14.05/zfuncs.cc 2014-05-05 21:48:23.160551146 +0700 -@@ -3995,3 +3995,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-14.08.patch b/media-gfx/fotoxx/files/fotoxx-14.08.patch new file mode 100644 index 000000000000..820ef1834ecd --- /dev/null +++ b/media-gfx/fotoxx/files/fotoxx-14.08.patch @@ -0,0 +1,50 @@ +diff -r -U1 fotoxx-14.08.orig/Makefile fotoxx-14.08/Makefile +--- fotoxx-14.08.orig/Makefile 2014-08-01 18:26:48.000000000 +0700 ++++ fotoxx-14.08/Makefile 2014-08-03 16:11:40.201653715 +0700 +@@ -5,5 +5,4 @@ + # defaults for parameters that may be pre-defined +-CXXFLAGS ?= -O2 -Wall -ggdb +- +-LDFLAGS ?= -rdynamic ++CXXFLAGS += -Wall ++LDFLAGS += -rdynamic + PREFIX ?= /usr +@@ -16,3 +15,3 @@ + LOCALESDIR = $(SHAREDIR)/locales +-DOCDIR = $(PREFIX)/share/doc/fotoxx ++DOCDIR = $(PREFIX)/share/doc/$(PF) + MANDIR = $(PREFIX)/share/man/man1 +@@ -21,4 +20,4 @@ + +-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0` +-LIBS = `pkg-config --libs gtk+-3.0` ++CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0` ++LIBS = `pkg-config --libs gtk+-3.0` -lpthread + +@@ -73,3 +72,2 @@ + rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz +- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE) + rm -f $(DESTDIR)$(MENUFILE) +@@ -80,2 +78,3 @@ + mkdir -p $(DESTDIR)$(DOCDIR) ++ mkdir -p $(DESTDIR)$(APPDATADIR) + mkdir -p $(DESTDIR)$(MANDIR) +@@ -94,6 +93,2 @@ + rm -f fotoxx.1.gz +- # menu (desktop) file +- cp -f desktop $(DESTDIR)$(MENUFILE) +- # chmod +x $(DESTDIR)$(MENUFILE) +- xdg-desktop-menu install --novendor $(DESTDIR)$(MENUFILE) + +@@ -104,3 +99,2 @@ + rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz +- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE) + rm -f $(DESTDIR)$(MENUFILE) +diff -r -U1 fotoxx-14.08.orig/zfuncs.cc fotoxx-14.08/zfuncs.cc +--- fotoxx-14.08.orig/zfuncs.cc 2014-08-01 18:26:48.000000000 +0700 ++++ fotoxx-14.08/zfuncs.cc 2014-08-03 16:13:01.706650287 +0700 +@@ -3973,3 +3973,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-14.05.ebuild b/media-gfx/fotoxx/fotoxx-14.05.ebuild deleted file mode 100644 index 572f7a3c0542..000000000000 --- a/media-gfx/fotoxx/fotoxx-14.05.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-14.05.ebuild,v 1.1 2014/05/05 11:17:23 grozin Exp $ - -EAPI=4 - -inherit eutils toolchain-funcs fdo-mime - -DESCRIPTION="Program for improving image files made with a digital camera" -HOMEPAGE="http://www.kornelix.com/fotoxx.html" -SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - x11-libs/gtk+:3 - media-libs/libpng - media-libs/tiff - media-libs/lcms:2" -RDEPEND="${DEPEND} - media-libs/exiftool - media-gfx/ufraw[gtk] - media-gfx/dcraw - x11-misc/xdg-utils" - -src_prepare() { - epatch "${FILESDIR}"/${PF}.patch -} - -src_compile() { - tc-export CXX - emake -} - -src_install() { - # For the Help menu items to work, *.html must be in /usr/share/doc/${PF}, - # and README, changelog, translations, edit-menus, KB-shortcuts must not be compressed - emake DESTDIR="${D}" install - newmenu desktop ${PN}.desktop - rm -f "${D}"/usr/share/doc/${PF}/*.man - docompress -x /usr/share/doc -} - -pkg_postinst() { - fdo-mime_mime_database_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} diff --git a/media-gfx/fotoxx/fotoxx-14.08.ebuild b/media-gfx/fotoxx/fotoxx-14.08.ebuild new file mode 100644 index 000000000000..b1ffd26cf8f8 --- /dev/null +++ b/media-gfx/fotoxx/fotoxx-14.08.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-14.08.ebuild,v 1.1 2014/08/03 08:04:02 grozin Exp $ + +EAPI=4 + +inherit eutils toolchain-funcs fdo-mime + +DESCRIPTION="Program for improving image files made with a digital camera" +HOMEPAGE="http://www.kornelix.com/fotoxx.html" +SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + x11-libs/gtk+:3 + media-libs/libpng + media-libs/tiff + media-libs/lcms:2" +RDEPEND="${DEPEND} + media-libs/exiftool + media-gfx/ufraw[gtk] + media-gfx/dcraw + x11-misc/xdg-utils" + +src_prepare() { + epatch "${FILESDIR}"/${PF}.patch +} + +src_compile() { + tc-export CXX + emake +} + +src_install() { + # For the Help menu items to work, *.html must be in /usr/share/doc/${PF}, + # and README, changelog, translations, edit-menus, KB-shortcuts must not be compressed + emake DESTDIR="${D}" install + newmenu desktop ${PN}.desktop + rm -f "${D}"/usr/share/doc/${PF}/*.man + docompress -x /usr/share/doc +} + +pkg_postinst() { + fdo-mime_mime_database_update + fdo-mime_desktop_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} -- cgit v1.2.3-65-gdbad