From 78cf311d4c8fafed1227aad40ceb6538e0f93ba7 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 16 May 2010 18:25:37 +0000 Subject: [PATCH] =?utf8?q?Update=20libpng-1.4.x-update.sh=20to=20use=20qfi?= =?utf8?q?le=20for=20finding=20.la=20files=20(based=20on=20xcb-rebuilder.s?= =?utf8?q?h=20from=20x11-libs/libxcb,=20thanks=20to=20R=C3=A9mi=20Cardona?= =?utf8?q?=20for=20pointing=20this=20out).=20Package-Manager:=20portage-2.?= =?utf8?q?2=5Frc67/cvs/Linux=20x86=5F64?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- media-libs/libpng/ChangeLog | 8 ++++++- media-libs/libpng/Manifest | 4 ++-- .../libpng/files/libpng-1.4.x-update.sh | 22 ++++++++++--------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog index 80cbe8180d5a..8450f559e6aa 100644 --- a/media-libs/libpng/ChangeLog +++ b/media-libs/libpng/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/libpng # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.259 2010/05/13 20:05:17 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.260 2010/05/16 18:25:37 ssuominen Exp $ + + 16 May 2010; Samuli Suominen + files/libpng-1.4.x-update.sh: + Update libpng-1.4.x-update.sh to use qfile for finding .la files (based on + xcb-rebuilder.sh from x11-libs/libxcb, thanks to Rémi Cardona for + pointing this out). *libpng-1.2.43-r3 (13 May 2010) diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest index 536220e0e2d8..38a589a93184 100644 --- a/media-libs/libpng/Manifest +++ b/media-libs/libpng/Manifest @@ -1,8 +1,8 @@ -AUX libpng-1.4.x-update.sh 460 RMD160 7c65ff777394cc2d8e17cb928d63a8ead5a0498b SHA1 516992aeec7140285670ffec310d394351f304bc SHA256 d7005d2ba8829edd2da1ddde54d2c645e61d3360d4005d562d04a616c197d444 +AUX libpng-1.4.x-update.sh 377 RMD160 4c8a49afbf78f551a24c6cc0c262bce06876ea8f SHA1 896fdb1d858a1feaef8a3d19497bd1f7bb758fac SHA256 0ad63911f71c2b7f33eaebf563d91db6e96f2fb645c25aa023650625b1bf55c2 DIST libpng-1.2.43.tar.xz 538832 RMD160 18e56239433f21263b90a93c6ddb941a75a3a544 SHA1 c7013d773eb45b8ed6a864e419e544106a0dd95d SHA256 d634da73842dfd734811de9247403b0aeb16d292d58be2f04abb5c31b54b607a DIST libpng-1.4.2.tar.xz 527736 RMD160 3b813503b155cd9b00ba0a77f346bab8b0e82366 SHA1 d6a3ef20f5bb2c13f3d799bd23ffb9ee3dbc844f SHA256 a644469ab0620dcf19351b0739ea1ee6696feb4560b42575af7885a16dfef88e EBUILD libpng-1.2.43-r2.ebuild 722 RMD160 485feff086d6660ed3606a425c10920b2fd8b9be SHA1 62b5322ac426ff4860f433f378f2d85073ea2b3d SHA256 53f4b20d5fb91ca658e72e714ff6dc1d02e01632593490b148aa4c151677cc27 EBUILD libpng-1.2.43-r3.ebuild 1045 RMD160 ea369fdc74e0cc8eaf50462c18e8b267db77618d SHA1 11caaa88d98a4e3961d1b192373ffa9688de5a33 SHA256 b1e73fe2b8c2bf945e3d147858b541ad00633a420837d12f8280f2c271a9c4aa EBUILD libpng-1.4.2.ebuild 1148 RMD160 89add6e5a82fd04ac2defb0264ed3cc425f1765a SHA1 49ceecedcd2ba857eec820d7cb6a2ac5d32cd14f SHA256 796a55050f7d852cbe2033833e29c2911a13379e3f63c106f480daed4c958c66 -MISC ChangeLog 34620 RMD160 964c732d3de3cb72414475e04f45abbb37484d8a SHA1 67b7f167df0dc75969f7ada4702b5d841b272823 SHA256 46c42256e1bdaa5379cd15c643f127c73bfdfba0b755ca7d651b840a5bdd968d +MISC ChangeLog 34875 RMD160 d35b1085741be2f9657cf31d71e8b10c3d7e96db SHA1 f899f73050469c81f43fe31c51acdf6745a36742 SHA256 356b218a206abf4ecd66b9a1cae1c87263c22be5e79adf19023c840bbbe26e4b MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 diff --git a/media-libs/libpng/files/libpng-1.4.x-update.sh b/media-libs/libpng/files/libpng-1.4.x-update.sh index 8b0a695528d3..bdf54cb47710 100644 --- a/media-libs/libpng/files/libpng-1.4.x-update.sh +++ b/media-libs/libpng/files/libpng-1.4.x-update.sh @@ -1,14 +1,16 @@ #!/bin/bash -echo "Try revdep-rebuild first." -echo "This script will rename -lpng12 and libpng12.la to -lpng14 and libpng14.la" -echo "in your system libdir libtool .la files without asking permission." +. /etc/init.d/functions.sh -[[ -d /usr/lib64 ]] && lib_suffix=64 +if ! type -p qfile >/dev/null; then + einfo "Please install app-portage/portage-utils." + exit 1 +fi -libdir=/usr/lib${lib_suffix} - -find ${libdir} -name '*.la' | xargs sed -i -e '/^dependency_libs/s:-lpng12:-lpng14:' -find ${libdir} -name '*.la' | xargs sed -i -e '/^dependency_libs/s:libpng12.la:libpng14.la:' - -# WTFPL-2 +einfo "Fixing broken libtool archives (.la)" +for i in $(qlist -a | grep "\.la$"); do + sed -i \ + -e '/^dependency_libs/s:-lpng12:-lpng14:g' \ + -e '/^dependency_libs/s:libpng12.la:libpng14.la:g' \ + "${i}" 2>/dev/null +done -- 2.26.2