Version bump, fix for GCC 4.7, remove old versions

Package-Manager: portage-2.2.0_alpha115/cvs/Linux x86_64

6 files changed, 32 insertions, 65 deletions

diff --git a/gnustep-apps/cenon/ChangeLog b/gnustep-apps/cenon/ChangeLog
index 090b4de7bdde..a3a703a1f119 100644
--- a/gnustep-apps/cenon/ChangeLog
+++ b/gnustep-apps/cenon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnustep-apps/cenon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/ChangeLog,v 1.14 2012/06/07 15:56:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/ChangeLog,v 1.15 2012/07/03 18:37:08 voyageur Exp $
+
+*cenon-3.9.6 (03 Jul 2012)
+
+  03 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org> -cenon-3.8.2.ebuild,
+  -cenon-3.9.4.ebuild, +cenon-3.9.6.ebuild, +files/cenon-3.9.6-gcc47.patch,
+  -files/cenon-3.82-install.patch:
+  Version bump, fix for GCC 4.7, remove old versions
 
   07 Jun 2012; Michael Weber <xmw@gentoo.org> cenon-3.9.5.ebuild:
   ppc stable (bug 410601)
diff --git a/gnustep-apps/cenon/Manifest b/gnustep-apps/cenon/Manifest
index 1f7a1153b705..4c4a85147453 100644
--- a/gnustep-apps/cenon/Manifest
+++ b/gnustep-apps/cenon/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX cenon-3.82-install.patch 1048 RMD160 31550dc1ffeb51610666df48fc7748bd5e5919ac SHA1 e172fe91464e831feb019cad1aa12a641cd9671b SHA256 40621c6d0a59990903a3ce3dc985a265b54be2d99a3c70554c1f36e753e7994c
 AUX cenon-3.9.4-install.patch 636 RMD160 aae83bacf868a2d5de41f00a29d945888489301e SHA1 ef3eadecd84ea4d9742973ebc9f1a5cbc252bc30 SHA256 3d0a3bf38b4a16b62230da9a8bdb17bb570a3d4486bb73ff7b1d0a4441c886c3
-DIST Cenon-3.82.tar.bz2 2153537 RMD160 323ee0590ea2046df821c91c5d320fbfd0def874 SHA1 513acf72c9a21bf669f1bd4f532debf25dfef392 SHA256 40ec970655e046bbafed33c57b02dbfe8f3691d83cffc5cd40e8dbe70695a0db
-DIST Cenon-3.9.4.tar.bz2 2001681 RMD160 87006f122625501f34939fba97c0f510d0d89b75 SHA1 0e24d1140b14dc5001c5dbcd3af523d6c915dace SHA256 4bb66273283f6e2aa32f1626448cda428e60514d1d7bf34c7b2d18c07fcf0ef3
+AUX cenon-3.9.6-gcc47.patch 609 RMD160 265d2c80384bd3f2133cd3f19c03b870dbc99a72 SHA1 8af1f4074a49af536a2e83a3dd9ec1989425d894 SHA256 abf6a501f683c42664c9e697780c4c476231d0e040d393c209dcf6f3207079bc
 DIST Cenon-3.9.5.tar.bz2 2003607 RMD160 3ab6af7c49f00bc1fa8f63e5f987aa91b7798c29 SHA1 f3d9251290cc0ffa9e09e884a971f926a0eab9b5 SHA256 523049066f88e9e022127c017633b0431a29b9eda847e875c8c82d1f976f4977
