fix automagic Emacs dependency and make it a proper DEPEND, see bug 92219, reported by dan <reddan AT warpmail DOT net>, fix provided by ulm

Package-Manager: portage-2.1.3.19

6 files changed, 133 insertions, 24 deletions

diff --git a/dev-python/bicyclerepair/ChangeLog b/dev-python/bicyclerepair/ChangeLog
index 9327463ff566..a1f547380b44 100644
--- a/dev-python/bicyclerepair/ChangeLog
+++ b/dev-python/bicyclerepair/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/bicyclerepair
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bicyclerepair/ChangeLog,v 1.16 2007/07/04 19:16:33 hawking Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bicyclerepair/ChangeLog,v 1.17 2008/01/23 21:45:35 opfer Exp $
+
+*bicyclerepair-0.9-r1 (23 Jan 2008)
+
+  23 Jan 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/50bicyclerepair-gentoo.el, bicyclerepair-0.9.ebuild,
+  +bicyclerepair-0.9-r1.ebuild:
+  fix automagic Emacs dependency and make it a proper DEPEND, see bug 92219,
+  reported by dan <reddan AT warpmail DOT net>, fix provided by ulm
 
   04 Jul 2007; Ali Polatel <hawking@gentoo.org> bicyclerepair-0.7.1.ebuild,
   bicyclerepair-0.7.1-r1.ebuild, bicyclerepair-0.9.ebuild:
diff --git a/dev-python/bicyclerepair/Manifest b/dev-python/bicyclerepair/Manifest
index 48e74476b00e..a810b1c4445d 100644
--- a/dev-python/bicyclerepair/Manifest
+++ b/dev-python/bicyclerepair/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 50bicyclerepair-gentoo.el 196 RMD160 4f3ea645adb8ea1f9d678712d2a145cbeed5d6ff SHA1 3789ae3b869a3b59f3c0361f97400b2899e990ac SHA256 37e59786c0046262b09d5f2a3bd70d5a1bb52ceef4bae5942be5b34729ca87a0
+MD5 189838192250057a3f4067f95aabc7eb files/50bicyclerepair-gentoo.el 196
+RMD160 4f3ea645adb8ea1f9d678712d2a145cbeed5d6ff files/50bicyclerepair-gentoo.el 196
+SHA256 37e59786c0046262b09d5f2a3bd70d5a1bb52ceef4bae5942be5b34729ca87a0 files/50bicyclerepair-gentoo.el 196
 DIST bicyclerepair-0.7.1.tar.gz 87885 RMD160 b288dbfabbbc56da1c99af1b4d86b3abc394aaa3 SHA1 eacd46bf1008bf4a9b37e8add1d3107547d62c51 SHA256 86f5468a46dec7c0eeab7b742e17490ede9aef7bd54e378061d9171deb735ad6
 DIST bicyclerepair-0.9.tar.gz 165025 RMD160 18f274c2078f481b63e20a7f50aa14119dbdf55e SHA1 269c0fda6111b9c5cb631d46626083a9d213baec SHA256 69509eebaeb595ad1d14291b47c6236df97abd5893352965055d91b0cfaea116
 EBUILD bicyclerepair-0.7.1-r1.ebuild 1353 RMD160 fc6a2eef1c62eb2c3b27c82d75018b65e56092f6 SHA1 f458dbaffc0657a5598fab4d9638396a9cb4afa2 SHA256 6072f3edffe19a2eb979780966f2673d9617f636525cab5a7ef2b18f00b6cc5e
@@ -8,14 +15,18 @@ EBUILD bicyclerepair-0.7.1.ebuild 1018 RMD160 91e2289e6347d48f2541aca139c1513375
 MD5 cb93361131205924aadadd2769dca905 bicyclerepair-0.7.1.ebuild 1018
 RMD160 91e2289e6347d48f2541aca139c1513375866bf9 bicyclerepair-0.7.1.ebuild 1018
 SHA256 bed25f2017ea1607babd7b40b9cb40721a5d1da38ada9330839e594c953ced0e bicyclerepair-0.7.1.ebuild 1018
