oyepa: create install file; clean up packaging, sources

4 files changed, 43 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 749bcc846441..8180fd665723 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = oyepa
-	pkgdesc = A tagging file system emulator.
+	pkgdesc = Tagging file system emulator
 	pkgver = 3.2
-	pkgrel = 1
-	url = http://pages.stern.nyu.edu/~marriaga/software/oyepa/
+	pkgrel = 2
+	url = https://pages.stern.nyu.edu/~marriaga/software/oyepa
 	arch = any
 	license = GPL2
-	depends = python2-pyqt
 	depends = python2-pyinotify
-	source = http://pages.stern.nyu.edu/~marriaga/software/oyepa/oyepa-latest.tgz
-	md5sums = 099777c8b0601bdaa6ff2e6ab4fcfe8c
+	depends = python2-pyqt4
+	source = oyepa-3.2.tgz::https://pages.stern.nyu.edu/~marriaga/software/oyepa/oyepa-latest.tgz
+	b2sums = b7f6a7f0468144465b86262071ba743e1232bcc3cdb50324862a8fa7ffb85a1e8e29e2ca010091a6565e90fe4ad82dbecff80f61921de7387ab4d2fe71cf7fb5
 
 pkgname = oyepa
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..d9d4a3b83343
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/*
+!/.gitignore
+!/.SRCINFO
+!/PKGBUILD
+!/oyepa.install
diff --git a/PKGBUILD b/PKGBUILD
index 326e523e601b..55d2aa951a8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,32 @@
-# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Maintainer: éclairevoyant
+# Contributor: Kyle Keen <keenerd at gmail dot com>
 
 pkgname=oyepa
 pkgver=3.2
-pkgrel=1
-pkgdesc="A tagging file system emulator."
-arch=('any')
-url="http://pages.stern.nyu.edu/~marriaga/software/oyepa/"
-license=('GPL2')
-depends=('python2-pyqt' 'python2-pyinotify')
-source=(http://pages.stern.nyu.edu/~marriaga/software/$pkgname/$pkgname-latest.tgz)
-md5sums=('099777c8b0601bdaa6ff2e6ab4fcfe8c')
+pkgrel=2
+pkgdesc="Tagging file system emulator"
+arch=(any)
+url="https://pages.stern.nyu.edu/~marriaga/software/$pkgname"
+license=(GPL2)
+depends=(python2-pyinotify python2-pyqt4)
+source=("$pkgname-$pkgver.tgz::$url/$pkgname-latest.tgz")
+b2sums=('b7f6a7f0468144465b86262071ba743e1232bcc3cdb50324862a8fa7ffb85a1e8e29e2ca010091a6565e90fe4ad82dbecff80f61921de7387ab4d2fe71cf7fb5')
+install=$pkgname.install
 
-package() {
-  cd $pkgname-$pkgver
-  
-  # Oyepa normally uses install.sh to copy and link files.
-  # But it can't split between /usr/bin and /usr/share.
-  # So we do it by hand, here.
-
-  # Some .py files have no shebang?
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' *.py
+prepare() {
+	sed -i 's|/usr/bin/env python|\02|' $pkgname-$pkgver/*.py
+}
 
-  # Copy everything to /usr/share/oyepa/
-  install -d    "$pkgdir/usr/share/$pkgname/icons"
-  install *.py  "$pkgdir/usr/share/$pkgname"
-  install *.png "$pkgdir/usr/share/$pkgname"
-  install *O*   "$pkgdir/usr/share/$pkgname"
-  install *E*   "$pkgdir/usr/share/$pkgname"
-  install -Dm644 icons/* "$pkgdir/usr/share/$pkgname/icons"
-  chmod -x "$pkgdir"/usr/share/$pkgname/{CHANGE.LOG,COPYING,README,TODO}
-  # Create symlinks in /usr/bin/
-  install -d "$pkgdir/usr/bin"
-  ln -s /usr/share/$pkgname/oyepa.py         "/$pkgdir/usr/bin/oyepa"
-  ln -s /usr/share/$pkgname/oyepa-filemon.py "/$pkgdir/usr/bin/oyepa-filemon"
-  ln -s /usr/share/$pkgname/mp.py            "/$pkgdir/usr/bin/mp.py"
-  ln -s /usr/share/$pkgname/ds.py            "/$pkgdir/usr/bin/ds"
-  ln -s /usr/share/$pkgname/wnote.py         "/$pkgdir/usr/bin/wnote"
+package() {
+	cd $pkgname-$pkgver
+	install -Dm755 *.py -t "$pkgdir/usr/share/$pkgname/"
+	install -Dm644 *.png CHANGE.LOG COPYING README TODO -t "$pkgdir/usr/share/$pkgname/"
+	install -Dm644 icons/* -t "$pkgdir/usr/share/$pkgname/icons/"
 
-  msg "Create the file ~/.oyepa/dirs with directories to watch.  See /usr/share/oyepa/README for more."
+	install -d "$pkgdir/usr/bin"
+	ln -s /usr/share/$pkgname/oyepa.py         "$pkgdir/usr/bin/oyepa"
+	ln -s /usr/share/$pkgname/oyepa-filemon.py "$pkgdir/usr/bin/oyepa-filemon"
+	ln -s /usr/share/$pkgname/mp.py            "$pkgdir/usr/bin/mp.py"
+	ln -s /usr/share/$pkgname/ds.py            "$pkgdir/usr/bin/ds"
+	ln -s /usr/share/$pkgname/wnote.py         "$pkgdir/usr/bin/wnote"
 }
diff --git a/oyepa.install b/oyepa.install
new file mode 100644
index 000000000000..18050ebae003
--- /dev/null
+++ b/oyepa.install
@@ -0,0 +1,7 @@
+post_install() {
+	echo "Create the file ~/.oyepa/dirs with directories to watch. See /usr/share/oyepa/README for more info."
+}
+
+post_upgrade() {
+	post_install
+}