net-analyzer/linkchecker: Add live ebuild; backport upstream fix and drop bad patch to fix help issue, #488360; drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

7 files changed, 108 insertions, 167 deletions

diff --git a/net-analyzer/linkchecker/ChangeLog b/net-analyzer/linkchecker/ChangeLog
index 870c597cd3f8..0a06739d3acd 100644
--- a/net-analyzer/linkchecker/ChangeLog
+++ b/net-analyzer/linkchecker/ChangeLog
@@ -1,6 +1,16 @@
 # 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.89 2013/11/06 13:36:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.90 2013/12/11 08:50:11 jlec Exp $
+
+*linkchecker-9999 (11 Dec 2013)
+*linkchecker-8.4-r1 (11 Dec 2013)
+
+  11 Dec 2013; Justin Lecher <jlec@gentoo.org> -linkchecker-8.2.ebuild,
+  -linkchecker-8.3.ebuild, -linkchecker-8.4.ebuild, +linkchecker-8.4-r1.ebuild,
+  +linkchecker-9999.ebuild, -files/8.0-missing-files.patch,
+  +files/linkchecker-8.4-help.patch:
+  Add live ebuild; backport upstream fix and drop bad patch to fix help issue,
+  #488360; drop old
 
 *linkchecker-8.4 (06 Nov 2013)
 
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index b6f890b9401d..ad46f328441b 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -3,33 +3,30 @@ Hash: SHA512
 
 AUX 7.0-unbundle.patch 795 SHA256 f80a7f2c711d0ee89a6cc4ca9e3b7aeaccf6d7c1bec8482e89ab8265afc7f5de SHA512 8f9c3de72eec1f66a941dce915497b95863b5b7963e96ecd0c6c8a189d5c9230f1ff99c1f7c1470e344c63d459b5427fa9ff6d90e76eb265118e0ebe383a7bf8 WHIRLPOOL 48ee6ae656d8a814bc4f169085bb877be0428e88151cc099b2bcb69a8a570e88161d855c489d44ca5d839c3f985f3d1d4a553e5c2d6e94975c083e9201815525
 AUX 7.4-missing-files.patch 478 SHA256 1db17a6085214c56a8a84ef74723bb0b711dc3cdef9bdc5674f20a4142b532a1 SHA512 73040684f93f348aa41633aa0702f2962b22aa621921f0edc5bd8be973443725c2b145f46254c6d7a7249756100172ebd84cb2786c5e34288e56e220c51790f9 WHIRLPOOL 5431b39874db972445630ce4c3198c2e1a9bbfae209b1cfa06836e7d643ec234c79ae433f748b4b5db5f04363f225677cab984fb5a55f17920cc7fa9ca08a774
-AUX 8.0-missing-files.patch 508 SHA256 60d3e82a95dfca8621cea0abebc38811d543a67cdd70ecdfb5415295af2fd568 SHA512 329f113ac55cacc8ee272a57b54200ffd60ca4bb6730d8d1b082c9eba69019f575bb6ca879653c92d0b1be756a6353aae3727e419af4ca15ba53dc813685d74d WHIRLPOOL 39a60ddd4a424a4e47582a9ee9f99ca84245abe9f30a452ae7aa5eb57297247c682b8d0adfb55bec543dda6b0935580d2a8bcdfbbaf4253a10102d7567b48c11
 AUX linkchecker-8.0-desktop.patch 830 SHA256 a15bfb0c4dcb226de25999939277db52baa33427a299ebcc0bad094b143a3c44 SHA512 c771281f874df6f185e2ecf303d145849741c1e016857c11a02b84e1049c2270c76b0845412637cbda13348d7493152d95ba4873b66bdab95a81f05615ce4f04 WHIRLPOOL 80e45bfbea6b93c09422fc2f93d8c5c8241592e825f7e8f9ffa0614431376aee1fc1aa0e7e7d9f3e05b372bd4ef16227d1cd64f4cd93ff57dd4b56ac5d016711
 AUX linkchecker-8.3-unbundle.patch 822 SHA256 5bc3690884efcede99879fa0754a3153cbde3d6fd3d5eee700e5de1cda4174fb SHA512 a525d47c2768e2eee4f838d9d607ea1a86ab65ee0d22fcf9bc4b1e01c23951d9bdebb2facd657e3009cb072045374c474cd67a93932bfca601393e02cc1657b1 WHIRLPOOL 19d0d0769d3d446a5bf4bdfba2b5552d0f149ee7eac47adea80693cca3f43d5b1fcf80967db0afa542f2f2a4d062406791eabdbe153a391e0d6614de35fc2547