-EBUILD bicyclerepair-0.9.ebuild 1369 RMD160 90ea3b25681075043354cd0ad866e04b58da46aa SHA1 b084c8b723662c379400ca1b6bea608422388319 SHA256 d91f53f1cfdbb33aec7303a1a131bd631622ea3babbcad9ba9005c40aaa5c9ae
-MD5 1ea7dcb14cc50148c3fd96bd82d87f95 bicyclerepair-0.9.ebuild 1369
-RMD160 90ea3b25681075043354cd0ad866e04b58da46aa bicyclerepair-0.9.ebuild 1369
-SHA256 d91f53f1cfdbb33aec7303a1a131bd631622ea3babbcad9ba9005c40aaa5c9ae bicyclerepair-0.9.ebuild 1369
-MISC ChangeLog 2063 RMD160 4b524e82516b8879f0e1029260c88c20492bffa1 SHA1 7ccbcd30262dd6d75dc124855dac95386c13ba02 SHA256 59ce724284efc2fa7793edc9057bc48c8c8ab7a87eb3974f86ecca257cad494b
-MD5 849ac2108e236ac0e8b33f84637358d5 ChangeLog 2063
-RMD160 4b524e82516b8879f0e1029260c88c20492bffa1 ChangeLog 2063
-SHA256 59ce724284efc2fa7793edc9057bc48c8c8ab7a87eb3974f86ecca257cad494b ChangeLog 2063
+EBUILD bicyclerepair-0.9-r1.ebuild 1507 RMD160 1400b94eb102a86bd8ada072c16c9400e3669aec SHA1 89b06122f2ffdc6f9b1970ee024724740277e8b3 SHA256 98c73f418f6a9cd876c057074e7bd88ef1ff59f95e067555e735cff3b57b11f5
+MD5 67236e111adada9551422d6a9c35df08 bicyclerepair-0.9-r1.ebuild 1507
+RMD160 1400b94eb102a86bd8ada072c16c9400e3669aec bicyclerepair-0.9-r1.ebuild 1507
+SHA256 98c73f418f6a9cd876c057074e7bd88ef1ff59f95e067555e735cff3b57b11f5 bicyclerepair-0.9-r1.ebuild 1507
+EBUILD bicyclerepair-0.9.ebuild 1504 RMD160 f98f188858e7cc34d0c906b156a5ce5428a1f218 SHA1 6f7ccc590b82794fbc73c5ae55fef77623d2985c SHA256 be273bf65a092b1bfb1f579aa6303a962f21e29e8149d31a3aaeaf826e67f728
+MD5 28b604a8ca3804b5566abc402a5fb014 bicyclerepair-0.9.ebuild 1504
+RMD160 f98f188858e7cc34d0c906b156a5ce5428a1f218 bicyclerepair-0.9.ebuild 1504
+SHA256 be273bf65a092b1bfb1f579aa6303a962f21e29e8149d31a3aaeaf826e67f728 bicyclerepair-0.9.ebuild 1504
+MISC ChangeLog 2393 RMD160 d1af9ba5facc19f514dad633fddf58d678e7baf9 SHA1 4525a8bbb71f5c1636bcc7306947851c3a764084 SHA256 823751b188551ca437e14531b0aaf4b322bc2e7a3c03d341417e509f7cc16392
+MD5 df774541d9e1dbd6d50df6411c2e76af ChangeLog 2393
+RMD160 d1af9ba5facc19f514dad633fddf58d678e7baf9 ChangeLog 2393
+SHA256 823751b188551ca437e14531b0aaf4b322bc2e7a3c03d341417e509f7cc16392 ChangeLog 2393
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -29,3 +40,13 @@ SHA256 ec0e3dd5e7ee90c147f1842098b7f23c63f9606900662f639d99af32bb614138 files/di
 MD5 191b9947f6f6f5eb3eebd0468219b1f3 files/digest-bicyclerepair-0.9 253
 RMD160 9ba56e651f43ecb49899e6f9a5b6442c44b23dad files/digest-bicyclerepair-0.9 253
 SHA256 59ee311c3dc9f3446c537c5c7ce1f4c2118ca2172aa90d8218e9cec93d4acfd6 files/digest-bicyclerepair-0.9 253
