Wed Sep 5 00:02:30 UTC 2012

7 files changed, 64 insertions, 39 deletions

diff --git a/community/apper/PKGBUILD b/community/apper/PKGBUILD
index 66c3ae307..1dc3a6397 100644
--- a/community/apper/PKGBUILD
+++ b/community/apper/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75748 2012-08-30 17:50:49Z idevolder $
+# $Id: PKGBUILD 75865 2012-09-03 20:25:45Z idevolder $
 # Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
 # Contributor: Valeriy Lyasotskiy <onestep@ukr.net>
 # Contributor: Zom <zom@eevul.org>
@@ -6,7 +6,7 @@
 pkgname=apper
 _pkgmainver=0.7
 pkgver=0.7.2
-pkgrel=4
+pkgrel=5
 pkgdesc="KDE tools for PackageKit"
 arch=('i686' 'x86_64')
 url="http://kde-apps.org/content/show.php/Apper?content=84745"
@@ -15,7 +15,7 @@ depends=('kdebase-workspace' 'packagekit-qt2>=0.6.17')
 makedepends=('cmake' 'automoc4' 'chrpath')
 install="$pkgname.install"
 provides=('kpackagekit')
-conflicts=('kpackagekit' 'gnome-packagekit')
+conflicts=('kpackagekit')
 replaces=('kpackagekit')
 source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2")
 sha256sums=('975fede728e7ab96d8e244ae721a2e15ae40b9fb1cd189a1f4afd46c400b219f')
@@ -36,6 +36,9 @@ package() {
 	cd "$pkgname-$pkgver"
 	cd build
 	make DESTDIR="$pkgdir" install
+	# avoid gnome-packagekit conflict (stolen from fedora as suggested)
+	mv "$pkgdir/usr/share/dbus-1/services/org.freedesktop.PackageKit.service" \
+		"$pkgdir/usr/share/dbus-1/services/kde-org.freedesktop.PackageKit.service"
 	# Hack around cmake rpath bug (debian)
 	chrpath --list "$pkgdir/usr/bin/apper"
 	chrpath --replace "/usr/lib/apper" "$pkgdir/usr/bin/apper"
diff --git a/community/milkytracker/PKGBUILD b/community/milkytracker/PKGBUILD
index cad1cfc2e..d869a8a31 100644
--- a/community/milkytracker/PKGBUILD
+++ b/community/milkytracker/PKGBUILD
@@ -1,10 +1,11 @@
 # $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Christopher O'Neill <milkytracker at chrisoneill co uk>
+# Contributor: Christopher O'Neill <milkytracker@chrisoneill.co.uk>
+# Contributor: Maks Verver <maksverver@geocities.com>
 
 pkgname=milkytracker
 pkgver=0.90.85
-pkgrel=6
+pkgrel=7
 pkgdesc="Fast Tracker II inspired music tracker"
 arch=('x86_64' 'i686')
 url="http://www.milkytracker.org/"
@@ -17,7 +18,7 @@ install=$pkgname.install
 source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2"
         'arch.patch')
 sha256sums=('59a0d294d63752be74b157e07b0c70252c9198c312d9b1ad0ca460129fe5bd80'
-            'cb9dfa99491d72eae7c09e7bae6c35871dddbc5b6a71730e772daa2f31f922bc')
+            'c0cf7adc0db78519644a64321c319b04a6ee6c26de1f0620b581137791f596c3')
 _name=('MilkyTracker')
 
 build() {
diff --git a/community/milkytracker/arch.patch b/community/milkytracker/arch.patch
index 3f5cb16cb..f7ade306f 100644
--- a/community/milkytracker/arch.patch
+++ b/community/milkytracker/arch.patch
@@ -203,35 +203,22 @@ diff -c -x .svn milkytracker-0.90.85/docs/MilkyTracker.html milkytracker-trunk/d
   
   
 Only in milkytracker-0.90.85/docs/: MilkyTracker.rtf
---- milkytracker-0.90.85/src/compression/DecompressorGZIP.cpp	2009-04-17 22:34:16.000000000 +0200
-+++ milkytracker-trunk/src/compression/DecompressorGZIP.cpp	2012-02-20 20:24:49.161937553 +0100
-@@ -61,7 +61,7 @@
+--- x/src/compression/DecompressorGZIP.cpp	2012-08-28 17:54:46.000000000 +0200
++++ y/src/compression/DecompressorGZIP.cpp	2012-08-28 17:55:21.000000000 +0200
+@@ -57,11 +57,11 @@
+ 	
+ bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint)
+ {
+-    gzFile *gz_input_file = NULL;
++    gzFile gz_input_file = NULL;
  	int len = 0;
  	pp_uint8 *buf;
  	
 -	if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL)
-+	if ((gz_input_file = (gzFile*)gzopen (fileName.getStrBuffer(), "r")) == NULL)
++	if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL)
  		return false;
  	
  	if ((buf = new pp_uint8[0x10000]) == NULL)
