Fix wisent compilation, bug #183205.

Package-Manager: portage-2.1.3_rc5

4 files changed, 34 insertions, 13 deletions

diff --git a/app-emacs/cedet/ChangeLog b/app-emacs/cedet/ChangeLog
index fb439860ec2f..0a1caf8aaee9 100644
--- a/app-emacs/cedet/ChangeLog
+++ b/app-emacs/cedet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/cedet
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.24 2007/06/26 07:59:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.25 2007/06/27 04:36:38 ulm Exp $
+
+  27 Jun 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/1.0_pre4-semantic-makefile.patch, cedet-1.0_pre4.ebuild:
+  Fix wisent compilation, bug #183205, reported by Martin von Gagern
+  <Martin.vGagern@gmx.net>.
 
 *cedet-1.0_pre4 (23 Jun 2007)
 
diff --git a/app-emacs/cedet/Manifest b/app-emacs/cedet/Manifest
index dd7d1654dcfd..c4c524cdb2a2 100644
--- a/app-emacs/cedet/Manifest
+++ b/app-emacs/cedet/Manifest
@@ -13,6 +13,10 @@ AUX 1.0_pre3-sb-info-circular-dep-gentoo.patch 366 RMD160 34db6a890982d4023051f5
 MD5 916b79c8b07d0ab1479e19a5e617f2d3 files/1.0_pre3-sb-info-circular-dep-gentoo.patch 366
 RMD160 34db6a890982d4023051f51ee3fd1648e1964dda files/1.0_pre3-sb-info-circular-dep-gentoo.patch 366
 SHA256 8804c2850ad211a0c57303d4f2d02fe3326a380f9f6fa24390a8b410178a0b34 files/1.0_pre3-sb-info-circular-dep-gentoo.patch 366
+AUX 1.0_pre4-semantic-makefile.patch 328 RMD160 a1e9138bd702e86dc27f96b2213b2ee27de4557b SHA1 6e6eb3df3950f8ff641963c376f1ac645aa95207 SHA256 10762713fdf70ead30ad77bd809be22335fc94544461963e6b6f6dfd87ecabc4
+MD5 859facb7c1d8446f92b74c20e664c83a files/1.0_pre4-semantic-makefile.patch 328
+RMD160 a1e9138bd702e86dc27f96b2213b2ee27de4557b files/1.0_pre4-semantic-makefile.patch 328
+SHA256 10762713fdf70ead30ad77bd809be22335fc94544461963e6b6f6dfd87ecabc4 files/1.0_pre4-semantic-makefile.patch 328
 AUX 60cedet-gentoo.el 263 RMD160 b63ecadb4d1e9261f12d5c6b76349aaa06c2a60d SHA1 bb50e89f4188dea6a3e448e71d32b4e9b9bf9ebe SHA256 1a7c1c2a570c2e3d5424978c304bdc7f3f468003e4b4cb8881887d8e7fa0ca86
 MD5 a070e39802eeece0cd8c0bf82727f2f2 files/60cedet-gentoo.el 263
 RMD160 b63ecadb4d1e9261f12d5c6b76349aaa06c2a60d files/60cedet-gentoo.el 263
@@ -23,14 +27,14 @@ EBUILD cedet-1.0_pre3-r2.ebuild 1866 RMD160 c176ff148b651f0237028a958f8b745ac4b2
 MD5 2e7902afc1392a79caaf32acf28b7185 cedet-1.0_pre3-r2.ebuild 1866
 RMD160 c176ff148b651f0237028a958f8b745ac4b2d136 cedet-1.0_pre3-r2.ebuild 1866
 SHA256 93c4977f7ca9f9386e9a528134ca2ea09f4d73972838a56ee1f15127a99d56a9 cedet-1.0_pre3-r2.ebuild 1866
