From 542f91e59d38f5632cc39df929b564ba0c0fb392 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 30 Nov 2011 18:41:29 +0000 Subject: [PATCH] Fix building on Prefix platforms, bug #385621 Package-Manager: portage-2.2.01.19572-prefix/cvs/Darwin i386 --- dev-perl/perl-tk/ChangeLog | 5 ++++- dev-perl/perl-tk/Manifest | 14 +++++++------- dev-perl/perl-tk/perl-tk-804.29.0.ebuild | 11 +++++++++-- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dev-perl/perl-tk/ChangeLog b/dev-perl/perl-tk/ChangeLog index c62f1bd2db9f..1b6e489862bd 100644 --- a/dev-perl/perl-tk/ChangeLog +++ b/dev-perl/perl-tk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-perl/perl-tk # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.83 2011/09/04 11:22:46 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.84 2011/11/30 18:41:29 grobian Exp $ + + 30 Nov 2011; Fabian Groffen perl-tk-804.29.0.ebuild: + Fix building on Prefix platforms, bug #385621 04 Sep 2011; Torsten Veller -perl-tk-804.029.ebuild: Cleanup diff --git a/dev-perl/perl-tk/Manifest b/dev-perl/perl-tk/Manifest index 8b7b97fe6b7d..f9fdbc4b4727 100644 --- a/dev-perl/perl-tk/Manifest +++ b/dev-perl/perl-tk/Manifest @@ -1,17 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX 804.028-path.patch 555 RMD160 d9950e90749c3e4ac4505b16f1652b6e29cde5fd SHA1 2366dfff98aa1e2cb80f504ba8962e695c1d462e SHA256 3b5466b95f1549886e25071d4609bba9bc8a2956a920cf727467c13614ee2563 AUX 804.029-X11_XLIB_H.patch 830 RMD160 61419ffc592546922a5ab6dc95d31091aab1d396 SHA1 d26b997ce3293d52b9cb413cb8726f887544f955 SHA256 a4dbec5e8b61bab63dd875d580f1fbb7715ee034b6495cc1b55a774c4e670252 AUX xorg.patch 1893 RMD160 17d6a59108c5ab150b5d71f9c3d147062c58d13a SHA1 487e0b4bf9e47e0de8e7a4bf4a3b1aaa88b37000 SHA256 f20d6f8c78b10f05cf02c02396cd699ddc66cd48de584eef6dc0b010894fea07 DIST Tk-804.029.tar.gz 6924235 RMD160 1feac57c5799c286a3e81258d3e7621b84b1cfc2 SHA1 1076d736e43fdf416c664bde0e4c3d035d6903e3 SHA256 41e31d393c29301918949d0f93d7d1a1f877777ac6e65cd92e11741c68a4bc7f -EBUILD perl-tk-804.29.0.ebuild 1034 RMD160 f8c2095ed101cc9fd302da39d856f9e2c5b5cc11 SHA1 f087197cf771e619dc50e9859304b67702283874 SHA256 a2033ea3662212831262f49c49af483b782e818bf16fae1e86e190b7c3db66be -MISC ChangeLog 10435 RMD160 436540913f8cc4f452ed18eac5cd877e80ecf430 SHA1 9931bf5be650ff65fc115a943a9cbb7c81eb9fde SHA256 472d88c94f6723d9ab04d6eb9f89b4dae59ff49ec3b5ba6fe804802d1c1ff90c +EBUILD perl-tk-804.29.0.ebuild 1221 RMD160 37dc6c03a6f0f5bfc2e9541a873c47fef09f8af8 SHA1 8e499173cad6824b551dcdc2cf3a6e86b85d8693 SHA256 8bd4e76e8791da7e627461a84efe1f161f5304452507fc6965d1f215a6bfd414 +MISC ChangeLog 10563 RMD160 1ef81385f888b912513c7e511a0f507e73337d4a SHA1 e6ad4f76b1e522c542516f11e75e622656acc9d9 SHA256 c9e54e0b9dac893512e0d9f08bfaad985567912c3ed28eac2c7f1069499cf492 MISC metadata.xml 228 RMD160 885e1e511eca7842c5663a97f16debb33479c350 SHA1 5efb0a5f6af6867c647d59502fe50f6b3da42b3b SHA256 9cb7e2563cdbf5a3bdd4a6ff056b6711a5ec1815572962bc3b4408382a2e11b4 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.18 (Darwin) -iEYEAREIAAYFAk5jYEAACgkQV3J2n04EauzU1gCfYNK4CK8zR/5fgq1TH9zyZiQK -pnUAnRtQ2J2g0VTa69fFFIDrOgeFU9sc -=FN+C +iEYEARECAAYFAk7WeN4ACgkQX3X2B8XHTokiswCfdKcXhOtyrdIuIu7rx6VAeT0N +aVAAn3xROgv0zlVmlKKxwRojFIAZHMe9 +=U8SB -----END PGP SIGNATURE----- diff --git a/dev-perl/perl-tk/perl-tk-804.29.0.ebuild b/dev-perl/perl-tk/perl-tk-804.29.0.ebuild index 8fd3b61e1a0e..df2d25fa3cf0 100644 --- a/dev-perl/perl-tk/perl-tk-804.29.0.ebuild +++ b/dev-perl/perl-tk/perl-tk-804.29.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/perl-tk-804.29.0.ebuild,v 1.3 2011/09/03 21:05:06 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/perl-tk-804.29.0.ebuild,v 1.4 2011/11/30 18:41:29 grobian Exp $ EAPI=4 @@ -28,9 +28,16 @@ SRC_TEST="skip" PATCHES=( "${FILESDIR}"/xorg.patch "${FILESDIR}"/804.028-path.patch "${FILESDIR}"/804.029-X11_XLIB_H.patch ) -# "${FILESDIR}"/${PN}-804.027-interix-x11.patch ) myconf="X11ROOT=${EPREFIX}/usr XFT=1 -I${EPREFIX}/usr/include/ -l${EPREFIX}/usr/$(get_libdir)" mydoc="ToDo VERSIONS" MAKEOPTS+=" -j1" #333049 + +src_prepare() { + perl-module_src_prepare + # fix detection logic for Prefix, bug #385621 + sed -i -e "s:/usr:${EPREFIX}/usr:g" myConfig || die + # having this around breaks with perl-module and a case-IN-sensitive fs + rm build || die +} -- 2.26.2