Merge pull request #53 from jrstjohn/remove-pkgfile

Remove pkgfile and other cleanup/maintenance

Author: Daenyth

.gitignore

@@ -5,7 +5,4 @@ pkgtools.tar.gz
 .*.swp
 *.files.*
 scripts/*.pyc
-modules/pkgfile.so
-modules/*.o
-modules/build
 tags

Makefile

@@ -1,22 +1,18 @@
 INSTALL = install
 INSTALL_DATA = $(INSTALL) -Dm644
 INSTALL_PROGRAM = $(INSTALL) -Dm755
-INSTALL_CRON = $(INSTALL) -Dm744
-
 prefix = /usr
 exec_prefix = $(prefix)
 confdir = /etc
 bindir = $(exec_prefix)/bin
 libdir = $(prefix)/lib
 sharedir = $(prefix)/share/pkgtools
-cachedir = /var/cache/pkgtools/lists
 profiledir = $(confdir)/profile.d
-crondir = $(confdir)/cron.daily
 mandir = $(prefix)/share/man
 
 .PHONY: all
 
-all: pkgfile.so
+all: install
 
 install:
 	# Common functions needed by all scripts
@@ -29,18 +25,6 @@ install:
 	$(INSTALL) -d $(DESTDIR)$(sharedir)/newpkg/presets/
 	$(INSTALL) -m644 other/newpkg_presets/* $(DESTDIR)$(sharedir)/newpkg/presets/
 
-	# pkgfile
-	$(INSTALL) -d $(DESTDIR)$(cachedir)
-	$(INSTALL_PROGRAM) scripts/pkgfile.py $(DESTDIR)$(bindir)/pkgfile
-	$(INSTALL_DATA) confs/pkgfile.conf $(DESTDIR)$(confdir)/pkgtools/pkgfile.conf
-	$(INSTALL_CRON) other/pkgfile.cron $(DESTDIR)$(crondir)/pkgfile
-	# install pkgfile.so module
-	(cd modules; python3 ./setup.py install --root=$(DESTDIR))
-	# Loads shell hooks
-	$(INSTALL_PROGRAM) other/pkgfile-hook.sh $(DESTDIR)$(profiledir)/pkgfile-hook.sh
-	$(INSTALL_DATA) other/pkgfile-hook.zsh $(DESTDIR)$(sharedir)/pkgfile-hook.zsh
-	$(INSTALL_DATA) other/pkgfile-hook.bash $(DESTDIR)$(sharedir)/pkgfile-hook.bash
-
 	# spec2arch
 	$(INSTALL_PROGRAM) scripts/spec2arch $(DESTDIR)$(bindir)/spec2arch
 	$(INSTALL_DATA) confs/spec2arch.conf $(DESTDIR)$(confdir)/pkgtools/spec2arch.conf
@@ -64,15 +48,7 @@ install:
 
 uninstall:
 	rm -Rf $(DESTDIR)$(sharedir)
-	rm $(DESTDIR)$(bindir)/{newpkg,pkgfile,spec2arch,pkgconflict,whoneeds,pkgclean,pip2arch}
-	rm $(DESTDIR)$(crondir)/pkgfile
-	rm $(DESTDIR)$(profiledir)/pkgfile-hook.*
+	rm $(DESTDIR)$(bindir)/{newpkg,spec2arch,pkgconflict,whoneeds,pkgclean,pip2arch}
 	rm -Rf $(DESTDIR)$(confdir)/pkgtools
 	rm $(DESTDIR)$(mandir)/man8/spec2arch.8
 	rm $(DESTDIR)$(mandir)/man5/spec2arch.conf.5
-
-pkgfile.so:
-	(cd modules; python3 ./setup.py build)
-
-clean:
-	(rm -rf modules/build)

PKGBUILD

@@ -1,26 +1,22 @@
 # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
 # Contributor: Daenyth <Daenyth+Arch AT gmail DOT com>
 pkgname=pkgtools
-pkgver=23
+pkgver=24
 pkgrel=1
 pkgdesc="A collection of scripts for Arch Linux packages"
-arch=('i686' 'x86_64')
-url="http://bbs.archlinux.org/viewtopic.php?pid=384196"
+arch=('any')
+url="https://bbs.archlinux.org/viewtopic.php?pid=384196"
 license=('GPL')
-source=(v$pkgver::http://github.com/Daenyth/pkgtools/tarball/v$pkgver)
+depends=('bash>=4' 'pcre' 'libarchive' 'python' 'namcap' 'pkgfile')
+optdepends=('abs: Provides PKGBUILD prototypes for newpkg')
+provides=('newpkg')
 backup=('etc/pkgtools/newpkg.conf' 'etc/pkgtools/pkgfile.conf' 'etc/pkgtools/spec2arch.conf')
 install=pkgtools.install
-provides=(newpkg pkgfile)
-depends=('bash>=4' 'pcre' 'libarchive' 'python')
-optdepends=('cron: For pkgfile --update entry'
-            'abs: Provides proto packaging files for newpkg')
-md5sums=('5361111e31741f8d7ff8ca45c7996b6b')
+source=("${pkgname}-v${pkgver}.tar.gz::https://github.com/Daenyth/pkgtools/tarball/v$pkgver")
+md5sums=('f139c3940e1038cac4e29e985089e8a8')
 
-build() {
-  cd "$srcdir/Daenyth-$pkgname"-*
+package() {
+	cd "Daenyth-$pkgname"-*
 
-  make
-  make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 }
-
-# vim:set ts=2 sw=2 et:

PKGBUILD-git

@@ -1,44 +1,30 @@
 # Contributor: Daenyth <Daenyth+Arch AT gmail DOT com>
 pkgname=pkgtools-git
-pkgver=20110902
+_pkgname=pkgtools
+pkgver=20140211.bc854ae
 pkgrel=1
 pkgdesc="A collection of scripts for Arch Linux packages"
-arch=('i686' 'x86_64')
-url="http://github.com/Daenyth/pkgtools"
+arch=('any')
+url="https://github.com/Daenyth/pkgtools"
 license=('GPL')
-source=()
-depends=('bash>=4' 'libarchive' 'pcre' 'python')
-makedepends=(git)
-provides=(pkgtools)
-conflicts=(pkgtools)
+depends=('bash>=4' 'libarchive' 'pcre' 'python' 'namcap' 'pkgfile')
+makedepends=('git')
+optdepends=('abs: Provides PKGBUILD prototypes for newpkg')
+provides=('pkgtools' 'newpkg')
+conflicts=('pkgtools')
 backup=('etc/pkgtools/newpkg.conf' 'etc/pkgtools/pkgfile.conf' 'etc/pkgtools/spec2arch.conf')
-install=pkgtools.install
-optdepends=('cron: For pkgfile --update entry'
-            'abs: Provides proto packaging files for newpkg')
 options=('!strip')
+install=pkgtools.install
+source=("git+https://github.com/Daenyth/${_pkgname}.git")
+sha1sums=('SKIP')
 
-_gitroot="git://github.com/Daenyth/pkgtools.git"
-_gitname="pkgtools"
-
-build() {
-  cd ${srcdir}
-  msg "Connecting to GIT server...."
-
-  if [ -d ${srcdir}/$_gitname ] ; then
-    cd $srcdir/$_gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone $_gitroot
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  [[ -d $srcdir/$_gitname-build ]] && rm -r ${srcdir}/$_gitname-build
-  cp -r ${srcdir}/$_gitname ${srcdir}/$_gitname-build
-  cd ${srcdir}/$_gitname-build
+pkgver() {
+	cd "${_pkgname%-git}"
+	echo "$(date +%Y%m%d).$(git rev-parse --short master)"
+}
 
-  make
-  make DESTDIR=${pkgdir} install
+package() {
+	cd "${_pkgname%-git}"
+	git submodule update --init
+	make DESTDIR="${pkgdir}" install
 }
-# vim:set ts=2 sw=2 et:

README.md

@@ -0,0 +1,10 @@
+This is a collection of scripts for Arch Linux packages.
+
+This repository contains the following scripts:
+	- newpkg
+	- spec2arch
+	- pkgconflict
+	- whoneeds
+	- pkgclean
+	- maintpkg
+	- pip2arch