Version bump for security and fun #77002.

6 files changed, 19 insertions, 15 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index 2e6db1432591..e407187104fb 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/imlib2
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.35 2004/11/25 10:23:18 usata Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.36 2005/01/08 09:00:40 vapier Exp $
+
+*imlib2-1.2.0.20041226 (08 Jan 2005)
+
+  08 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  -imlib2-1.2.0.20041226.ebuild, +imlib2-1.2.0.ebuild, imlib2-9999.ebuild:
+  Version bump for security and fun #77002.
 
   25 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> imlib2-1.1.2.ebuild:
   Added to ~ppc-macos.
diff --git a/media-libs/imlib2/files/digest-imlib2-1.2.0 b/media-libs/imlib2/files/digest-imlib2-1.2.0
new file mode 100644
index 000000000000..f74c3378cdfe
--- /dev/null
+++ b/media-libs/imlib2/files/digest-imlib2-1.2.0
@@ -0,0 +1 @@
+MD5 853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz 890457
diff --git a/media-libs/imlib2/files/digest-imlib2-1.2.0.20041226 b/media-libs/imlib2/files/digest-imlib2-1.2.0.20041226
deleted file mode 100644
index 672526e546cf..000000000000
--- a/media-libs/imlib2/files/digest-imlib2-1.2.0.20041226
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c61d29f02abd81fb585380f0f47a736 imlib2-1.2.0.20041226.tar.bz2 595731
diff --git a/media-libs/imlib2/imlib2-1.1.2.ebuild b/media-libs/imlib2/imlib2-1.1.2.ebuild
index ddbb50806473..492cab8ea1cf 100644
--- a/media-libs/imlib2/imlib2-1.1.2.ebuild
+++ b/media-libs/imlib2/imlib2-1.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.1.2.ebuild,v 1.5 2004/11/25 10:23:18 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.1.2.ebuild,v 1.6 2005/01/08 09:00:40 vapier Exp $
 
 EHACKAUTOGEN=yes
 inherit enlightenment
diff --git a/media-libs/imlib2/imlib2-1.2.0.20041226.ebuild b/media-libs/imlib2/imlib2-1.2.0.ebuild
index c58b22f31fea..2b4cdc74472b 100644
--- a/media-libs/imlib2/imlib2-1.2.0.20041226.ebuild
+++ b/media-libs/imlib2/imlib2-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0.20041226.ebuild,v 1.1 2004/12/26 22:11:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0.ebuild,v 1.1 2005/01/08 09:00:40 vapier Exp $
 
 EHACKAUTOGEN=yes
 inherit enlightenment
@@ -12,8 +12,7 @@ HOMEPAGE="http://www.enlightenment.org/pages/imlib2.html"
 IUSE="X gif jpeg mmx png tiff"
 
 DEPEND="=media-libs/freetype-2*
-	gif? ( media-libs/libungif
-		>=media-libs/giflib-4.1.0 )
+	gif? ( || ( media-libs/libungif >=media-libs/giflib-4.1.0 ) )
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( media-libs/jpeg )
 	tiff? ( >=media-libs/tiff-3.5.5 )
@@ -24,12 +23,12 @@ src_compile() {
 	if [ "${ARCH}" == "amd64" ] ; then
 		mymmx="--disable-mmx"
 	else
-		mymmx="`use_enable mmx`"
+		mymmx="$(use_enable mmx)"
 	fi
 
 	export MY_ECONF="
 		${mymmx} \
-		`use_with X x` \
+		$(use_with X x) \
 	"
 	enlightenment_src_compile
 }
diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild
index 8927591ed255..387b9960a87c 100644
--- a/media-libs/imlib2/imlib2-9999.ebuild
+++ b/media-libs/imlib2/imlib2-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.2 2004/10/21 20:18:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.3 2005/01/08 09:00:40 vapier Exp $
 
 EHACKAUTOGEN=yes
 inherit enlightenment
@@ -12,8 +12,7 @@ HOMEPAGE="http://www.enlightenment.org/pages/imlib2.html"
 IUSE="X gif jpeg mmx png tiff"
 
 DEPEND="=media-libs/freetype-2*
-	gif? ( media-libs/libungif
-		>=media-libs/giflib-4.1.0 )
+	gif? ( || ( media-libs/libungif >=media-libs/giflib-4.1.0 ) )
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( media-libs/jpeg )
 	tiff? ( >=media-libs/tiff-3.5.5 )