From bde4c9734addb0ce1fc1237b44fd9ef180fbf865 Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Tue, 1 Jun 2010 19:24:12 +0000 Subject: [PATCH] Fix compilation against latest dev-lang/ruby ebuild. Link against stdc++. Fix insecure RUNPATH. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- app-misc/booh/ChangeLog | 7 ++++++- app-misc/booh/Manifest | 13 +++++++------ app-misc/booh/booh-0.9.2.2.ebuild | 5 ++++- app-misc/booh/files/booh-0.9.2.2-stdc.patch | 11 +++++++++++ 4 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 app-misc/booh/files/booh-0.9.2.2-stdc.patch diff --git a/app-misc/booh/ChangeLog b/app-misc/booh/ChangeLog index 2d989b724fff..f1c9cfb98bd9 100644 --- a/app-misc/booh/ChangeLog +++ b/app-misc/booh/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/booh # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/ChangeLog,v 1.25 2010/04/24 19:22:30 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/ChangeLog,v 1.26 2010/06/01 19:24:11 graaff Exp $ + + 01 Jun 2010; Hans de Graaff booh-0.9.2.2.ebuild, + +files/booh-0.9.2.2-stdc.patch: + Fix compilation against latest dev-lang/ruby ebuild. Link against stdc++. + Fix insecure RUNPATH. 24 Apr 2010; Hans de Graaff booh-0.9.2.2.ebuild: Fix *magick dependency according to bugs 297830 and 314213. diff --git a/app-misc/booh/Manifest b/app-misc/booh/Manifest index abb3ed32b310..f8e9ae50db99 100644 --- a/app-misc/booh/Manifest +++ b/app-misc/booh/Manifest @@ -2,14 +2,15 @@ Hash: SHA1 AUX booh-0.9.1-require_gems.patch 2406 RMD160 6961b878f35e33f2ee1aad39e9bc2a55dc047d3e SHA1 868be77d94f306e3684a0a7190f1cfbc98f44210 SHA256 81c61ab145714c5a199514440e4360281686d771f85dd677f2f692f8a1edcff2 +AUX booh-0.9.2.2-stdc.patch 327 RMD160 f4f585a1d1c0233bccd4820e9589edbd18a9f474 SHA1 277a380c2f50cf8398828a0e7a9da05ddb56b44b SHA256 dc123ecf0d02edc289169c2eecf8751c4eccc7fbfbdab8f508abfb0a90e8127c DIST booh-0.9.2.2.tar.bz2 615063 RMD160 d2e57abeb953a6435f65981eab0e7140aa8fd0e7 SHA1 cba269ad20b00d9b36ca9e7fbb0b7634a2782c82 SHA256 5bb4642a442dac2658001cbc645a1e184bc5c4b36eb4270ba59fe7bf802dca9e -EBUILD booh-0.9.2.2.ebuild 1848 RMD160 cf3983ace7e0c93a92916d6bbf762875c7018e4c SHA1 a273f923d6376c30c45369ee56475e01a6ff0699 SHA256 f643eb8308e935a872361dda51c16137246633c72fa7f3bef675e6bead15136a -MISC ChangeLog 3141 RMD160 7600430d382b8b62815a734b3722f3921a681501 SHA1 ca971e0d62b4b01ac8dd9149c1c2d87945367fc6 SHA256 5d179de4759a04d69c017d4ee27a18301c87aaa0df051316a0bbb974f599df8c +EBUILD booh-0.9.2.2.ebuild 2080 RMD160 417b66d03a4a51445308e6fdc0731df1e1abd360 SHA1 d44cf319d62cd2558322a6d4d334ef2e053a7bea SHA256 f138c34d56d433fce1448e413d0f885d4554c43a5de9b01aef5e2c17954524e9 +MISC ChangeLog 3347 RMD160 97c7ba67cda8118f80c3c83c978f87a3e522e112 SHA1 ae368ccb24e07ae8c01c95edee61cfc93eb34fc9 SHA256 eb1b3415bf1a79adb99201dfbd0698341684364d32fd8213c2991cb31100e143 MISC metadata.xml 237 RMD160 2acdd7d87289e9598af8091adaf7978979689355 SHA1 a475efa89d1992a036ad831837ff274ed831c0e1 SHA256 8af78ca867011fbef8c46c0d0b238b655cd03c23e28f861f5c3487db2a85de2e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvTRQIACgkQeM7EJeUH71P0KwCfbUmJhr6kSB8c7GBRijzfJMuW -cnYAoI/zCpLR09wgsDEEeFGBagvdNRGM -=6MPJ +iEYEARECAAYFAkwFXmEACgkQeM7EJeUH71Np/gCeIg7lbR+g7TNLM3xKpKEbtr47 +5dYAn1+MPIa28e9n4F/5bUVWvUIuwCFl +=EWdR -----END PGP SIGNATURE----- diff --git a/app-misc/booh/booh-0.9.2.2.ebuild b/app-misc/booh/booh-0.9.2.2.ebuild index f83c5770e979..0784c739ace0 100644 --- a/app-misc/booh/booh-0.9.2.2.ebuild +++ b/app-misc/booh/booh-0.9.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/booh-0.9.2.2.ebuild,v 1.3 2010/04/24 19:22:30 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/booh-0.9.2.2.ebuild,v 1.4 2010/06/01 19:24:11 graaff Exp $ EAPI="2" @@ -30,6 +30,7 @@ RDEPEND="${DEPEND} src_prepare() { epatch "${FILESDIR}"/${PN}-0.9.1-require_gems.patch + epatch "${FILESDIR}"/${P}-stdc.patch # Remove scripts requiring gtk if gtk is not used if ! use gtk; then @@ -43,6 +44,8 @@ src_configure() { ruby setup.rb setup || die "ruby setup.rb setup failed" cd ext ruby extconf.rb || die "ruby extconf.rb failed" + sed -i -e 's:-Wl,--no-undefined ::' Makefile || die "--no-undefined removal failed" + sed -i -e 's:-Wl,-R$(libdir)::' -e 's:-Wl,-R -Wl,$(libdir)::' Makefile || die "Fix insecure RUNPATH failed" } src_install() { diff --git a/app-misc/booh/files/booh-0.9.2.2-stdc.patch b/app-misc/booh/files/booh-0.9.2.2-stdc.patch new file mode 100644 index 000000000000..66a7d4a66bce --- /dev/null +++ b/app-misc/booh/files/booh-0.9.2.2-stdc.patch @@ -0,0 +1,11 @@ +--- ext/extconf.rb.orig 2010-06-01 20:33:10.544558767 +0200 ++++ ext/extconf.rb 2010-06-01 21:12:28.380808877 +0200 +@@ -16,6 +16,8 @@ + #- does it do something good, actually? + setup_win32(PACKAGE_NAME) + ++have_library('stdc++') ++ + begin + create_makefile_at_srcdir(PACKAGE_NAME, File.dirname(__FILE__)) + rescue NoMethodError -- 2.26.2