Correct paths in *.RUNME files, put manuals in /usr/share/man instead of /usr/man

(Portage version: 2.0.53_rc7)

5 files changed, 370 insertions, 18 deletions

diff --git a/media-libs/openinventor/ChangeLog b/media-libs/openinventor/ChangeLog
index cfc9be69eccf..6a3f87c82157 100644
--- a/media-libs/openinventor/ChangeLog
+++ b/media-libs/openinventor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/openinventor
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/ChangeLog,v 1.4 2005/11/15 03:10:39 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/ChangeLog,v 1.5 2005/11/15 13:13:40 stefaan Exp $
+
+*openinventor-2.1.5.10-r1 (15 Nov 2005)
+
+  15 Nov 2005; Stefaan De Roeck <stefaan@gentoo.org>
+  +files/gentoo-paths-v2.patch, +openinventor-2.1.5.10-r1.ebuild:
+  Correct paths in *.RUNME files, put manuals in /usr/share/man instead of
+  /usr/man
 
   15 Nov 2005; Chris White <chriswhite@gentoo.org>
   openinventor-2.1.5.10.ebuild:
diff --git a/media-libs/openinventor/Manifest b/media-libs/openinventor/Manifest
index d4c5f6329e99..ed272da56f15 100644
--- a/media-libs/openinventor/Manifest
+++ b/media-libs/openinventor/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0f7895c10f859b7a86f1df293a1e602b metadata.xml 515
 MD5 bc832000ca1d8d90e0f82705eb8035a8 ChangeLog 970
-MD5 39738f9ae7ef1748109ec7ed2cbbe5ae openinventor-2.1.5.10.ebuild 2404
-MD5 43d9fc3b8d7b147ca5378116eb24d558 files/gentoo-paths.patch 10582
-MD5 bd1dcb17d80481152c4856c899b21144 files/gcc4-support.patch 4155
+MD5 8ce8331fdab79fb938507af45228210f files/digest-openinventor-2.1.5.10 74
+MD5 8ce8331fdab79fb938507af45228210f files/digest-openinventor-2.1.5.10-r1 74
 MD5 481f4b44d5f9f6b9af804116c4d2bcc0 files/freetype2-activate.patch 261
-MD5 3514d32986d95c1a1edd9c8503913121 files/support-archs.patch 1116
 MD5 1a742e312c436314783b6b91b8a485d4 files/freetype2-includes.patch 291