-EBUILD cenon-3.8.2.ebuild 641 RMD160 0b3d24de9207657776c207a84b3078cfcc5b1dd3 SHA1 77e7c1b2358ca273ae29f17d9971a144ca8e6e80 SHA256 c90b0eb05a04622445989821a5a596b6013d9dacc5eb43ad3052cde6237b9e1c
-EBUILD cenon-3.9.4.ebuild 732 RMD160 9ec425b9a8b9a6efa08e90478b46a063b480eb86 SHA1 324904dc0b3110d2ad3ffad12d80a5f75e207fcc SHA256 94920d8ae609c60db60921e9ab65db5c3de65905e180702048c9feae4f15e96c
+DIST Cenon-3.9.6.tar.bz2 2005991 RMD160 9a80e3ed91f861715e486199de6523fe6d0c3a29 SHA1 083f0f15beea03b534b814edc574e149dec3082f SHA256 373e6c3b7e23950aef865cc3719eece97e1bfbfcecae901cac2e5e6e6ff9175d
 EBUILD cenon-3.9.5.ebuild 645 RMD160 a324d99cc161bccf7216b1ce78fcec76d1ae2ebe SHA1 40656e16fdf9e19babbc3f79f3039151c4b96cf7 SHA256 2c03f014b540756d95639938292c675990f805a5aa2dce2845204f52ddb2194e
-MISC ChangeLog 2363 RMD160 1996a6daf388eb0cacfde93482553113369cad8b SHA1 9821cc42d838009c30ad52e816483dcdb00aded2 SHA256 b08fa65734909910fdcd68a837bb87dcb0895b43549af637a7661d358ffee878
+EBUILD cenon-3.9.6.ebuild 692 RMD160 a273f5ec60db6a0e57396aa4b9b138c98e0e60d6 SHA1 c3de96ae2551f4988a60de8d247db4be4ed86366 SHA256 213f4b21daa0b11fa480ebce4a0ad29548997fe982bbe4c2dad796a33d94848f
+MISC ChangeLog 2637 RMD160 55db1910b11225b7447e00dc8fd64cea7eac44e4 SHA1 6e771997a6dea8b4308336696f88ebd963a7288a SHA256 292c975d69197b64bb7cc3cf81ecc81cb79a4ee43f8e40548ea712cac6d9a5ec
 MISC metadata.xml 351 RMD160 52c0e9873160b51ea4a8d37dbec10b4cb19cb33c SHA1 1fe56a0f62c696af01bb278d2373f468ef6c1246 SHA256 f6feea5139f9ddbd39fa1c5c09362472d47967ae034139e0cca20ce2e6fddc2f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/QzwsACgkQknrdDGLu8JBJmQD/YpXzMB8CmWEaADrkzc59Lsva
-9LQ5dCIXa0mQOngckXIA/0noV9ThCN1LSVQdgjKnbPs8RPNNaNQlR+Ebt33OdHes
-=M6nG
+iF4EAREIAAYFAk/zO94ACgkQFYEBGcdFJfJM5AD+Pj/nV+J0BRLJ4vh3BfrY69uu
+t0AU+lb7djT60g8xEFYA/3k+7VTpmcdO2aDrqjwHMB7vIa5UiJWggS8orND+m/TC
+=A4Gh
 -----END PGP SIGNATURE-----
diff --git a/gnustep-apps/cenon/cenon-3.8.2.ebuild b/gnustep-apps/cenon/cenon-3.8.2.ebuild
deleted file mode 100644
index bf4b729d9861..000000000000
--- a/gnustep-apps/cenon/cenon-3.8.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/cenon-3.8.2.ebuild,v 1.1 2011/08/19 12:38:23 voyageur Exp $
-
-inherit gnustep-2
-
-S=${WORKDIR}/${PN/c/C}
-
-DESCRIPTION="Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX"
-HOMEPAGE="http://www.cenon.info/"
-SRC_URI="http://www.vhf-group.com/vhfInterservice/download/source/${PN/c/C}-3.82.tar.bz2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-LICENSE="Cenon"
-
-RDEPEND=">=gnustep-libs/cenonlibrary-3.8.2"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${PN}-3.82"-install.patch
-}
diff --git a/gnustep-apps/cenon/cenon-3.9.4.ebuild b/gnustep-apps/cenon/cenon-3.9.6.ebuild
index 83bae2cd55c1..336058f7346f 100644
--- a/gnustep-apps/cenon/cenon-3.9.4.ebuild
+++ b/gnustep-apps/cenon/cenon-3.9.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/cenon-3.9.4.ebuild,v 1.1 2011/08/19 12:38:23 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/cenon-3.9.6.ebuild,v 1.1 2012/07/03 18:37:08 voyageur Exp $
 
 EAPI=4
 inherit gnustep-2
