Tue May 14 01:18:40 PDT 2013

5 files changed, 44 insertions, 64 deletions

diff --git a/core/sysvinit/0001-simplify-writelog.patch b/core/sysvinit-tools/0001-simplify-writelog.patch
index cc28f14bc..cc28f14bc 100644
--- a/core/sysvinit/0001-simplify-writelog.patch
+++ b/core/sysvinit-tools/0001-simplify-writelog.patch
diff --git a/core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch b/core/sysvinit-tools/0002-remove-ansi-escape-codes-from-log-file.patch
index 89b3280df..89b3280df 100644
--- a/core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch
+++ b/core/sysvinit-tools/0002-remove-ansi-escape-codes-from-log-file.patch
diff --git a/core/sysvinit-tools/PKGBUILD b/core/sysvinit-tools/PKGBUILD
new file mode 100644
index 000000000..e0c3c0358
--- /dev/null
+++ b/core/sysvinit-tools/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 185338 2013-05-13 13:18:59Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Maintainer: Eric Belanger <eric@archlinux.org>
+
+pkgname=sysvinit-tools
+pkgver=2.88
+pkgrel=10
+arch=('i686' 'x86_64')
+url="http://savannah.nongnu.org/projects/sysvinit"
+license=('GPL')
+depends=('glibc')
+source=(http://download.savannah.gnu.org/releases/sysvinit/sysvinit-${pkgver}dsf.tar.bz2
+        "0001-simplify-writelog.patch"
+        "0002-remove-ansi-escape-codes-from-log-file.patch")
+sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26'
+          '326112c8a9bd24cb45bd4bb2f958a25f0ac4773d'
+          'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32')
+
+build() {
+  cd "${srcdir}/sysvinit-${pkgver}dsf"
+
+  # FS#30005
+  patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch"
+  patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch"
+
+  make 
+}
+
+package() {
+  pkgdesc="Linux System V Init Tools"
+
+  cd "${srcdir}/sysvinit-${pkgver}dsf"
+  make ROOT="${pkgdir}" install
+
+  ### drop the stuff provided by systemd-sysvcompat and util-linux
+  cd "${pkgdir}"
+  rm -r usr/share/man/man5
+  rm -r usr/include
+  rm bin/mountpoint
+  rm sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin}
+  rm usr/bin/{mesg,utmpdump,wall}
+  rm usr/share/man/man1/{mountpoint,mesg,utmpdump,wall}.1
+  rm usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin}.8
+}
diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD
deleted file mode 100644
index 334bafded..000000000
--- a/core/sysvinit/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 168539 2012-10-13 09:28:52Z thomas $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgbase=sysvinit
-pkgname=('sysvinit-tools' 'sysvinit')
-pkgver=2.88
-pkgrel=9
-arch=('i686' 'x86_64')
-url="http://savannah.nongnu.org/projects/sysvinit"
-license=('GPL')
-depends=('util-linux' 'coreutils' 'glibc' 'awk')
-source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgbase}-${pkgver}dsf.tar.bz2
-        "0001-simplify-writelog.patch"
-        "0002-remove-ansi-escape-codes-from-log-file.patch")
-sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26'
-          '326112c8a9bd24cb45bd4bb2f958a25f0ac4773d'
-          'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}dsf"
-
-  # FS#30005
-  patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch"
-  patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch"
-
-  make 
-}
-
-package_sysvinit-tools() {
-  pkgdesc="Linux System V Init Tools"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}dsf"
-  make ROOT="${pkgdir}" install
-
-  # provided by util-linux
-  cd "${pkgdir}"
-  rm bin/mountpoint
-  rm usr/share/man/man1/mountpoint.1
-  rm usr/bin/{mesg,utmpdump,wall}
-  rm usr/share/man/man1/{mesg,utmpdump,wall}.1
-  rm sbin/sulogin
-  rm usr/share/man/man8/sulogin.8
-
-  ### split out sysvinit
-  rm -rf ${srcdir}/_sysvinit
-  install -dm755 \
-        ${srcdir}/_sysvinit/sbin \
-        ${srcdir}/_sysvinit/usr/share/man/man8
-  cd ${srcdir}/_sysvinit
-  mv ${pkgdir}/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} sbin/
-  mv ${pkgdir}/usr/share/man/man5 usr/share/man/
-  mv ${pkgdir}/usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}.8 usr/share/man/man8/
-}
-
-package_sysvinit() {
-  pkgdesc="Linux System V Init"
-  depends=('sysvinit-tools')
-  install=sysvinit.install
-
-  mv "${srcdir}"/_sysvinit/* $pkgdir
-}
diff --git a/core/sysvinit/sysvinit.install b/core/sysvinit/sysvinit.install
deleted file mode 100644
index 2f0e62e74..000000000
--- a/core/sysvinit/sysvinit.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_upgrade() {
-  [ -x sbin/init ] && sbin/init u
-}