From 68404f4e9671b975526ad21efec1c8521b232d29 Mon Sep 17 00:00:00 2001 From: Jim Ramsay Date: Thu, 2 Oct 2008 16:17:56 +0000 Subject: Added patch which fixes #239136, and version cleanup (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64) --- rox-base/rox-lib/ChangeLog | 9 +++- rox-base/rox-lib/files/rox-lib-2.0.3-nosvg.patch | 18 ------- rox-base/rox-lib/files/rox-lib-nosvg.patch | 18 +++++++ rox-base/rox-lib/rox-lib-2.0.4.ebuild | 39 --------------- rox-base/rox-lib/rox-lib-2.0.5-r1.ebuild | 63 ++++++++++++++++++++++++ 5 files changed, 89 insertions(+), 58 deletions(-) delete mode 100644 rox-base/rox-lib/files/rox-lib-2.0.3-nosvg.patch create mode 100644 rox-base/rox-lib/files/rox-lib-nosvg.patch delete mode 100644 rox-base/rox-lib/rox-lib-2.0.4.ebuild create mode 100644 rox-base/rox-lib/rox-lib-2.0.5-r1.ebuild (limited to 'rox-base') 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 + -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 rox-lib-2.0.5.ebuild: alpha/sparc stable wrt #236057 diff --git a/rox-base/rox-lib/files/rox-lib-2.0.3-nosvg.patch b/rox-base/rox-lib/files/rox-lib-2.0.3-nosvg.patch deleted file mode 100644 index eff2aa325c40..000000000000 --- a/rox-base/rox-lib/files/rox-lib-2.0.3-nosvg.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: ROX-Lib2/python/rox/__init__.py -=================================================================== ---- ROX-Lib2/python/rox/__init__.py (revision 4953) -+++ ROX-Lib2/python/rox/__init__.py (working copy) -@@ -197,8 +197,11 @@ - try: - g.window_set_default_icon_list(g.gdk.pixbuf_new_from_file(_icon_path)) - except: -- # Older pygtk -- _window_icon = g.gdk.pixbuf_new_from_file(_icon_path) -+ try: -+ # Older pygtk -+ _window_icon = g.gdk.pixbuf_new_from_file(_icon_path) -+ except: -+ pass - del _icon_path - - class Window(g.Window): diff --git a/rox-base/rox-lib/files/rox-lib-nosvg.patch b/rox-base/rox-lib/files/rox-lib-nosvg.patch new file mode 100644 index 000000000000..eff2aa325c40 --- /dev/null +++ b/rox-base/rox-lib/files/rox-lib-nosvg.patch @@ -0,0 +1,18 @@ +Index: ROX-Lib2/python/rox/__init__.py +=================================================================== +--- ROX-Lib2/python/rox/__init__.py (revision 4953) ++++ ROX-Lib2/python/rox/__init__.py (working copy) +@@ -197,8 +197,11 @@ + try: + g.window_set_default_icon_list(g.gdk.pixbuf_new_from_file(_icon_path)) + except: +- # Older pygtk +- _window_icon = g.gdk.pixbuf_new_from_file(_icon_path) ++ try: ++ # Older pygtk ++ _window_icon = g.gdk.pixbuf_new_from_file(_icon_path) ++ except: ++ pass + del _icon_path + + class Window(g.Window): 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/" +} -- cgit v1.2.3-65-gdbad