Version bump, move stable to new versioning

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64, RepoMan options: --force)

6 files changed, 21 insertions, 51 deletions

diff --git a/gnustep-apps/cenon/ChangeLog b/gnustep-apps/cenon/ChangeLog
index 8349d3690a61..f4068642cdb3 100644
--- a/gnustep-apps/cenon/ChangeLog
+++ b/gnustep-apps/cenon/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnustep-apps/cenon
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/ChangeLog,v 1.9 2010/09/01 12:01:50 voyageur Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/ChangeLog,v 1.10 2011/08/19 12:38:23 voyageur Exp $
+
+*cenon-3.9.4 (19 Aug 2011)
+*cenon-3.8.2 (19 Aug 2011)
+
+  19 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org> +cenon-3.8.2.ebuild,
+  +cenon-3.9.4.ebuild, +files/cenon-3.9.4-install.patch, -cenon-3.82.ebuild,
+  -cenon-3.90.ebuild, -files/cenon-3.90-install.patch, -cenon-3.91.ebuild,
+  -files/cenon-3.91-install.patch:
+  Version bump, move stable to new versioning
 
 *cenon-3.91 (01 Sep 2010)
 
diff --git a/gnustep-apps/cenon/cenon-3.82.ebuild b/gnustep-apps/cenon/cenon-3.8.2.ebuild
index 9a7e4ab1f061..bf4b729d9861 100644
--- a/gnustep-apps/cenon/cenon-3.82.ebuild
+++ b/gnustep-apps/cenon/cenon-3.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.82.ebuild,v 1.4 2008/03/08 13:24:41 coldwind Exp $
+# $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
 
@@ -8,14 +8,14 @@ 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/${P/c/C}.tar.bz2"
+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.82"
+RDEPEND=">=gnustep-libs/cenonlibrary-3.8.2"
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}/${P}"-install.patch
+	epatch "${FILESDIR}/${PN}-3.82"-install.patch
 }
diff --git a/gnustep-apps/cenon/cenon-3.90.ebuild b/gnustep-apps/cenon/cenon-3.9.4.ebuild
index 5e0b6551c8f1..83bae2cd55c1 100644
--- a/gnustep-apps/cenon/cenon-3.90.ebuild
+++ b/gnustep-apps/cenon/cenon-3.9.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.90.ebuild,v 1.1 2009/09/21 14:45:00 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/cenon-3.9.4.ebuild,v 1.1 2011/08/19 12:38:23 voyageur Exp $
 
-EAPI=2
+EAPI=4
 inherit gnustep-2
 
 S=${WORKDIR}/${PN/c/C}
@@ -15,8 +15,9 @@ SLOT="0"
 LICENSE="Cenon"
 IUSE=""
 
-RDEPEND=">=gnustep-libs/cenonlibrary-3.82"
+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
 }
diff --git a/gnustep-apps/cenon/cenon-3.91.ebuild b/gnustep-apps/cenon/cenon-3.91.ebuild
deleted file mode 100644
index 90a401e0d527..000000000000
--- a/gnustep-apps/cenon/cenon-3.91.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/cenon-3.91.ebuild,v 1.1 2010/09/01 12:01:50 voyageur Exp $
-
-EAPI=3
-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/vhf-interservice/download/source/${P/c/C}.tar.bz2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="Cenon"
-IUSE=""
-
-RDEPEND=">=gnustep-libs/cenonlibrary-3.90"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-install.patch
-}
diff --git a/gnustep-apps/cenon/files/cenon-3.91-install.patch b/gnustep-apps/cenon/files/cenon-3.9.4-install.patch
index 45540fab7b01..45540fab7b01 100644
--- a/gnustep-apps/cenon/files/cenon-3.91-install.patch
+++ b/gnustep-apps/cenon/files/cenon-3.9.4-install.patch
diff --git a/gnustep-apps/cenon/files/cenon-3.90-install.patch b/gnustep-apps/cenon/files/cenon-3.90-install.patch
deleted file mode 100644
index 523dd61efa83..000000000000
--- a/gnustep-apps/cenon/files/cenon-3.90-install.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur Cenon.orig/GNUmakefile.postamble Cenon/GNUmakefile.postamble
---- Cenon.orig/GNUmakefile.postamble	2009-09-21 16:37:50.000000000 +0200
-+++ Cenon/GNUmakefile.postamble	2009-09-21 16:38:18.000000000 +0200
-@@ -18,13 +18,7 @@
- # before-install::
- 
- # Things to do after installing
--after-install::
--	# copy library
--	#rm -R $(GNUSTEP_LOCAL_ROOT)/Library/$(APP_NAME)
--	cp -R Library/$(APP_NAME)/ $(GNUSTEP_LOCAL_ROOT)/Library/
--	# set permissions (rrr)
--	chmod -R ugo+rX $(GNUSTEP_APPS)/$(APP_NAME).*
--	#chmod -R ugo+rX $(GNUSTEP_LOCAL_ROOT)/Library/$(APP_NAME)
-+#after-install::
- 
- # Things to do before uninstalling
- # before-uninstall::