Version update. Make it easier to only build the packages you want.

2 files changed, 86 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00e8a433bee5..d309585edfe6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
 # Generated by mksrcinfo v8
-# Sun Jun 11 16:56:47 UTC 2017
+# Tue Jun 27 17:28:08 UTC 2017
 pkgbase = eclipse-devel
 	pkgdesc = Highly extensible IDE
-	pkgver = 4.7.0.RC3
+	pkgver = 4.7.0.R
 	pkgrel = 1
+	epoch = 1
 	url = https://eclipse.org
 	arch = i686
 	arch = x86_64
 	license = EPL
 	makedepends = ruby
-	noextract = eclipse-java-oxygen-RC3-linux-gtk.tar.gz
-	noextract = eclipse-java-oxygen-RC3-linux-gtk-x86_64.tar.gz
-	noextract = eclipse-cpp-oxygen-RC3-linux-gtk.tar.gz
-	noextract = eclipse-cpp-oxygen-RC3-linux-gtk-x86_64.tar.gz
-	noextract = eclipse-jee-oxygen-RC3-linux-gtk.tar.gz
-	noextract = eclipse-jee-oxygen-RC3-linux-gtk-x86_64.tar.gz
-	noextract = eclipse-php-oxygen-RC3-linux-gtk.tar.gz
-	noextract = eclipse-php-oxygen-RC3-linux-gtk-x86_64.tar.gz
+	noextract = eclipse-cpp-oxygen-R-linux-gtk.tar.gz
+	noextract = eclipse-cpp-oxygen-R-linux-gtk-x86_64.tar.gz
+	noextract = eclipse-jee-oxygen-R-linux-gtk.tar.gz
+	noextract = eclipse-jee-oxygen-R-linux-gtk-x86_64.tar.gz
+	noextract = eclipse-php-oxygen-R-linux-gtk.tar.gz
+	noextract = eclipse-php-oxygen-R-linux-gtk-x86_64.tar.gz
+	noextract = eclipse-java-oxygen-R-linux-gtk.tar.gz
+	noextract = eclipse-java-oxygen-R-linux-gtk-x86_64.tar.gz
 	options = !emptydirs
 	source = commonify
 	source = eclipse.sh
@@ -24,22 +25,22 @@ pkgbase = eclipse-devel
 	sha256sums = 9f8980078c97fb3020ba2e9c6c07eac077b932406aba3e2d6a4763a5d299290d
 	sha256sums = 7f0c352f8593774838d96c213293de6d00fb6d71becce8d4ff6209bb8c58e8f6
 	sha256sums = be491b305ee6d5fd4a94db4d2b31a5fbc69539e3f97094ffc35246e104deea17
