Reworked: overlay-scrollbar-bzr is no longer a metapackage, but a config package for both gtk3 and gtk2 versions

1 files changed, 26 insertions, 31 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6df6e83f37a8..e9b3b9d829a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,20 @@
 # Maintainer: quequotion <quequotion@bugmenot.com>
 # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 
-pkgname=({overlay-scrollbar,liboverlay-scrollbar-gtk3}-bzr)
+pkgname=({overlay-scrollbar,liboverlay-scrollbar-gtk{2,3}}-bzr)
 pkgbase=overlay-scrollbar-bzr
 pkgver=r391
-pkgrel=1
+pkgrel=2
 pkgdesc="Ayatana Scrollbars, pointer-triggered overlay scrollbars to save screen real-estate."
 arch=('i686' 'x86_64')
 url="https://launchpad.net/ayatana-scrollbar"
 license=('LGPL')
 groups=('unity')
-makedepends=('gtk3')
 options=('!emptydirs')
 extrafiles=('overlay-scrollbar.install')
 source=('bzr+lp:overlay-scrollbar#revision=391')
 sha512sums=('SKIP')
 
-
 pkgver() {
   cd overlay-scrollbar
 
@@ -27,48 +25,43 @@ build() {
   cd "${srcdir}/overlay-scrollbar"
 
   autoreconf -vfi
-
   [[ -d ../build-gtk3 ]] || mkdir ../build-gtk3
   pushd ../build-gtk3
   ../overlay-scrollbar/configure --prefix=/usr --sysconfdir=/etc --with-gtk=3 --disable-static
   make
   popd
 
-#  bzr update
-#  autoreconf -vfi
-
-#  [[ -d ../build-gtk2 ]] || mkdir ../build-gtk2
-#  pushd ../build-gtk2
-#  ../overlay-scrollbar/configure --prefix=/usr --sysconfdir=/etc --disable-static
-#  make
-#  popd
+  [[ -d ../build-gtk2 ]] || mkdir ../build-gtk2
+  pushd ../build-gtk2
+  ../overlay-scrollbar/configure --prefix=/usr --sysconfdir=/etc --with-gtk=2 --disable-static
+  make
+  popd
 
 }
 
 package_overlay-scrollbar-bzr() {
   pkgdesc+="Configuration and metapackage"
-  depends=('dconf' liboverlay-scrollbar-gtk{2,3})
+  depends=('dconf')
   provides=(overlay-scrollbar{,-bzr}="${pkgver}")
   conflicts=(overlay-scrollbar)
   install=overlay-scrollbar.install
 
   cd "${srcdir}/build-gtk3/"
   make DESTDIR="${pkgdir}/" install
-
-  rm -rvf "${pkgdir}/usr/lib/"
-
-  # Put X11 startup script in correct directory
   install -dm755 "${pkgdir}/etc/X11/xinit/xinitrc.d/"
-  mv "${pkgdir}/etc/X11/Xsession.d/81overlay-scrollbar" \
-    "${pkgdir}/etc/X11/xinit/xinitrc.d/"
+  mv "${pkgdir}"/etc/X11/{Xsession.d/81overlay-scrollbar,xinit/xinitrc.d/}
   chmod 755 "${pkgdir}/etc/X11/xinit/xinitrc.d/81overlay-scrollbar"
+
+  rm -rvf "${pkgdir}/usr/lib/"
 }
 
 package_liboverlay-scrollbar-gtk3-bzr() {
   pkgdesc+=" gtk3"
-  depends=('cairo' 'gtk3')
+  depends=('cairo' 'gtk3' 'dconf' 'overlay-scrollbar-bzr')
+  makedepends=('gtk3')
   provides=(liboverlay-scrollbar{3,-gtk3}{,-bzr}="${pkgver}")
   conflicts=('liboverlay-scrollbar3')
+  install=overlay-scrollbar.install
 
   cd "${srcdir}/build-gtk3/"
   make DESTDIR="${pkgdir}/" install
@@ -77,16 +70,18 @@ package_liboverlay-scrollbar-gtk3-bzr() {
   rm -rvf "${pkgdir}/usr/share/glib-2.0/"
 }
 
-#package_liboverlay-scrollbar-bzr() {
-#  pkgdesc+=" gtk2"
-#  depends=('gtk2-ubuntu')
-#  provides=(liboverlay-scrollbar{,-gtk2}{,-bzr}="${pkgver}")
-#  conflicts=('liboverlay-scrollbar')
+package_liboverlay-scrollbar-gtk2-bzr() {
+  pkgdesc+=" gtk2"
+  depends=('gtk2-ubuntu' 'overlay-scrollbar-bzr')
+  makedepends=('gtk2-ubuntu')
+  provides=(liboverlay-scrollbar{,-gtk2}{,-bzr}="${pkgver}")
+  conflicts=('liboverlay-scrollbar')
+  install=overlay-scrollbar.install
 
-#  cd "${srcdir}/build-gtk2/"
-#  make DESTDIR="${pkgdir}/" install
+  cd "${srcdir}/build-gtk2/"
+  make DESTDIR="${pkgdir}/" install
 
-#  rm -rvf "${pkgdir}/etc/"
-#  rm -rvf "${pkgdir}/usr/share/glib-2.0/"
-#}
+  rm -rvf "${pkgdir}/etc/"
+  rm -rvf "${pkgdir}/usr/share/glib-2.0/"
+}