fix #100240

(Portage version: 2.0.51.22-r2)

4 files changed, 22 insertions, 36 deletions

diff --git a/gnome-extra/nautilus-cd-burner/ChangeLog b/gnome-extra/nautilus-cd-burner/ChangeLog
index fdf65f4a8584..f0be6e5eb87a 100644
--- a/gnome-extra/nautilus-cd-burner/ChangeLog
+++ b/gnome-extra/nautilus-cd-burner/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for gnome-extra/nautilus-cd-burner
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.88 2005/07/31 13:17:10 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.89 2005/07/31 21:37:29 foser Exp $
 
   31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
   nautilus-cd-burner-2.10.1.ebuild:
   ppc stable
 
+  31 Jul 2005; Marinus Schraal <foser@gentoo.org> :
+  Add libtool fix & beautify configure patch while I was at it (#10024)
+
   27 Jul 2005; Guy Martin <gmsoft@gentoo.org>
   nautilus-cd-burner-2.10.1.ebuild:
   Stable on hppa.
diff --git a/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-2.10.2-configure.patch b/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-2.10.2-configure.patch
deleted file mode 100644
index b90f1d9059f2..000000000000
--- a/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-2.10.2-configure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -NurdB nautilus-cd-burner-2.10.2/configure.in nautilus-cd-burner-2.10.2-patched/configure.in
---- nautilus-cd-burner-2.10.2/configure.in	2005-06-22 10:53:19.000000000 -0500
-+++ nautilus-cd-burner-2.10.2-patched/configure.in	2005-07-16 04:19:23.000000000 -0500
-@@ -99,13 +99,6 @@
- esac],
- [ENABLE_HAL=yes]) dnl Default value
- 
--HAL=""
--if test "x$ENABLE_HAL" = "xyes"; then
--	PKG_CHECK_MODULES(HAL, hal >= $HAL_REQUIRED,
--		[ AC_DEFINE([USE_HAL], 1, [Use the HAL library])]
--		[HAL="hal >= $HAL_REQUIRED" ], :)
--fi
--
- dnl ===========================================================================
- dnl Check for modules and libraries
- 
-@@ -113,6 +106,13 @@
-  gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED dnl
-  gnome-vfs-module-2.0 >= $GNOME_VFS_REQUIRED)
- 
-+HAL=""
-+if test "x$ENABLE_HAL" = "xyes"; then
-+	PKG_CHECK_MODULES(HAL, hal >= $HAL_REQUIRED,
-+		[ AC_DEFINE([USE_HAL], 1, [Use the HAL library])]
-+		[HAL="hal >= $HAL_REQUIRED" ], :)
-+fi
-+
- PKG_CHECK_MODULES(DAEMON, glib-2.0 >= $GLIB_REQUIRED)
- AC_CHECK_LIB(socket, bind, 
-     DAEMON_LIBS="$DAEMON_LIBS -lsocket",
diff --git a/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-2.10.2-hal_check.patch b/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-2.10.2-hal_check.patch
new file mode 100644
index 000000000000..54369973ae8e
--- /dev/null
+++ b/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-2.10.2-hal_check.patch
@@ -0,0 +1,12 @@
+diff -uNr nautilus-cd-burner-2.10.2/configure.in nautilus-cd-burner-2.10.2.patched/configure.in
+--- nautilus-cd-burner-2.10.2/configure.in	2005-06-22 17:53:19.000000000 +0200
++++ nautilus-cd-burner-2.10.2.patched/configure.in	2005-07-31 23:32:25.000000000 +0200
+@@ -13,6 +13,8 @@
+ AC_PROG_LIBTOOL
+ AC_PROG_INTLTOOL([0.22])
+ 
++PKG_PROG_PKG_CONFIG()
++
+ # Before making a release, the BURN_LT_VERSION string should be modified.
+ # The string is of the form C:R:A.
+ # - If interfaces have been changed or added, but binary compatibility has
diff --git a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.2.ebuild b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.2.ebuild
index 3f848368a6f3..beabee807e0a 100644
--- a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.2.ebuild
+++ b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.2.ebuild,v 1.1 2005/07/16 09:53:01 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.2.ebuild,v 1.2 2005/07/31 21:37:29 foser Exp $
 
 inherit eutils gnome2
 
@@ -33,7 +33,7 @@ DEPEND=">=dev-libs/glib-2.4
 	>=gnome-base/libgnome-2
 	>=gnome-base/gconf-2
 	hal? ( >=sys-apps/hal-0.4.2 )
-	>=dev-util/intltool-0.22
+	>=dev-util/intltool-0.29
 	dev-util/pkgconfig"
 
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
@@ -43,12 +43,14 @@ G2CONF="${G2CONF} $(use_enable hal) $(use_enable static)"
 USE_DESTDIR="1"
 
 src_unpack() {
+
 	unpack ${A}
 	cd ${S}
 
 	# Detect pkg-config if --disable-hal is passed
-	epatch ${FILESDIR}/${P}-configure.patch
+	epatch ${FILESDIR}/${P}-hal_check.patch
 
-	einfo "Running autoconf"
 	autoconf || die "Autoconf failed"
+	libtoolize --copy --force
+
 }