[patch] k3d-0.7.11.0-r1-to-r2.ebuild.patch

k3d-0.7.11.0-r1.ebuild.patch (text/plain), 1.74 KB, created by cmuelle8 on 2015-01-18 15:13:15 UTC

--- gentoo/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild	2013-08-31 16:07:29.000000000 +0200
+++ myrep/media-gfx/k3d/k3d-0.7.11.0-r2.ebuild	2015-01-18 15:53:28.000000000 +0100
@@ -3,8 +3,11 @@
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild,v 1.14 2013/08/31 14:07:29 pacho Exp $
 
 EAPI="2"
+PYTHON_ABI_TYPE="single"
+PYTHON_DEPEND="python? 2:2.4"
+PYTHON_RESTRICTED_ABIS="3.* *-jython *-pypy"
 
-inherit eutils cmake-utils flag-o-matic
+inherit eutils cmake-utils flag-o-matic python
 
 MY_P="${PN}-source-${PV}"
 
@@ -40,7 +43,7 @@
 	jpeg? ( virtual/jpeg )
 	openexr? ( media-libs/openexr )
 	png? ( >=media-libs/libpng-1.2.43-r2 )
-	python? ( >=dev-lang/python-2.3 dev-python/cgkit )
+	python? ( dev-python/cgkit )
 	tiff? ( media-libs/tiff )
 	truetype? ( >=media-libs/freetype-2 )"
 DEPEND="${RDEPEND}
@@ -67,18 +70,23 @@
 	echo "-DK3D_BUILD_$2_MODULE=$(use $1 && echo ON || echo OFF)"
 }
 
+pkg_setup() {
+    python_set_active_version 2
+    python_pkg_setup
+}
+
 src_prepare() {
 	sed -i \
 		-e '/PKG_CHECK_MODULES/s:libpng12:libpng:' \
 		cmake/modules/K3DFindPNG.cmake || die
 
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-
-	epatch "${FILESDIR}"/${P}-fix-potfiles.patch \
+	epatch "${FILESDIR}"/${P}-libpng14.patch \
+		"${FILESDIR}"/${P}-fix-potfiles.patch \
 		"${FILESDIR}"/${P}-cuda.patch \
 		"${FILESDIR}"/${P}-gcc44.patch \
 		"${FILESDIR}"/${P}-gtk-liststore-vs-treemodel.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-boost-spirit.patch
 
 	[[ -f CMakeCache.txt ]] && rm CMakeCache.txt
 }
@@ -88,6 +96,10 @@
 		append-cxxflags -fno-stack-protector
 	fi
 
+	if is-flagq '-flto*'; then
+		append-ldflags -ldl
+	fi
+
 	mycmakeargs="
 		-DK3D_BUILD_SVG_IO_MODULE=ON
 		-DK3D_BUILD_CGAL_MODULE=OFF