+MD5 191b9947f6f6f5eb3eebd0468219b1f3 files/digest-bicyclerepair-0.9-r1 253
+RMD160 9ba56e651f43ecb49899e6f9a5b6442c44b23dad files/digest-bicyclerepair-0.9-r1 253
+SHA256 59ee311c3dc9f3446c537c5c7ce1f4c2118ca2172aa90d8218e9cec93d4acfd6 files/digest-bicyclerepair-0.9-r1 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHl7WnNQqtfCuFneMRAmlfAKCJxf7odVuh8L0hT3zPz3Ge0ZjqGwCeLidW
+w4D0J9MjspILDjkdsyxn6iE=
+=l6TS
+-----END PGP SIGNATURE-----
diff --git a/dev-python/bicyclerepair/bicyclerepair-0.9-r1.ebuild b/dev-python/bicyclerepair/bicyclerepair-0.9-r1.ebuild
new file mode 100644
index 000000000000..5963f3ff6744
--- /dev/null
+++ b/dev-python/bicyclerepair/bicyclerepair-0.9-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bicyclerepair/bicyclerepair-0.9-r1.ebuild,v 1.1 2008/01/23 21:45:35 opfer Exp $
+
+inherit distutils elisp-common
+
+DESCRIPTION="Bicycle Repair Man is the Python Refactoring Browser"
+HOMEPAGE="http://bicyclerepair.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bicyclerepair/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="emacs"
+
+DEPEND="virtual/python
+	emacs? ( app-emacs/pymacs
+		app-emacs/python-mode )"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# bikeemacs.py contains non-ascii characters in comments
+	sed -i -e '1s/$/\t-*- coding: latin-1 -*-/' ide-integration/bikeemacs.py
+}
+
+src_install() {
+	distutils_src_install
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+}
+
+pkg_postinst() {
+	# Enable IDLE integration if Python was compiled with tcltk.
+	PYTHON_VER=$(python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:')
+	config_txt=/usr/lib/python${PYTHON_VER}/tools/idle/config.txt
+	if [ -f "${config_txt}" ];
+	then
+		if [ -z "`grep BicycleRepairMan_Idle ${config_txt}`" ]; then
+			elog "Appending BicycleRepairman to IDLE.."
+			echo "[BicycleRepairMan_Idle]" >> ${config_txt}
+		fi
+	else
+		elog "BicycleRepairMan won't integrate with IDLE included in Python 2.3*"
+	fi
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/bicyclerepair/bicyclerepair-0.9.ebuild b/dev-python/bicyclerepair/bicyclerepair-0.9.ebuild
index 7dfd095ba26a..9a43d070a535 100644
--- a/dev-python/bicyclerepair/bicyclerepair-0.9.ebuild
+++ b/dev-python/bicyclerepair/bicyclerepair-0.9.ebuild
@@ -1,24 +1,36 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bicyclerepair/bicyclerepair-0.9.ebuild,v 1.7 2007/07/04 19:16:33 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bicyclerepair/bicyclerepair-0.9.ebuild,v 1.8 2008/01/23 21:45:35 opfer Exp $
 
-inherit distutils
+inherit distutils elisp-common
 
-DESCRIPTION="Bicycle Repair Man is the Python Refactoring Browser,"
+DESCRIPTION="Bicycle Repair Man is the Python Refactoring Browser"
 HOMEPAGE="http://bicyclerepair.sourceforge.net/"
 SRC_URI="mirror://sourceforge/bicyclerepair/${P}.tar.gz"
+
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-DEPEND="virtual/python"
+IUSE="emacs"
+
+DEPEND="virtual/python
+	emacs? ( app-emacs/pymacs
+		app-emacs/python-mode )"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# bikeemacs.py contains non-ascii characters in comments
+	sed -i -e '1s/$/\t-*- coding: latin-1 -*-/' ide-integration/bikeemacs.py
+}
 
 src_install() {
-	DOCS="DESIGN"
 	distutils_src_install
-	insinto /usr/share/${PN}
-	doins ide-integration/bike.el
-	rm -f ${D}/usr/bin/bikeemacs.bat
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
 }
 
 pkg_postinst() {
@@ -34,8 +46,9 @@ pkg_postinst() {
 	else
 		elog "BicycleRepairMan won't integrate with IDLE included in Python 2.3*"
 	fi
-	elog
-	elog "To use bicyclerepair with Xemacs or GNU Emacs you must be in Python"
-	elog "mode and add this to your .emacs or .init.el:"
-	elog "(load-library '/usr/share/bicyclerepair/bike.el')"
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }
diff --git a/dev-python/bicyclerepair/files/50bicyclerepair-gentoo.el b/dev-python/bicyclerepair/files/50bicyclerepair-gentoo.el
new file mode 100644
index 000000000000..edad427b54e0
--- /dev/null
+++ b/dev-python/bicyclerepair/files/50bicyclerepair-gentoo.el
@@ -0,0 +1,10 @@
+
+;;; bicyclerepair site-lisp configuration
+
+(add-hook
+ 'python-mode-hook
+ (lambda ()
+   (unless (fboundp 'brm-menu)
+     (require 'pymacs)
+     (pymacs-load "bikeemacs" "brm-")
+     (brm-init))))
diff --git a/dev-python/bicyclerepair/files/digest-bicyclerepair-0.9-r1 b/dev-python/bicyclerepair/files/digest-bicyclerepair-0.9-r1
new file mode 100644
index 000000000000..063e76982c25
--- /dev/null
+++ b/dev-python/bicyclerepair/files/digest-bicyclerepair-0.9-r1
@@ -0,0 +1,3 @@
+MD5 f825f48384febefacf0717738e909321 bicyclerepair-0.9.tar.gz 165025
+RMD160 18f274c2078f481b63e20a7f50aa14119dbdf55e bicyclerepair-0.9.tar.gz 165025
+SHA256 69509eebaeb595ad1d14291b47c6236df97abd5893352965055d91b0cfaea116 bicyclerepair-0.9.tar.gz 165025