Split into several packages to make optional components easier to remove

3 files changed, 108 insertions, 96 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05812f4060e0..4eeb937c6363 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,43 @@
 # Generated by mksrcinfo v8
-# Wed Oct 19 16:36:20 UTC 2016
+# Sun Nov 20 07:01:19 UTC 2016
 pkgbase = clion
 	pkgdesc = C/C++ IDE. Free 30-day trial.
 	pkgver = 2016.2.3
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = http://www.jetbrains.com/clion
-	arch = i686
 	arch = x86_64
 	license = custom
-	optdepends = java-runtime: native JRE
-	optdepends = cmake: native build system (Set BUNDLED_CMAKE=0 to remove the bundled one)
-	optdepends = gdb: native debugger (Set BUNDLED_GDB=0 to remove the bundled one)
-	optdepends = lldb: native debugger (Set BUNDLED_LLDB=0 to remove the bundled one)
+	noextract = CLion-2016.2.3.tar.gz
+	options = !strip
+	source = https://download.jetbrains.com/cpp/CLion-2016.2.3.tar.gz
+	source = jetbrains-clion.desktop
+	sha256sums = 0d2fc6ecec4dfab15ba98021ed3d3e866c2d43e7c27b7e522e0161e76aa78fbd
+	sha256sums = 9f0f4335f410e0587018c85ebfcf4b65a7a47ad682a58972624378953ef288d6
+
+pkgname = clion
+	optdepends = clion-jre: JetBrains custom Java Runtime (Recommended)
+	optdepends = clion-cmake: JetBrains packaged CMake tools
+	optdepends = clion-gdb: JetBrains packaged GNU debugger
+	optdepends = clion-lldb: JetBrains packaged LLVM debugger
+	optdepends = java-runtime: JRE - Required if clion-jre is not installed
+	optdepends = cmake: Build system - Required if clion-cmake is not installed
+	optdepends = gdb: native GNU debugger
+	optdepends = lldb: native LLVM debugger
 	optdepends = gcc: GNU compiler
 	optdepends = clang: LLVM compiler
 	optdepends = biicode: C/C++ dependency manager
 	optdepends = gtest: C++ testing
 	optdepends = swift: Swift programming language support (Also requires the plugin)
-	optdepends = python: Python programming language support
+	optdepends = python: Python 3 programming language support
 	optdepends = python2: Python 2 programming language support
 	optdepends = doxygen: Code documentation generation
-	noextract = CLion-2016.2.3.tar.gz
-	options = !strip
-	source = https://download.jetbrains.com/cpp/CLion-2016.2.3.tar.gz
-	sha256sums = 0d2fc6ecec4dfab15ba98021ed3d3e866c2d43e7c27b7e522e0161e76aa78fbd
 
-pkgname = clion
+pkgname = clion-jre
+
+pkgname = clion-cmake
+
+pkgname = clion-gdb
+
+pkgname = clion-lldb
 
diff --git a/PKGBUILD b/PKGBUILD
index 32d3e338abba..f84a81c77884 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,106 +5,93 @@
 # Uncomment if you want to disable compressing the package to save some time.
 #PKGEXT=.pkg.tar
 
-# These can be overridden on the makepkg command line
-# Note that AUR helpers may not support overriding these, so they can also
-# be modified here for convenience
-[[ -z "$USE_SYSTEM_JRE" ]] && USE_SYSTEM_JRE=0
-[[ -z "$BUNDLED_CMAKE"  ]] && BUNDLED_CMAKE=1
-[[ -z "$BUNDLED_GDB"    ]] && BUNDLED_GDB=1
-[[ -z "$BUNDLED_LLDB"   ]] && BUNDLED_LLDB=1
-
-pkgname=clion
+pkgbase=clion
+pkgname=(clion clion-jre clion-cmake clion-gdb clion-lldb)
 _pkgname=clion
-_archname=CLion
+_dlname=CLion
 # Make sure to use vercmp to check version is seen as newer. Bump epoch if not.
 pkgver=2016.2.3
-pkgrel=1
+pkgrel=2
 # Bump when JetBrains uses silly letters in stable releases
 epoch=1
 pkgdesc="C/C++ IDE. Free 30-day trial."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 options=(!strip)
 url="http://www.jetbrains.com/${_pkgname}"
 license=('custom')
