fix gtk2 use flag

4 files changed, 60 insertions, 23 deletions

diff --git a/app-text/ghostscript/ChangeLog b/app-text/ghostscript/ChangeLog
index 9198c210ad4f..2fa9dee92c42 100644
--- a/app-text/ghostscript/ChangeLog
+++ b/app-text/ghostscript/ChangeLog
@@ -1,6 +1,10 @@
 # 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.91 2004/12/05 22:31:50 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.92 2004/12/14 15:14:03 lanius Exp $
+
+  14 Dec 2004; lanius@gentoo.org +files/gs7.07.1-nogtk2.patch,
+  ghostscript-7.07.1-r8.ebuild:
+  fix gtk use flag
 
   05 Dec 2004; Sven Wegener <swegener@gentoo.org> :
   Added missing digest entries.
diff --git a/app-text/ghostscript/Manifest b/app-text/ghostscript/Manifest
index 20beff665be7..dee5aa01452d 100644
--- a/app-text/ghostscript/Manifest
+++ b/app-text/ghostscript/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 40cb9de588f9d7b84c71b45be2ff8d69 ghostscript-7.07.1-r5.ebuild 4028
 MD5 07fa06b16fde004dfe9307662b844ebe ghostscript-7.07.1-r7.ebuild 4151
 MD5 2db7df35be7d9e0921a6ab5c72c02f67 ghostscript-7.07.1-r2.ebuild 3295
@@ -9,8 +6,8 @@ MD5 a61c4af42b77a20abcd7330f20a70162 ghostscript-7.05.6-r2.ebuild 2806
 MD5 6319ff45453f1d6fb8e71caa8f40556a ghostscript-7.07.1-r4.ebuild 4028
 MD5 1f0374fe43952ae741d0cf174588a5fb ghostscript-7.07.1-r6.ebuild 4076
 MD5 adb8f4a12eb1764922b5e13835ef60dc ghostscript-7.07.1-r1.ebuild 3270
-MD5 c95f92b5264ab10db3729aacdb88ab2c ChangeLog 14803
-MD5 edf62fda09b85f35d1fc08deb083317b ghostscript-7.07.1-r8.ebuild 4545
+MD5 0e936a695da6f98eb9b71d71c9cde03f ChangeLog 14916
+MD5 f4ba2f38a0be9a73d615ba44cfd67b22 ghostscript-7.07.1-r8.ebuild 4886
 MD5 0eb21cd33b7646ed6bab341f994c6640 ghostscript-7.05.6-r1.ebuild 2749
 MD5 0d1e785f83f28fcc649afaee1641be97 ghostscript-7.07.1-r3.ebuild 3443
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
@@ -33,6 +30,7 @@ MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r8 212
 MD5 370d4bcd16d8acd03190ba84e2f61a41 files/gs7.07.1-ijsdestdir.patch 1418
 MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6 359
 MD5 0cb94835c5d49c5eeeba6e11b2cd65ed files/gs7.07.1-fontconfig-rh.patch.2.bz2 6113
+MD5 92fa24960f2c7802749ce6908aeaf60d files/gs7.07.1-nogtk2.patch 1419
 MD5 d3f26c93b9fb75b509c375cbf841da9a files/gs7.05.6-tempfile.patch 2763
 MD5 7208aacbb4aa234ce1a6126e8f682c06 files/gs7.07.1-ps2epsi.patch 372
 MD5 1d5618d793799f7247d624ced0dea493 files/gs7.07.1-tempfile.patch 3123
@@ -41,10 +39,3 @@ MD5 3d1cdf07dabc4a05bde9a2dc6f7da2de files/gs7.07.1-fontconfig-rh.patch.bz2 6121
 MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
 MD5 ac6af6bf67095500ea043aea27062d62 files/gs7.07.1-ijs.patch 401
 MD5 06fe485954243190f4f0f4d8e1542f92 files/gs7.07.1-cjk.diff.bz2 3055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBtH3KI1lqEGTUzyQRAkhYAJ4kpGZZ9eI453MXp3Qf6e8euPvVoACgtraC
