Added patch which fixes #239136, and version cleanup

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

5 files changed, 74 insertions, 44 deletions

diff --git a/rox-base/rox-lib/ChangeLog b/rox-base/rox-lib/ChangeLog
index f66a988c1698..3b8d44f8145c 100644
--- a/rox-base/rox-lib/ChangeLog
+++ b/rox-base/rox-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for rox-base/rox-lib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-lib/ChangeLog,v 1.30 2008/08/31 21:11:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-lib/ChangeLog,v 1.31 2008/10/02 16:17:55 lack Exp $
+
+*rox-lib-2.0.5-r1 (02 Oct 2008)
+
+  02 Oct 2008; Jim Ramsay <lack@gentoo.org>
+  -files/rox-lib-2.0.3-nosvg.patch, +files/rox-lib-nosvg.patch,
+  -rox-lib-2.0.4.ebuild, +rox-lib-2.0.5-r1.ebuild:
+  Added patch which fixes #239136, and version cleanup
 
   31 Aug 2008; Raúl Porcel <armin76@gentoo.org> rox-lib-2.0.5.ebuild:
   alpha/sparc stable wrt #236057
diff --git a/rox-base/rox-lib/Manifest b/rox-base/rox-lib/Manifest
index 1f19e9253363..ecaa32253d2d 100644
--- a/rox-base/rox-lib/Manifest
+++ b/rox-base/rox-lib/Manifest
@@ -1,7 +1,6 @@
-AUX rox-lib-2.0.3-nosvg.patch 543 RMD160 93469b0c7dc749706ca677eac084e025ed1afc44 SHA1 23abeb104f0e3a00e4f9622bdcbe83bbba93c342 SHA256 a1150d8a208071f5e1d0b207374a6cdd86502fde5a51ca4f5bc0d8ab2de18746
-DIST rox-lib2-2.0.4.tar.bz2 139299 RMD160 5c4fbb6d7980db5debcaff677749e34c39a83fbc SHA1 3a055022b81ed091ef78196cc341601f78f6646e SHA256 a7234531f972cf6f90be9076178e47324a952332ae2e6db4b475a7528abdf28e
+AUX rox-lib-nosvg.patch 543 RMD160 93469b0c7dc749706ca677eac084e025ed1afc44 SHA1 23abeb104f0e3a00e4f9622bdcbe83bbba93c342 SHA256 a1150d8a208071f5e1d0b207374a6cdd86502fde5a51ca4f5bc0d8ab2de18746
 DIST rox-lib2-2.0.5.tar.bz2 139670 RMD160 a8e13ae4456dd31e58b2e93bc0acc1e76190de4a SHA1 62283301b4f2bb9fda5cafcd0785d4a8aa156914 SHA256 d0a4c250249e2d2aa5569f00f740f105ef712304b933255284bd94211da12143
-EBUILD rox-lib-2.0.4.ebuild 1030 RMD160 03b00a7573afa8e64db507e44e2ec3318f829b21 SHA1 e81e0e1a79e0b17002b386c8516b2e3d5913cac6 SHA256 381c634f8b2593db9d00af2b7f2b98f116b8deff286f24a0cb509b47412a1756
+EBUILD rox-lib-2.0.5-r1.ebuild 1817 RMD160 6ad98da5baaf26c92866bc8fe05c40801f21ab3b SHA1 cebfa2b07387ac999c0b466f152b8ba0ba10e586 SHA256 f3dfb95cab5f1e1bf7f1fad4ad8ccd42766c1fe342b1dfa1a63d42efec9f5e19
 EBUILD rox-lib-2.0.5.ebuild 1727 RMD160 37d1931eec60a01f47b2d52110ee32ec193a942a SHA1 b90cd6528a775e1b69f029c72192ee091e2e0b89 SHA256 4fdb155b8c063c0b79531f2c45fa687218a4cd10db6f69febea573ecde47fb77