-source=("https://download.jetbrains.com/cpp/${_archname}-${pkgver}.tar.gz")
-sha256sums=('0d2fc6ecec4dfab15ba98021ed3d3e866c2d43e7c27b7e522e0161e76aa78fbd')
-noextract=("${_archname}-${pkgver}.tar.gz")
-depends=()
-optdepends=()
+source=("https://download.jetbrains.com/cpp/${_dlname}-${pkgver}.tar.gz"
+        "jetbrains-${pkgbase}.desktop")
+sha256sums=('0d2fc6ecec4dfab15ba98021ed3d3e866c2d43e7c27b7e522e0161e76aa78fbd'
+            '9f0f4335f410e0587018c85ebfcf4b65a7a47ad682a58972624378953ef288d6')
+noextract=("${_dlname}-${pkgver}.tar.gz")
 
-if (( USE_SYSTEM_JRE )); then
-  depends+=('java-runtime')
-else
-  optdepends+=('java-runtime: native JRE')
-fi
+build() {
+    mkdir -p "${srcdir}/opt/${pkgbase}"
+    bsdtar --strip-components 1 -xf "${_dlname}-${pkgver}.tar.gz" \
+           -C "${srcdir}/opt/${pkgbase}"
 
-if (( ! BUNDLED_CMAKE )); then
-  depends+=('cmake')
-else
-  optdepends+=('cmake: native build system (Set BUNDLED_CMAKE=0 to remove the bundled one)')
-fi
+    rm -f "${srcdir}/opt/${pkgbase}/bin/libyjpagent-linux.so"
+    rm -f "${srcdir}/opt/${pkgbase}/bin/fsnotifier"
+}
 
