4 files changed, 17 insertions, 18 deletions
diff --git a/rox-extra/roxcd/ChangeLog b/rox-extra/roxcd/ChangeLog
index 4bddcb18539c..54a1f1b3bf86 100644
--- a/rox-extra/roxcd/ChangeLog
+++ b/rox-extra/roxcd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-extra/roxcd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/roxcd/ChangeLog,v 1.6 2006/11/01 17:25:02 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/roxcd/ChangeLog,v 1.7 2006/11/17 14:57:33 lack Exp $
+
+  17 Nov 2006; Jim Ramsay <lack@gentoo.org> roxcd-0.4.5.ebuild,
+  roxcd-0.5.4.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/roxcd/files/digest-roxcd-0.5.4 b/rox-extra/roxcd/files/digest-roxcd-0.5.4
index d579bb501545..5b3574ee5b4f 100644
--- a/rox-extra/roxcd/files/digest-roxcd-0.5.4
+++ b/rox-extra/roxcd/files/digest-roxcd-0.5.4
@@ -1 +1,3 @@
 MD5 c0c05b91dfc6231c3a162bc37e1a1bd1 RoxCD-0.5.4.tar.bz2 80455
+RMD160 8f4704e89d444c4b487a7aefc3579540cd39f7b6 RoxCD-0.5.4.tar.bz2 80455
+SHA256 50fe21a5a56cbb049a5269504ff71c43e4b9b3487b9175ad9fbfd098fa75b96f RoxCD-0.5.4.tar.bz2 80455
diff --git a/rox-extra/roxcd/roxcd-0.4.5.ebuild b/rox-extra/roxcd/roxcd-0.4.5.ebuild
index 8e38d3425f9f..3bf59cc7ab92 100644
--- a/rox-extra/roxcd/roxcd-0.4.5.ebuild
+++ b/rox-extra/roxcd/roxcd-0.4.5.ebuild
@@ -1,27 +1,20 @@
-# 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/roxcd/roxcd-0.4.5.ebuild,v 1.2 2005/03/05 23:51:46 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/roxcd/roxcd-0.4.5.ebuild,v 1.3 2006/11/17 14:57:32 lack Exp $
 
-DESCRIPTION="RoxCD - A CD Player/Ripper for the ROX Desktop"
+ROX_LIB_VER=1.9.11
+inherit rox
 
+DESCRIPTION="RoxCD - A CD Player/Ripper for the ROX Desktop"
 MY_PN="RoxCD"
-
 HOMEPAGE="http://www.rdsarts.com/code/roxcd"
-
 SRC_URI="http://www.rdsarts.com/code/roxcd/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
-
 SLOT="0"
-
 KEYWORDS="~x86 ~ppc"
-
 IUSE=""
 
-ROX_LIB_VER=1.9.11
-
 APPNAME=${MY_PN}
-
 S=${WORKDIR}
 
-inherit rox
diff --git a/rox-extra/roxcd/roxcd-0.5.4.ebuild b/rox-extra/roxcd/roxcd-0.5.4.ebuild
index bac4f3289c7e..46f78df5fde5 100644
--- a/rox-extra/roxcd/roxcd-0.5.4.ebuild
+++ b/rox-extra/roxcd/roxcd-0.5.4.ebuild
@@ -1,6 +1,9 @@
-# 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/roxcd/roxcd-0.5.4.ebuild,v 1.1 2005/10/07 11:12:06 svyatogor Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/roxcd/roxcd-0.5.4.ebuild,v 1.2 2006/11/17 14:57:33 lack Exp $
+
+ROX_LIB_VER=1.9.14
+inherit rox
 
 MY_PN="RoxCD"
 DESCRIPTION="RoxCD - A CD Player/Ripper for the ROX Desktop"
@@ -12,12 +15,9 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-ROX_LIB_VER=1.9.14
 APPNAME=${MY_PN}
 S=${WORKDIR}
 
-inherit rox
-
 #YUCK, there is a subdiretory in Help for the Licenses.
 #need to move it
 src_unpack() {