Compatible with python-3.3 (#483178 by Ed Catmur), drop old.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 13 insertions, 64 deletions

diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index f3a440101fd2..2c3ac52f07b7 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/devhelp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.156 2013/08/27 22:25:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.157 2013/08/31 18:48:40 pacho Exp $
+
+  31 Aug 2013; Pacho Ramos <pacho@gentoo.org> -devhelp-3.8.1.ebuild,
+  devhelp-3.8.2.ebuild:
+  Compatible with python-3.3 (#483178 by Ed Catmur), drop old.
 
   27 Aug 2013; Alexis Ballier <aballier@gentoo.org> devhelp-3.6.1-r1.ebuild,
   devhelp-3.8.1.ebuild:
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index e604859e1e50..87ed96d55047 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -3,17 +3,15 @@ Hash: SHA256
 
 AUX devhelp-3.6.1-libm.patch 1091 SHA256 1dd5ff2aea497b4b8181829b94329d1f2bebe8d577a55e207eacea4c3b92ff5c SHA512 15689fae693c9231f22242605557e73fd5a48d11e37a091c7b06d93b1720413790bbfa9cf8bb627200ecaf3b6fcbe34220426698ed033c70275b7b58f15755cd WHIRLPOOL 09e880fcf619f8159712203abb286409ee0a5ad3e2fd72e5c003578cd9915cf3a53426cc49236a29ab12f42ee43a8b70f447f6832ae2c80b252f650efec7cb17
 DIST devhelp-3.6.1.tar.xz 499156 SHA256 71c6933422bf876745fc10276a2b2ee0f8c4c4ddfe034b3f6380507725fd4e63 SHA512 413c47116f8206e8c652d3a22cb8359c4810bf958f51fffcdb445b660b4955afc59e60b3a8f70964eb1c572cdb08a0d0ea35df40faa8208733ef0b62bb9f9e34 WHIRLPOOL 9c4da6366f6d3f6f37154b0ebe5da6f0ec09ce7bd2487dcdf3be1fdca6d7b788ee39678f9c53c8615e3613d3ddaf2970b481667a64da206c3c809add99e53164
-DIST devhelp-3.8.1.tar.xz 503444 SHA256 4548fb0b17d4716851cf044294a8ee59e72c8de97e793842faf510a6dbfd3c96 SHA512 1522d9e8d91419e53616a9475ac491f3332932d20fddbc88877cebc39755fc83a17fbb502121021f579c390c262bdf3d808b4008a24b5f2d8eea8714cef8efeb WHIRLPOOL b5732186bb3ef8b801327103537e768cb15cc667410034d65ecbe829df44e03f0197b815cab0599c76da6016012df910c1953ceb2f40464c2fa6d0c91d752233
 DIST devhelp-3.8.2.tar.xz 503632 SHA256 a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7 SHA512 9c91e86369519549aebac0f28da6f70e901d5904d1c12b09f38a3541fff77d05e966caf1b652518b1e66fa8bcefd7ae16416a38de12a4c9ca2c1350f8e8a1bc5 WHIRLPOOL c67a6d4b44cdad196802778986d370987025fd8cb03e684313dfd3487880e95ab115e4f74ce01c5689acb3ecdf560f92c2986168c6a64953400450a9125f3765
 EBUILD devhelp-3.6.1-r1.ebuild 1775 SHA256 526fabb38931ee5ea5b2926574d58c11352be5e9c265aff83210c2abc487be30 SHA512 b10f199dd07143907d1ccc9499f9d0ae36682ca3243ea450731afb6925fa07e32bc2cf19194dbf8786ed0b9b323a57cd52bea719610f05bb6574454ace844705 WHIRLPOOL e5c2393a4431f1332782dbbfd6ef7baa9f3521d60dceaed84041e035448ce6ca9071adddfcc384d1dfa2dfa9a3ff0e505b374c8baf44251b6d32c577e48c4314
-EBUILD devhelp-3.8.1.ebuild 1369 SHA256 4d288a2f0d1c0837d48ebb423b38e0b7b48d1973354c91c585391d952124be6b SHA512 21b329b7150bb330c41b0528c8968370a5e41047b8fa41acbba1383cf7fc1088307d2670e34a2c624609cd885737100bd010c5e383f244e5804b21516d74b157 WHIRLPOOL a7fff9a6446e1c7c8d5d62777d87907792f7eb1fa95af7c4b6505efa575a596aa1e870f0f116dd6b86edc28a74b3e098578ed15488e57ebe9c529ad9e5dad20a
-EBUILD devhelp-3.8.2.ebuild 1531 SHA256 bf0258e3b865e79b2dadfce5d24645192ea83b8611260ea5504abd33eaf24c27 SHA512 3db05aecd424244de083ff2451396acbde5d0aee56640cac366c0d573742c2c3d4ae1a6d7945b9bbad52db8d4d87f1a4be263ead95f2983b810ffdaadbcdf76e WHIRLPOOL 3d4959733c89d290e652a2ab88461139ef163f82811232487aa30f4117ebab4d886242521d44b6391c7c55f61f16d7a39ed37db5dde3829f274b6163ba3167d2
-MISC ChangeLog 20988 SHA256 dd4604b434ae3a9ae023d51b5719d00be2689e9ae0e4cd04fcbf6601b23dc21b SHA512 7daaa587bd61a07fdb33bd33d9675a7a5a77ef9ed063f5f8bc90a84b3ab92409288fd31cb37ed07ad5d2048d9654bd1750c9c764b6a028a4a2b5569bbc01df53 WHIRLPOOL f701524c2c482ab280403b46a6071c299c7eddf27d568f83217c8565e4d568a6d517a26e80c07f3e5f4d867474569a144da0783a1d9c13f2805b26acfb364893
+EBUILD devhelp-3.8.2.ebuild 1537 SHA256 89d83263ce143ca4d82fc6111ca2f96cd77e736bd7897480564176f0ed7a5884 SHA512 5b50397b1181ee6fa70297913162427f834a5f53c5255aa82ddfe03ed8d2b376e25b156f0b750ad5818d31f1b81c81d476351c669cc89042c2da55fbcddf48ba WHIRLPOOL 1afd287ed78f1aa0694712d6c7b45ba95de31ee91a113ed9ecf9d47a22d65ac5556e73a257b2534548e977e9511ede9324df17f923ae305a5fe4a8ce067cba0e
+MISC ChangeLog 21142 SHA256 cc8b5782a69d73a0e334afb6d4328346d0588f0ce37c5a3fe53e422a4420948a SHA512 9db830de918a9b4ecd5c344fe92831858a514fc2e74b0bce225c4a130b7f634451da583875d50fd92cc5c34ef79620aa652290efdb5d5edf64acbab306e6899b WHIRLPOOL a3ac98ff067896120a15b851000fc80cdc0a82896f79c4132ef610801f5726ab10a6b9bcac705fea89a58dc8e22091788fc0ff1e0fa7b35e3cfd591755feee9c
 MISC metadata.xml 246 SHA256 b7869ee755ded9fba9f18437bd1561f09b344608c4c131193d1131f3fac9ed42 SHA512 eb2eec1b0ad655d5511fee383d114f40b84661af2cb37e6707b5b30af1d79d1166178be974f10b13dab8690ff6bd9e1a3296c76c61d437e049dec285da400367 WHIRLPOOL a94dca04276ad096ede6f4ad3e0862b66666e9210c4ea631af4e1c8c30125ce54d0c249652990031999c8348168cc7b91f94861ae453641314a870421e504695
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIdJ2MACgkQvFcC4BYPU0rlgQCgqnLTuKXsDJUzzsUW5Jo2Ub8o
-ptIAn1//jplN1fLHpWKlfi6ABFV52oKV
-=W6Vi
+iEYEAREIAAYFAlIiOokACgkQCaWpQKGI+9SSPQCfcjrx/AqLItatEjf2F+lespFb
+MKwAn2K9pv5qmcs/V/WUYLGVdk4xL8He
+=WVb2
 -----END PGP SIGNATURE-----
diff --git a/dev-util/devhelp/devhelp-3.8.1.ebuild b/dev-util/devhelp/devhelp-3.8.1.ebuild
deleted file mode 100644
index b0e8616ceca8..000000000000
--- a/dev-util/devhelp/devhelp-3.8.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.8.1.ebuild,v 1.2 2013/08/27 22:25:37 aballier Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit gnome2 python-single-r1 toolchain-funcs
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="http://live.gnome.org/devhelp"
-
-LICENSE="GPL-2+"
-SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gedit"
-
-# FIXME: automagic python dependency
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.5.6:3
-	>=net-libs/webkit-gtk-1.10.0:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+[introspection] )
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		G2CONF="${G2CONF} --with-compile-warnings=no"
-	fi
-
-	use gedit || sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die
-
-	gnome2_src_prepare
-}
diff --git a/dev-util/devhelp/devhelp-3.8.2.ebuild b/dev-util/devhelp/devhelp-3.8.2.ebuild
index ad644de5979c..d79239e26431 100644
--- a/dev-util/devhelp/devhelp-3.8.2.ebuild
+++ b/dev-util/devhelp/devhelp-3.8.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.8.2.ebuild,v 1.3 2013/07/25 18:39:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.8.2.ebuild,v 1.4 2013/08/31 18:48:40 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 # gedit-3.8 is python3 only, this also per:
 # https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python3_2 )
+PYTHON_COMPAT=( python{3_2,3_3} )
 
 inherit gnome2 python-single-r1 toolchain-funcs