dev-python/setuptools/python3_setuptools-20.6.7.recipe → dev-python/setuptools/python3_setuptools-22.0.0.recipe

@@ -7,8 +7,9 @@ HOMEPAGE="https://pypi.python.org/pypi/setuptools"
 COPYRIGHT="2006-2014 Python Packaging Authority"
 LICENSE="Python"
 REVISION="1"
-SOURCE_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-$portVersion.zip"
-CHECKSUM_SHA256="7290abedfa47de40286b76b0206fbfd7c291ac51f0a62cc946af658967f77b8f"
+SOURCE_URI="https://github.com/pypa/setuptools/archive/v$portVersion.tar.gz"
+SOURCE_FILENAME="setuptools-$portVersion.tar.gz"
+CHECKSUM_SHA256="90a40d54d21d4cfe55ae2c3597ed3f2a63d9e8fe768f03ff16f2a58ed97bcc32"
 SOURCE_DIR="setuptools-$portVersion"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
@@ -44,9 +45,4 @@ INSTALL()
 
 	$portPackageLinksDir/cmd~python3/bin/python3 setup.py install \
 		--prefix=$prefix
-
-	# easy_install cannot tolerate not being installed alongside setuptools,
-	# so just delete it.
-	rm $prefix/bin/easy_install
-	rm $prefix/bin/easy_install-3.?
 }

dev-python/setuptools/python_setuptools-20.7.0.recipe → dev-python/setuptools/python_setuptools-22.0.0.recipe

@@ -7,8 +7,9 @@ HOMEPAGE="https://pypi.python.org/pypi/setuptools"
 COPYRIGHT="2006-2014 Python Packaging Authority"
 LICENSE="Python"
 REVISION="1"
-SOURCE_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-$portVersion.tar.gz"
-CHECKSUM_SHA256="505cdf282c5f6e3a056e79f0244b8945f3632257bba8469386c6b9b396400233"
+SOURCE_URI="https://github.com/pypa/setuptools/archive/v$portVersion.tar.gz"
+SOURCE_FILENAME="setuptools-$portVersion.tar.gz"
+CHECKSUM_SHA256="90a40d54d21d4cfe55ae2c3597ed3f2a63d9e8fe768f03ff16f2a58ed97bcc32"
 SOURCE_DIR="setuptools-$portVersion"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
@@ -44,9 +45,4 @@ INSTALL()
 
 	$portPackageLinksDir/cmd~python2/bin/python2 setup.py install \
 		--prefix=$prefix
-
-	# easy_install cannot tolerate not being installed alongside setuptools,
-	# so just delete it.
-	rm $prefix/bin/easy_install
-	rm $prefix/bin/easy_install-2.?
 }

dev-python/twisted/python_twisted-16.1.1.recipe → dev-python/twisted/python_twisted-16.2.0.recipe

@@ -23,10 +23,10 @@ HOMEPAGE="http://twistedmatrix.com"
 COPYRIGHT="2001-2013 Twisted project members"
 LICENSE="MIT"
 REVISION="1"
-SOURCE_URI="https://pypi.python.org/packages/source/T/Twisted/Twisted-$portVersion.tar.bz2"
-CHECKSUM_SHA256="fe7d001d9a803ed26cd0fd2f69fa4212ff025f3af6ef1a559d905fe551ab04e9"
+SOURCE_URI="https://github.com/twisted/twisted/archive/twisted-$portVersion.tar.gz"
+CHECKSUM_SHA256="458a917dfd61c1d480b3efa024c702890c201667c4f28ce0d5b0f1d22e4c7403"
 PATCHES="python_twisted-$portVersion.patchset"
-SOURCE_DIR="Twisted-$portVersion"
+SOURCE_DIR="twisted-twisted-$portVersion"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
@@ -35,13 +35,11 @@ PROVIDES="
 	cmd:cftp
 	cmd:ckeygen
 	cmd:conch
-	cmd:lore
 	cmd:mailmail
 	cmd:manhole
 	cmd:pyhtmlizer
 	cmd:tap2deb
 	cmd:tap2rpm
-	cmd:tapconvert
 	cmd:tkconch
 	cmd:trial
 	cmd:twistd

dev-vcs/git/git-2.8.0.recipe → dev-vcs/git/git-2.8.3.recipe

@@ -8,20 +8,20 @@ It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with \
 features like cheap local branching, convenient staging areas, and multiple \
 workflows."
 HOMEPAGE="http://git-scm.com/"
