Revert a change in patch and really fix autotools.

(Portage version: 2.1.2-r7)

3 files changed, 25 insertions, 14 deletions

diff --git a/media-libs/imlib/ChangeLog b/media-libs/imlib/ChangeLog
index 35eb5c249e26..1dc647c82d2b 100644
--- a/media-libs/imlib/ChangeLog
+++ b/media-libs/imlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/imlib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.41 2007/02/05 19:27:27 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.42 2007/02/05 21:59:28 drac Exp $
+
+  05 Feb 2007; Samuli Suominen <drac@gentoo.org> files/imlib-1.9.15.patch,
+  imlib-1.9.15-r1.ebuild:
+  Revert a change in patch and really fix autotools.
 
 *imlib-1.9.15-r1 (05 Feb 2007)
 
diff --git a/media-libs/imlib/files/imlib-1.9.15.patch b/media-libs/imlib/files/imlib-1.9.15.patch
index 6b8bc06864a7..c78aea9ad98f 100644
--- a/media-libs/imlib/files/imlib-1.9.15.patch
+++ b/media-libs/imlib/files/imlib-1.9.15.patch
@@ -1,14 +1,10 @@
 diff -ur imlib-1.9.15.orig/configure.in imlib-1.9.15/configure.in
 --- imlib-1.9.15.orig/configure.in	2004-09-23 04:13:45.000000000 +0300
-+++ imlib-1.9.15/configure.in	2007-02-05 20:10:48.000000000 +0200
-@@ -17,10 +17,20 @@
++++ imlib-1.9.15/configure.in	2007-02-05 23:43:18.000000000 +0200
+@@ -17,11 +17,26 @@
  dnl incase it is broken for example.
  AC_ARG_ENABLE(shm, [  --enable-shm            support shared memory if available [default=yes]], echo $enable_shm, enable_shm="yes")
  
--AM_PATH_GTK(1.2.1,[
--  GDK_IMLIB="gdk_imlib utils"],[
--  GDK_IMLIB="" 
--  AC_MSG_WARN([*** gdk_imlib will not be built ***])])
 +AC_ARG_ENABLE(gdk, [  --enable-gdk            enable gdk_imlib compilation [default=yes]],[
 +  if test x$enableval = xyes; then
 +    disable_gdk="no"
@@ -17,18 +13,24 @@ diff -ur imlib-1.9.15.orig/configure.in imlib-1.9.15/configure.in
 +  fi],disable_gdk=no)
 +
 +if test x$disable_gdk = xno; then
-+  AC_MSG_RESULT(no)
-+  GDK_IMLIB="gdk_imlib utils"
++ AC_MSG_RESULT(no)
++
+ AM_PATH_GTK(1.2.1,[
+   GDK_IMLIB="gdk_imlib utils"],[
+   GDK_IMLIB="" 
+   AC_MSG_WARN([*** gdk_imlib will not be built ***])])
+ 
 +else
 +  AC_MSG_RESULT(yes)
 +  GDK_IMLIB=""
 +fi
- 
++
  AC_MSG_CHECKING(whether to build gmodulized imlib)
  
+ AC_ARG_ENABLE(modules, [  --disable-modules       Disables dynamic module loading],[
 diff -ur imlib-1.9.15.orig/imlib-config.in imlib-1.9.15/imlib-config.in
 --- imlib-1.9.15.orig/imlib-config.in	2004-08-27 19:03:11.000000000 +0300
-+++ imlib-1.9.15/imlib-config.in	2007-02-05 20:59:43.000000000 +0200
++++ imlib-1.9.15/imlib-config.in	2007-02-05 23:46:34.000000000 +0200
 @@ -46,15 +46,9 @@
        echo @VERSION@
        ;;
@@ -47,7 +49,7 @@ diff -ur imlib-1.9.15.orig/imlib-config.in imlib-1.9.15/imlib-config.in
      --libs)
 diff -ur imlib-1.9.15.orig/imlib.m4 imlib-1.9.15/imlib.m4
 --- imlib-1.9.15.orig/imlib.m4	2004-08-27 19:03:11.000000000 +0300
-+++ imlib-1.9.15/imlib.m4	2007-02-05 21:36:58.000000000 +0200
++++ imlib-1.9.15/imlib.m4	2007-02-05 23:42:57.000000000 +0200
 @@ -6,7 +6,7 @@
  dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
  dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS
diff --git a/media-libs/imlib/imlib-1.9.15-r1.ebuild b/media-libs/imlib/imlib-1.9.15-r1.ebuild
index fb0827b352b1..d10cfaff28f7 100644
--- a/media-libs/imlib/imlib-1.9.15-r1.ebuild
+++ b/media-libs/imlib/imlib-1.9.15-r1.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.15-r1.ebuild,v 1.2 2007/02/05 19:32:33 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.15-r1.ebuild,v 1.3 2007/02/05 21:59:28 drac Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
 
 inherit autotools eutils gnome.org
 
@@ -31,7 +34,9 @@ src_unpack() {
 	# Fix security bug 72681.
 	epatch "${FILESDIR}"/${PN}-security.patch
 
-	eautoreconf
+	eautoconf
+	eautomake
+	_elibtoolize
 }
 
 src_compile() {