Drop old, migrate to python-r1 classes

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

6 files changed, 71 insertions, 251 deletions

diff --git a/dev-util/cppcheck/ChangeLog b/dev-util/cppcheck/ChangeLog
index d20bf9644823..a5122825a40f 100644
--- a/dev-util/cppcheck/ChangeLog
+++ b/dev-util/cppcheck/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cppcheck
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.38 2013/04/08 07:43:40 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.39 2013/05/28 08:32:23 xmw Exp $
+
+*cppcheck-1.59-r1 (28 May 2013)
+
+  28 May 2013; Michael Weber <xmw@gentoo.org> +cppcheck-1.59-r1.ebuild,
+  -cppcheck-1.56.ebuild, -cppcheck-1.57.ebuild, -cppcheck-1.58.ebuild:
+  Drop old, migrate to python-r1 classes
 
 *cppcheck-1.59 (08 Apr 2013)
 
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 91a2d859027f..19740cf571f4 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,20 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST cppcheck-1.56.tar.bz2 1131979 SHA256 0de45db8126a11f396130235a8b0c93ceff150a0afa675f5c7f5a07395c31df5 SHA512 f9dd83f38dc0255ecd122f7e7270e72ace5e9a4bbd14d94c9e47eff766c4eef3951f8b222a1c6e8b2613ba01d4e2140615f3309a0a60daacc399b3220038dec4 WHIRLPOOL b8ee263861048506e9da2e3b45dff2af69e3f2ddf47fef6e04f945b8576bad63c617b9eaf2daff994f0681958009fb1d60fdec8637355e668aedf11a4872fbdc
-DIST cppcheck-1.57.tar.bz2 1180272 SHA256 8774a804e08465787e3ddc3af9faf496606c207aa65f750eefd2851a9ccdafd5 SHA512 14afca2fb2cac3965b189b1f110554d40c1db259b6f839407c3e2937d322ec9323e1f2fc1207bd1ba9c1e7af6f77fc5521a6201a7223d10be21fac6c625919df WHIRLPOOL 38e95045c66cd8df1f3e57925288b8ae6ac50c96fa7219f61361dd68b2f704079384480ef89b59f11e607dfebed74a49140cdaab073ff758299a3e71a65d5b5a
-DIST cppcheck-1.58.tar.bz2 1230439 SHA256 d82e98f83ad9fa963d8f9f72d73b409abe13a35aaf302a86a0114a161715b19b SHA512 440b93ccbfb1b5d70f6d945a29ee949ccde30888454aa1938864521c81f9568150194fd0a610139cd10fd5e0e183bc1257bfb91d35ec5a107b20e8db38ae396e WHIRLPOOL 04b60a1271bba5799800e7ec8cdc59c967c8c144127ef25a2362e8643215323c39fcee75dcf15006a4565284d0dde3ddbf0a855ca9ad1664dca595a6129cb001
 DIST cppcheck-1.59.tar.bz2 1243616 SHA256 6be40d8422c545959d1cc44ce3f80be9f6d3d18f70d65b8d2e1b65284aa38f6e SHA512 c09f772a80e00c9a0a4ab09523e153dd21c205b6a91339886fbf36c2a27fc6c0a7c89d5721ed0e4c3f82df1b7e2d4b20949c78dcc167d2792d0d291d0c63b6e3 WHIRLPOOL ec9f6fcd079392bcc28a25700725b4bba87f10cc9eb1b7dceff7f268f4378731ae3cbc0f0156b486b1e3d6e9e8703890bc9c4a08ef96e205fc14a3209c3b6b1d
