dev-util/eclipse-cpp-bin: version bump 4.9.0

Package-Manager: Portage-2.3.51, Repoman-2.3.11

5 files changed, 12 insertions, 84 deletions

diff --git a/dev-util/eclipse-cpp-bin/Manifest b/dev-util/eclipse-cpp-bin/Manifest
index 71dbaa3..e059584 100644
--- a/dev-util/eclipse-cpp-bin/Manifest
+++ b/dev-util/eclipse-cpp-bin/Manifest
@@ -1,3 +1,2 @@
-DIST eclipse-cpp-bin-4.6.3-x86_64.tar.gz 197432205 SHA256 e203ff06381b0ba728b07181ebfa3b41bf18d5cae5857e5ffd462aece32df1fe SHA512 b2f0af3b555b0100b091ec9e5eff0107edf0bbb28a42ae8bcaf413eb2c3807f3a99f437c08b3c02b9f9ff3cbdb8ee8f929015832b09574225e099ed2e068fb1a WHIRLPOOL e7825a32eb7cde287da854313a1b7fbc8ab2cd7fbad17319a7163c99b8c78ec5bba048160a82e5de4d7ac5cd5e9aa89ef46523a594662e54c9acb83728f4fa5c
-DIST eclipse-cpp-bin-4.6.3.tar.gz 197279288 SHA256 aeee272443a7327325a940479902c0cde7b050aa981cf44a016b770d55a35a2d SHA512 685261247e6151989b23aa1458cdec8588ecbfb569ecccf25c1dcb49847ddd5bb28a2576c93b21f92a25e84b0206e44383e4f54f70294b1244ff7a66e0144892 WHIRLPOOL 4b4f9085d1600eab82cee0cb5d9cf1c48d25e292446a0543af451a1f0f55c5ea02478700a7a8aa8051fe7eccd3857dda4dcf2b9a1d2d079b6fea27943572b1c0
 DIST eclipse-cpp-bin-4.7.3-x86_64.tar.gz 218219684 SHA256 82e790efa5c02a7447506c85a138a2cef4fae815201c157480d630da1a55d5d9 SHA512 b00598a7c9620d585353bc148b6712e6eea35afdd4e7c6f4804901fa06b91f57972581c31e6f3b17801948a3cf6a73cc3882e29baed8b58f961ad58989a9f828 WHIRLPOOL 3c91921af2778e463e644aeb9d6296621a5e82973e9d976122feb25db56526a399875d04e1f69506421684e6b77eb2d253fb3936ecec5845b2f25043b6be8a3e
+DIST eclipse-cpp-bin-4.9.0-x86_64.tar.gz 236908195 SHA256 f18e533650ab1961651cb3ebdcf38d6fb78d983e1edb175da1afe5b06bebc9e0 SHA512 4d93be6701169021315439e8f8ba25c4a33e584487443c10ad23e81748838ec64e4fa6540d6ec03a60d1dc313b2b6b57f8edfdabe5895b9d82d084725cda7d8c WHIRLPOOL 7cf2075a7e0d0cdb3a1791bf9bec215abcf249d3b28df2f7d36879fa072afb6f63eda27b03d919cf3623b729ac16a4ce5e4a27d74fbad1b363c90d7d2f0565f4
diff --git a/dev-util/eclipse-cpp-bin/eclipse-cpp-bin-4.7.3.ebuild b/dev-util/eclipse-cpp-bin/eclipse-cpp-bin-4.7.3.ebuild
index 76f3c38..e5ac95f 100644
--- a/dev-util/eclipse-cpp-bin/eclipse-cpp-bin-4.7.3.ebuild
+++ b/dev-util/eclipse-cpp-bin/eclipse-cpp-bin-4.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils versionator
+inherit eutils
 
 RNAME="oxygen"
 SR="3a"
diff --git a/dev-util/eclipse-cpp-bin/eclipse-cpp-bin-4.6.3.ebuild b/dev-util/eclipse-cpp-bin/eclipse-cpp-bin-4.9.0.ebuild
index 70122ff..940883d 100644
--- a/dev-util/eclipse-cpp-bin/eclipse-cpp-bin-4.6.3.ebuild
+++ b/dev-util/eclipse-cpp-bin/eclipse-cpp-bin-4.9.0.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils versionator
+inherit eutils
 
-RNAME="neon"
-SR=$(get_version_component_range 3 $PV)
+RNAME="2018-09"
+SR="R"
 
 DESCRIPTION="Eclipse IDE for C/C++"
 HOMEPAGE="http://www.eclipse.org"
 
-SRC_BASE="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${RNAME}/${SR}/eclipse-cpp-${RNAME}-${SR}-linux-gtk"
-
+SRC_BASE="https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${RNAME}/R/eclipse-cpp-${RNAME}-linux-gtk"
 SRC_URI="
 	amd64? ( ${SRC_BASE}-x86_64.tar.gz&r=1 -> ${P}-x86_64.tar.gz )