-LICENSE="GNU GPL v2"
 COPYRIGHT="2005-2016 Git Authors (see git web site for list)"
+LICENSE="GNU GPL v2"
+REVISION="1"
 
 SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz"
-CHECKSUM_SHA256="9a099a4f1e68c0446800f0c538ce7d5d24bd5b4ee5d559317600cd407a59e74c"
-PATCHES="git-$portVersion.patchset"
+CHECKSUM_SHA256="7d8e6c274a88b4a73b3c98c70d3438ec12871300ce8bb4ca179ea19fcf74aa91"
 
 SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
-CHECKSUM_SHA256_2="2945558be9e16de71a67f00fe3f6bdd8ca24977389a86ef9a077ce73612fb353"
+CHECKSUM_SHA256_2="9d25e10c2bc327fdc59820bb00075799487095059d652fb32fea1cdb3a898bc6"
 
 SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
-CHECKSUM_SHA256_3="515bee47dbb1f1c345eae394e14f82009865529aaf0c201301defee32512a7c6"
+CHECKSUM_SHA256_3="df9aa1f374ca49dd65f47a8bb1498c11567d963e30cf00e097aa89c495d3ccde"
 
-REVISION="2"
+PATCHES="git-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 

media-libs/libopenshot/libopenshot-0.1.1.recipe

@@ -9,7 +9,7 @@ LICENSE="GNU LGPL v3"
 SOURCE_URI="https://github.com/OpenShot/libopenshot/archive/v$portVersion.tar.gz"
 SOURCE_FILENAME="libopenshot-$portVersion.tar.gz"
 CHECKSUM_SHA256="735322c73f6e8ea7bac059970f247c906b4c35f83fad5e5efd9a77adead20d0c"
-REVISION="2"
+REVISION="3"
 PATCHES="libopenshot-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"

media-libs/libopenshot/patches/libopenshot-0.1.1.patchset

@@ -38,276 +38,6 @@ index 545f62a..edcc511 100644
      ~/Library/Frameworks
      /Library/Frameworks
      /usr/local/lib