-@@ -71,7 +71,7 @@
- 	
-     while (true) 
- 	{
--        len = gzread (gz_input_file, buf, 0x10000);
-+        len = gzread (*gz_input_file, buf, 0x10000);
- 		
-         if (len < 0) 
- 		{
-@@ -84,7 +84,7 @@
- 		fOut.write(buf, 1, len);
-     }
- 	
--    if (gzclose (gz_input_file) != Z_OK)
-+    if (gzclose (*gz_input_file) != Z_OK)
- 	{
- 	    delete[] buf;
-         return false;
 diff -cx .svn milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp
 *** milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp	2009-03-28 11:19:41.392162000 +0000
 --- milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp	2010-01-03 18:48:15.616918068 +0000
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index e0a629774..582dafd5b 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 75451 2012-08-24 16:38:30Z heftig $
+# $Id: PKGBUILD 75855 2012-09-03 16:08:44Z tdziedzic $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Mathias Stearn <mathias@10gen.com>
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.0.7
+pkgver=2.2.0
 pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64')
@@ -19,22 +19,26 @@ backup=('etc/mongodb.conf')
 install="mongodb.install"
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
         'mongodb.rc' 'mongodb.conf' 'mongodb.service'
-        'boost-1.50.patch')
-md5sums=('420660f67c0dfaefac3ec3164fc2e096'
+        'SConscript.client.patch')
+md5sums=('832bdb6cc659176fd8d6b16a660ccfc6'
          '9c67e00f4626ad761a8f7d4e037a54d7'
          '4839fe1d638187ca3226e8267b947318'
          '96ab4517b48974ce0e566d9746a75a4f'
-         '5d22fd2c0ae869218488cd7c0dbc3903')
+         'a9529e2a6e392ffecef7a9178394c814')
 
 build() {
   export SCONSFLAGS="$MAKEFLAGS"
 
   cd mongodb-src-r${pkgver}
 
-  patch -Np1 -i $srcdir/boost-1.50.patch
+  # fix https://jira.mongodb.org/browse/SERVER-5575
+  patch -Np1 -i ${srcdir}/SConscript.client.patch
+
   sed -i '/nixLibPrefix/s/lib64/lib/' SConstruct
 
-  scons all --full --sharedclient # --use-system-sm --use-system-pcre
+  # --sharedclient generates an error that the source .so could not be found
+  # --use-system-sm --use-system-pcre
+  scons all --full
 }
 
 <<COMMENT
@@ -52,7 +56,7 @@ package() {
 
   cd mongodb-src-r${pkgver}
 
-  scons install --full --sharedclient --prefix=$pkgdir/usr # --use-system-sm --use-system-pcre
+  scons install --full --prefix=$pkgdir/usr
 
   install -D -m755 $srcdir/mongodb.rc $pkgdir/etc/rc.d/mongodb
   install -D -m644 $srcdir/mongodb.conf $pkgdir/etc/mongodb.conf
diff --git a/community/mongodb/SConscript.client.patch b/community/mongodb/SConscript.client.patch
new file mode 100644
index 000000000..f289d18da
--- /dev/null
+++ b/community/mongodb/SConscript.client.patch
@@ -0,0 +1,13 @@
+diff --git a/src/SConscript.client b/src/SConscript.client
+index 7a6bdc9..3fb55e5 100644
+--- a/src/SConscript.client
++++ b/src/SConscript.client
+@@ -134,7 +134,7 @@ env.Install(
+ # install
+ prefix = GetOption("prefix")
+ 
+-env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
++env.InstallAs(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
+ 
+ for x in clientHeaderDirectories:
+     env.Install(prefix + "/include/mongo/" + x,
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 4331065b7..16ead1ff8 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74818 2012-08-06 08:52:13Z spupykin $
+# $Id: PKGBUILD 75852 2012-09-03 15:18:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.4.16
+pkgver=2.4.17
 pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64')
@@ -17,9 +17,11 @@ backup=("etc/redis.conf"
 	"etc/logrotate.d/redis")
 source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
+	"redis.service"
 	"redis.logrotate")
-md5sums=('6b3fffc8c58ebc0849a1046695d4556b'
+md5sums=('f921ce282fb1780cb4a5646e242dadea'
          '4f2c02b481283d1336508c988e60e8d8'
+         '5ab9fdb200e15c13b450fda77fa030b6'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
 build() {
@@ -34,6 +36,7 @@ package() {
 
     install -D -m755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING"
     install -D -m755 "$srcdir/redis.d" "$pkgdir/etc/rc.d/redis"
+    install -Dm644 "$srcdir"/redis.service "$pkgdir"/usr/lib/systemd/system/redis.service
     install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis"
     sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis/|;s|logfile stdout|logfile /var/log/redis.log| ' $srcdir/${pkgname}-${pkgver}/redis.conf
     install -D -m644 "$srcdir/${pkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis.conf"
diff --git a/community/redis/redis.service b/community/redis/redis.service
new file mode 100644
index 000000000..7596b4bda
--- /dev/null
+++ b/community/redis/redis.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Advanced key-value store
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/redis.pid
+ExecStartPre=/bin/mkdir -p /var/lib/redis
+ExecStart=/usr/bin/redis-server /etc/redis.conf
+ExecStop=/usr/bin/redis-cli shutdown
+Restart=always
+
+[Install]
+WantedBy=multi-user.target