sci-chemistry/openbabel: Drop old; drop PDEPEND in favour of optfeature()

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 20 insertions, 150 deletions

diff --git a/sci-chemistry/openbabel/ChangeLog b/sci-chemistry/openbabel/ChangeLog
index 3744b8d38a17..fa4f073bb55c 100644
--- a/sci-chemistry/openbabel/ChangeLog
+++ b/sci-chemistry/openbabel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/openbabel
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/ChangeLog,v 1.62 2013/02/20 19:42:22 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/ChangeLog,v 1.63 2015/01/04 13:40:52 jlec Exp $
+
+  04 Jan 2015; Justin Lecher <jlec@gentoo.org> -openbabel-2.3.0.ebuild,
+  -openbabel-2.3.1.ebuild, openbabel-2.3.2.ebuild, metadata.xml:
+  Drop old; drop PDEPEND in favour of optfeature()
 
   20 Feb 2013; Agostino Sarubbo <ago@gentoo.org> openbabel-2.3.2.ebuild:
   Add ~arm, wrt bug #455960
diff --git a/sci-chemistry/openbabel/metadata.xml b/sci-chemistry/openbabel/metadata.xml
index 6d2bd5b58651..831a79c2d37b 100644
--- a/sci-chemistry/openbabel/metadata.xml
+++ b/sci-chemistry/openbabel/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<longdescription>
+  <herd>sci-chemistry</herd>
+  <longdescription>
     Open Babel is a chemical toolbox designed to speak the many languages of
 	chemical data. It's an open, collaborative project allowing anyone to
 	search, convert, analyze, or store data from molecular modeling, chemistry,
 	solid-state materials, biochemistry, or related areas.
   </longdescription>
-	<use>
-		<flag name="swig">Use swig to rebuild language bindings.</flag>
-	</use>
+  <use>
+    <flag name="swig">Use swig to rebuild language bindings.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-chemistry/openbabel/openbabel-2.3.0.ebuild b/sci-chemistry/openbabel/openbabel-2.3.0.ebuild
deleted file mode 100644
index 6cbd898303fd..000000000000
--- a/sci-chemistry/openbabel/openbabel-2.3.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.3.0.ebuild,v 1.6 2011/11/21 15:36:34 jlec Exp $
-
-EAPI="3"
-
-WX_GTK_VER="2.8"
-
-inherit cmake-utils eutils wxwidgets
-
-DESCRIPTION="Interconverts file formats used in molecular modeling"
-HOMEPAGE="http://openbabel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="doc perl python wxwidgets"
-
-RDEPEND="
-	dev-cpp/eigen:2
-	dev-libs/libxml2:2
-	!sci-chemistry/babel
-	sci-libs/inchi
-	sys-libs/zlib
-	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.8"
-PDEPEND="
-	perl? ( sci-chemistry/openbabel-perl )
-	python? ( sci-chemistry/openbabel-python )"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/*.inc doc/README* doc/*.mol2"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-test_lib_path.patch \
-		"${FILESDIR}"/${P}-swig.patch
-}
-
-src_configure() {
-	local mycmakeargs=""
-	mycmakeargs="${mycmakeargs}
-		-DOPENBABEL_USE_SYSTEM_INCHI=ON
-		$(cmake-utils_use wxwidgets BUILD_GUI)"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dohtml doc/{*.html,*.png} || die
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/API/html
-		doins doc/API/html/* || die
-	fi
-	cmake-utils_src_install
-}
-
-src_test() {
-	local mycmakeargs=""
-	mycmakeargs="${mycmakeargs}
-		-DOPENBABEL_USE_SYSTEM_INCHI=ON
-		-DPYTHON_EXECUTABLE=false
-		$(cmake-utils_use wxwidgets BUILD_GUI)
-		$(cmake-utils_use_enable test TESTS)"
-
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test
-}
diff --git a/sci-chemistry/openbabel/openbabel-2.3.1.ebuild b/sci-chemistry/openbabel/openbabel-2.3.1.ebuild
deleted file mode 100644
index ca15889b5564..000000000000
--- a/sci-chemistry/openbabel/openbabel-2.3.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.3.1.ebuild,v 1.2 2012/03/04 10:32:17 jlec Exp $
-
-EAPI=4
-
-WX_GTK_VER="2.8"
-
-inherit cmake-utils eutils wxwidgets
-
-DESCRIPTION="Interconverts file formats used in molecular modeling"
-HOMEPAGE="http://openbabel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="doc perl python wxwidgets"
-
-RDEPEND="
-	dev-cpp/eigen:2
-	dev-libs/libxml2:2
-	!sci-chemistry/babel
-	sci-libs/inchi
-	sys-libs/zlib
-	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.8"
-PDEPEND="
-	perl? ( sci-chemistry/openbabel-perl )
-	python? ( sci-chemistry/openbabel-python )"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/*.inc doc/README* doc/*.mol2"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.3.0-test_lib_path.patch )
-
-src_configure() {
-	local mycmakeargs=""
-	mycmakeargs="${mycmakeargs}
-		-DOPENBABEL_USE_SYSTEM_INCHI=ON
-		$(cmake-utils_use wxwidgets BUILD_GUI)"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dohtml doc/{*.html,*.png}
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/API/html
-		doins doc/API/html/*
-	fi
-	cmake-utils_src_install
-}
-
-src_test() {
-	local mycmakeargs=""
-	mycmakeargs="${mycmakeargs}
-		-DOPENBABEL_USE_SYSTEM_INCHI=ON
-		-DPYTHON_EXECUTABLE=false
-		$(cmake-utils_use wxwidgets BUILD_GUI)
-		$(cmake-utils_use_enable test TESTS)"
-
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test
-}
diff --git a/sci-chemistry/openbabel/openbabel-2.3.2.ebuild b/sci-chemistry/openbabel/openbabel-2.3.2.ebuild
index 41e154c548af..873a08dae844 100644
--- a/sci-chemistry/openbabel/openbabel-2.3.2.ebuild
+++ b/sci-chemistry/openbabel/openbabel-2.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.3.2.ebuild,v 1.3 2013/02/20 19:42:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.3.2.ebuild,v 1.4 2015/01/04 13:40:52 jlec Exp $
 
 EAPI=5
 
@@ -15,21 +15,18 @@ SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc openmp perl python test wxwidgets"
+IUSE="doc openmp test wxwidgets"
 
 RDEPEND="
+	!sci-chemistry/babel
 	dev-cpp/eigen:3
 	dev-libs/libxml2:2
-	!sci-chemistry/babel
 	sci-libs/inchi
 	sys-libs/zlib
 	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.4.8
 	doc? ( app-doc/doxygen )"
-PDEPEND="
-	perl? ( sci-chemistry/openbabel-perl )
-	python? ( sci-chemistry/openbabel-python )"
 
 DOCS="AUTHORS ChangeLog NEWS README THANKS doc/*.inc doc/README* doc/*.mol2"
 
@@ -78,3 +75,8 @@ src_test() {
 	cmake-utils_src_compile
 	cmake-utils_src_test -E py
 }
+
+pkg_postinst() {
+	optfeature "perl support" sci-chemistry/openbabel-perl
+	optfeature "python support" sci-chemistry/openbabel-python
+}