Use own created cmakescript instead of patching up Makefile.

Get rid of problematic one. Add ppc keyword.
Fixes bug #249312 and bug #249567.
Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo x86_64

5 files changed, 29 insertions, 70 deletions

diff --git a/media-libs/glpng/ChangeLog b/media-libs/glpng/ChangeLog
index 7617b31c2428..4f1fdc22364d 100644
--- a/media-libs/glpng/ChangeLog
+++ b/media-libs/glpng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/glpng
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/ChangeLog,v 1.2 2008/12/02 01:30:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/ChangeLog,v 1.3 2008/12/02 13:54:49 scarabeus Exp $
+
+*glpng-1.45-r1 (02 Dec 2008)
+
+  02 Dec 2008; Tomas Chvatal <scarabeus@gentoo.org> -files/Makefile,
+  -glpng-1.45.ebuild, +glpng-1.45-r1.ebuild:
+  Revision bump. Use own created cmakescript instead of patching up
+  Makefile. Get rid of problematic one. Add ppc keyword.
 
   02 Dec 2008; Tomas Chvatal <scarabeus@gentoo.org> files/Makefile:
   Update Makefile and make default LDFLAGS in it.
diff --git a/media-libs/glpng/Manifest b/media-libs/glpng/Manifest
index f028e6295496..c58e4729ad16 100644
--- a/media-libs/glpng/Manifest
+++ b/media-libs/glpng/Manifest
@@ -1,5 +1,4 @@
-AUX Makefile 1007 RMD160 4e86f85798a2c06a6bbc4f2895b69f9b1cbd143b SHA1 68269199a61888a5918af1cbafc7191ab9362114 SHA256 587eec421d1c02f3895d2699503c6b61692100e1384e6bdb9f1ff5e1d91628f9
-DIST glpng.zip 309337 RMD160 797a4b68b54b0681e0c84e26a7962b24329eaddd SHA1 9678f9627b011eb5d4ac222673dfdde8539c6409 SHA256 5f7c785acb00de6f7bcf53b1c2c94ddc07de3ef1b1f85c5bfc6483e89fa22223
-EBUILD glpng-1.45.ebuild 827 RMD160 d98bd3a13f1cfaaa11d830a28b016b3dd853cfe4 SHA1 bb106fbe82d6b0239761a13fc147960a89e9105e SHA256 226ffcf7aee2e959ad99d0130b9a1990eb2e526e8357dcd6c7536f94f0f640b9
-MISC ChangeLog 645 RMD160 46c4770ad7712311421fbf17674410c537a69d87 SHA1 ecef95b859bf12ae9b195e972f0233cccb2406d0 SHA256 3823d6fe156162479eb9862b6115a568ac8e196a77f41a255b52457168608edd
+DIST glpng-1.45.tar.bz2 64426 RMD160 994ffa788e3a7ebc314c56160c36496e39a12958 SHA1 7644769957d597032480e2d70d39f44b26c2b512 SHA256 a002aa60f460b0f363267d10c79c730b9dba4c834d0ee43eac15460c2e05f2e8
+EBUILD glpng-1.45-r1.ebuild 534 RMD160 8da8aace4c86844296b5082bca085aa69f06f4ac SHA1 3a81b170d0815743587754ad8d2042827c8a6516 SHA256 0b2bcec3290aa9ed980ec276c659b8df5d530bcf5461ffbe94c1b341e2c6c452
+MISC ChangeLog 915 RMD160 2cc0b3c56c18af4357ac88201b288a19b5842e66 SHA1 b5e8b3c675eb7ed6ad209a8d1af7e7d2912d7bac SHA256 f69e79f6d9ef83f61a1fd87cc788a699ba194cd867707eeba36c67ff283c26e1
 MISC metadata.xml 250 RMD160 174bcaa9210d4faefadfb58326df11c787a891ae SHA1 60322be503647adecc133838c3dfef2d1ee169da SHA256 1e21cdb93854b93981b9e2baff7d029e35c4be1a21dc351085d9f51a877fdc9d
diff --git a/media-libs/glpng/files/Makefile b/media-libs/glpng/files/Makefile
deleted file mode 100644
index 7bd7d6719668..000000000000
--- a/media-libs/glpng/files/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for:	glpng
-# Date created:		06 Mar 2006
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
-# $FreeBSD: ports/graphics/glpng/Makefile,v 1.6 2008/06/19 17:28:19 amdmi3 Exp $
-#
-
-LIB_DEPENDS=	/usr/lib/libpng.so
-
-AR?=		/usr/bin/ar
-LN?=		/bin/ln
-INSTALL_DATA?=	/bin/cp
-MKDIR?=		/bin/mkdir
-DESTDIR?=	/
-LDFLAGS?=	-Wl
-PREFIX=		${DESTDIR}/usr
-WRKSRC=		/src
-LOCALBASE= ./
-LD = /usr/bin/ld
-all:
-	${CC} ${CFLAGS} -fPIC -I${LOCALBASE}/include -c -o ${WRKSRC}/libglpng.o ${LDFLAGS} ${WRKSRC}/glpng.c
-	${CC} ${CFLAGS} -L${LOCALBASE}/lib -shared -soname -lGL -lpng -lz -lm -o ${WRKSRC}/libglpng.so.1 ${LDFLAGS},-soname=libglpng.so.1 ${WRKSRC}/libglpng.o
-	${AR} cqs ${WRKSRC}/libglpng.a ${WRKSRC}/libglpng.o
-
-install:
-	${MKDIR} -p ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libglpng.so.1 ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libglpng.a ${PREFIX}/lib
-	${LN} -sf libglpng.so.1 ${PREFIX}/lib/libglpng.so
-	${MKDIR} -p ${PREFIX}/include/GL/
-	${INSTALL_DATA} include/GL/glpng.h ${PREFIX}/include/GL/
diff --git a/media-libs/glpng/glpng-1.45-r1.ebuild b/media-libs/glpng/glpng-1.45-r1.ebuild
new file mode 100644
index 000000000000..46872506299e
--- /dev/null
+++ b/media-libs/glpng/glpng-1.45-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/glpng-1.45-r1.ebuild,v 1.1 2008/12/02 13:54:49 scarabeus Exp $
+
+inherit cmake-utils
+
+DESCRIPTION="An OpenGL png image library"
+HOMEPAGE="http://www.fifi.org/doc/libglpng-dev/glpng.html"
+SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/opengl
+	media-libs/libpng
+	sys-libs/zlib"
diff --git a/media-libs/glpng/glpng-1.45.ebuild b/media-libs/glpng/glpng-1.45.ebuild
deleted file mode 100644
index db14bf735469..000000000000
--- a/media-libs/glpng/glpng-1.45.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/glpng-1.45.ebuild,v 1.1 2008/11/28 19:57:34 scarabeus Exp $
-
-inherit eutils
-
-DESCRIPTION="An OpenGL png image library"
-HOMEPAGE="http://www.fifi.org/doc/libglpng-dev/glpng.html"
-SRC_URI="http://www.amdmi3.ru/distfiles/${PN}.zip"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	media-libs/libpng"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	cp "${FILESDIR}"/Makefile "${S}"/Makefile
-	sed -i \
-		-e "s:\"png/png.h\":<png.h>:" \
-		"${S}"/src/glpng.c || die "sed glpng.c failed"
-	sed -i \
-		-e "s:/src:${S}/src:" \
-		"${S}"/Makefile || die "sed Makefile failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-}