Fixed install process for ijs. The previous hack didn't work when we passed --libdir to configure.

4 files changed, 47 insertions, 10 deletions

diff --git a/app-text/ghostscript/ChangeLog b/app-text/ghostscript/ChangeLog
index 8f8f882abf47..9d5667666700 100644
--- a/app-text/ghostscript/ChangeLog
+++ b/app-text/ghostscript/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/ghostscript
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.68 2004/09/02 21:26:02 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.69 2004/09/19 20:36:48 eradicator Exp $
+
+  19 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/gs7.07.1-ijsdestdir.patch:
+  Fixed install process for ijs. The previous hack didn't work when we passed
+  --libdir to configure.
 
   02 Sep 2004; Danny van Dyk <kugelfang@gentoo.org>
   ghostscript-7.07.1-r1.ebuild, ghostscript-7.07.1-r2.ebuild,
diff --git a/app-text/ghostscript/Manifest b/app-text/ghostscript/Manifest
index 99741ffad144..ca2ab003612c 100644
--- a/app-text/ghostscript/Manifest
+++ b/app-text/ghostscript/Manifest
@@ -1,23 +1,24 @@
-MD5 6fbf0f3d09011b8026c6ba947c9b988f ChangeLog 10984
+MD5 9a045da530da98cb27e79d01ce057bb8 ChangeLog 11182
 MD5 5c8154bc4b0d22262f9b9cd6e8e8381f ghostscript-7.07.1-r1.ebuild 3159
+MD5 333468642f939582d640b40d8a241503 ghostscript-7.07.1-r2.ebuild 3267
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 b597ebd00e4193693bb8e668f2bbace5 ghostscript-7.05.6.ebuild 2709
-MD5 333468642f939582d640b40d8a241503 ghostscript-7.07.1-r2.ebuild 3267
 MD5 f9da560c48806e555dd58c239497ea30 ghostscript-7.07.1-r3.ebuild 3415
 MD5 eb3a70a293200230d06cba8edd75981f ghostscript-7.07.1-r4.ebuild 3616
-MD5 d1e0da0bea949badf419f3bc603d9cae ghostscript-7.07.1-r5.ebuild 3641
+MD5 f58d4f3f34c4a44e1a50e9d08f6655b9 ghostscript-7.07.1-r5.ebuild 3819
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r1 291
+MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r2 291
 MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
 MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
 MD5 5f1b04ca58928a339b749703e067e2ba files/gs7.05.6-kochi-substitute.patch 3774
 MD5 ac6af6bf67095500ea043aea27062d62 files/gs7.07.1-ijs.patch 401
+MD5 acda8ddfde1efeaf451cb28a67dcc773 files/gs7.07.1-krgb.patch.gz 5569
 MD5 7208aacbb4aa234ce1a6126e8f682c06 files/gs7.07.1-ps2epsi.patch 372
 MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6 359
-MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r2 291
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r3 291
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r4 291
 MD5 291c8895063b8ecee12b68d45a705ab4 files/gs7.05-gdevhl12.c.bz2 7406
 MD5 343b6a60e15e35d0c5f825b4f361fd29 files/gs7.05.6-cjk.diff.bz2 3287
 MD5 3d1cdf07dabc4a05bde9a2dc6f7da2de files/gs7.07.1-fontconfig-rh.patch.bz2 6121
