Version bump for security and fun #77002.

8 files changed, 35 insertions, 31 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/Manifest b/media-libs/imlib2/Manifest
index cdb1cd071c73..a05e6f2c458a 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c986b372a87c99f51b112474ec088ee1 ChangeLog 3484
-MD5 5d3f9c840dd85395c89ca8619bb40660 imlib2-1.1.2.ebuild 1024
+MD5 360eddefd2236446a2023568329ee3e6 ChangeLog 3693
+MD5 6a421e15e38c966d3e142c490bc94d0e imlib2-1.1.2.ebuild 1025
 MD5 0c36280f1141c2ab86d0bd09ceec038a metadata.xml 2284
-MD5 441eec17aad20b5af3479a26f7d30473 imlib2-1.2.0.20041226.ebuild 961
-MD5 4c52a220713b0a27da0c6dc34c2da8c2 imlib2-9999.ebuild 953
-MD5 b9ac522955bfb7a3812ef7766db8b31c files/digest-imlib2-1.2.0.20041226 74
+MD5 1dc08c470d4cd11b838245387d7347ea imlib2-9999.ebuild 958
+MD5 102926d277b830c52b0d098a20c664ca imlib2-1.2.0.ebuild 959
+MD5 00966d224a91444676648c49ecc1eaf4 files/digest-imlib2-1.2.0 64
 MD5 78f8f17705b3e58fd3f15a898dfa2e25 files/digest-imlib2-1.1.2 64
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-imlib2-9999 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFBzzcoroRuSHgZdywRAr3jAJ44qwuzZIe5Wiajni+wXKH6GtDuHACggOzx
-DcCZ5Gb8NrORsyrgYGK/QD0=
-=7Z43
+iD8DBQFB36FMroRuSHgZdywRAqTpAJ9SDlp+hMPCiqAbMy57ONKQMv/xCwCeK17I
+wiIrwwcvMO/YMg4/nxJyKFo=
+=+LFi
 -----END PGP SIGNATURE-----
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 )
diff --git a/media-libs/libungif/Manifest b/media-libs/libungif/Manifest
index 2aa25885e388..1d83afc9e3fa 100644
--- a/media-libs/libungif/Manifest
+++ b/media-libs/libungif/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0b95e0489f0465015b61ff5a36094010 ChangeLog 3053
-MD5 023fdba0c5061f88719c5097813f1b6f libungif-4.1.0.1b.ebuild 2181
-MD5 c64f165c5de28bdf877b9f7892e294c2 libungif-4.1.3.ebuild 2027
+MD5 dbb98f5f6958742940cca118c0801dd1 ChangeLog 3169
+MD5 9fc39149d10338732478469a31d56631 libungif-4.1.0.1b.ebuild 2182
+MD5 a2fab39d46d6906e117345537630c78b libungif-4.1.3.ebuild 1929
 MD5 f71b3a2bf523f503987501c602a1c1e9 files/digest-libungif-4.1.0.1b 69
 MD5 4dce5cb6bb39518676e2056624963e1a files/libungif-4.1.0-stdarg.patch 655
 MD5 934f005d68b860ad80eff92ecf9e0273 files/libungif-CVS.patch 4542
 MD5 c8f7239f2db03a50ebcc2bd24a0cf8d0 files/digest-libungif-4.1.3 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFBjI7aVWNWqTUmv+0RAvQQAKCiJuZrgxCmaINJmEpqhAjhDSoDxQCfTXZf
-hCvc8s0H2cEPg6fHumQXCzc=
-=fY6l
+iD8DBQFB36HkroRuSHgZdywRAl3IAKCG4yEadGgzcyUXhTC8dn0vIKZfiACfVPUz
+g+RjjtDBwIFkyktna5IiVi4=
+=HxQe
 -----END PGP SIGNATURE-----