reinit the tree, so we can have metadata

5 files changed, 238 insertions, 0 deletions

diff --git a/dev-python/simplecv/Manifest b/dev-python/simplecv/Manifest
new file mode 100644
index 000000000000..df66f93fd83c
--- /dev/null
+++ b/dev-python/simplecv/Manifest
@@ -0,0 +1,7 @@
+AUX new-support-for-opencv-2.4.3-added.patch 4889 SHA256 7ba7671ee56b81e69d38a022cb4f2a5efa540c5c97f88a07f85e4e4213756765 SHA512 248a0cdaf74af780c10bbc805aa286c3dee4b93456cb2097460e5916ac94a791665355d1b814f593ac5fedbcbb12a797eff21290ce4db8a04b7c870b82db9293 WHIRLPOOL 38430e0d353961b8fc2be1f3e08c77fb904ef9aefb3110eea4ba33f37a68586757878174e11e50c67a390007670856a8a14e20fcbc86e4700f1fdab71bbcb464
+AUX remove-failing-test.patch 1476 SHA256 9fb4e06794b72f63c2e78ae12cdf87748962ae6222ed0263d8e7a5c745d585e0 SHA512 d07daa7addc1f824a2e7bc70e51da05917e559ace9779035a032ce5358b1e0dee3184e44f9eaab137bf8f7a261a136f1f909ea1617e54a8eb7735876b5e74316 WHIRLPOOL 5d36fec3ead4f7bb25afec3fc6bef7172c48b2ae092e077598fd324ecaa0a928090701ada332eb9c0464e6ede18c0d347c42802a2d7788fb5458879ace3a3928
+DIST simplecv-1.3.tar.gz 42860284 SHA256 3510727fa5e219c811cf89bce21ecf29647bdd4ef48a0a78aa29b10b9f583947 SHA512 47fa3c0bb41057ae17323aeb68711ef4716c4fe6607162218477af9070a1b1a03a7300f38b2c2a5c54ff69b916267504aeeac7c3108d6a45045a1469a93005b8 WHIRLPOOL 0206dfc06627b78e96aa7487b6c3450cde043e1527044e413b6111831aa48b32dd043fbebbb33c61ffb1aab7683187bf76db4f0a641cdcd0c3dbd6c8d36e1b18
+EBUILD simplecv-1.3.ebuild 1226 SHA256 872f7b26c95e1ae5c95a914ba5a89481e67ca711f82f63352a18e7e830055b37 SHA512 d479226dd26038fe8eb575bb32a8ee14359dc0e6c6a4991cb1e524a60b040a19c70412fd8c5b4b292a9199d2a7d366c4b44fcff5a7b16c3f1b6236537433415e WHIRLPOOL c28d9cd0035ddc5a69df41f5a5d2c1df5017c0de8862989a7fa5b3c56554292fed3faef666da141f523c34318ca502bd225432dbbb4c2cc6e6ae28ca6861fedf
+MISC ChangeLog 2596 SHA256 b060f822eba8a08768f45ad122d1ab1d3e65990439118cce6aa6c974e455a949 SHA512 a685b6878ce7a3c0b112b23daf648141ac9c28eea9558c41daa8971eeba50f5c3e98398dc0fa97f25a028f21628eebed8f231c1425784937662f049f6674bc63 WHIRLPOOL ed1ffbf7db0324713acf5b7aba78bdff2d4f570a404dbca1184e6fe33e16e5013f4cebf8730825e5f7a3365a99a0b4ee7ec3b8cb67d40a561309aeb6c27b5cc9
+MISC ChangeLog-2015 1093 SHA256 3b905dec992c2a4d5575b8c763c74d8e056e8ae1dcca92695be5ce661b61f595 SHA512 03358b60136b5abeb04a83a2fdd9a04d74a783d22d3ea8b95dc2c3b79f07b1179d678e67b27626507be1a7e2047be3e9350d05892ef1144031cadaa42dd9de58 WHIRLPOOL 3e79638f0e2d2e3c3ec2517ddb47e980d2863b6fb6f5e6d891f525cc44ed2aa717bfcb6808a688c1287aeaf96d4f5e62df0fbae61624d6710ed1b6223cd6d292
+MISC metadata.xml 395 SHA256 939544cee7ffbefb6292c09463e0795248899b2a8d0cf2ae7beff7e038c53cfc SHA512 604a83919efa9e0b8ffecc3e8edc7058b6d4a1c5caefde04f0494911417bdc390f1436094602f5cc11d2c38fc034c96c209f1406386c890b027af8aed8872454 WHIRLPOOL 45324cee5bce59883f665d477367f32bb33e8b7cddd05cd6cd01adf8189ac689f90d1f4dcb6dd1dc98294d3b0ba461b26026c3729cda4c9781b6cbaf6baf22d6
diff --git a/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch b/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch
new file mode 100644
index 000000000000..58f8639ea064
--- /dev/null
+++ b/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch
@@ -0,0 +1,111 @@
+From 164d39c1be66eb35b02fb7c30f65b5929c9e407d Mon Sep 17 00:00:00 2001
+From: Vijay Mahantesh SM <vijay@vijay.(none)>
+Date: Sat, 8 Dec 2012 01:55:24 +0530
+Subject: [PATCH] new support for opencv 2.4.3 added
+
+---
+ SimpleCV/ImageClass.py | 52 ++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 33 insertions(+), 19 deletions(-)
+
+diff --git a/SimpleCV/ImageClass.py b/SimpleCV/ImageClass.py
+index a545b50..6fab39a 100644
+--- a/SimpleCV/ImageClass.py
++++ b/SimpleCV/ImageClass.py
+@@ -7610,11 +7610,12 @@ class Image:
+             new_version = 0
+             #For OpenCV versions till 2.4.0,  cv2.__versions__ are of the form "$Rev: 4557 $" 
+             if not ver.startswith('$Rev:'):
+-	        if int(ver.replace('.','0'))>=20400 :
+-                    new_version = 1
+-                if int(ver.replace('.','0'))>=20402 :     
+-                    new_version = 2
+-                    
++              if int(ver.replace('.','0'))>=20400:
++                 new_version = 1
++              if int(ver.replace('.','0'))>=20402:
++                 new_version = 2
++              if int(ver.replace('.','0'))>=20403:
++                 new_version = 3    
+         except:
+             logger.warning("Can't run Keypoints without OpenCV >= 2.3.0")
+             return
+@@ -7622,11 +7623,11 @@ class Image:
+         if( forceReset ):
+             self._mKeyPoints = None
+             self._mKPDescriptors = None
+-            
+-        if( self._mKeyPoints is None or self._mKPFlavor != flavor ):
++        
++        if( not(self._mKeyPoints) or self._mKPFlavor != flavor ):
+             if ( new_version == 0):
+                 if( flavor == "SURF" ):
+-                    surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1) 
++                    surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1)
+                     self._mKeyPoints,self._mKPDescriptors = surfer.detect(self.getGrayNumpy(),None,False)
+                     if( len(self._mKPDescriptors) == 0 ):
+                         return None, None                     
+@@ -7659,10 +7660,9 @@ class Image:
+                     self._mKPDescriptors = None
+                     self._mKPFlavor = "STAR"
+                     del starer
+-            
+-            
+-            elif( new_version == 2 and flavor in ["SURF", "FAST"] ): 
+-                if( flavor == "SURF" ):
++
++            elif( new_version >= 2 and flavor in ["SURF", "FAST"] ): 
++                if( flavor == "SURF" and new_version==2):
+                     surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1)
+                     #mask = self.getGrayNumpy()                    
+                     #mask.fill(255) 
+@@ -7678,6 +7678,20 @@ class Image:
+                     self._mKPFlavor = "SURF"
+                     del surfer
+             
++                if( flavor == "SURF" and new_version==3):
++                    surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1)
++                    self._mKeyPoints,self._mKPDescriptors = surfer.detectAndCompute(self.getGrayNumpy(),None,useProvidedKeypoints = False)
++                    if( len(self._mKPDescriptors) == 0 ):
++                        return None, None                     
++                
++                    if( highQuality == 1 ):
++                        self._mKPDescriptors = self._mKPDescriptors.reshape((-1,128))
++                    else:
++                        self._mKPDescriptors = self._mKPDescriptors.reshape((-1,64))
++                
++                    self._mKPFlavor = "SURF"
++                    del surfer
++
+                 elif( flavor == "FAST" ):
+                     faster = cv2.FastFeatureDetector(threshold=int(thresh),nonmaxSuppression=True)
+                     self._mKeyPoints = faster.detect(self.getGrayNumpy())
+@@ -7693,19 +7707,19 @@ class Image:
+                if( len(self._mKPDescriptors) == 0 ):
+                     return None, None     
+                self._mKPFlavor = flavor
+-	       del FeatureDetector
++               del FeatureDetector
+ 
+             elif( new_version >= 1 and flavor in ["FAST", "STAR", "MSER", "Dense"] ):
+                FeatureDetector = cv2.FeatureDetector_create(flavor)
+                self._mKeyPoints = FeatureDetector.detect(self.getGrayNumpy())
+                self._mKPDescriptors = None
+                self._mKPFlavor = flavor
+-               del FeatureDetector   
+-               
+-	    else:
+-                logger.warning("ImageClass.Keypoints: I don't know the method you want to use")
+-                return None, None
+-
++               del FeatureDetector
++        
++            else:
++               logger.warning("ImageClass.Keypoints: I don't know the method you want to use")
++               return None, None
++        
+         return self._mKeyPoints,self._mKPDescriptors 
+ 
+     def _getFLANNMatches(self,sd,td):
+-- 
+1.8.1.5
+
diff --git a/dev-python/simplecv/files/remove-failing-test.patch b/dev-python/simplecv/files/remove-failing-test.patch
new file mode 100644
index 000000000000..7ee326df02a5
--- /dev/null
+++ b/dev-python/simplecv/files/remove-failing-test.patch
@@ -0,0 +1,57 @@
+From d8abe3346d7aa2b192d384476d5f2c89ca9c70e9 Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Fri, 14 Jun 2013 20:35:11 -0400
+Subject: [PATCH] remove failing test
+
+According to the docs, the UserWarning that is raised should not be an
+issue.  Ignore the failure during testings.
+---
+ SimpleCV/tests/tests.py | 32 --------------------------------
+ 1 file changed, 32 deletions(-)
+
+diff --git a/SimpleCV/tests/tests.py b/SimpleCV/tests/tests.py
+index 94f4fc7..ce442e3 100644
+--- a/SimpleCV/tests/tests.py
++++ b/SimpleCV/tests/tests.py
+@@ -1731,38 +1731,6 @@ def test_movement_feature():
+ 
+   pass 
+ 
+-def test_keypoint_extraction():
+-  try:
+-    import cv2
+-  except:
+-    pass
+-    return 
+-
+-  img1 = Image("../sampleimages/KeypointTemplate2.png")
+-  img2 = Image("../sampleimages/KeypointTemplate2.png")
+-  img3 = Image("../sampleimages/KeypointTemplate2.png")
+-
+-  kp1 = img1.findKeypoints()
+-  kp2 = img2.findKeypoints(highQuality=True)
+-  kp3 = img3.findKeypoints(flavor="STAR")
+-  kp1.draw()
+-  kp2.draw()
+-  kp3.draw()
+-  #TODO: Fix FAST binding
+-  #~ kp4 = img.findKeypoints(flavor="FAST",min_quality=10)
+-  if( len(kp1)==190 and 
+-      len(kp2)==190 and
+-      len(kp3)==37
+-      #~ and len(kp4)==521
+-    ):
+-    pass
+-  else:
+-    assert False
+-  results = [img1,img2,img3]
+-  name_stem = "test_keypoint_extraction"
+-  perform_diff(results,name_stem,tolerance=3.0)    
+-
+-
+ def test_keypoint_match():
+   try:
+     import cv2
+-- 
+1.8.1.5
+
diff --git a/dev-python/simplecv/metadata.xml b/dev-python/simplecv/metadata.xml
new file mode 100644
index 000000000000..b317bb249d88
--- /dev/null
+++ b/dev-python/simplecv/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jsbronder@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="shell">Enable the iPython SimpleCV shell</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">sightmachine/SimpleCV</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/simplecv/simplecv-1.3.ebuild b/dev-python/simplecv/simplecv-1.3.ebuild
new file mode 100644
index 000000000000..146b07ce85cd
--- /dev/null
+++ b/dev-python/simplecv/simplecv-1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=SimpleCV
+
+DESCRIPTION="Python interface to several powerful open source computer vision libraries"
+HOMEPAGE="http://simplecv.org/"
+SRC_URI="https://github.com/sightmachine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shell test"
+
+DEPEND="
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+RDEPEND="
+	>=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pygame[${PYTHON_USEDEP}]
+	shell? ( dev-python/ipython[${PYTHON_USEDEP}] )"
+
+# 1. FeatureDetector being called with the wrong number of arguments
+# 2. Remove test that according to docs shouldn't be an issue
+PATCHES=(
+	"${FILESDIR}"/new-support-for-opencv-2.4.3-added.patch
+	"${FILESDIR}"/remove-failing-test.patch
+)
+
+src_test() {
+	cd "${S}/SimpleCV/tests"
+	nosetests tests.py || die "tests failed"
+}
+
+src_install() {
+	distutils-r1_src_install
+	if ! use shell; then
+		rm -rf "${D}"/usr/bin
+	fi
+}