-diff --git a/include/ChunkReader.h b/include/ChunkReader.h
-index dd61257..250d133 100644
---- a/include/ChunkReader.h
-+++ b/include/ChunkReader.h
-@@ -35,7 +35,9 @@
- #include <ctime>
- #include <iostream>
- #include <fstream>
-+#ifndef __HAIKU__
- #include <omp.h>
-+#endif
- #include <QtCore/qdir.h>
- #include <stdio.h>
- #include <stdlib.h>
-diff --git a/include/ChunkWriter.h b/include/ChunkWriter.h
-index 729713c..01e6607 100644
---- a/include/ChunkWriter.h
-+++ b/include/ChunkWriter.h
-@@ -36,7 +36,9 @@
- #include <ctime>
- #include <iostream>
- #include <fstream>
-+#ifndef __HAIKU__
- #include <omp.h>
-+#endif
- #include <QtCore/qdir.h>
- #include <stdio.h>
- #include <sstream>
-diff --git a/include/DummyReader.h b/include/DummyReader.h
-index 73783cf..1cc5182 100644
---- a/include/DummyReader.h
-+++ b/include/DummyReader.h
-@@ -33,7 +33,9 @@
- #include <cmath>
- #include <ctime>
- #include <iostream>
-+#ifndef __HAIKU__
- #include <omp.h>
-+#endif
- #include <stdio.h>
- #include <tr1/memory>
- #include "Cache.h"
-diff --git a/include/ImageReader.h b/include/ImageReader.h
-index e51b40a..b836aa0 100644
---- a/include/ImageReader.h
-+++ b/include/ImageReader.h
-@@ -33,7 +33,9 @@
- #include <cmath>
- #include <ctime>
- #include <iostream>
-+#ifndef __HAIKU__
- #include <omp.h>
-+#endif
- #include <stdio.h>
- #include <tr1/memory>
- #include "Magick++.h"
-diff --git a/include/OpenMPUtilities.h b/include/OpenMPUtilities.h
-index fc4ff3a..422b90d 100644
---- a/include/OpenMPUtilities.h
-+++ b/include/OpenMPUtilities.h
-@@ -28,9 +28,14 @@
- #ifndef OPENSHOT_OPENMP_UTILITIES_H
- #define OPENSHOT_OPENMP_UTILITIES_H
-
-+#ifndef __HAIKU__
- #include <omp.h>
-
- 	// Calculate the # of OpenMP Threads to allow (HACK / WORK-AROUND for an ImageMagick bug: preventing use of all 8 cores)
- 	#define OPEN_MP_NUM_PROCESSORS omp_get_num_procs()
-+#else
-+	#define OPEN_MP_NUM_PROCESSORS 1
-+#endif
-+	
-
- #endif
-diff --git a/include/QtImageReader.h b/include/QtImageReader.h
-index 594ef26..c40d38f 100644
---- a/include/QtImageReader.h
-+++ b/include/QtImageReader.h
-@@ -33,7 +33,9 @@
- #include <cmath>
- #include <ctime>
- #include <iostream>
-+#ifndef __HAIKU__
- #include <omp.h>
-+#endif
- #include <stdio.h>
- #include <tr1/memory>
- #include <QtCore/QString>
-diff --git a/include/TextReader.h b/include/TextReader.h
-index bb8bdd7..2f4e8cf 100644
---- a/include/TextReader.h
-+++ b/include/TextReader.h
-@@ -33,7 +33,9 @@
- #include <cmath>
- #include <ctime>
- #include <iostream>
-+#ifndef __HAIKU__
- #include <omp.h>
-+#endif
- #include <stdio.h>
- #include <tr1/memory>
- #include "Magick++.h"
-diff --git a/include/effects/Blur.h b/include/effects/Blur.h
-index 02799bd..5acc5c9 100644
---- a/include/effects/Blur.h
-+++ b/include/effects/Blur.h
-@@ -33,7 +33,9 @@
- #include <cmath>
- #include <ctime>
- #include <iostream>
-+#ifndef __HAIKU__
- #include <omp.h>
-+#endif
- #include <stdio.h>
- #include <tr1/memory>
- #include <QRect>
-diff --git a/include/effects/Brightness.h b/include/effects/Brightness.h
-index 801cf40..6b9dd9b 100644
---- a/include/effects/Brightness.h
-+++ b/include/effects/Brightness.h
-@@ -33,7 +33,9 @@
- #include <cmath>
- #include <ctime>
- #include <iostream>
-+#ifndef __HAIKU__
- #include <omp.h>
-+#endif
- #include <stdio.h>
- #include <tr1/memory>
- #include "../Color.h"
-diff --git a/include/effects/ChromaKey.h b/include/effects/ChromaKey.h
-index f2710ad..a216068 100644
---- a/include/effects/ChromaKey.h
-+++ b/include/effects/ChromaKey.h
-@@ -33,7 +33,9 @@
- #include <cmath>
- #include <ctime>
- #include <iostream>
-+#ifndef __HAIKU__
- #include <omp.h>
-+#endif
- #include <stdio.h>
- #include <tr1/memory>
- #include "../Color.h"
-diff --git a/include/effects/Deinterlace.h b/include/effects/Deinterlace.h
-index 8210399..1d7257b 100644
---- a/include/effects/Deinterlace.h
-+++ b/include/effects/Deinterlace.h
-@@ -33,7 +33,9 @@
- #include <cmath>
- #include <ctime>
- #include <iostream>
-+#ifndef __HAIKU__
- #include <omp.h>
-+#endif
- #include <stdio.h>
- #include <tr1/memory>
- #include "../Color.h"
-diff --git a/include/effects/Mask.h b/include/effects/Mask.h
-index 005ab19..a783fbe 100644
---- a/include/effects/Mask.h
-+++ b/include/effects/Mask.h
-@@ -33,7 +33,9 @@
- #include <cmath>
- #include <ctime>
- #include <iostream>
-+#ifndef __HAIKU__
- #include <omp.h>
-+#endif
- #include <stdio.h>
- #include <tr1/memory>
- #include "../Color.h"
-diff --git a/include/effects/Negate.h b/include/effects/Negate.h
-index d8a85f2..6fbaadb 100644
---- a/include/effects/Negate.h
-+++ b/include/effects/Negate.h
-@@ -33,7 +33,9 @@
- #include <cmath>
- #include <ctime>
- #include <iostream>
-+#ifndef __HAIKU__
- #include <omp.h>
-+#endif
- #include <stdio.h>
- #include <tr1/memory>
- #include "../Color.h"
-diff --git a/include/effects/Saturation.h b/include/effects/Saturation.h
-index 35bff03..19bdd6c 100644
---- a/include/effects/Saturation.h
-+++ b/include/effects/Saturation.h
-@@ -33,7 +33,9 @@
- #include <cmath>
- #include <ctime>
- #include <iostream>
-+#ifndef __HAIKU__
- #include <omp.h>
-+#endif
- #include <stdio.h>
- #include <tr1/memory>
- #include "../Color.h"
-diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp
-index 7bc06ac..a47aa93 100644
---- a/src/FFmpegReader.cpp
-+++ b/src/FFmpegReader.cpp
-@@ -506,10 +506,12 @@ tr1::shared_ptr<Frame> FFmpegReader::ReadStream(long int requested_frame)
- 	int packets_processed = 0;
- 	int minimum_packets = OPEN_MP_NUM_PROCESSORS;
-
-+#ifndef __HAIKU__
- 	// Set the number of threads in OpenMP
- 	omp_set_num_threads(OPEN_MP_NUM_PROCESSORS);
- 	// Allow nested OpenMP sections
- 	omp_set_nested(true);
-+#endif
-
- 	// Debug output
- 	AppendDebugMethod("FFmpegReader::ReadStream", "requested_frame", requested_frame, "OPEN_MP_NUM_PROCESSORS", OPEN_MP_NUM_PROCESSORS, "", -1, "", -1, "", -1, "", -1);
-diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp
-index 33745e6..d40c9e1 100644
---- a/src/FFmpegWriter.cpp
-+++ b/src/FFmpegWriter.cpp
-@@ -398,10 +398,12 @@ void FFmpegWriter::write_queued_frames() throw (ErrorEncodingVideo)
- 	spooled_video_frames.clear();
- 	spooled_audio_frames.clear();
-
-+#ifndef __HAIKU__
- 	// Set the number of threads in OpenMP
- 	omp_set_num_threads(OPEN_MP_NUM_PROCESSORS);
- 	// Allow nested OpenMP sections
- 	omp_set_nested(true);
-+#endif
-
- 	// Create blank exception
- 	bool has_error_encoding_video = false;
-diff --git a/src/FrameMapper.cpp b/src/FrameMapper.cpp
-index 5b1ac2a..0d24a1d 100644
---- a/src/FrameMapper.cpp
-+++ b/src/FrameMapper.cpp
-@@ -376,10 +376,12 @@ tr1::shared_ptr<Frame> FrameMapper::GetFrame(long int requested_frame) throw(Rea
- 	// Minimum number of frames to process (for performance reasons)
- 	int minimum_frames = OPEN_MP_NUM_PROCESSORS;
-
-+#ifndef __HAIKU__
- 	// Set the number of threads in OpenMP
- 	omp_set_num_threads(OPEN_MP_NUM_PROCESSORS);
- 	// Allow nested OpenMP sections
- 	omp_set_nested(true);
-+#endif
-
- 	#pragma omp parallel
- 	{
-diff --git a/src/Timeline.cpp b/src/Timeline.cpp
-index 891d148..205c339 100644
---- a/src/Timeline.cpp
-+++ b/src/Timeline.cpp
-@@ -627,9 +627,13 @@ tr1::shared_ptr<Frame> Timeline::GetFrame(long int requested_frame) throw(Reader
- 		// This also opens the readers for intersecting clips, and marks non-intersecting clips as 'needs closing'
- 		vector<Clip*> nearby_clips = find_intersecting_clips(requested_frame, minimum_frames, true);
-
-+#ifndef __HAIKU__
- 		omp_set_num_threads(OPEN_MP_NUM_PROCESSORS);
- 		// Allow nested OpenMP sections
- 		omp_set_nested(true);
-+#else
-+	#define omp_get_thread_num() 1
-+#endif
-
- 		// Debug output
- 		AppendDebugMethod("Timeline::GetFrame", "requested_frame", requested_frame, "minimum_frames", minimum_frames, "OPEN_MP_NUM_PROCESSORS", OPEN_MP_NUM_PROCESSORS, "", -1, "", -1, "", -1);
 -- 
 2.2.2
 

media-libs/libraw/libraw-0.17.1.recipe → media-libs/libraw/libraw-0.17.2.recipe

@@ -16,7 +16,7 @@ LICENSE="
 	GNU LGPL v2.1
 	CDDL v1"
 SOURCE_URI="http://www.libraw.org/data/LibRaw-$portVersion.tar.gz"
-CHECKSUM_SHA256="e599651a4cc37e00cfc2d2b56be87c3a4e4dae2c360b680fe9ab3f93d07cdea1"
+CHECKSUM_SHA256="92b0c42c7666eca9307e5e1f97d6fefc196cf0b7ee089e22880259a76fafd15c"
 REVISION="1"
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"