rename to bumblebee

3 files changed, 18 insertions, 19 deletions

diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee/PKGBUILD
index 82bfbca1d..964fcf020 100644
--- a/libre/bumblebee-libre/PKGBUILD
+++ b/libre/bumblebee/PKGBUILD
@@ -1,10 +1,9 @@
 # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=bumblebee
-pkgname=bumblebee-libre
+pkgname=bumblebee
 pkgver=3.2.1
-pkgrel=3
+pkgrel=3.parabola1
 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('virtualgl' 'glib2' 'mesa-libgl')
@@ -17,32 +16,32 @@ if [ "$CARCH" = "x86_64" ]; then
      optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun'
      optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun'
 fi
-replaces=('bumblebee' 'nvidia-libgl')
-conflicts=('bumblebee' 'nvidia-libgl')
-provides=("bumblebee=$pkgver" 'nvidia-libgl')
-url="http://www.bumblebee-project.org"
+replaces=("$pkgname-libre" 'nvidia-libgl')
+conflicts=("$pkgname-libre" 'nvidia-libgl')
+provides=('nvidia-libgl')
+url="http://www.$pkgname-project.org"
 license=("GPL3")
-install='bumblebee.install'
-backup=('etc/bumblebee/bumblebee.conf' 
-        'etc/bumblebee/xorg.conf.nouveau')
-source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz"
+install="$pkgname.install"
+backup=("etc/$pkgname/$pkgname.conf"
+        "etc/$pkgname/xorg.conf.nouveau")
+source=("http://www.$pkgname-project.org/${pkgname}-${pkgver}.tar.gz"
         'libre.patch')
 md5sums=('30974e677bb13e8a3825fd6f3e7d3b24'
          '1daed1e00f74538add6c435dfa0569d1')
 
 prepare() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
 
     # Remove nonfree references to nonfree nvidia driver and unnecessaries files
     rm -rv "README.markdown"
-    rm -rv "conf/"{99-bumblebee-nvidia-dev.rules,xorg.conf.nvidia}
+    rm -rv "conf/"{99-$pkgname-nvidia-dev.rules,xorg.conf.nvidia}
     rm -rv "doc"
-    rm -rv "scripts/bumblebee-bugreport.in"
+    rm -rv "scripts/$pkgname-bugreport.in"
     patch -Np1 -i "${srcdir}/libre.patch"
 }
 
 build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
 
     ./configure \
         CONF_DRIVER=nouveau \
@@ -55,14 +54,14 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
 
     make install DESTDIR="$pkgdir"
 
     # Install systemd unit
-    install -D -m644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service"    
-    sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service"
+    install -D -m644 "scripts/systemd/${pkgname}d.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}d.service"
+    sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/${pkgname}d.service"
 
     # Make bash_completion work
-    mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun"
+    mv -v "${pkgdir}/etc/bash_completion.d/$pkgname" "${pkgdir}/etc/bash_completion.d/optirun"
 }
diff --git a/libre/bumblebee-libre/bumblebee.install b/libre/bumblebee/bumblebee.install
index 57aed6cc5..57aed6cc5 100644
--- a/libre/bumblebee-libre/bumblebee.install
+++ b/libre/bumblebee/bumblebee.install
diff --git a/libre/bumblebee-libre/libre.patch b/libre/bumblebee/libre.patch
index 81d49ca33..81d49ca33 100644
--- a/libre/bumblebee-libre/libre.patch
+++ b/libre/bumblebee/libre.patch