Fixed to work with USE="-emacs", fixes bug #146348

(Portage version: 2.1.2.2)

4 files changed, 47 insertions, 4 deletions

diff --git a/dev-lang/ucblogo/ChangeLog b/dev-lang/ucblogo/ChangeLog
index 65a18e5f86d1..558f184d5e89 100644
--- a/dev-lang/ucblogo/ChangeLog
+++ b/dev-lang/ucblogo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ucblogo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ChangeLog,v 1.4 2007/02/22 00:15:07 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ChangeLog,v 1.5 2007/04/03 22:25:50 tomk Exp $
+
+  03 Apr 2007; Tom Knight <tomk@gentoo.org>
+  +files/ucblogo-5.5-no-emacs.patch, metadata.xml, ucblogo-5.5.ebuild:
+  Fixed to work with USE="-emacs", fixes bug #146348
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-lang/ucblogo/files/ucblogo-5.5-no-emacs.patch b/dev-lang/ucblogo/files/ucblogo-5.5-no-emacs.patch
new file mode 100644
index 000000000000..03c78fc179f6
--- /dev/null
+++ b/dev-lang/ucblogo/files/ucblogo-5.5-no-emacs.patch
@@ -0,0 +1,28 @@
+--- makefile.in~	2007-04-03 22:50:58.000000000 +0100
++++ makefile.in	2007-04-03 22:50:58.000000000 +0100
+@@ -57,12 +57,10 @@
+ 
+ clean:
+ 	rm -f *.o libloc.c
+-	cd emacs; $(MAKE) clean
+ 
+ ship:
+ 	rm -f config.h config.cache config.log config.status
+ 	rm -f makefile makehelp logo *.o libloc.c
+-	cd emacs; $(MAKE) ship
+ 	cd docs; $(MAKE) ship
+ 
+ install: all
+@@ -71,12 +69,10 @@
+ 	cp -f logolib/* $(DESTDIR)$(LIBLOC)/logolib/.
+ 	cp -f helpfiles/* $(DESTDIR)$(LIBLOC)/helpfiles/.
+ 	cp -f csls/* $(DESTDIR)$(LIBLOC)/csls/.
+-	(cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) $(MAKE) install)
+ 	(cd docs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) $(MAKE) install)
+ #	prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) install
+ 
+ logo-mode: 
+-	(cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE))
+ #	@prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE)
+ 
+ make-docs:
diff --git a/dev-lang/ucblogo/metadata.xml b/dev-lang/ucblogo/metadata.xml
index d9cd2cad66c2..5f28c3418929 100644
--- a/dev-lang/ucblogo/metadata.xml
+++ b/dev-lang/ucblogo/metadata.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>no-herd</herd>
 <maintainer>
-<email>maintainer-needed@gentoo.org</email>
+  <email>tomk@gentoo.org</email>
+  <name>Tom Knight</name>
 </maintainer>
+<longdescription>
+  Logo is the educational programming language best known for its "turtle
+  graphics" but also featuring easy and powerful facilities for computing
+  with words and sentences.  Sample projects included with the Berkeley
+  Logo distribution range from a tic-tac-toe game to a Pascal compiler and
+  a Logo implementation of Student, Daniel Bobrow's program that solves
+  algebra word problems.
+</longdescription>
 </pkgmetadata>
diff --git a/dev-lang/ucblogo/ucblogo-5.5.ebuild b/dev-lang/ucblogo/ucblogo-5.5.ebuild
index 0e40ab4efd05..5ed0e6a189b4 100644
--- a/dev-lang/ucblogo/ucblogo-5.5.ebuild
+++ b/dev-lang/ucblogo/ucblogo-5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ucblogo-5.5.ebuild,v 1.5 2006/03/24 00:12:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ucblogo-5.5.ebuild,v 1.6 2007/04/03 22:25:50 tomk Exp $
 
 inherit eutils
 
@@ -22,6 +22,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-destdir.patch
 	epatch "${FILESDIR}"/${P}-fhs.patch
 	epatch "${FILESDIR}"/${P}-dont-require-tetex.patch
+	use emacs || epatch "${FILESDIR}"/${P}-no-emacs.patch
 #	use emacs || echo 'all install:' > emacs/makefile
 }