Snapshot.

svn path=/emacs-overlay/; revision=1660

5 files changed, 93 insertions, 6 deletions

diff --git a/app-emacs/rudel/ChangeLog b/app-emacs/rudel/ChangeLog
index bf67369..89c47b4 100644
--- a/app-emacs/rudel/ChangeLog
+++ b/app-emacs/rudel/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*rudel-0.3_pre20110405 (20 Jul 2011)
+
+  20 Jul 2011; Ulrich Mueller <ulm@gentoo.org> +rudel-0.3_pre20110405.ebuild,
+  files/60rudel-gentoo.el, +files/rudel-0.3_pre20110405-icons-dir.patch:
+  Snapshot.
+
 *rudel-9999 (19 Jul 2011)
 
   19 Jul 2011; Ulrich Mueller <ulm@gentoo.org> +rudel-9999.ebuild:
diff --git a/app-emacs/rudel/Manifest b/app-emacs/rudel/Manifest
index eff693f..98237c6 100644
--- a/app-emacs/rudel/Manifest
+++ b/app-emacs/rudel/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 60rudel-gentoo.el 112 RMD160 f86473c1f06b39fadad81ad95f0892b1451ccd48 SHA1 6de838aa926164ec0720082da18ac86ffa5f7ebe SHA256 5fe5d0e95cb73280b24ef0a023c09ed99ade4a5d945c33cda7ca2e40b1701a86
+AUX 60rudel-gentoo.el 542 RMD160 4fbec851ccd7a30b9f4d37efbd5cfc620528ab1f SHA1 a7b33a7d70474f3e98bc48b841bb59ea8e61034b SHA256 3a5509fe5f36f6add179831c6c49c8ab70e1e526a653ce6d470587715e2a6f1f
 AUX rudel-0.2.4-icons-dir.patch 503 RMD160 44b328338d2ae9b470a7954fc817cdbe7e6f50e2 SHA1 4e4c302ab34358f8351304b25d8cbb5bc4a22522 SHA256 6786ad0cbe14be9fe58f4e839988f513ddd917e708756dd69d0e058b8616be39
 AUX rudel-0.2.4-require-cl.patch 455 RMD160 88298e4867f1a01800e4df00c4936aaf0f6c6b7f SHA1 f6c6b9ebdd407603d8d62371bd6669c0d982bec1 SHA256 263506e3ca3cee50e1ba1c420219f73ac44be0b52a74b7611f836c8440b5ae52
+AUX rudel-0.3_pre20110405-icons-dir.patch 388 RMD160 fcbc1b6fda08062f184529745c8b2c914bf6a94f SHA1 7b6f559198b1c49415bf33c654fac91102022428 SHA256 b76e3ebfb544c299383f19299240d0d681a7302609d47e30ed63fcb41e03e747
 DIST rudel-0.2-4.tar.gz 190557 RMD160 fd9a8053341876324b9f0ef0e3e020d47756e2f6 SHA1 26bb3af4b2accf67a3465b4e43d6548e2ce6a9bb SHA256 68247bfb702d929877f6d098932e8b0ca45c573a3510187e1ccc43e5ea194f25
+DIST rudel-0.3_pre20110405.tar.xz 415988 RMD160 71047df542dc0d0c0121b117b87be5686174d10b SHA1 74485b0aba0bedc9a6081e01e9d28569fecf2251 SHA256 690d9bd4dcd0f6539d6a99177e299421681b99f2eca762f5eaaf052e3ff79894
 EBUILD rudel-0.2.4.ebuild 1235 RMD160 dfad0dd8059efe097d329a3daba76c5afc8b7167 SHA1 6e5f1ca1952dd563c14616cd15d58e472eacd248 SHA256 10efe0444348b5b47d0d6c25a86ee88fc972dd6ce09184b936b56f47d4d448c7
+EBUILD rudel-0.3_pre20110405.ebuild 1272 RMD160 2db4842997707f447fff5af6e52bd27543fc3bd9 SHA1 066222da8b4b85a4f144e092e03c234bb19f4fe3 SHA256 1e6f1bc464e53b486af7a8ba7d68631a5f2882bef21d86f932027ed58c3c7cb6
 EBUILD rudel-9999.ebuild 1161 RMD160 82948521191a7f2d9d0d52eae69fc1745477849e SHA1 acb570861e2476045d0e839a1ad053061556c36e SHA256 ed3f353f15e495736bce757c8c91deea2d976a2c2248b8d215b4cbe5502e8ffa
