Version bump, fix for GCC 4.7, remove old versions

(Portage version: 2.2.0_alpha115/cvs/Linux x86_64)

5 files changed, 24 insertions, 55 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/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]