From cbe0aacc8397f6f0cb1f757d3482f158626d0f9f Mon Sep 17 00:00:00 2001 From: Alastair Tse Date: Mon, 15 Nov 2004 21:22:45 +0000 Subject: [PATCH] added simple patch to get around parallel make problems with mkdir and ln (#70832) --- gnome-extra/yelp/ChangeLog | 7 ++++- gnome-extra/yelp/Manifest | 23 +++++++++++----- .../yelp/files/yelp-2.6.4-makedepfix.patch | 26 +++++++++++++++++++ gnome-extra/yelp/yelp-2.6.4.ebuild | 10 +++++-- 4 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 gnome-extra/yelp/files/yelp-2.6.4-makedepfix.patch diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog index e27f874a9800..5b53c2ae591b 100644 --- a/gnome-extra/yelp/ChangeLog +++ b/gnome-extra/yelp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/yelp # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.71 2004/11/12 10:10:16 obz Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.72 2004/11/15 21:22:45 liquidx Exp $ + + 15 Nov 2004; Alastair Tse + +files/yelp-2.6.4-makedepfix.patch, yelp-2.6.4.ebuild: + added simple patch to get around parallel make problems with mkdir and ln + (#70832) 12 Nov 2004; Mike Gardiner yelp-2.6.4.ebuild: Keyworded ppc for GNOME 2.8 diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest index b281881ad2e1..b4276e939593 100644 --- a/gnome-extra/yelp/Manifest +++ b/gnome-extra/yelp/Manifest @@ -1,13 +1,24 @@ -MD5 c3430c1f77e0d42617cae1489b026a8d yelp-2.6.2.ebuild 832 -MD5 4716de329c4579b9fadf6409c54e3302 yelp-2.6.4.ebuild 836 -MD5 b4cb69462935c76edc31011d08891dc3 yelp-2.6.1.ebuild 845 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 a570f1de98be92d2cc980aa0a971a159 ChangeLog 7481 +MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 97600b6d525fd83fba6d93093bf68414 yelp-2.4.2.ebuild 870 MD5 a38c7463d391798f7dc298910048dc15 yelp-2.6.0.ebuild 845 -MD5 71dc7b05f659be041d7cfb3a8c6ee697 ChangeLog 7283 -MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 b4cb69462935c76edc31011d08891dc3 yelp-2.6.1.ebuild 845 +MD5 c3430c1f77e0d42617cae1489b026a8d yelp-2.6.2.ebuild 832 +MD5 730d7ba0384b26244f3e0b7897b854a2 yelp-2.6.4.ebuild 928 MD5 5c3187494762706268a83d298ed70ed1 files/digest-yelp-2.4.2 63 MD5 df2c88704653695b75b2962b83153d05 files/digest-yelp-2.6.0 63 MD5 8df713e174b2fc332eef4bdc2710a14a files/digest-yelp-2.6.1 63 MD5 b3f4bb2439f62b72847b6ed744fcffbe files/digest-yelp-2.6.2 63 -MD5 3cc5005ee15816000841f6abfa15e909 files/digest-yelp-2.6.4 63 MD5 d3fa3016a8d381dc0bd303a75bc88538 files/yelp-2-speed_fix.patch 14137 +MD5 3cc5005ee15816000841f6abfa15e909 files/digest-yelp-2.6.4 63 +MD5 d13c2fbe43ee623230084d6f7bd6ec25 files/yelp-2.6.4-makedepfix.patch 948 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFBmR67Rkyva5PS18kRAp5FAKDH68iYJL+2zgKorA6vxfHZvcVMowCgijg8 ++7cZ/DoD44v0Ns2+VlkWFKU= +=qcJW +-----END PGP SIGNATURE----- diff --git a/gnome-extra/yelp/files/yelp-2.6.4-makedepfix.patch b/gnome-extra/yelp/files/yelp-2.6.4-makedepfix.patch new file mode 100644 index 000000000000..3d4023a91165 --- /dev/null +++ b/gnome-extra/yelp/files/yelp-2.6.4-makedepfix.patch @@ -0,0 +1,26 @@ +diff -ur yelp-2.6.4/src/Makefile.am yelp-2.6.4.new/src/Makefile.am +--- yelp-2.6.4/src/Makefile.am 2004-01-12 02:07:04.000000000 +0000 ++++ yelp-2.6.4.new/src/Makefile.am 2004-11-15 19:12:07.990444240 +0000 +@@ -17,7 +17,7 @@ + noinst_PROGRAMS = test-man-parser test-pager + + install-exec-local: +- rm -f $(DESTDIR)$(bindir)/gnome-help ++ rm -f $(DESTDIR)$(bindir)/gnome-help; \ + ln -s yelp $(DESTDIR)$(bindir)/gnome-help + + yelp-marshal.h: yelp-marshal.list +Only in yelp-2.6.4.new/src: Makefile.am~ +diff -ur yelp-2.6.4/src/Makefile.in yelp-2.6.4.new/src/Makefile.in +--- yelp-2.6.4/src/Makefile.in 2004-10-12 05:56:21.000000000 +0100 ++++ yelp-2.6.4.new/src/Makefile.in 2004-11-15 19:12:30.534017096 +0000 +@@ -556,7 +556,7 @@ + + + install-exec-local: +- rm -f $(DESTDIR)$(bindir)/gnome-help ++ rm -f $(DESTDIR)$(bindir)/gnome-help; \ + ln -s yelp $(DESTDIR)$(bindir)/gnome-help + + yelp-marshal.h: yelp-marshal.list +Only in yelp-2.6.4.new/src: Makefile.in~ diff --git a/gnome-extra/yelp/yelp-2.6.4.ebuild b/gnome-extra/yelp/yelp-2.6.4.ebuild index 692a7585b8a9..24e1d0444116 100644 --- a/gnome-extra/yelp/yelp-2.6.4.ebuild +++ b/gnome-extra/yelp/yelp-2.6.4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.6.4.ebuild,v 1.5 2004/11/12 10:10:16 obz Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.6.4.ebuild,v 1.6 2004/11/15 21:22:45 liquidx Exp $ -inherit gnome2 +inherit gnome2 eutils DESCRIPTION="Help browser for GNOME" HOMEPAGE="http://www.gnome.org/" @@ -31,3 +31,9 @@ DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0" DOCS="AUTHORS ChangeLog NEWS README TODO" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-makedepfix.patch +} \ No newline at end of file -- 2.26.2