@@ -15,9 +15,10 @@ SLOT="0"
 LICENSE="Cenon"
 IUSE=""
 
+DEPEND=""
 RDEPEND=">=gnustep-libs/cenonlibrary-3.9.0"
 
 src_prepare() {
-	sed -e "s/App.m/App.m UpdateController.m/" -i GNUmakefile || die "UpdateController sed failed"
-	epatch "${FILESDIR}"/${P}-install.patch
+	epatch "${FILESDIR}"/${PN}-3.9.4-install.patch
+	epatch "${FILESDIR}"/${P}-gcc47.patch
 }
diff --git a/gnustep-apps/cenon/files/cenon-3.82-install.patch b/gnustep-apps/cenon/files/cenon-3.82-install.patch
deleted file mode 100644
index f47513573013..000000000000
--- a/gnustep-apps/cenon/files/cenon-3.82-install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur Cenon.orig/GNUmakefile Cenon/GNUmakefile
---- Cenon.orig/GNUmakefile	2007-05-31 15:53:12.000000000 +0200
-+++ Cenon/GNUmakefile	2007-05-31 15:53:18.000000000 +0200
-@@ -23,7 +23,6 @@
- # eMail: info@vhf.de
- # http://www.vhf.de
- 
--GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
- #GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
- 
- include $(GNUSTEP_MAKEFILES)/common.make
-diff -Naur Cenon.orig/GNUmakefile.postamble Cenon/GNUmakefile.postamble
---- Cenon.orig/GNUmakefile.postamble	2007-05-31 15:53:12.000000000 +0200
-+++ Cenon/GNUmakefile.postamble	2007-05-31 15:54:10.000000000 +0200
-@@ -18,13 +18,7 @@
- # before-install::
- 
- # Things to do after installing
--after-install::
--	# copy library
--	#rm -R $(GNUSTEP_INSTALLATION_DIR)/Library/$(APP_NAME)
--	cp -R Library/$(APP_NAME)/ $(GNUSTEP_INSTALLATION_DIR)/Library/
--	# set permissions (rrr)
--	chmod -R ugo+rX $(GNUSTEP_APPS)/$(APP_NAME).*
--	#chmod -R ugo+rX $(GNUSTEP_INSTALLATION_DIR)/Library/$(APP_NAME)
-+#after-install::
- 
- # Things to do before uninstalling
- # before-uninstall::
diff --git a/gnustep-apps/cenon/files/cenon-3.9.6-gcc47.patch b/gnustep-apps/cenon/files/cenon-3.9.6-gcc47.patch
new file mode 100644
index 000000000000..662a8ea5ca70
--- /dev/null
+++ b/gnustep-apps/cenon/files/cenon-3.9.6-gcc47.patch
@@ -0,0 +1,11 @@
+--- cenon.app-3.93.orig/VHFShared/vhfCompatibility.h
++++ cenon.app-3.93/VHFShared/vhfCompatibility.h
+@@ -44,7 +44,7 @@
+ #if defined( GNUSTEP_BASE_VERSION )
+ 
+ #    define VHFIsDrawingToScreen()	[[NSGraphicsContext currentContext] isDrawingToScreen]
+-#    define VHFSelectorIsEqual(a, b)	sel_eq(a, b)
++#    define VHFSelectorIsEqual(a, b)	sel_isEqual(a, b)
+ #    define VHFAntialiasing()		[[NSGraphicsContext currentContext] shouldAntialias]
+ #    define VHFSetAntialiasing(f)	[[NSGraphicsContext currentContext] setShouldAntialias:f]
+ #    define PSWait()			[[NSGraphicsContext currentContext] flushGraphics]