Bug 155429 - Fixed inherit order

Package-Manager: portage-2.1.2_rc1-r6

diff --git a/rox-extra/edit/ChangeLog b/rox-extra/edit/ChangeLog
index eff30f34a30b424cb75e8f6a287e22ee46689d74..6aaef13c1b5ac57c768c891d6e27570e56ade8d7 100644 (file)
--- a/rox-extra/edit/ChangeLog
+++ b/rox-extra/edit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-extra/edit
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/edit/ChangeLog,v 1.7 2006/11/01 17:25:02 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/edit/ChangeLog,v 1.8 2006/11/17 14:51:26 lack Exp $
+
+  17 Nov 2006; Jim Ramsay <lack@gentoo.org> edit-1.9.5.ebuild,
+  edit-2.0.ebuild:
+  Bug 155429 - Fixed inherit order
 
   01 Nov 2006; Jim Ramsay <lack@gentoo.org> metadata.xml:
   Now owned by new rox herd

diff --git a/rox-extra/edit/Manifest b/rox-extra/edit/Manifest
index 9779ba43134d46793952d33b9f0b1ae368df5382..a51b64ce86bee2a94edf3765943d28222eaf28a1 100644 (file)
--- a/rox-extra/edit/Manifest
+++ b/rox-extra/edit/Manifest
@@ -1,17 +1,17 @@
 DIST edit-1.9.5.tgz 35143
-DIST edit-2.0.tgz 61195
-EBUILD edit-1.9.5.ebuild 474 RMD160 ac094aab3a902e419ef79f851c162403f4015303 SHA1 0b3b4d8b9861c49f622bc071c64583facd7718d2 SHA256 6113330417d60d778f3dae92075598de75c8622d5422d12b982029e05b948cc0
-MD5 f274e7d167ea0ac7a7d3c5fb0b6c96ed edit-1.9.5.ebuild 474
-RMD160 ac094aab3a902e419ef79f851c162403f4015303 edit-1.9.5.ebuild 474
-SHA256 6113330417d60d778f3dae92075598de75c8622d5422d12b982029e05b948cc0 edit-1.9.5.ebuild 474
-EBUILD edit-2.0.ebuild 667 RMD160 26ae25a05305a737cb540a488d3db86a326460fd SHA1 c9557396b1adbf72271c2b14fe46100e88c33e2b SHA256 dc5e06ca80b930fb047e36d710ef0f86d638f7f44ae55e22787f2257024a8c41
-MD5 34dbe93d8874eac07ef7520d3fb39aae edit-2.0.ebuild 667
-RMD160 26ae25a05305a737cb540a488d3db86a326460fd edit-2.0.ebuild 667
-SHA256 dc5e06ca80b930fb047e36d710ef0f86d638f7f44ae55e22787f2257024a8c41 edit-2.0.ebuild 667
-MISC ChangeLog 1043 RMD160 6a6de72712f913eeebe18e40c4e53b4c41407012 SHA1 0081049a4a8796219b041de59c65bcd79f28dae5 SHA256 08f78317e88d85fd5e56366a30cfa392c572508d4ffd432b3bb33f307147ba37
-MD5 a6a07a95c2832b23b501f6d99c3388c7 ChangeLog 1043
-RMD160 6a6de72712f913eeebe18e40c4e53b4c41407012 ChangeLog 1043
-SHA256 08f78317e88d85fd5e56366a30cfa392c572508d4ffd432b3bb33f307147ba37 ChangeLog 1043
+DIST edit-2.0.tgz 61195 RMD160 112c5196ea5709471cfb6f3c5987e914f0f20344 SHA1 28741374baa1c0e7b09cfde672071599255f69c2 SHA256 3fc97b68f8ff9e5eca241ac59a0c0f6eb54e74335c4250d24e7422ae9625a746
+EBUILD edit-1.9.5.ebuild 464 RMD160 2e9b011af2a0b9768c97ee3ae73bcdda341f25b8 SHA1 7a44f54577cabf96e4b02ef511246ee963376d6e SHA256 22487c920d2043cf88199cab789bb85e6c1cec9e738e5129fa2032478b161995
+MD5 3acef9d910acc3d040b4cd7528020cad edit-1.9.5.ebuild 464
+RMD160 2e9b011af2a0b9768c97ee3ae73bcdda341f25b8 edit-1.9.5.ebuild 464
+SHA256 22487c920d2043cf88199cab789bb85e6c1cec9e738e5129fa2032478b161995 edit-1.9.5.ebuild 464
+EBUILD edit-2.0.ebuild 667 RMD160 edcaacf3bf0cf873358447cacfd4ed041bd333bf SHA1 bfe4dbe90e9b7c9f3d5a7d377946a63f62fedd04 SHA256 7b710de20cd15815a5601180475ed199f532a613dd6cfdcf4417b25adb46aa70
+MD5 708913c4e9a58a39102cb8b422648d83 edit-2.0.ebuild 667
+RMD160 edcaacf3bf0cf873358447cacfd4ed041bd333bf edit-2.0.ebuild 667
+SHA256 7b710de20cd15815a5601180475ed199f532a613dd6cfdcf4417b25adb46aa70 edit-2.0.ebuild 667
+MISC ChangeLog 1161 RMD160 05c6b2f258e3cb97baba7b37635460c62eec2897 SHA1 ae58cb9727f64f511a96873d875508b82f082944 SHA256 7272a0a4387be2128f7f4e7d00c8c0fff139a7185abea4a101d27d850ec516c4
+MD5 f2b7a6fac1ea1090413690417a823cdc ChangeLog 1161
+RMD160 05c6b2f258e3cb97baba7b37635460c62eec2897 ChangeLog 1161
+SHA256 7272a0a4387be2128f7f4e7d00c8c0fff139a7185abea4a101d27d850ec516c4 ChangeLog 1161
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
@@ -19,6 +19,6 @@ SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c metadata
 MD5 f21b7aa99b68eef4b9c99ba8187b0098 files/digest-edit-1.9.5 58
 RMD160 a99cd2105d2978897cfa29d2ff40b6f0e6060551 files/digest-edit-1.9.5 58
 SHA256 cc23d5c4f1bd5e32c0360ba1bff13ed83cab900a0f511a1a67948d2d2c7683a8 files/digest-edit-1.9.5 58
