Drop old; move to EAPI=5 and new pythen eclasses

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

7 files changed, 183 insertions, 96 deletions

diff --git a/sci-chemistry/bkchem/ChangeLog b/sci-chemistry/bkchem/ChangeLog
index 8939e41ef03a..e93571c3a037 100644
--- a/sci-chemistry/bkchem/ChangeLog
+++ b/sci-chemistry/bkchem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/bkchem
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/bkchem/ChangeLog,v 1.6 2010/08/12 07:47:56 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/bkchem/ChangeLog,v 1.7 2015/02/20 10:28:32 jlec Exp $
+
+*bkchem-0.14.0_pre2-r1 (20 Feb 2015)
+
+  20 Feb 2015; Justin Lecher <jlec@gentoo.org> +bkchem-0.14.0_pre2-r1.ebuild,
+  +files/bkchem-0.14.0_pre2-nolauncher.patch, -bkchem-0.14.0_pre1-r2.ebuild,
+  -bkchem-0.14.0_pre2.ebuild, metadata.xml:
+  Drop old; move to EAPI=5 and new pythen eclasses
 
 *bkchem-0.14.0_pre2 (12 Aug 2010)
 
@@ -31,4 +38,3 @@
   17 Jun 2010; Justin Lecher <jlec@gentoo.org> +bkchem-0.14.0_pre1.ebuild,
   +metadata.xml:
   New addition imported from sci oerlay, #95178
