Version bump, closing #368379

Package-Manager: portage-2.2.0_alpha38/cvs/Linux i686

8 files changed, 71 insertions, 133 deletions

diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index 120cd49de0c9..d08983179a60 100644
--- a/media-gfx/fotoxx/ChangeLog
+++ b/media-gfx/fotoxx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/fotoxx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.16 2011/04/05 18:54:04 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.17 2011/06/06 20:43:26 grozin Exp $
+
+*fotoxx-11.06 (06 Jun 2011)
+
+  06 Jun 2011; Andrey Grozin <grozin@gentoo.org> -fotoxx-11.02.ebuild,
+  -files/fotoxx-11.02-makefile.patch, -fotoxx-11.03.1.ebuild,
+  -files/fotoxx-11.03.1-makefile.patch, +fotoxx-11.06.ebuild,
+  +files/fotoxx-11.06-docdir.patch, +files/fotoxx-11.06-makefile.patch:
+  Version bump, closing #368379
 
 *fotoxx-11.04 (05 Apr 2011)
 
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index b68dd0d6d2d6..4f1c02a51ce8 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,11 +1,9 @@
-AUX fotoxx-11.02-makefile.patch 1370 RMD160 b12ec9174d7b47432814fd52a72a00b51fc026ac SHA1 ff263d49591fe0d5a980fee99e7f94531c58df47 SHA256 882afb30dcc13478d4c72196a72fd9593021e6563797dc0fde5d18390d5c6411
-AUX fotoxx-11.03.1-makefile.patch 1370 RMD160 b12ec9174d7b47432814fd52a72a00b51fc026ac SHA1 ff263d49591fe0d5a980fee99e7f94531c58df47 SHA256 882afb30dcc13478d4c72196a72fd9593021e6563797dc0fde5d18390d5c6411
 AUX fotoxx-11.04-makefile.patch 1370 RMD160 b12ec9174d7b47432814fd52a72a00b51fc026ac SHA1 ff263d49591fe0d5a980fee99e7f94531c58df47 SHA256 882afb30dcc13478d4c72196a72fd9593021e6563797dc0fde5d18390d5c6411
-DIST fotoxx-11.02.tar.gz 1110805 RMD160 1abb5f30ee72ce7e8747152356d2adac7751cfef SHA1 821e1f26c3bbb14530ea4f937c56ec54fb8b6786 SHA256 9c3404589342a1c1546f8b35f5493a6accdf5687e0c347dca18b91a3a84426c5
-DIST fotoxx-11.03.1.tar.gz 1151923 RMD160 4a5e3dc3214c21efa27d3695577bcb8080362323 SHA1 9b0352aeada5c5193c66bbac808c535845e388ca SHA256 6c97b6a23db5b03ca2d68ca8c72aa50763b1a5ffdd121e0abb61c8a796050865
+AUX fotoxx-11.06-docdir.patch 552 RMD160 d67a99dfb2f66f4e56dd516a965391fc5fba6183 SHA1 0a4d2196de9f2439514d8e98dc9eca1f89df2390 SHA256 d0aa130f9b1cd06e299a73922767cab712d2443c0f1f96b0179abb4e511ae282
+AUX fotoxx-11.06-makefile.patch 1429 RMD160 e983a385b795ab2d17da42a7304478d65d50d0aa SHA1 4fc62b5421e2c6402ebc712aea1feb1eedb6610c SHA256 4491dddfa8ce28be2c3aa0893ea77f154080cdeca0a1e28bc74aa4b3c7777e37
 DIST fotoxx-11.04.tar.gz 1223499 RMD160 c8319af1acf9f474c3faa132a07975d36653659b SHA1 863100e98fce08d3a48ac81c6b945807ac1ab677 SHA256 84b416f0bf8efd07204b8737be76f79f248ab03f1083ac6e7ed80b5213e5b993
