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 56BC81381F3 for ; Wed, 14 Aug 2013 15:25:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFC3AE0BE1; Wed, 14 Aug 2013 15:25:14 +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 6E7C9E0BE1 for ; Wed, 14 Aug 2013 15:25:14 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 535B433EB51 for ; Wed, 14 Aug 2013 15:25:13 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2335) id EDF612171C; Wed, 14 Aug 2013 15:25:11 +0000 (UTC) From: "Tom Wijsman (tomwij)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, tomwij@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-java/maven-bin: maven-bin-3.1.0-r1.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: maven-bin-3.1.0-r1.ebuild ChangeLog X-VCS-Directories: dev-java/maven-bin X-VCS-Committer: tomwij X-VCS-Committer-Name: Tom Wijsman Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130814152511.EDF612171C@flycatcher.gentoo.org> Date: Wed, 14 Aug 2013 15:25:11 +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: 7507c14b-d052-438c-8c47-658d14fec8f0 X-Archives-Hash: 946c3d98128e1715ef79a0192a1e2ab5 tomwij 13/08/14 15:25:11 Modified: maven-bin-3.1.0-r1.ebuild ChangeLog Log: Move commons-logging under a has_version check just like the other two choices. Fixes bug #480700, reported by spyder on IRC as well as Maciej Piechotka on the bug. (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) Revision Changes Path 1.2 dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild?r1=1.1&r2=1.2 Index: maven-bin-3.1.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- maven-bin-3.1.0-r1.ebuild 10 Aug 2013 11:15:09 -0000 1.1 +++ maven-bin-3.1.0-r1.ebuild 14 Aug 2013 15:25:11 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild,v 1.1 2013/08/10 11:15:09 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild,v 1.2 2013/08/14 15:25:11 tomwij Exp $ EAPI="5" @@ -46,7 +46,8 @@ chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die # Register jars. - java-pkg_getjars avalon-framework-4.1,commons-io-1,commons-logging,juel,osgi-core-api,servlet-api-2.4 > /dev/null + java-pkg_getjars avalon-framework-4.1,commons-io-1,juel,osgi-core-api,servlet-api-2.4 > /dev/null + has_version dev-java/commons-logging:0 && java-pkg_getjars commons-logging > /dev/null has_version dev-java/avalon-logkit:2.0 && java-pkg_getjars avalon-logkit-2.0 > /dev/null has_version dev-java/log4j:0 && java-pkg_getjars log4j > /dev/null } 1.85 dev-java/maven-bin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/ChangeLog?rev=1.85&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/ChangeLog?rev=1.85&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/ChangeLog?r1=1.84&r2=1.85 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- ChangeLog 10 Aug 2013 11:15:09 -0000 1.84 +++ ChangeLog 14 Aug 2013 15:25:11 -0000 1.85 @@ -1,6 +1,11 @@ # ChangeLog for dev-java/maven-bin # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.84 2013/08/10 11:15:09 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.85 2013/08/14 15:25:11 tomwij Exp $ + + 14 Aug 2013; Tom Wijsman maven-bin-3.1.0-r1.ebuild: + Move commons-logging under a has_version check just like the other two + choices. Fixes bug #480700, reported by spyder on IRC as well as Maciej + Piechotka on the bug. *maven-bin-3.1.0-r1 (10 Aug 2013)