Package cleanup - Some have gone to the main tree, some new versions added from the main tree.

svn path=/trunk/overlay/; revision=7

7 files changed, 18 insertions, 76 deletions

diff --git a/profiles/package.mask b/profiles/package.mask
index 62a5a98..251e1ca 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,7 @@
->=rox-base/pager-1.1-r2
->=rox-base/rox-2.6-r2
->=rox-base/rox-clib-2.1.9-r2
->=rox-base/rox-lib-2.0.3-r4
+=rox-base/pager-1.1-r2
+=rox-base/rox-2.6-r2
+=rox-base/rox-2.6.1-r1
+=rox-base/rox-clib-2.1.9-r2
+=rox-base/rox-lib-2.0.3-r4
+=rox-base/rox-lib-2.0.4-r1
 rox-base/zeroinstall-injector
diff --git a/rox-base/rox-clib/Manifest b/rox-base/rox-clib/Manifest
index 155750d..0bf25a6 100644
--- a/rox-base/rox-clib/Manifest
+++ b/rox-base/rox-clib/Manifest
@@ -1,3 +1,2 @@
 DIST ROX-CLib-2.1.9.tar.gz 569820 RMD160 d88f9e35924b8921cd199c7f645cf50925e0a36e SHA1 cd6b528d00643adac76e5e97f4c705633091aa8f SHA256 7cd8aea53948552d940d2a6d9a24b9e65798371e99ea50cb77f7eecd65b1c33c
-EBUILD rox-clib-2.1.9-r1.ebuild 1584 RMD160 fcd7d5e4374a9cde2efa6b026f998b2f1182e07b SHA1 7ddda371b0981f948273a4bb172ba71a2ac8c21d SHA256 859f6b5fa6774782230aad196a6e415b901d7117d108d42f8509fa7ace6826e3
 EBUILD rox-clib-2.1.9-r2.ebuild 1688 RMD160 75fc55c9b8407c7bbf8a258dcdd6092d6142ad92 SHA1 376bcb8d31546fda066d86ae4d550f460119ef1b SHA256 3217569955a14feae4fc93479235580eb0c894fc5816a3ed7d955657b766bd27
diff --git a/rox-base/rox-clib/rox-clib-2.1.9-r1.ebuild b/rox-base/rox-clib/rox-clib-2.1.9-r1.ebuild
deleted file mode 100644
index b7ff00c..0000000
--- a/rox-base/rox-clib/rox-clib-2.1.9-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/rox-clib-2.1.9.ebuild,v 1.2 2007/02/09 22:02:10 opfer Exp $
-
-inherit multilib
-
-MY_PN="ROX-CLib"
-DESCRIPTION="A library for ROX applications written in C."
-HOMEPAGE="http://rox.sourceforge.net/"
-SRC_URI="http://www.kerofin.demon.co.uk/rox/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.0.1
-	>=dev-libs/libxml2-2.4.0"
-
-DEPEND="$RDEPEND
-	>=dev-util/pkgconfig-0.20"
-
-S=${WORKDIR}/ROX-CLib
-APPNAME=${MY_PN}
-
-src_compile() {
-	chmod 0755 AppRun
-
-	# Most rox self-compiles have a 'read' call to wait for the user to
-	# press return if the compile fails.
-	# Find and remove this:
-	sed -i.bak -e 's/\<read WAIT\>/#read/' AppRun
-
-	./AppRun --compile || die "Could not make ROX-CLib. Sorry."
-
-	# Restore the original AppRun
-	mv AppRun.bak AppRun
-}
-
-src_install() {
-	local baselibdir="/usr/$(get_libdir)"
-	#  clean up source instead of remove it!
-	( cd src && make clean )
-
-	# remove silly .cvs files
-	find . -name '.cvs*' | xargs rm -f >/dev/null 2>&1
-	dodoc ${baselibdir}/${APPNAME}
-	dodir ${baselibdir}/${APPNAME}
-	cp -r . ${D}${baselibdir}/${APPNAME}
-	(
-		cd Help
-		dodoc Authors Changes ToDo COPYING README Versions
-	)
-
-	#finally link the html and latex dirs
-	#cd ${D}/usr/share/doc/${P}
-	#ln -s ${baselibdir}/${APPNAME}/Help/rox-clib.html rox-clib.html
-	#ln -s ${baselibdir}/${APPNAME}/Help/libdir.html libdir.html
-	#ln -s ${baselibdir}/${APPNAME}/Help/html html
-}
diff --git a/rox-base/rox-lib/Manifest b/rox-base/rox-lib/Manifest
index f4cafdd..d76ec1b 100644
--- a/rox-base/rox-lib/Manifest
+++ b/rox-base/rox-lib/Manifest
@@ -1,4 +1,5 @@
 AUX rox-lib-2.0.3-nosvg.patch 543 RMD160 93469b0c7dc749706ca677eac084e025ed1afc44 SHA1 23abeb104f0e3a00e4f9622bdcbe83bbba93c342 SHA256 a1150d8a208071f5e1d0b207374a6cdd86502fde5a51ca4f5bc0d8ab2de18746
 DIST rox-lib2-2.0.3.tar.bz2 127605 RMD160 dd5a1472a8e5db1c7af330d2c0f4a03e5088b899 SHA1 7c51c93bc335ecb614767f79bb6a1e4a21eb216b SHA256 8d2f7475f2ab131d03453b1da7ed4472a564a93927836add77291d8fc6cdd355
-EBUILD rox-lib-2.0.3-r3.ebuild 964 RMD160 91c52b7b7628a84ce28d8fc9fcf4f00b708129f9 SHA1 402f332dbe27588e74262c19f86cccc95c4ac1fc SHA256 0341f672ab06bfeb3569d6db2de850f3bd2417b1d677bbaedd9e9926c1ad0367
+DIST rox-lib2-2.0.4.tar.bz2 139299 RMD160 5c4fbb6d7980db5debcaff677749e34c39a83fbc SHA1 3a055022b81ed091ef78196cc341601f78f6646e SHA256 a7234531f972cf6f90be9076178e47324a952332ae2e6db4b475a7528abdf28e
 EBUILD rox-lib-2.0.3-r4.ebuild 1040 RMD160 dd50ddd9fdff57f3aaef9a9df821e4e131717937 SHA1 4dd0c74bf6000b3ba385333882726cec47974f99 SHA256 b8f5b3c443cc4e9a0881ca146062f2037a027a60960f89c6ff21ce8c6d1e16e3
+EBUILD rox-lib-2.0.4-r1.ebuild 959 RMD160 7fac2e07f6d3217c3f564195d24000ded3cd507e SHA1 5a7af3dde9e2a42594b9b4fc6d70e568c7ff437f SHA256 cf48d464117a906507d08100177f3e3c390968a48d9f9f8d95fc5a31baeb6653
diff --git a/rox-base/rox-lib/rox-lib-2.0.3-r3.ebuild b/rox-base/rox-lib/rox-lib-2.0.4-r1.ebuild
index 85b1a0d..0b8347c 100644
--- a/rox-base/rox-lib/rox-lib-2.0.3-r3.ebuild
+++ b/rox-base/rox-lib/rox-lib-2.0.4-r1.ebuild
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/rox-base/rox-lib/rox-lib-2.0.3-r2.ebuild,v 1.1 2007/02/13 17:03:46 lack Exp $
 
 NEED_PYTHON="2.3"
-inherit python eutils multilib
+inherit python eutils 0install multilib
 
 MY_PN="rox-lib2"
 DESCRIPTION="ROX-Lib2 - Shared code for ROX applications by Thomas Leonard"