+AUX linkchecker-8.4-help.patch 1121 SHA256 99f8b4cfbf7c1cc0b5b488cd4ff2b5e7b7c3412c989fce53422346162621b96f SHA512 7650d207948590b8f06d6ca10a4cba0323c6c304a5031f74544594fce893a15fd95da9dda320f252ea974a2b96e69dabc45fcfdc4d387069e7fad0f7c7340307 WHIRLPOOL 6bff95cb6c808236244f172d566bfea822525591991cb7d4e54a7ced79aba3949b9eed3a0368f5a9823d9ce8f1844528bbec5ff4906316c8a45b0a2518dbb5ca
 DIST LinkChecker-7.9.tar.bz2 586258 SHA256 d35e5a9d025629d8264e165b50e8f84b81e9ceddcbab34d55f247b741abdc665 SHA512 b1d07ce8bb28b10cd2596916fbcc9d7ec6486df586bee0bbee149efaeeb14c82b03c46fe0c901ae76208beed96b261133bd70b1ea773543a446a8dc70f2620fc WHIRLPOOL 7fb5c067c956c6df13b1b027f2a196881b3ae45d49548ba0517c6a3ae4057e7ca64296fc38f4d722a2b3f1d67a02baf89da4ea33b4680934abd1dc321b7822b6
-DIST LinkChecker-8.2.tar.xz 666084 SHA256 052d2c239326029baf57eddd56650b40de03576160a930a7d55960fffafa7811 SHA512 dccd6bd2061c1353dedf50aa579f98d2e065a946cc44fa16af826e286b2e533523788ad82d5b696b3bda245454f37ebf413b5f1e758538f9166940c474b6c717 WHIRLPOOL c4ebbcffa9edfea602feaccfbb22b75b24e9ec2dcc9ffe839ef56fa8b096faa6be27924454655edf6768187199b22bf329fa087630bde08b2ae71c13c42cfc80
-DIST LinkChecker-8.3.tar.xz 669480 SHA256 0b8f85b9c9f8fce81054676332aa2e53428ffde7336a5d2bc51aead83e2dc705 SHA512 08208d761eea3289c63f14143b5e363fc21a7fec2b7e849143a2d6f1aad40f2e5c5c6086782616b8a67c10bfbb56479f0529f90bd94d177dadffae1ad3b1d1d9 WHIRLPOOL 0bc2cd44dd51d8956f5483ac9acffaf2c207b58087c6475cd188f818c0c904b921dc6cf96d8d3d58fc6a087aa563196532c5b0f0241184a11dfc1f901088bc3c
 DIST LinkChecker-8.4.tar.xz 655044 SHA256 b77ba0e8a087ea11efb64216427b3ae5437a1534ffd9f8762ffd26bc9600c0a7 SHA512 886f96f5213db384851aa4ac25afd1f508c135c513f8936c78639cc25e5631c6ab483a1eb4c2b4515beaff180996971474cda1a25fb6aaf2e70bd3d448edecaf WHIRLPOOL 5a47cc2f9cda6733ba40c083d4cb2a1c02fce1c335523aac1e2ae824a6b107dad6a685d71a9f1aea5db528e3cb9005bab1d7ca89aaeb9b6f8e6707c747a92525
 EBUILD linkchecker-7.9.ebuild 1906 SHA256 a699786cc532e08fa28d2513b8961c9ca8fa157fc86c567242f4b20c99def749 SHA512 2425c9b267b732e2d7944505c762879d9329e1448d630cb38d0b0485f0ca7e9275d857bf3b71c8fe7c844f6deb7292d8e958311fbde705c79ca493493f83b2dd WHIRLPOOL 97fbe1e1db0faf8ba624e52b693fd522cc0dd056a300aad47708d72277d6eb0960c9d6d5f2016cb0fc59474171fd2f6ef0a11cbe98d3a0b202c6b8228d56e671
