Fix loaders when using python/perl/etc... #78112.

(Portage version: 2.0.51-r15)

4 files changed, 94 insertions, 2 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index e407187104fb..7b35ea054546 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/imlib2
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.37 2005/02/21 05:49:55 vapier Exp $
+
+*imlib2-1.2.0-r1 (21 Feb 2005)
+
+  21 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/imlib2-1.2.0-loaders.patch, +imlib2-1.2.0-r1.ebuild,
+  -imlib2-1.2.0.ebuild:
+  Fix loaders when using python/perl/etc... #78112.
 
 *imlib2-1.2.0.20041226 (08 Jan 2005)
 
diff --git a/media-libs/imlib2/files/digest-imlib2-1.2.0 b/media-libs/imlib2/files/digest-imlib2-1.2.0-r1
index f74c3378cdfe..f74c3378cdfe 100644
--- a/media-libs/imlib2/files/digest-imlib2-1.2.0
+++ b/media-libs/imlib2/files/digest-imlib2-1.2.0-r1
diff --git a/media-libs/imlib2/files/imlib2-1.2.0-loaders.patch b/media-libs/imlib2/files/imlib2-1.2.0-loaders.patch
new file mode 100644
index 000000000000..2651f4141e0c
--- /dev/null
+++ b/media-libs/imlib2/files/imlib2-1.2.0-loaders.patch
@@ -0,0 +1,79 @@
+--- imlib2-1.2.0.orig/src/modules/loaders/Makefile.in
++++ imlib2-1.2.0/src/modules/loaders/Makefile.in
+@@ -113,52 +113,52 @@
+ 
+ 
+ jpeg_la_SOURCES = loader_jpeg.c
+-jpeg_la_LDFLAGS = -module -avoid-version
+-jpeg_la_LIBADD = @JPEGLIBS@
++jpeg_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
++jpeg_la_LIBADD = @JPEGLIBS@ -lImlib2
+ 
+ png_la_SOURCES = loader_png.c
+-png_la_LDFLAGS = -module -avoid-version
+-png_la_LIBADD = @PNGLIBS@
++png_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
++png_la_LIBADD = @PNGLIBS@ -lImlib2
+ 
+ tiff_la_SOURCES = loader_tiff.c
+-tiff_la_LDFLAGS = -module -avoid-version
+-tiff_la_LIBADD = @TIFFLIBS@
++tiff_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
++tiff_la_LIBADD = @TIFFLIBS@ -lImlib2
+ 
+ gif_la_SOURCES = loader_gif.c
+-gif_la_LDFLAGS = -module -avoid-version
+-gif_la_LIBADD = @GIFLIBS@
++gif_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
++gif_la_LIBADD = @GIFLIBS@ -lImlib2
+ 
+ zlib_la_SOURCES = loader_zlib.c
+-zlib_la_LDFLAGS = -module -avoid-version
+-zlib_la_LIBADD = @ZLIBLIBS@ 
++zlib_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
++zlib_la_LIBADD = @ZLIBLIBS@  -lImlib2
+ 
+ bz2_la_SOURCES = loader_bz2.c
+-bz2_la_LDFLAGS = -module -avoid-version
+-bz2_la_LIBADD = @BZ2LIBS@ 
++bz2_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
++bz2_la_LIBADD = @BZ2LIBS@  -lImlib2
+ 
+ pnm_la_SOURCES = loader_pnm.c
+-pnm_la_LDFLAGS = -module -avoid-version
+-pnm_la_LIBADD = 
++pnm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
++pnm_la_LIBADD =  -lImlib2
+ 
+ argb_la_SOURCES = loader_argb.c
+-argb_la_LDFLAGS = -module -avoid-version
+-argb_la_LIBADD = 
++argb_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
++argb_la_LIBADD =  -lImlib2
+ 
+ bmp_la_SOURCES = loader_bmp.c
+-bmp_la_LDFLAGS = -module -avoid-version
+-bmp_la_LIBADD = 
++bmp_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
++bmp_la_LIBADD =  -lImlib2
+ 
+ xpm_la_SOURCES = loader_xpm.c
+-xpm_la_LDFLAGS = -module -avoid-version
+-xpm_la_LIBADD = 
++xpm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
++xpm_la_LIBADD =  -lImlib2
+ 
+ tga_la_SOURCES = loader_tga.c
+-tga_la_LDFLAGS = -module -avoid-version
+-tga_la_LIBADD = 
++tga_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
++tga_la_LIBADD =  -lImlib2
+ 
+ lbm_la_SOURCES = loader_lbm.c
+-lbm_la_LDFLAGS = -module -avoid-version
+-lbm_la_LIBADD = 
++lbm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
++lbm_la_LIBADD =  -lImlib2
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/media-libs/imlib2/imlib2-1.2.0.ebuild b/media-libs/imlib2/imlib2-1.2.0-r1.ebuild
index 2b4cdc74472b..9b3f7fd9ee98 100644
--- a/media-libs/imlib2/imlib2-1.2.0.ebuild
+++ b/media-libs/imlib2/imlib2-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2005/01/08 09:00:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0-r1.ebuild,v 1.1 2005/02/21 05:49:55 vapier Exp $
 
 EHACKAUTOGEN=yes
 inherit enlightenment
@@ -18,6 +18,12 @@ DEPEND="=media-libs/freetype-2*
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	X? ( virtual/x11 )"
 
+src_unpack() {
+	enlightenment_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/${P}-loaders.patch
+}
+
 src_compile() {
 	local mymmx=""
 	if [ "${ARCH}" == "amd64" ] ; then