Fix old Kamaelia ebuild, version bump to 0.9.8.0.

5 files changed, 73 insertions, 10 deletions

diff --git a/dev-python/kamaelia/ChangeLog b/dev-python/kamaelia/ChangeLog
index a82562d..ffceff1 100644
--- a/dev-python/kamaelia/ChangeLog
+++ b/dev-python/kamaelia/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*kamaelia-0.9.8.0 (22 Nov 2009)
+
+  22 Nov 2009; Aaron Mavrinac <mavrinac@gmail.com> kamaelia-0.9.8.0.ebuild:
+  Version bump for testing release
+
 *kamaelia-0.6.0 (23 Mar 2009)
 
   23 Mar 2009; Aaron Mavrinac <mavrinac@gmail.com> kamaelia-0.6.0.ebuild:
diff --git a/dev-python/kamaelia/Manifest b/dev-python/kamaelia/Manifest
index 818bf62..cd8f238 100644
--- a/dev-python/kamaelia/Manifest
+++ b/dev-python/kamaelia/Manifest
@@ -1,4 +1,7 @@
+AUX kamaelia-0.6.0-prefix.patch 2252 RMD160 9f66e8cb2b8760996ec170de478e2b36d4975560 SHA1 ac40b5f7e0e27b5b5920e456095ed9866434f871 SHA256 b47deae528f82fbe778d6518f73e64a8583dbf05e27d9e08be61ae6f43db29c0
 DIST Kamaelia-0.6.0.tar.gz 2816822 RMD160 70b42083739e5420cdde5410fdc6389f7b8bf833 SHA1 879a82f5643f8eef77615ce382eb797075558af4 SHA256 1a7ccea204da87c162492582e77beac664688ed43bca4403c2a3e813e7280180
-EBUILD kamaelia-0.6.0.ebuild 582 RMD160 d9dec3b5040379d4eb2dffe87d26d8dd6070f22b SHA1 e0f02175004de6432d9e884fb96b07867350bf9d SHA256 c609615a96776f965594f15cdb805801453503d36efd34207ad18b0588c7eaf2
-MISC ChangeLog 242 RMD160 97df05ee7bb9c99f4f6ca28a42ee3056686afc90 SHA1 985b3d07934e718fb7c095f13ffd1740edd085d4 SHA256 b580254920cd3318ed0aa85a9450f445886842cc301774c0ca6f1473fedbaf0d
+DIST Kamaelia-0.9.8.0.tar.gz 4394753 RMD160 4d223095552f5f47a8c6852ee01331e4e6c7952c SHA1 ec4db4ec18c7e6b1f961c65e6f8b7bfc3fae08bd SHA256 006857ef1841471fd7bd109ab70561b38e3dbd3a11d3988af6d3a63cdf99c8db
+EBUILD kamaelia-0.6.0.ebuild 579 RMD160 bf9d0b0d04affa51ec26b46c47708984ea90256e SHA1 ff81ade32927fece01624fe92818c5928ce52dcb SHA256 4f28b3d2d157934e5fe17e4e3b6607841bb3b98e13c03864a1fcac516dc002eb
+EBUILD kamaelia-0.9.8.0.ebuild 488 RMD160 51d8508c3852c14b646520ba5532bf294321d1fc SHA1 747103ec427bc827012de3f6b2ba9798ae3ee699 SHA256 b4c9914388c5c8dd57cade6cd5b0fa5893963579e07a6abb9a9c9bd3dee02dc2
+MISC ChangeLog 387 RMD160 6a0075fbdf161d81ff43019ae2cea86bac6f1b16 SHA1 da1cc944b962e2d409c0b5c83439cc5dbe524d63 SHA256 f5b9647a7261d136ad086e2dc91582a751e6deed0f56db2546181fab6001e13d
 MISC metadata.xml 453 RMD160 0b637f109d37cd5fc8b797b1883a7c3a7240525f SHA1 aa3fa02f505e49603ad2e76aaf5fc353b50d0d13 SHA256 fde701bcab65346d21572ed05421d0c19276007b95f7afd0bf3b93e7494865cf
