public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-java/diablo-jdk: ChangeLog diablo-jdk-1.6.0.07.02.ebuild
@ 2008-10-15 13:31 Alexis Ballier (aballier)
  0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2008-10-15 13:31 UTC (permalink / raw
  To: gentoo-commits

aballier    08/10/15 13:31:56

  Modified:             ChangeLog
  Added:                diablo-jdk-1.6.0.07.02.ebuild
  Log:
  Bump to JDK 1.6. Bug #232310
  (Portage version: 2.2_rc12/cvs/Linux 2.6.26.6 x86_64)

Revision  Changes    Path
1.8                  dev-java/diablo-jdk/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jdk/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jdk/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jdk/ChangeLog?r1=1.7&r2=1.8

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog	22 Jul 2007 09:45:06 -0000	1.7
+++ ChangeLog	15 Oct 2008 13:31:56 -0000	1.8
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/diablo-jdk
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.7 2007/07/22 09:45:06 graaff Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.8 2008/10/15 13:31:56 aballier Exp $
+
+*diablo-jdk-1.6.0.07.02 (15 Oct 2008)
+
+  15 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/diablo-jdk-1.6.env, +diablo-jdk-1.6.0.07.02.ebuild:
+  Bump to JDK 1.6. Bug #232310
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org>
   diablo-jdk-1.5.0.07.01.ebuild:



1.1                  dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?rev=1.1&content-type=text/plain

Index: diablo-jdk-1.6.0.07.02.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.1 2008/10/15 13:31:56 aballier Exp $

inherit java-vm-2 eutils versionator

DESCRIPTION="Java Development Kit"
HOMEPAGE="http://www.FreeBSDFoundation.org/downloads/java.shtml"
MY_PV=$(replace_version_separator 3 '_')
MY_PVL=$(get_version_component_range 1-3)

javafile="diablo-caffe-freebsd7-i386-$(replace_version_separator 4 '-b' ${MY_PV}).tar.bz2"

SRC_URI="$javafile"

LICENSE="sun-bcla-java-vm"
SLOT="1.6"
KEYWORDS="-* ~x86-fbsd"
RESTRICT="fetch"
IUSE="X examples nsplugin jce"

QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/server/libjvm.so opt/${P}/jre/lib/i386/client/libjvm.so"

DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
RDEPEND="X? ( x11-libs/libICE
				x11-libs/libSM
				x11-libs/libX11
				x11-libs/libXau
				x11-libs/libXdmcp
				x11-libs/libXext
				x11-libs/libXi
				x11-libs/libXp
				x11-libs/libXt
				x11-libs/libXtst
			)
		=sys-freebsd/freebsd-lib-7*
		${DEPEND}"

JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
S="${WORKDIR}/diablo-jdk$(get_version_component_range 1-4 ${MY_PV})"

pkg_nofetch() {
	einfo "Please download ${javafile} from:"
	einfo "${HOMEPAGE}"
	einfo "and move it to ${DISTDIR}"
}

