ebuild patch

boost.patch (text/plain), 8.65 KB, created by Ian Delaney (RETIRED) on 2011-11-14 11:33:20 UTC

diff -ur boost.orig//boost-1.41.0-r3.ebuild boost/boost-1.41.0-r3.ebuild
--- boost.orig//boost-1.41.0-r3.ebuild	2011-11-14 19:26:00.518933398 +0800
+++ boost/boost-1.41.0-r3.ebuild	2011-11-14 19:12:53.838933279 +0800
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.41.0-r3.ebuild,v 1.14 2011/07/15 16:27:59 mattst88 Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
 
@@ -41,23 +42,26 @@
 
 _add_line() {
 	if [ -z "$2" ] ; then
-		echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/default"
-		use debug && echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug"
+		echo "${1}" >> "${ED}/usr/share/boost-eselect/profiles/${SLOT}/default"
+		use debug && echo "${1}" >> "${ED}/usr/share/boost-eselect/profiles/${SLOT}/debug"
 	else
-		echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/${2}"
+		echo "${1}" >> "${ED}/usr/share/boost-eselect/profiles/${SLOT}/${2}"
 	fi
 }
 
 pkg_setup() {
 	# It doesn't compile with USE="python mpi" and python-3 (bug 295705)
-	if use python && use mpi ; then
-		if [[ "$(python_get_version --major)" != "2" ]]; then
-			eerror "The Boost.MPI python bindings do not support any other python version"
-			eerror "than 2.x. Please either use eselect to select a python 2.x version or"
-			eerror "disable the python and/or mpi use flag for =${CATEGORY}/${PF}."
-			die "unsupported python version"
-		fi
-	fi
+#	if use python && use mpi ; then
+#		if [[ "$(python_get_version --major)" != "2" ]]; then
+#			eerror "The Boost.MPI python bindings do not support any other python version"
+#			eerror "than 2.x. Please either use eselect to select a python 2.x version or"
+#			eerror "disable the python and/or mpi use flag for =${CATEGORY}/${PF}."
+#			die "unsupported python version"
+#		fi
+#	fi
+
+	python_set_active_version 2
+	python_pkg_setup
 
 	if use test ; then
 		CHECKREQS_DISK_BUILD="1024"
@@ -177,7 +181,7 @@
 		OPTIONS="${OPTIONS} --disable-long-double"
 	fi
 
-	OPTIONS="${OPTIONS} pch=off --user-config=\"${S}/user-config.jam\" --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}/usr\" --layout=versioned"
+	OPTIONS="${OPTIONS} pch=off --user-config=\"${S}/user-config.jam\" --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${ED}/usr\" --layout=versioned"
 
 }
 
@@ -230,41 +234,42 @@
 	export BOOST_ROOT="${S}"
 
 	einfo "Using the following command to install: "
-	einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi link=shared,static runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" install"
+	einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi link=shared,static runtime-link=shared --includedir=\"${ED}/usr/include\" --libdir=\"${ED}/usr/$(get_libdir)\" install"
 
+	python_convert_shebangs -r 2 "${ED}"
 	${BJAM} -q -d+2 \
 		gentoorelease \
 		${OPTIONS} \
 		threading=single,multi link=shared,static runtime-link=shared \
-		--includedir="${D}/usr/include" \
-		--libdir="${D}/usr/$(get_libdir)" \
+		--includedir="${ED}/usr/include" \
+		--libdir="${ED}/usr/$(get_libdir)" \
 		install || die "install failed for options '${OPTIONS}'"
 
 	if use debug ; then
 		einfo "Using the following command to install: "
-		einfo "${BJAM} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi link=shared,static runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" --buildid=debug"
+		einfo "${BJAM} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi link=shared,static runtime-link=shared --includedir=\"${ED}/usr/include\" --libdir=\"${ED}/usr/$(get_libdir)\" --buildid=debug"
 
 		${BJAM} -q -d+2 \
 			gentoodebug \
 			${OPTIONS} \
 			threading=single,multi link=shared,static runtime-link=shared \
-			--includedir="${D}/usr/include" \
-			--libdir="${D}/usr/$(get_libdir)" \
+			--includedir="${ED}/usr/include" \
+			--libdir="${ED}/usr/$(get_libdir)" \
 			--buildid=debug \
 			install || die "install failed for options '${OPTIONS}'"
 	fi
 
-	use python || rm -rf "${D}/usr/include/boost-${MAJOR_PV}/boost"/python*
+	use python || rm -rf "${ED}/usr/include/boost-${MAJOR_PV}/boost"/python*
 
 	dodir /usr/share/boost-eselect/profiles/${SLOT}
