fix need to merge twice for working installation

8 files changed, 81 insertions, 100 deletions

diff --git a/media-libs/gdk-pixbuf/ChangeLog b/media-libs/gdk-pixbuf/ChangeLog
index 70a22e90624d..2efaf7d29308 100644
--- a/media-libs/gdk-pixbuf/ChangeLog
+++ b/media-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/gdk-pixbuf
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/ChangeLog,v 1.1 2002/02/01 21:53:30 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/ChangeLog,v 1.2 2002/02/17 20:23:43 azarah Exp $
+
+  17 Feb 2002; M.Schlemmer <azarah@gentoo.org> gdk-pixbuf-0.16.0-r4.ebuild :
+
+  Fix the build to do the libraries in /usr/lib/gdk-pixbuf/loaders/ properly the
+  first time.  This is hackish at the moment, but seems to be a upstream
+  problem.  This should resolve the need to remerge gdk-pixbuf twice to get
+  mentioned libraries.
 
 *gdk-pixbuf-0.16.0-r1 (1 Feb 2002)
 
diff --git a/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.11.0 b/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.11.0
deleted file mode 100644
index 858abdc09b80..000000000000
--- a/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.11.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a4a61cadff79b27c0b1e1ab6e93baf79 gdk-pixbuf-0.11.0.tar.gz 459728
diff --git a/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.16.0-r2 b/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.16.0-r2
deleted file mode 100644
index a42280783e68..000000000000
--- a/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.16.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 941eb582ea273651945feb26299d8266 gdk-pixbuf-0.16.0.tar.gz 530090
diff --git a/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.16.0-r1 b/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.16.0-r4
index a42280783e68..a42280783e68 100644
--- a/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.16.0-r1
+++ b/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.16.0-r4
diff --git a/media-libs/gdk-pixbuf/gdk-pixbuf-0.11.0.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.11.0.ebuild
deleted file mode 100644
index dd8f482d12b6..000000000000
--- a/media-libs/gdk-pixbuf/gdk-pixbuf-0.11.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.11.0.ebuild,v 1.6 2002/02/13 17:03:37 g2boojum Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNOME Image Library"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz"
-
-DEPEND=">=x11-libs/gtk+-1.2.10-r4
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/jpeg"
-
-
-src_compile() {
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc/X11/gdk-pixbuf || die
-
-	emake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc/X11/gdk-pixbuf 			\
-	     install || die
-
-	dodoc AUTHORS COPYING* ChangeLog INSTALL README NEWS TODO
-}
diff --git a/media-libs/gdk-pixbuf/gdk-pixbuf-0.16.0-r1.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.16.0-r1.ebuild
deleted file mode 100644
index 180a68fbfed6..000000000000
--- a/media-libs/gdk-pixbuf/gdk-pixbuf-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.16.0-r1.ebuild,v 1.1 2002/01/23 16:21:56 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNOME Image Library"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz"
-
-DEPEND=">=x11-libs/gtk+-1.2.10-r4
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/jpeg
-        >=gnome-base/gnome-libs-1.4.1.2-r1"
-
-
-src_compile() {
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc/X11/gdk-pixbuf || die
-
-	emake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc/X11/gdk-pixbuf 			\
-	     install || die
-
-	dodoc AUTHORS COPYING* ChangeLog INSTALL README NEWS TODO
-}
diff --git a/media-libs/gdk-pixbuf/gdk-pixbuf-0.16.0-r2.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.16.0-r2.ebuild
deleted file mode 100644
index 8de8b16aeb97..000000000000
--- a/media-libs/gdk-pixbuf/gdk-pixbuf-0.16.0-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.16.0-r2.ebuild,v 1.1 2002/02/13 17:00:59 g2boojum Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNOME Image Library"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz"
-
-DEPEND=">=x11-libs/gtk+-1.2.10-r4
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/jpeg"
-
-
-src_compile() {
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc/X11/gdk-pixbuf || die
-
-	emake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc/X11/gdk-pixbuf 			\
-	     install || die
-
-	dodoc AUTHORS COPYING* ChangeLog INSTALL README NEWS TODO
-}
diff --git a/media-libs/gdk-pixbuf/gdk-pixbuf-0.16.0-r4.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.16.0-r4.ebuild
new file mode 100644
index 000000000000..090e8dc9fd3c
--- /dev/null
+++ b/media-libs/gdk-pixbuf/gdk-pixbuf-0.16.0-r4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.16.0-r4.ebuild,v 1.1 2002/02/17 20:23:43 azarah Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="GNOME Image Library"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz"
+
+DEPEND=">=x11-libs/gtk+-1.2.10-r4
+	media-libs/libpng
+	media-libs/tiff
+	media-libs/jpeg
+	dev-libs/glib
+	sys-libs/zlib
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
+# We need gnome-libs here, else gnome support do not get compiled into
+# gdk-pixbuf (the GnomeCanvasPixbuf library )
+
+src_unpack() {
+
+	unpack ${A}
+
+	cp ${S}/demo/Makefile.in ${S}/demo/Makefile.in.orig
+	sed -e 's:LDADD = :LDADD = $(LIBJPEG) $(LIBTIFF) $(LIBPNG) :' \
+		${S}/demo/Makefile.in.orig > ${S}/demo/Makefile.in
+}
+
+src_compile() {
+
+	./configure --host=${CHOST} \
+		    --prefix=/usr \
+		    --sysconfdir=/etc/X11/gdk-pixbuf || die
+
+	emake || die
+}
+
+src_install() {
+
+	make prefix=${D}/usr \
+	     sysconfdir=${D}/etc/X11/gdk-pixbuf \
+	     install || die
+
+	#fix the /usr/lib/gdk-pixbuf/loaders/* issue where they do
+	#not get installed on the first merge
+	rmdir ${D}/usr/lib/gdk-pixbuf/loaders >/dev/null 2>/dev/null
+	if [ $? -eq 0 ]
+	then
+		cd ${S}/gdk-pixbuf/.libs
+		dodir /usr/lib/gdk-pixbuf/loaders
+
+		for x in *U
+		do
+			mv $x ${x/U/}
+		done
+
+		exeinto /usr/lib/gdk-pixbuf/loaders
+		for x in libpixbufloader-*.so.?.*
+		do
+			doexe $x
+			dosym ${x##*/} /usr/lib/gdk-pixbuf/loaders/${x%%.so.*}.so
+			dosym ${x##*/} /usr/lib/gdk-pixbuf/loaders/${x%%.so.*}.so.1
+		done
+		insinto /usr/lib/gdk-pixbuf/loaders
+		doins libpixbufloader-*.{a,la}
+	fi
+
+	chmod a+rx ${D}/usr/lib/gdk-pixbuf/loaders
+	chmod a+r ${D}/usr/lib/gdk-pixbuf/loaders/*
+
+	dodoc AUTHORS COPYING* ChangeLog INSTALL README NEWS TODO
+}
+