-EBUILD fotoxx-11.02.ebuild 1191 RMD160 8b3a64029592f0f083425a3b2ad9efbe0cb70e70 SHA1 a107f1fd38697b3696817eba0ff8746ae71c6089 SHA256 fdaf5c0729a6c7a8980df598309c9e1108769cc82f3925e5afc0712674357f97
-EBUILD fotoxx-11.03.1.ebuild 1193 RMD160 0282b80f31b464d119cd5cca918ba5779cb4438d SHA1 975a8c7105cc8b6456ce3198602b0e48d6e5d21f SHA256 23bc9e079ddf9b6c2ead9524d8bf0714f9351ee33cc89b84aa22b762ad0ef533
+DIST fotoxx-11.06.tar.gz 1354181 RMD160 bc9c00ac814e89eeca84047734aa11c3893a04fe SHA1 49a5a885d1e0e543d7f9a5b7356d990eb892efa9 SHA256 f583febf98c188a064f4f8637f5a5c2ba87000a8674d5efe79db42373c1d6da7
 EBUILD fotoxx-11.04.ebuild 1191 RMD160 ffc51fbf1798f4e1f068896c024a6e15c00634d1 SHA1 7ec57fbb9b3d2bc1688b41a8bb153dbdcdfc7ce5 SHA256 34380e90e2bc14f618d639fc1a65a3acedf9660f46add0257bf69dc24d95d97d
-MISC ChangeLog 3199 RMD160 44cd3959ac4e6dc0ca5c2fda0e20b69fa877d69c SHA1 26501335a5d4c9183afb4abe009eb8052c9c11a7 SHA256 94aceb253bf7f8ea48f47ef806941282e0bcaf36d185230db3e6a095162880ef
+EBUILD fotoxx-11.06.ebuild 1120 RMD160 a9ed60a7ee9e110c0388a19e296c04a0b1bad4ce SHA1 8a60304fdc9f12cc7370dde81c7a965732d42b31 SHA256 52b7880eb7b2e1694248b7f3bdc4d10004fc5fc79ee453ec8b9b0f4720719342
+MISC ChangeLog 3528 RMD160 0fc73672a0364272690415d42facfc713cf89e27 SHA1 24b654edbabfea7d560107ff4e12f16b2a229375 SHA256 4ce1d4c337de04ac583e3745e63bf39de2508ff65e5a0d62b2874b3233c8605b
 MISC metadata.xml 868 RMD160 8264b2cc211f3c453ab9d2e119d18e543133bee9 SHA1 bf7bf564db831fb3e8474e19ddbde50631808167 SHA256 b705d0b873a5a64e431884d3d975e3634a47b3a8c5a6e1d1392d4195a4e1e219
