[gentoo-commits] proj/java:master commit in: dev-java/icedtea/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     5bc53eddade933f0488242dd8bb71f1f4882c0e2
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 14:17:16 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 14:17:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=5bc53edd

dev-java/icedtea: Sync changes from 7 to 3

This reduces the number of diffs across these versions to a minimum.

Package-Manager: portage-2.2.27

 dev-java/icedtea/icedtea-3.0.0_pre07-r2.ebuild | 76 +++++++++++++-------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/dev-java/icedtea/icedtea-3.0.0_pre07-r2.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre07-r2.ebuild
index 909a568..6c0b9a9 100644
--- a/dev-java/icedtea/icedtea-3.0.0_pre07-r2.ebuild
+++ b/dev-java/icedtea/icedtea-3.0.0_pre07-r2.ebuild
@@ -10,7 +10,7 @@
 EAPI="5"
 SLOT="8"
 
-inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial multiprocessing pax-utils prefix versionator virtualx
+inherit autotools check-reqs gnome2-utils java-pkg-2 java-vm-2 mercurial multiprocessing pax-utils prefix versionator virtualx
 
 ICEDTEA_VER=$(get_version_component_range 1-3)
 ICEDTEA_BRANCH=3.0
@@ -74,9 +74,8 @@ ALSA_COMMON_DEP="
 CUPS_COMMON_DEP="
 	>=net-print/cups-1.2.12"
 X_COMMON_DEP="
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.3.5
+	>=media-libs/giflib-4.1.6:=
+	>=media-libs/libpng-1.2:0=
 	>=x11-libs/libX11-1.1.3
 	>=x11-libs/libXext-1.1.1
 	>=x11-libs/libXi-1.1.3
@@ -92,33 +91,29 @@ X_DEPEND="
 	x11-proto/xproto"
 
 COMMON_DEP="
-	>=media-libs/giflib-4.1.6:=
+	>=dev-libs/glib-2.26:2
+	>=dev-util/systemtap-1
+	media-libs/fontconfig
+	>=media-libs/freetype-2.5.3:2=
 	>=media-libs/lcms-2.5
-	>=media-libs/libpng-1.2:0=
 	>=sys-libs/zlib-1.2.3:=
 	virtual/jpeg:0=
 	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	>=dev-util/systemtap-1
-	smartcard? ( sys-apps/pcsc-lite )
 	sctp? ( net-misc/lksctp-tools )
-	!dev-java/icedtea-web:7"
+	smartcard? ( sys-apps/pcsc-lite )"
 
-# cups is needed for X. #390945 #390975
 RDEPEND="${COMMON_DEP}
 	!dev-java/icedtea:0
-	!headless-awt? (
-		${CUPS_COMMON_DEP}
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			media-fonts/lklug
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
+	!dev-java/icedtea-web:7
+	media-fonts/dejavu
 	alsa? ( ${ALSA_COMMON_DEP} )
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
 	cups? ( ${CUPS_COMMON_DEP} )
 	gtk? (
 		>=dev-libs/atk-1.30.0
@@ -127,12 +122,11 @@ RDEPEND="${COMMON_DEP}
 		>=x11-libs/gtk+-2.8:2=
 		>=x11-libs/pango-1.24.5
 	)
+	!headless-awt? ( ${X_COMMON_DEP} )
 	selinux? ( sec-policy/selinux-java )"
 
 # ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
 	|| (
 		dev-java/icedtea-bin:8
 		dev-java/icedtea-bin:7
@@ -146,10 +140,9 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
 	dev-lang/perl
 	>=dev-libs/libxslt-1.1.26
 	dev-libs/openssl
-	virtual/pkgconfig
 	sys-apps/attr
 	sys-apps/lsb-release
-	${X_DEPEND}
+	virtual/pkgconfig
 	pax_kernel? ( sys-apps/elfix )"
 
 PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
@@ -202,7 +195,7 @@ java_prepare() {
 }
 
 src_configure() {
-	local cacao_config config hotspot_port jamvm_config use_jamvm use_zero zero_config
+	local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
 	local vm=$(java-pkg_get-current-vm)
 
 	# gcj-jdk ensures ecj is present.
@@ -230,7 +223,7 @@ src_configure() {
 
 	# Are we on a architecture with a HotSpot port?
 	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm64 || use ppc64 || use sparc || use x86; }; then
+	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
 		hotspot_port="yes"
 	fi
 
@@ -290,9 +283,10 @@ src_configure() {
 		--with-pkgversion="Gentoo ${PF}" \
 		--disable-downloading --disable-Werror \
 		--disable-hotspot-tests --disable-jdk-tests \
-		--enable-system-lcms --enable-system-gif \
-		--enable-system-jpeg --enable-system-png \
+		--enable-system-lcms --enable-system-jpeg \
 		--enable-system-zlib --disable-pulseaudio \
+		$(use_enable !headless-awt system-gif) \
+		$(use_enable !headless-awt system-png) \
 		$(use_enable !debug optimizations) \
 		$(use_enable doc docs) \
 		$(use_enable nss) \
@@ -317,18 +311,23 @@ src_install() {
 	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
 	local ddest="${ED}${dest#/}"
 
+	if ! use alsa; then
+		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
 	# Ensures Headless-AwtGraphicsEnvironment is used.
 	# Hack; we should get IcedTea to support passing --disable-headful
-	if use headless-awt ; then
-		rm -vf "${ddest}"/jre/lib/$(get_system_arch)/libawt_xawt.so || die
+	if use headless-awt; then
+		rm -vr "${ddest}"/jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
+		   "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
 	fi
 
 	if ! use examples; then
-		rm -rf "${ddest}"/demo "${ddest}"/sample || die
+		rm -r "${ddest}"/demo "${ddest}"/sample || die
 	fi
 
 	if ! use source; then
-		rm -f "${ddest}"/src.zip || die
+		rm -v "${ddest}"/src.zip || die
 	fi
 
 	# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
@@ -357,8 +356,9 @@ src_install() {
 	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
 
 	set_java_env "${FILESDIR}/icedtea.env"
-	if use headless-awt || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
 	java-vm_sandbox-predict /proc/self/coredump_filter
 }
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }