Dependency on polygon:2 only

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 18 insertions, 87 deletions

diff --git a/dev-python/visual/ChangeLog b/dev-python/visual/ChangeLog
index 829a4b310118..45fdf7c0cfaa 100644
--- a/dev-python/visual/ChangeLog
+++ b/dev-python/visual/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/visual
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/ChangeLog,v 1.54 2012/02/25 02:00:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/ChangeLog,v 1.55 2012/03/16 16:29:07 bicatali Exp $
+
+*visual-5.72-r2 (16 Mar 2012)
+
+  16 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> -visual-5.72.ebuild,
+  -visual-5.72-r1.ebuild, +visual-5.72-r2.ebuild:
+  Dependency on polygon:2 only
 
   25 Feb 2012; Patrick Lauer <patrick@gentoo.org> visual-5.4.ebuild,
   visual-5.72-r1.ebuild, visual-5.72.ebuild:
diff --git a/dev-python/visual/visual-5.72-r1.ebuild b/dev-python/visual/visual-5.72-r2.ebuild
index fe7e7af0f002..c8b774bc9e98 100644
--- a/dev-python/visual/visual-5.72-r1.ebuild
+++ b/dev-python/visual/visual-5.72-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/visual-5.72-r1.ebuild,v 1.5 2012/02/25 02:00:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/visual-5.72-r2.ebuild,v 1.1 2012/03/16 16:29:07 bicatali Exp $
 
 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 *-jython 2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="2.5 3.* *-jython 2.7-pypy-*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 
 inherit flag-o-matic multilib python versionator
@@ -24,7 +24,7 @@ RDEPEND=">=dev-cpp/gtkglextmm-1.2
 	dev-cpp/libglademm
 	>=dev-libs/boost-1.48[python]
 	dev-python/numpy
-	dev-python/polygon
+	dev-python/polygon:2
 	dev-python/ttfquery"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -34,19 +34,23 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	# Delete redundant file, which causes compilation failure.
 	rm -f src/gtk2/random_device.cpp
-	sed -e "s/ random_device.l\?o//" -i src/Makefile.in src/gtk2/makefile || die "sed failed"
+	sed -i \
+		-e "s/ random_device.l\?o//" \
+		src/Makefile.in src/gtk2/makefile || die
 
 	# Verbose build.
-	sed -e 's/2\?>>[[:space:]]*\$(LOGFILE).*//' -i src/Makefile.in || die "sed failed"
+	sed -i \
+		-e 's/2\?>>[[:space:]]*\$(LOGFILE).*//' \
+		src/Makefile.in || die
 
 	python_clean_py-compile_files
 	python_src_prepare
 
 	preparation() {
-		sed \
+		sed -i \
 			-e "s/-lboost_python/-lboost_python-${PYTHON_ABI}/" \
 			-e "s/libboost_python/libboost_python-${PYTHON_ABI}/" \
-			-i src/Makefile.in src/gtk2/makefile
+			src/Makefile.in src/gtk2/makefile
 	}
 	python_execute_function -s preparation
 }
diff --git a/dev-python/visual/visual-5.72.ebuild b/dev-python/visual/visual-5.72.ebuild
deleted file mode 100644
index 906dec4cebfe..000000000000
--- a/dev-python/visual/visual-5.72.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/visual-5.72.ebuild,v 1.6 2012/02/25 02:00:49 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 *-jython 2.7-pypy-*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-
-inherit flag-o-matic multilib python versionator
-
-MY_P="${PN}-$(delete_version_separator 2)_release"
-
-DESCRIPTION="Real-time 3D graphics library for Python"
-HOMEPAGE="http://www.vpython.org/"
-SRC_URI="http://www.vpython.org/contents/download/${MY_P}.tar.bz2"
-
-IUSE="doc examples"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="visual"
-
-RDEPEND="<dev-libs/boost-1.48[python]
-	dev-cpp/libglademm
-	>=dev-cpp/gtkglextmm-1.2
-	dev-python/numpy
-	dev-python/polygon
-	dev-python/ttfquery"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# redundant file
-	rm src/gtk2/random_device.cpp || die
-	sed -i \
-		-e 's/random_device.lo//g' \
-		src/Makefile.in src/gtk2/makefile || die
-	# verbose build
-	sed -i -e 's/2\?>> \?\$(LOGFILE).*//' src/Makefile.in || die
-
-	echo "#!/bin/bash" > py-compile
-	python_src_prepare
-}
-
-src_configure() {
-	BOOST_PKG="$(best_version ">=dev-libs/boost-1.41.0")"
-	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
-	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
-	BOOST_INC="${EPREFIX}/usr/include/boost-${BOOST_VER}"
-	BOOST_LIB="${EPREFIX}/usr/$(get_libdir)/boost-${BOOST_VER}"
-
-	# hack to specify the include and lib directory for boost
-	append-cxxflags -I${BOOST_INC}
-	append-ldflags -L${BOOST_LIB}
-
-	python_src_configure \
-		--with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--with-example-dir="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		$(use_enable doc docs) \
-		$(use_enable examples)
-}
-
-src_install() {
-	python_src_install
-	python_clean_installation_image
-	dodoc authors.txt HACKING.txt NEWS.txt || die "dodoc failed"
-	# Don't install useless vpython script.
-	rm -fr "${ED}usr/bin"
-}
-
-pkg_postinst() {
-	python_mod_optimize vis visual
-}
-
-pkg_postrm() {
-	python_mod_cleanup vis visual
-}