Fixed broken doc generation with USE=-glut (fixes bug #200914).

Package-Manager: portage-2.1.4_rc9

5 files changed, 36 insertions, 38 deletions

diff --git a/sci-mathematics/yacas/ChangeLog b/sci-mathematics/yacas/ChangeLog
index d8a532cbd591..13c004e660f0 100644
--- a/sci-mathematics/yacas/ChangeLog
+++ b/sci-mathematics/yacas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/yacas
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.18 2007/11/07 23:26:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.19 2007/12/13 11:31:32 markusle Exp $
+
+  13 Dec 2007; Markus Dittrich <markusle@gentoo.org> yacas-1.0.61.ebuild,
+  yacas-1.0.63.ebuild:
+  Fixed broken doc generation with USE="-glut" (fixes bug #200914).
 
 *yacas-1.2.2 (07 Nov 2007)
 
diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest
index 148a5aa4e610..9064906d0675 100644
--- a/sci-mathematics/yacas/Manifest
+++ b/sci-mathematics/yacas/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX yacas-1.0.63-as-needed.patch 1081 RMD160 678c823fff9d720be1662c60c8dbea4b30bbbaeb SHA1 bacfb031a77068a0e749c5f7714e75ba060a15e3 SHA256 d0db20ee97ea3be043eb8c49413372c380916804311fdd9ac288eb02b54780c4
 MD5 5a16ae5b3114d0fd547951b1fcbea891 files/yacas-1.0.63-as-needed.patch 1081
 RMD160 678c823fff9d720be1662c60c8dbea4b30bbbaeb files/yacas-1.0.63-as-needed.patch 1081
@@ -9,26 +6,26 @@ DIST yacas-1.0.61.tar.gz 2106778 RMD160 b2f83a169f4b7eedd834391cdc32f1eaf0b7fa97
 DIST yacas-1.0.63.tar.gz 2145848 RMD160 7a17c88756874a245eba7961d19b73d4fc45a840 SHA1 d6c73390f9562a5f5b1bc572119431006daf988a SHA256 6dca2c9b6a15720e231dbe2f379277c46e75c2732fb2cee3fb40ad92904830db
 DIST yacas-1.1.0.tar.gz 1918265 RMD160 8dbec2086fd9fffb5c1abfa7bcfde7c30318e6b0 SHA1 a9fb6c3e783082642508e70692dc9b697141e8d8 SHA256 c55e2d58fca55beac12c31e2499dd2dcaa1e3b6a47a0645778825226d121d981
 DIST yacas-1.2.2.tar.gz 1203303 RMD160 6c49ca60e4f1f92e7d30e8d91b6126e55d77321b SHA1 8e753c22c207a5aa5e9fd2a9d519605d5b73d5b9 SHA256 e8345de267ed41790128649e3ff5ab7be7d0a2fa6e721b82e0a552c04775aab6
-EBUILD yacas-1.0.61.ebuild 1503 RMD160 939d747f6864a9d1764477c86b78d7ae920f908a SHA1 711d311e24b78b892283856907e72a3bbdae92bb SHA256 6931da5c5de1ebf99e9f68c8d943001145536614d0a4f7b9b934ca76450eec23
-MD5 cb65c1a156669d78ed617476a0950ec0 yacas-1.0.61.ebuild 1503
-RMD160 939d747f6864a9d1764477c86b78d7ae920f908a yacas-1.0.61.ebuild 1503
-SHA256 6931da5c5de1ebf99e9f68c8d943001145536614d0a4f7b9b934ca76450eec23 yacas-1.0.61.ebuild 1503
-EBUILD yacas-1.0.63.ebuild 1697 RMD160 c1362c5b8c9903f8f1fd41b26663cd6da8e4adbd SHA1 b8129b2ae529ffa3eb9595544f2327705de9e96c SHA256 a23b17226f164f78974b4117dad7d83a312824a2fb4cdb47e17fab9dd0853943
-MD5 d00c1a0d6b88773ae8b23616fba23061 yacas-1.0.63.ebuild 1697
-RMD160 c1362c5b8c9903f8f1fd41b26663cd6da8e4adbd yacas-1.0.63.ebuild 1697
-SHA256 a23b17226f164f78974b4117dad7d83a312824a2fb4cdb47e17fab9dd0853943 yacas-1.0.63.ebuild 1697
-EBUILD yacas-1.1.0.ebuild 1708 RMD160 cd122a6e212380b9e7901be9016f09f932102859 SHA1 f4620eb05f6f938ef8d73801e0982cc7f4072d7f SHA256 e1b38bc3d9b0284d46035667f089cf521175290bec9b99033ba9d4243aa45444
-MD5 2851f8730ca0a60526b062e5524ad5f8 yacas-1.1.0.ebuild 1708
-RMD160 cd122a6e212380b9e7901be9016f09f932102859 yacas-1.1.0.ebuild 1708
-SHA256 e1b38bc3d9b0284d46035667f089cf521175290bec9b99033ba9d4243aa45444 yacas-1.1.0.ebuild 1708
+EBUILD yacas-1.0.61.ebuild 1626 RMD160 68dfe945b22d2b62fb8a5b91cb36ab02fed9a6e9 SHA1 f0472274e4594556624464906ab0ace5a3d0e6ae SHA256 d8e4997f464c6d5fc9f7accef64698c8605afbcf3538899f97d6fdd3440e02bc
+MD5 66e1abef53e2323e07f14341258e8d8c yacas-1.0.61.ebuild 1626
+RMD160 68dfe945b22d2b62fb8a5b91cb36ab02fed9a6e9 yacas-1.0.61.ebuild 1626
+SHA256 d8e4997f464c6d5fc9f7accef64698c8605afbcf3538899f97d6fdd3440e02bc yacas-1.0.61.ebuild 1626
+EBUILD yacas-1.0.63.ebuild 1811 RMD160 0c4b6a36ca3d402a1d5922521e596c29ec4b486b SHA1 4937fecd299494c7a30f7ae833e2063591609f8e SHA256 ae2f144af0ac7d2e842df1c61b18c99e7b1ffee4834869b28e7283d2429ac141
+MD5 de93fdbca1dff738504122561d7edca5 yacas-1.0.63.ebuild 1811
+RMD160 0c4b6a36ca3d402a1d5922521e596c29ec4b486b yacas-1.0.63.ebuild 1811
+SHA256 ae2f144af0ac7d2e842df1c61b18c99e7b1ffee4834869b28e7283d2429ac141 yacas-1.0.63.ebuild 1811
+EBUILD yacas-1.1.0.ebuild 1697 RMD160 89b9b6cc87a29292dad83db576222789e7a9cddf SHA1 3937484e2495342aa2d731053d7b045b738584d5 SHA256 e33a692c5f7106a46844551590a60ca5a565051f800234e10e5245300594d872
+MD5 4e02c323869d47d44aba36905cd1eebd yacas-1.1.0.ebuild 1697
+RMD160 89b9b6cc87a29292dad83db576222789e7a9cddf yacas-1.1.0.ebuild 1697
+SHA256 e33a692c5f7106a46844551590a60ca5a565051f800234e10e5245300594d872 yacas-1.1.0.ebuild 1697
 EBUILD yacas-1.2.2.ebuild 1162 RMD160 46eab0f5a133b8a0f6fd78bea3a761f65cb9a018 SHA1 a2e1a8e4aac8c944fbc775a37ad1b951a7370cdc SHA256 550f0ddea68673b13379ff3a75f076491a0300d77219be39909d57a19ef6a1c0
 MD5 7daff9dd36b6847a4893b51f109b5bf7 yacas-1.2.2.ebuild 1162
 RMD160 46eab0f5a133b8a0f6fd78bea3a761f65cb9a018 yacas-1.2.2.ebuild 1162
 SHA256 550f0ddea68673b13379ff3a75f076491a0300d77219be39909d57a19ef6a1c0 yacas-1.2.2.ebuild 1162
-MISC ChangeLog 4678 RMD160 8b541c5e90ceabf64f5338c31dac643bdc47b219 SHA1 33da77679a5b7400483e01ea0203a4ae2564b2ea SHA256 0c305673350e67f692d6f9caa08c939f3f63efe045e7987e44db9f1318b1c1d1
-MD5 f0dba2caec1a1a0e06932cdf6999fe88 ChangeLog 4678
-RMD160 8b541c5e90ceabf64f5338c31dac643bdc47b219 ChangeLog 4678
-SHA256 0c305673350e67f692d6f9caa08c939f3f63efe045e7987e44db9f1318b1c1d1 ChangeLog 4678
+MISC ChangeLog 4844 RMD160 3ba1e09679905d8d383a16d0fc828d25af63c026 SHA1 7c44db0b881fd34cf5d377dc09c59eaf743f76f5 SHA256 f6a73cc319f57fd80d4d3cb3f33b3408f807764ce7dfc24a60b330d0cb31bfde
+MD5 01b079a9a85261d45da639046ebdebd5 ChangeLog 4844
+RMD160 3ba1e09679905d8d383a16d0fc828d25af63c026 ChangeLog 4844
+SHA256 f6a73cc319f57fd80d4d3cb3f33b3408f807764ce7dfc24a60b330d0cb31bfde ChangeLog 4844
 MISC metadata.xml 565 RMD160 d5113fe8e26abda2ffef0f7f145ab6068bf7d134 SHA1 40fa0a98ccd10ea8ad9d7cee9de750d7b90defa0 SHA256 f908bd3449e5f9e6f65315c555592e1cea8e91f455cb32b37f8391f7e763e72a
 MD5 902cccbbb4b982c531b7d832e8ac3d7c metadata.xml 565
 RMD160 d5113fe8e26abda2ffef0f7f145ab6068bf7d134 metadata.xml 565
@@ -45,10 +42,3 @@ SHA256 5ad8a3fdefaa88482059aa9936c7a5f59d240934b38b273b0052c35a428a92ab files/di
 MD5 7fd0dc7261c3cbf0080776fb444678c0 files/digest-yacas-1.2.2 238
 RMD160 64c4a4a65202565ec7e4df657cbc2bc78ac70c10 files/digest-yacas-1.2.2 238
 SHA256 c66e86f03449377bf4cc2285527cdd53ffeffe189217fed31dbcfce66ff0f2e9 files/digest-yacas-1.2.2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFHMkmY1ycZbhPLE2ARAs44AJ90qj0mQBOXpjgyxo+Y1dWvpUcNygCgliYH
-F0rx/25avW6OocvfpxD6AXo=
-=XUA0
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/yacas/yacas-1.0.61.ebuild b/sci-mathematics/yacas/yacas-1.0.61.ebuild
index 1d790bf87554..60785097170a 100644
--- a/sci-mathematics/yacas/yacas-1.0.61.ebuild
+++ b/sci-mathematics/yacas/yacas-1.0.61.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/sci-mathematics/yacas/yacas-1.0.61.ebuild,v 1.3 2006/04/18 03:59:36 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.0.61.ebuild,v 1.4 2007/12/13 11:31:32 markusle Exp $
 
 inherit eutils flag-o-matic
 
@@ -23,9 +23,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	if ! use glut; then
-		sed -e 's:opengl::g' -i plugins/Makefile.in || die "sed (opengl) failed"
-		sed -e 's/\(^PLUGINDOCSCHAPTERS.*\)opengl.chapt\(.*\)/\1 \2/' -i \
+		sed -e "s:opengl::g" -i plugins/Makefile.in || die "sed (opengl) failed"
+		sed -e "s/\(^PLUGINDOCSCHAPTERS.*\)opengl.chapt\(.*\)/\1 \2/" -i \
 		manmake/Makefile.in || die 'sed (manmake) failed'
+		sed -e "s:\*INCLUDE opengl.chapt::" \
+			-i manmake/plugin-docs.chapt.txt \
+			|| die "failed to fix plugin-doc.chapt"
 	fi
 }
 
diff --git a/sci-mathematics/yacas/yacas-1.0.63.ebuild b/sci-mathematics/yacas/yacas-1.0.63.ebuild
index 5e07eb2dad58..1fd79b9213eb 100644
--- a/sci-mathematics/yacas/yacas-1.0.63.ebuild
+++ b/sci-mathematics/yacas/yacas-1.0.63.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/sci-mathematics/yacas/yacas-1.0.63.ebuild,v 1.4 2007/07/18 02:16:06 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.0.63.ebuild,v 1.5 2007/12/13 11:31:32 markusle Exp $
 
 inherit autotools eutils flag-o-matic
 
@@ -25,10 +25,13 @@ src_unpack() {
 	cd "${S}"
 
 	if ! use glut; then
-		sed -e 's:opengl::g' -i plugins/Makefile.am || \
+		sed -e "s:opengl::g" -i plugins/Makefile.am || \
 			die "sed (opengl) failed"
-		sed -e 's/\(^PLUGINDOCSCHAPTERS.*\)opengl.chapt\(.*\)/\1 \2/' -i \
-		manmake/Makefile.am || die 'sed (manmake) failed'
+		sed -e "s:\(^PLUGINDOCSCHAPTERS.*\)opengl.chapt\(.*\):\1 \2:" \
+			-i manmake/Makefile.am || die 'sed (manmake) failed'
+		sed -e "s:\*INCLUDE opengl.chapt::" \
+			-i manmake/plugin-docs.chapt.txt \
+			|| die "failed to fix plugin-doc.chapt"
 	fi
 
 	epatch "${FILESDIR}"/${P}-as-needed.patch
@@ -50,7 +53,6 @@ src_compile() {
 }
 
 src_install() {
-	cd "${S}"
 	make DESTDIR="${D}" install-strip || die
 
 	dodoc AUTHORS INSTALL NEWS README TODO
diff --git a/sci-mathematics/yacas/yacas-1.1.0.ebuild b/sci-mathematics/yacas/yacas-1.1.0.ebuild
index c3daf81d74a2..85c293f45e7a 100644
--- a/sci-mathematics/yacas/yacas-1.1.0.ebuild
+++ b/sci-mathematics/yacas/yacas-1.1.0.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/sci-mathematics/yacas/yacas-1.1.0.ebuild,v 1.1 2007/08/10 18:00:16 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.1.0.ebuild,v 1.2 2007/12/13 11:31:32 markusle Exp $
 
 inherit autotools eutils flag-o-matic
 
@@ -50,7 +50,6 @@ src_compile() {
 }
 
 src_install() {
-	cd "${S}"
 	make DESTDIR="${D}" install-strip || die
 
 	dodoc AUTHORS INSTALL NEWS README TODO