diff --git a/dev-python/kamaelia/files/kamaelia-0.6.0-prefix.patch b/dev-python/kamaelia/files/kamaelia-0.6.0-prefix.patch
new file mode 100644
index 0000000..5968ce9
--- /dev/null
+++ b/dev-python/kamaelia/files/kamaelia-0.6.0-prefix.patch
@@ -0,0 +1,36 @@
+diff -Naur Kamaelia-0.6.0.orig/Kamaelia/Visualisation/Axon/ExtraWindowFurniture.py Kamaelia-0.6.0/Kamaelia/Visualisation/Axon/ExtraWindowFurniture.py
+--- Kamaelia-0.6.0.orig/Kamaelia/Visualisation/Axon/ExtraWindowFurniture.py	2008-10-19 12:19:52.000000000 -0400
++++ Kamaelia-0.6.0/Kamaelia/Visualisation/Axon/ExtraWindowFurniture.py	2009-11-22 11:47:15.000000000 -0500
+@@ -81,7 +81,7 @@
+             self.logo = pygame.image.load("kamaelia_logo.png")
+         except pygame.error:
+             try:
+-                self.logo = pygame.image.load("/usr/local/share/kamaelia/kamaelia_logo.png")
++                self.logo = pygame.image.load("/usr/share/kamaelia/kamaelia_logo.png")
+             except pygame.error:
+                 pass # Give up for now. FIXME: Could do something new
+     
+diff -Naur Kamaelia-0.6.0.orig/Kamaelia/Visualisation/ER/ExtraWindowFurniture.py Kamaelia-0.6.0/Kamaelia/Visualisation/ER/ExtraWindowFurniture.py
+--- Kamaelia-0.6.0.orig/Kamaelia/Visualisation/ER/ExtraWindowFurniture.py	2008-10-19 12:19:52.000000000 -0400
++++ Kamaelia-0.6.0/Kamaelia/Visualisation/ER/ExtraWindowFurniture.py	2009-11-22 11:46:59.000000000 -0500
+@@ -79,7 +79,7 @@
+         try:
+             self.logo = pygame.image.load("kamaelia_logo.png")
+         except pygame.error:
+-            self.logo = pygame.image.load("/usr/local/share/kamaelia/kamaelia_logo.png")
++            self.logo = pygame.image.load("/usr/share/kamaelia/kamaelia_logo.png")
+         
+         biggest = max( self.logo.get_width(), self.logo.get_height() )
+         from pygame.transform import rotozoom
+diff -Naur Kamaelia-0.6.0.orig/setup.py Kamaelia-0.6.0/setup.py
+--- Kamaelia-0.6.0.orig/setup.py	2008-10-19 12:19:56.000000000 -0400
++++ Kamaelia-0.6.0/setup.py	2009-11-22 11:43:48.000000000 -0500
+@@ -84,7 +84,7 @@
+                   "Kamaelia.Visualisation.PhysicsGraph",
+                   "Kamaelia.XML", # LAST
+                   ""],
+-      data_files=[ ('/usr/local/share/kamaelia', ['App/kamaelia_logo.png']) ],
++      data_files=[ ('/usr/share/kamaelia', ['App/kamaelia_logo.png']) ],
+       long_description = """
+ Kamaelia is an open source project from BBC R&D. It makes prototyping
+ multimedia, network & broadcast aware systems simple. Kamaelia systems are
diff --git a/dev-python/kamaelia/kamaelia-0.6.0.ebuild b/dev-python/kamaelia/kamaelia-0.6.0.ebuild
index acfe143..ae2640b 100644
--- a/dev-python/kamaelia/kamaelia-0.6.0.ebuild
+++ b/dev-python/kamaelia/kamaelia-0.6.0.ebuild
@@ -4,7 +4,7 @@
 
 NEED_PYTHON=2.4
 
-inherit distutils
+inherit eutils distutils
 
 DESCRIPTION="Kamaelia is a Python library for concurrent programming."
 HOMEPAGE="http://www.kamaelia.org/Home"
@@ -15,18 +15,15 @@ SLOT="0"
 KEYWORDS="amd64 sparc x86"
 IUSE=""
 
+DEPEND="dev-python/setuptools"
 RDEPEND=""
-DEPEND="${RDEPEND}
-		dev-python/setuptools"
 
 S=${WORKDIR}/Kamaelia-${PV}
 
+PATCHES=( "${FILESDIR}/${P}-prefix.patch" )
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	rm -f ez_setup.py
-}
-
-src_install() {
-	distutils_src_install
+	epatch ${PATCHES}
 }
diff --git a/dev-python/kamaelia/kamaelia-0.9.8.0.ebuild b/dev-python/kamaelia/kamaelia-0.9.8.0.ebuild
new file mode 100644
index 0000000..ab1cd2d
--- /dev/null
+++ b/dev-python/kamaelia/kamaelia-0.9.8.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+NEED_PYTHON=2.4
+
+inherit distutils
+
+DESCRIPTION="Kamaelia is a Python library for concurrent programming."
+HOMEPAGE="http://www.kamaelia.org/Home"
+SRC_URI="http://www.kamaelia.org/release/MonthlyReleases/Kamaelia-${PV}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools"
+RDEPEND=""
+
+S=${WORKDIR}/Kamaelia-${PV}/Kamaelia
+