compensate for upstream weirdness

7 files changed, 43 insertions, 43 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index eba0ad30c4da..063bcc5ded20 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libpng
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.9 2002/07/08 15:52:23 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.10 2002/07/09 08:14:28 seemant Exp $
+
+*libpng-1.2.4 libpng-1.2.3-r1 (09 Jul 2002)
+
+  09 Jul 2002; Seemant Kulleen <seemant@gentoo.org> libpng-1.2.4.ebuild,
+  libpng-1.2.3-r1.ebuild files/digest-libpng-1.2.3-r1 :
+
+  added a check to see if /usr/lib/libpng.so.3.1.2.1 exists, and to remove
+  it if it does, in pkg_postinst(). This is because upstream screwed up
+  somehow between 1.2.1 and 1.2.3
 
 *libpng-1.2.4 (08 Jul 2002)
 
diff --git a/media-libs/libpng/files/digest-libpng-1.2.1-r1 b/media-libs/libpng/files/digest-libpng-1.2.1-r1
deleted file mode 100644
index 043d104e4d76..000000000000
--- a/media-libs/libpng/files/digest-libpng-1.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 75a21cbfae566158a0ac6d9f39087c4d libpng-1.2.1.tar.gz 493105
diff --git a/media-libs/libpng/files/digest-libpng-1.2.3 b/media-libs/libpng/files/digest-libpng-1.2.3-r1
index 15d3e5144e9d..15d3e5144e9d 100644
--- a/media-libs/libpng/files/digest-libpng-1.2.3
+++ b/media-libs/libpng/files/digest-libpng-1.2.3-r1
diff --git a/media-libs/libpng/libpng-1.0.12-r1.ebuild b/media-libs/libpng/libpng-1.0.12-r1.ebuild
index 80217292103d..59662bff9cb3 100644
--- a/media-libs/libpng/libpng-1.0.12-r1.ebuild
+++ b/media-libs/libpng/libpng-1.0.12-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Desktop Team <desktop@gentoo.org>
-# Author: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.0.12-r1.ebuild,v 1.3 2002/06/09 03:54:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.0.12-r1.ebuild,v 1.4 2002/07/09 08:14:28 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="libpng"
 SRC_URI="ftp://swrinde.nde.swri.edu/pub/png/src/${P}.tar.gz"
 HOMEPAGE="http://www.libpng.org/"
 SLOT="1.0"
-LICENSE="GPL-2"
+LICENSE="as-is"
+KEYWORDS="all"
+
 DEPEND=">=sys-libs/zlib-1.1.3-r2"
 
 
diff --git a/media-libs/libpng/libpng-1.2.1-r1.ebuild b/media-libs/libpng/libpng-1.2.1-r1.ebuild
deleted file mode 100644
index c5bf8c01df26..000000000000
--- a/media-libs/libpng/libpng-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Desktop Team <desktop@gentoo.org>
-# Author: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.1-r1.ebuild,v 1.2 2002/04/27 23:08:36 bangert Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="libpng"
-SRC_URI="ftp://swrinde.nde.swri.edu/pub/png/src/${P}.tar.gz"
-HOMEPAGE="http://www.libpng.org/"
-SLOT="1.2"
-DEPEND=">=sys-libs/zlib-1.1.4"
-
-src_compile() {
-	sed -e "s:ZLIBLIB=../zlib:ZLIBLIB=/usr/lib:"	\
-		-e "s:ZLIBINC=../zlib:ZLIBINC=/usr/include:"	\
-		-e "s:prefix=/usr:prefix=${D}/usr:" -e "s/-O3/${CFLAGS}/"	\
-			scripts/makefile.linux > Makefile
-
-	make || die
-}
-
-src_install() {
-	dodir /usr/{include,lib}
-	make 	\
-		prefix=${D}/usr	\
-		install || die
-
-	doman *.[35]
-	dodoc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
-}
diff --git a/media-libs/libpng/libpng-1.2.3.ebuild b/media-libs/libpng/libpng-1.2.3-r1.ebuild
index 20de4539e97d..28df198b7d35 100644
--- a/media-libs/libpng/libpng-1.2.3.ebuild
+++ b/media-libs/libpng/libpng-1.2.3-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Desktop Team <desktop@gentoo.org>
-# Author: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.3.ebuild,v 1.2 2002/06/05 05:19:39 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.3-r1.ebuild,v 1.1 2002/07/09 08:14:28 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="libpng"
 SRC_URI="ftp://swrinde.nde.swri.edu/pub/png/src/${P}.tar.gz"
 HOMEPAGE="http://www.libpng.org/"
 SLOT="1.2"
+LICENSE="as-is"
+KEYWORDS="*"
+
 DEPEND=">=sys-libs/zlib-1.1.4"
 
 src_compile() {
@@ -37,3 +38,13 @@ src_install() {
 	doman *.[35]
 	dodoc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
 }
+
+pkg_postinst() {
+
+	# compensate for an upstream screwup
+
+	if [ -f /usr/lib/libpng.so.3.1.2.1 ]
+	then
+		rm -f /usr/lib/libpng.so.3.1.2.1
+	fi
+}
diff --git a/media-libs/libpng/libpng-1.2.4.ebuild b/media-libs/libpng/libpng-1.2.4.ebuild
index 0f072bef8279..227f7a0bb002 100644
--- a/media-libs/libpng/libpng-1.2.4.ebuild
+++ b/media-libs/libpng/libpng-1.2.4.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.4.ebuild,v 1.1 2002/07/08 15:52:23 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.4.ebuild,v 1.2 2002/07/09 08:14:28 seemant Exp $
 
-# Maintainer: Desktop Team <desktop@gentoo.org>
-# Author: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
 
 S=${WORKDIR}/${P}
 DESCRIPTION="libpng"
 SRC_URI="ftp://swrinde.nde.swri.edu/pub/png/src/${P}.tar.gz"
 HOMEPAGE="http://www.libpng.org/"
 SLOT="1.2"
+LICENSE="as-is"
+KEYWORDS="*"
+
 DEPEND=">=sys-libs/zlib-1.1.4"
 
 src_compile() {
@@ -38,3 +39,14 @@ src_install() {
 	doman *.[35]
 	dodoc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
 }
+
+
+pkg_postinst() {
+	
+	# the libpng authors really screwed around between 1.2.1 and 1.2.3
+
+	if [ -f /usr/lib/libpng.so.3.1.2.1 ]
+	then
+		rm /usr/lib/libpng.so.3.1.2.1
+	fi
+}