summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-emulation/cbmbasic/Manifest2
-rw-r--r--app-emulation/evbu/Manifest6
-rw-r--r--app-emulation/evbu/evbu-0.6.ebuild43
-rw-r--r--app-emulation/evbu/files/evbu-0.6-pysimwx.patch781
-rw-r--r--app-emulation/evbu/files/evbu-0.6-wx.patch454
-rw-r--r--dev-embedded/as31/Manifest2
-rw-r--r--dev-python/bitarray/Manifest4
-rw-r--r--dev-python/bitarray/bitarray-0.3.5.ebuild20
-rw-r--r--dev-python/ctypes-opencv/Manifest6
-rw-r--r--dev-python/ctypes-opencv/ctypes-opencv-0.7.3.ebuild34
-rw-r--r--dev-python/ctypes-opencv/ctypes-opencv-0.8.0.ebuild34
-rw-r--r--dev-python/django-annoying/Manifest4
-rw-r--r--dev-python/django-annoying/django-annoying-0.7.4.ebuild20
-rw-r--r--dev-python/django-treebeard/Manifest3
-rw-r--r--dev-python/django-treebeard/django-treebeard-9999.ebuild25
-rw-r--r--dev-python/fuzzpy/Manifest2
-rw-r--r--dev-python/kamaelia/Manifest7
-rw-r--r--dev-python/kamaelia/files/kamaelia-0.6.0-prefix.patch36
-rw-r--r--dev-python/kamaelia/kamaelia-0.6.0.ebuild29
-rw-r--r--dev-python/kamaelia/kamaelia-0.9.8.0.ebuild22
-rw-r--r--dev-python/multitask/Manifest4
-rw-r--r--dev-python/multitask/multitask-0.2.0.ebuild27
-rw-r--r--dev-python/polygon/Manifest3
-rw-r--r--dev-python/polygon/polygon-2.0.4.ebuild (renamed from dev-python/polygon/polygon-2.0.3.ebuild)11
-rw-r--r--dev-python/progressbar/Manifest2
-rw-r--r--dev-python/ptt/Manifest4
-rw-r--r--dev-python/ptt/ptt-1.2.ebuild27
-rw-r--r--dev-python/pycha/Manifest4
-rw-r--r--dev-python/pycha/pycha-0.5.3.ebuild21
-rw-r--r--dev-python/pyevolve/Manifest2
-rw-r--r--dev-python/pyevolve/pyevolve-0.6_rc1.ebuild24
-rw-r--r--dev-python/python-graph/Manifest1
-rw-r--r--dev-python/python-graph/python-graph-1.8.0.ebuild31
-rw-r--r--dev-python/south/Manifest4
-rw-r--r--dev-python/south/south-0.6.2.ebuild23
-rw-r--r--dev-python/visual/Manifest2
-rw-r--r--media-libs/opencv/Manifest9
-rw-r--r--media-libs/opencv/files/opencv-1.1.0_pre1-libtool.patch11
-rw-r--r--media-libs/opencv/files/opencv-1.1.0_pre1-link.patch26
-rw-r--r--media-libs/opencv/files/opencv-1.1.0_pre1-stereorectify.patch40
-rw-r--r--media-libs/opencv/files/opencv-2.0.0-multilib.patch120
-rw-r--r--media-libs/opencv/opencv-1.1.0_pre1.ebuild80
-rw-r--r--media-libs/opencv/opencv-9999.ebuild52
-rw-r--r--media-sound/pykaraoke/Manifest2
-rw-r--r--media-tv/entertainer/Manifest2
-rw-r--r--net-misc/bti/Manifest2
-rw-r--r--net-p2p/retroshare/Manifest2
-rw-r--r--sci-libs/gandalf/Manifest2
-rw-r--r--sci-libs/pydsscc/Manifest9
-rw-r--r--sci-libs/pydsscc/pydsscc-0.2.0.ebuild24
-rw-r--r--sci-libs/pydsscc/pydsscc-0.3.1.ebuild33
-rw-r--r--sci-libs/pydsscc/pydsscc-0.3.2.ebuild33
-rw-r--r--sci-libs/pydsscc/pydsscc-9999.ebuild36
-rw-r--r--sci-misc/swarm/Manifest2
-rw-r--r--www-plugins/google-talkplugin/Manifest1
-rw-r--r--x11-misc/tinybat/Manifest2
56 files changed, 13 insertions, 2199 deletions
diff --git a/app-emulation/cbmbasic/Manifest b/app-emulation/cbmbasic/Manifest
index c245ec9..660ca6b 100644
--- a/app-emulation/cbmbasic/Manifest
+++ b/app-emulation/cbmbasic/Manifest
@@ -1,4 +1,2 @@
DIST cbmbasic.zip 387558 RMD160 34dc488631cf171d9953f3ae767c047d3f861f66 SHA1 2872133be235e48ed512cd619e6c2034350ef86a SHA256 cd0362a14c5f806404c67bac73f133e8845aa878ac4ea6ea91d340e50063396b
EBUILD cbmbasic-0.ebuild 485 RMD160 4fc4bc0478aa9376083b03df322e2b46fd7ac5a3 SHA1 862821d3a1bd79c26cf29f6d9f183c8a92270f30 SHA256 89aae9047fe175ddd023360b49ec97759bfa52c992dd28ff60712211795309b6
-MISC ChangeLog 238 RMD160 ac557bdffc3f297ec666ad8cddc726a49a9e8386 SHA1 f83d2479080b746374fb4f46dfba1bbfd61fa363 SHA256 79dd317fb5deda14b95b57f31df379bea8d939312e4e2acd7dd0920490cf8e35
-MISC metadata.xml 497 RMD160 533a6a2324d45aecbd7e060fcd51a3991a93dbb3 SHA1 fc92aa86419740b4198509d17e279b3d17917061 SHA256 68260c59577a93b47efc89272349754544c2c2ec00ba5b2f0d105c7f41007e5d
diff --git a/app-emulation/evbu/Manifest b/app-emulation/evbu/Manifest
deleted file mode 100644
index 3b42905..0000000
--- a/app-emulation/evbu/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX evbu-0.6-pysimwx.patch 31557 RMD160 cf90ad8dabcbfc378f7a0f8eba57357594858b1b SHA1 c5c110e5d771953054f7ed572723212d1f496f1f SHA256 2afb3cff25af0e5dd7181c0df2df1a886d514d3b9e3e23c23d764d2e7f8f0ccc
-AUX evbu-0.6-wx.patch 16428 RMD160 5ad7a5c5964b7e878caf981b5eec8f2942b6d0c7 SHA1 af42ae5517bd5a3dc6f5fdbf550f86747322d136 SHA256 27bbf1baaf2f74672e12aece73c02669f6e0bd3675cc2e69b9274c779e07b2ef
-DIST evbu-0.6.tar.gz 109457 RMD160 701118bccba6ef07e5abff61cc81b226a8bc2e8c SHA1 1a985312482a6fb3cc8fb4875cb6fcb962c07638 SHA256 f15d4bca9ffd898a8c5379340dc124ec198fdb2eb23431d7f83b525e32a08e19
-EBUILD evbu-0.6.ebuild 946 RMD160 bdda2fb1c003095a0b6c2a8f6541e550f5fad070 SHA1 d94b41d00eeaace898bd2e8bef5c59264611f97d SHA256 f73a23b27cad199dcc7982a0c0293e1e8d2d6adef62e60f39313c0464a954d47
-MISC ChangeLog 230 RMD160 ddac491d29fd032839097df172a40388e6d5e332 SHA1 15e1a9af3bc71bd29c5901150e5e0085ac6e5550 SHA256 41dd1ac6514b2742d944f07edff23fb671346ff5a9386b4a62db29c1742e7938
-MISC metadata.xml 489 RMD160 23a9073ff6ef4f00d526465b8d99beb3aee44237 SHA1 57d08c04ce7d4a6c370786607c05d663fb60ad53 SHA256 4c774fa9c98f039377c246df67ff462d1875f3b3392d06a6982efd364b028752
diff --git a/app-emulation/evbu/evbu-0.6.ebuild b/app-emulation/evbu/evbu-0.6.ebuild
deleted file mode 100644
index 0031b6c..0000000
--- a/app-emulation/evbu/evbu-0.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.1
-
-inherit distutils python
-
-DESCRIPTION="EVBU simulates the execution of a 68HC11 microcontroller."
-HOMEPAGE="http://claymore.engineer.gvsu.edu/~steriana/Python/"
-SRC_URI="http://claymore.engineer.gvsu.edu/%7Esteriana/courses/Downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/python
- dev-python/setuptools"
-RDEPEND="virtual/python
- >=dev-python/wxpython-2.3.2"
-
-DOCS="COPYING README"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-wx.patch
- epatch "${FILESDIR}"/${P}-pysimwx.patch
- sed '$d' < misc/evbu > misc/evbu-new
- mv misc/evbu-new misc/evbu
- echo python $(python_get_sitedir)/${PN}/${PN}.py \$\* >> misc/evbu
-}
-
-src_install() {
- distutils_src_install
- dobin misc/evbu
- dohtml doc/*
-}
-
-pkg_postrm() {
- python_mod_cleanup
-}
diff --git a/app-emulation/evbu/files/evbu-0.6-pysimwx.patch b/app-emulation/evbu/files/evbu-0.6-pysimwx.patch
deleted file mode 100644
index bc5af57..0000000
--- a/app-emulation/evbu/files/evbu-0.6-pysimwx.patch
+++ /dev/null
@@ -1,781 +0,0 @@
-diff -Naur PySim11/kcmmemory.py PySim11.new/kcmmemory.py
---- PySim11/kcmmemory.py 2004-07-25 11:41:25.000000000 -0400
-+++ PySim11.new/kcmmemory.py 2008-10-09 12:14:42.000000000 -0400
-@@ -3,7 +3,7 @@
- #
- # Source file is kcmmemory.png from KDE icons
-
--from wxPython.wx import wxBitmapFromXPMData, wxImageFromBitmap
-+from wx import BitmapFromXPMData, ImageFromBitmap
- import cPickle
-
-
-@@ -30,8 +30,8 @@
- a." )
-
- def getkcmmemoryBitmap():
-- return wxBitmapFromXPMData(getkcmmemoryData())
-+ return BitmapFromXPMData(getkcmmemoryData())
-
- def getkcmmemoryImage():
-- return wxImageFromBitmap(getkcmmemoryBitmap())
-+ return ImageFromBitmap(getkcmmemoryBitmap())
-
-diff -Naur PySim11/lacursors.py PySim11.new/lacursors.py
---- PySim11/lacursors.py 2004-07-25 11:41:25.000000000 -0400
-+++ PySim11.new/lacursors.py 2008-10-09 12:18:53.000000000 -0400
-@@ -3,14 +3,14 @@
- """
-
- ## import all of the wxPython GUI package
--from wxPython.wx import *
-+from wx import *
-
- import types
- import sys
-
--class LACursors(wxWindow):
-+class LACursors(Window):
- def __init__(self, parent, id, orig, size):
-- wxWindow.__init__(self, parent, id, orig, size)
-+ Window.__init__(self, parent, id, orig, size)
- self.parent = parent
-
- EVT_PAINT(self, self.OnPaint)
-@@ -20,8 +20,8 @@
-
- self.startTime = 0L
- self.division = 100000L # 100ns/div
-- self.lineColor1 = wxRED
-- self.lineColor2 = wxCYAN
-+ self.lineColor1 = RED
-+ self.lineColor2 = CYAN
- self.lineWidth = 1
- self.tickSpacing = 50 # pixels/division
-
-@@ -66,7 +66,7 @@
- self.Refresh()
-
- def OnPaint(self, event):
-- dc = wxPaintDC(self)
-+ dc = PaintDC(self)
- (w, h) = self.GetClientSizeTuple()
- (decorationDX,decorationDY) = self.parent.GetWaveformBorderSizes()
-
-@@ -75,7 +75,7 @@
- # pixels/tick so we compute...
- dX = float(self.tickSpacing) / self.division
-
-- dc.SetBackground(wxBrush(self.parent.GetBackgroundColour(), wxSOLID))
-+ dc.SetBackground(Brush(self.parent.GetBackgroundColour(), SOLID))
- dc.Clear()
-
- if self.pos1 is None:
-@@ -83,24 +83,24 @@
- else:
- x = int((self.pos1 - self.startTime)*dX + decorationDX)
- if 0 <= x <= w:
-- dc.SetPen(wxPen(self.lineColor1, self.lineWidth, wxSOLID))
-+ dc.SetPen(Pen(self.lineColor1, self.lineWidth, SOLID))
- if self.active==1:
-- dc.SetBrush(wxBrush(self.lineColor1, wxSOLID))
-+ dc.SetBrush(Brush(self.lineColor1, SOLID))
- else:
-- dc.SetBrush(wxBrush(self.lineColor1, wxTRANSPARENT))
-- dc.DrawPolygon([wxPoint(0,h), wxPoint(-4,h-4), wxPoint(-4,0), wxPoint(4,0), wxPoint(4,h-4)], xoffset=x)
-+ dc.SetBrush(Brush(self.lineColor1, TRANSPARENT))
-+ dc.DrawPolygon([Point(0,h), Point(-4,h-4), Point(-4,0), Point(4,0), Point(4,h-4)], xoffset=x)
-
- if self.pos2 is None:
- pass
- else:
- x = int((self.pos2 - self.startTime)*dX + decorationDX)
- if 0 <= x <= w:
-- dc.SetPen(wxPen(self.lineColor2, self.lineWidth, wxSOLID))
-+ dc.SetPen(Pen(self.lineColor2, self.lineWidth, SOLID))
- if self.active==2:
-- dc.SetBrush(wxBrush(self.lineColor2, wxSOLID))
-+ dc.SetBrush(Brush(self.lineColor2, SOLID))
- else:
-- dc.SetBrush(wxBrush(self.lineColor2, wxTRANSPARENT))
-- dc.DrawPolygon([wxPoint(0,h), wxPoint(-4,h-4), wxPoint(-4,0), wxPoint(4,0), wxPoint(4,h-4)], xoffset=x)
-+ dc.SetBrush(Brush(self.lineColor2, TRANSPARENT))
-+ dc.DrawPolygon([Point(0,h), Point(-4,h-4), Point(-4,0), Point(4,0), Point(4,h-4)], xoffset=x)
-
- def GetC1Pos(self):
- if not (self.pos1 is None):
-diff -Naur PySim11/ladata.py PySim11.new/ladata.py
---- PySim11/ladata.py 2004-07-25 11:41:25.000000000 -0400
-+++ PySim11.new/ladata.py 2008-10-09 12:20:32.000000000 -0400
-@@ -2,7 +2,7 @@
- import re
-
- ## import all of the wxPython GUI package
--from wxPython.wx import *
-+from wx import *
-
- #---------------------------------------------------------------------------
-
-@@ -63,9 +63,9 @@
- # seem to work.
- return hasattr(w, 'Blue')
-
--class LAData(wxWindow):
-+class LAData(Window):
- def __init__(self, parent, id, orig, size):
-- wxWindow.__init__(self, parent, id, orig, size, wxSUNKEN_BORDER)
-+ Window.__init__(self, parent, id, orig, size, SUNKEN_BORDER)
-
- EVT_PAINT(self, self.OnPaint)
- EVT_SIZE(self, self.OnSize)
-@@ -74,11 +74,11 @@
-
- self.startTime = 0L
- self.division = 100000L # 100ns/div
-- self.lineColor = wxWHITE
-+ self.lineColor = WHITE
- self.lineWidth = 2
-- self.backgroundColor = wxBLACK
-+ self.backgroundColor = BLACK
- self.tickSpacing = 50 # pixels/division
-- self.tickColor = wxTheColourDatabase.FindColour("YELLOW")
-+ self.tickColor = TheColourDatabase.FindColour("YELLOW")
-
- self.cursor1 = self.cursor2 = None
-
-@@ -195,13 +195,13 @@
- t = T1
- T1 = T2
- T2 = t
-- self.Refresh(1, wxRect(T1, 0, T2-T1+1, h))
-+ self.Refresh(1, Rect(T1, 0, T2-T1+1, h))
- elif not (self.cursor1 is None):
- T1 = int((self.cursor1 - self.startTime)*self.dX)
-- self.Refresh(1, wxRect(T1-2, 0, 5, h))
-+ self.Refresh(1, Rect(T1-2, 0, 5, h))
- elif not (oldpos is None):
- T1 = int((oldpos - self.startTime)*self.dX)
-- self.Refresh(1, wxRect(T1-2, 0, 5, h))
-+ self.Refresh(1, Rect(T1-2, 0, 5, h))
- else:
- self.Refresh()
-
-@@ -217,23 +217,23 @@
- t = T1
- T1 = T2
- T2 = t
-- self.Refresh(1, wxRect(T1, 0, T2-T1+1, h))
-+ self.Refresh(1, Rect(T1, 0, T2-T1+1, h))
- elif not (self.cursor2 is None):
- T1 = int((self.cursor2 - self.startTime)*self.dX)
-- self.Refresh(1, wxRect(T1-2, 0, 5, h))
-+ self.Refresh(1, Rect(T1-2, 0, 5, h))
- elif not (oldpos is None):
- T1 = int((oldpos - self.startTime)*self.dX)
-- self.Refresh(1, wxRect(T1-2, 0, 5, h))
-+ self.Refresh(1, Rect(T1-2, 0, 5, h))
- else:
- self.Refresh()
-
- def OnPaint(self, event):
-- dc = wxPaintDC(self)
-+ dc = PaintDC(self)
- (w, h) = self.GetClientSizeTuple()
- YVal = [h-4, 4] # Mapping from (0,1) to pixel positions
-
-- dc.SetPen(wxPen(self.lineColor, self.lineWidth, wxSOLID))
-- dc.SetBackground(wxBrush(self.backgroundColor, wxSOLID))
-+ dc.SetPen(Pen(self.lineColor, self.lineWidth, SOLID))
-+ dc.SetBackground(Brush(self.backgroundColor, SOLID))
-
- region = self.GetUpdateRegion()
- dc.SetClippingRegionAsRegion(region)
-@@ -279,7 +279,7 @@
- if firstTime < self.startTime:
- firstTime = firstTime + self.division
-
-- dc.SetPen(wxPen(self.tickColor, 1, wxSOLID))
-+ dc.SetPen(Pen(self.tickColor, 1, SOLID))
- if self.events:
- while 1:
- T = int((firstTime - self.startTime)*self.dX)
-@@ -291,11 +291,11 @@
- # Draw cursors
- if not (self.cursor1 is None):
- T = int((self.cursor1 - self.startTime)*self.dX)
-- dc.SetPen(wxRED_PEN)
-+ dc.SetPen(RED_PEN)
- dc.DrawLine(T, 0, T, h)
- if not (self.cursor2 is None):
- T = int((self.cursor2 - self.startTime)*self.dX)
-- dc.SetPen(wxPen(wxCYAN, 1, wxSOLID))
-+ dc.SetPen(Pen(CYAN, 1, SOLID))
- dc.DrawLine(T, 0, T, h)
-
- def Clear(self):
-@@ -332,13 +332,13 @@
- try:
- fid = open(filename, 'r')
- except IOError, detail:
-- wxMessageBox('%s: "%s"' % (detail.strerror, detail.filename), "You lose", wxOK|wxCENTRE)
-+ MessageBox('%s: "%s"' % (detail.strerror, detail.filename), "You lose", OK|CENTRE)
- return 0
-
- try:
- lines = fid.readlines()
- except IOError, detail:
-- wxMessageBox('%s: "%s"' % (detail.strerror, filename), "You lose", wxOK|wxCENTRE)
-+ MessageBox('%s: "%s"' % (detail.strerror, filename), "You lose", OK|CENTRE)
- return 0
-
- fid.close()
-@@ -354,7 +354,7 @@
- match = pat_c.match(line)
- if match is None:
- if comment_c.match(line) is None:
-- wxMessageBox('Error at "%s" line %d\nLine is not in the format\n"CYCLE ZeroOrOne"' % (filename, linenum), "Bad file format", wxOK|wxCENTRE)
-+ MessageBox('Error at "%s" line %d\nLine is not in the format\n"CYCLE ZeroOrOne"' % (filename, linenum), "Bad file format", OK|CENTRE)
- return 0
- else:
- continue
-@@ -364,7 +364,7 @@
-
- if events:
- if cycle <= events[-1][0]:
-- wxMessageBox('Error at "%s" line %d\nCycle time not in ascending order' % (filename, linenum), "Bad file format", wxOK|wxCENTRE)
-+ MessageBox('Error at "%s" line %d\nCycle time not in ascending order' % (filename, linenum), "Bad file format", OK|CENTRE)
- return 0
-
- if val != events[-1][1]:
-diff -Naur PySim11/laframe.py PySim11.new/laframe.py
---- PySim11/laframe.py 2004-07-25 11:41:25.000000000 -0400
-+++ PySim11.new/laframe.py 2008-10-09 12:21:09.000000000 -0400
-@@ -2,30 +2,30 @@
- This module is the top-level frame for the logic analyzer window
- """
-
--from wxPython.wx import *
-+from wx import *
- from lapanel import LAPanel
-
- from kcmmemory import getkcmmemoryData
-
- ## Create a new frame class, derived from the wxPython Frame.
--class LAFrame(wxFrame):
-+class LAFrame(Frame):
-
- def __init__(self, parent, id, title):
- # First, call the base class' __init__ method to create the frame
-- wxFrame.__init__(self, parent, id, title, wxPoint(-1, -1), wxSize(835, 320), wxDEFAULT_FRAME_STYLE)
-+ Frame.__init__(self, parent, id, title, Point(-1, -1), Size(835, 320), DEFAULT_FRAME_STYLE)
-
- EVT_CLOSE(self, self.OnCloseWindow)
-
- # Add the LA panel
-- self.la = LAPanel(self, -1, wxPoint(10,10), wxSize(660,300), wxTAB_TRAVERSAL)
-+ self.la = LAPanel(self, -1, Point(10,10), Size(660,300), TAB_TRAVERSAL)
-
-- self.statusBar = wxStatusBar(self, -1)
-+ self.statusBar = StatusBar(self, -1)
- self.statusBar.SetFieldsCount(1)
- self.statusBar.SetStatusWidths([-1])
- self.statusBar.SetStatusText("", 0)
- self.SetStatusBar(self.statusBar)
-
-- icon = wxIconFromXPMData(getkcmmemoryData())
-+ icon = IconFromXPMData(getkcmmemoryData())
- self.SetIcon(icon)
-
- # This method is called automatically when the CLOSE event is
-@@ -34,10 +34,10 @@
- if hasattr(self,'testonly'):
- self.Destroy()
- else:
-- wxMessageBox("Do not close this window while EVBU is running.", "Bad user!", wxOK|wxCENTRE)
-+ MessageBox("Do not close this window while EVBU is running.", "Bad user!", OK|CENTRE)
-
- if __name__=="__main__":
-- app = wxPySimpleApp()
-+ app = PySimpleApp()
- f = LAFrame(None, -1, "Stuff")
- f.Show(1)
- f.testonly = 1
-diff -Naur PySim11/lalabel.py PySim11.new/lalabel.py
---- PySim11/lalabel.py 2004-07-25 11:41:25.000000000 -0400
-+++ PySim11.new/lalabel.py 2008-10-09 12:21:43.000000000 -0400
-@@ -3,7 +3,7 @@
- """
-
- ## import all of the wxPython GUI package
--from wxPython.wx import *
-+from wx import *
-
- import types
-
-@@ -20,18 +20,18 @@
- # seem to work.
- return hasattr(w, 'Blue')
-
--class LALabel(wxWindow):
-+class LALabel(Window):
- def __init__(self, parent, id, orig, size):
-- wxWindow.__init__(self, parent, id, orig, size, wxSUNKEN_BORDER)
-+ Window.__init__(self, parent, id, orig, size, SUNKEN_BORDER)
-
- EVT_PAINT(self, self.OnPaint)
- EVT_SIZE(self, self.OnSize)
- EVT_RIGHT_DOWN(self, self.OnRightClick)
- EVT_LEFT_DCLICK(self, self.OnLeftDoubleClick)
-
-- self.textColor = wxWHITE
-+ self.textColor = WHITE
- self.textWidth = 2
-- self.backgroundColor = wxTheColourDatabase.FindColour("DIM GREY")
-+ self.backgroundColor = TheColourDatabase.FindColour("DIM GREY")
-
- self.parent = parent
- self.label = ""
-@@ -75,11 +75,11 @@
- self.Refresh()
-
- def OnPaint(self, event):
-- dc = wxPaintDC(self)
-+ dc = PaintDC(self)
- (W, H) = self.GetClientSizeTuple()
-
-- bg = wxBrush(self.backgroundColor, wxSOLID)
-- dc.SetFont(wxFont(14, wxSWISS, wxNORMAL, wxBOLD))
-+ bg = Brush(self.backgroundColor, SOLID)
-+ dc.SetFont(Font(14, SWISS, NORMAL, BOLD))
- dc.SetTextForeground(self.textColor)
- dc.SetTextBackground(self.backgroundColor)
- dc.SetBackground(bg)
-diff -Naur PySim11/lapanel.py PySim11.new/lapanel.py
---- PySim11/lapanel.py 2004-07-25 11:41:25.000000000 -0400
-+++ PySim11.new/lapanel.py 2008-10-09 12:24:08.000000000 -0400
-@@ -3,7 +3,7 @@
- """
-
- ## import all of the wxPython GUI package
--from wxPython.wx import *
-+from wx import *
-
- import operator
- import types
-@@ -30,18 +30,18 @@
-
- # Colors for successive traces
- _LA_DATA_COLORS = [
-- wxWHITE, wxRED, wxBLUE, wxGREEN, wxCYAN,
-- wxTheColourDatabase.FindColour("YELLOW"),
-- wxTheColourDatabase.FindColour("MAGENTA"),
-- wxTheColourDatabase.FindColour("PINK")
-+ WHITE, RED, BLUE, GREEN, CYAN,
-+ TheColourDatabase.FindColour("YELLOW"),
-+ TheColourDatabase.FindColour("MAGENTA"),
-+ TheColourDatabase.FindColour("PINK")
- ]
- _LA_LAST_COLOR = -1
-
- # Background color definitions for input waveforms and output waveforms
--_LA_INDATA_COLOR = wxTheColourDatabase.FindColour("DIM GRAY")
--_LA_OUTDATA_COLOR = wxBLACK
-+_LA_INDATA_COLOR = TheColourDatabase.FindColour("DIM GRAY")
-+_LA_OUTDATA_COLOR = BLACK
-
--class LAPanel(wxPanel):
-+class LAPanel(Panel):
- # Future support for time units?
- Cycles = 1
- Ms = 2
-@@ -49,11 +49,11 @@
- Ns = 4
-
- def __init__(self, parent, id, orig, size, attr):
-- wxPanel.__init__(self, parent, id, orig, size, attr)
-+ Panel.__init__(self, parent, id, orig, size, attr)
- self.parent = parent
-
- (w,h) = self.GetClientSize()
-- self.cursors = LACursors(self, -1, wxPoint(5+100+5, _LA_TOP_Y-10), wxSize(w-5-100-5-5, 10))
-+ self.cursors = LACursors(self, -1, Point(5+100+5, _LA_TOP_Y-10), Size(w-5-100-5-5, 10))
- self.isSimulating = 0
-
- # The PySim11 thread calls our functions to post window update
-@@ -105,12 +105,12 @@
- # "right" way just yet.
-
- # Start time text control
-- wxStaticBox(self, -1, "Start Time", wxPoint(5, 10), wxSize(176,40))
-- self.startTimeText = wxTextCtrl(self, 100, "0", wxPoint(10, 25), wxSize(68,20), wxTE_PROCESS_ENTER)
-- self.startTimeUnits = wxStaticText(self, -1, "cyc", wxPoint(80, 28), wxSize(25,20))
-- self.startTimePDivButton = wxButton(self, 111, "+div", wxPoint(105, 19), wxSize(37,15))
-- self.startTimeMDivButton = wxButton(self, 112, "-div", wxPoint(140, 19), wxSize(37,15))
-- self.startTimeZeroButton = wxButton(self, 101, "zero", wxPoint(105, 33), wxSize(72,15))
-+ StaticBox(self, -1, "Start Time", Point(5, 10), Size(176,40))
-+ self.startTimeText = TextCtrl(self, 100, "0", Point(10, 25), Size(68,20), TE_PROCESS_ENTER)
-+ self.startTimeUnits = StaticText(self, -1, "cyc", Point(80, 28), Size(25,20))
-+ self.startTimePDivButton = Button(self, 111, "+div", Point(105, 19), Size(37,15))
-+ self.startTimeMDivButton = Button(self, 112, "-div", Point(140, 19), Size(37,15))
-+ self.startTimeZeroButton = Button(self, 101, "zero", Point(105, 33), Size(72,15))
-
- EVT_TEXT_ENTER(self, 100, self.OnStartTimeChange)
- EVT_BUTTON(self, 101, self.OnZeroStartTime)
-@@ -118,18 +118,18 @@
- EVT_BUTTON(self, 112, self.OnMDiv)
-
- # Division text control
-- wxStaticBox(self, -1, "Scale", wxPoint(186, 10), wxSize(134,40))
-- self.divisionText = wxTextCtrl(self, 102, "100", wxPoint(191,25), wxSize(68,20), wxTE_PROCESS_ENTER)
-- self.divisionUnits = wxStaticText(self, -1, "cyc/div", wxPoint(262,28), wxSize(50,20))
-+ StaticBox(self, -1, "Scale", Point(186, 10), Size(134,40))
-+ self.divisionText = TextCtrl(self, 102, "100", Point(191,25), Size(68,20), TE_PROCESS_ENTER)
-+ self.divisionUnits = StaticText(self, -1, "cyc/div", Point(262,28), Size(50,20))
-
- EVT_TEXT_ENTER(self, 102, self.OnDivisionChange)
-
- # Zoom buttons
-- wxStaticBox(self, -1, "Zoom", wxPoint(325, 10), wxSize(165,40))
-- self.zoomInButton = wxButton(self, 103, "In", wxPoint(380, 19), wxSize(50,15))
-- self.zoomOutButton = wxButton(self, 104, "Out", wxPoint(380, 33), wxSize(50,15))
-- self.zoomAllButton = wxButton(self, 105, "All", wxPoint(435, 19), wxSize(50,15))
-- self.zoomMaxButton = wxButton(self, 106, "Max", wxPoint(435, 33), wxSize(50,15))
-+ StaticBox(self, -1, "Zoom", Point(325, 10), Size(165,40))
-+ self.zoomInButton = Button(self, 103, "In", Point(380, 19), Size(50,15))
-+ self.zoomOutButton = Button(self, 104, "Out", Point(380, 33), Size(50,15))
-+ self.zoomAllButton = Button(self, 105, "All", Point(435, 19), Size(50,15))
-+ self.zoomMaxButton = Button(self, 106, "Max", Point(435, 33), Size(50,15))
-
- EVT_BUTTON(self, 103, self.OnZoomIn)
- EVT_BUTTON(self, 104, self.OnZoomOut)
-@@ -139,13 +139,13 @@
- ##############
- # Cursors
- ##############
-- wxStaticBox(self, -1, "Cursors", wxPoint(495, 10), wxSize(325,40))
-- wxStaticText(self, -1, "C1", wxPoint(500, 30), wxSize(20, 15))
-- self.c1TimeText = wxTextCtrl(self, 113, "0", wxPoint(520, 26), wxSize(70, 20), wxTE_PROCESS_ENTER)
-- wxStaticText(self, -1, "C2", wxPoint(600, 30), wxSize(20, 15))
-- self.c2TimeText = wxTextCtrl(self, 114, "0", wxPoint(620, 26), wxSize(70, 20), wxTE_PROCESS_ENTER)
-- wxStaticText(self, -1, "C2-C1", wxPoint(700, 30), wxSize(45, 15))
-- self.deltaCTimeText = wxTextCtrl(self, 115, "0", wxPoint(745, 26), wxSize(70, 20), wxTE_READONLY)
-+ StaticBox(self, -1, "Cursors", Point(495, 10), Size(325,40))
-+ StaticText(self, -1, "C1", Point(500, 30), Size(20, 15))
-+ self.c1TimeText = TextCtrl(self, 113, "0", Point(520, 26), Size(70, 20), TE_PROCESS_ENTER)
-+ StaticText(self, -1, "C2", Point(600, 30), Size(20, 15))
-+ self.c2TimeText = TextCtrl(self, 114, "0", Point(620, 26), Size(70, 20), TE_PROCESS_ENTER)
-+ StaticText(self, -1, "C2-C1", Point(700, 30), Size(45, 15))
-+ self.deltaCTimeText = TextCtrl(self, 115, "0", Point(745, 26), Size(70, 20), TE_READONLY)
-
- EVT_TEXT_ENTER(self, 113, self.OnTextC1)
- EVT_TEXT_ENTER(self, 114, self.OnTextC2)
-@@ -172,14 +172,14 @@
- # bar for our parent, an LAFrame. Now why is this? Why doesn't this code
- # migrate up to laframe.py?
- ######
-- parent.menubar = wxMenuBar()
-+ parent.menubar = MenuBar()
-
-- waveformMenu = wxMenu()
-+ waveformMenu = Menu()
- waveformMenu.Append(401, "&Add waveform...\tCtrl-A", "Add a waveform")
- parent.menubar.Append(waveformMenu, "&Waveform")
- self.waveformMenu = waveformMenu
-
-- viewMenu = wxMenu()
-+ viewMenu = Menu()
- viewMenu.Append(201, "&Zero\tCtrl-Z", "Set start time to 0")
- viewMenu.Append(211, "&+Div", "Increase start time by one division (also Shift-Right)")
- viewMenu.Append(212, "&-Div", "Decrease start time by one division (also Shift-Left)")
-@@ -206,17 +206,17 @@
- EVT_MENU(parent, 207, self.OnCursor1)
- EVT_MENU(parent, 208, self.OnCursor2)
-
-- accel = wxAcceleratorTable([ \
-- (wxACCEL_CTRL, ord('a'), 401), \
-- (wxACCEL_CTRL, ord('z'), 201), \
-- (wxACCEL_NORMAL, WXK_PRIOR, 203), \
-- (wxACCEL_NORMAL, WXK_NEXT, 204), \
-- (wxACCEL_CTRL, WXK_PRIOR, 206), \
-- (wxACCEL_CTRL, WXK_NEXT, 205), \
-- (wxACCEL_CTRL, ord('1'), 207), \
-- (wxACCEL_CTRL, ord('2'), 208), \
-- (wxACCEL_SHIFT, WXK_RIGHT, 211), \
-- (wxACCEL_SHIFT, WXK_LEFT, 212)])
-+ accel = AcceleratorTable([ \
-+ (ACCEL_CTRL, ord('a'), 401), \
-+ (ACCEL_CTRL, ord('z'), 201), \
-+ (ACCEL_NORMAL, WXK_PRIOR, 203), \
-+ (ACCEL_NORMAL, WXK_NEXT, 204), \
-+ (ACCEL_CTRL, WXK_PRIOR, 206), \
-+ (ACCEL_CTRL, WXK_NEXT, 205), \
-+ (ACCEL_CTRL, ord('1'), 207), \
-+ (ACCEL_CTRL, ord('2'), 208), \
-+ (ACCEL_SHIFT, WXK_RIGHT, 211), \
-+ (ACCEL_SHIFT, WXK_LEFT, 212)])
- parent.SetAcceleratorTable(accel)
-
- def OnPDiv(self, event):
-@@ -264,7 +264,7 @@
- if newSpacing != self.tickSpacing:
- self.SetTickSpacing(newSpacing)
- else:
-- wxMessageBox("Minimum zoom reached. Increase the scale to see more of the waveform.", "Whoa, there", wxOK|wxCENTRE)
-+ MessageBox("Minimum zoom reached. Increase the scale to see more of the waveform.", "Whoa, there", OK|CENTRE)
-
- def OnZoomIn(self, event):
- newSpacing = self.tickSpacing*5/4
-@@ -372,8 +372,8 @@
- if w >= 100:
- for wave in self.waveforms:
- (oldw, h) = wave.GetSize()
-- wave.SetSize(wxSize(w,h))
-- self.cursors.SetSize(wxSize(w-5-100, 10))
-+ wave.SetSize(Size(w,h))
-+ self.cursors.SetSize(Size(w-5-100, 10))
-
- def OnZeroStartTime(self, event):
- self.startTimeText.SetValue("0")
-@@ -405,7 +405,7 @@
- if self.isSimulating:
- return
-
-- m = wxMenu()
-+ m = Menu()
- (x,y) = event.GetPosition()
-
- m.Append(401, "Add waveform...")
-@@ -489,7 +489,7 @@
- x = self.clickxy[0]
- nextedge = self.clickwaveform.FindNextEdgeFromX(x)
- if nextedge is None:
-- wxMessageBox("No waveform edges exist past this point", "Outta luck", wxOK|wxCENTRE)
-+ MessageBox("No waveform edges exist past this point", "Outta luck", OK|CENTRE)
- return
-
- self.cursors.SetC1PosCycles(nextedge)
-@@ -501,7 +501,7 @@
- x = self.clickxy[0]
- nextedge = self.clickwaveform.FindNextEdgeFromX(x)
- if nextedge is None:
-- wxMessageBox("No waveform edges exist past this point", "Outta luck", wxOK|wxCENTRE)
-+ MessageBox("No waveform edges exist past this point", "Outta luck", OK|CENTRE)
- return
-
- self.cursors.SetC2PosCycles(nextedge)
-@@ -551,7 +551,7 @@
- (w,h) = self.GetClientSizeTuple()
- ix = len(self.waveforms)
-
-- w = LAWaveform(self, -1, wxPoint(5, _LA_TOP_Y+ix*_LA_VSPACING), wxSize(w-10, _LA_HEIGHT), 0)
-+ w = LAWaveform(self, -1, Point(5, _LA_TOP_Y+ix*_LA_VSPACING), Size(w-10, _LA_HEIGHT), 0)
-
- # Open dialog to set properties
- (isOK, newPath) = w.Edit(self.lastSTIPath)
-@@ -687,7 +687,7 @@
- apply(func, args)
-
- # Come back here for the next event in the queue
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
-+ PostEvent(self, CommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
-
- # The following functions are called as fake button handlers
- # to respond to events from the PySim11 thread.
-@@ -743,19 +743,19 @@
-
- def OnCycReset(self, event):
- self.queue.put((self.OnCycReset_handler, ()))
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
-+ PostEvent(self, CommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
-
- def IsSimulating(self, sim):
- self.queue.put((self.IsSimulating_handler, (sim,)))
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
-+ PostEvent(self, CommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
-
- def Append(self, PortPin, T, V):
- self.queue.put((self.Append_handler, (PortPin, T, V)))
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
-+ PostEvent(self, CommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
-
- def AppendRel(self, PortPin, DT, V):
- self.queue.put((self.AppendRel_handler, (PortPin, DT, V)))
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
-+ PostEvent(self, CommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
-
- ##################################################################
- ##################################################################
-diff -Naur PySim11/lawaveform.py PySim11.new/lawaveform.py
---- PySim11/lawaveform.py 2004-07-25 11:41:25.000000000 -0400
-+++ PySim11.new/lawaveform.py 2008-10-09 12:24:35.000000000 -0400
-@@ -7,7 +7,7 @@
- import os.path
-
- ## import all of the wxPython GUI package
--from wxPython.wx import *
-+from wx import *
-
- from ladata import LAData
- from lalabel import LALabel
-@@ -15,9 +15,9 @@
-
- _LA_LABELWIDTH = 100
-
--class LAWaveform(wxWindow):
-+class LAWaveform(Window):
- def __init__(self, parent, id, orig, size, attr):
-- wxWindow.__init__(self, parent, id, orig, size, attr)
-+ Window.__init__(self, parent, id, orig, size, attr)
-
- self.data = None # Contains object of class LAData
- self.label = None # Contains object of class LALabel
-@@ -66,7 +66,7 @@
- (oldw, oldh) = self.data.GetSize()
- neww = myw - _LA_LABELWIDTH - 5
- if neww >= 100:
-- self.data.SetSize(wxSize(neww, oldh))
-+ self.data.SetSize(Size(neww, oldh))
-
- event.Skip()
-
-@@ -100,14 +100,14 @@
-
- (w,h) = self.GetClientSizeTuple()
-
-- d = LAWaveformProperties(self, -1, "Waveform Properties", wxPoint(-1,-1), lastPath)
-+ d = LAWaveformProperties(self, -1, "Waveform Properties", Point(-1,-1), lastPath)
- d.SetValues(self.portpin, self.stimfile)
-
-- if d.ShowModal() == wxID_OK:
-+ if d.ShowModal() == ID_OK:
- dlgdata = d.SlurpData()
- if len(dlgdata['pin']) and dlgdata['pin'] != self.portpin:
-- self.label = LALabel(self, -1, wxPoint(0, 0), wxSize(_LA_LABELWIDTH, h))
-- self.data = LAData(self, -1, wxPoint(_LA_LABELWIDTH+5, 0), wxSize(w-_LA_LABELWIDTH-5,h))
-+ self.label = LALabel(self, -1, Point(0, 0), Size(_LA_LABELWIDTH, h))
-+ self.data = LAData(self, -1, Point(_LA_LABELWIDTH+5, 0), Size(w-_LA_LABELWIDTH-5,h))
-
- self.label.SetLabel(dlgdata['pin'])
- self.stimfile = dlgdata['filename']
-@@ -174,7 +174,7 @@
- assert self.isinput
-
- if not self.stimfile:
-- wxMessageBox("You must first Edit this waveform to specify a stimulus file", "First things first", wxOK|wxCENTRE)
-+ MessageBox("You must first Edit this waveform to specify a stimulus file", "First things first", OK|CENTRE)
- return
-
- if self.data:
-diff -Naur PySim11/lawaveprops_dlg.py PySim11.new/lawaveprops_dlg.py
---- PySim11/lawaveprops_dlg.py 2004-07-25 11:41:25.000000000 -0400
-+++ PySim11.new/lawaveprops_dlg.py 2008-10-09 12:26:07.000000000 -0400
-@@ -1,4 +1,4 @@
--from wxPython.wx import *
-+from wx import *
-
- PortInfo = { \
- 'PA7': ('IO',"""Port A:7 PA7/PAI/OC1
-@@ -215,40 +215,40 @@
- input channel.""")
- }
-
--class LAWaveformProperties(wxDialog):
-+class LAWaveformProperties(Dialog):
-
- def __init__(self, parent, id, title, orig, lastPath):
-- wxDialog.__init__(self, parent, id, title, orig, wxDLG_SZE(parent,wxSize(160,184)), wxCAPTION|wxDIALOG_MODAL)
-+ Dialog.__init__(self, parent, id, title, orig, DLG_SZE(parent,Size(160,184)), CAPTION|DIALOG_MODAL)
-
-- wxStaticText(self, -1, "Port Pin", wxDLG_PNT(self,wxPoint(10,10)), wxDLG_SZE(self,wxSize(21,9)), wxALIGN_LEFT)
-+ StaticText(self, -1, "Port Pin", DLG_PNT(self,Point(10,10)), DLG_SZE(self,Size(21,9)), ALIGN_LEFT)
-
- self.lastPath = lastPath
-
- names = PortInfo.keys()
- names.sort()
-
-- self.listbox = wxListBox(self, 100, wxDLG_PNT(self,wxPoint(10,20)), wxDLG_SZE(self,wxSize(46,90)), names, wxLB_SINGLE)
-- self.stimulusfile = wxStaticText(self, -1, "Stimulus File", wxDLG_PNT(self,wxPoint(10,114)), wxDLG_SZE(self,wxSize(36,9)), wxALIGN_LEFT)
-+ self.listbox = ListBox(self, 100, DLG_PNT(self,Point(10,20)), DLG_SZE(self,Size(46,90)), names, LB_SINGLE)
-+ self.stimulusfile = StaticText(self, -1, "Stimulus File", DLG_PNT(self,Point(10,114)), DLG_SZE(self,Size(36,9)), ALIGN_LEFT)
- self.stimulusfile.Enable(0)
-
-- self.filename = wxTextCtrl(self, 101, "", wxDLG_PNT(self,wxPoint(10,123)), wxDLG_SZE(self,wxSize(100,13)), wxTE_PROCESS_ENTER)
-+ self.filename = TextCtrl(self, 101, "", DLG_PNT(self,Point(10,123)), DLG_SZE(self,Size(100,13)), TE_PROCESS_ENTER)
- self.filename.Enable(0)
-- self.browse = wxButton(self, 102, "Browse", wxDLG_PNT(self,wxPoint(116,123)), wxDLG_SZE(self,wxSize(32,12)))
-+ self.browse = Button(self, 102, "Browse", DLG_PNT(self,Point(116,123)), DLG_SZE(self,Size(32,12)))
- self.browse.Enable(0)
-- wxStaticBox(self, -1, "Port Pin Info", wxDLG_PNT(self,wxPoint(60,10)), wxDLG_SZE(self,wxSize(90,100)))
-+ StaticBox(self, -1, "Port Pin Info", DLG_PNT(self,Point(60,10)), DLG_SZE(self,Size(90,100)))
-
-- self.pininfo = wxStaticText(self, 103, "", wxDLG_PNT(self,wxPoint(62,21)), wxDLG_SZE(self,wxSize(86,85)), wxALIGN_LEFT|wxST_NO_AUTORESIZE)
-+ self.pininfo = StaticText(self, 103, "", DLG_PNT(self,Point(62,21)), DLG_SZE(self,Size(86,85)), ALIGN_LEFT|ST_NO_AUTORESIZE)
-
-- wxStaticLine(self, -1, wxDLG_PNT(self,wxPoint(5,145)), wxDLG_SZE(self,wxSize(148,2)), wxLI_HORIZONTAL)
-- self.okbutton = wxButton(self, wxID_OK, "OK", wxDLG_PNT(self,wxPoint(34, 152)), wxDLG_SZE(self,wxSize(32,12)))
-+ StaticLine(self, -1, DLG_PNT(self,Point(5,145)), DLG_SZE(self,Size(148,2)), LI_HORIZONTAL)
-+ self.okbutton = Button(self, ID_OK, "OK", DLG_PNT(self,Point(34, 152)), DLG_SZE(self,Size(32,12)))
- self.okbutton.Enable(0)
-- wxButton(self, wxID_CANCEL, "Cancel", wxDLG_PNT(self,wxPoint(86, 152)), wxDLG_SZE(self,wxSize(32,12)))
-+ Button(self, ID_CANCEL, "Cancel", DLG_PNT(self,Point(86, 152)), DLG_SZE(self,Size(32,12)))
-
- EVT_LISTBOX(self, 100, self.OnListBox)
- EVT_LISTBOX_DCLICK(self, 100, self.OnListBoxDoubleClick)
- EVT_BUTTON(self, 102, self.OnBrowse)
- EVT_TEXT_ENTER(self, 101, self.OnTextEnter)
-- EVT_BUTTON(self, wxID_OK, self.OnOk)
-+ EVT_BUTTON(self, ID_OK, self.OnOk)
-
- def OnOk(self, event):
- # Don't allow OK button when no selection. We kind-of handle
-@@ -279,13 +279,13 @@
- self.filename.SetValue("")
-
- def OnTextEnter(self, event):
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK))
-+ PostEvent(self, CommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, ID_OK))
-
- def OnListBoxDoubleClick(self, event):
- s = event.GetString()
- assert PortInfo.has_key(s)
- self.okbutton.Enable(1)
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK))
-+ PostEvent(self, CommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, ID_OK))
-
- def OnListBox(self, event):
- s = event.GetString()
-@@ -302,7 +302,7 @@
- self.stimulusfile.Enable(1)
-
- def OnBrowse(self, event):
-- s = wxFileSelector("Select stimulus file", self.lastPath, "", ".sti", "Stimulus files (*.sti)|*.sti|All files (*.*)|*.*", wxOPEN|wxFILE_MUST_EXIST, self)
-+ s = FileSelector("Select stimulus file", self.lastPath, "", ".sti", "Stimulus files (*.sti)|*.sti|All files (*.*)|*.*", OPEN|FILE_MUST_EXIST, self)
- if (s):
- self.filename.SetValue(s)
-
-@@ -315,9 +315,9 @@
- return d
-
- if __name__=="__main__":
-- app = wxPySimpleApp()
-- d = LAWaveformProperties(None, -1, "Waveform Properties", wxPoint(-1,-1))
-- if d.ShowModal() == wxID_OK:
-+ app = PySimpleApp()
-+ d = LAWaveformProperties(None, -1, "Waveform Properties", Point(-1,-1))
-+ if d.ShowModal() == ID_OK:
- dlgdata = d.SlurpData()
- print dlgdata['pin']
- print dlgdata['filename']
-diff -Naur PySim11/pe_pio.py PySim11.new/pe_pio.py
---- PySim11/pe_pio.py 2004-07-25 11:41:25.000000000 -0400
-+++ PySim11.new/pe_pio.py 2008-10-09 12:26:29.000000000 -0400
-@@ -114,7 +114,7 @@
- PAIF = 0x10
-
- try:
-- import wxPython.wx
-+ import wx
- from laframe import LAFrame
-
- except:
diff --git a/app-emulation/evbu/files/evbu-0.6-wx.patch b/app-emulation/evbu/files/evbu-0.6-wx.patch
deleted file mode 100644
index 2c1e686..0000000
--- a/app-emulation/evbu/files/evbu-0.6-wx.patch
+++ /dev/null
@@ -1,454 +0,0 @@
-diff -Naur evbu/evbu.py evbu.new/evbu.py
---- evbu/evbu.py 2004-07-25 11:41:25.000000000 -0400
-+++ evbu.new/evbu.py 2008-10-09 12:02:20.000000000 -0400
-@@ -811,11 +811,11 @@
- import Queue
-
- ## import all of the wxPython GUI package
-- from wxPython.wx import *
-+ from wx import *
-
- from evbuframe import EVBUFrame
-
-- class MyApp(wxApp):
-+ class MyApp(App):
-
- # wxWindows calls this method to initialize the application
- def OnInit(self):
-@@ -866,7 +866,7 @@
- import buffalo
- bstate = buffalo.BuffaloServices(evb)
-
-- frame.Show(true)
-+ frame.Show(True)
-
- # Tell wxWindows that this is our main window
- self.SetTopWindow(frame)
-@@ -884,7 +884,7 @@
- frame.term.input.SetFocus()
-
- # Return a success flag
-- return true
-+ return True
-
-
- # Save and restore working directory on exit
-diff -Naur evbu/evbuframe.py evbu.new/evbuframe.py
---- evbu/evbuframe.py 2004-07-25 11:41:25.000000000 -0400
-+++ evbu.new/evbuframe.py 2008-10-09 11:49:35.000000000 -0400
-@@ -10,7 +10,7 @@
-
- from safestruct import *
-
--from wxPython.wx import *
-+from wx import *
-
- import G
- from term import Term
-@@ -18,7 +18,7 @@
- from PySim11 import PySim11
- from kcmmemory import getkcmmemoryData
-
--class EVBUFrame(wxFrame):
-+class EVBUFrame(Frame):
-
- def __init__(self, parent, id, title, queue, simbreak):
- # Queue for sending user input to cmdloop
-@@ -38,11 +38,11 @@
- # Determine sizes
- #
- #####################################################
-- dc = wxScreenDC()
-+ dc = ScreenDC()
- if sys.platform == "win32":
-- font = wxFont(12, wxMODERN, wxNORMAL, wxNORMAL)
-+ font = Font(12, MODERN, NORMAL, NORMAL)
- else:
-- font = wxFont(14, wxMODERN, wxNORMAL, wxNORMAL)
-+ font = Font(14, MODERN, NORMAL, NORMAL)
- dc.SetFont(font)
- ch = dc.GetCharHeight()
- cw = dc.GetCharWidth()
-@@ -75,10 +75,10 @@
- h = 25*ch + ch + 72
-
- # First, call the base class' __init__ method to create the frame
-- wxFrame.__init__(self, parent, id, title, wxPoint(-1, -1), wxSize(w,h), wxMINIMIZE_BOX|wxMAXIMIZE_BOX|wxSYSTEM_MENU|wxCAPTION|wxRESIZE_BORDER)
-- self.SetAutoLayout(true)
-+ Frame.__init__(self, parent, id, title, Point(-1, -1), Size(w,h), MINIMIZE_BOX|MAXIMIZE_BOX|SYSTEM_MENU|CAPTION|RESIZE_BORDER)
-+ self.SetAutoLayout(True)
-
-- self.term = Term(self, -1, wxPoint(0,0), (80,25), font, queue)
-+ self.term = Term(self, -1, Point(0,0), (80,25), font, queue)
-
- # The PySim11 thread calls our functions to post window update
- # commands using this queue. We use a fake button with ID
-@@ -87,7 +87,7 @@
- # (func, parms) which is simply invoked as apply(func,parms)
- # in the handler.
- self.handlerqueue = Queue.Queue(0)
-- self.handlerqueuebuttonid = wxNewId()
-+ self.handlerqueuebuttonid = NewId()
- EVT_BUTTON(self, self.handlerqueuebuttonid, self.Queue_handler)
-
- ##############################################
-@@ -95,25 +95,25 @@
- # Create menu bar, event table, and accelerator
- #
- ##############################################
-- self.menubar = wxMenuBar()
-+ self.menubar = MenuBar()
- self.menuIDs = {}
-- fileMenu = wxMenu()
-- #self.menuIDs['Preferences'] = fileMenu.preferencesID = wxNewId()
-+ fileMenu = Menu()
-+ #self.menuIDs['Preferences'] = fileMenu.preferencesID = NewId()
- #fileMenu.Append(fileMenu.preferencesID, "&Preferences...\tCtrl-P", "Edit global properties for this application")
- #fileMenu.AppendSeparator()
-- self.menuIDs['Load'] = fileMenu.loadID = wxNewId()
-+ self.menuIDs['Load'] = fileMenu.loadID = NewId()
- fileMenu.Append(fileMenu.loadID, "&Load\tCtrl-L", "Load an S19 file")
-- self.menuIDs['Exit'] = fileMenu.exitID = wxNewId()
-+ self.menuIDs['Exit'] = fileMenu.exitID = NewId()
- fileMenu.Append(fileMenu.exitID, "E&xit\tCtrl-Q", "Exit the program")
- self.menubar.Append(fileMenu, "&File")
-
-- simMenu = wxMenu()
-- self.menuIDs['Stop'] = simMenu.stopID = wxNewId()
-+ simMenu = Menu()
-+ self.menuIDs['Stop'] = simMenu.stopID = NewId()
- simMenu.Append(simMenu.stopID, "&Stop\tCtrl-C", "Stop the simulation")
- self.menubar.Append(simMenu, "&Simulation")
-
-- helpMenu = wxMenu()
-- self.menuIDs['About'] = helpMenu.aboutID = wxNewId()
-+ helpMenu = Menu()
-+ self.menuIDs['About'] = helpMenu.aboutID = NewId()
- helpMenu.Append(helpMenu.aboutID, "&About...", "About this program")
- self.menubar.Append(helpMenu, "&Help")
-
-@@ -127,10 +127,10 @@
- EVT_MENU(self, helpMenu.aboutID, self.OnAbout)
- EVT_MENU(self, simMenu.stopID, self.OnSimStop)
-
-- accel = wxAcceleratorTable([ \
-- (wxACCEL_CTRL, ord('q'), fileMenu.exitID), \
-- # (wxACCEL_CTRL, ord('p'), fileMenu.preferencesID), \
-- (wxACCEL_CTRL, ord('c'), simMenu.stopID)])
-+ accel = AcceleratorTable([ \
-+ (ACCEL_CTRL, ord('q'), fileMenu.exitID), \
-+ # (ACCEL_CTRL, ord('p'), fileMenu.preferencesID), \
-+ (ACCEL_CTRL, ord('c'), simMenu.stopID)])
- self.SetAcceleratorTable(accel)
-
- ##############################################
-@@ -138,15 +138,15 @@
- # Create status bar
- #
- ##############################################
-- self.statusBar = wxStatusBar(self, -1, 0)
-+ self.statusBar = StatusBar(self, -1, 0)
- self.statusBar.SetFieldsCount(1)
- self.statusBar.SetStatusWidths([-1])
- self.statusBar.SetStatusText("Ready", 0)
- self.SetStatusBar(self.statusBar)
- #self.statusBarBackgroundColor = self.statusBar.GetBackgroundColour()
-
-- self.sizer = wxBoxSizer(wxVERTICAL)
-- self.sizer.Add(self.term, 1, wxEXPAND)
-+ self.sizer = BoxSizer(VERTICAL)
-+ self.sizer.Add(self.term, 1, EXPAND)
- self.sizer.Fit(self)
- self.SetSizer(self.sizer)
-
-@@ -175,7 +175,7 @@
- # Icon
- #
- #########################
-- icon = wxIconFromXPMData(getkcmmemoryData())
-+ icon = IconFromXPMData(getkcmmemoryData())
- self.SetIcon(icon)
-
- #def OnSize(self, event):
-@@ -184,7 +184,7 @@
-
- def Quit(self):
- if self.isSimulating:
-- wxMessageBox("Simulation is in progress. Terminate the simulation before quitting the program.", "Hold it, bub", wxOK|wxCENTRE)
-+ MessageBox("Simulation is in progress. Terminate the simulation before quitting the program.", "Hold it, bub", OK|CENTRE)
- return
-
- self.queue.put(0)
-@@ -197,7 +197,7 @@
- pass
-
- def OnFileLoad(self, event):
-- line = wxFileSelector("Select S19 file", os.getcwd(), "", ".s19", "S19 files (*.s19)|*.s19|All files (*.*)|*.*", wxOPEN|wxFILE_MUST_EXIST, self)
-+ line = FileSelector("Select S19 file", os.getcwd(), "", ".s19", "S19 files (*.s19)|*.s19|All files (*.*)|*.*", OPEN|FILE_MUST_EXIST, self)
- if line:
- self.queue.put("load "+line)
-
-@@ -215,7 +215,7 @@
- <http://claymore.engineer.gvsu.edu/~steriana/Python>
- """ % (EVBUoptions.EVBUVersionMajor, EVBUoptions.EVBUVersionMinor,\
- PySim11.PySim11VersionMajor, PySim11.PySim11VersionMinor)
-- wxMessageBox(aboutText, "About EVBU", wxOK|wxCENTRE, self)
-+ MessageBox(aboutText, "About EVBU", OK|CENTRE, self)
-
- def FlushQueue(self):
- # Flush the queue that sends user data to the EVBU
-@@ -235,7 +235,7 @@
- # User-generated simulation stop
- def OnSimStop(self, event):
- if not self.isSimulating:
-- wxMessageBox("Simulation not in progress", "Huh?", wxOK|wxCENTRE, self)
-+ MessageBox("Simulation not in progress", "Huh?", OK|CENTRE, self)
- return
-
- # Clear the flag, then wait for PySim11 to set it, indicating a
-@@ -246,8 +246,8 @@
- if self.simbreak.isSet():
- break
- else:
-- ret = wxMessageBox("The simulator has not stopped yet. Press OK to try again or Cancel to give up.", "Ooops", wxOK|wxCANCEL|wxCENTRE|wxICON_ERROR)
-- if ret != wxOK:
-+ ret = MessageBox("The simulator has not stopped yet. Press OK to try again or Cancel to give up.", "Ooops", OK|CANCEL|CENTRE|ICON_ERROR)
-+ if ret != OK:
- return
-
- ##################################################################
-@@ -266,7 +266,7 @@
- apply(func, args)
-
- # Come back here for the next event in the queue
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, self.handlerqueuebuttonid))
-+ PostEvent(self, CommandEvent(EVT_COMMAND_BUTTON_CLICKED, self.handlerqueuebuttonid))
-
- def OnCharWait_handler(self):
- self.statusBar.SetStatusText("Simulating...waiting for a character", 0)
-@@ -302,35 +302,35 @@
-
- def OnCharWait(self, event):
- self.handlerqueue.put((self.OnCharWait_handler, ()))
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, self.handlerqueuebuttonid))
-+ PostEvent(self, CommandEvent(EVT_COMMAND_BUTTON_CLICKED, self.handlerqueuebuttonid))
-
- def OnNoCharWait(self, event):
- self.handlerqueue.put((self.OnNoCharWait_handler, ()))
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, self.handlerqueuebuttonid))
-+ PostEvent(self, CommandEvent(EVT_COMMAND_BUTTON_CLICKED, self.handlerqueuebuttonid))
-
- def OnSimStart(self, event):
- self.handlerqueue.put((self.OnSimStart_handler, ()))
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, self.handlerqueuebuttonid))
-+ PostEvent(self, CommandEvent(EVT_COMMAND_BUTTON_CLICKED, self.handlerqueuebuttonid))
-
- def OnSimEnd(self, event):
- self.handlerqueue.put((self.OnSimEnd_handler, ()))
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, self.handlerqueuebuttonid))
-+ PostEvent(self, CommandEvent(EVT_COMMAND_BUTTON_CLICKED, self.handlerqueuebuttonid))
-
- if __name__=="__main__":
-- class MyApp(wxApp):
-+ class MyApp(App):
-
- # wxWindows calls this method to initialize the application
- def OnInit(self):
-
- # Create an instance of our customized Frame class
- frame = EVBUFrame(None, -1, "This is a test")
-- frame.Show(true)
-+ frame.Show(True)
-
- # Tell wxWindows that this is our main window
- self.SetTopWindow(frame)
-
- # Return a success flag
-- return true
-+ return True
-
-
- app = MyApp(0) # Create an instance of the application class
-diff -Naur evbu/kcmmemory.py evbu.new/kcmmemory.py
---- evbu/kcmmemory.py 2004-07-25 11:41:25.000000000 -0400
-+++ evbu.new/kcmmemory.py 2008-10-09 11:37:52.000000000 -0400
-@@ -3,7 +3,7 @@
- #
- # Source file is kcmmemory.png from KDE icons
-
--from wxPython.wx import wxBitmapFromXPMData, wxImageFromBitmap
-+from wx import BitmapFromXPMData, ImageFromBitmap
- import cPickle
-
-
-@@ -30,8 +30,8 @@
- a." )
-
- def getkcmmemoryBitmap():
-- return wxBitmapFromXPMData(getkcmmemoryData())
-+ return BitmapFromXPMData(getkcmmemoryData())
-
- def getkcmmemoryImage():
-- return wxImageFromBitmap(getkcmmemoryBitmap())
-+ return ImageFromBitmap(getkcmmemoryBitmap())
-
-diff -Naur evbu/term.py evbu.new/term.py
---- evbu/term.py 2004-07-25 11:41:25.000000000 -0400
-+++ evbu.new/term.py 2008-10-09 12:01:44.000000000 -0400
-@@ -1,5 +1,5 @@
- ## import all of the wxPython GUI package
--from wxPython.wx import *
-+from wx import *
-
- import Queue
-
-@@ -57,9 +57,9 @@
- # Term -- terminal with read-only display and single-input line
-
-
--class MyTextCtrl(wxTextCtrl):
-+class MyTextCtrl(TextCtrl):
- def __init__(self, parent, id, title, orig, size, style):
-- wxTextCtrl.__init__(self, parent, id, title, orig, size, style)
-+ TextCtrl.__init__(self, parent, id, title, orig, size, style)
- self.parent = parent
-
- EVT_CHAR(self, self.OnChar)
-@@ -68,7 +68,7 @@
- self.parent.RawChar(event.GetKeyCode())
- event.Skip()
-
--class Term(wxWindow):
-+class Term(Window):
- def __init__(self, parent, id, orig, dimension, font, queue):
- self.parent = parent
-
-@@ -86,7 +86,7 @@
- # List of previously entered lines for recalling with up/down arrows
- self.history = History(100)
-
-- dc = wxClientDC(parent)
-+ dc = ClientDC(parent)
- dc.SetFont(font)
- ch = dc.GetCharHeight()
- cw = dc.GetCharWidth()
-@@ -95,37 +95,37 @@
- w = dimension[0]*cw + 25
- h = dimension[1]*ch + ch + 18
-
-- wxWindow.__init__(self, parent, id, orig, wxSize(w,h), wxNO_BORDER)
-+ Window.__init__(self, parent, id, orig, Size(w,h), NO_BORDER)
-
- EVT_SIZE(self, self.OnSize)
-- self.sizer = wxBoxSizer(wxVERTICAL)
-+ self.sizer = BoxSizer(VERTICAL)
-
- # Slop approach
- h = dimension[1]*ch + 8
-
-- self.display = wxTextCtrl(self, 200, "", wxPoint(0,0), wxSize(w,h), wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH|wxTE_NOHIDESEL)
-+ self.display = TextCtrl(self, 200, "", Point(0,0), Size(w,h), TE_MULTILINE|TE_READONLY|TE_RICH|TE_NOHIDESEL)
-
- sep = 4
- h2 = ch + 8
-
-- self.input = MyTextCtrl(self, 201, "", wxPoint(0,h+sep), wxSize(w,h2), wxTE_PROCESS_ENTER|wxTE_RICH)
-+ self.input = MyTextCtrl(self, 201, "", Point(0,h+sep), Size(w,h2), TE_PROCESS_ENTER|TE_RICH)
-
- self.display.SetFont(font)
-- self.display.SetDefaultStyle(wxTextAttr(wxGREEN, wxBLACK, font))
-- self.display.SetBackgroundColour(wxBLACK)
-+ self.display.SetDefaultStyle(TextAttr(GREEN, BLACK, font))
-+ self.display.SetBackgroundColour(BLACK)
-
- self.input.SetFont(font)
-- self.input.SetBackgroundColour(wxBLACK)
-- self.input.SetForegroundColour(wxWHITE)
-+ self.input.SetBackgroundColour(BLACK)
-+ self.input.SetForegroundColour(WHITE)
-
- EVT_TEXT_ENTER(self, 201, self.OnInput)
- EVT_BUTTON(self, 301, self.OnWriteQueue)
-
- # Try using a sizer
-- self.sizer.Add(self.display, 1, wxEXPAND)
-- self.sizer.Add(w, 5, 0, wxEXPAND)
-- self.sizer.Add(self.input, 0, wxEXPAND)
-- self.SetAutoLayout(true)
-+ self.sizer.Add(self.display, 1, EXPAND)
-+ #self.sizer.Add(w, 5, 0, EXPAND)
-+ self.sizer.Add(self.input, 0, EXPAND)
-+ self.SetAutoLayout(True)
- self.SetSizer(self.sizer)
- self.sizer.Fit(self)
-
-@@ -135,14 +135,14 @@
- #print 'Display:', (X,Y), (x,y)
- #dX = X-x
- #dY = Y-y
-- #self.display.SetClientSize(wxSize(dimension[0]*cw + dX, dimension[1]*ch + dY))
-+ #self.display.SetClientSize(Size(dimension[0]*cw + dX, dimension[1]*ch + dY))
-
- #(X,Y) = self.input.GetSizeTuple()
- #(x,y) = self.input.GetClientSizeTuple()
- #print 'Input:', (X,Y), (x,y)
- #dX = X-x
- #dY = Y-y
-- #self.input.SetClientSize(wxSize(dimension[0]*cw + dX, 1*ch + dY))
-+ #self.input.SetClientSize(Size(dimension[0]*cw + dX, 1*ch + dY))
-
- def OnSize(self, event):
- #print 'OnSize:', event.GetSize()
-@@ -186,44 +186,44 @@
- for line in lines[:-1]:
- self.writequeue.put(line+'\n')
- self.writequeue.put(lines[-1])
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
-+ PostEvent(self, CommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
-
- def OnWriteQueue(self, event):
- try:
- self.display.AppendText(self.writequeue.get(0))
-- wxPostEvent(self, wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
-+ PostEvent(self, CommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, 301))
- except Queue.Empty:
- pass
-
- #---------------------------------------------------------------------------
- if __name__=="__main__":
-- class MyFrame(wxFrame):
-+ class MyFrame(Frame):
-
- def __init__(self, parent, id, title):
- # First, call the base class' __init__ method to create the frame
-- wxFrame.__init__(self, parent, id, title, wxPoint(-1, -1), wxSize(800, 450))
-+ Frame.__init__(self, parent, id, title, Point(-1, -1), Size(800, 450))
-
- EVT_CLOSE(self, self.OnCloseWindow)
-
-- self.term = Term(self, -1, wxPoint(0,0), wxSize(610,430))
-+ self.term = Term(self, -1, Point(0,0), Size(610,430))
-
- def OnCloseWindow(self, event):
- self.Destroy()
-
-- class MyApp(wxApp):
-+ class MyApp(App):
-
- # wxWindows calls this method to initialize the application
- def OnInit(self):
-
- # Create an instance of our customized Frame class
- frame = MyFrame(None, -1, "This is a test")
-- frame.Show(true)
-+ frame.Show(True)
-
- # Tell wxWindows that this is our main window
- self.SetTopWindow(frame)
-
- # Return a success flag
-- return true
-+ return True
-
-
- app = MyApp(0) # Create an instance of the application class
diff --git a/dev-embedded/as31/Manifest b/dev-embedded/as31/Manifest
index 4e2df6a..5f3e33c 100644
--- a/dev-embedded/as31/Manifest
+++ b/dev-embedded/as31/Manifest
@@ -1,4 +1,2 @@
DIST as31_beta3.tar.gz 82696 RMD160 873a7c1d2814d7d69f0a2112417e82aef54f964b SHA1 1ec22bc93273412abc9a10f254563a6356121501 SHA256 26a8425ec71b7b91f9194febd9c8530b5c2a391963c9bd9bd1e3bc840879ed4c
EBUILD as31-2.0_beta3.ebuild 776 RMD160 6ddf6cf408d22d1ffdb3a178b819ee07bf7c7da9 SHA1 d79de90f780f2ed83b687ce0169c30e9e27f29c2 SHA256 5069675835cebf7be450be8ffb558f8af4c7d70f123e5672bfc1370dec7dbf1f
-MISC ChangeLog 241 RMD160 453aace1256157479d6c59e3e340a64a6953d0c1 SHA1 94b3319d09a77e8dc19a16c65091c6a4da111891 SHA256 79b6111bb2201659822b03a3217a30c35fafd301b5d9e524be4c8975ac79acf6
-MISC metadata.xml 643 RMD160 3bda92019cb9a627d763c625fe5c47e162c62659 SHA1 a5a8995876fccee43247f8460f324178ce447269 SHA256 35b5769a36ea9915a553724a404368ef8451e1bcfb000fe8f3653d9ebdf7644c
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
deleted file mode 100644
index a2ccd94..0000000
--- a/dev-python/bitarray/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST bitarray-0.3.5.tar.gz 42009 RMD160 f95b100c3a1b6092aa0aa9d6c796656e85f0adf4 SHA1 3ca114f3df14ac5f07b507b3b5c44e27b7ef0eb9 SHA256 cebf82b533dc7ffdd1b8b669633e754e2e1a00016bf27865fdd3ea6ca28aaf51
-EBUILD bitarray-0.3.5.ebuild 459 RMD160 b9b3b51014af3ddc93a8cd6447e7c645d037b309 SHA1 9ef5b14e07e5dada68df50c118a0d6f4d4bec538 SHA256 f2e03fb0d5566cb1c279542371b5f8601f8a517b33512947249e47e389649b6b
-MISC ChangeLog 242 RMD160 828d25b1ac1853a0ea3b9a2c02474501702833c3 SHA1 183517b61aa745873cf990861b8193d59755cc9b SHA256 34835841fc48f8c915c3b8d5a3264db28dda43660adc8f5425bacfb865bb3e3d
-MISC metadata.xml 942 RMD160 51d2bfd9bd8e83c8ce6e10eba4ffcb4e4602f4b6 SHA1 e4e4c39243e13656380f5a598670d613d630a61a SHA256 be7e2e4fa373713d12434012875372ffbdc816895a057cc00202a4636f9185eb
diff --git a/dev-python/bitarray/bitarray-0.3.5.ebuild b/dev-python/bitarray/bitarray-0.3.5.ebuild
deleted file mode 100644
index 435a8d3..0000000
--- a/dev-python/bitarray/bitarray-0.3.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.5
-
-inherit distutils
-
-DESCRIPTION="Efficient arrays of booleans - C extension."
-HOMEPAGE="http://pypi.python.org/pypi/bitarray"
-SRC_URI="http://pypi.python.org/packages/source/b/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/python"
-DEPEND="${RDEPEND}
- dev-python/setuptools"
diff --git a/dev-python/ctypes-opencv/Manifest b/dev-python/ctypes-opencv/Manifest
deleted file mode 100644
index 5d5c2e0..0000000
--- a/dev-python/ctypes-opencv/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ctypes-opencv-0.7.3-src.7z 69619 RMD160 084ac104710c776cb0981b83b8d89b91a9dae76b SHA1 dd5306641932a1d8601b349e461cd93bb4b26de1 SHA256 ff25610c534ad049af56cfa2d8a6259c4c95f473185fc5bcb9dc50905510a41f
-DIST ctypes-opencv-0.8.0-src.7z 69997 RMD160 ae691c770eedbd0b9b09a963969add05d0965542 SHA1 9261544ea8f095387928fb8bff33a5c228e78507 SHA256 cf2eeb2a4988c6f670c740ddeed6ce0e52b61bc346921bd9fa619829cfc80926
-EBUILD ctypes-opencv-0.7.3.ebuild 723 RMD160 70835a169d45aea0bd8a868bc67ca547537c7f59 SHA1 7f8bc6270221a9f814e536791d8dd55756a0bb2c SHA256 3db059c1f6db4c968aeef87b2819f8e62d17107aada6293f8bd996752f67bf74
-EBUILD ctypes-opencv-0.8.0.ebuild 714 RMD160 0126350276f04a888a800ebf9e34c46fe04d3809 SHA1 e46368b0ed13d59fbdd4993f7a8e22829d791022 SHA256 62ee540b5e43c39462f44fc146b030444e0993f9cdb63a87c675ae39fda4670f
-MISC ChangeLog 655 RMD160 6823b3cd76c932367e60a150d69a8c82e33fbea7 SHA1 a4228a4813948d6820b26704056c8538bfd79733 SHA256 f472947922226d7b83f670f3da6add3c80a53009687ae4a1e0f79a6f0ef11ac4
-MISC metadata.xml 610 RMD160 883724695fb37508ee019d72e65e2cde0767d1f5 SHA1 990973f444c5931630e66e2c3bebb12ec4fd2c88 SHA256 88f6bafa4f93e648554121505e5443c0f1672aa2c1064d13f57f0cafe5619792
diff --git a/dev-python/ctypes-opencv/ctypes-opencv-0.7.3.ebuild b/dev-python/ctypes-opencv/ctypes-opencv-0.7.3.ebuild
deleted file mode 100644
index f352ccf..0000000
--- a/dev-python/ctypes-opencv/ctypes-opencv-0.7.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.5
-
-inherit distutils eutils
-
-DESCRIPTION="ctypes-opencv is a package that brings OpenCV to Python."
-HOMEPAGE="http://code.google.com/p/ctypes-opencv"
-SRC_URI="http://${PN}.googlecode.com/files/${P}-src.7z"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/python
- <=media-libs/opencv-1.1.0_pre1[-python]"
-DEPEND="${RDEPEND}
- dev-python/setuptools
- app-arch/p7zip"
-
-S="${WORKDIR}/src"
-DOCS="AUTHORS README THANKS TODO"
-
-src_unpack() {
- 7z x "${DISTDIR}/${A}" || die "unpack failed"
-}
-
-src_install() {
- distutils_src_install
- rm -rf "${D}/usr/doc"
-}
diff --git a/dev-python/ctypes-opencv/ctypes-opencv-0.8.0.ebuild b/dev-python/ctypes-opencv/ctypes-opencv-0.8.0.ebuild
deleted file mode 100644
index 0727726..0000000
--- a/dev-python/ctypes-opencv/ctypes-opencv-0.8.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.5
-
-inherit distutils eutils
-
-DESCRIPTION="ctypes-opencv is a package that brings OpenCV to Python."
-HOMEPAGE="http://code.google.com/p/ctypes-opencv"
-SRC_URI="http://${PN}.googlecode.com/files/${P}-src.7z"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/python
- <=media-libs/opencv-1.1.0_pre1"
-DEPEND="${RDEPEND}
- dev-python/setuptools
- app-arch/p7zip"
-
-S="${WORKDIR}/src"
-DOCS="AUTHORS README THANKS TODO"
-
-src_unpack() {
- 7z x "${DISTDIR}/${A}" || die "unpack failed"
-}
-
-src_install() {
- distutils_src_install
- rm -rf "${D}/usr/doc"
-}
diff --git a/dev-python/django-annoying/Manifest b/dev-python/django-annoying/Manifest
deleted file mode 100644
index 3641182..0000000
--- a/dev-python/django-annoying/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST django-annoying-0.7.4.tar.gz 4330 RMD160 f7839f87adf628bf6fe44b8546113b893017a8a0 SHA1 18646ac1804eea03daa00c28abe3ddb944660743 SHA256 94acab42e103ab7457eece49057c3980bbccdebec2e2d684653fe787e015848e
-EBUILD django-annoying-0.7.4.ebuild 508 RMD160 61b3e9465b369087e8c5190825490d87b9defc5a SHA1 3839442be102bc22f2c1408a1d1d5cf475330cc2 SHA256 64421ef44d5945461aa167a4d88115412cdabd687f2a120f23d486ff4c2c139f
-MISC ChangeLog 264 RMD160 9e98ab2b7d0978233b28fa23c8f3eef4477b0e71 SHA1 7532223c1ba5c073422cf413555dc991c7fbd44a SHA256 8ab19d9de92dd12c8749f27116fc4defcc9ee900709df56343275785545e6557
-MISC metadata.xml 386 RMD160 fc7cb7186cf727f16cbae49e027de9b152f808d7 SHA1 1757009e2972595e80418c7644d15cb38b67ac22 SHA256 7d700264989ea1f800df4eb56929be3087728df71285c230ee142224c5fad45f
diff --git a/dev-python/django-annoying/django-annoying-0.7.4.ebuild b/dev-python/django-annoying/django-annoying-0.7.4.ebuild
deleted file mode 100644
index 9387da4..0000000
--- a/dev-python/django-annoying/django-annoying-0.7.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.4
-
-inherit distutils
-
-DESCRIPTION="This is django application that try to eliminate annoying things in Django framework."
-HOMEPAGE="http://bitbucket.org/offline/django-annoying/wiki/Home"
-SRC_URI="http://pypi.python.org/packages/source/d/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="dev-python/django"
-
diff --git a/dev-python/django-treebeard/Manifest b/dev-python/django-treebeard/Manifest
deleted file mode 100644
index 318a49b..0000000
--- a/dev-python/django-treebeard/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD django-treebeard-9999.ebuild 544 RMD160 54a720921da6ec7d652aab85e9a5665b6515516c SHA1 b2af0cb2415929942ccf5e5daef6eae8781aba6d SHA256 28bd57ca796c62cf8b719338837fd56f97bae0c2fc5ad299bb0e8bd92c85ad71
-MISC ChangeLog 246 RMD160 1ccd296d8ef2cd95d0f7ab0b82b6ffe7f6b17fbe SHA1 89f3927bac2ec4820d4ca8089aa697295fbef354 SHA256 907344ef4041e016c6fd330e57ed6df9ec1d68447da9d9721f2fd17569a3f546
-MISC metadata.xml 654 RMD160 e1622f0f7d46a24a6b2d12d31b0da25bbe88e2d0 SHA1 44d3242e894ba807019b43d16da0b19c367263bb SHA256 9bfe574eaab0b1184eca2e8b1a9cb2276b276b575df45b2e0b95533298e617c4
diff --git a/dev-python/django-treebeard/django-treebeard-9999.ebuild b/dev-python/django-treebeard/django-treebeard-9999.ebuild
deleted file mode 100644
index 6fbc0fe..0000000
--- a/dev-python/django-treebeard/django-treebeard-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.5
-
-inherit distutils mercurial
-
-DESCRIPTION="Efficient Materialized Path tree implementation for Django 1.0+"
-HOMEPAGE="http://code.google.com/p/django-treebeard/"
-EHG_REPO_URI="http://code.tabo.pe/django-treebeard/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=">=dev-python/django-1.0.0"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
- distutils_src_install
-}
diff --git a/dev-python/fuzzpy/Manifest b/dev-python/fuzzpy/Manifest
index b87c976..6b19ff0 100644
--- a/dev-python/fuzzpy/Manifest
+++ b/dev-python/fuzzpy/Manifest
@@ -1,5 +1,3 @@
DIST fuzzpy-0.4.0.tar.bz2 28605 RMD160 81700a4c7142f20eae05b376c8ab776d6edfc52a SHA1 b87fbbc7211ae47b27597a5db1cda805ac395568 SHA256 a7519b5d0b101c1c3eaaa7f48911301baf0fd034dd14c6374e5c95f6b8cdc2d4
EBUILD fuzzpy-0.4.0.ebuild 778 RMD160 5ff9170bb27416ba6ec181096c38677de02a45ba SHA1 0b5304c8e225fed8b5497fc01da6591220ff3d0e SHA256 23a1561ed404a750ee198ed1a17bd0329657dfce90ed35142b3accea9389ec48
EBUILD fuzzpy-9999.ebuild 794 RMD160 08963bf6a9493d615110d80d51a1d16b6f85c681 SHA1 daaec9adf0fa9c0bbe58cdb9ac4c0ee9f1f20b7b SHA256 2ef9e60244ba98852a6239e32adc30ef0dcf770b6bb78fe13afdd176c8fe9fb7
-MISC ChangeLog 1396 RMD160 6b860a0c553e0195ccb28c12d965565415bd273e SHA1 f4458c36b4ddfc1e6acbea91f285799a20168f3d SHA256 34bbacb624ce1ae4130af199e97f60fec1d65fc3cb31bbe835959e03d860e859
-MISC metadata.xml 478 RMD160 00750705f74e39bbc9b256e7c7b8d14a47a426a7 SHA1 f232b226759fe563a65812801115633d941a55ae SHA256 dbcfa9aacd331da7b2eaaf6ee0df998bbccab671f3360202546724f0aaedbfef
diff --git a/dev-python/kamaelia/Manifest b/dev-python/kamaelia/Manifest
deleted file mode 100644
index cd8f238..0000000
--- a/dev-python/kamaelia/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-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
-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
deleted file mode 100644
index 5968ce9..0000000
--- a/dev-python/kamaelia/files/kamaelia-0.6.0-prefix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index ae2640b..0000000
--- a/dev-python/kamaelia/kamaelia-0.6.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.4
-
-inherit eutils distutils
-
-DESCRIPTION="Kamaelia is a Python library for concurrent programming."
-HOMEPAGE="http://www.kamaelia.org/Home"
-SRC_URI="http://www.kamaelia.org/release/Kamaelia-${PV}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S=${WORKDIR}/Kamaelia-${PV}
-
-PATCHES=( "${FILESDIR}/${P}-prefix.patch" )
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch ${PATCHES}
-}
diff --git a/dev-python/kamaelia/kamaelia-0.9.8.0.ebuild b/dev-python/kamaelia/kamaelia-0.9.8.0.ebuild
deleted file mode 100644
index ab1cd2d..0000000
--- a/dev-python/kamaelia/kamaelia-0.9.8.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
-
diff --git a/dev-python/multitask/Manifest b/dev-python/multitask/Manifest
deleted file mode 100644
index 874ccd6..0000000
--- a/dev-python/multitask/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST multitask-0.2.0.tar.gz 11192 RMD160 54eeb64d2f889aa9842f1df6df6cb1eafa1dc6e9 SHA1 e2f9380cc321b24427b7fc0c6f0e5e104b1cc640 SHA256 4828aa750bfe204298535290396361da4511c68831c268cc10b84444c295c01f
-EBUILD multitask-0.2.0.ebuild 622 RMD160 0a483e388085aeb72447323121d5abc7e57779cb SHA1 419a503e5f9bba301c37fa9e357d9caf9246d874 SHA256 9bd48e004a0aa8a32b0f273bb70661062ed4ea40e87b88219fa4a3ce77fa315d
-MISC ChangeLog 245 RMD160 b2184896c236f6ebcf158eb7bcb3bedc613a6fe7 SHA1 72a6410343ca112b4a8343d212b55a8fea3149d5 SHA256 86af2fa5f9d776c6cdac0a845d0eab37102ce5181abf5449545e336503189858
-MISC metadata.xml 944 RMD160 5f50cf7a1fb3068d33ab00cda9e62e653cb1ac83 SHA1 ebde7bb4763c9e91bb17ad87f0f58f885de38464 SHA256 9d75e7fe4288b3f0a69ba719e058d506eae8f88550e32640f92a1cfa35f27c8b
diff --git a/dev-python/multitask/multitask-0.2.0.ebuild b/dev-python/multitask/multitask-0.2.0.ebuild
deleted file mode 100644
index a40b806..0000000
--- a/dev-python/multitask/multitask-0.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.5
-
-inherit distutils
-
-DESCRIPTION="multitask allows Python programs to use generators (a.k.a. coroutines) to perform cooperative multitasking and asynchronous I/O."
-HOMEPAGE="http://o2s.csail.mit.edu/o2s-wiki/multitask"
-SRC_URI="http://o2s.csail.mit.edu/download/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-python/setuptools"
-
-src_install() {
- distutils_src_install
-
- insinto /usr/share/${PN}/examples
- doins examples/*
-}
diff --git a/dev-python/polygon/Manifest b/dev-python/polygon/Manifest
index 501be02..8cf092e 100644
--- a/dev-python/polygon/Manifest
+++ b/dev-python/polygon/Manifest
@@ -1 +1,2 @@
-DIST Polygon-2.0.3.zip 57007 RMD160 271baa3ade0c52631bc6131f3db86e2e7918b8fe SHA1 ec4f80de0b44fc26c97207737f817100a8623f55 SHA256 adeab30f5a79f7d5a8716e4574ae2ff179bebfb3759b4c4b5733662eaa1925f1
+DIST Polygon-2.0.4.zip 73544 RMD160 dfb26325998f3e8b44ac36f6ef2c0be30b8d9fd9 SHA1 aa734572c911c0ddb4b39d1bf21f8ecbfa3685c8 SHA256 a9a85d81cc9faabba398001b1e9d32444e98147ac6e31cbdc5ef512c4f7c43dd
+EBUILD polygon-2.0.4.ebuild 576 RMD160 cff8df85a4248227228cc089d21ecb7b8db89583 SHA1 0799eefdd2a0b1835a110dc7ba95157d227a4a51 SHA256 16774f7626d1a8c93b9e3b4715eea82d97da629fff76831eee6b37765c06aa0e
diff --git a/dev-python/polygon/polygon-2.0.3.ebuild b/dev-python/polygon/polygon-2.0.4.ebuild
index 9c4f8bb..35942ae 100644
--- a/dev-python/polygon/polygon-2.0.3.ebuild
+++ b/dev-python/polygon/polygon-2.0.4.ebuild
@@ -4,20 +4,21 @@
EAPI=3
PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
inherit distutils eutils
DESCRIPTION="Polygon is a python package that handles polygonal shapes in 2D."
-HOMEPAGE="http://polygon.origo.ethz.ch/"
-SRC_URI="http://download.origo.ethz.ch/${PN}/2101/Polygon-${PV}.zip"
+HOMEPAGE="http://www.j-raedler.de/projects/polygon/"
+SRC_URI="https://github.com/downloads/jraedler/Polygon2/Polygon-${PV}.zip"
LICENSE="LGPL"
SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 x86"
IUSE=""
-DEPEND="virtual/python
- dev-python/setuptools"
+DEPEND="dev-python/setuptools"
RDEPEND="${DEPEND}"
S="${WORKDIR}/Polygon-${PV}"
diff --git a/dev-python/progressbar/Manifest b/dev-python/progressbar/Manifest
index 2672f3c..4191617 100644
--- a/dev-python/progressbar/Manifest
+++ b/dev-python/progressbar/Manifest
@@ -1,4 +1,2 @@
DIST progressbar-2.2.tar.gz 5118 RMD160 13f59c0c3155cd120eef11c7736f6363d33fa136 SHA1 a6ccec7c4d908a0c9d5ed1831ca9947df003407c SHA256 dfee5201237ca0e942baa4d451fee8bf8a54065a337fabe7378b8585aeda56a3
EBUILD progressbar-2.2.ebuild 482 RMD160 ee2ddea468f319d15ed2d35ac5975e9024f9753d SHA1 ee3d96b450753e73d655fb0a9c125ffa5fc81ade SHA256 213e7b26fb7b8a7fa6c827cc42e35b46f24eceed26eb6face9423d3f76324eab
-MISC ChangeLog 247 RMD160 c117e0f816f5816065a0f074c0e48f63ce3146f6 SHA1 1ff0a5c3c05c0b9c3c4a3504914a8bc6a9477614 SHA256 46889c54d16a6200fd763eb76f194ec18a5ed7f19b31a9a8bffcdefd678e0099
-MISC metadata.xml 476 RMD160 a82d4bc8fe0f12b62f3afd9730b9c46c3c67ddcc SHA1 296991b2d7da9ad1a7a8c112307456cbd5e64d05 SHA256 46eb24ed183df2be3cb555c745e865e052bc803244729176fa57e76c08946460
diff --git a/dev-python/ptt/Manifest b/dev-python/ptt/Manifest
deleted file mode 100644
index da226d1..0000000
--- a/dev-python/ptt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST twitter-1.2.tar.gz 12678 RMD160 33ef91996ba2138de4a8a719cb9752d0cfb96e43 SHA1 7883a980d697c502e9f60e4d23398509bae5a225 SHA256 b3217a619fef99e1d45460c7052fe94b6cbd60717c5c35183c8c21436ae05eef
-EBUILD ptt-1.2.ebuild 591 RMD160 b99db0ec6ef4bac44998ba552d49ba432dc3a195 SHA1 f54734387baeb195bfd7425c1a0c8041361ea9b1 SHA256 40d144082f90bc8fa0e0d397760a70a8f905f19f14b1b91e2731d6fd4adcb1bc
-MISC ChangeLog 223 RMD160 4f165435184310824444378679fcd3cc4875f8ee SHA1 f70a226b5dd8e6ffacec054b571008dfcdf9c6d5 SHA256 b41e126eb1584c117ebab4fbe4e0bc09ae9c7442eaee4e157805bc264fe7ca11
-MISC metadata.xml 383 RMD160 9456b65fede960ed1f380dc4ba47931452af6279 SHA1 2de2c3196a57633f30407409c322c4952e9f8725 SHA256 f73c1f77d59db44589ea4ce4f25fc07265f5c846615f96527826848a7751ed63
diff --git a/dev-python/ptt/ptt-1.2.ebuild b/dev-python/ptt/ptt-1.2.ebuild
deleted file mode 100644
index ce926ec..0000000
--- a/dev-python/ptt/ptt-1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit distutils
-
-DESCRIPTION="Python Twitter Tools - command-line client and IRC bot"
-HOMEPAGE="http://mike.verdone.ca/twitter/"
-SRC_URI="http://mike.verdone.ca/twitter/twitter-${PV}.tar.gz"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/python
- dev-python/python-dateutil
- dev-python/simplejson
- dev-python/python-irclib"
-DEPEND="${RDEPEND}
- dev-python/setuptools"
-
-S="${WORKDIR}/twitter-${PV}"
-
-src_install() {
- distutils_src_install
-}
diff --git a/dev-python/pycha/Manifest b/dev-python/pycha/Manifest
deleted file mode 100644
index c437dd6..0000000
--- a/dev-python/pycha/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pycha-0.5.3.tar.gz 39370 RMD160 ebaedd3c5dc33a35095a9fe4df0d1801a700754c SHA1 7679259389e8b36c4ac0e3d6e7aac2a47a7c2978 SHA256 9b924c2f000a0b36ec4ae72942f70ea17a751db3ad45125800658d4bbc048036
-EBUILD pycha-0.5.3.ebuild 513 RMD160 a1beaf434fcc6eb8c7142c5f3f1dc7b5b9f52bc8 SHA1 6155d73f1908c2bf65e77e22535935ef6a925c2d SHA256 9d869fd8553b23e8610bac567e71fff1bae200b50a6ebb1668a4ba9a3edc3b66
-MISC ChangeLog 557 RMD160 e2a0ef7713c3760afe53d79c2a25a9e430a7e930 SHA1 b03f96156294b22f43a631d785468c2fc6488b25 SHA256 15f2917eac33070e43058fc44b5c013e505afb9178ce9c403252760ddb475943
-MISC metadata.xml 388 RMD160 d1168481f4d8bf8ad4e3e86e48b5988e27ab844c SHA1 310358b2ff80d730af061eddbe104fa57e6ddb9a SHA256 5a9041b890d089854d094df03ddc2bc122a1b28007d0c4d15262d28dfcf07d5e
diff --git a/dev-python/pycha/pycha-0.5.3.ebuild b/dev-python/pycha/pycha-0.5.3.ebuild
deleted file mode 100644
index d57f805..0000000
--- a/dev-python/pycha/pycha-0.5.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.4"
-
-inherit distutils
-
-DESCRIPTION="Pycha is a very simple Python package for drawing charts using the great Cairo library."
-HOMEPAGE="http://bitbucket.org/lgs/pycha/wiki/Home"
-SRC_URI="http://pypi.python.org/packages/source/p/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="dev-python/pycairo"
-
diff --git a/dev-python/pyevolve/Manifest b/dev-python/pyevolve/Manifest
deleted file mode 100644
index 18d667b..0000000
--- a/dev-python/pyevolve/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Pyevolve-0.6rc1.tar.gz 2362561 RMD160 56a2b5ac007a6187d38b3d970fdac8169a767427 SHA1 8884e6f712f6f96dfc0112cb46a9b361d33eb4b1 SHA256 23ce2d97ed64a195073ef8e1569e20a4512f420c76bb9389c24f214d72945828
-EBUILD pyevolve-0.6_rc1.ebuild 572 RMD160 b4a7d206c6c283bdf3c3f52ba921e6ca4cf2177f SHA1 21e38ffdf31667e0ed103ea21e20c709107a3cb3 SHA256 b147a4c9146e3eaf20f1ef8063e2dde80a2c026f75d139bcf92b120919f6db66
diff --git a/dev-python/pyevolve/pyevolve-0.6_rc1.ebuild b/dev-python/pyevolve/pyevolve-0.6_rc1.ebuild
deleted file mode 100644
index 4a025fc..0000000
--- a/dev-python/pyevolve/pyevolve-0.6_rc1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-PYTHON_DEPEND="2:2.5"
-
-inherit distutils eutils
-
-DESCRIPTION="Pyevolve is a complete genetic algorithm framework in pure Python."
-HOMEPAGE="http://pyevolve.sourceforge.net"
-SRC_URI="mirror://sourceforge/Pyevolve/0.6rc1/Pyevolve-0.6rc1.tar.gz"
-
-LICENSE="PSF"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+matplotlib"
-
-DEPEND="virtual/python
- dev-python/setuptools
- matplotlib? ( dev-python/matplotlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/Pyevolve-0.6rc1"
diff --git a/dev-python/python-graph/Manifest b/dev-python/python-graph/Manifest
deleted file mode 100644
index 3a675fc..0000000
--- a/dev-python/python-graph/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-graph-1.8.0.tar.bz2 193745 RMD160 4b52f871719862f6bc9349bbaffea9623132d594 SHA1 2ab1d261c03a58649bb3e8d75be4b9961e1dad2a SHA256 3c69bae0faa25b1c066801be401b59084f9a8f75cace3add0d09026ed92a56f5
diff --git a/dev-python/python-graph/python-graph-1.8.0.ebuild b/dev-python/python-graph/python-graph-1.8.0.ebuild
deleted file mode 100644
index ec8669e..0000000
--- a/dev-python/python-graph/python-graph-1.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6 3"
-
-inherit python distutils
-
-DESCRIPTION="python-graph is a library for working with graphs in Python."
-HOMEPAGE="http://code.google.com/p/python-graph/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pydot"
-
-RDEPEND="virtual/python
- pydot? ( media-gfx/pydot )"
-DEPEND="${RDEPEND}
- dev-python/setuptools"
-
-S="${S}/core"
-
-src_prepare() {
- if use pydot; then
- cp ${S}/../dot/pygraph/readwrite/dot.py ${S}/pygraph/readwrite/
- fi
- distutils_src_prepare
-}
diff --git a/dev-python/south/Manifest b/dev-python/south/Manifest
deleted file mode 100644
index edeeb12..0000000
--- a/dev-python/south/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST South-0.6.2.tar.gz 51537 RMD160 4a1556129cd7f3dbbf4262b0fd02e0a71e48fce6 SHA1 d6b2cb0afebef643a24346127dacc7bb21b3bc7c SHA256 8595c14b397fa8cf57362095946da445cbd24a1aa9c9c07f943f42d75c971794
-EBUILD south-0.6.2.ebuild 560 RMD160 e3fe895f9eb92c8c132e99e2347d442ee9d8db00 SHA1 552741cbbe56cac4018e367fcb250c7aaa7f8de0 SHA256 0beef29c6f67acffeace5857083fbb26917b37a06fc1a2878ac5546505f9b623
-MISC ChangeLog 233 RMD160 13668909933dc70e0a05b0d25c762c478def0c24 SHA1 b59f8ad2ecb4956c60afc8459425d7feb922f047 SHA256 be7422e2eefcbb8b9c6e96f75db1f9a72815fa41c8b4c69e1cdfb41e4fccced7
-MISC metadata.xml 471 RMD160 4da799cb1fa8025e7584d9c3808dc24603d0887f SHA1 407e287eacc13d4272c8192f4f91283e54d49d3b SHA256 61a87735beed9b1bd6c802745fafba5e1f65f6d3abaedb747075a08a18886d6f
diff --git a/dev-python/south/south-0.6.2.ebuild b/dev-python/south/south-0.6.2.ebuild
deleted file mode 100644
index fc36f72..0000000
--- a/dev-python/south/south-0.6.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.4
-
-inherit distutils
-
-DESCRIPTION="South: Migrations for Django"
-HOMEPAGE="http://south.aeracode.org/"
-SRC_URI="http://pypi.python.org/packages/source/S/South/South-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="postgres mysql sqlite"
-
-DEPEND="dev-python/setuptools"
-RDEPEND="postgres? ( virtual/postgresql-base )
- mysql? ( virtual/mysql )
- sqlite? ( dev-db/sqlite )"
-
-S=${WORKDIR}/South-${PV}
diff --git a/dev-python/visual/Manifest b/dev-python/visual/Manifest
index 8332b4b..cf0d13b 100644
--- a/dev-python/visual/Manifest
+++ b/dev-python/visual/Manifest
@@ -1,2 +1,4 @@
DIST visual-5.4_release.tar.bz2 2695774 RMD160 f16fbd592b483332d4b6330a221e888618ccdcf9 SHA1 81a23b6a46c71bfd3305555a460e59ba7e49633f SHA256 7d32ddc4e6c0fce5be961b200c29cdf8d3f7459157b7bfd6a661cace93728c87
DIST visual-5.72_release.tar.bz2 5742709 RMD160 51a6deb152ba4b93b391cae6ab8df8375cf50933 SHA1 7d49e9a93f34692cdd0cbf030fa9a5be99391560 SHA256 02e28e33f0a813c6823c10d4821f2afa9366513e5f1a3392e01b012599f15f6d
+EBUILD visual-5.4-r1.ebuild 1959 RMD160 54354ca632c0035d86fa15f5dfa262adf1a74b9e SHA1 51cf943a1a8e134a4b71c76a6a62a2011e673777 SHA256 ac6eeddfd7edd21481af7a6c7e1a48eaef2a2e46f582fd70a407af8a53cb380d
+EBUILD visual-5.72.ebuild 1959 RMD160 54354ca632c0035d86fa15f5dfa262adf1a74b9e SHA1 51cf943a1a8e134a4b71c76a6a62a2011e673777 SHA256 ac6eeddfd7edd21481af7a6c7e1a48eaef2a2e46f582fd70a407af8a53cb380d
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
deleted file mode 100644
index 92cc2ae..0000000
--- a/media-libs/opencv/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX opencv-1.1.0_pre1-libtool.patch 425 RMD160 677c2dee8aba8b5170eabc39528f904f58ec9f43 SHA1 90fb1baa007e0137a6113fe526528198e0660445 SHA256 603b333a005fcf8dbd87d43264dbd67f10de740b92f1cabf70a01799b2e312c3
-AUX opencv-1.1.0_pre1-link.patch 1264 RMD160 9b189456b9d7c089c61755368950e47f9e6bb716 SHA1 2430a3028c02729038b447f4a90fffa9c2bd86a9 SHA256 5535327774d5062ff24a6ac26d874db1377cbd64f1e1052b65e8f4557f8b145b
-AUX opencv-1.1.0_pre1-stereorectify.patch 1409 RMD160 0b317df1cb2a2b61be6e673b1b52ecf836b0e7cf SHA1 2a4d841dac0882de2087bcf7c495045b4639d142 SHA256 2a25dd7b7cf968dfbac143a1cfbd1a5afaaafb2fceb62e60d51d21220139c8af
-AUX opencv-2.0.0-multilib.patch 5557 RMD160 f3b9114b3c69b74ec48cf399c0b4a091b888213b SHA1 9ef9e91d147e34325bf16aa70ac18af0ca2709ff SHA256 133bf0b2b757f422bbecf36c8273ac80e72d12c4063a8d818bffa9bb6f570e73
-DIST opencv-1.1pre1.tar.gz 22301291 RMD160 d105a97f211637edbbac1eb21dca2b140b1f37be SHA1 4bc4bda92a250adcb82b236161d364c059021a43 SHA256 7e4f0026e5543c38afcf8a4298b1da2bace977499f99b885c925fc784783d812
-EBUILD opencv-1.1.0_pre1.ebuild 2199 RMD160 f550df98b58a352cf06772eda1cb094cb04fe03f SHA1 598b691bb5932df387b1f7f3bb9fec05c7310400 SHA256 3bf985bc9040c62311b25ae1372fb3f71c6148b6ce215982f2c27001a89c7699
-EBUILD opencv-9999.ebuild 1640 RMD160 a32c3e8e8ecfc7d7881a6b6a058ec105c4dc75ab SHA1 0d49e75567fea8f7e951f84cf4993a4c6db0e4b0 SHA256 0630fcb45e20d40d7b1a92aa42cd58ce6b065f44942807346ff21b0e712cdc0d
-MISC ChangeLog 1173 RMD160 671403715ed2d7e733ac23ae0ca9d1db5544e00b SHA1 9988a99aa9ecacb44cec8dc2d68a51081807e270 SHA256 84e2682b7f86604070d00922e94d8e7b1803da31e6a8582949d7ff602b7006e6
-MISC metadata.xml 758 RMD160 bdfc7cd1bf469fe5951429333659946f377faa48 SHA1 812545f8fab4fc2304006b8ebc6bfcb1155cc519 SHA256 7468b2722153f29842e40153f877e1bd980ef617f46a3f438b686b2f1a9f1dea
diff --git a/media-libs/opencv/files/opencv-1.1.0_pre1-libtool.patch b/media-libs/opencv/files/opencv-1.1.0_pre1-libtool.patch
deleted file mode 100644
index 63c725f..0000000
--- a/media-libs/opencv/files/opencv-1.1.0_pre1-libtool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- opencv-1.1.0/configure.in.orig
-+++ opencv-1.1.0/configure.in
-@@ -37,7 +37,7 @@
- AC_INIT([opencv],[opencv_version],[opencvlibrary-devel@lists.sourceforge.net])
- AC_CONFIG_SRCDIR([opencv.pc.in])
- AC_CONFIG_AUX_DIR([autotools])
--AC_CONFIG_MACRO_DIR([autotools/aclocal])
-+#AC_CONFIG_MACRO_DIR([autotools/aclocal])
-
- # put CVS revision of this configure.in into the resulting configure script
- AC_REVISION($Revision: 1.60 $)
diff --git a/media-libs/opencv/files/opencv-1.1.0_pre1-link.patch b/media-libs/opencv/files/opencv-1.1.0_pre1-link.patch
deleted file mode 100644
index a72c2c8..0000000
--- a/media-libs/opencv/files/opencv-1.1.0_pre1-link.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- interfaces/swig/python/Makefile.am.orig
-+++ interfaces/swig/python/Makefile.am
-@@ -122,20 +122,17 @@
- cv.i imagedata.i cvarr.i nointpb.i pytypemaps.i cvseq.i cvshadow.i
- _cv_la_CXXFLAGS = $(PYTHON_CSPEC)
- _cv_la_LIBADD = $(top_builddir)/cv/src/libcv.la
--_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
-- -L$(SWIG_PYTHON_LIBS)
-+_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC)
-
- _ml_la_SOURCES = _ml.cpp pyhelpers.cpp pyhelpers.h
- _ml_la_CXXFLAGS = $(PYTHON_CSPEC)
- _ml_la_LIBADD = $(top_builddir)/ml/src/libml.la
--_ml_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
-- -L$(SWIG_PYTHON_LIBS)
-+_ml_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC)
-
- _highgui_la_SOURCES = _highgui.cpp pyhelpers.cpp pyhelpers.h \
- highgui.i
- _highgui_la_CXXFLAGS = $(PYTHON_CSPEC)
- _highgui_la_LIBADD = $(top_builddir)/otherlibs/highgui/libhighgui.la
--_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
-- -L$(SWIG_PYTHON_LIBS)
-+_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC)
-
- endif
diff --git a/media-libs/opencv/files/opencv-1.1.0_pre1-stereorectify.patch b/media-libs/opencv/files/opencv-1.1.0_pre1-stereorectify.patch
deleted file mode 100644
index 0c16cbe..0000000
--- a/media-libs/opencv/files/opencv-1.1.0_pre1-stereorectify.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- opencv-1.1.0/cv/src/cvcalibration.cpp.orig
-+++ opencv-1.1.0/cv/src/cvcalibration.cpp
-@@ -2337,20 +2337,28 @@
-
- fc = cvmGet(A,idx^1,idx^1);
- if( dk1 < 0 )
-- fc *= 1 + 0.2*dk1*(nx*nx + ny*ny)/(8*fc*fc);
-+ fc *= 1 + dk1*(nx*nx + ny*ny)/(4*fc*fc);
- fc_new = MIN(fc_new, fc);
-
- for( i = 0; i < 4; i++ )
- {
-- _pts[i].x = (float)(((i % 2) + 0.5)*nx*0.5);
-- _pts[i].y = (float)(((i / 2) + 0.5)*ny*0.5);
-- }
-+ int j = (i<2) ? 0 : 1;
-+ _pts[i].x = (float)((i % 2)*(nx-1));
-+ _pts[i].y = (float)(j*(ny-1));
-+ }
- cvUndistortPoints( &pts, &pts, A, Dk, 0, 0 );
- cvConvertPointsHomogeneous( &pts, &pts_3 );
-- cvProjectPoints2( &pts_3, k == 0 ? _R1 : _R2, &Z, A, 0, &pts );
-+ //Change camera matrix to have cc=[0,0] and fc = fc_new
-+ double _a_tmp[3][3];
-+ CvMat A_tmp = cvMat(3, 3, CV_64F, _a_tmp);
-+ _a_tmp[0][0]=fc_new;
-+ _a_tmp[1][1]=fc_new;
-+ _a_tmp[0][2]=0.0;
-+ _a_tmp[1][2]=0.0;
-+ cvProjectPoints2( &pts_3, k == 0 ? _R1 : _R2, &Z, &A_tmp, 0, &pts );
- CvScalar avg = cvAvg(&pts);
-- cc_new[k].x = avg.val[0];
-- cc_new[k].y = avg.val[1];
-+ cc_new[k].x = (nx-1)/2 - avg.val[0];
-+ cc_new[k].y = (ny-1)/2 - avg.val[1];
- }
-
- // vertical focal length must be the same for both images to keep the epipolar constraint
-
-
diff --git a/media-libs/opencv/files/opencv-2.0.0-multilib.patch b/media-libs/opencv/files/opencv-2.0.0-multilib.patch
deleted file mode 100644
index 9df1373..0000000
--- a/media-libs/opencv/files/opencv-2.0.0-multilib.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Naur OpenCV-2.0.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.0.0/3rdparty/flann/CMakeLists.txt
---- OpenCV-2.0.0.orig/3rdparty/flann/CMakeLists.txt 2009-09-30 20:21:00.000000000 -0400
-+++ OpenCV-2.0.0/3rdparty/flann/CMakeLists.txt 2009-10-16 08:51:29.000000000 -0400
-@@ -86,8 +86,8 @@
- INSTALL (
- TARGETS flann flann_s
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
- )
-
- # INSTALL (
-diff -Naur OpenCV-2.0.0.orig/CMakeLists.txt OpenCV-2.0.0/CMakeLists.txt
---- OpenCV-2.0.0.orig/CMakeLists.txt 2009-09-30 20:21:05.000000000 -0400
-+++ OpenCV-2.0.0/CMakeLists.txt 2009-10-16 10:28:51.000000000 -0400
-@@ -405,8 +405,8 @@
-
- string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
- if(UNIX)
-- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
-- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
-+ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
-+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
- endif()
- if(WIN32)
- get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
-diff -Naur OpenCV-2.0.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.0.0/interfaces/ffopencv/CMakeLists.txt
---- OpenCV-2.0.0.orig/interfaces/ffopencv/CMakeLists.txt 2009-09-30 20:20:57.000000000 -0400
-+++ OpenCV-2.0.0/interfaces/ffopencv/CMakeLists.txt 2009-10-16 08:54:26.000000000 -0400
-@@ -33,5 +33,5 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
- )
-diff -Naur OpenCV-2.0.0.orig/src/cv/CMakeLists.txt OpenCV-2.0.0/src/cv/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/cv/CMakeLists.txt 2009-09-30 20:20:58.000000000 -0400
-+++ OpenCV-2.0.0/src/cv/CMakeLists.txt 2009-10-16 08:52:46.000000000 -0400
-@@ -66,8 +66,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION include/opencv
-diff -Naur OpenCV-2.0.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.0.0/src/cvaux/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/cvaux/CMakeLists.txt 2009-09-30 20:20:59.000000000 -0400
-+++ OpenCV-2.0.0/src/cvaux/CMakeLists.txt 2009-10-16 08:52:29.000000000 -0400
-@@ -76,8 +76,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${aux_hdrs_ext}
- DESTINATION include/opencv
-diff -Naur OpenCV-2.0.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.0.0/src/cxcore/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/cxcore/CMakeLists.txt 2009-09-30 20:20:59.000000000 -0400
-+++ OpenCV-2.0.0/src/cxcore/CMakeLists.txt 2009-10-16 08:50:19.000000000 -0400
-@@ -66,8 +66,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- # install each module headers separately
- install(FILES ${lib_hdrs}
-diff -Naur OpenCV-2.0.0.orig/src/highgui/CMakeLists.txt OpenCV-2.0.0/src/highgui/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/highgui/CMakeLists.txt 2009-09-30 20:20:58.000000000 -0400
-+++ OpenCV-2.0.0/src/highgui/CMakeLists.txt 2009-10-16 08:53:18.000000000 -0400
-@@ -206,8 +206,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${highgui_ext_hdrs}
- DESTINATION include/opencv
-diff -Naur OpenCV-2.0.0.orig/src/ml/CMakeLists.txt OpenCV-2.0.0/src/ml/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/ml/CMakeLists.txt 2009-09-30 20:20:59.000000000 -0400
-+++ OpenCV-2.0.0/src/ml/CMakeLists.txt 2009-10-16 08:51:57.000000000 -0400
-@@ -61,8 +61,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION include/opencv
-diff -Naur OpenCV-2.0.0.orig/tests/cxts/CMakeLists.txt OpenCV-2.0.0/tests/cxts/CMakeLists.txt
---- OpenCV-2.0.0.orig/tests/cxts/CMakeLists.txt 2009-09-30 20:20:56.000000000 -0400
-+++ OpenCV-2.0.0/tests/cxts/CMakeLists.txt 2009-10-16 08:53:47.000000000 -0400
-@@ -63,6 +63,6 @@
- if(WIN32)
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
- endif()
diff --git a/media-libs/opencv/opencv-1.1.0_pre1.ebuild b/media-libs/opencv/opencv-1.1.0_pre1.ebuild
deleted file mode 100644
index fe51931..0000000
--- a/media-libs/opencv/opencv-1.1.0_pre1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="1"
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
-HOMEPAGE="http://www.intel.com/technology/computing/opencv/index.htm"
-SRC_URI="mirror://sourceforge/${PN}library/${PN}-1.1pre1.tar.gz"
-
-##If video for linux is enabled, add GPL-2, since it will need to use GPL-2
-##stuff, same for v4l
-LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) Intel"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug demos ffmpeg gtk ieee1394 jpeg jpeg2k openexr png python tiff xine v4l zlib"
-
-COMMON_DEPEND="ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
- gtk? ( x11-libs/gtk+:2 )
- ieee1394? ( >=sys-libs/libraw1394-1.2.0 media-libs/libdc1394:1 )
- jpeg? ( media-libs/jpeg )
- jpeg2k? ( media-libs/jasper )
- openexr? ( media-libs/openexr )
- png? ( media-libs/libpng:1.2 )
- python? ( >=dev-lang/python-2.3 >=dev-lang/swig-1.3.30 )
- tiff? ( media-libs/tiff )
- xine? ( media-libs/xine-lib )
- zlib? ( sys-libs/zlib )"
-
-DEPEND="${COMMON_DEPEND}
- gtk? ( dev-util/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-1.1.0"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # remove the install-hook that runs ldconfig.
- sed -i '/install-hook:/,/^$/d' Makefile.am
-
- epatch "${FILESDIR}"/${P}-libtool.patch
- epatch "${FILESDIR}"/${P}-link.patch
- epatch "${FILESDIR}"/${P}-stereorectify.patch
-
- eautoreconf || die "eautoreconf failed"
-}
-
-src_compile() {
- use debug && filter-ldflags -O1 -Wl --enable-new-dtags -s
- filter-ldflags -L
-
- local myconf="--without-quicktime"
- use python && myconf="${myconf} --with-swig --with-python" \
- || myconf="${myconf} --without-swig --without-python"
-
- econf \
- ${myconf} \
- $(use_with gtk) \
- $(use_with xine) \
- $(use_with ffmpeg) \
- $(use_with ieee1394 1394libs) \
- $(use_with v4l) \
- $(use_enable debug) \
- $(use_enable demos apps)
- emake || die "Emake failed"
-}
-
-src_test() {
- emake check || die "Tests failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Install failed"
- dodoc AUTHORS ChangeLog README NEWS TODO
- insinto /usr/share/doc/${P}
- doins -r docs/
-}
diff --git a/media-libs/opencv/opencv-9999.ebuild b/media-libs/opencv/opencv-9999.ebuild
deleted file mode 100644
index ea5802d..0000000
--- a/media-libs/opencv/opencv-9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit eutils cmake-utils subversion
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
-HOMEPAGE="http://opencv.willowgarage.com"
-
-ESVN_REPO_URI="https://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk/opencv"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug python ieee1394 ffmpeg gstreamer gtk jpeg2k jpeg png tiff v4l xine zlib"
-
-COMMON_DEPEND="python? ( >=dev-lang/python-2.5 >=dev-lang/swig-1.3.30 )
- ieee1394? ( >=sys-libs/libraw1394-1.2.0 media-libs/libdc1394:1 )
- ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
- gstreamer? ( media-libs/gstreamer )
- gtk? ( x11-libs/gtk+:2 )
- jpeg2k? ( media-libs/jasper )
- jpeg? ( media-libs/jpeg )
- png? ( media-libs/libpng:1.2 )
- tiff? ( media-libs/tiff )
- xine? ( media-libs/xine-lib )
- zlib? ( sys-libs/zlib )"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-util/cmake-2.6
- dev-util/pkgconfig"
-RDEPEND="${COMMON_DEPEND}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_configure() {
- use python && mycmakeargs="${mycmakeargs} -DBUILD_PYTHON_SUPPORT=ON" \
- || mycmakeargs="${mycmakeargs} -DBUILD_PYTHON_SUPPORT=OFF"
- mycmakeargs="${mycmakeargs} \
- $(cmake-utils_use_with ieee1394 1394) \
- $(cmake-utils_use_with ffmpeg) \
- $(cmake-utils_use_with gstreamer) \
- $(cmake-utils_use_with gtk) \
- $(cmake-utils_use_with jpeg2k jasper) \
- $(cmake-utils_use_with jpeg) \
- $(cmake-utils_use_with png) \
- $(cmake-utils_use_with tiff) \
- $(cmake-utils_use_with v4l) \
- $(cmake-utils_use_with xine)"
- cmake-utils_src_configure
-}
diff --git a/media-sound/pykaraoke/Manifest b/media-sound/pykaraoke/Manifest
index 36913f7..887715d 100644
--- a/media-sound/pykaraoke/Manifest
+++ b/media-sound/pykaraoke/Manifest
@@ -1,4 +1,2 @@
DIST pykaraoke-0.7.3.zip 871803 RMD160 75e5f35558371128b658d801de101407a4d3ddd5 SHA1 e5d7e719d9a8fa9daee186989b0419bcbfc97437 SHA256 9f0a5d9cdad0ecc1408898659e15f070713f9ff1de7459b07b24ba45ef5eb2f5
EBUILD pykaraoke-0.7.3.ebuild 538 RMD160 4a2d2cc1f1ed29b967d51bf50ba54ae39202b252 SHA1 3c5b8a8e1684c62450594ca1909daf0ef37b654e SHA256 a7b4c44d215555eee727a96b3ad311975a43cf4538f378189ce6746d6c15851c
-MISC ChangeLog 247 RMD160 5373191bfde202782e7fa43997a8d8c0491cb840 SHA1 5276ca6f6d5ac4c024cb4ac179c441e1f83796d3 SHA256 add3747c53cb8fd867ffb2e57bd5d6eca9794cb76093edd62bc24d6264239d89
-MISC metadata.xml 603 RMD160 126d3ef3933f3e44460c7328b1619fdadb9c7424 SHA1 0a9d03409e1c33d413ac93f5116c88d22aee705a SHA256 aa90503ec36b3598c93747f76fede5fab6be91d9a24d7779c57da54a2009baab
diff --git a/media-tv/entertainer/Manifest b/media-tv/entertainer/Manifest
index 4a9de01..71d3591 100644
--- a/media-tv/entertainer/Manifest
+++ b/media-tv/entertainer/Manifest
@@ -1,4 +1,2 @@
DIST entertainer-0.5.1.tar.gz 1573414 RMD160 396e892b830a144c82fd55125a9a4aebc71e228a SHA1 898a30c64242d9889e2e27093a409daf7ac741c3 SHA256 6b1d9ef54649b11e208c23eff76c2daab3565c081a7cad52281d4a4c8c5fe623
EBUILD entertainer-0.5.1.ebuild 845 RMD160 3b06be770cf432d1bafc255818eca11618a17bf4 SHA1 bed40910ffa3d80eaa6a1435a71067aa97b1b8be SHA256 7a51036061d220d28e46257aa378fe07ed75edc5feefc138bb8c57995509fdf2
-MISC ChangeLog 247 RMD160 7eeff2e82b787452ba9014909524e6a701ba6055 SHA1 cbba5fb4b5fbb6be5fef95a74938d105583bc7f1 SHA256 bc7adc3541e5301b7ac87a5bffd808ae3757536f2fcacad81748ce8c9779fbf1
-MISC metadata.xml 383 RMD160 5a0449f109e8313cdf8d0a3b43080097bdd447ee SHA1 7acb523c2665f414e50f0e0b98bc63e61b1214d2 SHA256 97b7e75d60801e7aafaf239e692fa4b906eb5ee128cebe7d99acb86ef40f85f8
diff --git a/net-misc/bti/Manifest b/net-misc/bti/Manifest
index b4fd700..a5ea52e 100644
--- a/net-misc/bti/Manifest
+++ b/net-misc/bti/Manifest
@@ -1,4 +1,2 @@
DIST bti-023.tar.bz2 83208 RMD160 08f9ca9087adf18843d0e2f72ba48506d079b839 SHA1 0f69809ff83d772ed1cab6422f75031b0e013c9a SHA256 f87223a4de16934d754675450fd7230d46c63b98256bcee7aaa042eb296e10c6
EBUILD bti-023.ebuild 529 RMD160 da9bbe7733a9a4e437017a98296a55544b4e143a SHA1 92a4d067c182e7345b2199aca92792e225baef24 SHA256 1158f8d132a8049c121aff4ebe53bc7c86258074653905bfbd53c2c9ba6fcfc1
-MISC ChangeLog 437 RMD160 b95feaa5f57a17540603b8c5b4dad453d6860a31 SHA1 a9d3b5f5961553b9787460de8ae6beb061e3ebbf SHA256 61ff83c4a24f0e90d80ecbf4a98c3884490fc9be38fa7f98c8f0e8a28dcda76b
-MISC metadata.xml 373 RMD160 3944143d52519de861c38874f8a8d00e3218f0a5 SHA1 565bc409f5934d4d7c7d3dfa00133a0f1931c581 SHA256 e9aad6dac4ba4e3da04b47dc4347c4de8e2e1e23234adc1f3d13d8c7b4d81d51
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 2088612..21be7b8 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,4 +1,2 @@
DIST retroshare-pkg-linux-src-v0.4.09b.tgz 11840516 RMD160 a6e58d747d46e262b9838b0f85c38dbc678a10a7 SHA1 3d701bfddd47bc7986611565184473fa3e74b710 SHA256 815c20acdc24510de8c2f7824e0bee4f143f8838993cf3554c77ae0045caa22c
EBUILD retroshare-0.4.09b.ebuild 5001 RMD160 afaedaa290fd0a99838f9aa75a09cc9879696d7d SHA1 b17b35103ea4a975b14ee0df849fee03d1939ccf SHA256 f08405d0e4ac008768cb9153cb52790f7a87ca7abfdd6ed32881670c00d25b32
-MISC ChangeLog 249 RMD160 82606ecf683f64046d21a2b779b01682e6b49d04 SHA1 3e6429c997c2b158c70f2989c38c2e67542015ab SHA256 4454e6aa4a4de38bf40118ff6a23c752c0da77593db90cf5883f3d085f83f591
-MISC metadata.xml 395 RMD160 ee5d871be67bcfb1ad483d8b709df30d9c87d153 SHA1 a0f3e86241de893cdddc6747925e65a3e216705e SHA256 2daad30e1153b9fb2d5b76052a05f3ed3285288b8ce09d9c9aeddfa4358028b6
diff --git a/sci-libs/gandalf/Manifest b/sci-libs/gandalf/Manifest
index 8f655c1..ed6c32c 100644
--- a/sci-libs/gandalf/Manifest
+++ b/sci-libs/gandalf/Manifest
@@ -1,5 +1,3 @@
AUX gandalf-1.6-destdir.patch 785 RMD160 d872cf4de289e9a7a6bf643085b8406c2ad5427a SHA1 aae55085db0b1aff9d698743d946772803308b0e SHA256 4848323251d5bcd45e5034778269923eacce03ec77f34027b32d17e8d65bec33
DIST gandalf.1.6.tar.gz 6731606 RMD160 8a986ffc7f1230cf9390982e583772f3ce0de697 SHA1 8e75dc0f96b47fa808b5f0bd70f5aed5b07fcb3c SHA256 2ad526966623e67637c4c7c7ca10b8b096f9c9c1d5727439b799aaea480e4d83
EBUILD gandalf-1.6.ebuild 1222 RMD160 4a90b3e9c47086fa65b3f2c1aea8c6f67bbf1f12 SHA1 7ef1180dcf938c0a7ec377f4fd1b0b86269c01d5 SHA256 0a1bbf993b4a627f5c580b7e79788136d54eb6d2a2ad0bdb2664849a999bfeda
-MISC ChangeLog 234 RMD160 0a98ce3c637a10fc23c2915e868dfa2e2713b045 SHA1 2012b066e671f4bd083d153ebd09809c42f5bae0 SHA256 b2c38183097f60678dd8ad6b24f523d5ec401767c157477cc707b9335c584f14
-MISC metadata.xml 548 RMD160 934461cbe8f963afad8b7d49cdb359c70aebfd4c SHA1 2936adfee2a889791a80c90a9b5bc98180f69d66 SHA256 c17a9905979f2fb3c0cc9b8bd0035792476857db001f57bde20d105d612e8da7
diff --git a/sci-libs/pydsscc/Manifest b/sci-libs/pydsscc/Manifest
deleted file mode 100644
index 4b786b5..0000000
--- a/sci-libs/pydsscc/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST pydsscc-0.2.0.tar.bz2 33280 RMD160 3ac20888e10b500f30ae51805beeb842fa693807 SHA1 ddbf021a803ca3b9a4d43c41d6ff88414ad9b16d SHA256 3c96f8e32a1ffbd3d728a6878c9d588c00a2e57a452ca03deaedc33ba46fad6c
-DIST pydsscc-0.3.1.tar.bz2 36788 RMD160 1a13db62501af7539760cbf273c0ef1c59c58821 SHA1 64700ebcd63b333b76b22e955a80caf4808e6703 SHA256 bb611b4c41e559b5ed4ab6c62f8f9c2ff21b949d99cfdcf7803ca29a725da066
-DIST pydsscc-0.3.2.tar.bz2 22248 RMD160 f5e47aaacab3a1cec1209e0a121ac03b75ba97b3 SHA1 4c75f5f85bbe94284b2829343efe8d6a400a5f67 SHA256 3545c4eb645493f372df5aabd5d30773b029eb2487daf30565bc0a5ec0a6669b
-EBUILD pydsscc-0.2.0.ebuild 550 RMD160 f9f2cd1e06b1592002e507c677546462333875b3 SHA1 0263956cb0c2097392c2c4586e6a0cb08741351d SHA256 8cfe5f4a511ed2e65af05261a272118fcef6bb6a62512791f8d5f3f25d6696c0
-EBUILD pydsscc-0.3.1.ebuild 677 RMD160 e89d81df5aacc10302ff7a8e802c6933e39ee69f SHA1 4b84ff38457badf35d85f3df99ed1a370a24b658 SHA256 9b24f07989e5c72d4a81f13fa444b9985b5fe729b51153f819097fdd45dd612a
-EBUILD pydsscc-0.3.2.ebuild 677 RMD160 e89d81df5aacc10302ff7a8e802c6933e39ee69f SHA1 4b84ff38457badf35d85f3df99ed1a370a24b658 SHA256 9b24f07989e5c72d4a81f13fa444b9985b5fe729b51153f819097fdd45dd612a
-EBUILD pydsscc-9999.ebuild 713 RMD160 57facf5e732e27cadb7b0d296314c1e9a7088a94 SHA1 59542941457ec93110e8cf8eca6140159c752a84 SHA256 32644e0e263ca09874ace1e8c517064da895090a2982fcc188661899f6e106bd
-MISC ChangeLog 888 RMD160 e62306baf85e679874133664d1fbb63d786fc555 SHA1 644e3bcfb4ff7d21ea27f32221a2ffac3b66dad0 SHA256 935bc2b9c96ce2b8d30bf0424262ca015353670322c44a236959fc7ed794b52d
-MISC metadata.xml 396 RMD160 ef5f0ee9357d8aa9caec57a5574c4285f3c517ee SHA1 df94a398f383ab1839fb2c0ad746a1da92e857eb SHA256 59be91d7d7bbfe2dec8a89866472eccac26180795f1247d0267b70265b3d6665
diff --git a/sci-libs/pydsscc/pydsscc-0.2.0.ebuild b/sci-libs/pydsscc/pydsscc-0.2.0.ebuild
deleted file mode 100644
index b3d738e..0000000
--- a/sci-libs/pydsscc/pydsscc-0.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.4
-
-inherit distutils eutils
-
-DESCRIPTION="PyDSSCC - Calibration Software for Distributed Smart Stereo
-Cameras"
-HOMEPAGE="http://www.mavrinac.com/index.cgi?page=pydsscc"
-SRC_URI="http://www.mavrinac.com/files/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/python
- >=dev-python/numpy-1.0.4"
-DEPEND="${RDEPEND}
- dev-python/setuptools"
-
-DOCS="AUTHORS README TODO"
diff --git a/sci-libs/pydsscc/pydsscc-0.3.1.ebuild b/sci-libs/pydsscc/pydsscc-0.3.1.ebuild
deleted file mode 100644
index f922c00..0000000
--- a/sci-libs/pydsscc/pydsscc-0.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.4
-
-inherit distutils eutils
-
-DESCRIPTION="PyDSSCC - Calibration Software for Distributed Smart Stereo
-Cameras"
-HOMEPAGE="http://www.mavrinac.com/index.cgi?page=pydsscc"
-SRC_URI="http://www.mavrinac.com/files/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE="doc"
-
-RDEPEND="virtual/python
- >=dev-python/numpy-1.0.4"
-DEPEND="${RDEPEND}
- dev-python/setuptools
- doc? ( dev-python/epydoc )"
-
-DOCS="AUTHORS README TODO"
-
-src_install() {
- distutils_src_install
- if use doc; then
- ./gendoc.sh
- dohtml -r doc/
- fi
-}
diff --git a/sci-libs/pydsscc/pydsscc-0.3.2.ebuild b/sci-libs/pydsscc/pydsscc-0.3.2.ebuild
deleted file mode 100644
index f922c00..0000000
--- a/sci-libs/pydsscc/pydsscc-0.3.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.4
-
-inherit distutils eutils
-
-DESCRIPTION="PyDSSCC - Calibration Software for Distributed Smart Stereo
-Cameras"
-HOMEPAGE="http://www.mavrinac.com/index.cgi?page=pydsscc"
-SRC_URI="http://www.mavrinac.com/files/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE="doc"
-
-RDEPEND="virtual/python
- >=dev-python/numpy-1.0.4"
-DEPEND="${RDEPEND}
- dev-python/setuptools
- doc? ( dev-python/epydoc )"
-
-DOCS="AUTHORS README TODO"
-
-src_install() {
- distutils_src_install
- if use doc; then
- ./gendoc.sh
- dohtml -r doc/
- fi
-}
diff --git a/sci-libs/pydsscc/pydsscc-9999.ebuild b/sci-libs/pydsscc/pydsscc-9999.ebuild
deleted file mode 100644
index 5a905bd..0000000
--- a/sci-libs/pydsscc/pydsscc-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.4
-
-EGIT_REPO_URI="git://commander.mavrinac.com/${PN}.git"
-EGIT_BRANCH="master"
-
-inherit distutils eutils git
-
-DESCRIPTION="PyDSSCC - Calibration Software for Distributed Smart Stereo
-Cameras"
-HOMEPAGE="http://www.mavrinac.com/index.cgi?page=pydsscc"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="virtual/python
- >=dev-python/numpy-1.0.4"
-DEPEND="${RDEPEND}
- dev-python/setuptools
- doc? ( dev-python/epydoc )"
-
-DOCS="AUTHORS README TODO"
-
-src_install() {
- distutils_src_install
- if use doc; then
- ./gendoc.sh
- dohtml -r doc/
- fi
-}
diff --git a/sci-misc/swarm/Manifest b/sci-misc/swarm/Manifest
index 6cd9346..66861f0 100644
--- a/sci-misc/swarm/Manifest
+++ b/sci-misc/swarm/Manifest
@@ -1,5 +1,3 @@
AUX swarm-2.2.3-amd64.patch 505 RMD160 8a491f26d134c2393b1edfcd9bd1ae423f400d11 SHA1 ed8cc60fe250ca046c366017c5d5bcaefe319439 SHA256 33cbf9839de4950e3c16975deead12a00a461911b9025acdc21ed33d6895de6f
DIST swarm-2.2.3.tar.gz 2960666 RMD160 d99a33c423a83c6fbb4bad6b9abf554b86879af7 SHA1 e2aa16835b749dcff4f5f8c638902fb8683128cf SHA256 908412f08ae53c321a403c737de30ffa5c905d0b6f5a947bb306f08a2116be7b
EBUILD swarm-2.2.3.ebuild 1455 RMD160 b5fdeedfd0f70b2a54bab160a99b8b2ff6477b0c SHA1 232ca6909c01d2a9e996046a362f6031e28659a2 SHA256 1381f74f08a25217e1c42aa6a0ad2674a16bc858f001161aa47ffc7b2d68534e
-MISC ChangeLog 232 RMD160 54470ca4f906b59a491935297805c5718ed18927 SHA1 a7c4c91fcf1ed7f25eafbdbf8131656ce76f48f7 SHA256 a745cd920a917596fa7d83bd0ac23890334ef8914f82ba29c245adb831aee088
-MISC metadata.xml 919 RMD160 13019f810458c7883faefba2c588401335660c5c SHA1 8d664d24ef108ab1d948076f9f16a4fb06c0a018 SHA256 6ada18dd001e61363ef27459d5f8afd43a7ad71cc74b8510847bb7bb8a06a4af
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index a3d08dc..40c3deb 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -1,2 +1,3 @@
DIST google-talkplugin_current_amd64.deb 7728830 RMD160 6e6304f8b9f46655286ee939f0fd8cc831f28514 SHA1 96b6e814dcd811e45afec2047927f4a8ee89cf93 SHA256 6950777bdf96ef82aee80b7c857f10212824a1eed582f38c8163345ea61dc3f2
DIST google-talkplugin_current_i386.deb 6738522 RMD160 ec95ed1d31e42b3b08539a7fdbd0bc9af12382ef SHA1 fc77263ff5dd62264b82ef77acdc679d7d3977a7 SHA256 0cf9d284fae27642c47e6c9104c31b282a36eab9b3be3c118a04716ae9f6e1b1
+EBUILD google-talkplugin-9999.ebuild 1930 RMD160 187084b6f9662350423259a7f5130a3b8c93cc3e SHA1 ff625ba5d45a35102a9bf1714d22b440b23a5ae2 SHA256 123ee189745cbacb68f73b9164ba281d382bc641a9a56e05260df1cfed3017d6
diff --git a/x11-misc/tinybat/Manifest b/x11-misc/tinybat/Manifest
index da89a33..adf387c 100644
--- a/x11-misc/tinybat/Manifest
+++ b/x11-misc/tinybat/Manifest
@@ -1 +1,3 @@
DIST tinybat-0.2.0.tar.bz2 22818 RMD160 559bfd9d9aa739ce7667de52f306580f6dbc05e6 SHA1 c4830b9532221aee45bc2a58ba981e52e4ca2a0f SHA256 b00c038ba2c4df5864cf45befdd04aa1a36a7ad53386b3ec51627769fcdc6ff7
+EBUILD tinybat-0.2.0.ebuild 519 RMD160 72ae9ace4385d8197b153532ea82669e6fa8429e SHA1 362de612ee1529b90ad59d6ea912194cfa1c0186 SHA256 8f4fed322f891b6142dede45d28a4a347843dd3e5b0183cbd7daa4cc05429326
+EBUILD tinybat-9999.ebuild 561 RMD160 8dcaccbf0f9cd42f592dbf93a3f9b64b0479955f SHA1 0abc481bdd0097eee29b19aba64dd8b01ad09689 SHA256 9c98a1cb5e1280bf9b0c5b04aaa14d61f63bb9e34a63d4f1b7cf23779d00d597