-optdepends+=(
-  'gdb: native debugger (Set BUNDLED_GDB=0 to remove the bundled one)'
-  'lldb: native debugger (Set BUNDLED_LLDB=0 to remove the bundled one)'
-  'gcc: GNU compiler'
-  'clang: LLVM compiler'
-  'biicode: C/C++ dependency manager'
-  'gtest: C++ testing'
-  'swift: Swift programming language support (Also requires the plugin)'
-  'python: Python programming language support'
-  'python2: Python 2 programming language support'
-  'doxygen: Code documentation generation'
-)
+package_clion() {
+    optdepends=(
+        'clion-jre: JetBrains custom Java Runtime (Recommended)'
+        'clion-cmake: JetBrains packaged CMake tools'
+        'clion-gdb: JetBrains packaged GNU debugger'
+        'clion-lldb: JetBrains packaged LLVM debugger'
+        'java-runtime: JRE - Required if clion-jre is not installed'
+        'cmake: Build system - Required if clion-cmake is not installed'
+        'gdb: native GNU debugger'
+        'lldb: native LLVM debugger'
+        'gcc: GNU compiler'
+        'clang: LLVM compiler'
+        'biicode: C/C++ dependency manager'
+        'gtest: C++ testing'
+        'swift: Swift programming language support (Also requires the plugin)'
+        'python: Python 3 programming language support'
+        'python2: Python 2 programming language support'
+        'doxygen: Code documentation generation'
+    )
 
-package() {
-  mkdir -p "${pkgdir}/opt/${pkgname}"
-  bsdtar --strip-components 1 -xf "${_archname}-${pkgver}.tar.gz" \
-         -C "${pkgdir}/opt/${pkgname}"
+    rsync -rtl "${srcdir}/opt" "${pkgdir}" \
+          --exclude=/opt/${pkgbase}/jre \
+          --exclude=/opt/${pkgbase}/bin/cmake \
+          --exclude=/opt/${pkgbase}/bin/gdb \
+          --exclude=/opt/${pkgbase}/bin/lldb
 
-  (( USE_SYSTEM_JRE )) && rm -r "${pkgdir}/opt/${pkgname}/jre"
-  (( ! BUNDLED_CMAKE )) && rm -r "${pkgdir}/opt/${pkgname}/bin/cmake"
-  (( ! BUNDLED_GDB )) && rm -r "${pkgdir}/opt/${pkgname}/bin/gdb"
-  (( ! BUNDLED_LLDB )) && rm -r "${pkgdir}/opt/${pkgname}/bin/lldb"
+    mkdir -p "${pkgdir}/usr/bin/"
+    mkdir -p "${pkgdir}/usr/share/applications/"
+    mkdir -p "${pkgdir}/usr/share/pixmaps/"
+    mkdir -p "${pkgdir}/usr/share/licenses/${pkgbase}"
 
-  if [[ $CARCH = 'i686' ]]; then
-    rm -f "${pkgdir}/opt/${pkgname}/bin/libyjpagent-linux64.so"
-    rm -f "${pkgdir}/opt/${pkgname}/bin/fsnotifier64"
-  fi
-  if [[ $CARCH = 'x86_64' ]]; then
-    rm -f "${pkgdir}/opt/${pkgname}/bin/libyjpagent-linux.so"
-    rm -f "${pkgdir}/opt/${pkgname}/bin/fsnotifier"
-  fi
+    install -m 644 "${srcdir}/jetbrains-${pkgbase}.desktop" \
+            "${pkgdir}/usr/share/applications/"
 
-(
-cat <<EOF
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=CLion
-GenericName=${_pkgname}
-Comment=${pkgdesc}
-Icon=${pkgname}
-Exec="/usr/bin/${pkgname}" %f
-Terminal=false
-Categories=Development;IDE;
-StartupNotify=true
-StartupWMClass=jetbrains-${_pkgname}
-EOF
-) > ${srcdir}/jetbrains-${pkgname}.desktop
+    ln -s "/opt/${pkgbase}/bin/${_pkgname}.svg" \
+            "${pkgdir}/usr/share/pixmaps/${pkgbase}.svg"
+    ln -s "/opt/${pkgbase}/license/CLion_Preview_License.txt" \
+            "${pkgdir}/usr/share/licenses/${pkgbase}"
+    ln -s "/opt/${pkgbase}/bin/${_pkgname}.sh" \
+            "${pkgdir}/usr/bin/${pkgbase}"
+}
 
-  mkdir -p "${pkgdir}/usr/bin/"
-  mkdir -p "${pkgdir}/usr/share/applications/"
-  mkdir -p "${pkgdir}/usr/share/pixmaps/"
-  mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
+package_clion-jre() {
+    install -d -m755 "${pkgdir}/opt/${pkgbase}"
+    rsync -rtl "${srcdir}/opt/${pkgbase}/jre" "${pkgdir}/opt/${pkgbase}"
+}
 
-  install -m 644 "${srcdir}/jetbrains-${pkgname}.desktop" \
-            "${pkgdir}/usr/share/applications/"
+package_clion-cmake() {
+    install -d -m755 "${pkgdir}/opt/${pkgbase}/bin"
+    rsync -rtl "${srcdir}/opt/${pkgbase}/bin/cmake" "${pkgdir}/opt/${pkgbase}/bin"
+}
+
+package_clion-gdb() {
+    install -d -m755 "${pkgdir}/opt/${pkgbase}/bin"
+    rsync -rtl "${srcdir}/opt/${pkgbase}/bin/gdb" "${pkgdir}/opt/${pkgbase}/bin"
+}
 
-  ln -s "/opt/${pkgname}/bin/${_pkgname}.svg" \
-            "${pkgdir}/usr/share/pixmaps/${pkgname}.svg"
-  ln -s "/opt/${pkgname}/license/CLion_Preview_License.txt" \
-            "${pkgdir}/usr/share/licenses/${pkgname}"
-  ln -s "/opt/${pkgname}/bin/${_pkgname}.sh" \
-            "${pkgdir}/usr/bin/${pkgname}"
+package_clion-lldb() {
+    install -d -m755 "${pkgdir}/opt/${pkgbase}/bin"
+    rsync -rtl "${srcdir}/opt/${pkgbase}/bin/lldb" "${pkgdir}/opt/${pkgbase}/bin"
 }
diff --git a/jetbrains-clion.desktop b/jetbrains-clion.desktop
new file mode 100644
index 000000000000..4fdc1255a57d
--- /dev/null
+++ b/jetbrains-clion.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=CLion
+GenericName=clion
+Comment=C/C++ IDE. Free 30-day trial.
+Icon=clion
+Exec="/usr/bin/clion" %f
+Terminal=false
+Categories=Development;IDE;
+StartupNotify=true
+StartupWMClass=jetbrains-clion