From: Andrey Grozin Date: Thu, 4 Aug 2011 08:11:43 +0000 (+0000) Subject: Version bump, bug #358689 should be fixed X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4a1d278de807b3b71865c9a077b62a95e6f25222;p=gentoo.git Version bump, bug #358689 should be fixed Package-Manager: portage-2.2.0_alpha49/cvs/Linux i686 --- diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog index 4d6773164ab3..0633511489d2 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.18 2011/07/14 15:41:02 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.19 2011/08/04 08:11:43 grozin Exp $ + +*fotoxx-11.08.1 (04 Aug 2011) + + 04 Aug 2011; Andrey Grozin -fotoxx-11.06.ebuild, + -files/fotoxx-11.06-docdir.patch, -files/fotoxx-11.06-makefile.patch, + +fotoxx-11.08.1.ebuild, +files/fotoxx-11.08.1-docdir.patch, + +files/fotoxx-11.08.1-makefile.patch: + Version bump, bug #358689 should be fixed *fotoxx-11.07 (14 Jul 2011) diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest index 06e5ceff544a..35539f517a76 100644 --- a/media-gfx/fotoxx/Manifest +++ b/media-gfx/fotoxx/Manifest @@ -1,10 +1,10 @@ -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 AUX fotoxx-11.07-docdir.patch 552 RMD160 d67a99dfb2f66f4e56dd516a965391fc5fba6183 SHA1 0a4d2196de9f2439514d8e98dc9eca1f89df2390 SHA256 d0aa130f9b1cd06e299a73922767cab712d2443c0f1f96b0179abb4e511ae282 AUX fotoxx-11.07-makefile.patch 649 RMD160 0b801aec319849ad1ed965d0af89a34254531f61 SHA1 7b1627bfbe0047a096f0a38d6b1ee79bae6d7e90 SHA256 8ec14e7ee878721907ee41dd39a215d49f29aa1e3c892a5921cb61f4f58ec128 -DIST fotoxx-11.06.tar.gz 1354181 RMD160 bc9c00ac814e89eeca84047734aa11c3893a04fe SHA1 49a5a885d1e0e543d7f9a5b7356d990eb892efa9 SHA256 f583febf98c188a064f4f8637f5a5c2ba87000a8674d5efe79db42373c1d6da7 +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 DIST fotoxx-11.07.tar.gz 1404130 RMD160 a8b6aa6cfb6310695621bcb07932f22a4f2ea3ab SHA1 011aeb57df73ba6689160379bf90f0b46991df65 SHA256 3c014a32049241ab39f13ea7d2bd3f8b2969ccfd2cf2c2b9858c475b8bb99c68 -EBUILD fotoxx-11.06.ebuild 1120 RMD160 a9ed60a7ee9e110c0388a19e296c04a0b1bad4ce SHA1 8a60304fdc9f12cc7370dde81c7a965732d42b31 SHA256 52b7880eb7b2e1694248b7f3bdc4d10004fc5fc79ee453ec8b9b0f4720719342 +DIST fotoxx-11.08.1.tar.gz 1477220 RMD160 640ea896325383b495702577c274dfbd75e4dc5f SHA1 cad763c6e6b295166ad8c54c0f74ea0ad47e2254 SHA256 5d161f5311b7dadfb32c03bff6b97cafab1019ac462ea6bb8031c2ea1d341f70 EBUILD fotoxx-11.07.ebuild 1120 RMD160 8df96743edddb8615cf309ab01a426b276ac1b2f SHA1 7e348377a4c9b3459e2cffd390563bb57a793c39 SHA256 b008983291a18c824fa886071179e944e9182e8ff6b6db031dfcf83e44ef91b8 -MISC ChangeLog 3776 RMD160 3a36f2d44220bc2e1b104df8c077c4b685169a9f SHA1 c51fd6c4668e98703ece5995e45d2ea79844864e SHA256 58128ef4467b61af4537d7033de34c414ad085ae70ab2d98a6ecef61e78b1a0b +EBUILD fotoxx-11.08.1.ebuild 1122 RMD160 1fc36d559b99a8703eb22a188a7c460a9e8b537e SHA1 6469cf05e252ccd4ab7702a3ae9cb6d09a8541e4 SHA256 fdbceece03293093f13846555c06033d0d127a13dc0895826b1fb0bd4a79e07e +MISC ChangeLog 4097 RMD160 57f5f46fc0e258b12fd980195ea9e61e54542291 SHA1 7cfd91e853eb6fed634082551689906272ab5af1 SHA256 a545174f3a8bac48b2357c75bc3161d42b1bd2fe64087a643c329f16cd08d736 MISC metadata.xml 868 RMD160 8264b2cc211f3c453ab9d2e119d18e543133bee9 SHA1 bf7bf564db831fb3e8474e19ddbde50631808167 SHA256 b705d0b873a5a64e431884d3d975e3634a47b3a8c5a6e1d1392d4195a4e1e219 diff --git a/media-gfx/fotoxx/files/fotoxx-11.06-makefile.patch b/media-gfx/fotoxx/files/fotoxx-11.06-makefile.patch deleted file mode 100644 index 9a580117bdde..000000000000 --- a/media-gfx/fotoxx/files/fotoxx-11.06-makefile.patch +++ /dev/null @@ -1,45 +0,0 @@ -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/files/fotoxx-11.06-docdir.patch b/media-gfx/fotoxx/files/fotoxx-11.08.1-docdir.patch similarity index 100% rename from media-gfx/fotoxx/files/fotoxx-11.06-docdir.patch rename to media-gfx/fotoxx/files/fotoxx-11.08.1-docdir.patch diff --git a/media-gfx/fotoxx/files/fotoxx-11.08.1-makefile.patch b/media-gfx/fotoxx/files/fotoxx-11.08.1-makefile.patch new file mode 100644 index 000000000000..7d0715062500 --- /dev/null +++ b/media-gfx/fotoxx/files/fotoxx-11.08.1-makefile.patch @@ -0,0 +1,20 @@ +diff -r -U1 fotoxx-11.08.1.orig/Makefile fotoxx-11.08.1/Makefile +--- fotoxx-11.08.1.orig/Makefile 2011-08-03 16:11:43.000000000 +0700 ++++ fotoxx-11.08.1/Makefile 2011-08-04 14:59:24.000000000 +0700 +@@ -5,4 +5,4 @@ + # defaults for parameters that may be pre-defined +-CXXFLAGS ?= -O3 -g -Wall +-LDFLAGS ?= -O3 -g -Wall -rdynamic ++CXXFLAGS += -Wall ++LDFLAGS += -rdynamic + PREFIX ?= /usr +@@ -15,3 +15,3 @@ + LOCALESDIR = $(SHAREDIR)/locales +-DOCDIR = $(PREFIX)/share/doc/fotoxx ++DOCDIR = $(PREFIX)/share/doc/$(PF) + MANDIR = $(PREFIX)/share/man/man1 +@@ -20,3 +20,3 @@ + +-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0` ++CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-2.0` + LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` diff --git a/media-gfx/fotoxx/fotoxx-11.06.ebuild b/media-gfx/fotoxx/fotoxx-11.08.1.ebuild similarity index 89% rename from media-gfx/fotoxx/fotoxx-11.06.ebuild rename to media-gfx/fotoxx/fotoxx-11.08.1.ebuild index 7e0b7dcc8dec..ca56a01f13e3 100644 --- a/media-gfx/fotoxx/fotoxx-11.06.ebuild +++ b/media-gfx/fotoxx/fotoxx-11.08.1.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.06.ebuild,v 1.1 2011/06/06 20:43:26 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-11.08.1.ebuild,v 1.1 2011/08/04 08:11:43 grozin Exp $ EAPI=3 inherit eutils toolchain-funcs