gentoo resync : 14.07.2018

5 files changed, 0 insertions, 236 deletions

diff --git a/dev-python/simplecv/Manifest b/dev-python/simplecv/Manifest
deleted file mode 100644
index fabee328c693..000000000000
--- a/dev-python/simplecv/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX new-support-for-opencv-2.4.3-added.patch 4889 BLAKE2B 4f1ebacc61e86836b4dc81fc696a6deae9ccd211761a153616b3e474559591d2722188be51c09a67fe2751ced2adbbab4d1daf0fa1aa3142d2fe0413302a7815 SHA512 248a0cdaf74af780c10bbc805aa286c3dee4b93456cb2097460e5916ac94a791665355d1b814f593ac5fedbcbb12a797eff21290ce4db8a04b7c870b82db9293
-AUX remove-failing-test.patch 1476 BLAKE2B a72bb3c9dbf43617cfe891a3e47b049970693c89eaa811fa1283f238705497f835553e56bf0ff68526ac00d1ed47c734d035d817a86719368cbaac5d2c3e291f SHA512 d07daa7addc1f824a2e7bc70e51da05917e559ace9779035a032ce5358b1e0dee3184e44f9eaab137bf8f7a261a136f1f909ea1617e54a8eb7735876b5e74316
-DIST simplecv-1.3.tar.gz 42860284 BLAKE2B c94e484d8ff23fb4d2f2832aad9fdf10a2015e9ca9245d51a9c959273b8c003736f8ade34e04e3a400027cb512b1d228466a57e9d03bce106dab0b568d8205bc SHA512 47fa3c0bb41057ae17323aeb68711ef4716c4fe6607162218477af9070a1b1a03a7300f38b2c2a5c54ff69b916267504aeeac7c3108d6a45045a1469a93005b8
-EBUILD simplecv-1.3.ebuild 1226 BLAKE2B 53fb56076f35d4790d045a03ac41462db8a3ab00bd9205d4d97c752032a2dc264a5f256440e79f5085cef56939428d3ecc3ab3cb32c7d06d7e916e93a8961e87 SHA512 d479226dd26038fe8eb575bb32a8ee14359dc0e6c6a4991cb1e524a60b040a19c70412fd8c5b4b292a9199d2a7d366c4b44fcff5a7b16c3f1b6236537433415e
-MISC metadata.xml 395 BLAKE2B 3208750c8822bd57d815b05b1f9abce19adde87855bd588816c4fef73c1301d2368be1f2f2ad1a311576ac5151089ae7431ced2e200efbeefea60cc4d540ca18 SHA512 604a83919efa9e0b8ffecc3e8edc7058b6d4a1c5caefde04f0494911417bdc390f1436094602f5cc11d2c38fc034c96c209f1406386c890b027af8aed8872454
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
deleted file mode 100644
index 58f8639ea064..000000000000
--- a/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-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
deleted file mode 100644
index 7ee326df02a5..000000000000
--- a/dev-python/simplecv/files/remove-failing-test.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index b317bb249d88..000000000000
--- a/dev-python/simplecv/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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
deleted file mode 100644
index 146b07ce85cd..000000000000
--- a/dev-python/simplecv/simplecv-1.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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
-}