Version bump, move stable to new versioning

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
RepoMan-Options: --force

7 files changed, 36 insertions, 59 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/Manifest b/gnustep-apps/cenon/Manifest
index 26cba673d622..7982ca60e1b2 100644
--- a/gnustep-apps/cenon/Manifest
+++ b/gnustep-apps/cenon/Manifest
@@ -1,11 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX cenon-3.82-install.patch 1048 RMD160 31550dc1ffeb51610666df48fc7748bd5e5919ac SHA1 e172fe91464e831feb019cad1aa12a641cd9671b SHA256 40621c6d0a59990903a3ce3dc985a265b54be2d99a3c70554c1f36e753e7994c
-AUX cenon-3.90-install.patch 645 RMD160 d9a96ce47371df771555a38f17f0b6a40a29cbfc SHA1 7d6a7ddb1467b47f2ffe07d0def9b5fdc8ce3d50 SHA256 c4c94c4aea4b2ab8c101d3356d43a2080ee8a5847ea6516ff577a54fb7acbc16
-AUX cenon-3.91-install.patch 636 RMD160 aae83bacf868a2d5de41f00a29d945888489301e SHA1 ef3eadecd84ea4d9742973ebc9f1a5cbc252bc30 SHA256 3d0a3bf38b4a16b62230da9a8bdb17bb570a3d4486bb73ff7b1d0a4441c886c3
+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.90.tar.bz2 1408897 RMD160 c571e3ef6b3b10f68231c93e38a1813c44b88c4e SHA1 9713aaf84bc94a860938b825d3f97cb42f50221e SHA256 9c426d7b0dfee4d7c53b2f5f7c621a70baa8a6e8b6134c38dd5ad6a7f2513b2e
-DIST Cenon-3.91.tar.bz2 1880833 RMD160 e16e453e432e03a17a80a9564ef4717cac277c09 SHA1 c95a0d47a8d17c6a2dda7c324a973e6e6596fed8 SHA256 a650ef90395b8cfcce3cd773a12ddffc855f776cce78a38c3c33a6da3b7347e1
-EBUILD cenon-3.82.ebuild 627 RMD160 ea6d726cda05df5a7668b7abfa713aef34d5a404 SHA1 087fd4d56c3faa691ad7b17d65756291fb2ec06e SHA256 c504f6fb9763cc65bd197f54e223310b4858875642993c2820a5c16f5e90acb3
-EBUILD cenon-3.90.ebuild 634 RMD160 63c636a3e8a2533a609e7014a3f6f056aea6109e SHA1 ea4ae82b0a65f4499e5dec46383a1bdf04662d43 SHA256 2f1556f28b7111e140f5c65ff5fe5a95318f0aadffc1b836311228510faa8036
-EBUILD cenon-3.91.ebuild 634 RMD160 ef8f6bef7c6350061550c586a07d7f984fc46aad SHA1 1e83ead9eee6daa22ee7dacdcc19c3dbc2ef2a0e SHA256 78c7fd78de3d426f254cb6b235f19194a4fed9b941ef253076a22c01377eaccd
-MISC ChangeLog 1562 RMD160 04ffc7c08c50a0a36e3e01dd696065d4d7ef15e7 SHA1 fed3518260bab75f543bc9d1e2281b0bd19ac9d8 SHA256 84c9602e65846c894b3c5d3edf5f89dc2064a7fb7010ae5011354211cc43a15e
+DIST Cenon-3.9.4.tar.bz2 2001681 RMD160 87006f122625501f34939fba97c0f510d0d89b75 SHA1 0e24d1140b14dc5001c5dbcd3af523d6c915dace SHA256 4bb66273283f6e2aa32f1626448cda428e60514d1d7bf34c7b2d18c07fcf0ef3
+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
+MISC ChangeLog 1928 RMD160 59dffe3dec59c5855020565d34d2c34b862fd537 SHA1 5c6d9d13d9912a7bc885ea4bab0157d70e613c92 SHA256 3a0fb40e32fa3dc657fa224770f8b2e58e2aef8e6aa02132c21c4ae97e7d11ac
 MISC metadata.xml 351 RMD160 52c0e9873160b51ea4a8d37dbec10b4cb19cb33c SHA1 1fe56a0f62c696af01bb278d2373f468ef6c1246 SHA256 f6feea5139f9ddbd39fa1c5c09362472d47967ae034139e0cca20ce2e6fddc2f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5OWUsACgkQFYEBGcdFJfKG3AD/Y1ycg90oZY7opZSIHzt/3u/Z
+Vx5IB3DkLufIc1FNC2MA+wbKzaZG3btmEefGJ2jnYQSjTxScs/49C/FVQT/viF6F
+=udcZ
+-----END PGP SIGNATURE-----
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::