From ea63a1cbae80068763907ba694efd6f3b1465430 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 8 Jul 2010 21:22:08 +0000 Subject: [PATCH] Fixed hardcoded libdir and python paths leading to broken installation wrt bug #327171 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-gfx/exact-image/ChangeLog | 7 ++++++- media-gfx/exact-image/Manifest | 4 ++-- media-gfx/exact-image/exact-image-0.8.1.ebuild | 10 ++++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/media-gfx/exact-image/ChangeLog b/media-gfx/exact-image/ChangeLog index 6bcbc9092745..52c7d94d476d 100644 --- a/media-gfx/exact-image/ChangeLog +++ b/media-gfx/exact-image/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/exact-image # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/ChangeLog,v 1.3 2010/06/21 20:47:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/ChangeLog,v 1.4 2010/07/08 21:22:08 hwoarang Exp $ + + 08 Jul 2010; Markos Chandras + exact-image-0.8.1.ebuild: + Fixed hardcoded libdir and python paths leading to broken installation wrt + bug #327171 *exact-image-0.8.1 (21 Jun 2010) diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest index 2e591e3e9c0b..8e5ec65a9b1b 100644 --- a/media-gfx/exact-image/Manifest +++ b/media-gfx/exact-image/Manifest @@ -1,5 +1,5 @@ AUX exact-image-0.7.5-libpng14.patch 2431 RMD160 2d4a5bf1d2a6019a3a0dbb29eb4a3e2f42d63ab3 SHA1 40fb4b4b140d6958310226f4444521717ae903d9 SHA256 19c2ed561d37ca66543f5c778fa714b873d53289bf779f1482a76222ea5fb2ba DIST exact-image-0.8.1.tar.bz2 283660 RMD160 aa7b46540fca3a790cfb67529cb906fb2cab4088 SHA1 2aa8398d52b62cee5f62356fb81b0d1b8e7f6137 SHA256 926a09c897489705ba42daeb01fc4a3c327a8194dc65431f630d50684390e28b -EBUILD exact-image-0.8.1.ebuild 1994 RMD160 f638765a4dce1026ae3efcb1a3cd353b624996bd SHA1 e9f011387f712b880011c284c29fcd066162a05a SHA256 e5ea393d564205897fde1f79061e17e079b29d06e38ad139275f48f057f98ddb -MISC ChangeLog 854 RMD160 762bef169c61a65dbee80c536c67586d7b91615a SHA1 adf621747fbd6e093344c973516381a32489e86d SHA256 587029e49d6a8b822f8880db1f4365e75758f18585bf9167c43a084a2b2044a8 +EBUILD exact-image-0.8.1.ebuild 2237 RMD160 9d35865b2b317b48adcdd91e1be6b7c312004294 SHA1 3062099cfc8b079c91e58ccd0aecaef3ec22a09b SHA256 1ab26b0c81abe5e02a7cd48cf0148b6e5c33e7a679a33169dc28df1f24cac756 +MISC ChangeLog 1026 RMD160 5ec987c6f465fae521f304f2d5c0f9ff09b15dac SHA1 121769bb368505a3ee941176083b95065f4f9b47 SHA256 d75803c9b974323fe7007ece1ab2704af6e7e77acdec20003f43a3b4208c1b9e MISC metadata.xml 334 RMD160 12bdc101bd2eee4943e4f4b1edcb515b2c3391d6 SHA1 9c1a070cabea2437e41e8b0b11f580408d4ffa05 SHA256 d3b932743a46a3e1a3cb0effd6afdb1125e7ff26472ce392ec1fe4f67a743994 diff --git a/media-gfx/exact-image/exact-image-0.8.1.ebuild b/media-gfx/exact-image/exact-image-0.8.1.ebuild index 7fe104c45a85..9687826011c7 100644 --- a/media-gfx/exact-image/exact-image-0.8.1.ebuild +++ b/media-gfx/exact-image/exact-image-0.8.1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/exact-image-0.8.1.ebuild,v 1.1 2010/06/21 20:47:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/exact-image-0.8.1.ebuild,v 1.2 2010/07/08 21:22:08 hwoarang Exp $ EAPI=2 PYTHON_DEPEND="python? 2:2.5" -inherit eutils python +inherit eutils multilib python DESCRIPTION="A fast, modern and generic image processing library" HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/" @@ -48,7 +48,12 @@ pkg_setup() { } src_prepare() { + python_convert_shebangs -r 2 . epatch "${FILESDIR}"/${PN}-0.7.5-libpng14.patch + # fix python hardcoded path wrt bug #327171 + sed -i -e "s:python2.5:python$(python_get_version):" \ + -e "s:\$(libdir):usr/$(get_libdir):" \ + "${S}"/api/python/Makefile } src_configure() { @@ -58,6 +63,7 @@ src_configure() { ./configure \ --prefix=/usr \ + --libdir=/usr/$(get_libdir) \ $(use_with X x11) \ $(use_with truetype freetype) \ --without-evas \ -- 2.26.2