From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 67B22138537 for ; Fri, 18 Jan 2013 09:25:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE5E8E05AF; Fri, 18 Jan 2013 09:25:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72B47E05AF for ; Fri, 18 Jan 2013 09:25:17 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 843F633D8FF for ; Fri, 18 Jan 2013 09:25:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DC14CE4073 for ; Fri, 18 Jan 2013 09:25:14 +0000 (UTC) From: "Honza Macháček" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Honza Macháček" Message-ID: <1358501104.23a8201dcd97fbb09c0b89919649ce971e23ac21.honza_machacek@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/abinit/files/, sci-physics/abinit/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/abinit/ChangeLog sci-physics/abinit/abinit-7.0.4.ebuild sci-physics/abinit/files/6.12.3-gui-makefiles.tbz X-VCS-Directories: sci-physics/abinit/files/ sci-physics/abinit/ X-VCS-Committer: honza_machacek X-VCS-Committer-Name: Honza Macháček X-VCS-Revision: 23a8201dcd97fbb09c0b89919649ce971e23ac21 X-VCS-Branch: master Date: Fri, 18 Jan 2013 09:25:14 +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: a1c5468f-097f-42cb-8a22-99df2ab2b5d3 X-Archives-Hash: 141a9c0ccd6e264bca5a590017722865 commit: 23a8201dcd97fbb09c0b89919649ce971e23ac21 Author: Honza Macháček centrum cz> AuthorDate: Fri Jan 18 09:25:04 2013 +0000 Commit: Honza Macháček centrum cz> CommitDate: Fri Jan 18 09:25:04 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=23a8201d In sci-physics/abinit-7.0.4 missing makefile sources for the gui added from the 6.12.3 version. --- sci-physics/abinit/ChangeLog | 5 +++++ sci-physics/abinit/abinit-7.0.4.ebuild | 20 ++++++++++++++++++-- sci-physics/abinit/files/6.12.3-gui-makefiles.tbz | Bin 0 -> 14600 bytes 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog index d814a8a..08c3872 100644 --- a/sci-physics/abinit/ChangeLog +++ b/sci-physics/abinit/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 18 Jan 2013; Honza Macháček + +files/6.12.3-gui-makefiles.tbz, abinit-7.0.4.ebuild: + Makefile sources for the gui, missing in the 7.0.4, added from the 6.12.3 + version. + *abinit-7.0.4 (17 Jan 2013) 17 Jan 2013; Honza Macháček diff --git a/sci-physics/abinit/abinit-7.0.4.ebuild b/sci-physics/abinit/abinit-7.0.4.ebuild index 2218c10..a3ab9ae 100644 --- a/sci-physics/abinit/abinit-7.0.4.ebuild +++ b/sci-physics/abinit/abinit-7.0.4.ebuild @@ -112,6 +112,16 @@ pkg_setup() { fi } +src_unpack() { + default_src_unpack + if use gui; then + pushd "${S}" > /dev/null + tar -xjf "${FILESDIR}"/6.12.3-gui-makefiles.tbz + popd > /dev/null + fi + +} + src_prepare() { epatch \ "${FILESDIR}"/6.2.2-change-default-directories.patch \ @@ -121,6 +131,11 @@ src_prepare() { eautoreconf sed -e"s/\(grep '\^-\)\(\[LloW\]\)'/\1\\\(\2\\\|pthread\\\)'/g" -i configure + if use gui; then + pushd gui > /dev/null + eautoreconf + popd > /dev/null + fi } src_configure() { @@ -222,6 +237,7 @@ src_configure() { mkdir -p gui cd gui ECONF_SOURCE="${S}"/gui econf UUDECODE="uudecode" + popd > /dev/null fi } @@ -299,9 +315,9 @@ src_install() { use libabinit && dolib libabinit.a if use gui; then - pushd gui + pushd gui > /dev/null emake DESTDIR="${D}" install || die "The GUI install failed" - popd + popd > /dev/null fi if use test; then diff --git a/sci-physics/abinit/files/6.12.3-gui-makefiles.tbz b/sci-physics/abinit/files/6.12.3-gui-makefiles.tbz new file mode 100644 index 0000000..d324544 Binary files /dev/null and b/sci-physics/abinit/files/6.12.3-gui-makefiles.tbz differ