-EBUILD cppcheck-1.56.ebuild 1687 SHA256 bc0c18f49efb2b8edee2c79d2554b117163528a8e1bd1c7b9e436c5e2e95916b SHA512 3a42fc7f2f5a9a580e6d0dc42726ad57332d666130dbad8959a51f2ea1ea8e05e41592bca81a7122a2f03f4b4a74a1d8c90b093f41c6dff88aa286a906f80a89 WHIRLPOOL 65f1356bf30dfabefc01cad8913f29c4e2ab0c8f650b9d30f2db77435af4d71becdc9f2c36458fac58fa22a74f69c4084058b2280436aa58072fb3eb5335d781
-EBUILD cppcheck-1.57.ebuild 1687 SHA256 babad47b5223e5358281db533c9dcae8caaa6ea75d6bd54657f1c7cfb9381d35 SHA512 14588aee6966eb7ede5d5b7b80656e47b14ec154680bc8d95954de8283b367dcceb778f9e98b175fa33f11a8143b902213b834a40c753717d74ef4b375e0281d WHIRLPOOL b539f6b18dcfa73abde0fdd3da9b411142f0e35a8b32331066d5f1fe9ca868d14414cb3fd0331f5a5ecb7472d2d694cc15e87904f18cd9190d4ccea8777d8837
-EBUILD cppcheck-1.58.ebuild 1687 SHA256 01a9133240e19a998083cbfdf685d06c0f66c8ee0fcf5c2c1b58a2d0371e2de2 SHA512 1c58507a8685349f142f5434294437bf3638541b0fc7c50c0465fa53658662e2da9dc8766dfd79bb6a707ae31ada47df1af2c7442b5ad0396959c2fd4031bf36 WHIRLPOOL f1a701e0e2c1dc3d9c210d5d4756661704fdc28f39185a3b7257fe1e442be2f80455de56c530972f2a1f62138431eb26b6eea8d85bea2c01bf69d5d3ad983e1c
+EBUILD cppcheck-1.59-r1.ebuild 1166 SHA256 c008c204152b3b411e3eedcd075c7b4c3622904eafe9a555c561f9041de712b1 SHA512 6910de6cbe1decb397bbfc6a9575bf25a993f9aecc1db6a7b53c5c3e61949b720bc2d3a3fb780b479e888a41de51313c678f7987e410935de8cc4ba33c1e6ccb WHIRLPOOL 3b6a8aa5e6ee6826a28a47798ff380ea467dc42968b0fa72653de97ff7916c12312f0e0df26362b6e84ec43c25652cee4fc0caef8f12cbd9554e2a557f2451d7
 EBUILD cppcheck-1.59.ebuild 1682 SHA256 418410cb03a923f262a886c617bc6556921eca38aba9f1f894fe7765d6ea96ca SHA512 4a38f534583df4357f58f8ff88a6e87db71b7f717345072c3c3133492f674bde451d11402f891a36015244b648aacd6d9e5ad54fe268e0ddb54fe6fddce4a949 WHIRLPOOL 0b955b5896bf91001960baed8b8112325dce0a9da40d7234775a725ddcfe159efc4ff853a105cabd5af1f455604ed7aeaa5282c38ff8dd16e6d4dbf9e0ba3006
-MISC ChangeLog 6078 SHA256 14ad85b809f351cb758f346f9807c65fc7c136891422582801fc77edfb6e2c1a SHA512 078b501a43f0bcf6502282f933694d328ec996c45f87a25bd2a0e5801b4ec3a8ba27996d66ebf045d6952ea4760d3f2506f8261d7e76169a3989d912edf5f635 WHIRLPOOL 293e6f9a66f56c75f404821c476c75fe046edc1cf6507c46b7e7a7f17420098b0b8e0b17771c1bc24ac08ca4985e2c23f14e2e2c35471db402efa5d772375cef
+MISC ChangeLog 6296 SHA256 55c30a793a0b42837a6b86b3d4ebc0ca325e91ffd64d342a650420524680c49c SHA512 adafb0f52e5e20a60f98a7e4d58bc3a80b77206a6ab37795ae8f02520db50c6766949dbcdbab4c1202275666456f3ff0aa7f4f2c38b85fd5a55cac6662b0659f WHIRLPOOL bb08a1ba6a14913096b9e57e1cf0cc23fdd11978c5321919c5698977a1f63bd8fd9df2abb3e54330f93ff984dadd7c12f5e37a1f964f35954e0bf19e23626f3f
 MISC metadata.xml 295 SHA256 4526a4860c02569699367a86914fabb0c0f4d7939ebbba1f728fc5bff7356583 SHA512 057b7f72a8bf12017d26717b3ac49883d21b5253a965722c9b23bb4dd9d23a6c64e070dad31a3e5d2abea4439592bd0144a5fdfb710ce843de2dd223369bd696 WHIRLPOOL b9f7e00e6b294237385d609666e3c7bdf0477809445e47e96e6efb911e451bc7281b1957bfffd8e8f35e8fd0a35789ccc7c3199eb6b2cd4070092cf41fd21cca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFidbMACgkQknrdDGLu8JC8ygD/Voyc76LKHOd9yaJjGicTLotN
