From 35c107505df05b0580033dc7241ae0c37c9a9462 Mon Sep 17 00:00:00 2001 From: Aaron Bauman Date: Mon, 2 Mar 2015 10:31:40 +0000 Subject: [PATCH] revbump; conversion to distutils-r1, rm charm-1.9.2.ebuild, checked by idella4 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x8EE88A22 --- net-misc/charm/ChangeLog | 10 +++++-- net-misc/charm/Manifest | 26 +++++++++++++++-- net-misc/charm/charm-1.9.1.ebuild | 34 ++++++++++------------ net-misc/charm/charm-1.9.2-r1.ebuild | 38 +++++++++++++++++++++++++ net-misc/charm/charm-1.9.2.ebuild | 42 ---------------------------- 5 files changed, 84 insertions(+), 66 deletions(-) create mode 100644 net-misc/charm/charm-1.9.2-r1.ebuild delete mode 100644 net-misc/charm/charm-1.9.2.ebuild diff --git a/net-misc/charm/ChangeLog b/net-misc/charm/ChangeLog index 63f690c7146e..ae84b5943d97 100644 --- a/net-misc/charm/ChangeLog +++ b/net-misc/charm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/charm -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/charm/ChangeLog,v 1.9 2013/04/03 05:30:08 patrick Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/charm/ChangeLog,v 1.10 2015/03/02 10:31:23 bman Exp $ + +*charm-1.9.2-r1 (02 Mar 2015) + + 02 Mar 2015; Aaron Bauman +charm-1.9.2-r1.ebuild, + -charm-1.9.2.ebuild, charm-1.9.1.ebuild: + revbump; conversion to distutils-r1, rm charm-1.9.2.ebuild, checked by idella4 *charm-1.9.2 (03 Apr 2013) diff --git a/net-misc/charm/Manifest b/net-misc/charm/Manifest index ffb1ac7bd7de..41555bdf8438 100644 --- a/net-misc/charm/Manifest +++ b/net-misc/charm/Manifest @@ -1,6 +1,26 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST charm-1.9.1.tar.gz 82760 SHA256 43bd9725e68ed6efc8c2b6d5163d384491a2f8b49c121fe7f8c256ebf60006d7 DIST charm-1.9.2.tar.gz 84927 SHA256 ae2d536303e770ceb002f69c1e71f6a8532c8d5dd075d2f5c1bf09ad02c3c015 SHA512 9ea4c7411764dd1d1c87a1a19de2de3061e08e030e793ff259e80477aa5880a01f05f8a8d1ecc9b1e696111c3f3f9504f5387f535d9d52d1496d20b04c68835b WHIRLPOOL 9e25c985ea6f3e0f9bdf4ad4c2508a2b77886eaaeb3ffce9e04887a2d6fbc9b553a4accdcbfa2114fee81926864872b06aacf1f36a2af7108ad2fffdc1f0a329 -EBUILD charm-1.9.1.ebuild 1006 SHA256 14ba98110528a984013a779e70bdb360e5e9120cd5c14f67d606c7eb0207fa35 SHA512 ad8237db3320b0653974809fadab2dc9fbca3b42374f0720d21d707ddf4d642db0ddd3d8288c72a6ab31398537c854e0a681ff065190c805d173cc3030aa2bda WHIRLPOOL c1114de6af6f3e8c18d9624383237ea9bc5e65f2d9cddbb30828d13d8ef7033ca02984890f74d0fcd8a22c2a04b94725eed3330ad8dc7104bf761da113236a6c -EBUILD charm-1.9.2.ebuild 1007 SHA256 5626d999d4ae7117c2a5f616e011f48260edaadda7af740369f27ab5a50f0e70 SHA512 b4945441bb3213cfc54ff12bd2da8b337d6fb942aea3006703bfeffab593d27e4501b874c1f2daa41cc0fb4cc9f9ab6bf054645c7b7806d7506439eb94b916cb WHIRLPOOL ead478c822effbabe72457c4590a092400716d995dd5168452c91948a43e8e5f6d1b4e74c849860faf2da57c02d6ed84ccd50b0fcd407a0f024ba4ba3cbc48dd -MISC ChangeLog 2777 SHA256 6b27e79b9ae23dd5365c2dbe1cec004f9de632f2bfe31fe9e26d045b63c329a0 SHA512 845c048918e3f05b61ac9f3f2a690d9267d3c90a37167b70e74956f1b3300fbd68fb2f78536535307d370c09c2056dbe878ea882b84e7eee1a0719c829759559 WHIRLPOOL 41664d84794ed618de28604a82b699ebcd7e5e943226ba71eb340cbda412a1ce34795de7c45c2c2fc8a9764142f7167e1cd6696e4515f59dbe83244d90c33429 +EBUILD charm-1.9.1.ebuild 938 SHA256 3c316c15e126450037966a5ade243ebc1b608b54a02974625060eb50bb364be2 SHA512 c83b85f3196777592b8de396f2b5009706361503ef5d8d63fd250baae3741578738f06ee5acc24201e05c1f5bfec16211deecdf6ed80572009b0f96531549ff1 WHIRLPOOL d22d03a95151702ad71240fa3a809ec9cb3198c9ded2922ec483ce33587d18148c5930a18272a485590a02fd0abf3028da2e6ff85a0f7abc92b8b04ead81d342 +EBUILD charm-1.9.2-r1.ebuild 943 SHA256 20ed9aa1ef64f17ada2e00ed2f1e0770f060e0a642a1f1e8d8ed13f7d95ba416 SHA512 2ff34c16fbedf7b1a683240235a5bfb4f76cf575c45340ef86511b57283c13e8756c5c35cc4875dfcef3445fe74c3c637251ac7407b6cd796c7de4730bd2dc55 WHIRLPOOL c67abcc8bec3d849f3fb8218b6887ecbb1105bdc8f6ebb8fbc833f6c0eeac0534e1a4f2a7c5eaed4dc53717e09efcef3a8f760c9dee4705765bacdccf4e8e9ba +MISC ChangeLog 3001 SHA256 61d7c51322ffaff3fa54c03b2b806a535cbf58acaf48b137ad8190c4ffe71633 SHA512 fe7a265ee06720478e60a63c8f989877fcc0147864cb164dd79f4fdb4bcc34a758a3b44614c94352da3db69ec8abb30bccb2d32d2d2206a4889927dd7de36ca8 WHIRLPOOL b095ad0bfb396a569af6765f3d5b8bef40a67862333404b3bdeeda2c250aa5a9fde73e24986f7d497a5e585972e4393fff89bc09de6c96f9ebe1f6f88ac4878a MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAEBCAAGBQJU9DwAAAoJENXWzZRV2HNsFlUP/00SmwaJXciLjddeBBd4eskj +atiSdKBETJ5wRpnCMnZvYWlPHrLHkVVkLGcd8htRVgr/b5UVRyoDrO1SgLJEVyx3 +rSdLs/EvyEI2Tiw3fk18DGg2hnAKXJ+FQdyDIyTXeCP3PM9jwJae9qB8xu8+EUvD +dz1KeEAbyFBMD0Besi0mAwth0C7dwpKlgKTyIBDtniubUxPC31I8cTP8NVIhA6V8 +L47hIh4A+w0JqHYbE+lj2ypxldVbaf+iAo3WaMMQWaoFlGjO7NpO6f+bqME4Pcit +WZhuoDZlbrCS52WZEVOQElSkNsNv7RdDgLnpx5cf4tB07/HjaFJGa2pFRCjEoyse +KtKr4N30G5fnVREpExaQbCgXpBZF/EEIYCpLgk1r8nce0Ab3xVenBldesFnNvhZo +/GnBeQYnWbyt6P5pSWgJezhRhSVl6WoG0ZpcJLpKyCdGsO233BfJR4/fW0u+Fhvj +TdMexbbTuiGJ65Xn1Lor6W/TDpUE4/5oZZtOxpztXWgEvgnfbaNzuN0ZAGQrYa8s +U4sS5yOSD1xQDmJDRT9cVmsDxpO8FwTFEfJkZSl0ZzOMbmWJ6x/V9Ap0FgnIP480 +HK/u/Dhdf7rtfl1ozfNaRQlKVzgsB62MCrkw0Mycz2jTN/tByvnut1V0MDc3joG/ +wnwZ3op42qYPRJHtFJuG +=qqsP +-----END PGP SIGNATURE----- diff --git a/net-misc/charm/charm-1.9.1.ebuild b/net-misc/charm/charm-1.9.1.ebuild index 502589dab587..04027409e22c 100644 --- a/net-misc/charm/charm-1.9.1.ebuild +++ b/net-misc/charm/charm-1.9.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/charm/charm-1.9.1.ebuild,v 1.5 2010/11/14 15:03:36 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/charm/charm-1.9.1.ebuild,v 1.6 2015/03/02 10:31:23 bman Exp $ -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" +EAPI="5" -inherit distutils +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL="1" + +inherit distutils-r1 DESCRIPTION="A text based livejournal client" HOMEPAGE="http://ljcharm.sourceforge.net/" @@ -18,25 +18,21 @@ SLOT="0" KEYWORDS="~amd64 sparc x86" IUSE="" -DEPEND="dev-python/feedparser" -RDEPEND="${RDEPEND}" +DEPEND="dev-python/feedparser[$PYTHON_USEDEP]" -DOCS="CHANGES.charm sample.charmrc README.charm" -PYTHON_MODNAME="ljcharm.py" +DOCS=( CHANGES.charm sample.charmrc README.charm ) +HTML_DOCS=( charm.html ) -src_prepare() { - distutils_src_prepare - sed -e 's/("share\/doc\/charm", .*),/\\/' -i setup.py || die "sed failed" +pkg_setup() { + python-single-r1_pkg_setup } -src_install() { - distutils_src_install - dohtml charm.html || die "dohtml failed" +python_prepare_all() { + distutils-r1_python_prepare_all + sed -e 's/("share\/doc\/charm", .*),/\\/' -i setup.py || die "sed failed" } pkg_postinst() { - distutils_pkg_postinst - elog "You need to create a ~/.charmrc before running charm." elog "Read 'man charmrc' for more information." } diff --git a/net-misc/charm/charm-1.9.2-r1.ebuild b/net-misc/charm/charm-1.9.2-r1.ebuild new file mode 100644 index 000000000000..32e561d41171 --- /dev/null +++ b/net-misc/charm/charm-1.9.2-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/charm/charm-1.9.2-r1.ebuild,v 1.1 2015/03/02 10:31:23 bman Exp $ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL="1" + +inherit distutils-r1 + +DESCRIPTION="A text based livejournal client" +HOMEPAGE="http://ljcharm.sourceforge.net/" +SRC_URI="mirror://sourceforge/ljcharm/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~sparc ~x86" +IUSE="" + +DEPEND="dev-python/feedparser[$PYTHON_USEDEP]" + +DOCS=( CHANGES.charm sample.charmrc README.charm ) +HTML_DOCS=( charm.html ) + +pkg_setup() { + python-single-r1_pkg_setup +} + +python_prepare_all() { + distutils-r1_python_prepare_all + sed -e 's/("share\/doc\/charm", .*),/\\/' -i setup.py || die "sed failed" +} + +pkg_postinst() { + elog "You need to create a ~/.charmrc before running charm." + elog "Read 'man charmrc' for more information." +} diff --git a/net-misc/charm/charm-1.9.2.ebuild b/net-misc/charm/charm-1.9.2.ebuild deleted file mode 100644 index d7004c925db0..000000000000 --- a/net-misc/charm/charm-1.9.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/charm/charm-1.9.2.ebuild,v 1.1 2013/04/03 05:30:08 patrick Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit distutils - -DESCRIPTION="A text based livejournal client" -HOMEPAGE="http://ljcharm.sourceforge.net/" -SRC_URI="mirror://sourceforge/ljcharm/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" -IUSE="" - -DEPEND="dev-python/feedparser" -RDEPEND="${RDEPEND}" - -DOCS="CHANGES.charm sample.charmrc README.charm" -PYTHON_MODNAME="ljcharm.py" - -src_prepare() { - distutils_src_prepare - sed -e 's/("share\/doc\/charm", .*),/\\/' -i setup.py || die "sed failed" -} - -src_install() { - distutils_src_install - dohtml charm.html || die "dohtml failed" -} - -pkg_postinst() { - distutils_pkg_postinst - - elog "You need to create a ~/.charmrc before running charm." - elog "Read 'man charmrc' for more information." -} -- 2.26.2