-	x86? ( ${SRC_BASE}.tar.gz&r=1 -> ${P}.tar.gz )
 "
 
 LICENSE="EPL-1.0"
-SLOT="4.6"
-KEYWORDS="-* ~amd64 ~x86"
+SLOT="4.9"
+KEYWORDS="-* ~amd64"
 IUSE=""
 
 RDEPEND="
@@ -41,8 +39,8 @@ src_install() {
 
 	dohtml -r readme/*
 
-	cp "${FILESDIR}"/eclipserc-bin-${SLOT} "${T}" || die
-	cp "${FILESDIR}"/eclipse-bin-${SLOT} "${T}" || die
+	cp "${FILESDIR}"/eclipserc-bin "${T}/eclipserc-bin-${SLOT}" || die
+	cp "${FILESDIR}"/eclipse-bin "${T}/eclipse-bin-${SLOT}" || die
 	sed "s@%SLOT%@${SLOT}@" -i "${T}"/eclipse{,rc}-bin-${SLOT} || die
 
 	insinto /etc
diff --git a/dev-util/eclipse-cpp-bin/files/eclipse-bin-4.6 b/dev-util/eclipse-cpp-bin/files/eclipse-bin-4.6
deleted file mode 100644
index 867874c..0000000
--- a/dev-util/eclipse-cpp-bin/files/eclipse-bin-4.6
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-#
-# Tiny startup wrapper for Eclipse
-#
-# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
-# Copyright (c) 2007-2008, Jean-Noël Rivasseau <elvanor@gentoo.org>
-# Copyright (c) 2004-2016, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, version 2
-#
-
-SLOT="%SLOT%"
-
-[ -f "/etc/eclipserc-bin-${SLOT}" ] && . "/etc/eclipserc-bin-${SLOT}"
-[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc"
-
-ECLIPSE_HOME=${ECLIPSE_HOME:="/opt/eclipse-cpp-bin-%SLOT%"}
-ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse"
-
-if [ ! -x "${ECLIPSE_BIN}" ] ; then
-	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
-	exit 1
-fi
-
-if [ $(id -u) -eq 0 ] ; then
-	echo "Do not run eclipse as root user! Exiting ..." > /dev/stderr
-	exit 1
-fi
-
-case "$(java-config -f)" in
-	*gcj*)
-		export JAVA_PKG_CLASSMAP="${ECLIPSE_HOME}/eclipse.gcjdb"
-		;;
-esac
-
-#eval $(gjl --package "swt-${SLOT}" --get-args)
-
-[ -n "${ECLIPSE_XMS}" ] && VM_ARGS="${VM_ARGS} -Xms${ECLIPSE_XMS}"
-[ -n "${ECLIPSE_XMX}" ] && VM_ARGS="${VM_ARGS} -Xmx${ECLIPSE_XMX}"
-[ -n "${ECLIPSE_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:PermSize=${ECLIPSE_PERMSIZE}"
-[ -n "${ECLIPSE_MAX_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:MaxPermSize=${ECLIPSE_MAX_PERMSIZE}"
-
-# Fix for JRE 1.5.
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib
-
-exec "${ECLIPSE_BIN}" -vm $(java-config --java) "$@" "${ECLIPSE_USER_ARGS}" --launcher.GTK_version ${GTK_VERSION} -vmargs ${VM_ARGS}
diff --git a/dev-util/eclipse-cpp-bin/files/eclipserc-bin-4.6 b/dev-util/eclipse-cpp-bin/files/eclipserc-bin-4.6
deleted file mode 100644
index 8fcb6b1..0000000
--- a/dev-util/eclipse-cpp-bin/files/eclipserc-bin-4.6
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file specifies some initial Eclipse settings, like memory allowed
-# These settings only affect Eclipse startup and overall configuration
-# Main Eclipse configuration should be done within Eclipse (with the GUI)
-
-GTK_VERSION=2
-
-# Following variables controls the minimal and maximum amounts of memory
-# allocated to Eclipse (respectively).
-# Increase those numbers if you get OutOfMemory errors.
-
-ECLIPSE_XMS=256m
-ECLIPSE_XMX=1024m
-
-# Following variables controls the minimal and maximum amounts of memory
-# allocated to the permanent generation space.
-# This space contains data related to all classes.
-# Thus, if you use a lot of Eclipse plugins, it is recommended to uncomment
-# these variables and even increase it, if you have enough RAM.
-# Else you will get crashes related to OutOfMemory in PermGen exceptions.
-
-#ECLIPSE_PERMSIZE=64m
-#ECLIPSE_MAX_PERMSIZE=128m
-