-	source_i686 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/RC3/eclipse-java-oxygen-RC3-linux-gtk.tar.gz
-	source_i686 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/RC3/eclipse-cpp-oxygen-RC3-linux-gtk.tar.gz
-	source_i686 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/RC3/eclipse-jee-oxygen-RC3-linux-gtk.tar.gz
-	source_i686 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/RC3/eclipse-php-oxygen-RC3-linux-gtk.tar.gz
-	sha1sums_i686 = cb99393772d3f6895709c84313bbf7c85b2a871b
-	sha1sums_i686 = 0f4bf795f88e78add0f065d03738074124b91804
-	sha1sums_i686 = 5526231742bc0a9c484c79c44dfa0e1d9d86d6ca
-	sha1sums_i686 = 8dea1bc3a90842a3d1895f9d481f13d087d3553f
-	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/RC3/eclipse-java-oxygen-RC3-linux-gtk-x86_64.tar.gz
-	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/RC3/eclipse-cpp-oxygen-RC3-linux-gtk-x86_64.tar.gz
-	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/RC3/eclipse-jee-oxygen-RC3-linux-gtk-x86_64.tar.gz
-	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/RC3/eclipse-php-oxygen-RC3-linux-gtk-x86_64.tar.gz
-	sha1sums_x86_64 = 217ce4c4d008a46189a446efaddd10bdba08ed04
-	sha1sums_x86_64 = e6d6b30f4e19596a3572225d15c2b12bdb8a45e1
-	sha1sums_x86_64 = 828dec0df954ebf27152df47758deb3d05578eda
-	sha1sums_x86_64 = 72f3438e445da274fabddd0e90d7a42d0f3f8bf2
+	source_i686 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk.tar.gz
+	source_i686 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/R/eclipse-jee-oxygen-R-linux-gtk.tar.gz
+	source_i686 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/R/eclipse-php-oxygen-R-linux-gtk.tar.gz
+	source_i686 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/R/eclipse-java-oxygen-R-linux-gtk.tar.gz
+	sha1sums_i686 = 41fdf3422deba2189dbb4aafc9951c886ec16cb9
+	sha1sums_i686 = c9b8f9f6d2e97d81ed678fbea8047bbfad8287ae
+	sha1sums_i686 = 74602abec77cae9de3ec4456763c35d1add84833
+	sha1sums_i686 = 23ab70a1c694cb42ed32d4592bbd86a5631571e7
+	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk-x86_64.tar.gz
+	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/R/eclipse-jee-oxygen-R-linux-gtk-x86_64.tar.gz
+	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/R/eclipse-php-oxygen-R-linux-gtk-x86_64.tar.gz
+	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/R/eclipse-java-oxygen-R-linux-gtk-x86_64.tar.gz
+	sha1sums_x86_64 = 64b419cea0f1f67cb6cf4a167cbd3a034af6970e
+	sha1sums_x86_64 = c3e8305d5413ef08da1ae89d211d768c914024e0
+	sha1sums_x86_64 = 2bd251a90f803f9a7c2f97ef8aa71932c10c6631
+	sha1sums_x86_64 = 539e2edd7fe72653a7076e696ade52c4a3bafd0d
 
 pkgname = eclipse-common-devel
 	pkgdesc = Highly extensible IDE (common files) Development Version
@@ -47,9 +48,8 @@ pkgname = eclipse-common-devel
 	depends = java-environment>=8
 	depends = webkit2gtk
 	depends = unzip
-	provides = eclipse-common=4.7.0.RC3-1
-
-pkgname = eclipse-java-devel
+	provides = eclipse-common=4.7.0.R-1
+	provides = eclipse-common-devel=4.7.0.R-1
 
 pkgname = eclipse-cpp-devel
 
@@ -57,3 +57,5 @@ pkgname = eclipse-jee-devel
 
 pkgname = eclipse-php-devel
 
+pkgname = eclipse-java-devel
+
diff --git a/PKGBUILD b/PKGBUILD
index 41caa3db98c1..cc0deba80067 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,9 +6,26 @@
 # Contributor: Andreas W. Hauser <andy-aur@splashground.de>
 # Contributor: Marco Crosio <marco.crosio@gmail.com>
 
+# Set packages you want built to 1
+# If no packages are selected, build java by default
+# If more than 1 package is selected, create an eclipse-common-devel package
+_build_java=1
+_build_cpp=1
+_build_jee=1
+_build_php=1
+
 pkgbase=eclipse-devel
