Optionally install elisp files according to the 'emacs' USE flag (bug #101742). Cleaning old ebuilds.

(Portage version: 2.0.51.22-r2)

7 files changed, 38 insertions, 78 deletions

diff --git a/dev-util/monotone/ChangeLog b/dev-util/monotone/ChangeLog
index f433987c1e4a..2c44a932a7f7 100644
--- a/dev-util/monotone/ChangeLog
+++ b/dev-util/monotone/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/monotone
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/ChangeLog,v 1.17 2005/07/19 06:17:26 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/ChangeLog,v 1.18 2005/08/09 02:19:18 leonardop Exp $
+
+*monotone-0.21-r1 (08 Aug 2005)
+
+  08 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  monotone-0.21-r1.ebuild, files/30monotone-gentoo.el:
+  New revision. Added 'emacs' USE flag to optionally install elisp files
+  from 'contrib' (bug #101742).
 
 *monotone-0.21 (19 Jul 2005)
 
diff --git a/dev-util/monotone/Manifest b/dev-util/monotone/Manifest
index aa1badec428f..78f359af607d 100644
--- a/dev-util/monotone/Manifest
+++ b/dev-util/monotone/Manifest
@@ -4,11 +4,12 @@ MD5 dc5686ff5a40dfaf23bd7e7e2ae96073 monotone-0.16.ebuild 1236
 MD5 790fb008dfdd0820a29a647565fe9284 monotone-0.17.ebuild 1692
 MD5 aa7a28ac1380cf89fb5a1d0576a76707 monotone-0.18.ebuild 1687
 MD5 af2251480135572c461c610665a18ab6 monotone-0.19.ebuild 1589
-MD5 b37e056f9865f7279561e83f3fe5c874 monotone-0.20.ebuild 1868
 MD5 137b92d68c4340f34b2e8e7089910c1d monotone-0.21.ebuild 1766
+MD5 8a453a724b3047439275264ed1515bea monotone-0.21-r1.ebuild 1877
+MD5 4ed8efff6890c90214ba8b16706766e0 .monotone-0.21-r1.ebuild.swp 12288
 MD5 f7dab86750bae0e4ff09e2139b790084 files/digest-monotone-0.16 66
 MD5 c8834d71dc37833961a7eb7b4a455e84 files/digest-monotone-0.17 66
 MD5 a4899373e67a34bbd0127cfb616e19ae files/digest-monotone-0.18 66
 MD5 da4fd1c22f053091a99f33b3da3331d3 files/digest-monotone-0.19 66
-MD5 2a075cd7118d0bbc2e3ce1e41c97f0ee files/digest-monotone-0.20 66
 MD5 b3a73360f9c121cd039cca80b516bb6a files/digest-monotone-0.21 66
+MD5 b3a73360f9c121cd039cca80b516bb6a files/digest-monotone-0.21-r1 66
diff --git a/dev-util/monotone/files/30monotone-gentoo.el b/dev-util/monotone/files/30monotone-gentoo.el
new file mode 100644
index 000000000000..bd5165e40861
--- /dev/null
+++ b/dev-util/monotone/files/30monotone-gentoo.el
@@ -0,0 +1,5 @@
+;;; monotone site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(require 'monotone)
+(require 'monotone-nav)
diff --git a/dev-util/monotone/files/digest-monotone-0.20 b/dev-util/monotone/files/digest-monotone-0.20
deleted file mode 100644
index eb3033066d47..000000000000
--- a/dev-util/monotone/files/digest-monotone-0.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3bdf4da35ff576a401483815952f4045 monotone-0.20.tar.gz 4931957
diff --git a/dev-util/monotone/files/digest-monotone-0.21 b/dev-util/monotone/files/digest-monotone-0.21-r1
index b7339b56497f..b7339b56497f 100644
--- a/dev-util/monotone/files/digest-monotone-0.21
+++ b/dev-util/monotone/files/digest-monotone-0.21-r1
diff --git a/dev-util/monotone/monotone-0.20.ebuild b/dev-util/monotone/monotone-0.20.ebuild
deleted file mode 100644
index 63c8120b836b..000000000000
--- a/dev-util/monotone/monotone-0.20.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/monotone-0.20.ebuild,v 1.1 2005/07/07 00:50:16 leonardop Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Monotone Distributed Version Control System"
-HOMEPAGE="http://www.venge.net/monotone/"
-SRC_URI="http://www.venge.net/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="doc ipv6 nls"
-
-RDEPEND=">=dev-libs/boost-1.32"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-3.2
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	doc? ( sys-apps/texinfo )"
-
-src_compile() {
-	local myconf="$(use_enable nls) $(use_enable ipv6)"
-
-	# more aggressive optimizations cause trouble with the crypto library
-	strip-flags
-	append-flags -fno-stack-protector-all -fno-stack-protector \
-		-fno-strict-aliasing
-
-	econf ${myconf} || die
-	emake || die "emake failed"
-	use doc && make html
-}
-
-src_test() {
-	make check || die "self test failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	if use doc
-	then
-		dohtml -r html/*
-		dohtml -r figures
-	fi
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README* UPGRADE
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you are upgrading from:"
-	einfo "  - 0.19 or earlier: there are some command line and server"
-	einfo "    configuration changes; see /usr/share/doc/${PF}/NEWS.gz"
-	einfo "  - 0.18 or earliear: if you have created a ~/.monotonerc, rename"
-	einfo "    it to ~/.monotone/monotonerc, so monotone will still find it."
-	einfo "  - 0.17: simply make a backup of your databases, just in case, and"
-	einfo "    run \"db migrate\" on each."
-	einfo
-	einfo "For instructions to upgrade from previous versions, please read"
-	einfo "/usr/share/doc/${PF}/UPGRADE.gz"
-	einfo
-	einfo "Also, please note that 0.19 clients cannot talk to 0.20 servers,"
-	einfo "and vice-versa."
-	einfo
-}
diff --git a/dev-util/monotone/monotone-0.21.ebuild b/dev-util/monotone/monotone-0.21-r1.ebuild
index df1ff55abb15..c3f89b1917bf 100644
--- a/dev-util/monotone/monotone-0.21.ebuild
+++ b/dev-util/monotone/monotone-0.21-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/monotone-0.21.ebuild,v 1.1 2005/07/19 06:17:26 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/monotone-0.21-r1.ebuild,v 1.1 2005/08/09 02:19:18 leonardop Exp $
 
-inherit flag-o-matic
+inherit elisp-common flag-o-matic
 
 DESCRIPTION="Monotone Distributed Version Control System"
 HOMEPAGE="http://www.venge.net/monotone/"
@@ -12,15 +12,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="doc ipv6 nls"
+IUSE="doc emacs ipv6 nls"
 
 RDEPEND=">=dev-libs/boost-1.32"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/gcc-3.2
+	emacs? ( virtual/emacs )
 	nls? ( >=sys-devel/gettext-0.12.1 )
 	doc? ( sys-apps/texinfo )"
 
+SITEFILE="30monotone-gentoo.el"
+
+
 src_compile() {
 	local myconf="$(use_enable nls) $(use_enable ipv6)"
 
@@ -31,7 +35,10 @@ src_compile() {
 
 	econf ${myconf} || die "configure failed"
 	emake || die "emake failed"
+
 	use doc && make html
+
+	use emacs && elisp-compile contrib/*.el
 }
 
 src_test() {
@@ -41,16 +48,22 @@ src_test() {
 src_install() {
 	make DESTDIR="${D}" install || die
 
-	if use doc
-	then
+	if use doc; then
 		dohtml -r html/*
 		dohtml -r figures
 	fi
 
+	if use emacs; then
+		elisp-install ${PN} contrib/*.{el,elc}
+		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+	fi
+
 	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README* UPGRADE
 }
 
 pkg_postinst() {
+	use emacs && elisp-site-regen
+
 	einfo
 	einfo "If you are upgrading from:"
 	einfo "  - 0.20 or earlier: you need to run 'db migrate' against each of"
@@ -64,3 +77,7 @@ pkg_postinst() {
 	einfo "/usr/share/doc/${PF}/UPGRADE.gz"
 	einfo
 }
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}