-MD5 acda8ddfde1efeaf451cb28a67dcc773 files/gs7.07.1-krgb.patch.gz 5569
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r5 291
+MD5 370d4bcd16d8acd03190ba84e2f61a41 files/gs7.07.1-ijsdestdir.patch 1418
diff --git a/app-text/ghostscript/files/gs7.07.1-ijsdestdir.patch b/app-text/ghostscript/files/gs7.07.1-ijsdestdir.patch
new file mode 100644
index 000000000000..3ce64986bdb1
--- /dev/null
+++ b/app-text/ghostscript/files/gs7.07.1-ijsdestdir.patch
@@ -0,0 +1,26 @@
+diff -Naur espgs-7.07.1.orig/ijs/Makefile.in espgs-7.07.1/ijs/Makefile.in
+--- espgs-7.07.1.orig/ijs/Makefile.in	2004-09-19 13:09:50.225860000 -0700
++++ espgs-7.07.1/ijs/Makefile.in	2004-09-19 13:20:08.118191874 -0700
+@@ -60,14 +60,14 @@
+ 	$(RM) *~ gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux libijs.a libijs$(SHARED_OBJ) config.cache config.log config.status ijs-config
+ 
+ install:	all
+-	$(INSTALL) ijs_client_example$(EXE) -c $(bindir)/ijs_client_example$(EXE)
+-	$(INSTALL) ijs-config -c $(bindir)/ijs-config
+-	$(INSTALL) libijs.a $(libdir)/libijs.a
+-	$(INSTALL) libijs$(SHARED_OBJ) $(libdir)/libijs$(SHARED_OBJ)
+-	-mkdir $(pkgincludedir)
+-	$(INSTALL) ijs.h $(pkgincludedir)/ijs.h
+-	$(INSTALL) ijs_client.h $(pkgincludedir)/ijs_client.h
+-	$(INSTALL) ijs_server.h $(pkgincludedir)/ijs_server.h
++	$(INSTALL) ijs_client_example$(EXE) -c $(DESTDIR)$(bindir)/ijs_client_example$(EXE)
++	$(INSTALL) ijs-config -c $(DESTDIR)$(bindir)/ijs-config
++	$(INSTALL) libijs.a $(DESTDIR)$(libdir)/libijs.a
++	$(INSTALL) libijs$(SHARED_OBJ) $(DESTDIR)$(libdir)/libijs$(SHARED_OBJ)
++	-mkdir $(DESTDIR)$(pkgincludedir)
++	$(INSTALL) ijs.h $(DESTDIR)$(pkgincludedir)/ijs.h
++	$(INSTALL) ijs_client.h $(DESTDIR)$(pkgincludedir)/ijs_client.h
++	$(INSTALL) ijs_server.h $(DESTDIR)$(pkgincludedir)/ijs_server.h
+ 
+ uninstall:
+ 	$(RM) $(bindir)/ijs_client_example$(EXE) $(bindir)/ijs-config $(libdir)/libijs.a $(libdir)/libijs$(SHARED_OBJ)
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild
index a0f3bf2d5769..7cb88ddc4ee2 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild,v 1.3 2004/09/02 21:50:07 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild,v 1.4 2004/09/19 20:36:48 eradicator Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -61,6 +61,10 @@ src_unpack() {
 	# pxl dash patch
 	epatch ${FILESDIR}/gs7.05.6-gdevpx.patch
 
+	# Makefile.in fixes for DESTDIR support in libijs because
+	# einstall borks on multilib systems -- eradicator
+	epatch ${FILESDIR}/gs${PV}-ijsdestdir.patch
+
 	# search path fix
 	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/7.07/$(get_libdir):"\
 	Makefile.in || die "sed failed"
@@ -94,7 +98,7 @@ src_compile() {
 	make || die "make failed"
 
 	cd ijs
-	econf --prefix=${D}/usr || die "econf failed"
+	econf || die "econf failed"
 	make || die "make failed"
 	cd ..
 }
@@ -131,6 +135,7 @@ src_install() {
 	# This is broken - there are not even a 'install_prefix'
 	# anywhere in ${S}/ijs ...
 	#einstall install_prefix=${D}
-	einstall
-	dosed "s:^prefix=.*:prefix=/usr:" /usr/bin/ijs-config
+	#einstall
+	#dosed "s:^prefix=.*:prefix=/usr:" /usr/bin/ijs-config
+	make DESTDIR="${D}" install || die
 }