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 2D40E198005 for ; Thu, 21 Mar 2013 06:54:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37D96E080B; Thu, 21 Mar 2013 06:54:43 +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 7FA9BE07E6 for ; Thu, 21 Mar 2013 06:54:42 +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 8836A33DAFD for ; Thu, 21 Mar 2013 06:54:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3045DE408E for ; Thu, 21 Mar 2013 06:54:40 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1363679035.78f3677f181e4c375599aa5656e08fc97557bc83.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/amos/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/amos/ChangeLog sci-biology/amos/amos-9999.ebuild X-VCS-Directories: sci-biology/amos/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 78f3677f181e4c375599aa5656e08fc97557bc83 X-VCS-Branch: master Date: Thu, 21 Mar 2013 06:54:40 +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: 15463a87-d899-40aa-be2b-646a850f36c9 X-Archives-Hash: 6a469b75b118b9399a0d03a50e4b10d5 commit: 78f3677f181e4c375599aa5656e08fc97557bc83 Author: Justin Lecher gentoo org> AuthorDate: Tue Mar 19 07:43:55 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Mar 19 07:43:55 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=78f3677f sci-biology/amos: Bump to latest git HEAD, fixes qt problems, #348031 Package-Manager: portage-2.2.0_alpha166 --- sci-biology/amos/ChangeLog | 3 ++ sci-biology/amos/amos-9999.ebuild | 45 ++++++++---------------------------- 2 files changed, 13 insertions(+), 35 deletions(-) diff --git a/sci-biology/amos/ChangeLog b/sci-biology/amos/ChangeLog index 26c68ea..f121b16 100644 --- a/sci-biology/amos/ChangeLog +++ b/sci-biology/amos/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Mar 2013; Justin Lecher amos-9999.ebuild: + Bump to latest git HEAD, fixes qt problems, #348031 + 03 Mar 2013; Justin Lecher amos-9999.ebuild, metadata.xml: Update to new qt deps names diff --git a/sci-biology/amos/amos-9999.ebuild b/sci-biology/amos/amos-9999.ebuild index fc0e050..67180f8 100644 --- a/sci-biology/amos/amos-9999.ebuild +++ b/sci-biology/amos/amos-9999.ebuild @@ -2,52 +2,27 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 -[ "$PV" == "9999" ] && CVS=cvs +[ "$PV" == "9999" ] && VCS=git-2 -inherit eutils ${CVS} +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils ${VCS} DESCRIPTION="Genome assembly package live cvs sources" HOMEPAGE="http://sourceforge.net/projects/amos" -ECVS_SERVER="amos.cvs.sourceforge.net:/cvsroot/amos" -ECVS_AUTH="pserver" -ECVS_MODULE="AMOS" -ECVS_BRANCH="HEAD" -ECVS_USER="anonymous" -ECVS_PASS="" +SRC_URI="" +EGIT_REPO_URI="git://amos.git.sourceforge.net/gitroot/amos/amos" -LICENSE="GPL-2" +LICENSE="Artistic" SLOT="0" -IUSE="" KEYWORDS="" +IUSE="" DEPEND=" dev-libs/boost - dev-qt/qt3support" + dev-qt/qtcore:4" RDEPEND="${DEPEND} dev-perl/DBI sci-biology/mummer" - -S="${DISTDIR}"/cvs-src/AMOS/AMOS/ - -src_unpack() { - ECVS_TOP_DIR="${DISTDIR}/cvs-src/${ECVS_MODULE}" - cvs_src_unpack -} - -src_prepare(){ - epatch "${FILESDIR}"/amos.m4.patch -} - -src_configure() { - ./bootstrap || die - #CFLAGS=$CFLAGS' -I/usr/include/qt4/Qt' CXXFLAGS=$CXXFLAGS' -I/usr/include/qt4/Qt' econf --enable-all --with-Qt-include-dir=/usr/include/qt4 --with-Qt-lib-dir=/usr/lib/qt4 --with-Qt-bin-dir=/usr/bin --with-Qt-lib=Qt3Support - econf --enable-all - einfo "No hawkeye and other Qt3-based apps installed, sorry, no qt3 anynore on Gentoo" -} - -src_compile() { - # TODO: force MAKEOPTS=-j1 because it seems -j6 is exploting some dependency issue in Makefiles - MAKEOPTS=-j1 emake DESTDIR="${D}" -}