src_install() {
	local dirs="bin include jre lib man"

	dodir /opt/${P}

	for i in $dirs ; do
		cp -pPR $i "${D}"/opt/${P}/ || die "failed to build"
	done

	dodoc COPYRIGHT README.html
	dohtml README.html

	dodir /opt/${P}/share/

	cp -pPR src.zip "${D}"/opt/${P}/share/

	if use examples; then
		cp -pPR demo "${D}"/opt/${P}/share/
		cp -pRR sample "${D}"/opt/${P}/share/
	fi

	if use jce ; then
		cd "${D}"/opt/${P}/jre/lib/security
		dodir /opt/${P}/jre/lib/security/strong-jce
		mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar "${D}"/opt/${P}/jre/lib/security/strong-jce
		mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar "${D}"/opt/${P}/jre/lib/security/strong-jce
		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
	fi

	if use nsplugin; then
		install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns7/libjavaplugin_oji.so
	fi

	# Change libz.so.4 to libz.so.1
	scanelf -qR -N libz.so.4 -F "#N" "${D}"/opt/${P}/ | \
		while read i; do
		if [[ $(strings "$i" | fgrep -c libz.so.4) -ne 1 ]]; then
			export SANITY_CHECK_LIBZ_FAILED=1
			break
		fi
		sed -i -e 's/libz\.so\.4/libz.so.1/g' "$i"
	done
	[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.4 to libz.so.1"

	# create dir for system preferences
	dodir /opt/${P}/jre/.systemPrefs
	# Create files used as storage for system preferences.
	touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
	touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile

	# install control panel for Gnome/KDE
	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
		"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
		"${T}"/sun_java-${SLOT}.desktop

	domenu "${T}"/sun_java-${SLOT}.desktop

	set_java_env
}

pkg_postinst() {
	# Set as default VM if none exists
	java-vm-2_pkg_postinst

	if ! use X; then
		local xwarn="X11 libraries and/or"
	fi

	echo
	ewarn "Some parts of Sun's JRE require ${xwarn} virtual/lpr to be installed."
	ewarn "Be careful which Java libraries you attempt to use."

	echo
	elog "Be careful: ${P}'s Java compiler uses"
	elog "'-source 1.5' as default. Some keywords such as 'enum'"
	elog "are not valid identifiers any more in that mode,"
	elog "which can cause incompatibility with certain sources."
}






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/diablo-jdk: ChangeLog diablo-jdk-1.6.0.07.02.ebuild
@ 2010-03-13 14:12 Alexis Ballier (aballier)
  0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2010-03-13 14:12 UTC (permalink / raw
  To: gentoo-commits

aballier    10/03/13 14:12:59

  Modified:             ChangeLog diablo-jdk-1.6.0.07.02.ebuild
  Log:
  It works fine with freebsd 8, adjust the dep to >=
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.11                 dev-java/diablo-jdk/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jdk/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jdk/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jdk/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog	11 Mar 2010 10:42:38 -0000	1.10
+++ ChangeLog	13 Mar 2010 14:12:58 -0000	1.11
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/diablo-jdk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.10 2010/03/11 10:42:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.11 2010/03/13 14:12:58 aballier Exp $
+
+  13 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+  diablo-jdk-1.6.0.07.02.ebuild:
+  It works fine with freebsd 8, adjust the dep to >=
 
   11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
   -diablo-jdk-1.5.0.07.01.ebuild, -files/diablo-jdk-1.5.env:



1.2                  dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?r1=1.1&r2=1.2

Index: diablo-jdk-1.6.0.07.02.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- diablo-jdk-1.6.0.07.02.ebuild	15 Oct 2008 13:31:56 -0000	1.1
+++ diablo-jdk-1.6.0.07.02.ebuild	13 Mar 2010 14:12:58 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.1 2008/10/15 13:31:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.2 2010/03/13 14:12:58 aballier Exp $
 
 inherit java-vm-2 eutils versionator
 
@@ -33,7 +33,7 @@
 				x11-libs/libXt
 				x11-libs/libXtst
 			)
-		=sys-freebsd/freebsd-lib-7*
+		>=sys-freebsd/freebsd-lib-7
 		${DEPEND}"
 
 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/diablo-jdk: ChangeLog diablo-jdk-1.6.0.07.02.ebuild
@ 2011-05-21  4:29 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 6+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-05-21  4:29 UTC (permalink / raw
  To: gentoo-commits

ssuominen    11/05/21 04:29:26

  Modified:             ChangeLog diablo-jdk-1.6.0.07.02.ebuild
  Log:
  Change reference of virtual/lpr to net-print/cups and net-print/lprng wrt #358879.
  
  (Portage version: 2.2.0_alpha33/cvs/Linux x86_64)

Revision  Changes    Path
1.12                 dev-java/diablo-jdk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog	13 Mar 2010 14:12:58 -0000	1.11
+++ ChangeLog	21 May 2011 04:29:26 -0000	1.12
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/diablo-jdk
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.11 2010/03/13 14:12:58 aballier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.12 2011/05/21 04:29:26 ssuominen Exp $
+
+  21 May 2011; Samuli Suominen <ssuominen@gentoo.org>
+  diablo-jdk-1.6.0.07.02.ebuild:
+  Change reference of virtual/lpr to net-print/cups and net-print/lprng wrt
+  #358879.
 
   13 Mar 2010; Alexis Ballier <aballier@gentoo.org>
   diablo-jdk-1.6.0.07.02.ebuild:



1.3                  dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?r1=1.2&r2=1.3

Index: diablo-jdk-1.6.0.07.02.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- diablo-jdk-1.6.0.07.02.ebuild	13 Mar 2010 14:12:58 -0000	1.2
+++ diablo-jdk-1.6.0.07.02.ebuild	21 May 2011 04:29:26 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.2 2010/03/13 14:12:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.3 2011/05/21 04:29:26 ssuominen Exp $
 
 inherit java-vm-2 eutils versionator
 
@@ -118,7 +118,7 @@
 	fi
 
 	echo
-	ewarn "Some parts of Sun's JRE require ${xwarn} virtual/lpr to be installed."
+	ewarn "Some parts of Sun's JRE require ${xwarn} net-print/cups or net-print/lprng to be installed."
 	ewarn "Be careful which Java libraries you attempt to use."
 
 	echo






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/diablo-jdk: ChangeLog diablo-jdk-1.6.0.07.02.ebuild
@ 2012-05-10 15:45 Alexis Ballier (aballier)
  0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-10 15:45 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/10 15:45:37

  Modified:             ChangeLog diablo-jdk-1.6.0.07.02.ebuild
  Log:
  remove now old warning
  
  (Portage version: 2.2.0_alpha103/cvs/Linux x86_64)

Revision  Changes    Path
1.14                 dev-java/diablo-jdk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/ChangeLog?r1=1.13&r2=1.14

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog	15 Dec 2011 21:30:13 -0000	1.13
+++ ChangeLog	10 May 2012 15:45:37 -0000	1.14
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/diablo-jdk
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.13 2011/12/15 21:30:13 grobian Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.14 2012/05/10 15:45:37 aballier Exp $
+
+  10 May 2012; Alexis Ballier <aballier@gentoo.org>
+  diablo-jdk-1.6.0.07.02.ebuild:
+  remove now old warning
 
   15 Dec 2011; Fabian Groffen <grobian@gentoo.org>
   diablo-jdk-1.6.0.07.02.ebuild:



1.5                  dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?r1=1.4&r2=1.5

Index: diablo-jdk-1.6.0.07.02.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- diablo-jdk-1.6.0.07.02.ebuild	15 Dec 2011 21:30:13 -0000	1.4
+++ diablo-jdk-1.6.0.07.02.ebuild	10 May 2012 15:45:37 -0000	1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.4 2011/12/15 21:30:13 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.5 2012/05/10 15:45:37 aballier Exp $
 
 EAPI="3"
 
@@ -147,10 +147,4 @@
 	echo
 	ewarn "Some parts of Sun's JRE require ${xwarn} net-print/cups or net-print/lprng to be installed."
 	ewarn "Be careful which Java libraries you attempt to use."
-
-	echo
-	elog "Be careful: ${P}'s Java compiler uses"
-	elog "'-source 1.5' as default. Some keywords such as 'enum'"
-	elog "are not valid identifiers any more in that mode,"
-	elog "which can cause incompatibility with certain sources."
 }






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/diablo-jdk: ChangeLog diablo-jdk-1.6.0.07.02.ebuild
@ 2012-05-10 15:53 Alexis Ballier (aballier)
  0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-10 15:53 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/10 15:53:30

  Modified:             ChangeLog diablo-jdk-1.6.0.07.02.ebuild
  Log:
  fix pkg_nofetch
  
  (Portage version: 2.2.0_alpha103/cvs/Linux x86_64)

Revision  Changes    Path
1.15                 dev-java/diablo-jdk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	10 May 2012 15:45:37 -0000	1.14
+++ ChangeLog	10 May 2012 15:53:30 -0000	1.15
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/diablo-jdk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.14 2012/05/10 15:45:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.15 2012/05/10 15:53:30 aballier Exp $
+
+  10 May 2012; Alexis Ballier <aballier@gentoo.org>
+  diablo-jdk-1.6.0.07.02.ebuild:
+  fix pkg_nofetch
 
   10 May 2012; Alexis Ballier <aballier@gentoo.org>
   diablo-jdk-1.6.0.07.02.ebuild:



1.6                  dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?r1=1.5&r2=1.6

Index: diablo-jdk-1.6.0.07.02.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- diablo-jdk-1.6.0.07.02.ebuild	10 May 2012 15:45:37 -0000	1.5
+++ diablo-jdk-1.6.0.07.02.ebuild	10 May 2012 15:53:30 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.5 2012/05/10 15:45:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.6 2012/05/10 15:53:30 aballier Exp $
 
 EAPI="3"
 
@@ -43,6 +43,10 @@
 S="${WORKDIR}/diablo-jdk$(get_version_component_range 1-4 ${MY_PV})"
 
 pkg_nofetch() {
+	case ${CHOST} in
+		x86_64*) javafile=${javafile64};;
+		*) javafile=${javafile32}
+	esac
 	einfo "Please download ${javafile} from:"
 	einfo "${HOMEPAGE}"
 	einfo "and move it to ${DISTDIR}"






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/diablo-jdk: ChangeLog diablo-jdk-1.6.0.07.02.ebuild
@ 2012-05-10 18:34 Alexis Ballier (aballier)
  0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-10 18:34 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/10 18:34:12

  Modified:             ChangeLog diablo-jdk-1.6.0.07.02.ebuild
  Log:
  keyword ~amd64-fbsd
  
  (Portage version: 2.2.0_alpha103/cvs/Linux x86_64)

Revision  Changes    Path
1.16                 dev-java/diablo-jdk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/ChangeLog?r1=1.15&r2=1.16

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog	10 May 2012 15:53:30 -0000	1.15
+++ ChangeLog	10 May 2012 18:34:12 -0000	1.16
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/diablo-jdk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.15 2012/05/10 15:53:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.16 2012/05/10 18:34:12 aballier Exp $
+
+  10 May 2012; Alexis Ballier <aballier@gentoo.org>
+  diablo-jdk-1.6.0.07.02.ebuild:
+  keyword ~amd64-fbsd
 
   10 May 2012; Alexis Ballier <aballier@gentoo.org>
   diablo-jdk-1.6.0.07.02.ebuild:



1.7                  dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild?r1=1.6&r2=1.7

Index: diablo-jdk-1.6.0.07.02.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- diablo-jdk-1.6.0.07.02.ebuild	10 May 2012 15:53:30 -0000	1.6
+++ diablo-jdk-1.6.0.07.02.ebuild	10 May 2012 18:34:12 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.6 2012/05/10 15:53:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.7 2012/05/10 18:34:12 aballier Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@
 
 LICENSE="sun-bcla-java-vm"
 SLOT="1.6"
-KEYWORDS="-* ~x86-fbsd ~x64-freebsd ~x86-freebsd"
+KEYWORDS="-* ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd"
 RESTRICT="fetch"
 IUSE="X examples nsplugin jce"
 






^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2012-05-10 18:34 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-13 14:12 [gentoo-commits] gentoo-x86 commit in dev-java/diablo-jdk: ChangeLog diablo-jdk-1.6.0.07.02.ebuild Alexis Ballier (aballier)
  -- strict thread matches above, loose matches on Subject: below --
2012-05-10 18:34 Alexis Ballier (aballier)
2012-05-10 15:53 Alexis Ballier (aballier)
2012-05-10 15:45 Alexis Ballier (aballier)
2011-05-21  4:29 Samuli Suominen (ssuominen)
2008-10-15 13:31 Alexis Ballier (aballier)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox