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

Package-Manager: portage-2.1.2.2

5 files changed, 63 insertions, 16 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/Manifest b/dev-lang/ucblogo/Manifest
index f69dcc45a467..0dbedbe2e4a3 100644
--- a/dev-lang/ucblogo/Manifest
+++ b/dev-lang/ucblogo/Manifest
@@ -10,19 +10,23 @@ AUX ucblogo-5.5-fhs.patch 661 RMD160 00771124ed5956173d847afbcbf75280635d1d06 SH
 MD5 3da75893534e1513564394c430d3773e files/ucblogo-5.5-fhs.patch 661
 RMD160 00771124ed5956173d847afbcbf75280635d1d06 files/ucblogo-5.5-fhs.patch 661
 SHA256 edce527c09f5a9117348935612f6b680b927a18b35e4b7a7c687b1ca5c968fc2 files/ucblogo-5.5-fhs.patch 661
+AUX ucblogo-5.5-no-emacs.patch 1035 RMD160 98b365589332f9c6ec3cb3680f571fb3a04c4cc7 SHA1 5010b61a662e6b297104fa628a702ea75b314bba SHA256 2379c386d42492924e75b1517d0f89f86206cf2733fb245f9a9528a0dc3a4787
+MD5 70abf438d09b4b589b732ca8bd6b9a69 files/ucblogo-5.5-no-emacs.patch 1035
+RMD160 98b365589332f9c6ec3cb3680f571fb3a04c4cc7 files/ucblogo-5.5-no-emacs.patch 1035
+SHA256 2379c386d42492924e75b1517d0f89f86206cf2733fb245f9a9528a0dc3a4787 files/ucblogo-5.5-no-emacs.patch 1035
 DIST ucblogo-5.5.tar.gz 1290273 RMD160 f1e3adf901c0641b12bb5905860af4d77b46eef9 SHA1 77445ae2328e39f3ea84bf8faa6170a1c1baa55a SHA256 a2922e065113274dd701ba3b03448134cceb047f3d6cadbe5322e23061e2ff9d
-EBUILD ucblogo-5.5.ebuild 917 RMD160 5859d80a27e4f6c5ce6bf790e223f8f7ea0461d9 SHA1 16dcb6b1d96c3246456dfc598c00466035e8e1b1 SHA256 149d5bbb9715e1120cf2c62206000b6d215526a92ff6b88905d12bb671cfa120
-MD5 e735e9fa61560b3d6db8ff33a6b3fa4f ucblogo-5.5.ebuild 917
-RMD160 5859d80a27e4f6c5ce6bf790e223f8f7ea0461d9 ucblogo-5.5.ebuild 917
-SHA256 149d5bbb9715e1120cf2c62206000b6d215526a92ff6b88905d12bb671cfa120 ucblogo-5.5.ebuild 917
-MISC ChangeLog 778 RMD160 01ff804e0a0febefcf6a04ae24827641c0c0d08b SHA1 1b91b955d5d27e14e3f447758400fa363797a0fc SHA256 400ebd60aca60dc6245fd420eed419d2907811669434f8c8eff62fffd5fe87a7
-MD5 bb68eeaf2ae4e2248cc634989ce9ab94 ChangeLog 778
-RMD160 01ff804e0a0febefcf6a04ae24827641c0c0d08b ChangeLog 778
-SHA256 400ebd60aca60dc6245fd420eed419d2907811669434f8c8eff62fffd5fe87a7 ChangeLog 778
-MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
-MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
-RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
-SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 metadata.xml 210
+EBUILD ucblogo-5.5.ebuild 970 RMD160 c7dfe6276def48b253157b06e04ff02ad8163407 SHA1 1ff62ec4ccbcc72d0b521cb2c531df6fcbabdf2d SHA256 c48e319a18c03a64f6416573b6d38fad6c5eff33a29c5e143c12856f484d6674
+MD5 d68a8955b3d3e4abc6e49775e19476ca ucblogo-5.5.ebuild 970
+RMD160 c7dfe6276def48b253157b06e04ff02ad8163407 ucblogo-5.5.ebuild 970
+SHA256 c48e319a18c03a64f6416573b6d38fad6c5eff33a29c5e143c12856f484d6674 ucblogo-5.5.ebuild 970
+MISC ChangeLog 946 RMD160 88625a2af45f8aef67261ea4e9e6428974d69453 SHA1 9e1ef442841bbbab83b1505459203e70563f0bec SHA256 8990e2cbb1bc8098fc5038b96752553a326cd52f4fc383ef0736d8adee72fda5
+MD5 bd1a82b49610958bda0eab87c1d19c83 ChangeLog 946
+RMD160 88625a2af45f8aef67261ea4e9e6428974d69453 ChangeLog 946
+SHA256 8990e2cbb1bc8098fc5038b96752553a326cd52f4fc383ef0736d8adee72fda5 ChangeLog 946
+MISC metadata.xml 675 RMD160 5842c7519ead360fc810ae76f8ceb91ec6e931e7 SHA1 147551df2a38bc7eff756f3a9302c59d372c87a6 SHA256 5a1d21493fbeb97b176265c9937a3d60eabff13960ccda1b9dbdb2371f4f91d1
+MD5 45622ded96e0bd4c5795b3427472dddd metadata.xml 675
+RMD160 5842c7519ead360fc810ae76f8ceb91ec6e931e7 metadata.xml 675
+SHA256 5a1d21493fbeb97b176265c9937a3d60eabff13960ccda1b9dbdb2371f4f91d1 metadata.xml 675
 MD5 6eacc358649bd87cc1791cbb83b36f08 files/digest-ucblogo-5.5 238
 RMD160 42a94239f5e59328cc27c0109b4e0a750b2e9bc6 files/digest-ucblogo-5.5 238
 SHA256 fffbc4decbc5e1c5dfd736d8cd8c7799bdfb6c71790faa132ed17fd4a4e9a46a files/digest-ucblogo-5.5 238
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
 }