New release: 0.9.15 with a new patch to make gtk dependency optional. See bug #40453.

(Portage version: 2.0.51.22-r1)

6 files changed, 123 insertions, 6 deletions

diff --git a/media-libs/imlib/ChangeLog b/media-libs/imlib/ChangeLog
index 74e00fd0b0d0..e3d87707a21a 100644
--- a/media-libs/imlib/ChangeLog
+++ b/media-libs/imlib/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/imlib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.35 2004/12/29 00:45:41 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.36 2005/05/31 06:48:43 leonardop Exp $
+
+*imlib-1.9.15 (30 May 2005)
+
+  30 May 2005; Leonardo Boshell <leonardop@gentoo.org> imlib-1.9.15.ebuild,
+  files/imlib-1.9.15-gdk_flag.patch:
+  New release. Implements the 'static' USE flag and contains a new,
+  experimental patch to disable Gdk functionality. See bug #40453.
+
+  30 May 2005; Leonardo Boshell <leonardop@gentoo.org> imlib-1.9.14-r3.ebuild:
+  Updated HOMEPAGE.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest
index 09041d94e989..28ffa828f985 100644
--- a/media-libs/imlib/Manifest
+++ b/media-libs/imlib/Manifest
@@ -1,7 +1,11 @@
 MD5 6a30b3156f6c2a23e34a34be607cd1d8 ChangeLog 4742
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 6c175cd3e9a10ceceaf147faab9da1f6 imlib-1.9.15.ebuild 1334
+MD5 77dba844cf14c0d213710544a41869b2 .imlib-1.9.15.ebuild.swp 12288
 MD5 deaeaf36b590abd7cb1c80ccc403ef5a imlib-1.9.14-r3.ebuild 1184
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 8e77a50e166c6610a16692c5e35adfe9 files/imlib-1.9.14-m4.patch 436
-MD5 785e01e32ee3640d632ac61e28d14aa4 files/imlib-1.9.14-bound.patch 11764
+MD5 4ef17ea1031ab4006a8c1c28fcd4d6b0 files/digest-imlib-1.9.15 65
 MD5 249b41b845e39ccae3a4022bead066e9 files/digest-imlib-1.9.14-r3 65
+MD5 785e01e32ee3640d632ac61e28d14aa4 files/imlib-1.9.14-bound.patch 11764
 MD5 b273d36aa60adbfaacaf6062234e4c1f files/imlib-1.9.14-sec2.patch 13040
+MD5 2d810b6b736520a0b248a989e9195a9e files/imlib-1.9.15-gdk_flag.patch 888
diff --git a/media-libs/imlib/files/digest-imlib-1.9.15 b/media-libs/imlib/files/digest-imlib-1.9.15
new file mode 100644
index 000000000000..2088f3c8127c
--- /dev/null
+++ b/media-libs/imlib/files/digest-imlib-1.9.15
@@ -0,0 +1 @@
+MD5 7db987e6c52e4daf70d7d0f471238eae imlib-1.9.15.tar.bz2 683242
diff --git a/media-libs/imlib/files/imlib-1.9.15-gdk_flag.patch b/media-libs/imlib/files/imlib-1.9.15-gdk_flag.patch
new file mode 100644
index 000000000000..8ca134f9a3a7
--- /dev/null
+++ b/media-libs/imlib/files/imlib-1.9.15-gdk_flag.patch
@@ -0,0 +1,29 @@
+--- configure.in.old	2004-08-26 15:19:09.404502200 +0200
++++ configure.in	2004-08-26 15:40:08.283123560 +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")
+ 
++AC_ARG_ENABLE(gdk, [  --enable-gdk            enable gdk_imlib compilation [default=yes]],[
++  if test x$enableval = xyes; then
++    disable_gdk="no"
++  else
++    disable_gdk="yes"
++  fi],disable_gdk=no)
++
++if test x$disable_gdk = xno; then
++ 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 --git a/media-libs/imlib/imlib-1.9.14-r3.ebuild b/media-libs/imlib/imlib-1.9.14-r3.ebuild
index 60a633e6db99..d37ecb6b4ada 100644
--- a/media-libs/imlib/imlib-1.9.14-r3.ebuild
+++ b/media-libs/imlib/imlib-1.9.14-r3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.14-r3.ebuild,v 1.9 2005/04/29 00:03:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.14-r3.ebuild,v 1.10 2005/05/31 06:48:43 leonardop Exp $
 
 inherit gnome.org libtool eutils
 
-DESCRIPTION="general image loading and rendering library"
-HOMEPAGE="http://developer.gnome.org/arch/imaging/imlib.html"
+DESCRIPTION="Image loading and rendering library"
+HOMEPAGE="http://www.enlightenment.org/Libraries/Imlib.html"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-libs/imlib/imlib-1.9.15.ebuild b/media-libs/imlib/imlib-1.9.15.ebuild
new file mode 100644
index 000000000000..df708bea8536
--- /dev/null
+++ b/media-libs/imlib/imlib-1.9.15.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/05/31 06:48:43 leonardop Exp $
+
+inherit eutils gnome.org libtool
+
+DESCRIPTION="Image loading and rendering library"
+HOMEPAGE="http://www.enlightenment.org/Libraries/Imlib.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk static"
+
+RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
+	>=media-libs/tiff-3.5.5
+	>=media-libs/giflib-4.1.0
+	>=media-libs/libpng-1.2.1
+	>=media-libs/jpeg-6b"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	sys-devel/automake"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fix config script #3425
+	sed -i \
+		-e "49,51D" \
+		-e "55,57D" \
+		imlib-config.in
+
+	#Security fix for bug #72681
+	epatch "${FILESDIR}"/${PN}-1.9.14-sec2.patch
+	# shutup aclocal
+	epatch "${FILESDIR}"/${PN}-1.9.14-m4.patch
+	# Add configure switch to enable/disable Gdk functions. See bug #40453.
+	epatch ${FILESDIR}/${P}-gdk_flag.patch
+
+	autoconf || die "autoconf failed"
+	automake || die "automake failed"
+
+	elibtoolize
+}
+
+src_compile() {
+	local myconf="--sysconfdir=/etc/imlib $(use_enable static) \
+		$(use_enable gtk gdk) $(use_enable gtk gtktest)"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	einstall \
+		includedir="${D}"/usr/include \
+		sysconfdir="${D}"/etc/imlib \
+		|| die
+	preplib /usr
+
+	dodoc AUTHORS ChangeLog README NEWS
+	dohtml -r doc
+}
+
+pkg_postinst() {
+	if ! use gtk; then
+		ewarn "You have installed Imlib without support for Gdk. This may"
+		ewarn "cause problems with packages that depend on the libgdk_imlib"
+		ewarn "library. To install the complete set of Imlib libraries, please"
+		ewarn "emerge it again with the 'gtk' USE flag enabled."
+	fi
+}