-EBUILD linkchecker-8.2.ebuild 2040 SHA256 b0221605f2362ac70127b63e81c359fcf8d1c81914cd69aff62e6d8945f6c0cc SHA512 f483657ae5879bcdc50cd17c1daaff56329107dae6d248cdd3c08da8274cb0370d915cd2293de448b436327753120ecb4fc5f2d94233755fdde42b17acab102d WHIRLPOOL 4389f48b70e432066b0b92ea8b51b03985046c085d9a1bee2e620ce786e304a215d99da3dcf523609164d3957d48dca3a5a056190e7cf3a36cabe3088c113a48
-EBUILD linkchecker-8.3.ebuild 1980 SHA256 9680cfbe3952fc592eec18a6111e9d1b185f6e0101f3605108bec9c4fb7af46f SHA512 85f3c6f1550bb43d5671bae741cf46639b7f6486d9d114f3c41b3866af2ace6ab67a55b1aecceb27f590875cdee21412a746d6ad0fbc9432e976c2e0903a72c3 WHIRLPOOL dc957b5297c3271bcdbbb839c04dff5750ff8a00d35cf330da29eb7c3c99e9788d21b6806fda73fdfe365edba95f2c94086733cdd21575f9a75bf505f299fa8e
-EBUILD linkchecker-8.4.ebuild 1972 SHA256 6015436b2661bd72cbac75589e5095d692aebe42d19867a996b81c80f4c65cc4 SHA512 3097cde5eb126b6a6ae3658403407434bf13de9bca0d824e871ea50b285564d3049888b03f872d02b26704a0eba341fe1165a2da68513e6a1beda4fa794219eb WHIRLPOOL 19dbd9d2ca0defdea9ad7713aeb5756d53c196d56ed52268caae27573008ce5db3a747e9536743b094de639ddd7222923a55b2ab3074345e61bf60c4136f91ff
-MISC ChangeLog 12341 SHA256 5c955b67bebb03e512c1c33ab3bdcdddd9efcbf39ab66a82af3d7e84ee8a61c6 SHA512 aa392178f062e957df3c2eb2555cd8a0fe5a1213e1cefef8f8f12147438db2906d474b5af2cd5a40aab8f9a50feb7e020283fd7f11fdef5c08ccae7368e514f6 WHIRLPOOL 0543a74c8bb3ff0f352bdc33a020d390f72234261b9b423bd194f51458a506caac5b4d0c0f7c3a7561711751eb28469ec1bce5a7d78f5cd4c3aca2bffa325e0f
+EBUILD linkchecker-8.4-r1.ebuild 2041 SHA256 1bde2932f620a778699c19da09dfa4c2978a5f5763bf129ecb5a72db3a77831a SHA512 4d891fde7214ac1a337864f96846601ff6f28f7a82b3ff3dbf6c72c3769014b3e06d85116e323de6b2a2d3b705f380bfc922818487500f7aa1559597f471b959 WHIRLPOOL 7fc0c0929b392c99ef5f3fa9484f7125c2e2d7d6638225c366f61d96c1315fa8cbf04b773258b6be79754418a74dc76586eefb26167c844412b1af0b49dca428
+EBUILD linkchecker-9999.ebuild 1970 SHA256 4a8208fabf381d53bed4b719abdbed72250747da9d93d5114fe3cebd1138838c SHA512 9282996d1bd3b27a1336505fca440e6ec302f85cc5f54c36ad69b8ae21ba86dee5323eb131db4832c49d5c2aef7296f55b50c90e09711474a5e5c38400d312df WHIRLPOOL 69b2057bb46c29eb9ebb30b7b3e839d29922e60a48024e08061a50eb817bb8233166216b37ec5cce7a1574007c337fc522715b35b8ffab77f10d60a3e62bae3d
+MISC ChangeLog 12757 SHA256 82cc9bcb357c625aafd82c519402d18f5767b3bd8c2ecab5580fcdef79d6519b SHA512 6f13214c3c4452009186b1a76c6dd29b48c60e5ff374b1f7814a5b37589d46d8419d71b9c4b4b5322b2534833e5a284df2c7186162e9ba40a83c7513d0ec3270 WHIRLPOOL 5c409e2cfab70055fdddf1331bc5b47661983d05b8ac952efe59487f59887c3e3b768f6e6f516a01c9556274bcdb4963ad141acbbba1249c5a089efc712a5d88
 MISC metadata.xml 506 SHA256 eb3c9c13367aeafda72160a8dfd68f8a463ff509e27c3c51f064579343874077 SHA512 5f592c6ca68aa6d35d30251ec21290a724bc0bbc3a8124f48bdb8433a9f54fa7dfbcf8fcc55e77b73f2e7a17987dff21bafaeccb6554941a89668d3b4943257b WHIRLPOOL 3c67dac6a9439dd7aa0a7c124a1602e94a6615312f35190bf5f3e8acefe08626f46e1e10ef2c35f154eb7c0827ebce2f15d046b8afb78625a62c5bc3b533f471
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSekXPAAoJELnU8jG9FVirjdwP/3LUOWIXze502Sj0Z0CZ3Cr6
-rws/8XmJHyr5aSkbshvHC54kXP1810Fk7rzLqVG0G3Q9cmI9ULYQY25xXlgragRb
-YgpbLV/7beQPtXsTwsqT9P4svnZJoAm8d5bfE0GV6aiVdiZmEXY4Q/y/6DmgIBlO
-2fFryiLZCdhyZOESQkj5w2pDPVCUXD11ONyJbhZ1wowKLfzbU7Ktl1wrduZhdYrD
-o0CqbV3/AYDyQZU7W7paFmvuj6HBJ6rb5UBGKkBDkl4rE59HxhlXsQY7vdTb5463
-9gWRF7SEdWto05SygfXRZjgyadfrASYn63Ov5Zoz8TosE5sw6/NP8jVEnG2xX7bd
-gZ81gQd4VbPKHOUWGOlz2gpbvPzZwj3lvs773Qb08+byMn1j7vXbXSoGLlDy9o5k
-gEaUupC6jKzJJX7TDhCZ0ujlzN8+hm4Ix1WfssD3Re3wG7UJanmwCGGgu0C579ZT
-cv3qHNPy+45dEDFxgsjTdH8+bvpQtZ+her/F8GMu+plx/dWLDCytZ7iXiFNCBIdt
-OgnbBbXAKeBLqL4mmkGEMoOIcs0UE2w/guQKfv27gsnJ3w8kCk1y8WIChs14ZgTm
-mb6Y/+jTDxZkTklaQG3LprrWrm8tZixlFOVhkJo6Z8EseP0fl3YG4rwhiwx1RXiD
-hWutAMQVGgInVJ4DmCNX
-=feQy
+iQIcBAEBCgAGBQJSqCdEAAoJELnU8jG9FVirwWkQAJT8/I8hZK57Kyuo3s5ymBxH
+lvdzELbGsBDPEdKwses3PZ1heMUmALYqNSnNaYqnIho1BWkL4idZz3tXIOIquERK
+yL+sasAXloauJi2cJgW3n16uJJ5yNV/bTfe8DTDZfEFdalrQHrUgLuVew7cabMir
+amXMULeXccYurNLXQCX5EIukHmRSe6d6BYuWjGxW618v0/rhJBD+UiAjxN5jB8wq
+SKSyBjlDvGu2gsdhvrkGuz2Pe30Psg1CcdpvjbChcDZ7Q9m7D/XzNu5k7tsB05rA
+ffFjAfpILXN3YCJ/ZSjn4wHocqz20mgSgPqc9tHHuCWxrszW8Yb2NLFYEESFGbBT
+eiWgdRoCIvsaNoP8fK20H8/2nZZvfNKCJJLrXdXMYPF+wCBIzAQvQb8NgzGBlhH/
+WTkCNY2Nr/pYWY92QEL7mjrLYOZoxLcP9jcdNs7Uv8kiSCuaPxkjzOY+zKRcCbja
+PJFzTTd5dx8qpT2Rk2srHzUJ4KtDQYSXOOJa55DMVfNcAp9QZ4NHR6hlLr2pqKTy
+HvLgahqORnAKZTRzMApJaZaFxBYB8PTuUrt992Mr4nkVakU9iay08B6+W3iYVf2l
+sj5D9j+5dm+zYRFHfmvNuNafSeYpJvyrVxnRmZ0UfvHN9AGV6Q5e+Dc8eDWcvG2Y
+tvSg/oIHuinouQNNXbYJ
+=mGCT
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/linkchecker/files/8.0-missing-files.patch b/net-analyzer/linkchecker/files/8.0-missing-files.patch
deleted file mode 100644
index 165783ccb671..000000000000
--- a/net-analyzer/linkchecker/files/8.0-missing-files.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 38b4c15..716203d 100755
---- a/setup.py
-+++ b/setup.py
-@@ -375,7 +375,7 @@ myemail = "calvin@users.sourceforge.net"
- data_files = [
-     ('share/linkchecker',
-         ['config/linkcheckerrc', 'config/ca-certificates.crt',
--        'doc/html/lccollection.qhc', 'doc/html/lcdoc.qch']),
-+        'doc/html/lccollection.qhcp', 'doc/html/lcdoc.qhp']),
-     ('share/linkchecker/examples',
-         ['cgi-bin/lconline/leer.html.en',
-          'cgi-bin/lconline/leer.html.de',
diff --git a/net-analyzer/linkchecker/files/linkchecker-8.4-help.patch b/net-analyzer/linkchecker/files/linkchecker-8.4-help.patch
new file mode 100644
index 000000000000..32360b6ea89e
--- /dev/null
+++ b/net-analyzer/linkchecker/files/linkchecker-8.4-help.patch
@@ -0,0 +1,36 @@
+From a7c1cdd6f69a1b91a95361359e49494b4ed88701 Mon Sep 17 00:00:00 2001
+From: Bastian Kleineidam <bastian.kleineidam@web.de>
+Date: Tue, 10 Dec 2013 20:56:26 +0100
+Subject: [PATCH] Check for help files.
+
+---
+ linkcheck/configuration/__init__.py | 6 ++++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/linkcheck/configuration/__init__.py b/linkcheck/configuration/__init__.py
+index 3b72499..f40f285 100644
+--- a/linkcheck/configuration/__init__.py
++++ b/linkcheck/configuration/__init__.py
+@@ -96,7 +96,8 @@ def get_share_file (devel_dir, filename):
+     @param filename: filename to search for
+     @ptype filename: string
+     @return: the found filename or None
+-    @rtype: string or None
++    @rtype: string
++    @raises: ValueError if not found
+     """
+     paths = [
+         # when developing
+@@ -112,7 +113,8 @@ def get_share_file (devel_dir, filename):
+         if os.path.isfile(fullpath):
+             return fullpath
+     # not found
+-    return None
++    msg = "%s not found in %s; check your installation" % (filename, paths)
++    raise ValueError(msg)
+ 
+ 
+ # dynamic options
+-- 
+1.8.5.1
+
diff --git a/net-analyzer/linkchecker/linkchecker-8.2.ebuild b/net-analyzer/linkchecker/linkchecker-8.2.ebuild
deleted file mode 100644
index b53c2c265d6b..000000000000
--- a/net-analyzer/linkchecker/linkchecker-8.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.6 2013/03/02 22:45:42 hwoarang 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"
-PYTHON_USE_WITH=sqlite
-PYTHON_USE_WITH_OPT=bookmarks
-
-inherit bash-completion-r1 distutils eutils multilib
-
-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 )
-	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? ( dev-qt/qthelp:4 )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_pkg_setup
-}
-
-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.4.ebuild b/net-analyzer/linkchecker/linkchecker-8.4-r1.ebuild
index 052780200328..3f13140608a3 100644
--- a/net-analyzer/linkchecker/linkchecker-8.4.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-8.4-r1.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.4.ebuild,v 1.1 2013/11/06 13:36:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.4-r1.ebuild,v 1.1 2013/12/11 08:50:11 jlec Exp $
 
 EAPI=5
 
@@ -17,28 +17,28 @@ SRC_URI="mirror://github/wummel/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-solaris"
-IUSE="bash-completion clamav doc geoip gnome login nagios sqlite syntax-check X"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris"
+IUSE="bash-completion clamav geoip gnome login nagios sqlite syntax-check X"
 
 RDEPEND="
-	dev-python/dnspython
-	bash-completion? ( dev-python/optcomplete )
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	bash-completion? ( dev-python/optcomplete[${PYTHON_USEDEP}] )
 	clamav? ( app-antivirus/clamav )
-	geoip? ( dev-python/geoip-python )
-	gnome? ( dev-python/pygtk:2 )
-	login? ( dev-python/twill )
+	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
+	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	login? ( dev-python/twill[${PYTHON_USEDEP}] )
 	syntax-check? (
-		dev-python/cssutils
-		dev-python/utidylib
+		dev-python/cssutils[${PYTHON_USEDEP}]
+		dev-python/utidylib[${PYTHON_USEDEP}]
 		)
 	X? (
-		|| (
-			>=dev-python/PyQt4-4.9.6-r1[X,help]
-			<dev-python/PyQt4-4.9.6-r1[X,assistant] )
-		dev-python/qscintilla-python
+		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[${PYTHON_USEDEP}]
 		)"
 DEPEND="
-	doc? ( dev-qt/qthelp:4 )"
+	dev-qt/qthelp:4
+	dev-python/markdown2[${PYTHON_USEDEP}]
+"
 
 RESTRICT="test"
 
@@ -46,15 +46,14 @@ S="${WORKDIR}/${MY_P}"
 
 python_prepare_all() {
 	local PATCHES=(
-		"${FILESDIR}"/8.0-missing-files.patch
 		"${FILESDIR}"/${PN}-8.3-unbundle.patch
 		"${FILESDIR}"/${PN}-8.0-desktop.patch
+		"${FILESDIR}"/${P}-help.patch
 		)
-	distutils-r1_python_prepare_all
-}
 
-python_compile_all() {
-	use doc && emake -C doc/html
+	emake -C doc/html
+
+	distutils-r1_python_prepare_all
 }
 
 python_install_all() {
@@ -67,7 +66,7 @@ python_install_all() {
 		}
 		python_foreach_impl delete_gui
 	fi
-	use doc && dohtml doc/html/*
+	dohtml doc/html/*
 	use bash-completion && dobashcomp config/linkchecker-completion
 	if use nagios; then
 		insinto /usr/$(get_libdir)/nagios/plugins
diff --git a/net-analyzer/linkchecker/linkchecker-8.3.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild
index 1559aeeeb313..35487dd92dca 100644
--- a/net-analyzer/linkchecker/linkchecker-8.3.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild
@@ -1,60 +1,57 @@
 # 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.5 2013/03/02 22:45:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-9999.ebuild,v 1.1 2013/12/11 08:50:11 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="sqlite?"
 
-inherit bash-completion-r1 distutils-r1 eutils multilib
+inherit bash-completion-r1 distutils-r1 eutils git-r3 multilib
 
 MY_P="${P/linkchecker/LinkChecker}"
 
 DESCRIPTION="Check websites for broken links"
 HOMEPAGE="http://wummel.github.com/linkchecker/ http://pypi.python.org/pypi/linkchecker/"
-SRC_URI="mirror://github/downloads/wummel/${PN}/${MY_P}.tar.xz"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/wummel/linkchecker.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-solaris"
-IUSE="bash-completion clamav doc geoip gnome login nagios sqlite syntax-check X"
+KEYWORDS=""
+IUSE="bash-completion clamav geoip gnome login nagios sqlite syntax-check X"
 
 RDEPEND="
-	dev-python/dnspython
-	bash-completion? ( dev-python/optcomplete )
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	bash-completion? ( dev-python/optcomplete[${PYTHON_USEDEP}] )
 	clamav? ( app-antivirus/clamav )
-	geoip? ( dev-python/geoip-python )
-	gnome? ( dev-python/pygtk:2 )
-	login? ( dev-python/twill )
+	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
+	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	login? ( dev-python/twill[${PYTHON_USEDEP}] )
 	syntax-check? (
-		dev-python/cssutils
-		dev-python/utidylib
+		dev-python/cssutils[${PYTHON_USEDEP}]
+		dev-python/utidylib[${PYTHON_USEDEP}]
 		)
 	X? (
-		|| (
-			>=dev-python/PyQt4-4.9.6-r1[X,help]
-			<dev-python/PyQt4-4.9.6-r1[X,assistant] )
-		dev-python/qscintilla-python
+		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[${PYTHON_USEDEP}]
 		)"
 DEPEND="
-	doc? ( dev-qt/qthelp:4 )"
+	dev-qt/qthelp:4
+	dev-python/markdown2[${PYTHON_USEDEP}]
+"
 
 RESTRICT="test"
 
-S="${WORKDIR}/${MY_P}"
-
 python_prepare_all() {
 	local PATCHES=(
-		"${FILESDIR}"/8.0-missing-files.patch
-		"${FILESDIR}"/${P}-unbundle.patch
+		"${FILESDIR}"/${PN}-8.3-unbundle.patch
 		"${FILESDIR}"/${PN}-8.0-desktop.patch
 		)
-	distutils-r1_python_prepare_all
-}
 
-python_compile_all() {
-	use doc && emake -C doc/html
+	emake -C doc/html
+
+	distutils-r1_python_prepare_all
 }
 
 python_install_all() {
@@ -67,10 +64,10 @@ python_install_all() {
 		}
 		python_foreach_impl delete_gui
 	fi
-	use doc && dohtml doc/html/*
+	dohtml doc/html/*
 	use bash-completion && dobashcomp config/linkchecker-completion
-	insinto /usr/$(get_libdir)/nagios/plugins
 	if use nagios; then
+		insinto /usr/$(get_libdir)/nagios/plugins
 		doins linkchecker-nagios
 	else
 		rm -f "${ED}"/usr/bin/linkchecker-nagios* || die