Respecting USE=cairo and fix for prefix, thanks rei4dan for the patch

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-chemistry/bkchem/ChangeLog b/sci-chemistry/bkchem/ChangeLog
index c4b205d41d6bf17ce9149697421089724ad8118b..b23850e50a5adcb5ef08433ee2398793734524c3 100644 (file)
--- a/sci-chemistry/bkchem/ChangeLog
+++ b/sci-chemistry/bkchem/ChangeLog
@@ -1,6 +1,9 @@
 # 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.4 2010/06/25 08:06:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/bkchem/ChangeLog,v 1.5 2010/07/11 16:58:10 jlec Exp $
+
+  11 Jul 2010; Justin Lecher <jlec@gentoo.org> bkchem-0.14.0_pre1-r2.ebuild:
+  Respecting USE=cairo and fix for prefix, thanks rei4dan for the patch
 
   25 Jun 2010; Justin Lecher <jlec@gentoo.org> bkchem-0.14.0_pre1-r2.ebuild:
   Added desktop entry

diff --git a/sci-chemistry/bkchem/Manifest b/sci-chemistry/bkchem/Manifest
index 13e83dea36bf24f0f1f83856e1cebd06a8862afd..c1c7834eba1e93acd172b5fe2059ef8d310a293e 100644 (file)
--- a/sci-chemistry/bkchem/Manifest
+++ b/sci-chemistry/bkchem/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 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
-EBUILD bkchem-0.14.0_pre1-r2.ebuild 980 RMD160 0236876a03bf36c68ea77b6a589fc79912dfee99 SHA1 87a513136e444ac68b94aae655f93c0968bfb49d SHA256 db876db386c69fbe5079d7586f94922e1dd00cb1a4dc8f3b6e222dd0738a325e
-MISC ChangeLog 921 RMD160 dcaeef4ff5867c15176bf2ddee734da279625bb2 SHA1 14c32af26f1dc2444ba63f925f80fe4b2c6d831a SHA256 62b7039fff23d29d78c95eb673e98a970d77ece88baf8194af250d9201e1169c
+EBUILD bkchem-0.14.0_pre1-r2.ebuild 1016 RMD160 180d3dc98d4c3ca678ddb508c062c733fecebcc1 SHA1 2894da7bc0331b181bfe1e9f571547cabbe67d14 SHA256 c7c4754001417f8f4862c9b6f4f8c49dc22e3ea79fbdf319a799eb48c5d7c83d
+MISC ChangeLog 1071 RMD160 d114ecb0f84494f1e845dad6a7c78926759220e4 SHA1 57fd82d4cb855353d176ca3191d041c918b3e8cf SHA256 c18b7b1142a1123ad89c2f691de8a41389c4b3541bcc8b19e34a9cd44c268629
 MISC metadata.xml 155 RMD160 3461e0e8be85b18f167d6c09bd46051d3d1407d1 SHA1 b61e02ab96757b21564fe0c9d1c6ac85f3f4b4ea SHA256 dcbfd8047666ea8f6051e15ba815e96cfb5c03dcea941c16a709a9cdf761dd39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwkY4QACgkQgAnW8HDreRagQQCgpKdzdbZ3hl8bdUYOBotJKmD4
-M3QAoLWw2IyetjJlpnFBevu/f9f1MpwW
-=+OMX
+iEYEARECAAYFAkw5+CcACgkQgAnW8HDreRZd8QCgqvZ1OVGqoeyS1mpVfYj/smLO
+xyoAn371M846Vi6+54Wv9YC2qeBMvSQj
+=gQPe
 -----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
index 16f8bd8c157f872e761afd0384da52c7bb0e23a8..acedf89ea256f496b3efb9b34a5f8837e4738d7a 100644 (file)
--- a/sci-chemistry/bkchem/bkchem-0.14.0_pre1-r2.ebuild
+++ b/sci-chemistry/bkchem/bkchem-0.14.0_pre1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2010/06/25 08:06:22 jlec Exp $
+# $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"
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 IUSE="cairo"
 
-DEPEND="dev-python/pycairo[svg]"
+DEPEND="cairo? ( dev-python/pycairo[svg] )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MY_P}
@@ -36,6 +36,6 @@ src_prepare() {
 
 src_install() {
        distutils_src_install "--strip=${D%/}"
-       sed "s:^python:$(PYTHON):g" -i "${D}"/usr/bin/${PN} || die
-       make_desktop_entry /usr/bin/bkchem BKChem /usr/share/${PN}/images/${PN}.png
+       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
 }