-MD5 8ce8331fdab79fb938507af45228210f files/digest-openinventor-2.1.5.10 74
-MD5 3b720d5d1e432dec6ec597f5391caef1 files/use-byacc.patch 1444
+MD5 bd1dcb17d80481152c4856c899b21144 files/gcc4-support.patch 4155
+MD5 0bcb529884efc8c3d353d9c74723bd8f files/gentoo-paths-v2.patch 10940
+MD5 43d9fc3b8d7b147ca5378116eb24d558 files/gentoo-paths.patch 10582
 MD5 e44139ff4ff396e391630ccff2cab27b files/no-csh.patch 1053
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDeVHAFdQwWVoAgN4RAm8DAKD8aMY5K2rsxtIbnJA1RmYA2WAdAQCglrEP
-t6ngbtTTiGhR19VaIkRB2gE=
-=wENk
------END PGP SIGNATURE-----
+MD5 3514d32986d95c1a1edd9c8503913121 files/support-archs.patch 1116
+MD5 3b720d5d1e432dec6ec597f5391caef1 files/use-byacc.patch 1444
+MD5 0f7895c10f859b7a86f1df293a1e602b metadata.xml 515
+MD5 cb7e69acc928dc6c9c0ab7567e62109c openinventor-2.1.5.10-r1.ebuild 2657
+MD5 39738f9ae7ef1748109ec7ed2cbbe5ae openinventor-2.1.5.10.ebuild 2404
diff --git a/media-libs/openinventor/files/digest-openinventor-2.1.5.10-r1 b/media-libs/openinventor/files/digest-openinventor-2.1.5.10-r1
new file mode 100644
index 000000000000..95d1053b6fb2
--- /dev/null
+++ b/media-libs/openinventor/files/digest-openinventor-2.1.5.10-r1
@@ -0,0 +1 @@
+MD5 82208096f1e0b111160e864e239c3a51 inventor-2.1.5-10.src.tar.gz 8282780
diff --git a/media-libs/openinventor/files/gentoo-paths-v2.patch b/media-libs/openinventor/files/gentoo-paths-v2.patch
new file mode 100644
index 000000000000..17e943c4d6ee
--- /dev/null
+++ b/media-libs/openinventor/files/gentoo-paths-v2.patch
@@ -0,0 +1,261 @@
+diff -ur ../1/inventor/apps/demos/SceneViewer/SoSceneViewer.c++ ./inventor/apps/demos/SceneViewer/SoSceneViewer.c++
+--- ../1/inventor/apps/demos/SceneViewer/SoSceneViewer.c++	2003-06-11 03:20:09.000000000 +0200
++++ ./inventor/apps/demos/SceneViewer/SoSceneViewer.c++	2005-11-15 13:33:06.000000000 +0100
+@@ -4734,10 +4734,10 @@
+ //
+ ////////////////////////////////////////////////////////////////////////
+ {
+-    if (access(IVPREFIX "/demos/Inventor/SceneViewer.about", R_OK) != 0)
++    if (access(IVPREFIX "/share/openinventor/demos/Inventor/SceneViewer.about", R_OK) != 0)
+     {
+ 	system("xmessage 'Sorry, could not find "
+-	       IVPREFIX "/demos/Inventor/SceneViewer.about' > /dev/null");
++	       IVPREFIX "/share/openinventor/demos/Inventor/SceneViewer.about' > /dev/null");
+ 	return;
+     }
+ 
+@@ -4753,7 +4753,7 @@
+     }
+ 
+     sprintf(command, "acroread "
+-            IVPREFIX "/demos/Inventor/SceneViewer.about &");
++            IVPREFIX "/share/openinventor/demos/Inventor/SceneViewer.about &");
+     system(command);
+ }
+ 
+diff -ur ../1/inventor/apps/demos/gview/DisplayGraph.c++ ./inventor/apps/demos/gview/DisplayGraph.c++
+--- ../1/inventor/apps/demos/gview/DisplayGraph.c++	2002-06-01 04:22:20.000000000 +0200
++++ ./inventor/apps/demos/gview/DisplayGraph.c++	2005-11-15 13:33:06.000000000 +0100
+@@ -67,7 +67,7 @@
+ SbDict	*DisplayGraph::iconDict;
+ 
+ #define ICON_FILE	"gviewIcons.iv"
+-#define ICON_INST_DIR	IVPREFIX "/demos/data/Inventor"
++#define ICON_INST_DIR	IVPREFIX "/share/openinventor/demos/data/Inventor"
+ #define ICON_ENV_VAR	"IV_GRAPH_DIR"
+ 
+ ////////////////////////////////////////////////////////////////////////
+diff -ur ../1/inventor/apps/demos/noodle/Interface.c++ ./inventor/apps/demos/noodle/Interface.c++
+--- ../1/inventor/apps/demos/noodle/Interface.c++	2002-06-01 04:22:20.000000000 +0200
++++ ./inventor/apps/demos/noodle/Interface.c++	2005-11-15 13:33:06.000000000 +0100
+@@ -399,9 +399,9 @@
+ void
+ Interface::showAboutDialog()
+ {
+-   if (access(IVPREFIX "/demos/Inventor/noodle.about", R_OK) != 0) {
++   if (access(IVPREFIX "/share/inventor/demos/Inventor/noodle.about", R_OK) != 0) {
+         system("xmessage 'Sorry, could not find "
+-               IVPREFIX "/demos/Inventor/noodle.about' > /dev/null");
++               IVPREFIX "/share/inventor/demos/Inventor/noodle.about' > /dev/null");
+         return;
+     }
+ 
+@@ -415,7 +415,7 @@
+         return;
+     }
+ 
+-    sprintf(command, "acroread " IVPREFIX "/demos/Inventor/noodle.about &");
++    sprintf(command, "acroread " IVPREFIX "/share/inventor/demos/Inventor/noodle.about &");
+     system(command);
+ }
+ 
+diff -ur ../1/inventor/apps/demos/qmorf/qmorf.c++ ./inventor/apps/demos/qmorf/qmorf.c++
+--- ../1/inventor/apps/demos/qmorf/qmorf.c++	2002-06-01 04:22:20.000000000 +0200
++++ ./inventor/apps/demos/qmorf/qmorf.c++	2005-11-15 13:33:06.000000000 +0100
+@@ -414,7 +414,7 @@
+ 		"they must contain QuadMeshes (qmorf can\n");
+ 	fprintf(stderr, "only morph QuadMesh nodes).\n");
+ 	fprintf(stderr, "The directory "
+-		IVPREFIX "/share/data/models/CyberHeads "
++		IVPREFIX "/share/openinventor/data/models/CyberHeads "
+ 		"contains good data to morph.\n");
+ 
+ 	exit(7);
+@@ -436,10 +436,10 @@
+ void
+ showAboutDialog(Widget, XtPointer, XtPointer)
+ {
+-    if (access(IVPREFIX "/demos/Inventor/qmorf.about", R_OK) != 0)
++    if (access(IVPREFIX "/share/openinventor/demos/Inventor/qmorf.about", R_OK) != 0)
+     {
+ 	system("xmessage 'Sorry, could not find "
+-	       IVPREFIX "/demos/Inventor/qmorf.about' > /dev/null");
++	       IVPREFIX "/share/openinventor/demos/Inventor/qmorf.about' > /dev/null");
+ 	return;
+     }
+     char command[100];
+@@ -453,7 +453,7 @@
+ 	return;
+     }
+ 
+-    sprintf(command, "acroread " IVPREFIX "/demos/Inventor/qmorf.about &");
++    sprintf(command, "acroread " IVPREFIX "/share/openinventor/demos/Inventor/qmorf.about &");
+     system(command);
+ }	
+ 
+diff -ur ../1/inventor/apps/demos/revo/revo.c++ ./inventor/apps/demos/revo/revo.c++
+--- ../1/inventor/apps/demos/revo/revo.c++	2002-06-01 04:22:21.000000000 +0200
++++ ./inventor/apps/demos/revo/revo.c++	2005-11-15 13:33:06.000000000 +0100
+@@ -78,10 +78,10 @@
+ void
+ showAboutDialog(Widget, XtPointer, XtPointer)
+ {
+-    if (access(IVPREFIX "/demos/Inventor/revo.about", R_OK) != 0)
++    if (access(IVPREFIX "/share/openinventor/demos/Inventor/revo.about", R_OK) != 0)
+     {
+ 	system("xmessage 'Sorry, could not find "
+-	       IVPREFIX "/demos/Inventor/revo.about' > /dev/null");
++	       IVPREFIX "/share/openinventor/demos/Inventor/revo.about' > /dev/null");
+ 	return;
+     }
+ 
+@@ -96,7 +96,7 @@
+ 	return;
+     }
+ 
+-    sprintf(command, "acroread " IVPREFIX "/demos/Inventor/revo.about &");
++    sprintf(command, "acroread " IVPREFIX "/share/openinventor/demos/Inventor/revo.about &");
+     system(command);
+ }	
+ 
+diff -ur ../1/inventor/apps/demos/textomatic/textomatic.c++ ./inventor/apps/demos/textomatic/textomatic.c++
+--- ../1/inventor/apps/demos/textomatic/textomatic.c++	2003-07-12 00:40:53.000000000 +0200
++++ ./inventor/apps/demos/textomatic/textomatic.c++	2005-11-15 13:33:06.000000000 +0100
+@@ -160,10 +160,10 @@
+ void
+ showAboutDialog(Widget, XtPointer, XtPointer)
+ {
+-    if (access(IVPREFIX "/demos/Inventor/textomatic.about", R_OK) != 0)
++    if (access(IVPREFIX "/share/openinventor/demos/Inventor/textomatic.about", R_OK) != 0)
+     {
+ 	system("xmessage 'Sorry, could not find "
+-	       IVPREFIX "/demos/Inventor/textomatic.about' > /dev/null");
++	       IVPREFIX "/share/openinventor/demos/Inventor/textomatic.about' > /dev/null");
+ 	return;
+     }
+ 
+@@ -177,7 +177,7 @@
+ 	return;
+     }
+ 
+-    sprintf(command, "acroread " IVPREFIX "/demos/Inventor/textomatic.about &");
++    sprintf(command, "acroread " IVPREFIX "/share/openinventor/demos/Inventor/textomatic.about &");
+     system(command);
+ }	
+ 
+diff -ur ../1/inventor/apps/samples/widgets/MyMtlPal.c++ ./inventor/apps/samples/widgets/MyMtlPal.c++
+--- ../1/inventor/apps/samples/widgets/MyMtlPal.c++	2002-06-01 04:22:21.000000000 +0200
++++ ./inventor/apps/samples/widgets/MyMtlPal.c++	2005-11-15 13:33:06.000000000 +0100
+@@ -193,7 +193,7 @@
+ };
+ 
+ static char *editorTitle = "Material Palette";
+-static char *defaultDir = IVPREFIX "/share/data/materials";
++static char *defaultDir = IVPREFIX "/share/openinventor/data/materials";
+ 
+ 
+ static char *geometryBuffer = "\
+diff -ur ../1/inventor/apps/samples/widgets/MyTextureEd.c++ ./inventor/apps/samples/widgets/MyTextureEd.c++
+--- ../1/inventor/apps/samples/widgets/MyTextureEd.c++	2002-06-01 04:22:21.000000000 +0200
++++ ./inventor/apps/samples/widgets/MyTextureEd.c++	2005-11-15 13:33:06.000000000 +0100
+@@ -228,7 +228,7 @@
+ 
+ 
+ static char *customTextureDir = ".textures";
+-static char *defaultDir = IVPREFIX "/share/data/textures";
++static char *defaultDir = IVPREFIX "/share/openinventor/data/textures";
+ static char *editorTitle = "Texture Editor";
+ static char *noFileNameStr = "<empty>";
+ 
+diff -ur ../1/inventor/apps/tools/ivview/ivview.c++ ./inventor/apps/tools/ivview/ivview.c++
+--- ../1/inventor/apps/tools/ivview/ivview.c++	2002-06-01 04:22:21.000000000 +0200
++++ ./inventor/apps/tools/ivview/ivview.c++	2005-11-15 13:33:06.000000000 +0100
+@@ -715,9 +715,9 @@
+ static void
+ showAboutDialog()
+ {
+-   if (access(IVPREFIX "/share/help/ivview/ivview.about", R_OK) != 0) {
++   if (access(IVPREFIX "/share/openinventor/help/ivview/ivview.about", R_OK) != 0) {
+         system("xmessage 'Sorry, could not find "
+-               IVPREFIX "/share/help/ivview/ivview.about' > /dev/null");
++               IVPREFIX "/share/openinventor/help/ivview/ivview.about' > /dev/null");
+         return;
+     }
+ 
+@@ -731,7 +731,7 @@
+         return;
+     }
+ 
+-    sprintf(command, "acroread " IVPREFIX "/share/help/ivview/ivview.about &");
++    sprintf(command, "acroread " IVPREFIX "/share/openinventor/help/ivview/ivview.about &");
+     system(command);
+ }
+ 
+diff -ur ../1/inventor/libFL/ang/fl.c ./inventor/libFL/ang/fl.c
+--- ../1/inventor/libFL/ang/fl.c	2003-07-12 00:40:53.000000000 +0200
++++ ./inventor/libFL/ang/fl.c	2005-11-15 13:33:06.000000000 +0100
+@@ -95,7 +95,7 @@
+   NULL
+ };
+ 
+-static char *fontPath = IVPREFIX "/share/data/fonts";
++static char *fontPath = IVPREFIX "/share/openinventor/fonts";
+ int fl_debug = FALSE;
+ 
+ /*
+diff -ur ../1/inventor/libSoXt/src/SoXtComponent.c++ ./inventor/libSoXt/src/SoXtComponent.c++
+--- ../1/inventor/libSoXt/src/SoXtComponent.c++	2002-06-01 04:16:10.000000000 +0200
++++ ./inventor/libSoXt/src/SoXtComponent.c++	2005-11-15 13:33:06.000000000 +0100
+@@ -622,7 +622,7 @@
+     }
+     
+     // else check for the default location
+-    strcpy(cardPath, IVPREFIX "/share/help/Inventor/");
++    strcpy(cardPath, IVPREFIX "/share/openinventor/help/Inventor/");
+     strcat(cardPath, cardName);
+     if ( access(cardPath, R_OK) == 0 ) {
+ 	strcat(pgrCmd, cardPath);
+diff -ur ../1/inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ ./inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++
+--- ../1/inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++	2002-06-01 04:16:10.000000000 +0200
++++ ./inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++	2005-11-15 13:33:06.000000000 +0100
+@@ -156,7 +156,7 @@
+ 	"Material Emissive Color"
+ };
+ 
+-static char *mtlDir  = IVPREFIX "/share/data/materials";
++static char *mtlDir  = IVPREFIX "/share/openinventor/data/materials";
+ 
+ static char *slider_labels[] = { (char *)NULL, (char *)NULL, (char *)NULL,
+ 				 (char *)NULL, (char *)NULL, (char *)NULL
+diff -ur ../1/inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++ ./inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++
+--- ../1/inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++	2002-06-01 04:16:10.000000000 +0200
++++ ./inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++	2005-11-15 13:33:06.000000000 +0100
+@@ -264,7 +264,7 @@
+     setClassName("SoXtMaterialList");
+     if (dir != NULL)
+ 	materialDir = strdup(dir);
+-    else materialDir = strdup(IVPREFIX "/share/data/materials");
++    else materialDir = strdup(IVPREFIX "/share/openinventor/data/materials");
+ 
+     callbackList = new SoCallbackList;
+     curPalette = -1;
+diff -ur ../1/inventor/make/ivcommondefs ./inventor/make/ivcommondefs
+--- ../1/inventor/make/ivcommondefs	2003-07-12 00:40:54.000000000 +0200
++++ ./inventor/make/ivcommondefs	2005-11-15 13:35:19.000000000 +0100
+@@ -192,11 +192,11 @@
+ IVDLIBDIR = $(IVLIBDIR)/InventorDebug
+ IVHDRTOP = $(IVROOT)/$(IVPREFIX)/include/Inventor
+ IVHDRDIR = $(IVHDRTOP)/$(HDRSUBDIR)
+-IVMAN1DIR = $(IVROOT)/$(IVPREFIX)/man/man1
+-IVMAN3DIR = $(IVROOT)/$(IVPREFIX)/man/man3
+-IVHELPDIR = $(IVROOT)/$(IVPREFIX)/share/help
+-IVDATADIR = $(IVROOT)/$(IVPREFIX)/share/data/models
+-IVDEMODIR = $(IVROOT)/$(IVPREFIX)/demos
++IVMAN1DIR = $(IVROOT)/$(IVPREFIX)/share/man/man1
++IVMAN3DIR = $(IVROOT)/$(IVPREFIX)/share/man/man3
++IVHELPDIR = $(IVROOT)/$(IVPREFIX)/share/openinventor/help
++IVDATADIR = $(IVROOT)/$(IVPREFIX)/share/openinventor/data/models
++IVDEMODIR = $(IVROOT)/$(IVPREFIX)/share/openinventor/demos
+ IVDEMOBINDIR = $(IVDEMODIR)/Inventor
+ IVDEMODATADIR = $(IVDEMODIR)/data/Inventor
+ 
diff --git a/media-libs/openinventor/openinventor-2.1.5.10-r1.ebuild b/media-libs/openinventor/openinventor-2.1.5.10-r1.ebuild
new file mode 100644
index 000000000000..4e054f0f6445
--- /dev/null
+++ b/media-libs/openinventor/openinventor-2.1.5.10-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/openinventor-2.1.5.10-r1.ebuild,v 1.1 2005/11/15 13:13:40 stefaan Exp $
+
+inherit eutils versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+MY_PN="inventor"
+
+DESCRIPTION="SGI OpenInventor Toolkit and Utilities"
+HOMEPAGE="http://oss.sgi.com/projects/inventor/"
+SRC_URI="ftp://oss.sgi.com/projects/${MY_PN}/download/${MY_PN}-${MY_PV}.src.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/x11
+	virtual/opengl
+	virtual/motif
+	>=media-libs/jpeg-6b
+	>=media-libs/freetype-2.0"
+DEPEND="dev-util/byacc
+	${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# ordinary yacc fails
+	epatch ${FILESDIR}/use-byacc.patch
+	# support for amd64, sparc and alpha
+	epatch ${FILESDIR}/support-archs.patch
+	# freetype2 wasn't enabled by default
+	epatch ${FILESDIR}/freetype2-activate.patch
+	# extra #include statement necessary for freetype2
+	epatch ${FILESDIR}/freetype2-includes.patch
+	# script aiding in manual installation required csh
+	epatch ${FILESDIR}/no-csh.patch
+	# put files in sane places
+	epatch ${FILESDIR}/gentoo-paths-v2.patch
+	# fix compilation with gcc-4
+	epatch ${FILESDIR}/gcc4-support.patch
+}
+
+src_compile() {
+	# VLDOPTS: find libraries during linking of executables
+	# VLDDSOOPTS: find libraries during linking of libraries
+	# VCFLAGS / VCXXFLAGS: pass user-chosen compiler flags
+	# OPTIMIZER: do not override user-chosen compiler flags
+	# system
+	emake \
+		VLDOPTS="-L${S}/lib -L${S}/libSoXt" \
+		VLDDSOOPTS="-L${S}/lib -L${S}/libSoXt" \
+		VCFLAGS="${CFLAGS}" VCXXFLAGS="${CXXFLAGS}" \
+		OPTIMIZER= \
+		|| die "Build failed"
+
+	# fix RUNME-scripts in the demos directory for new paths
+	sed -i \
+		-e 's:/usr/share/:/usr/share/openinventor/:g' \
+		-e 's:/usr/demos/:/usr/share/openinventor/demos/:g' \
+		$(find apps/demos -name *.RUNME)
+}
+
+src_install() {
+	# IVROOT: serves as DESTDIR
+	# LLDOPTS: delete, so it won't go linking with libraries already on the
+	# system
+	# IVLIBDIR: multilib-strict compliance
+	# LD_LIBRARY_PATH: support executables ran during install
+	make \
+		IVROOT="${D}" \
+		LLDOPTS= \
+		IVLIBDIR="${D}usr/$(get_libdir)" \
+		LD_LIBRARY_PATH="${D}usr/$(get_libdir)" \
+		install \
+		|| die "Install failed"
+
+	# OpenInventor aliases for TrueType fonts
+	local FONTDIR=/usr/share/fonts/corefonts
+	local ALIASDIR=/usr/share/${PN}/fonts
+	dodir ${ALIASDIR}
+	dosym ${FONTDIR}/times.ttf ${ALIASDIR}/Times-Roman
+	dosym ${FONTDIR}/arial.ttf ${ALIASDIR}/Helvetica
+	dosym ${FONTDIR}/cour.ttf ${ALIASDIR}/Utopia-Regular
+}
+