-MD5 7cd1c2c02fc31e1f2dbb5d3b6b583280 files/digest-edit-2.0 56
-RMD160 5753bd81e43097f06385735fda0a9e3e176ce26b files/digest-edit-2.0 56
-SHA256 9883757f1c13ecff0ecf5a55ac09d8b007ef38ca73c62366da3cf62cd52294ad files/digest-edit-2.0 56
+MD5 403e05dfb5ce69edffbb7257e04a5be0 files/digest-edit-2.0 214
+RMD160 a11d2a4c9fbdf18da56628a3bcd592403b8a6b2f files/digest-edit-2.0 214
+SHA256 7e62f8016043d8aee574e2234ff8356f2fd42b1bfd258ed6f2533f0dc7511c67 files/digest-edit-2.0 214

diff --git a/rox-extra/edit/edit-1.9.5.ebuild b/rox-extra/edit/edit-1.9.5.ebuild
index 9b15bd5fb3234370da647a9ec925f8298506d10f..7bae1bc4c5f3df2c51debf043a3dd86d99ec49fc 100644 (file)
--- a/rox-extra/edit/edit-1.9.5.ebuild
+++ b/rox-extra/edit/edit-1.9.5.ebuild
@@ -1,23 +1,18 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/edit/edit-1.9.5.ebuild,v 1.4 2005/08/14 23:05:34 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/edit/edit-1.9.5.ebuild,v 1.5 2006/11/17 14:51:26 lack Exp $
 
-DESCRIPTION="Edit is a simple text editor for ROX Desktop"
+ROX_LIB_VER=1.9.14
+inherit rox
 
-HOMEPAGE="http://rox.sourceforge.net/"
+APPNAME=Edit
 
+DESCRIPTION="Edit is a simple text editor for ROX Desktop"
+HOMEPAGE="http://rox.sourceforge.net/"
 SRC_URI="mirror://sourceforge/rox/${P}.tgz"
 
 LICENSE="GPL-2"
-
 SLOT="0"
-
 KEYWORDS="~amd64 ~ppc ~x86"
-
 IUSE=""
 
-ROX_LIB_VER=1.9.14
-
-APPNAME=Edit
-
-inherit rox

diff --git a/rox-extra/edit/edit-2.0.ebuild b/rox-extra/edit/edit-2.0.ebuild
index 2b7c8ca7d6780fb98b4a14b6c746280075e6c396..cf970290e5850fb728ce5272493bf4375c8222b8 100644 (file)
--- a/rox-extra/edit/edit-2.0.ebuild
+++ b/rox-extra/edit/edit-2.0.ebuild
@@ -1,6 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/edit/edit-2.0.ebuild,v 1.3 2006/10/05 03:11:17 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/edit/edit-2.0.ebuild,v 1.4 2006/11/17 14:51:26 lack Exp $
+
+ROX_LIB_VER=1.9.14
+inherit rox
+
+APPNAME=Edit
 
 DESCRIPTION="Edit is a simple text editor for ROX Desktop"
 HOMEPAGE="http://rox.sourceforge.net/"
@@ -11,11 +16,6 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-ROX_LIB_VER=1.9.14
-APPNAME=Edit
-
-inherit rox
-
 # do some cleanup. Edit 2.0 has CVS dirs included
 pkg_preinst() {
        find ${D}/usr/lib/rox/${APPNAME} -name 'CVS' | xargs rm -fr

diff --git a/rox-extra/edit/files/digest-edit-2.0 b/rox-extra/edit/files/digest-edit-2.0
index 47bc575fc6a26b9084e59cc581ffa2b05593b9ef..19a11afadd642a7efe8c40cdf19f95197d3ee818 100644 (file)
--- a/rox-extra/edit/files/digest-edit-2.0
+++ b/rox-extra/edit/files/digest-edit-2.0
@@ -1 +1,3 @@
 MD5 55eb8c8b7b4bf630e626514b8bfa1f6e edit-2.0.tgz 61195
+RMD160 112c5196ea5709471cfb6f3c5987e914f0f20344 edit-2.0.tgz 61195
+SHA256 3fc97b68f8ff9e5eca241ac59a0c0f6eb54e74335c4250d24e7422ae9625a746 edit-2.0.tgz 61195