-vmImEF4RIZ3Z71BOj5kA/j/hxNTuAadaDkErBSy/5+2PUdRCpi1mF3rcp839+DNP
-=d9XR
+iF4EAREIAAYFAlGka5EACgkQknrdDGLu8JDGKgD9HMchkapk524pocAek7SsuF+x
+bPpDbynA4C4DNE5N9NcA/jm+xcVTUrGUMBd/QyY/H7Yy1FgmF/Nv2RRVisLgDaPx
+=rNWR
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cppcheck/cppcheck-1.56.ebuild b/dev-util/cppcheck/cppcheck-1.56.ebuild
deleted file mode 100644
index 59a2bd19662f..000000000000
--- a/dev-util/cppcheck/cppcheck-1.56.ebuild
+++ /dev/null
@@ -1,80 +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/cppcheck/cppcheck-1.56.ebuild,v 1.3 2013/03/02 20:21:20 hwoarang Exp $
-
-EAPI="3"
-PYTHON_DEPEND="htmlreport? 2"
-
-inherit distutils eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
-SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="htmlreport qt4"
-
-DEPEND="htmlreport? ( dev-python/pygments )
-	qt4? ( dev-qt/qtgui:4 )"
-RDEPEND="${DEPEND}"
-
-DISTUTILS_SETUP_FILES=("htmlreport|setup.py")
-
-pkg_setup() {
-	if use htmlreport ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	if use htmlreport ; then
-		pushd htmlreport
-		python_convert_shebangs -r 2 .
-		distutils_src_prepare
-		popd
-	fi
-}
-
-src_configure() {
-	tc-export CXX
-	if use qt4 ; then
-		pushd gui
-		qt4-r2_src_configure
-		popd
-	fi
-}
-
-src_compile() {
-	emake || die
-	if use qt4 ; then
-		pushd gui
-		qt4-r2_src_compile
-		popd
-	fi
-	use htmlreport && distutils_src_compile
-	#https://sourceforge.net/apps/trac/cppcheck/ticket/4149
-	#$(tc-getCXX) ${CFLAGS} ${LDFLAGS} -o ${PN}-democlient.cgi \
-	#	democlient.cpp -I../lib democlient.cpp
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc readme.txt || die
-	if use qt4 ; then
-		dobin gui/${PN}-gui || die
-		dodoc readme_gui.txt gui/{projectfile.txt,gui.cppcheck} || die
-	fi
-	use htmlreport && distutils_src_install
-	#dobin ${PN}-democlient.cgi
-}
-
-pkg_postinst() {
-	use htmlreport && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use htmlreport && distutils_pkg_postrm
-}
diff --git a/dev-util/cppcheck/cppcheck-1.57.ebuild b/dev-util/cppcheck/cppcheck-1.57.ebuild
deleted file mode 100644
index 4520f2dba326..000000000000
--- a/dev-util/cppcheck/cppcheck-1.57.ebuild
+++ /dev/null
@@ -1,80 +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/cppcheck/cppcheck-1.57.ebuild,v 1.2 2013/03/02 20:21:20 hwoarang Exp $
-
-EAPI="3"
-PYTHON_DEPEND="htmlreport? 2"
-
-inherit distutils eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
-SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="htmlreport qt4"
-
-DEPEND="htmlreport? ( dev-python/pygments )
-	qt4? ( dev-qt/qtgui:4 )"
-RDEPEND="${DEPEND}"
-
-DISTUTILS_SETUP_FILES=("htmlreport|setup.py")
-
-pkg_setup() {
-	if use htmlreport ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	if use htmlreport ; then
-		pushd htmlreport
-		python_convert_shebangs -r 2 .
-		distutils_src_prepare
-		popd
-	fi
-}
-
-src_configure() {
-	tc-export CXX
-	if use qt4 ; then
-		pushd gui
-		qt4-r2_src_configure
-		popd
-	fi
-}
-
-src_compile() {
-	emake || die
-	if use qt4 ; then
-		pushd gui
-		qt4-r2_src_compile
-		popd
-	fi
-	use htmlreport && distutils_src_compile
-	#https://sourceforge.net/apps/trac/cppcheck/ticket/4149
-	#$(tc-getCXX) ${CFLAGS} ${LDFLAGS} -o ${PN}-democlient.cgi \
-	#	democlient.cpp -I../lib democlient.cpp
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc readme.txt || die
-	if use qt4 ; then
-		dobin gui/${PN}-gui || die
-		dodoc readme_gui.txt gui/{projectfile.txt,gui.cppcheck} || die
-	fi
-	use htmlreport && distutils_src_install
-	#dobin ${PN}-democlient.cgi
-}
-
-pkg_postinst() {
-	use htmlreport && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use htmlreport && distutils_pkg_postrm
-}
diff --git a/dev-util/cppcheck/cppcheck-1.58.ebuild b/dev-util/cppcheck/cppcheck-1.58.ebuild
deleted file mode 100644
index c11988e078c6..000000000000
--- a/dev-util/cppcheck/cppcheck-1.58.ebuild
+++ /dev/null
@@ -1,80 +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/cppcheck/cppcheck-1.58.ebuild,v 1.2 2013/03/02 20:21:20 hwoarang Exp $
-
-EAPI="3"
-PYTHON_DEPEND="htmlreport? 2"
-
-inherit distutils eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
-SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="htmlreport qt4"
-
-DEPEND="htmlreport? ( dev-python/pygments )
-	qt4? ( dev-qt/qtgui:4 )"
-RDEPEND="${DEPEND}"
-
-DISTUTILS_SETUP_FILES=("htmlreport|setup.py")
-
-pkg_setup() {
-	if use htmlreport ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	if use htmlreport ; then
-		pushd htmlreport
-		python_convert_shebangs -r 2 .
-		distutils_src_prepare
-		popd
-	fi
-}
-
-src_configure() {
-	tc-export CXX
-	if use qt4 ; then
-		pushd gui
-		qt4-r2_src_configure
-		popd
-	fi
-}
-
-src_compile() {
-	emake || die
-	if use qt4 ; then
-		pushd gui
-		qt4-r2_src_compile
-		popd
-	fi
-	use htmlreport && distutils_src_compile
-	#https://sourceforge.net/apps/trac/cppcheck/ticket/4149
-	#$(tc-getCXX) ${CFLAGS} ${LDFLAGS} -o ${PN}-democlient.cgi \
-	#	democlient.cpp -I../lib democlient.cpp
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc readme.txt || die
-	if use qt4 ; then
-		dobin gui/${PN}-gui || die
-		dodoc readme_gui.txt gui/{projectfile.txt,gui.cppcheck} || die
-	fi
-	use htmlreport && distutils_src_install
-	#dobin ${PN}-democlient.cgi
-}
-
-pkg_postinst() {
-	use htmlreport && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use htmlreport && distutils_pkg_postrm
-}
diff --git a/dev-util/cppcheck/cppcheck-1.59-r1.ebuild b/dev-util/cppcheck/cppcheck-1.59-r1.ebuild
new file mode 100644
index 000000000000..f84881ccf285
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.59-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.59-r1.ebuild,v 1.1 2013/05/28 08:32:23 xmw Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1 eutils qt4-r2 toolchain-funcs
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
+SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="htmlreport qt4"
+
+DEPEND="htmlreport? ( ${PYTHON_DEPS} )
+	qt4? ( dev-qt/qtgui:4 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	tc-export CXX
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_configure
+		popd
+	fi
+}
+
+src_compile() {
+	emake
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_compile
+		popd
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc readme.txt
+	if use qt4 ; then
+		dobin gui/${PN}-gui
+		dodoc readme_gui.txt gui/{projectfile.txt,gui.cppcheck}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_install
+		popd
+	fi
+}