From ee98d9bd860737410fa21a212c6e1c087e3e66d7 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 9 Jul 2014 23:31:07 +0200 Subject: [PATCH] Cleanup of dev-python/fbrehm-libs --- dev-python/fbrehm-libs/Manifest | 6 +- .../fbrehm-libs/fbrehm-libs-0.3-r1.ebuild | 29 ------- dev-python/fbrehm-libs/fbrehm-libs-0.3.ebuild | 25 ------- .../fbrehm-libs/fbrehm-libs-0.4.3.1-r1.ebuild | 75 ------------------- ...1.ebuild => fbrehm-libs-0.4.3.1-r2.ebuild} | 30 ++------ 5 files changed, 9 insertions(+), 156 deletions(-) delete mode 100644 dev-python/fbrehm-libs/fbrehm-libs-0.3-r1.ebuild delete mode 100644 dev-python/fbrehm-libs/fbrehm-libs-0.3.ebuild delete mode 100644 dev-python/fbrehm-libs/fbrehm-libs-0.4.3.1-r1.ebuild rename dev-python/fbrehm-libs/{fbrehm-libs-0.4.3.1.ebuild => fbrehm-libs-0.4.3.1-r2.ebuild} (73%) diff --git a/dev-python/fbrehm-libs/Manifest b/dev-python/fbrehm-libs/Manifest index b73f427..0097740 100644 --- a/dev-python/fbrehm-libs/Manifest +++ b/dev-python/fbrehm-libs/Manifest @@ -1,6 +1,2 @@ -DIST fbrehm-libs-0.3.tar.gz 4804 SHA256 0056131b3c869208319f39417ad056f9d9ee80b9f38e11fb146da4a2eebd2859 -EBUILD fbrehm-libs-0.3-r1.ebuild 638 SHA256 7b38e67fc5990ab78d95444930b0fc2a6d89aa4571a39db91d2074ace785946d SHA512 6c455185bfe494f42a54b356fa1c7b442155de88851a25e3a7058f573cea3f29e1e9c2855465b32dc61c8a05385630d38bbc8f3927712edd83eabf6a7c0ae490 WHIRLPOOL b9cfd2baca68acb5f9bfc0dcab840b04b2c3c58924a9a5addcb24098e6517ea8eb71595e834fc5143b202066ec02bc4b41106fb98bb38d47ae44d6116c2e7f82 EBUILD fbrehm-libs-0.3-r2.ebuild 722 SHA256 d70be8c552400c06b5474d33b94a3b2dae2c5e946443d64f06922b837d3b532c SHA512 f007d50e14f72a029e784877230d3dd0cdaac740ca358e5480a0e9bf630eedc4a5ecfacdb1933b5a3793bd6af9427df3ec4883ce2ef77e0079aab61cdccad823 WHIRLPOOL 3ab5ab7ae46f9fafd11fa773692349fb99dd65ea149c10caf1ab1e01e48d0bfd0f9dfff74b47cd56007d50c33e3c2567035874e833e6e8107c76f406f02c7a13 -EBUILD fbrehm-libs-0.3.ebuild 493 SHA256 87cafcb8c875651c735a1089762c72375a8c9667f86177d2e5ab5672124d2692 SHA512 8bc7da7aba5374606fb4d2545a35de68f6c90917bde4d272db8e7806065492a164daf4ea88df2f6b659a5777c3f88d8f670c7080703438f2c102c50ca5ffd4c4 WHIRLPOOL 99a112681620b16c75245df345a786eb4294658ac8d59b4543f4b97eb9f18c2cd6cfeac5dc1579466c04ce5089854c87ee0c446f49031f2461fe864e651fc811 -EBUILD fbrehm-libs-0.4.3.1-r1.ebuild 1752 SHA256 c20e66a754331cd0ca393803fe665d9a489cd0c7ed37c241e3cdc8f5278923b5 SHA512 7baa74025944cea8e97fe15f3b00c310043c3e0461d346776709f2091af53cfc7481ddbdabd20beb1f5da99430450c9b21733b63e7f2a329c8c94c6734b4e5a1 WHIRLPOOL 063523f51e3231ba2d202b7222852c1885f0633c50545bea64497097ae53749097cdda4390813a03b2adb255bb6d88325b88805596b08ed5a6aa2562fd83b8c2 -EBUILD fbrehm-libs-0.4.3.1.ebuild 1748 SHA256 160572df5976844d315cdb884d3d326a627298cf40114bd893f883f786cf9ece SHA512 d12d8aed6ee988f845afe220a2e47e48180855674a6f5dcc1eaa6b2480252a8fc22efa53dd2bd13db6060020466a1b4a098096eed58565552710d50113e35419 WHIRLPOOL 1a32336818e2fe302ba612bad33a55f247b557219082d5aa330f3bd0dde790859fcb66ff8faf42ae39dc05aa9626302aeecd9549f7b82aac6e80306f0446fd61 +EBUILD fbrehm-libs-0.4.3.1-r2.ebuild 1469 SHA256 7b15dcd1d14fb930f07401759244441aac965a8761eb8ae0217f8b62346a6230 SHA512 16f98144b10c763ab219b3406303dc92097aba39524bb5140be01aeec39a0744546c3d83b17beb43b13d5acce7f86456ad9b97dcb9ea64a8514eda1e5ab7099c WHIRLPOOL 1b02aacf3fb468db7ed447ef7f5c8dff1a09aa29f0a086fec727bc89a402db457774008e0358b9e473b27296dbc98f10aed6f75bce539caed31d0339e23a5382 diff --git a/dev-python/fbrehm-libs/fbrehm-libs-0.3-r1.ebuild b/dev-python/fbrehm-libs/fbrehm-libs-0.3-r1.ebuild deleted file mode 100644 index f28521b..0000000 --- a/dev-python/fbrehm-libs/fbrehm-libs-0.3-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 -PYTHON_DEPEND="2:2.5" -SUPPORT_PYTHON_ABIS="1" - - -RESTRICT="nomirror" - -inherit distutils - -PYTHON_MODNAME="fbrehm/__init__.py fbrehm/common/__init__.py fbrehm/common/getopt.py fbrehm/common/logging_obj.py" - -DESCRIPTION="A collection of common python modules by Frank Brehm" -HOMEPAGE="http://www.brehm-online.com/projects/" -SRC_URI="http://www.brehm-online.com/projects/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -DOCS="README.txt debian/changelog" - diff --git a/dev-python/fbrehm-libs/fbrehm-libs-0.3.ebuild b/dev-python/fbrehm-libs/fbrehm-libs-0.3.ebuild deleted file mode 100644 index 06bbe4f..0000000 --- a/dev-python/fbrehm-libs/fbrehm-libs-0.3.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 -PYTHON_DEPEND="2" - -RESTRICT="nomirror" - -inherit distutils - -DESCRIPTION="A collection of common python modules by Frank Brehm" -HOMEPAGE="http://www.brehm-online.com/projects/" -SRC_URI="http://www.brehm-online.com/projects/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -DOCS="README.txt debian/changelog" - diff --git a/dev-python/fbrehm-libs/fbrehm-libs-0.4.3.1-r1.ebuild b/dev-python/fbrehm-libs/fbrehm-libs-0.4.3.1-r1.ebuild deleted file mode 100644 index 8c99ddc..0000000 --- a/dev-python/fbrehm-libs/fbrehm-libs-0.4.3.1-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header$ - -EAPI=4 -PYTHON_DEPEND="2:2.7" - -EGIT_REPO_URI="https://github.com/fbrehm/py_fbrehm_libs.git" - -RESTRICT="nomirror" - -inherit git-2 distutils user python versionator - -PYTHON_MODNAME="fbrehm/__init__.py fbrehm/common/__init__.py fbrehm/common/getopt.py fbrehm/common/logging_obj.py" - -DESCRIPTION="A collection of common python modules by Frank Brehm" -HOMEPAGE="http://git.brehm-online.com/my-stuff/fbrehm.git" -SRC_URI="" - -EGIT_BRANCH="develop" -EGIT_COMMIT=$(replace_version_separator 3 '-') - -DOCS="debian/changelog README.txt" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc nls" - -DEPEND="" -RDEPEND=" - virtual/python-argparse - dev-python/configobj - nls? ( virtual/libintl ) -" - -pkg_setup() { - - elog "Used GIT tag: '${EGIT_COMMIT}'." - - python_set_active_version 2 - python_pkg_setup -} - -src_install() { - distutils_src_install - #python_clean_installation_image - - if use doc; then - einfo "Installing documentation ..." - dodir "/usr/share/doc/${PF}" - dodir "/usr/share/doc/${PF}/html" - dodir "/usr/share/doc/${PF}/pdf" - - einfo "Creating epydoc html documentation" - epydoc --html -v -o "${ED}/usr/share/doc/${PF}/html" "${S}/src/fbrehm" || ewarn "Could not create epydoc html documentation" - einfo "Creating epydoc pdf documentation" - epydoc --pdf -o "${ED}/usr/share/doc/${PF}/pdf" "${S}/src/fbrehm" || ewarn "Could not create epydoc pdf documentation" - - fi - - #if use nls; then - # (cd "${S}/po" && make DESTDIR="${ED}" install) - #fi - -} - -pkg_postinst() { - python_mod_optimize fbrehm -} - -pkg_postrm () { - python_mod_cleanup fbrehm -} - diff --git a/dev-python/fbrehm-libs/fbrehm-libs-0.4.3.1.ebuild b/dev-python/fbrehm-libs/fbrehm-libs-0.4.3.1-r2.ebuild similarity index 73% rename from dev-python/fbrehm-libs/fbrehm-libs-0.4.3.1.ebuild rename to dev-python/fbrehm-libs/fbrehm-libs-0.4.3.1-r2.ebuild index c30920a..0ac78c4 100644 --- a/dev-python/fbrehm-libs/fbrehm-libs-0.4.3.1.ebuild +++ b/dev-python/fbrehm-libs/fbrehm-libs-0.4.3.1-r2.ebuild @@ -2,16 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Header$ -EAPI=4 -PYTHON_DEPEND="2:2.7" +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_2} pypy2_0 ) EGIT_REPO_URI="https://github.com/fbrehm/py_fbrehm_libs.git" RESTRICT="nomirror" -inherit git-2 distutils user python versionator - -PYTHON_MODNAME="fbrehm/__init__.py fbrehm/common/__init__.py fbrehm/common/getopt.py fbrehm/common/logging_obj.py" +inherit git-2 distutils-r1 user versionator DESCRIPTION="A collection of common python modules by Frank Brehm" HOMEPAGE="http://git.brehm-online.com/my-stuff/fbrehm.git" @@ -22,29 +20,25 @@ EGIT_COMMIT=$(replace_version_separator 3 '-') DOCS="debian/changelog README.txt" -LICENSE="GPL-3" +LICENSE="LGPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc nls" DEPEND="" RDEPEND=" - dev-python/argparse dev-python/configobj nls? ( virtual/libintl ) " -pkg_setup() { - +src_prepare() { elog "Used GIT tag: '${EGIT_COMMIT}'." - - python_set_active_version 2 - python_pkg_setup + distutils-r1_src_prepare } src_install() { - distutils_src_install - #python_clean_installation_image + + distutils-r1_src_install if use doc; then einfo "Installing documentation ..." @@ -65,11 +59,3 @@ src_install() { } -pkg_postinst() { - python_mod_optimize fbrehm -} - -pkg_postrm () { - python_mod_cleanup fbrehm -} - -- 2.39.5