-
diff --git a/sci-chemistry/bkchem/Manifest b/sci-chemistry/bkchem/Manifest
index ea76c08271ff..b21573192a0d 100644
--- a/sci-chemistry/bkchem/Manifest
+++ b/sci-chemistry/bkchem/Manifest
@@ -1,17 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX 0.14.0_pre1-piddle-Fix-assertions.patch 2362 RMD160 17e5a6f3cdae0db6b4cd91f4392b4d1e73565e50 SHA1 77cb2025aec6ec787864fb957386d9fd409c1f58 SHA256 0d79a173bd5af1356cc85a4a68d7ef112543a161fb243160ec8af4b6940fc2fc
-DIST bkchem-0.14.0-pre1.tar.gz 1035224 RMD160 02dc1cd582d112e999bdfe93d2acd56ffb32fb7f SHA1 326682356d14334ff00ae89cfd6e85834f65380a SHA256 4a1db68f47cb76dd63fd9d8f56ab61ecdf229df022ae1c0063f333414d27b4d0
-DIST bkchem-0.14.0-pre2.tar.gz 998916 RMD160 96f144b4ecda28b349522921ae6f4f7789618cd9 SHA1 9c17e8cbd0443d55b82c32f27f5965dd014033c5 SHA256 65b93128932959b394eff8e5a8018a19b30d26ee1ae44345e8bb87167303ed26
-EBUILD bkchem-0.14.0_pre1-r2.ebuild 1016 RMD160 180d3dc98d4c3ca678ddb508c062c733fecebcc1 SHA1 2894da7bc0331b181bfe1e9f571547cabbe67d14 SHA256 c7c4754001417f8f4862c9b6f4f8c49dc22e3ea79fbdf319a799eb48c5d7c83d
-EBUILD bkchem-0.14.0_pre2.ebuild 915 RMD160 190bf436b49e7784b44db038f59a0f9169d02a57 SHA1 4a3826aa5972c7b3b769e6db6d4d51eccf9faa76 SHA256 9d85049e866f3a9709c697a078e04e3f4adbe457a2b972c1d963a2a757a3f199
-MISC ChangeLog 1197 RMD160 fc5c90281a74dafa558f72cd01d0ae3a5a3e52f7 SHA1 17bb1f7d2c52fe597b50b4e0cc47840331d63590 SHA256 d1ba6b071b41698ea576d0f81e11e60cf5ea471673003f7f7587b0a86e46073e
-MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1
+AUX 0.14.0_pre1-piddle-Fix-assertions.patch 2362 SHA256 0d79a173bd5af1356cc85a4a68d7ef112543a161fb243160ec8af4b6940fc2fc SHA512 78e19302dbe57996d61a5a9e275e3a12730fb4db9400e4322b010239fe6305c5afe04f23056941e28dddfb55d1120907e68e0fe924bf2f46ed7f202948d03caa WHIRLPOOL 3c05f8216f908dfa570b4027b5c2ac0f402737e497ac85cd0ba11a3682d58372a6bea6107007fd725afc2841ea337eea00a6182a2e19ec9f9c253064958f2c19
+AUX bkchem-0.14.0_pre2-nolauncher.patch 2967 SHA256 91f95fedb29a3d6be3581a2aa056dc961176af0296d2fdbd1c0d0ba28e321312 SHA512 dbd7b8eef583c3b64dfc1755a3b5eae5eb8ab222454936636147de64e021166e29f915655f1acf2d7252983bf4873dc8f2fb69ca58b56955ab1ce07e8ec82789 WHIRLPOOL 2f4c410a30d08d7d7bb472a97afaa5969046e164098b1a9bd6cca03de0dd622e9ee9c150f2cc3b05cff4e4a2d9a63d6bb9b1f5503d012f7b4172ee2da708b35a
+DIST bkchem-0.14.0-pre2.tar.gz 998916 SHA256 65b93128932959b394eff8e5a8018a19b30d26ee1ae44345e8bb87167303ed26 SHA512 7fc3bbd7bfe27bc91cf69a98c347a3fb92f4ea25b45a13debd0646a6b02d7a40c5729ae1b2a9ac33c1049d6b90e38355c3cd80e06660a0a2fcc5dafb3514ef20 WHIRLPOOL 732bc45913248aa3df5929933f2072d09d90a46cdc3b3e22f1849adf391d7fd62704e71a98e24649bd74e1ebe96b30d7d398dadabffc0fcd114d8c13922241c6
+EBUILD bkchem-0.14.0_pre2-r1.ebuild 1014 SHA256 159fc09513e347849f5054d85564901b128585b24f248ddcf1b3e8f7dc83a868 SHA512 b9ba55360b4f15eccdcfc06348b2f983dba8e9a8cbaea42e1ebacca1ee844c127a604c57509d007f6d5f1ef502f336ac1bfbd7afc78732b487f01cf39abd1a15 WHIRLPOOL 7eb34439df731522abc7b0c1b41ed1a23d508836fc2866ac2e069475276998c23069a5988821a6343ffdc43e53a5e0ab2beb0b3083464249c07985bcf8137aca
+MISC ChangeLog 1485 SHA256 fc65256219a69a64f25bd25704d1d64aa17ae0f8556c79b57ca09590345c1189 SHA512 f2522d802a0114df653806c3d142e4d1902477d0f37e344e91c7df46c13a8ee83b5602a2d312dc3f51cdf88f45831ebed82f5b9a211707df45855dfd3ce7ab37 WHIRLPOOL 0721cab674115c5599c7e5c5ab7c78f2a299bd839b4443a63d72188fc7993b5194ea384f9d57e4b1a4b724135eafc39eff90a99128d57527af3279b5cf7b31dc
+MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEARECAAYFAkxjpzIACgkQgAnW8HDreRbJUACgroelJygVJdoWKeZRLyCnVwj+
-IH0An0uXYMuFi1o/uobIMCA401fKJ2g+
-=WcuB
+iQJ8BAEBCgBmBQJU5wxRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirmkwP/AzD4AI58XhXCuiUPUv9KELx
+CaPfBdeRpXTmvO44SRy1jddy301Vh5Xq4IcR+b7C2lmtdOLm0pSay/Dww9urwDdj
+BEOBbw0mVesgMXtcO35HK60fg/xyOjifsNqZTs5Wjj1It2pyAv1nI85EjyPkzWGg
+Omri5fZkJH6Pknu/0xTRnNs+WEspzqP37addBNmwDYg011xcFunWwQ+Cv3w82MRv
+0tMuFTC6+RU7FDNZu14m7VpEfTdhxMOorNoMmWp/4iwAbPH/USRD8hcel4/RInJp
+cipJn7cmt7gQ7RVpTT2WoOQixP6Qhw/DNUHMVUvPqNvYHFc8jKLZBhpBZ2AQeaSm
+x8qDiIA7Q2/VXVISlHKiyz15Xeadx0T2c7iJCknuENoGfmXg5DxOOMdhMXXkz3nB
+TJFi9gTscLZ/OPjoZ09HnSvXWPj1FPKuYu10CjAyr42rnraOR4o5AeGhaxhtcx/D
+ErULQo3GDlV3tHIikoyB20xqaotpt33w8WU/OcNX9lPs0LeWtXj+1g/aDaEkYyoJ
+TMnKlf5pevKAQ0mTMVtnUWD/v8LDEhp3uDWaApJe2pfNlXUcs2pWfnUpWcXibu5t
+f4NgqqPRGV9grwb1sRjlQX6ELrr8ydEeSr7nLpNo6BN/EyUEp6HZq7+9BrVt3781
+3YPDCFGFq+eMAKoPvYBV
+=08VM
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/bkchem/bkchem-0.14.0_pre1-r2.ebuild b/sci-chemistry/bkchem/bkchem-0.14.0_pre1-r2.ebuild
deleted file mode 100644
index acedf89ea256..000000000000
--- a/sci-chemistry/bkchem/bkchem-0.14.0_pre1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/bkchem/bkchem-0.14.0_pre1-r2.ebuild,v 1.4 2010/07/11 16:58:10 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="tk"
-
-inherit distutils eutils versionator
-
-MY_P="${PN}-$(replace_version_separator 3 -)"
-
-DESCRIPTION="Chemical drawing program"
-HOMEPAGE="http://bkchem.zirael.org/"
-SRC_URI="http://bkchem.zirael.org/download/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-IUSE="cairo"
-
-DEPEND="cairo? ( dev-python/pycairo[svg] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-piddle-Fix-assertions.patch
-	distutils_src_prepare
-}
-
-src_install() {
-	distutils_src_install "--strip=${D%/}"
-	sed "s:^python:$(PYTHON):g" -i "${ED}"/usr/bin/${PN} || die
-	make_desktop_entry "${EPREFIX}"/usr/bin/bkchem BKChem "${EPREFIX}"/usr/share/${PN}/images/${PN}.png
-}
diff --git a/sci-chemistry/bkchem/bkchem-0.14.0_pre2-r1.ebuild b/sci-chemistry/bkchem/bkchem-0.14.0_pre2-r1.ebuild
new file mode 100644
index 000000000000..70170b7b1a5b
--- /dev/null
+++ b/sci-chemistry/bkchem/bkchem-0.14.0_pre2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/bkchem/bkchem-0.14.0_pre2-r1.ebuild,v 1.1 2015/02/20 10:28:32 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1 eutils versionator
+
+MY_P="${PN}-$(replace_version_separator 3 -)"
+
+DESCRIPTION="Chemical drawing program"
+HOMEPAGE="http://bkchem.zirael.org/"
+SRC_URI="http://bkchem.zirael.org/download/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+IUSE="cairo"
+
+DEPEND="cairo? ( dev-python/pycairo[svg,${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nolauncher.patch
+)
+
+python_install() {
+	distutils-r1_python_install "--strip=${ED}/_${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	python_foreach_impl python_newscript ${PN}/${PN}.py ${PN}
+	make_desktop_entry bkchem BKChem "${EPREFIX}"/usr/share/${PN}/images/${PN}.png Science
+}
diff --git a/sci-chemistry/bkchem/bkchem-0.14.0_pre2.ebuild b/sci-chemistry/bkchem/bkchem-0.14.0_pre2.ebuild
deleted file mode 100644
index 3ab19919ce50..000000000000
--- a/sci-chemistry/bkchem/bkchem-0.14.0_pre2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/bkchem/bkchem-0.14.0_pre2.ebuild,v 1.1 2010/08/12 07:47:56 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="tk"
-
-inherit distutils eutils versionator
-
-MY_P="${PN}-$(replace_version_separator 3 -)"
-
-DESCRIPTION="Chemical drawing program"
-HOMEPAGE="http://bkchem.zirael.org/"
-SRC_URI="http://bkchem.zirael.org/download/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-IUSE="cairo"
-
-DEPEND="cairo? ( dev-python/pycairo[svg] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_install() {
-	distutils_src_install "--strip=${D%/}"
-	sed "s:^python:$(PYTHON):g" -i "${ED}"/usr/bin/${PN} || die
-	make_desktop_entry "${EPREFIX}"/usr/bin/bkchem BKChem "${EPREFIX}"/usr/share/${PN}/images/${PN}.png
-}
diff --git a/sci-chemistry/bkchem/files/bkchem-0.14.0_pre2-nolauncher.patch b/sci-chemistry/bkchem/files/bkchem-0.14.0_pre2-nolauncher.patch
new file mode 100644
index 000000000000..202c47a9c74f
--- /dev/null
+++ b/sci-chemistry/bkchem/files/bkchem-0.14.0_pre2-nolauncher.patch
@@ -0,0 +1,106 @@
+ bkchem/bkchem.py | 24 +++++++++++++-----------
+ setup.py         | 23 -----------------------
+ 2 files changed, 13 insertions(+), 34 deletions(-)
+
+diff --git a/bkchem/bkchem.py b/bkchem/bkchem.py
+index b336b9c..bcb68b0 100644
+--- a/bkchem/bkchem.py
++++ b/bkchem/bkchem.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python2
+ #--------------------------------------------------------------------------
+ #     This file is part of BKChem - a chemical drawing program
+ #     Copyright (C) 2002-2009 Beda Kosata <beda@zirael.org>
+@@ -18,18 +19,19 @@
+ #--------------------------------------------------------------------------
+ 
+ 
+-"""this is just a starter of the application"""
++#"""this is just a starter of the application"""
+ 
+ ## support for loading from outside of bkchem dir
+ 
+-import os_support, sys
++from bkchem import os_support
++import sys
+ sys.path.insert( 1, os_support.get_module_path())
+ 
+ 
+ ### now starting for real
+ 
+-from singleton_store import Store
+-import pref_manager
++from bkchem.singleton_store import Store
++from bkchem import pref_manager
+ 
+ # at first preference manager
+ Store.pm = pref_manager.pref_manager(
+@@ -78,13 +80,13 @@ else:
+ 
+ 
+ 
+-import config
++from bkchem import config
+ 
+ if not config.debug:
+   # checking of important modules availability
+   # import modules
+-  import import_checker
+-  import messages
++  from bkchem import import_checker
++  from bkchem import messages
+ 
+   # we need sets from the 2.3 version
+   if not import_checker.python_version_ok:
+@@ -103,16 +105,16 @@ if not config.debug:
+ 
+   
+ #import Tkinter
+-from main import BKChem
+-from splash import Splash
+-from singleton_store import Store
++from bkchem.main import BKChem
++from bkchem.splash import Splash
++from bkchem.singleton_store import Store
+ 
+ myapp = BKChem()
+ myapp.withdraw()
+ 
+ if __name__ == '__main__':
+ 
+-  import messages
++  from bkchem import messages
+   enc = sys.getfilesystemencoding()
+   if not enc:
+     enc = sys.getdefaultencoding()
+diff --git a/setup.py b/setup.py
+index d4b2a21..2319216 100755
+--- a/setup.py
++++ b/setup.py
+@@ -91,26 +91,3 @@ if len( sys.argv) > 1 and sys.argv[1] == 'install' and '--help' not in sys.argv:
+   print "file %s created" % config_name
+ 
+ 
+-  # the executable
+-  if not os.path.isdir( bin_dir):
+-    try:
+-      os.mkdir( bin_dir)
+-    except:
+-      print "ERROR: could not create directory %s" % bin_dir
+-      sys.exit( 201)      
+-  exec_name = os.path.join( bin_dir, 'bkchem')
+-  try:
+-    file = open( exec_name, 'w')
+-  except:
+-    print "ERROR: couldn't open the file %s for write" %  exec_name
+-    sys.exit( 201)
+-  file.write( "#!/bin/sh\n")
+-  file.write( 'python %s "$@"\n' % strip_path( os.path.join( py_dir, "bkchem", "bkchem.py")))
+-  file.close()
+-  print "file %s created" % exec_name
+-  try:
+-    os.chmod( os.path.join( bin_dir, 'bkchem'), 5+5*8+7*8*8)
+-  except:
+-    print "ERROR: failed to make %s executable" % exec_name
+-    sys.exit( 201)
+-  print "file %s made executable" % exec_name
diff --git a/sci-chemistry/bkchem/metadata.xml b/sci-chemistry/bkchem/metadata.xml
index dde7ca88a50f..ae9ec7c5f6a4 100644
--- a/sci-chemistry/bkchem/metadata.xml
+++ b/sci-chemistry/bkchem/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>