summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2012-11-28 10:27:48 +0000
committerAndrey Grozin <grozin@gentoo.org>2012-11-28 10:27:48 +0000
commit5eecd085fcd4da6f7c5cb20e0c769731070d7684 (patch)
treea52a6f3d007414c11c50c35526b6f702f5d43388 /media-gfx/fotoxx
parentUse virtual/udev instead of sys-fs/udev wrt #444398 (diff)
downloadgentoo-2-5eecd085fcd4da6f7c5cb20e0c769731070d7684.tar.gz
gentoo-2-5eecd085fcd4da6f7c5cb20e0c769731070d7684.tar.bz2
gentoo-2-5eecd085fcd4da6f7c5cb20e0c769731070d7684.zip
Add missing dependency (#444682), removing old versions
(Portage version: 2.2.0_alpha142/cvs/Linux i686, unsigned Manifest commit)
Diffstat (limited to 'media-gfx/fotoxx')
-rw-r--r--media-gfx/fotoxx/ChangeLog7
-rw-r--r--media-gfx/fotoxx/files/fotoxx-12.05.patch34
-rw-r--r--media-gfx/fotoxx/files/fotoxx-12.10.patch34
-rw-r--r--media-gfx/fotoxx/fotoxx-12.05.ebuild38
-rw-r--r--media-gfx/fotoxx/fotoxx-12.10.ebuild39
-rw-r--r--media-gfx/fotoxx/fotoxx-12.11.ebuild23
6 files changed, 24 insertions, 151 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index b1991c1598b2..0ce8a08b5000 100644
--- a/media-gfx/fotoxx/ChangeLog
+++ b/media-gfx/fotoxx/ChangeLog
@@ -1,6 +1,11 @@
# 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.41 2012/11/20 19:53:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.42 2012/11/28 10:27:48 grozin Exp $
+
+ 28 Nov 2012; Andrey Grozin <grozin@gentoo.org> -fotoxx-12.05.ebuild,
+ -files/fotoxx-12.05.patch, -fotoxx-12.10.ebuild, -files/fotoxx-12.10.patch,
+ fotoxx-12.11.ebuild:
+ Add missing dependency (#444682), removing old versions
20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> fotoxx-12.11.ebuild:
Stable for x86, wrt bug #441352
diff --git a/media-gfx/fotoxx/files/fotoxx-12.05.patch b/media-gfx/fotoxx/files/fotoxx-12.05.patch
deleted file mode 100644
index d1ce6b3261fd..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-12.05.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.10.patch b/media-gfx/fotoxx/files/fotoxx-12.10.patch
deleted file mode 100644
index d1ce6b3261fd..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-12.10.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/fotoxx-12.05.ebuild b/media-gfx/fotoxx/fotoxx-12.05.ebuild
deleted file mode 100644
index 988600012aba..000000000000
--- a/media-gfx/fotoxx/fotoxx-12.05.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.05.ebuild,v 1.3 2012/06/08 11:48:27 phajdan.jr 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.10.ebuild b/media-gfx/fotoxx/fotoxx-12.10.ebuild
deleted file mode 100644
index 86120467b0d5..000000000000
--- a/media-gfx/fotoxx/fotoxx-12.10.ebuild
+++ /dev/null
@@ -1,39 +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.10.ebuild,v 1.2 2012/11/15 15:07:36 grozin Exp $
-EAPI=4
-inherit eutils toolchain-funcs
-
-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"
-RDEPEND="${DEPEND}
- media-libs/exiftool
- media-gfx/ufraw[gtk]
- 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, CHANGES, TRANSLATIONS must not be compressed
- emake DESTDIR="${D}" install
- make_desktop_entry ${PN} "Fotoxx" /usr/share/${PN}/icons/${PN}.png \
- "Graphics;2DGraphics"
-}
diff --git a/media-gfx/fotoxx/fotoxx-12.11.ebuild b/media-gfx/fotoxx/fotoxx-12.11.ebuild
index 6dc560b58359..5947f5942f59 100644
--- a/media-gfx/fotoxx/fotoxx-12.11.ebuild
+++ b/media-gfx/fotoxx/fotoxx-12.11.ebuild
@@ -1,8 +1,8 @@
# 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.11.ebuild,v 1.4 2012/11/20 19:53:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-12.11.ebuild,v 1.5 2012/11/28 10:27:48 grozin Exp $
EAPI=4
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs fdo-mime
DESCRIPTION="Program for improving image files made with a digital camera."
HOMEPAGE="http://www.kornelix.com/fotoxx.html"
@@ -19,6 +19,7 @@ DEPEND="x11-libs/gtk+:3
RDEPEND="${DEPEND}
media-libs/exiftool
media-gfx/ufraw[gtk]
+ media-gfx/dcraw
x11-misc/xdg-utils"
src_prepare() {
@@ -32,8 +33,20 @@ src_compile() {
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
+ # and README, changelog, translations, edit-menus, KB-shortcuts must not be compressed
emake DESTDIR="${D}" install
- make_desktop_entry ${PN} "Fotoxx" /usr/share/${PN}/icons/${PN}.png \
- "Graphics;2DGraphics"
+ insinto /usr/share/applications
+ newins 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
}