Ayatana Overlay Scrollbars are best scrollbars.

2 files changed, 24 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac12e8e35615..9812d2a90ffd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Oct 23 11:57:44 UTC 2016
-pkgbase = overlay-scrollbar-bzr
+# Sun Oct 23 12:12:44 UTC 2016
+pkgbase = liboverlay-scrollbar-gtk2-bzr
 	pkgdesc = Ayatana Scrollbars, pointer-triggered overlay scrollbars to save screen real-estate.
-	pkgver = r391
+	pkgver = r395
 	pkgrel = 1
 	url = https://launchpad.net/ayatana-scrollbar
 	arch = i686
@@ -10,28 +10,15 @@ pkgbase = overlay-scrollbar-bzr
 	groups = unity
 	license = LGPL
 	makedepends = gtk2-ubuntu
-	makedepends = gtk3
 	options = !emptydirs
-	source = bzr+lp:overlay-scrollbar#revision=391
+	source = bzr+lp:overlay-scrollbar
 	sha512sums = SKIP
 
-pkgname = overlay-scrollbar-bzr
-	pkgdesc = Ayatana Scrollbars, pointer-triggered overlay scrollbars to save screen real-estate.Configuration and metapackage
-	install = overlay-scrollbar.install
-	depends = dconf
-	depends = liboverlay-scrollbar-gtk2
-	depends = liboverlay-scrollbar-gtk3
-	provides = overlay-scrollbar=r391
-	provides = overlay-scrollbar-bzr=r391
-	conflicts = overlay-scrollbar
-
-pkgname = liboverlay-scrollbar-gtk3-bzr
-	pkgdesc = Ayatana Scrollbars, pointer-triggered overlay scrollbars to save screen real-estate. gtk3
-	depends = cairo
-	depends = gtk3
-	provides = liboverlay-scrollbar3=r391
-	provides = liboverlay-scrollbar3-bzr=r391
-	provides = liboverlay-scrollbar-gtk3=r391
-	provides = liboverlay-scrollbar-gtk3-bzr=r391
-	conflicts = liboverlay-scrollbar3
+pkgname = liboverlay-scrollbar-gtk2-bzr
+	pkgdesc = Ayatana Scrollbars, pointer-triggered overlay scrollbars to save screen real-estate. gtk2
+	provides = liboverlay-scrollbar=r395
+	provides = liboverlay-scrollbar-bzr=r395
+	provides = liboverlay-scrollbar-gtk2=r395
+	provides = liboverlay-scrollbar-gtk2-bzr=r395
+	conflicts = liboverlay-scrollbar
 
diff --git a/PKGBUILD b/PKGBUILD
index cae2e73ddf20..da7cbcd9e371 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
 # Maintainer: quequotion <quequotion@bugmenot.com>
 # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 
-pkgname=({overlay-scrollbar,liboverlay-scrollbar-gtk3}-bzr)
-pkgbase=overlay-scrollbar-bzr
-pkgver=r391
+pkgname=(liboverlay-scrollbar-gtk2-bzr)
+#pkgbase=overlay-scrollbar-bzr
+pkgver=r395
 pkgrel=1
 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=('gtk2-ubuntu' 'gtk3')
+makedepends=('gtk2-ubuntu')
 options=('!emptydirs')
 extrafiles=('overlay-scrollbar.install')
-source=('bzr+lp:overlay-scrollbar#revision=391')
+source=('bzr+lp:overlay-scrollbar')
 sha512sums=('SKIP')
 
 
@@ -28,65 +28,23 @@ build() {
 
   autoreconf -vfi
 
-  [[ -d ../build-gtk3 ]] || mkdir ../build-gtk3
-  pushd ../build-gtk3
-  ../overlay-scrollbar/configure --prefix=/usr --sysconfdir=/etc --with-gtk=3 --disable-static
+  [[ -d ../build-gtk2 ]] || mkdir ../build-gtk2
+  pushd ../build-gtk2
+  ../overlay-scrollbar/configure --prefix=/usr --sysconfdir=/etc --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
-
 }
 
-package_overlay-scrollbar-bzr() {
-  pkgdesc+="Configuration and metapackage"
-  depends=('dconf' liboverlay-scrollbar-gtk{2,3})
-  provides=(overlay-scrollbar{,-bzr}="${pkgver}")
-  conflicts=(overlay-scrollbar)
-  install=overlay-scrollbar.install
+package() {
+  pkgdesc+=" gtk2"
+  provides=(liboverlay-scrollbar{,-gtk2}{,-bzr}="${pkgver}")
+  conflicts=('liboverlay-scrollbar')
 
-  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/"
-  chmod 755 "${pkgdir}/etc/X11/xinit/xinitrc.d/81overlay-scrollbar"
-}
-
-package_liboverlay-scrollbar-gtk3-bzr() {
-  pkgdesc+=" gtk3"
-  depends=('cairo' 'gtk3')
-  provides=(liboverlay-scrollbar{3,-gtk3}{,-bzr}="${pkgver}")
-  conflicts=('liboverlay-scrollbar3')
-
-  cd "${srcdir}/build-gtk3/"
+  cd "${srcdir}/build-gtk2/"
   make DESTDIR="${pkgdir}/" install
 
   rm -rvf "${pkgdir}/etc/"
   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')
-
-#  cd "${srcdir}/build-gtk2/"
-#  make DESTDIR="${pkgdir}/" install
-
-#  rm -rvf "${pkgdir}/etc/"
-#  rm -rvf "${pkgdir}/usr/share/glib-2.0/"
-#}
-