From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-java+bounces-1376-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1Jcy6O-0006L9-75
	for garchives@archives.gentoo.org; Sat, 22 Mar 2008 07:25:16 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id DF80AE051F;
	Sat, 22 Mar 2008 07:25:14 +0000 (UTC)
Received: from mailfilter4.ihug.co.nz (mailfilter4.ihug.co.nz [203.109.136.4])
	by pigeon.gentoo.org (Postfix) with ESMTP id 67118E051F
	for <gentoo-java@lists.gentoo.org>; Sat, 22 Mar 2008 07:25:14 +0000 (UTC)
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: AiYBAKJR5EfLbajT/2dsb2JhbAAIqHQ
X-IronPort-AV: E=Sophos;i="4.25,538,1199617200"; 
   d="scan'208";a="67836913"
Ironport-Content-Filter: send-to-smtp
Ironport-OCF: send-to-smtp
Received: from 203-109-168-211.dsl.dyn.ihug.co.nz (HELO [10.1.1.3]) ([203.109.168.211])
  by smtp.mailfilter4.ihug.co.nz with ESMTP; 22 Mar 2008 20:25:07 +1300
Message-ID: <47E4B43B.3020909@gentoo.org>
Date: Sat, 22 Mar 2008 20:24:43 +1300
From: Alistair Bush <ali_bush@gentoo.org>
User-Agent: Thunderbird 2.0.0.12 (X11/20080314)
Precedence: bulk
List-Post: <mailto:gentoo-java@lists.gentoo.org>
List-Help: <mailto:gentoo-java+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-java+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-java+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-java.gentoo.org>
X-BeenThere: gentoo-java@lists.gentoo.org
MIME-Version: 1.0
To: gentoo-java@lists.gentoo.org
Subject: [gentoo-java] EAP1=1 eclass patch
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Archives-Salt: 58e6b838-1c51-4389-9672-1dcf81a7c03d
X-Archives-Hash: 16a6e63ac3bc059f287ff3ffa3a4d7f9

Ok, here is a patch to support slot dependencies within the 
jar-from,getjar and getjars functions.

Its untested at present.  But that will change.

Any comments?

> cvs diff java-utils-2.eclass
> Index: java-utils-2.eclass
> ===================================================================
> RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
> retrieving revision 1.104
> diff -u -b -B -r1.104 java-utils-2.eclass
> --- java-utils-2.eclass 3 Mar 2008 17:55:21 -0000       1.104
> +++ java-utils-2.eclass 22 Mar 2008 07:23:10 -0000
> @@ -896,6 +896,10 @@
> 
>         local target_pkg="${1}" target_jar="${2}" destjar="${3}"
> 
> +       if[[ ${EAPI} == "1" ]]; then
> +               target_pkg="${target_pkg//:/-}"
> +       fi
> +
>         [[ -z ${target_pkg} ]] && die "Must specify a package"
> 
>         # default destjar to the target jar
> @@ -1019,6 +1023,11 @@
> 
> 
>         local classpath pkgs="${1}"
> +
> +       if[[ ${EAPI} == "1" ]]; then
> +               pkgs="${pkgs//:/-}"
> +       fi
> +
>         jars="$(java-config ${deep} --classpath=${pkgs})"
>         [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
>         debug-print "${pkgs}:${jars}"
> @@ -1086,6 +1095,11 @@
>         [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
> 
>         local pkg="${1}" target_jar="${2}" jar
> +
> +       if[[ ${EAPI} == "1" ]]; then
> +               pkg="${pkg//:/-}"
> +       fi
> +
>         [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
>         [[ -z ${target_jar} ]] && die "Must specify jar to get"
-- 
gentoo-java@lists.gentoo.org mailing list