-	touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/default"
-	use debug && touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug"
+	touch "${ED}/usr/share/boost-eselect/profiles/${SLOT}/default"
+	use debug && touch "${ED}/usr/share/boost-eselect/profiles/${SLOT}/debug"
 
 	# Move the mpi.so to the right place and make sure it's slotted
 	if use mpi && use python; then
-		mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}"
-		mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/"
-		touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py"
+		mkdir -p "${ED}$(python_get_sitedir)/boost_${MAJOR_PV}"
+		mv "${ED}/usr/$(get_libdir)/mpi.so" "${ED}$(python_get_sitedir)/boost_${MAJOR_PV}/"
+		touch "${ED}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py"
 		_add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\""
 	fi
 
@@ -287,7 +292,7 @@
 		dosym /usr/include/boost-${MAJOR_PV}/boost /usr/share/doc/${PF}/html/boost
 	fi
 
-	cd "${D}/usr/$(get_libdir)"
+	cd "${ED}/usr/$(get_libdir)"
 
 	# Remove (unversioned) symlinks
 	# And check for what we remove to catch bugs
@@ -365,7 +370,7 @@
 		insinto /usr/share
 		doins -r share/boostbook
 		# Append version postfix for slotting
-		mv "${D}/usr/share/boostbook" "${D}/usr/share/boostbook-${MAJOR_PV}"
+		mv "${ED}/usr/share/boostbook" "${ED}/usr/share/boostbook-${MAJOR_PV}"
 		_add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\""
 	fi
 
@@ -386,11 +391,11 @@
 	[[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		einfo "Working around completely broken build-system(tm)"
-		for d in "${D}"usr/lib/*.dylib ; do
+		for d in "${ED}"usr/lib/*.dylib ; do
 			if [[ -f ${d} ]] ; then
 				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${D}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${ED}}" "${d}"
 				eend $?
 				# fix references to other libs
 				refs=$(otool -XL "${d}" | \
diff -ur boost.orig//boost-1.42.0-r1.ebuild boost/boost-1.42.0-r1.ebuild
--- boost.orig//boost-1.42.0-r1.ebuild	2011-11-14 19:26:07.758933494 +0800
+++ boost/boost-1.42.0-r1.ebuild	2011-11-14 19:16:28.514933580 +0800
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.42.0-r1.ebuild,v 1.4 2011/07/15 16:27:59 mattst88 Exp $
 
-EAPI="2"
+EAPI="3"
+PTHON_DEPEND="2"
 
 inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
 
@@ -48,15 +49,18 @@
 }
 
 pkg_setup() {
-	# It doesn't compile with USE="python mpi" and python-3 (bug 295705)
-	if use python && use mpi ; then
-		if [[ "$(python_get_version --major)" != "2" ]]; then
-			eerror "The Boost.MPI python bindings do not support any other python version"
-			eerror "than 2.x. Please either use eselect to select a python 2.x version or"
-			eerror "disable the python and/or mpi use flag for =${CATEGORY}/${PF}."
-			die "unsupported python version"
-		fi
-	fi
+#	# It doesn't compile with USE="python mpi" and python-3 (bug 295705)
+#	if use python && use mpi ; then
+#		if [[ "$(python_get_version --major)" != "2" ]]; then
+#			eerror "The Boost.MPI python bindings do not support any other python version"
+#			eerror "than 2.x. Please either use eselect to select a python 2.x version or"
+#			eerror "disable the python and/or mpi use flag for =${CATEGORY}/${PF}."
+#			die "unsupported python version"
+#		fi
+#	fi
+
+	python_convert_shebangs -r 2 "${ED}"
+	python_pkg_setup
 
 	if use test ; then
 		CHECKREQS_DISK_BUILD="1024"
@@ -225,6 +229,7 @@
 	einfo "Using the following command to install: "
 	einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" install"
 
+	python_convert_shebangs -r 2 "${ED}"
 	${BJAM} -q -d+2 \
 		gentoorelease \
 		${OPTIONS} \
@@ -404,10 +409,10 @@
 	[[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		einfo "Working around completely broken build-system(tm)"
-		for d in "${D}"usr/lib/*.dylib ; do
+		for d in "${ED}"usr/lib/*.dylib ; do
 			if [[ -f ${d} ]] ; then
 				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${D}}"
+				ebegin "  correcting install_name of ${d#${ED}}"
 				install_name_tool -id "/${d#${D}}" "${d}"
 				eend $?
 				# fix references to other libs