-EBUILD cedet-1.0_pre4.ebuild 1747 RMD160 edeb25ad44c86d8940c07a78e4b165fec002aade SHA1 64c45069e33e3113f9f19534e8f5a062bb82781e SHA256 285cb63e5c738731cde5c02e13aaa14b2f53a6a3599e05490dded7120e5466c4
-MD5 d88756f4d6bde624eaf9e15816de57a6 cedet-1.0_pre4.ebuild 1747
-RMD160 edeb25ad44c86d8940c07a78e4b165fec002aade cedet-1.0_pre4.ebuild 1747
-SHA256 285cb63e5c738731cde5c02e13aaa14b2f53a6a3599e05490dded7120e5466c4 cedet-1.0_pre4.ebuild 1747
-MISC ChangeLog 3245 RMD160 4375a6116686533b50c52e89cadebc19ee7f302e SHA1 2c4e003c1b56b09e8de19261f56ff69e2cffd7c7 SHA256 e1268e13e767216f48ee5ecf46620d82e031687c6e73032e7db499bc31310fb8
-MD5 3a7db78fd42d27022b57f97b9c4972bb ChangeLog 3245
-RMD160 4375a6116686533b50c52e89cadebc19ee7f302e ChangeLog 3245
-SHA256 e1268e13e767216f48ee5ecf46620d82e031687c6e73032e7db499bc31310fb8 ChangeLog 3245
+EBUILD cedet-1.0_pre4.ebuild 1817 RMD160 46a859c05f1493d5173813e38bb43f6cc39454d7 SHA1 a748989463ea1c720cdf75cc469bea4a980d58c6 SHA256 4d7145f6c5a7d15b1d5413d3c901889fb2e9588bfdae5f8aea335b54fcf038cc
+MD5 9f91a98369bdb8eccc097771f4daf97f cedet-1.0_pre4.ebuild 1817
+RMD160 46a859c05f1493d5173813e38bb43f6cc39454d7 cedet-1.0_pre4.ebuild 1817
+SHA256 4d7145f6c5a7d15b1d5413d3c901889fb2e9588bfdae5f8aea335b54fcf038cc cedet-1.0_pre4.ebuild 1817
+MISC ChangeLog 3456 RMD160 801929676ac0c64cd83985944bc500dfc852d35f SHA1 7ad249dd51b4057bd96366e91f5c9b76347fc613 SHA256 3972d49117a08df8640437d6426ffab097545c9dcc4ce3228965f7a4d9566a2d
+MD5 4054d05a2fc0e6c16aa39ee28a6ab6aa ChangeLog 3456
+RMD160 801929676ac0c64cd83985944bc500dfc852d35f ChangeLog 3456
+SHA256 3972d49117a08df8640437d6426ffab097545c9dcc4ce3228965f7a4d9566a2d ChangeLog 3456
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -44,7 +48,7 @@ SHA256 aa2b607eb563e0c904a4375724f113f4d688104e01f5d1297160e11b1319993f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGgMdkOeoy/oIi7uwRArXSAJ96j7S0aoXQ+YtH3gKzzqRaszFI/QCggLn+
-gV1oasU+v+t56TwWAKTKFcE=
-=3yMs
+iD8DBQFGgelZOeoy/oIi7uwRAl45AKCDHMiN5iGJz0QeMrxhWzS4GuB0HwCcD0bU
+91n9e9QhX/ieOuubXharVoM=
+=5mUv
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/cedet/cedet-1.0_pre4.ebuild b/app-emacs/cedet/cedet-1.0_pre4.ebuild
index 539bc358e525..b604040009cf 100644
--- a/app-emacs/cedet/cedet-1.0_pre4.ebuild
+++ b/app-emacs/cedet/cedet-1.0_pre4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre4.ebuild,v 1.3 2007/06/26 07:59:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre4.ebuild,v 1.4 2007/06/27 04:36:38 ulm Exp $
 
 inherit elisp eutils versionator
 
@@ -26,6 +26,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/1.0_pre3-eieio-tests-gentoo.patch" # Bug #124598
+	epatch "${FILESDIR}/1.0_pre4-semantic-makefile.patch"  # Bug #183205
 }
 
 src_compile() {
diff --git a/app-emacs/cedet/files/1.0_pre4-semantic-makefile.patch b/app-emacs/cedet/files/1.0_pre4-semantic-makefile.patch
new file mode 100644
index 000000000000..c297c420d764
--- /dev/null
+++ b/app-emacs/cedet/files/1.0_pre4-semantic-makefile.patch
@@ -0,0 +1,11 @@
+--- cedet-1.0pre4/semantic/Makefile~	2007-06-06 04:00:10.000000000 +0200
++++ cedet-1.0pre4/semantic/Makefile	2007-06-27 00:45:06.000000000 +0200
+@@ -114,7 +114,7 @@
+ 	"$(EMACS)" -batch --no-site-file -l $@-compile-script -f batch-byte-compile $^
+ 
+ .PHONY:wisent
+-wisent:
++wisent: bovinator
+ 	cd wisent; $(MAKE)
+ 
+ .PHONY:Tests