From 56e29670aab133555c6fe8ed20722701e8e33994 Mon Sep 17 00:00:00 2001 From: Seemant Kulleen Date: Sat, 6 Jan 2007 23:46:27 +0000 Subject: [PATCH] put a versioned and compressed manual on the gentoo mirrors, to fix bug #146921, once and for all. I've also sent an email upstream requesting that they version the libpng-manual.txt file as well, so that we do not have to maintain it separately on our mirrors. Package-Manager: portage-2.1.2_rc4-r6 --- media-libs/libpng/ChangeLog | 10 +++++++++- media-libs/libpng/files/digest-libpng-1.2.14 | 6 +++--- media-libs/libpng/files/digest-libpng-1.2.14-r1 | 6 +++--- media-libs/libpng/files/digest-libpng-1.2.15 | 6 +++--- media-libs/libpng/libpng-1.2.14-r1.ebuild | 11 +++++------ media-libs/libpng/libpng-1.2.14.ebuild | 9 ++++----- media-libs/libpng/libpng-1.2.15.ebuild | 9 ++++----- 7 files changed, 31 insertions(+), 26 deletions(-) diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog index f47a8fa3d9da..c6dbfd8998e3 100644 --- a/media-libs/libpng/ChangeLog +++ b/media-libs/libpng/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-libs/libpng # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.110 2007/01/06 14:46:21 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.111 2007/01/06 23:46:27 seemant Exp $ + + 06 Jan 2007; Seemant Kulleen + -libpng-1.2.12-r1.ebuild, libpng-1.2.14.ebuild, libpng-1.2.14-r1.ebuild, + libpng-1.2.15.ebuild: + put a versioned and compressed manual on the gentoo mirrors, to fix bug + #146921, once and for all. I've also sent an email upstream requesting that + they version the libpng-manual.txt file as well, so that we do not have to + maintain it separately on our mirrors. 06 Jan 2007; Michael Cummings libpng-1.2.14.ebuild: Bug 159562, amd64 stable diff --git a/media-libs/libpng/files/digest-libpng-1.2.14 b/media-libs/libpng/files/digest-libpng-1.2.14 index 5ff5683f03fd..f2fd1fc410c0 100644 --- a/media-libs/libpng/files/digest-libpng-1.2.14 +++ b/media-libs/libpng/files/digest-libpng-1.2.14 @@ -1,6 +1,6 @@ MD5 2ec1e1beb2e6376b09d090f74d259160 libpng-1.2.14.tar.bz2 620379 RMD160 37c91bc411a8c4bc467bb8b229a4e39bcca4bd8a libpng-1.2.14.tar.bz2 620379 SHA256 2678855a235ed02d5b30831a70dff84d5b562c5de388f1323bd680ac5cdd1722 libpng-1.2.14.tar.bz2 620379 -MD5 a3e91d819c1a925c89b2d114336afa02 libpng-manual.txt 128288 -RMD160 7d145e2427b05f66f945bc8773725386f5090613 libpng-manual.txt 128288 -SHA256 0c6fc39145bbb2c61cbd9200abfd2eb0303b08c4622f33ad7aa9e4f28cb6fa2b libpng-manual.txt 128288 +MD5 699130f37c7806c58add4cc4ead159ac libpng-manual-1.2.14.txt.bz2 32067 +RMD160 458e2225f390caccfb2649bfbd1d88a323195f3b libpng-manual-1.2.14.txt.bz2 32067 +SHA256 5e561ba37b5a835a6fb489545d3b2cc9235b332922eff74744fbab44e4b9ac9b libpng-manual-1.2.14.txt.bz2 32067 diff --git a/media-libs/libpng/files/digest-libpng-1.2.14-r1 b/media-libs/libpng/files/digest-libpng-1.2.14-r1 index 5ff5683f03fd..f2fd1fc410c0 100644 --- a/media-libs/libpng/files/digest-libpng-1.2.14-r1 +++ b/media-libs/libpng/files/digest-libpng-1.2.14-r1 @@ -1,6 +1,6 @@ MD5 2ec1e1beb2e6376b09d090f74d259160 libpng-1.2.14.tar.bz2 620379 RMD160 37c91bc411a8c4bc467bb8b229a4e39bcca4bd8a libpng-1.2.14.tar.bz2 620379 SHA256 2678855a235ed02d5b30831a70dff84d5b562c5de388f1323bd680ac5cdd1722 libpng-1.2.14.tar.bz2 620379 -MD5 a3e91d819c1a925c89b2d114336afa02 libpng-manual.txt 128288 -RMD160 7d145e2427b05f66f945bc8773725386f5090613 libpng-manual.txt 128288 -SHA256 0c6fc39145bbb2c61cbd9200abfd2eb0303b08c4622f33ad7aa9e4f28cb6fa2b libpng-manual.txt 128288 +MD5 699130f37c7806c58add4cc4ead159ac libpng-manual-1.2.14.txt.bz2 32067 +RMD160 458e2225f390caccfb2649bfbd1d88a323195f3b libpng-manual-1.2.14.txt.bz2 32067 +SHA256 5e561ba37b5a835a6fb489545d3b2cc9235b332922eff74744fbab44e4b9ac9b libpng-manual-1.2.14.txt.bz2 32067 diff --git a/media-libs/libpng/files/digest-libpng-1.2.15 b/media-libs/libpng/files/digest-libpng-1.2.15 index 791ec5841d1f..ecd4b6ad86a9 100644 --- a/media-libs/libpng/files/digest-libpng-1.2.15 +++ b/media-libs/libpng/files/digest-libpng-1.2.15 @@ -1,6 +1,6 @@ MD5 184a3032a04d68827547cc75c6afbb3d libpng-1.2.15.tar.bz2 624008 RMD160 3fb0dcb7764c0fcb7bf349a617f3463869177aab libpng-1.2.15.tar.bz2 624008 SHA256 dc8350822da21eb40a9928aaded888bd29b674246f8997966b193306a1503156 libpng-1.2.15.tar.bz2 624008 -MD5 a3e91d819c1a925c89b2d114336afa02 libpng-manual.txt 128288 -RMD160 7d145e2427b05f66f945bc8773725386f5090613 libpng-manual.txt 128288 -SHA256 0c6fc39145bbb2c61cbd9200abfd2eb0303b08c4622f33ad7aa9e4f28cb6fa2b libpng-manual.txt 128288 +MD5 699130f37c7806c58add4cc4ead159ac libpng-manual-1.2.15.txt.bz2 32067 +RMD160 458e2225f390caccfb2649bfbd1d88a323195f3b libpng-manual-1.2.15.txt.bz2 32067 +SHA256 5e561ba37b5a835a6fb489545d3b2cc9235b332922eff74744fbab44e4b9ac9b libpng-manual-1.2.15.txt.bz2 32067 diff --git a/media-libs/libpng/libpng-1.2.14-r1.ebuild b/media-libs/libpng/libpng-1.2.14-r1.ebuild index b95c642b6300..741086d4dee2 100644 --- a/media-libs/libpng/libpng-1.2.14-r1.ebuild +++ b/media-libs/libpng/libpng-1.2.14-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.14-r1.ebuild,v 1.1 2006/12/31 13:37:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.14-r1.ebuild,v 1.2 2007/01/06 23:46:27 seemant Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -9,20 +9,19 @@ inherit eutils autotools multilib DESCRIPTION="Portable Network Graphics library" HOMEPAGE="http://www.libpng.org/" SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2 - doc? ( http://www.libpng.org/pub/png/libpng-manual.txt )" + doc? ( mirror://gentoo/${PN}-manual-${PV}.txt.bz2 )" LICENSE="as-is" SLOT="1.2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="doc" -RESTRICT="mirror" #146921 DEPEND="sys-libs/zlib" src_unpack() { - unpack ${P}.tar.bz2 + unpack ${A} cd "${S}" - use doc && cp "${DISTDIR}"/libpng-manual.txt . + use doc && cp "${DISTDIR}"/${PN}-manual-${PV}.txt ${PN}-manual.txt epatch "${FILESDIR}"/1.2.7-gentoo.diff epatch "${FILESDIR}"/${P}-mem-leak.patch #159216 diff --git a/media-libs/libpng/libpng-1.2.14.ebuild b/media-libs/libpng/libpng-1.2.14.ebuild index f211c5ed415e..b9d77e173911 100644 --- a/media-libs/libpng/libpng-1.2.14.ebuild +++ b/media-libs/libpng/libpng-1.2.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.14.ebuild,v 1.7 2007/01/06 14:46:21 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.14.ebuild,v 1.8 2007/01/06 23:46:27 seemant Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -9,20 +9,19 @@ inherit eutils autotools multilib DESCRIPTION="Portable Network Graphics library" HOMEPAGE="http://www.libpng.org/" SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2 - doc? ( http://www.libpng.org/pub/png/libpng-manual.txt )" + doc? ( mirror://gentoo/${PN}-manual-${PV}.txt.bz2 )" LICENSE="as-is" SLOT="1.2" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="doc" -RESTRICT="mirror" #146921 DEPEND="sys-libs/zlib" src_unpack() { - unpack ${P}.tar.bz2 + unpack ${A} cd "${S}" - use doc && cp "${DISTDIR}"/libpng-manual.txt . + use doc && cp "${DISTDIR}"/${PN}-manual-${PV}.txt ${PN}-manual.txt epatch "${FILESDIR}"/1.2.7-gentoo.diff diff --git a/media-libs/libpng/libpng-1.2.15.ebuild b/media-libs/libpng/libpng-1.2.15.ebuild index dd08e775bfcf..c5e8168746fb 100644 --- a/media-libs/libpng/libpng-1.2.15.ebuild +++ b/media-libs/libpng/libpng-1.2.15.ebuild @@ -1,26 +1,25 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.15.ebuild,v 1.1 2007/01/06 12:14:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.15.ebuild,v 1.2 2007/01/06 23:46:27 seemant Exp $ inherit eutils multilib DESCRIPTION="Portable Network Graphics library" HOMEPAGE="http://www.libpng.org/" SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2 - doc? ( http://www.libpng.org/pub/png/libpng-manual.txt )" + doc? ( mirror://gentoo/${PN}-manual-${PV}.txt.bz2 )" LICENSE="as-is" SLOT="1.2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="doc" -RESTRICT="mirror" #146921 DEPEND="sys-libs/zlib" src_unpack() { - unpack ${P}.tar.bz2 + unpack ${A} cd "${S}" - use doc && cp "${DISTDIR}"/libpng-manual.txt . + use doc && cp "${WORKDIR}"/${PN}-manual-${PV}.txt ${PN}-manual.txt epatch "${FILESDIR}"/1.2.7-gentoo.diff } -- 2.26.2