net-analyzer/linkchecker: Drop old; drop pysqlite dep, #452152

(Portage version: 2.2.0_alpha152/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

6 files changed, 16 insertions, 169 deletions

diff --git a/net-analyzer/linkchecker/ChangeLog b/net-analyzer/linkchecker/ChangeLog
index 191460723395..e5cf654f552a 100644
--- a/net-analyzer/linkchecker/ChangeLog
+++ b/net-analyzer/linkchecker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/linkchecker
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.84 2013/01/15 12:32:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.85 2013/01/15 16:17:54 jlec Exp $
+
+  15 Jan 2013; Justin Lecher <jlec@gentoo.org> linkchecker-7.9.ebuild,
+  -linkchecker-8.0.ebuild, -linkchecker-8.1.ebuild, linkchecker-8.2.ebuild,
+  linkchecker-8.3.ebuild:
+  Drop old; drop pysqlite dep, #452152
 
 *linkchecker-8.3 (15 Jan 2013)
 
diff --git a/net-analyzer/linkchecker/linkchecker-7.9.ebuild b/net-analyzer/linkchecker/linkchecker-7.9.ebuild
index f7257e9d34c1..a5994f50cb9b 100644
--- a/net-analyzer/linkchecker/linkchecker-7.9.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-7.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-7.9.ebuild,v 1.6 2012/12/26 06:56:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-7.9.ebuild,v 1.7 2013/01/15 16:17:54 jlec Exp $
 
 EAPI=4
 
@@ -8,8 +8,10 @@ PYTHON_DEPEND="2:2.7"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
 PYTHON_MODNAME="linkcheck"
+PYTHON_USE_WITH=sqlite
+PYTHON_USE_WITH_OPT=bookmarks
 
-inherit bash-completion-r1 distutils eutils
+inherit bash-completion-r1 distutils eutils multilib
 
 MY_P="${P/linkchecker/LinkChecker}"
 
@@ -25,7 +27,6 @@ IUSE="bash-completion bookmarks clamav doc geoip gnome login syntax-check X"
 RDEPEND="
 	dev-python/dnspython
 	bash-completion? ( dev-python/optcomplete )
-	bookmarks? ( dev-python/pysqlite:2 )
 	clamav? ( app-antivirus/clamav )
 	geoip? ( dev-python/geoip-python )
 	gnome? ( dev-python/pygtk:2 )
diff --git a/net-analyzer/linkchecker/linkchecker-8.0.ebuild b/net-analyzer/linkchecker/linkchecker-8.0.ebuild
deleted file mode 100644
index 21d9dcee7dce..000000000000
--- a/net-analyzer/linkchecker/linkchecker-8.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.0.ebuild,v 1.3 2012/12/26 06:56:19 pesa Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.7"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
-PYTHON_MODNAME="linkcheck"
-
-inherit bash-completion-r1 distutils eutils
-
-MY_P="${P/linkchecker/LinkChecker}"
-
-DESCRIPTION="Check websites for broken links"
-HOMEPAGE="http://linkchecker.sourceforge.net/ http://pypi.python.org/pypi/linkchecker/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-solaris"
-IUSE="bash-completion bookmarks clamav doc geoip gnome login nagios syntax-check X"
-
-RDEPEND="
-	dev-python/dnspython
-	bash-completion? ( dev-python/optcomplete )
-	bookmarks? ( dev-python/pysqlite:2 )
-	clamav? ( app-antivirus/clamav )
-	geoip? ( dev-python/geoip-python )
-	gnome? ( dev-python/pygtk:2 )
-	login? ( dev-python/twill )
-	syntax-check? (
-		dev-python/cssutils
-		dev-python/utidylib
-		)
-	X? (
-		|| ( >=dev-python/PyQt4-4.9.6-r1[X,help]
-			<dev-python/PyQt4-4.9.6-r1[X,assistant] )
-		dev-python/qscintilla-python
-		)"
-DEPEND="
-	doc? ( x11-libs/qt-assistant:4 )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-missing-files.patch \
-		"${FILESDIR}"/7.0-unbundle.patch \
-		"${FILESDIR}"/${P}-desktop.patch
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		emake -C doc/html
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	if ! use X; then
-		delete_gui() {
-				rm -rf \
-					"${ED}"/usr/bin/linkchecker-gui* \
-					"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-		}
-		python_execute_function -q delete_gui
-	fi
-	if use doc; then
-		dohtml doc/html/*
-	fi
-	use bash-completion && dobashcomp config/linkchecker-completion
-	insinto /usr/$(get_libdir)/nagios/plugins
-	use nagios && doins linkchecker-nagios
-}
diff --git a/net-analyzer/linkchecker/linkchecker-8.1.ebuild b/net-analyzer/linkchecker/linkchecker-8.1.ebuild
deleted file mode 100644
index 3a34688f43f0..000000000000
--- a/net-analyzer/linkchecker/linkchecker-8.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.1.ebuild,v 1.2 2012/12/26 06:56:19 pesa Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.7"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
-PYTHON_MODNAME="linkcheck"
-
-inherit bash-completion-r1 distutils eutils
-
-MY_P="${P/linkchecker/LinkChecker}"
-
-DESCRIPTION="Check websites for broken links"
-HOMEPAGE="http://linkchecker.sourceforge.net/ http://pypi.python.org/pypi/linkchecker/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-solaris"
-IUSE="bash-completion bookmarks clamav doc geoip gnome login nagios syntax-check X"
-
-RDEPEND="
-	dev-python/dnspython
-	bash-completion? ( dev-python/optcomplete )
-	bookmarks? ( dev-python/pysqlite:2 )
-	clamav? ( app-antivirus/clamav )
-	geoip? ( dev-python/geoip-python )
-	gnome? ( dev-python/pygtk:2 )
-	login? ( dev-python/twill )
-	syntax-check? (
-		dev-python/cssutils
-		dev-python/utidylib
-		)
-	X? (
-		|| ( >=dev-python/PyQt4-4.9.6-r1[X,help]
-			<dev-python/PyQt4-4.9.6-r1[X,assistant] )
-		dev-python/qscintilla-python
-		)"
-DEPEND="
-	doc? ( x11-libs/qt-assistant:4 )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/8.0-missing-files.patch \
-		"${FILESDIR}"/7.0-unbundle.patch \
-		"${FILESDIR}"/${PN}-8.0-desktop.patch
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		emake -C doc/html
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	if ! use X; then
-		delete_gui() {
-				rm -rf \
-					"${ED}"/usr/bin/linkchecker-gui* \
-					"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-		}
-		python_execute_function -q delete_gui
-	fi
-	if use doc; then
-		dohtml doc/html/*
-	fi
-	use bash-completion && dobashcomp config/linkchecker-completion
-	insinto /usr/$(get_libdir)/nagios/plugins
-	use nagios && doins linkchecker-nagios
-}
diff --git a/net-analyzer/linkchecker/linkchecker-8.2.ebuild b/net-analyzer/linkchecker/linkchecker-8.2.ebuild
index 8446a7b2ea57..486911673b7a 100644
--- a/net-analyzer/linkchecker/linkchecker-8.2.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.2.ebuild,v 1.3 2013/01/15 12:32:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.2.ebuild,v 1.4 2013/01/15 16:17:54 jlec Exp $
 
 EAPI=4
 
@@ -8,6 +8,8 @@ PYTHON_DEPEND="2:2.7"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
 PYTHON_MODNAME="linkcheck"
+PYTHON_USE_WITH=sqlite
+PYTHON_USE_WITH_OPT=bookmarks
 
 inherit bash-completion-r1 distutils eutils multilib
 
@@ -25,7 +27,6 @@ IUSE="bash-completion bookmarks clamav doc geoip gnome login nagios syntax-check
 RDEPEND="
 	dev-python/dnspython
 	bash-completion? ( dev-python/optcomplete )
-	bookmarks? ( dev-python/pysqlite:2 )
 	clamav? ( app-antivirus/clamav )
 	geoip? ( dev-python/geoip-python )
 	gnome? ( dev-python/pygtk:2 )
diff --git a/net-analyzer/linkchecker/linkchecker-8.3.ebuild b/net-analyzer/linkchecker/linkchecker-8.3.ebuild
index 1acde0c260ae..4004e06cf661 100644
--- a/net-analyzer/linkchecker/linkchecker-8.3.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-8.3.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.3.ebuild,v 1.1 2013/01/15 12:32:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.3.ebuild,v 1.2 2013/01/15 16:17:54 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite"
 
 inherit bash-completion-r1 distutils-r1 eutils multilib
 
@@ -22,7 +23,6 @@ IUSE="bash-completion bookmarks clamav doc geoip gnome login nagios syntax-check
 RDEPEND="
 	dev-python/dnspython
 	bash-completion? ( dev-python/optcomplete )
-	bookmarks? ( dev-python/pysqlite:2 )
 	clamav? ( app-antivirus/clamav )
 	geoip? ( dev-python/geoip-python )
 	gnome? ( dev-python/pygtk:2 )