From 7e7504f33d1ac54c085ef5ff3bc7788b9ef05f42 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 5 Feb 2007 21:59:28 +0000 Subject: [PATCH] Revert a change in patch and really fix autotools. Package-Manager: portage-2.1.2-r7 --- media-libs/imlib/ChangeLog | 6 +++++- media-libs/imlib/Manifest | 24 +++++++++++------------ media-libs/imlib/files/imlib-1.9.15.patch | 24 ++++++++++++----------- media-libs/imlib/imlib-1.9.15-r1.ebuild | 9 +++++++-- 4 files changed, 37 insertions(+), 26 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 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/Manifest b/media-libs/imlib/Manifest index 36a52c3bb172..7b17a8b48642 100644 --- a/media-libs/imlib/Manifest +++ b/media-libs/imlib/Manifest @@ -14,10 +14,10 @@ AUX imlib-1.9.15-gdk_flag.patch 888 RMD160 9ea1c287e3b24b9b29262d416fe5aa2739c7a MD5 2d810b6b736520a0b248a989e9195a9e files/imlib-1.9.15-gdk_flag.patch 888 RMD160 9ea1c287e3b24b9b29262d416fe5aa2739c7a1a9 files/imlib-1.9.15-gdk_flag.patch 888 SHA256 971e2971a23a627c389769b5c164bdd9d1bd3644e4ab1b1929982080a16e0dee files/imlib-1.9.15-gdk_flag.patch 888 -AUX imlib-1.9.15.patch 2195 RMD160 f35acd7e9eec1d5c9b52d47447d0ae6827fa3c26 SHA1 2c41b0c6cd38a5dbd5f74254737fea462ad69c45 SHA256 326ecda617bdf33578dd2fd28181e9f06b2ed36ad0f3daaf00962c0719a1b314 -MD5 39cafbc5c13298556d577b989fba7d81 files/imlib-1.9.15.patch 2195 -RMD160 f35acd7e9eec1d5c9b52d47447d0ae6827fa3c26 files/imlib-1.9.15.patch 2195 -SHA256 326ecda617bdf33578dd2fd28181e9f06b2ed36ad0f3daaf00962c0719a1b314 files/imlib-1.9.15.patch 2195 +AUX imlib-1.9.15.patch 2253 RMD160 beb86753cc2024a9eb671acdc3886b7a5692b526 SHA1 29fb949680e5b2d95392b4c5efd1fdfa21f2df3d SHA256 43dd12dae7913475f968f35a4fa4b1ef4670451e58c712cbd6e5460f20fc9197 +MD5 8328ba4002a30764a848de8b9b70f158 files/imlib-1.9.15.patch 2253 +RMD160 beb86753cc2024a9eb671acdc3886b7a5692b526 files/imlib-1.9.15.patch 2253 +SHA256 43dd12dae7913475f968f35a4fa4b1ef4670451e58c712cbd6e5460f20fc9197 files/imlib-1.9.15.patch 2253 AUX imlib-security.patch 13040 RMD160 432377938bd85f9974bff8f08aca6d93d310057c SHA1 ec1b47281c1a7fb21abe841f948ecc56ed13f310 SHA256 d67a7faa2dba8d361cf25b6fc8125c1da92f25b612bffe909daacdeda577dd57 MD5 b273d36aa60adbfaacaf6062234e4c1f files/imlib-security.patch 13040 RMD160 432377938bd85f9974bff8f08aca6d93d310057c files/imlib-security.patch 13040 @@ -28,18 +28,18 @@ EBUILD imlib-1.9.14-r3.ebuild 1175 RMD160 15f1eb7d2f4c85b8896c5f6cca6ac2dc135396 MD5 2abf42be490d9c3fd86ded8a9c7366cd imlib-1.9.14-r3.ebuild 1175 RMD160 15f1eb7d2f4c85b8896c5f6cca6ac2dc13539661 imlib-1.9.14-r3.ebuild 1175 SHA256 17051b7460eeec3c99c66284767a53088406b0aab6910ca725f2ee5513c355a4 imlib-1.9.14-r3.ebuild 1175 -EBUILD imlib-1.9.15-r1.ebuild 1318 RMD160 8e7ecc62006dc30e5be71550e1ed1ad87be14fc6 SHA1 792dc592a1ea23ba8bc937ba2d20caa8e7fce2fa SHA256 d25d6a5696602cb48b7f799d85bcf291edbc4049354e249de02dedc5187fff5f -MD5 1973e73918bd0cf2fd25d02dc62c5d40 imlib-1.9.15-r1.ebuild 1318 -RMD160 8e7ecc62006dc30e5be71550e1ed1ad87be14fc6 imlib-1.9.15-r1.ebuild 1318 -SHA256 d25d6a5696602cb48b7f799d85bcf291edbc4049354e249de02dedc5187fff5f imlib-1.9.15-r1.ebuild 1318 +EBUILD imlib-1.9.15-r1.ebuild 1388 RMD160 9694d2577920974c6a57bd2d00c0944f4dc30c79 SHA1 ad108c356723296ede0af1c9eb2cf9be95160ea9 SHA256 c2bc4ca3deee69dcc7ab450c9aa3faadd5de0c385010bcc0dfd05b0ce75d47dd +MD5 cdbff0e0a0171d8c51a46645146b90cb imlib-1.9.15-r1.ebuild 1388 +RMD160 9694d2577920974c6a57bd2d00c0944f4dc30c79 imlib-1.9.15-r1.ebuild 1388 +SHA256 c2bc4ca3deee69dcc7ab450c9aa3faadd5de0c385010bcc0dfd05b0ce75d47dd imlib-1.9.15-r1.ebuild 1388 EBUILD imlib-1.9.15.ebuild 1800 RMD160 6e1ef60b3ad6ffbfa83d9e676b5b9db1d7ef9e72 SHA1 9e9c406a06a465eba4cdad29e1c96b56e6042e7a SHA256 295183b7810ee8dd252e22fc6c7d9ebf2a898f9bd6add1654a04fd3d6fbcf10e MD5 eee2e020af96b3b5dfb189f91ea911c5 imlib-1.9.15.ebuild 1800 RMD160 6e1ef60b3ad6ffbfa83d9e676b5b9db1d7ef9e72 imlib-1.9.15.ebuild 1800 SHA256 295183b7810ee8dd252e22fc6c7d9ebf2a898f9bd6add1654a04fd3d6fbcf10e imlib-1.9.15.ebuild 1800 -MISC ChangeLog 5873 RMD160 784339a973a95cc56e596cd66c7dc0b0f11a18b4 SHA1 e34bc515f7ec5094e962b7fbada1b7a78925ea29 SHA256 c1e28543b6a4452a2eafcdafcef9dde6ba3928517cbd69f279f5e6551ed9754d -MD5 6ab3eeff54141771590ee669839f6925 ChangeLog 5873 -RMD160 784339a973a95cc56e596cd66c7dc0b0f11a18b4 ChangeLog 5873 -SHA256 c1e28543b6a4452a2eafcdafcef9dde6ba3928517cbd69f279f5e6551ed9754d ChangeLog 5873 +MISC ChangeLog 6028 RMD160 34b4871e3ada940bce6808ac12d3561c4a0bb60b SHA1 3c14888b164137a56e6be503fc27245bd2239b42 SHA256 97dac8875b41dd2d34578e96c2fb63c237e0bb0dc8509128e4102fca51d36c02 +MD5 a3b398552bd18ea5dc8f068a889873e4 ChangeLog 6028 +RMD160 34b4871e3ada940bce6808ac12d3561c4a0bb60b ChangeLog 6028 +SHA256 97dac8875b41dd2d34578e96c2fb63c237e0bb0dc8509128e4102fca51d36c02 ChangeLog 6028 MISC metadata.xml 223 RMD160 2fff04beb8d1d190f0ade4a52bb13e3b29af65cb SHA1 a91cab263e44718b8d7e8e33c7aca01b2b4032e9 SHA256 b589c118502c8401bcc833956c80ac3cdb0e484a332e7509a332352721a9f8c6 MD5 1e889c7f863a0fc30caf92bce27a25d3 metadata.xml 223 RMD160 2fff04beb8d1d190f0ade4a52bb13e3b29af65cb metadata.xml 223 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() { -- 2.26.2