-MISC ChangeLog 446 RMD160 0f19e8ef1e0f2679119451ba971d21ea9b2ff55e SHA1 985022510b5722e5a338f9785d484de948f5286a SHA256 e25a4e05dfa01d021edd5fa883876cebbef98f35fb52d6f3ea8226343ee2ff94
+MISC ChangeLog 648 RMD160 d29ab8d958384cc3d6204380430ca35b2d89600f SHA1 2d9fadc91cfe0adb63b01892e6ed79b5699a0701 SHA256 abe45f9927e1009104c4b440703029252b0b5574418a43c492a421dcc3eef518
 MISC metadata.xml 584 RMD160 d455dbbf09ed0ba17af5164b7b632091e803ab13 SHA1 6547736b94d1944e7a6eba72534b9eb628b9f307 SHA256 674db47f62f67e1a500201c646e67436f1985e593e9d96a462b600f57aa08d96
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4l2tMACgkQOeoy/oIi7uzM6wCfdUdkK+n+RbouhxF5UxuSxxrC
-lH4AnR+9VbO3hIkgNQCI4ShSH6CO/UBI
-=qTl3
+iEYEARECAAYFAk4nCS8ACgkQOeoy/oIi7uyfIQCg0p16cSE9ww0EAW9udCNhlJIb
+YnYAoJZMe/8qVcboKjFkoKH+OLUHKcy4
+=9qox
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/rudel/files/60rudel-gentoo.el b/app-emacs/rudel/files/60rudel-gentoo.el
index c8ddaf8..2383074 100644
--- a/app-emacs/rudel/files/60rudel-gentoo.el
+++ b/app-emacs/rudel/files/60rudel-gentoo.el
@@ -1,3 +1,13 @@
 (add-to-list 'load-path "@SITELISP@")
-(require 'rudel-loaddefs)
+(autoload 'rudel-join-session "rudel-loaddefs"
+  "Start a collaborative Rudel session" t)
+(autoload 'rudel-host-session "rudel-loaddefs"
+  "Host a collaborative Rudel session" t)
+(autoload 'rudel-speedbar "rudel-loaddefs"
+  "Show connected users and documents for the Rudel session in speedbar" t)
+(autoload 'global-rudel-minor-mode "rudel-loaddefs"
+  "Bindings for rudel session-level commands" t)
+
+;;(global-set-key (kbd "C-c c j") 'rudel-join-session)
+
 (setq rudel-icons-directory "@SITEETC@/icons/")
diff --git a/app-emacs/rudel/files/rudel-0.3_pre20110405-icons-dir.patch b/app-emacs/rudel/files/rudel-0.3_pre20110405-icons-dir.patch
new file mode 100644
index 0000000..d39faf2
--- /dev/null
+++ b/app-emacs/rudel/files/rudel-0.3_pre20110405-icons-dir.patch
@@ -0,0 +1,11 @@
+--- rudel-orig/rudel-icons.el
++++ rudel/rudel-icons.el
+@@ -44,7 +44,7 @@
+ (defconst rudel-icons-image-formats '(svg png)
+   "Image formats to try (in that order) when loading Rudel icons.")
+ 
+-(defconst rudel-icons-directory
++(defvar rudel-icons-directory
+   (file-name-as-directory
+    (concat (file-name-directory load-file-name)  "icons"))
+   "Directory that holds Rudel icon files.")
diff --git a/app-emacs/rudel/rudel-0.3_pre20110405.ebuild b/app-emacs/rudel/rudel-0.3_pre20110405.ebuild
new file mode 100644
index 0000000..3d9b014
--- /dev/null
+++ b/app-emacs/rudel/rudel-0.3_pre20110405.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+NEED_EMACS=23
+
+inherit elisp
+
+DESCRIPTION="Collaborative editing environment for GNU Emacs"
+HOMEPAGE="http://rudel.sourceforge.net/
+	http://www.emacswiki.org/emacs/Rudel"
+# snapshot of bzr://rudel.bzr.sourceforge.net/bzrroot/rudel/trunk
+SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/emacs-cedet"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+ELISP_PATCHES="${P}-icons-dir.patch"
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+	${EMACS} ${EMACSFLAGS} -l rudel-compile.el || die
+}
+
+src_install() {
+	local dir
+
+	for dir in . adopted infinote jupiter obby socket telepathy tls \
+		xmpp zeroconf
+	do
+		insinto "${SITELISP}/${PN}/${dir}"
+		doins ${dir}/*.{el,elc}
+	done
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+	insinto "${SITEETC}/${PN}"
+	doins -r icons
+
+	dodoc README INSTALL ChangeLog doc/card.pdf
+}
+
+pkg_postinst() {
+	elisp_pkg_postinst
+
+	elog "Connections to Gobby servers require the gnutls-cli program"
+	elog "(net-libs/gnutls)."
+	elog "The Avahi daemon (net-dns/avahi) is required for automatic"
+	elog "session discovery and advertising."
+}