From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F33C81393E9 for ; Wed, 7 May 2014 23:19:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13048E09EE; Wed, 7 May 2014 23:19:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F627E09EE for ; Wed, 7 May 2014 23:19:58 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 988AF33FAD3 for ; Wed, 7 May 2014 23:19:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 595BC18748 for ; Wed, 7 May 2014 23:19:56 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <1399417874.f73ae7dd317ffab84687e59e4458d8e42c4d9b66.bicatali@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/thepeg/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/thepeg/ChangeLog sci-physics/thepeg/thepeg-1.9.1.ebuild X-VCS-Directories: sci-physics/thepeg/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: f73ae7dd317ffab84687e59e4458d8e42c4d9b66 X-VCS-Branch: master Date: Wed, 7 May 2014 23:19:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bb9638c2-dcee-4e4a-8ad7-1a3b3f6a8707 X-Archives-Hash: eaf03c990981f9a7d5aea57781dbd086 commit: f73ae7dd317ffab84687e59e4458d8e42c4d9b66 Author: Sébastien Fabbro gentoo org> AuthorDate: Tue May 6 23:11:14 2014 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Tue May 6 23:11:14 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f73ae7dd sci-physics/thepeg: Properly link with c++ Package-Manager: portage-2.2.8-prefix --- sci-physics/thepeg/ChangeLog | 3 +++ sci-physics/thepeg/thepeg-1.9.1.ebuild | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sci-physics/thepeg/ChangeLog b/sci-physics/thepeg/ChangeLog index 57d3fad..bca9a07 100644 --- a/sci-physics/thepeg/ChangeLog +++ b/sci-physics/thepeg/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 May 2014; Sébastien Fabbro thepeg-1.9.1.ebuild: + sci-physics/thepeg: Properly link with c++ + *thepeg-1.9.1 (06 May 2014) 06 May 2014; Sébastien Fabbro +thepeg-1.9.1.ebuild: diff --git a/sci-physics/thepeg/thepeg-1.9.1.ebuild b/sci-physics/thepeg/thepeg-1.9.1.ebuild index e70b39f..6ecdb8a 100644 --- a/sci-physics/thepeg/thepeg-1.9.1.ebuild +++ b/sci-physics/thepeg/thepeg-1.9.1.ebuild @@ -23,7 +23,7 @@ SRC_URI="http://www.hepforge.org/archive/thepeg/${MYP}.tar.bz2 ${TEST_URI}/MRST2001nlo.LHgrid ) )" LICENSE="GPL-2" -SLOT="0" +SLOT="0/18" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="emacs fastjet hepmc java lhapdf rivet static-libs test zlib" @@ -46,7 +46,11 @@ PATCHES=( "${FILESDIR}"/${PN}-1.8.3-java.patch ) src_prepare() { find -name 'Makefile.am' -exec \ sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die - sed -i -e '/dist_pkgdata_DATA = ThePEG.el/d' lib/Makefile.am || die + # trick to force c++ linking + sed -i \ + -e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \ + -e '/dist_pkgdata_DATA = ThePEG.el/d' \ + lib/Makefile.am || die autotools-utils_src_prepare java-pkg-opt-2_src_prepare }