diff --git a/media-gfx/fotoxx/files/fotoxx-11.02-makefile.patch b/media-gfx/fotoxx/files/fotoxx-11.02-makefile.patch
deleted file mode 100644
index 1053d4a3b7b1..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-11.02-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -r -U1 fotoxx-11.02.orig/Makefile fotoxx-11.02/Makefile
---- fotoxx-11.02.orig/Makefile	2011-02-01 16:16:20.000000000 +0600
-+++ fotoxx-11.02/Makefile	2011-02-10 00:09:50.000000000 +0600
-@@ -7,8 +7,8 @@
- # defaults for parameters that may be pre-defined
--CXXFLAGS ?= -O3 -g -Wall
--LDFLAGS ?= -O3 -g -Wall -rdynamic
-+CXXFLAGS += -Wall
-+LDFLAGS += -rdynamic
- PREFIX ?= /usr/local
- 
--CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0`
--LFLAGS = $(LDFLAGS) `pkg-config --libs gtk+-2.0 gthread-2.0`
-+CXXFLAGS += -c `pkg-config --cflags gtk+-2.0`
-+LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
- 
-@@ -16,3 +16,3 @@
- DATADIR = $(PREFIX)/share/$(PROGRAM)
--DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
-+DOCDIR = $(PREFIX)/share/doc/$(PF)
- MANDIR = $(PREFIX)/share/man/man1
-@@ -22,3 +22,3 @@
- $(PROGRAM): $(PROGRAM).o zfuncs.o
--	$(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o
-+	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -ltiff $(LIBS)
- 	@ ./dependencies.sh
-@@ -26,3 +26,3 @@
- $(PROGRAM).o: $(SOURCE)
--	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)   \
-+	$(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \
- 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
-@@ -30,3 +30,3 @@
- zfuncs.o: zfuncs.cc
--	$(CXX) $(CFLAGS) zfuncs.cc	         \
-+	$(CXX) $(CXXFLAGS) zfuncs.cc \
- 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
diff --git a/media-gfx/fotoxx/files/fotoxx-11.03.1-makefile.patch b/media-gfx/fotoxx/files/fotoxx-11.03.1-makefile.patch
deleted file mode 100644
index 1053d4a3b7b1..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-11.03.1-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -r -U1 fotoxx-11.02.orig/Makefile fotoxx-11.02/Makefile
---- fotoxx-11.02.orig/Makefile	2011-02-01 16:16:20.000000000 +0600
-+++ fotoxx-11.02/Makefile	2011-02-10 00:09:50.000000000 +0600
-@@ -7,8 +7,8 @@
- # defaults for parameters that may be pre-defined
--CXXFLAGS ?= -O3 -g -Wall
--LDFLAGS ?= -O3 -g -Wall -rdynamic
-+CXXFLAGS += -Wall
-+LDFLAGS += -rdynamic
- PREFIX ?= /usr/local
- 
--CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0`
--LFLAGS = $(LDFLAGS) `pkg-config --libs gtk+-2.0 gthread-2.0`
-+CXXFLAGS += -c `pkg-config --cflags gtk+-2.0`
-+LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
- 
-@@ -16,3 +16,3 @@
- DATADIR = $(PREFIX)/share/$(PROGRAM)
--DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
-+DOCDIR = $(PREFIX)/share/doc/$(PF)
- MANDIR = $(PREFIX)/share/man/man1
-@@ -22,3 +22,3 @@
- $(PROGRAM): $(PROGRAM).o zfuncs.o
--	$(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o
-+	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -ltiff $(LIBS)
- 	@ ./dependencies.sh
-@@ -26,3 +26,3 @@
- $(PROGRAM).o: $(SOURCE)
--	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)   \
-+	$(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \
- 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
-@@ -30,3 +30,3 @@
- zfuncs.o: zfuncs.cc
--	$(CXX) $(CFLAGS) zfuncs.cc	         \
-+	$(CXX) $(CXXFLAGS) zfuncs.cc \
- 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
diff --git a/media-gfx/fotoxx/files/fotoxx-11.06-docdir.patch b/media-gfx/fotoxx/files/fotoxx-11.06-docdir.patch
new file mode 100644
index 000000000000..4c54ba3169a5
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-11.06-docdir.patch
@@ -0,0 +1,8 @@
+diff -r -U1 fotoxx-11.06.orig/zfuncs.cc fotoxx-11.06/zfuncs.cc
+--- fotoxx-11.06.orig/zfuncs.cc	2011-06-04 20:53:41.000000000 +0700
++++ fotoxx-11.06/zfuncs.cc	2011-06-07 03:25:04.000000000 +0700
+@@ -2999,3 +2999,3 @@
+    strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null);      //  /installoc/share/appname/locales
+-   strncatv(zdocdir,199,work,"/share/doc/",zappname,null);                 //  /installoc/share/doc/appname
++   strncatv(zdocdir,199,work,"/share/doc/",PF,null);                       //  /installoc/share/doc/appname
+    
diff --git a/media-gfx/fotoxx/files/fotoxx-11.06-makefile.patch b/media-gfx/fotoxx/files/fotoxx-11.06-makefile.patch
new file mode 100644
index 000000000000..9a580117bdde
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-11.06-makefile.patch
@@ -0,0 +1,45 @@
+diff -r -U1 fotoxx-11.06.orig/Makefile fotoxx-11.06/Makefile
+--- fotoxx-11.06.orig/Makefile	2011-06-04 20:53:41.000000000 +0700
++++ fotoxx-11.06/Makefile	2011-06-07 03:27:17.000000000 +0700
+@@ -6,5 +6,6 @@
+ # defaults for parameters that may be pre-defined
+-CXXFLAGS ?= -O3 -g -Wall
+-LDFLAGS ?= -O3 -g -Wall -rdynamic
++CXXFLAGS += -Wall -c `pkg-config --cflags gtk+-2.0`
++LDFLAGS += -rdynamic
+ PREFIX ?= /usr
++LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
+ 
+@@ -16,3 +17,3 @@
+ LOCALESDIR = $(SHAREDIR)/locales
+-DOCDIR = $(PREFIX)/share/doc/fotoxx
++DOCDIR = $(PREFIX)/share/doc/$(PF)
+ MANDIR = $(PREFIX)/share/man/man1
+@@ -21,5 +22,2 @@
+ 
+-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0`
+-LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
+-
+ fotoxx: fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o
+@@ -30,15 +28,15 @@
+ fotoxx.o: $(VERSION) fotoxx.h
+-	$(CXX) $(CFLAGS) -o fotoxx.o $(VERSION)
++	$(CXX) $(CXXFLAGS) -o fotoxx.o $(VERSION)
+ 
+ fotoxx_area.o: fotoxx_area.cc fotoxx.h
+-	$(CXX) $(CFLAGS) fotoxx_area.cc
++	$(CXX) $(CXXFLAGS) fotoxx_area.cc
+ 
+ fotoxx_info.o: fotoxx_info.cc fotoxx.h
+-	$(CXX) $(CFLAGS) fotoxx_info.cc
++	$(CXX) $(CXXFLAGS) fotoxx_info.cc
+ 
+ fotoxx_edit.o: fotoxx_edit.cc fotoxx.h
+-	$(CXX) $(CFLAGS) fotoxx_edit.cc
++	$(CXX) $(CXXFLAGS) fotoxx_edit.cc
+ 
+ zfuncs.o: zfuncs.cc
+-	$(CXX) $(CFLAGS) zfuncs.cc
++	$(CXX) $(CXXFLAGS) -DPF=\"$(PF)\" zfuncs.cc
+ 
+Только в fotoxx-11.06: Makefile~
diff --git a/media-gfx/fotoxx/fotoxx-11.03.1.ebuild b/media-gfx/fotoxx/fotoxx-11.03.1.ebuild
deleted file mode 100644
index c8471bde0ad1..000000000000
--- a/media-gfx/fotoxx/fotoxx-11.03.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-11.03.1.ebuild,v 1.1 2011/03/16 10:01:52 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+:2
-	media-libs/tiff"
-RDEPEND="${DEPEND}
-	media-libs/exiftool
-	media-gfx/ufraw
-	x11-misc/xdg-utils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PF}-makefile.patch
-}
-
-src_compile() {
-	tc-export CXX
-	emake PREFIX=/usr || die
-}
-
-src_install() {
-	pushd doc > /dev/null
-	mv ${PN}.man ${PN}.1
-	doman ${PN}.1
-	rm COPYING ${PN}.1
-	bzip2 -9 userguide-changes
-	popd > /dev/null
-	# 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}" PREFIX=/usr install || die
-	make_desktop_entry ${PN} "Fotoxx" /usr/share/${PN}/icons/${PN}.png \
-		"Application;Graphics;2DGraphics"
-}
diff --git a/media-gfx/fotoxx/fotoxx-11.02.ebuild b/media-gfx/fotoxx/fotoxx-11.06.ebuild
index 79902efb3a61..7e0b7dcc8dec 100644
--- a/media-gfx/fotoxx/fotoxx-11.02.ebuild
+++ b/media-gfx/fotoxx/fotoxx-11.06.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-11.02.ebuild,v 1.1 2011/02/09 18:16:41 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-11.06.ebuild,v 1.1 2011/06/06 20:43:26 grozin Exp $
 EAPI=3
 inherit eutils toolchain-funcs
 
@@ -22,23 +22,18 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PF}-makefile.patch
+	epatch "${FILESDIR}"/${PF}-docdir.patch
 }
 
 src_compile() {
 	tc-export CXX
-	emake PREFIX=/usr || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	pushd doc > /dev/null
-	mv ${PN}.man ${PN}.1
-	doman ${PN}.1
-	rm COPYING ${PN}.1
-	bzip2 -9 userguide-changes
-	popd > /dev/null
 	# 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}" PREFIX=/usr install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 	make_desktop_entry ${PN} "Fotoxx" /usr/share/${PN}/icons/${PN}.png \
 		"Application;Graphics;2DGraphics"
 }