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

(Portage version: 2.1.3.19)

5 files changed, 104 insertions, 16 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/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