-pkgname=(eclipse-{common,java,cpp,jee,php}-devel)
-_milestone=RC3
+pkgname=()
+[[ "${_build_cpp}" == '1' ]] && pkgname+=('eclipse-cpp-devel')
+[[ "${_build_jee}" == '1' ]] && pkgname+=('eclipse-jee-devel')
+[[ "${_build_php}" == '1' ]] && pkgname+=('eclipse-php-devel')
+# If no packages are selected, build java by default
+[[ "${_build_java}" == '1' || ${#pkgname[@]} -eq 0 ]] && pkgname+=('eclipse-java-devel')
+# If we're building more than one package, create a common package
+[[ ${#pkgname[@]} -gt 1 ]] && pkgname=('eclipse-common-devel' "${pkgname[@]}")
+
+epoch=1
+_milestone=R
 pkgver=4.7.0.${_milestone}
 pkgrel=1
 _release=oxygen-${_milestone}
@@ -16,7 +33,8 @@ pkgdesc="Highly extensible IDE"
 license=(EPL)
 arch=(i686 x86_64)
 url="https://eclipse.org"
-makedepends=(ruby)
+makedepends=()
+[[ ${#pkgname[@]} -gt 1 ]] && makedepends+=('ruby')
 options=(!emptydirs)
 source=(commonify eclipse.sh eclipse.desktop)
 source_i686=()
@@ -46,7 +64,8 @@ for _file in "${source_x86_64[@]}" ; do
 done
 
 prepare() {
-  mkdir eclipse-common
+
+  [[ ${#pkgname[@]} -gt 1 ]] && mkdir eclipse-common
 
   for _pkg in ${pkgname[@]/-devel/}; do
     [[ $_pkg == 'eclipse-common' ]] && continue
@@ -62,36 +81,53 @@ prepare() {
 }
 
 build() {
-  ./commonify ${pkgname[@]/-devel/}
+  if [[ ${#pkgname[@]} -gt 1 ]] ; then
+    ./commonify ${pkgname[@]/-devel/}
+
+    mkdir -p eclipse-common/dropins
+    touch eclipse-common/dropins/.keep
+  else
+    touch ${pkgname[0]%%-devel}/dropins/.keep
+  fi
+}
+
+_package_files() {
+  install -Dm755 eclipse.sh "$pkgdir/usr/bin/eclipse-devel"
+  install -Dm644 eclipse.desktop "$pkgdir/usr/share/applications/eclipse-devel.desktop"
 
-  mkdir -p eclipse-common/dropins
-  touch eclipse-common/dropins/.keep
+  for _i in 16 32 48 256; do
+    install -Dm644 "$1"/plugins/org.eclipse.platform_*/eclipse${_i}.png \
+      "$pkgdir/usr/share/icons/hicolor/${_i}x${_i}/apps/eclipse-devel.png"
+  done
 }
 
 package_eclipse-common-devel() {
   pkgdesc+=" (common files) Development Version"
   depends=("java-environment>=8" webkit2gtk unzip)
-  provides=("eclipse-common=$pkgver-$pkgrel")
+  provides=("eclipse-common=$pkgver-$pkgrel" "eclipse-common-devel=$pkgver-$pkgrel")
   install=eclipse.install
 
   install -d "$pkgdir/opt"
   cp -a eclipse-common "$pkgdir/opt/eclipse-devel"
 
-  install -Dm755 eclipse.sh "$pkgdir/usr/bin/eclipse-devel"
-  install -Dm644 eclipse.desktop "$pkgdir/usr/share/applications/eclipse-devel.desktop"
-
-  for _i in 16 32 48 256; do
-    install -Dm644 eclipse-common/plugins/org.eclipse.platform_*/eclipse${_i}.png \
-      "$pkgdir/usr/share/icons/hicolor/${_i}x${_i}/apps/eclipse-devel.png"
-  done
+  _package_files 'eclipse-common'
 }
 
 _package() {
   _variant=${1#eclipse-}
-  pkgdesc+=" (${_variant^^} variant) Development Version"
-  depends=(eclipse-common-devel=$pkgver)
-  provides=("eclipse-$_variant=$pkgver-$pkgrel")
+  pkgdesc+=" (${_variant} variant) Development Version"
+  conflicts=('eclipse-devel')
+  if [[ ${#pkgname[@]} -gt 1 ]] ; then
+    depends=(eclipse-common-devel=$pkgver)
+  else
+    conflicts+=('eclipse-common-devel')
+  fi
+  provides=(eclipse-devel "eclipse-$_variant=$pkgver-$pkgrel")
 
   install -d "$pkgdir/opt"
-  cp -a $1 "$pkgdir/opt/eclipse-devel"
+  cp -a ${1%%-devel} "$pkgdir/opt/eclipse-devel"
+
+  if [[ ${#pkgname[@]} -eq 1 ]] ; then
+    _package_files "eclipse-$_variant"
+  fi
 }