-6jp69eTa6C9McdoRsnT1KbI=
-=Wh/U
------END PGP SIGNATURE-----
diff --git a/app-text/ghostscript/files/gs7.07.1-nogtk2.patch b/app-text/ghostscript/files/gs7.07.1-nogtk2.patch
new file mode 100644
index 000000000000..23ede7580133
--- /dev/null
+++ b/app-text/ghostscript/files/gs7.07.1-nogtk2.patch
@@ -0,0 +1,30 @@
+--- src/unix-dll.mak.org	2004-12-14 15:58:05.499565376 +0100
++++ src/unix-dll.mak	2004-12-14 15:58:33.871252224 +0100
+@@ -66,8 +66,8 @@
+ 
+ # Build the small Ghostscript loaders, with Gtk+ and without
+ 
+-$(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
+-	$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
++#$(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
++#	$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
+ 
+ $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
+ 	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
+@@ -87,7 +87,7 @@
+ 
+ # Normal shared object
+ so: SODIRS
+-	$(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
++	$(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC)
+ 
+ # Debug shared object
+ # Note that this is in the same directory as the normal shared
+@@ -103,7 +103,6 @@
+ 	-mkdir -p $(DESTDIR)$(bindir)
+ 	-mkdir -p $(DESTDIR)$(libdir)
+ 	$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
+-	$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
+ 	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
+ 	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
+ 	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild
index f0e685d6a0ae..0720b7f5b252 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r8.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-r8.ebuild,v 1.1 2004/12/05 17:23:53 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild,v 1.2 2004/12/14 15:14:03 lanius Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -15,22 +15,25 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="X cups cjk emacs gtk"
 
-RDEPEND="virtual/libc
+DEP="virtual/libc
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.1
 	>=sys-libs/zlib-1.1.4
 	X? ( virtual/x11 )
+	gtk? ( >=x11-libs/gtk+-2.0 )
+	cups? ( net-print/cups )
+	!virtual/ghostscript"
+
+RDEPEND="${DEP}
 	cjk? ( media-fonts/arphicfonts
 		media-fonts/kochi-substitute
 		media-fonts/baekmuk-fonts )
-	cups? ( net-print/cups )
-	gtk? ( >=x11-libs/gtk+-2.0 )
-	!virtual/ghostscript
 	media-fonts/gnu-gs-fonts-std"
-#	media-libs/fontconfig"
 
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+DEPEND="${DEP}
+	gtk? ( dev-util/pkgconfig )"
+
+#	media-libs/fontconfig"
 
 S=${WORKDIR}/espgs-${PV}
 
@@ -80,13 +83,22 @@ src_unpack() {
 
 	# fix dynamic build
 	echo '#include "png.h"' >> src/png_.h
-	sed -i -e "s:CFLAGS_SO=-fPIC:CFLAGS_SO=-fPIC -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include:" Makefile.in
+
+	# fix for building with gtk2 instead of gtk1
+	if use gtk; then
+		sed -i -e "s:gmodule:gmodule-2.0:" configure.ac
+		sed -i -e "s:glib-config:pkgconfig:" configure.ac
+		sed -i -e "s:gtk-config:pkg-config gtk-2.0:" src/unix-dll.mak
+		sed -i -e "s:CFLAGS_SO=-fPIC:CFLAGS_SO=-fPIC -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include:" Makefile.in
+	else
+		epatch ${FILESDIR}/gs${PV}-nogtk2.patch
+	fi
 }
 
 src_compile() {
 	local myconf
 	myconf="--with-ijs --without-gimp-print"
-	use gtk && myconf="${myconf} --with-omni"
+	use gtk && myconf="${myconf} --with-omni" || myconf="${myconf} --without-omni"
 
 	# bug #56998, only compiled-in fontpath is searched when running 
 	# gs -DPARANOIDSAFER out.ps