handle glib better #34050

6 files changed, 25 insertions, 27 deletions

diff --git a/app-emulation/libspectrum/ChangeLog b/app-emulation/libspectrum/ChangeLog
index 4a897166cbd7..bb048395b864 100644
--- a/app-emulation/libspectrum/ChangeLog
+++ b/app-emulation/libspectrum/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/libspectrum
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libspectrum/ChangeLog,v 1.2 2003/11/21 04:04:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libspectrum/ChangeLog,v 1.3 2003/11/24 17:24:50 vapier Exp $
+
+*libspectrum-0.2.0.1-r1 (24 Nov 2003)
+
+  24 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Try to properly handle glib include #34050.
 
 *libspectrum-0.2.0.1 (20 Nov 2003)
 
diff --git a/app-emulation/libspectrum/files/0.2.0.1-no-gnome.patch b/app-emulation/libspectrum/files/0.2.0.1-no-gnome.patch
new file mode 100644
index 000000000000..9afa265b9b31
--- /dev/null
+++ b/app-emulation/libspectrum/files/0.2.0.1-no-gnome.patch
@@ -0,0 +1,12 @@
+--- libspectrum.h.in.orig	2003-11-24 11:57:50.432351584 -0500
++++ libspectrum.h.in	2003-11-24 11:58:17.915173560 -0500
+@@ -44,7 +44,9 @@
+ LIBSPECTRUM_DEFINE_TYPES
+ 
+ /* glib or its replacement */
++#ifndef __G_SLIST_H__
+ LIBSPECTRUM_GLIB_REPLACEMENT
++#endif __G_SLIST_H__
+ 
+ /*
+  * General libspectrum routines
diff --git a/app-emulation/libspectrum/files/digest-libspectrum-0.1.1 b/app-emulation/libspectrum/files/digest-libspectrum-0.1.1
deleted file mode 100644
index 639bf22716b8..000000000000
--- a/app-emulation/libspectrum/files/digest-libspectrum-0.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 48f59f6ae6683a16fa45d5510f8dca45 libspectrum-0.1.1.tar.gz 202521
diff --git a/app-emulation/libspectrum/files/digest-libspectrum-0.2.0.1 b/app-emulation/libspectrum/files/digest-libspectrum-0.2.0.1-r1
index f37eed98bfee..f37eed98bfee 100644
--- a/app-emulation/libspectrum/files/digest-libspectrum-0.2.0.1
+++ b/app-emulation/libspectrum/files/digest-libspectrum-0.2.0.1-r1
diff --git a/app-emulation/libspectrum/libspectrum-0.1.1.ebuild b/app-emulation/libspectrum/libspectrum-0.1.1.ebuild
deleted file mode 100644
index 074253eaefae..000000000000
--- a/app-emulation/libspectrum/libspectrum-0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libspectrum/libspectrum-0.1.1.ebuild,v 1.1 2003/07/16 00:24:17 vapier Exp $
-
-DESCRIPTION="Spectrum emulation library"
-HOMEPAGE="http://www.srcf.ucam.org/~pak21/spectrum/libspectrum.html"
-SRC_URI="http://www.srcf.ucam.org/~pak21/spectrum/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="gnome"
-
-DEPEND="gnome? ( =dev-libs/glib-1* )"
-
-src_compile() {
-	econf `use_with gnome glib` || die
-	make || die "libspectrum make failed!"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-	dodoc AUTHORS ChangeLog README THANKS doc/*.txt
-}
diff --git a/app-emulation/libspectrum/libspectrum-0.2.0.1.ebuild b/app-emulation/libspectrum/libspectrum-0.2.0.1-r1.ebuild
index 70ff49ee4d18..def37a0d10e9 100644
--- a/app-emulation/libspectrum/libspectrum-0.2.0.1.ebuild
+++ b/app-emulation/libspectrum/libspectrum-0.2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libspectrum/libspectrum-0.2.0.1.ebuild,v 1.1 2003/11/21 04:04:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libspectrum/libspectrum-0.2.0.1-r1.ebuild,v 1.1 2003/11/24 17:24:50 vapier Exp $
 
 DESCRIPTION="Spectrum emulation library"
 HOMEPAGE="http://www.srcf.ucam.org/~pak21/spectrum/libspectrum.html"
@@ -15,6 +15,12 @@ DEPEND="gnome? ( =dev-libs/glib-1* )
 	dev-libs/libgcrypt
 	dev-lang/perl"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use gnome || epatch ${FILESDIR}/${PV}-no-gnome.patch
+}
+
 src_compile() {
 	econf `use_with gnome glib` || die
 	emake -j1 || die "libspectrum make failed!"