@@ -20,12 +20,6 @@ RDEPEND=">=rox-base/rox-2.2.0
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-nosvg.patch"
-}
-
 src_install() {
 	local baselibdir="/usr/$(get_libdir)"
 	dodir ${baselibdir}
@@ -33,4 +27,6 @@ src_install() {
 	python_mod_optimize ${D}${baselibdir}/ROX-Lib2/ >/dev/null 2>&1
 	dodir /usr/share/doc/
 	dosym ${baselibdir}/ROX-Lib2/Help /usr/share/doc/${P}
+
+	0install_local_feed ROX-Lib2/ROX-Lib2.xml ${baselibdir}/ROX-Lib2
 }
diff --git a/rox-base/rox/Manifest b/rox-base/rox/Manifest
index e50b342..fc63cdf 100644
--- a/rox-base/rox/Manifest
+++ b/rox-base/rox/Manifest
@@ -1,4 +1,5 @@
 AUX rox-2.6-nostrip.patch 664 RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc SHA1 b9f0fe536442382a393e059ed8a2c830663427cb SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc
+DIST rox-filer-2.6.1.tar.bz2 1816711 RMD160 94a3320883c49066072d44f25f417e20739711ca SHA1 5364ac260970ecafa58f92892becf8104db025a3 SHA256 e7efefbfa8e37ba7263771bdfd0b16c9f4b47b09d301b82616012ad53eb03e02
 DIST rox-filer-2.6.tar.bz2 1815735 RMD160 1b4e8c65208ba84b78584471b1a7b711609c7623 SHA1 3f0be6bc480aa0752fe80c83dca321655a2cab19 SHA256 c1f8d7535528de3badf8762ba88bb1f41700f5117788abc575959effb6939960
-EBUILD rox-2.6-r1.ebuild 2878 RMD160 ecf6bd6f1e53cd2b5418ed81b92d33189c794ea6 SHA1 7d5eaa84a85d93230cb6552b1dcafb571f4e48da SHA256 53fe013766da0d79687f861aa303bcaa0318a30781f49050f180bab15abf7237
 EBUILD rox-2.6-r2.ebuild 2980 RMD160 bec05b7eca1ea5e9e9d611b4a1e21b866d39e326 SHA1 b0c83e0ed21695dfce06eb3766af3a215917f556 SHA256 72ce17475ad872643118f26d10cdb84ba0cf1db0878da4f86cae28daf8ff4a23
+EBUILD rox-2.6.1-r1.ebuild 2980 RMD160 bec05b7eca1ea5e9e9d611b4a1e21b866d39e326 SHA1 b0c83e0ed21695dfce06eb3766af3a215917f556 SHA256 72ce17475ad872643118f26d10cdb84ba0cf1db0878da4f86cae28daf8ff4a23
diff --git a/rox-base/rox/rox-2.6-r1.ebuild b/rox-base/rox/rox-2.6.1-r1.ebuild
index c8f6dea..5d4ec6f 100644
--- a/rox-base/rox/rox-2.6-r1.ebuild
+++ b/rox-base/rox/rox-2.6.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.6.ebuild,v 1.6 2007/04/23 05:46:06 opfer Exp $
 
-inherit eutils multilib
+inherit eutils multilib 0install
 
 MY_P="rox-filer-${PV}"
 S="${WORKDIR}/${MY_P}"
@@ -20,7 +20,8 @@ RDEPEND=">=x11-libs/gtk+-2.4
 	>=dev-libs/glib-2.2
 	>=dev-libs/libxml2-2.4.23
 	>=x11-misc/shared-mime-info-0.14
-	svg? ( gnome-base/librsvg )"
+	svg? ( gnome-base/librsvg )
+	rox-base/zeroinstall-injector"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.20"
@@ -116,6 +117,8 @@ EOF
 	newins ${APPNAME}/.DirIcon ${APPNAME}.png
 
 	make_desktop_entry ${WRAPPERNAME} ${APPNAME} ${APPNAME}.png "System;Utility;Core;ROX"
+
+	0install_local_feed "${APPNAME}.xml" "${APPDIR}/${APPNAME}"
 }
 
 pkg_postinst() {