back out of the no-X patches

4 files changed, 1 insertions, 320 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index 5c75f1af7bbb..eaac7ace9b76 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,18 +1,6 @@
 # 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.19 2003/11/02 15:24:39 azarah Exp $
-
-*imlib2-1.1.0-r2 (02 Nov 2003)
-
-  02 Nov 2003; Martin Schlemmer <azarah@gentoo.org> imlib2-1.1.0-r2.ebuild,
-  files/imlib2-1.1.0-no-xfree.patch:
-  Really fix bug #27169. Also elibtoolize, else the loaders and filters contain
-  invalid paths.
-
-*imlib2-1.1.0-r1 (01 Nov 2003)
-
-  01 Nov 2003; Martin Schlemmer <azarah@gentoo.org> imlib2-1.1.0-r1.ebuild:
-  Only depend on vitual/x11 if X in USE, bug #27169.
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.20 2003/11/08 19:07:15 vapier Exp $
 
 *imlib2-1.1.0 (07 Sep 2003)
 
diff --git a/media-libs/imlib2/files/digest-imlib2-1.1.0-r2 b/media-libs/imlib2/files/digest-imlib2-1.1.0-r2
deleted file mode 100644
index 303c53bc243d..000000000000
--- a/media-libs/imlib2/files/digest-imlib2-1.1.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1589ebb054da76734fe08ae570460034 imlib2-1.1.0.tar.gz 814851
diff --git a/media-libs/imlib2/files/imlib2-1.1.0-no-xfree.patch b/media-libs/imlib2/files/imlib2-1.1.0-no-xfree.patch
deleted file mode 100644
index 2e1894b0ca38..000000000000
--- a/media-libs/imlib2/files/imlib2-1.1.0-no-xfree.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-diff -urpN imlib2-1.1.0/filters/filter_bumpmap.c imlib2-1.1.0/filters/filter_bumpmap.c
---- imlib2-1.1.0/filters/filter_bumpmap.c	2003-11-02 15:02:22.294572888 +0000
-+++ imlib2-1.1.0/filters/filter_bumpmap.c	2003-11-02 15:03:43.319255264 +0000
-@@ -4,9 +4,13 @@
- 
- #include "common.h"
- #include <string.h>
--#include <X11/Xlib.h>
--#include <X11/extensions/XShm.h>
--#include <X11/Xutil.h>
-+
-+#ifndef X_DISPLAY_MISSING
-+#  include <X11/Xlib.h>
-+#  include <X11/extensions/XShm.h>
-+#  include <X11/Xutil.h>
-+#endif
-+
- #include <math.h>
- #include "image.h"
- #include "script.h"
-diff -urpN imlib2-1.1.0/filters/filter_colormod.c imlib2-1.1.0/filters/filter_colormod.c
---- imlib2-1.1.0/filters/filter_colormod.c	2003-11-02 15:02:22.294572888 +0000
-+++ imlib2-1.1.0/filters/filter_colormod.c	2003-11-02 15:03:29.122413512 +0000
-@@ -4,9 +4,13 @@
- 
- #include "common.h"
- #include <string.h>
--#include <X11/Xlib.h>
--#include <X11/extensions/XShm.h>
--#include <X11/Xutil.h>
-+
-+#ifndef X_DISPLAY_MISSING
-+#  include <X11/Xlib.h>
-+#  include <X11/extensions/XShm.h>
-+#  include <X11/Xutil.h>
-+#endif
-+
- #include <math.h>
- #include "image.h"
- #include "script.h"
-diff -urpN imlib2-1.1.0/filters/filter_test.c imlib2-1.1.0/filters/filter_test.c
---- imlib2-1.1.0/filters/filter_test.c	2003-11-02 15:02:22.294572888 +0000
-+++ imlib2-1.1.0/filters/filter_test.c	2003-11-02 15:04:05.331908832 +0000
-@@ -4,9 +4,13 @@
- 
- #include "common.h"
- #include <string.h>
--#include <X11/Xlib.h>
--#include <X11/extensions/XShm.h>
--#include <X11/Xutil.h>
-+
-+#ifndef X_DISPLAY_MISSING
-+#  include <X11/Xlib.h>
-+#  include <X11/extensions/XShm.h>
-+#  include <X11/Xutil.h>
-+#endif
-+
- #include "image.h"
- #include "script.h"
- #include "dynamic_filters.h"
-diff -urpN imlib2-1.1.0/loaders/loader_argb.c imlib2-1.1.0/loaders/loader_argb.c
---- imlib2-1.1.0/loaders/loader_argb.c	2003-11-02 15:08:47.456019448 +0000
-+++ imlib2-1.1.0/loaders/loader_argb.c	2003-11-02 15:09:18.607283736 +0000
-@@ -4,9 +4,13 @@
- 
- #include "common.h"
- #include <string.h>
--#include <X11/Xlib.h>
--#include <X11/extensions/XShm.h>
--#include <X11/Xutil.h>
-+
-+#ifndef X_DISPLAY_MISSING
-+#  include <X11/Xlib.h>
-+#  include <X11/extensions/XShm.h>
-+#  include <X11/Xutil.h>
-+#endif
-+
- #include "image.h"
- 
- char                load(ImlibImage * im, ImlibProgressFunction progress,
-diff -urpN imlib2-1.1.0/loaders/loader_bmp.c imlib2-1.1.0/loaders/loader_bmp.c
---- imlib2-1.1.0/loaders/loader_bmp.c	2003-11-02 15:08:47.456019448 +0000
-+++ imlib2-1.1.0/loaders/loader_bmp.c	2003-11-02 15:09:33.062086272 +0000
-@@ -10,9 +10,13 @@
- #include "common.h"
- #include <sys/stat.h>
- #include <string.h>
--#include <X11/Xlib.h>
--#include <X11/extensions/XShm.h>
--#include <X11/Xutil.h>
-+
-+#ifndef X_DISPLAY_MISSING
-+#  include <X11/Xlib.h>
-+#  include <X11/extensions/XShm.h>
-+#  include <X11/Xutil.h>
-+#endif
-+
- #include "image.h"
- 
- char                load(ImlibImage * im, ImlibProgressFunction progress,
-diff -urpN imlib2-1.1.0/loaders/loader_gif.c imlib2-1.1.0/loaders/loader_gif.c
---- imlib2-1.1.0/loaders/loader_gif.c	2003-11-02 15:08:47.455019600 +0000
-+++ imlib2-1.1.0/loaders/loader_gif.c	2003-11-02 15:09:48.290771160 +0000
-@@ -8,9 +8,13 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <string.h>
--#include <X11/Xlib.h>
--#include <X11/extensions/XShm.h>
--#include <X11/Xutil.h>
-+
-+#ifndef X_DISPLAY_MISSING
-+#  include <X11/Xlib.h>
-+#  include <X11/extensions/XShm.h>
-+#  include <X11/Xutil.h>
-+#endif
-+
- #include "image.h"
- #include <gif_lib.h>
- 
-diff -urpN imlib2-1.1.0/loaders/loader_jpeg.c imlib2-1.1.0/loaders/loader_jpeg.c
---- imlib2-1.1.0/loaders/loader_jpeg.c	2003-11-02 15:08:47.455019600 +0000
-+++ imlib2-1.1.0/loaders/loader_jpeg.c	2003-11-02 15:10:16.886423960 +0000
-@@ -4,9 +4,13 @@
- 
- #include "common.h"
- #include <string.h>
--#include <X11/Xlib.h>
--#include <X11/extensions/XShm.h>
--#include <X11/Xutil.h>
-+
-+#ifndef X_DISPLAY_MISSING
-+#  include <X11/Xlib.h>
-+#  include <X11/extensions/XShm.h>
-+#  include <X11/Xutil.h>
-+#endif
-+
- #include "image.h"
- #include <jpeglib.h>
- #include <setjmp.h>
-diff -urpN imlib2-1.1.0/loaders/loader_png.c imlib2-1.1.0/loaders/loader_png.c
---- imlib2-1.1.0/loaders/loader_png.c	2003-11-02 15:08:47.455019600 +0000
-+++ imlib2-1.1.0/loaders/loader_png.c	2003-11-02 15:10:31.836151256 +0000
-@@ -4,9 +4,13 @@
- 
- #include "common.h"
- #include <string.h>
--#include <X11/Xlib.h>
--#include <X11/extensions/XShm.h>
--#include <X11/Xutil.h>
-+
-+#ifndef X_DISPLAY_MISSING
-+#  include <X11/Xlib.h>
-+#  include <X11/extensions/XShm.h>
-+#  include <X11/Xutil.h>
-+#endif
-+
- #include "image.h"
- #include <png.h>
- 
-diff -urpN imlib2-1.1.0/loaders/loader_pnm.c imlib2-1.1.0/loaders/loader_pnm.c
---- imlib2-1.1.0/loaders/loader_pnm.c	2003-11-02 15:08:47.456019448 +0000
-+++ imlib2-1.1.0/loaders/loader_pnm.c	2003-11-02 15:10:42.770488984 +0000
-@@ -4,9 +4,13 @@
- 
- #include "common.h"
- #include <string.h>
--#include <X11/Xlib.h>
--#include <X11/extensions/XShm.h>
--#include <X11/Xutil.h>
-+
-+#ifndef X_DISPLAY_MISSING
-+#  include <X11/Xlib.h>
-+#  include <X11/extensions/XShm.h>
-+#  include <X11/Xutil.h>
-+#endif
-+
- #include <ctype.h>
- #include "image.h"
- 
-diff -urpN imlib2-1.1.0/loaders/loader_tga.c imlib2-1.1.0/loaders/loader_tga.c
---- imlib2-1.1.0/loaders/loader_tga.c	2003-11-02 15:08:47.457019296 +0000
-+++ imlib2-1.1.0/loaders/loader_tga.c	2003-11-02 15:10:54.655682160 +0000
-@@ -18,9 +18,13 @@
- #include <stdio.h>
- #include <string.h>
- #include <sys/stat.h>
--#include <X11/Xlib.h>
--#include <X11/extensions/XShm.h>
--#include <X11/Xutil.h>
-+
-+#ifndef X_DISPLAY_MISSING
-+#  include <X11/Xlib.h>
-+#  include <X11/extensions/XShm.h>
-+#  include <X11/Xutil.h>
-+#endif
-+
- #include "image.h"
- #include "colormod.h"
- #include "blend.h"
-diff -urpN imlib2-1.1.0/loaders/loader_tiff.c imlib2-1.1.0/loaders/loader_tiff.c
---- imlib2-1.1.0/loaders/loader_tiff.c	2003-11-02 15:08:47.455019600 +0000
-+++ imlib2-1.1.0/loaders/loader_tiff.c	2003-11-02 15:11:06.845828976 +0000
-@@ -7,9 +7,13 @@
- 
- #include "common.h"
- #include <string.h>
--#include <X11/Xlib.h>
--#include <X11/extensions/XShm.h>
--#include <X11/Xutil.h>
-+
-+#ifndef X_DISPLAY_MISSING
-+#  include <X11/Xlib.h>
-+#  include <X11/extensions/XShm.h>
-+#  include <X11/Xutil.h>
-+#endif
-+
- #include <setjmp.h>
- #include <stdarg.h>
- #include <stdio.h>
-diff -urpN imlib2-1.1.0/loaders/loader_xpm.c imlib2-1.1.0/loaders/loader_xpm.c
---- imlib2-1.1.0/loaders/loader_xpm.c	2003-11-02 15:08:47.456019448 +0000
-+++ imlib2-1.1.0/loaders/loader_xpm.c	2003-11-02 15:11:16.452368560 +0000
-@@ -8,9 +8,13 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <string.h>
--#include <X11/Xlib.h>
--#include <X11/extensions/XShm.h>
--#include <X11/Xutil.h>
-+
-+#ifndef X_DISPLAY_MISSING
-+#  include <X11/Xlib.h>
-+#  include <X11/extensions/XShm.h>
-+#  include <X11/Xutil.h>
-+#endif
-+
- #include "image.h"
- 
- char                load(ImlibImage * im, ImlibProgressFunction progress,
diff --git a/media-libs/imlib2/imlib2-1.1.0-r2.ebuild b/media-libs/imlib2/imlib2-1.1.0-r2.ebuild
deleted file mode 100644
index f94401850522..000000000000
--- a/media-libs/imlib2/imlib2-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,66 +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.1.0-r2.ebuild,v 1.1 2003/11/02 15:24:39 azarah Exp $
-
-inherit enlightenment flag-o-matic gcc libtool
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="http://www.enlightenment.org/pages/imlib2.html"
-SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
-
-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-2*
-	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 )
-	X? ( virtual/x11 )"
-
-#S=${WORKDIR}/${PN}		# cvs
-S=${WORKDIR}/${P}		# release
-
-
-src_unpack() {
-	unpack ${A}
-
-	elibtoolize
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-no-xfree.patch
-}
-
-src_compile() {
-	# cvs only stuff
-#	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}
-
-	replace-flags k6-3 i586
-	replace-flags k6-2 i586
-	replace-flags k6 i586
-	[ ${ARCH} = alpha ] && append-flags -fPIC
-
-	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
-}