8 files changed, 20 insertions, 120 deletions
diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index ba5b3f7b59e8..903f86d92c81 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/imlib2
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.16 2003/09/07 09:17:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.17 2003/09/08 03:35:25 vapier Exp $
+
+*imlib2-1.1.0 (07 Sep 2003)
+
+  07 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Now the real release :) (fixes #28126)
 
 *imlib2-1.1.0.20030906 (07 Sep 2003)
 
diff --git a/media-libs/imlib2/files/digest-imlib2-1.0.6.20030220-r1 b/media-libs/imlib2/files/digest-imlib2-1.0.6.20030220-r1
deleted file mode 100644
index a3a2a14360d1..000000000000
--- a/media-libs/imlib2/files/digest-imlib2-1.0.6.20030220-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8028f6ba736fa1dbacdcdb701058797 imlib2-1.0.6.20030220.tar.bz2 564221
diff --git a/media-libs/imlib2/files/digest-imlib2-1.0.7.20030629 b/media-libs/imlib2/files/digest-imlib2-1.0.7.20030629
deleted file mode 100644
index df38f42da8d0..000000000000
--- a/media-libs/imlib2/files/digest-imlib2-1.0.7.20030629
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6891cb518b735147df0099efb0aea4d8 imlib2-1.0.7.20030629.tar.bz2 567610
diff --git a/media-libs/imlib2/files/digest-imlib2-1.1.0 b/media-libs/imlib2/files/digest-imlib2-1.1.0
new file mode 100644
index 000000000000..303c53bc243d
--- /dev/null
+++ b/media-libs/imlib2/files/digest-imlib2-1.1.0
@@ -0,0 +1 @@
+MD5 1589ebb054da76734fe08ae570460034 imlib2-1.1.0.tar.gz 814851
diff --git a/media-libs/imlib2/files/digest-imlib2-1.1.0.20030906 b/media-libs/imlib2/files/digest-imlib2-1.1.0.20030906
deleted file mode 100644
index 12acbf8394d6..000000000000
--- a/media-libs/imlib2/files/digest-imlib2-1.1.0.20030906
+++ /dev/null
@@ -1 +0,0 @@
-MD5 483d4af75e6ec9ccb874dfd92bce4dec imlib2-1.1.0.20030906.tar.bz2 556015
diff --git a/media-libs/imlib2/imlib2-1.0.6.20030220-r1.ebuild b/media-libs/imlib2/imlib2-1.0.6.20030220-r1.ebuild
deleted file mode 100644
index 281e9899b89e..000000000000
--- a/media-libs/imlib2/imlib2-1.0.6.20030220-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.0.6.20030220-r1.ebuild,v 1.7 2003/08/26 18:39:04 carpaski Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="http://www.enlightenment.org/pages/imlib2.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://wh0rd.tk/gentoo/distfiles/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~alpha ~mips ~arm ~hppa ~sparc amd64"
-IUSE="mmx gif png jpeg tiff static X"
-
-DEPEND="=media-libs/freetype-1*
-	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 )
-	virtual/x11"
-
-S=${WORKDIR}/${PN}
-
-replace-flags k6-3 i586
-replace-flags k6-2 i586
-replace-flags k6 i586
-[ $ARCH = alpha ] && append-flags -fPIC
-
-src_compile() {
-	cp autogen.sh{,.old}
-	sed -e 's:.*configure.*::' autogen.sh.old > autogen.sh
-	env USER=blah WANT_AUTOCONF_2_5=1 ./autogen.sh || die "could not autogen"
-
-	local myconf="--sysconfdir=/etc/X11/imlib --with-gnu-ld"
-	myconf="${myconf} `use_enable mmx` `use_with X x`"
-	econf ${myconf} || die "could not configure"
-	emake || die "could not make"
-}
-
-src_install() {
-	make prefix=${D}/usr sysconfdir=${D}/etc/X11/imlib install || die
-	dodoc AUTHORS ChangeLog README TODO
-	dohtml -r doc
-	docinto samples
-	dodoc demo/*.c
-}
diff --git a/media-libs/imlib2/imlib2-1.0.7.20030629.ebuild b/media-libs/imlib2/imlib2-1.0.7.20030629.ebuild
deleted file mode 100644
index da7853461019..000000000000
--- a/media-libs/imlib2/imlib2-1.0.7.20030629.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.0.7.20030629.ebuild,v 1.3 2003/08/26 03:49:20 vapier Exp $
-
-inherit enlightenment flag-o-matic
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="http://www.enlightenment.org/pages/imlib2.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://wh0rd.tk/gentoo/distfiles/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~mips ~arm ~hppa ~sparc ~amd64"
-IUSE="${IUSE} mmx gif png jpeg tiff static X"
-
-DEPEND="${DEPEND}
-	=media-libs/freetype-1*
-	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 )
-	virtual/x11"
-
-S=${WORKDIR}/${PN}
-
-replace-flags k6-3 i586
-replace-flags k6-2 i586
-replace-flags k6 i586
-[ ${ARCH} = alpha ] && append-flags -fPIC
-
-src_compile() {
-	cp autogen.sh{,.old}
-	sed -e 's:.*configure.*::' autogen.sh.old > autogen.sh
-	env USER=blah WANT_AUTOCONF_2_5=1 ./autogen.sh || die "could not autogen"
-	cd libltdl
-	env WANT_AUTOCONF_2_5=1 autoconf || die
-	cd ${S}
-
-	econf \
-		`use_enable mmx` \
-		`use_with X x` \
-		--sysconfdir=/etc/X11/imlib \
-		|| die "could not configure"
-	emake || die "could not make"
-}
-
-src_install() {
-	make prefix=${D}/usr sysconfdir=${D}/etc/X11/imlib install || die
-	dodoc AUTHORS ChangeLog README TODO
-	dohtml -r doc
-	docinto samples
-	dodoc demo/*.c
-}
diff --git a/media-libs/imlib2/imlib2-1.1.0.20030906.ebuild b/media-libs/imlib2/imlib2-1.1.0.ebuild
index 16a0e90db9d6..54b974014cc8 100644
--- a/media-libs/imlib2/imlib2-1.1.0.20030906.ebuild
+++ b/media-libs/imlib2/imlib2-1.1.0.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.1.0.20030906.ebuild,v 1.1 2003/09/07 09:17:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.1.0.ebuild,v 1.1 2003/09/08 03:35:25 vapier Exp $
 
-inherit enlightenment flag-o-matic
+inherit enlightenment flag-o-matic gcc
 
 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
 HOMEPAGE="http://www.enlightenment.org/pages/imlib2.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://wh0rd.tk/gentoo/distfiles/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
+#mirror://gentoo/${P}.tar.bz2
+#http://wh0rd.tk/gentoo/distfiles/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
@@ -15,7 +16,7 @@ KEYWORDS="~x86 ~ppc ~alpha ~mips ~arm ~hppa ~sparc ~amd64"
 IUSE="${IUSE} mmx gif png jpeg tiff static X"
 
 DEPEND="${DEPEND}
-	=media-libs/freetype-1*
+	=media-libs/freetype-2*
 	gif? ( media-libs/libungif
 		>=media-libs/giflib-4.1.0 )
 	png? ( >=media-libs/libpng-1.2.1 )
@@ -23,7 +24,7 @@ DEPEND="${DEPEND}
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	virtual/x11"
 
-S=${WORKDIR}/${PN}
+#S=${WORKDIR}/${PN}
 
 replace-flags k6-3 i586
 replace-flags k6-2 i586
@@ -31,12 +32,12 @@ replace-flags k6 i586
 [ ${ARCH} = alpha ] && append-flags -fPIC
 
 src_compile() {
-	cp autogen.sh{,.old}
-	sed -e 's:.*configure.*::' autogen.sh.old > autogen.sh
-	env USER=blah WANT_AUTOCONF_2_5=1 ./autogen.sh || die "could not autogen"
-	cd libltdl
-	env WANT_AUTOCONF_2_5=1 autoconf || die
-	cd ${S}
+#	cp autogen.sh{,.old}
+#	sed -e 's:.*configure.*::' autogen.sh.old > autogen.sh
+#	env USER=blah WANT_AUTOCONF_2_5=1 ./autogen.sh || die "could not autogen"
+#	cd libltdl
+#	env WANT_AUTOCONF_2_5=1 autoconf || die
+#	cd ${S}
 
 	econf \
 		`use_enable mmx` \