-MISC ChangeLog 4323 RMD160 41ff114e090f4826e037b7a4a3dd35e63c5e415c SHA1 fd8fd7244e33deea1a1937086d1b529977350504 SHA256 9e040264b96e622d425c938cd4f068d6ded3f82adcb328ac8334b6b2764ac4af
+MISC ChangeLog 4568 RMD160 60d619104a974ade3546d8780027dfc3de5281f7 SHA1 d45c26d5d7e622f7630672439e91857ba6194d51 SHA256 f561bd11ed55393d8ad252c791cce3a096b3a8d3773b8df0101cf0ff0ccab43c
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
diff --git a/rox-base/rox-lib/files/rox-lib-2.0.3-nosvg.patch b/rox-base/rox-lib/files/rox-lib-nosvg.patch
index eff2aa325c40..eff2aa325c40 100644
--- a/rox-base/rox-lib/files/rox-lib-2.0.3-nosvg.patch
+++ b/rox-base/rox-lib/files/rox-lib-nosvg.patch
diff --git a/rox-base/rox-lib/rox-lib-2.0.4.ebuild b/rox-base/rox-lib/rox-lib-2.0.4.ebuild
deleted file mode 100644
index c27dd7140844..000000000000
--- a/rox-base/rox-lib/rox-lib-2.0.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-lib/rox-lib-2.0.4.ebuild,v 1.7 2008/06/04 13:15:41 lack Exp $
-
-NEED_PYTHON="2.3"
-inherit python eutils multilib
-
-MY_PN="rox-lib2"
-DESCRIPTION="ROX-Lib2 - Shared code for ROX applications by Thomas Leonard"
-HOMEPAGE="http://rox.sourceforge.net/desktop/ROX-Lib"
-SRC_URI="mirror://sourceforge/rox/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=rox-base/rox-2.2.0
-		>=dev-python/pygtk-2.8.2"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
-	local baselibdir="/usr/$(get_libdir)"
-	dodir ${baselibdir}
-	cp -r ROX-Lib2/ "${D}${baselibdir}"
-	dodir /usr/share/doc/
-	dosym ${baselibdir}/ROX-Lib2/Help /usr/share/doc/${P}
-}
-
-pkg_postinst() {
-	local baselibdir="/usr/$(get_libdir)"
-	python_mod_optimize "${baselibdir}/ROX-Lib2/"
-}
-
-pkg_postrm() {
-	local baselibdir="/usr/$(get_libdir)"
-	python_mod_cleanup "${baselibdir}/ROX-Lib2/"
-}
diff --git a/rox-base/rox-lib/rox-lib-2.0.5-r1.ebuild b/rox-base/rox-lib/rox-lib-2.0.5-r1.ebuild
new file mode 100644
index 000000000000..a337fb038945
--- /dev/null
+++ b/rox-base/rox-lib/rox-lib-2.0.5-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-lib/rox-lib-2.0.5-r1.ebuild,v 1.1 2008/10/02 16:17:55 lack Exp $
+
+NEED_PYTHON="2.3"
+inherit python eutils multilib
+
+MY_PN="rox-lib2"
+DESCRIPTION="ROX-Lib2 - Shared code for ROX applications by Thomas Leonard"
+HOMEPAGE="http://rox.sourceforge.net/desktop/ROX-Lib"
+SRC_URI="mirror://sourceforge/rox/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=rox-base/rox-2.2.0
+		>=dev-python/pygtk-2.8.2"
+
+DEPEND="rox-base/zeroinstall-injector"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/rox-lib-nosvg.patch"
+}
+
+src_install() {
+	local baselibdir="/usr/$(get_libdir)"
+	local NATIVE_FEED_DIR="/usr/share/0install.net/native_feeds"
+	local ICON_CACHE_DIR="/var/cache/0install.net/interface_icons"
+
+	dodir "${baselibdir}"
+	cp -r ROX-Lib2/ "${D}${baselibdir}"
+	dodir /usr/share/doc/
+	dosym "${baselibdir}/ROX-Lib2/Help" "/usr/share/doc/${P}"
+
+	0distutils ROX-Lib2/ROX-Lib2.xml > tmp.native_feed || die "0distutilss feed edit failed"
+	insinto "${baselibdir}/ROX-Lib2/"
+	newins tmp.native_feed ROX-Lib2.xml
+
+	local feedname
+	feedname=$(0distutils -e tmp.native_feed) || die "0distutils URI escape failed"
+	dosym "${baselibdir}/ROX-Lib2/ROX-Lib2.xml" "${NATIVE_FEED_DIR}/${feedname}"
+
+	local cachedname
+	cachedname=$(0distutils -c tmp.native_feed) || die "0distutils URI escape failed"
+	dosym "${baselibdir}/ROX-Lib2/.DirIcon" "${ICON_CACHE_DIR}/${cachedname}"
+}
+
+pkg_postinst() {
+	local baselibdir="/usr/$(get_libdir)"
+	python_mod_optimize "${baselibdir}/ROX-Lib2/"
+}
+
+pkg_postrm() {
+	local baselibdir="/usr/$(get_libdir)"
+	python_mod_cleanup "${baselibdir}/ROX-Lib2/"
+}