Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

6 files changed, 54 insertions, 25 deletions

diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index dfc4da18e..9d771b952 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -51,6 +51,6 @@ package() {
   install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
 }
 
-md5sums=('7da3cc51b9ce0598dde955b034616267'
+md5sums=('63551fdb16086d57bfa4d39cd40d74cd'
          'fe4a243fabe24608f5c05e40f0f118f6'
          'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index 2a45f0310..e8a981a3d 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -27,7 +27,7 @@ source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.s
 prepare() {
   cd "$srcdir/$_pkgname-$pkgver"
   
-  ## Adding patch to remove unfree software recommendation (ServPoET)
+  ## Adding patch to remove nonfree software recommendation (ServPoET)
   patch -Np1 -i "$srcdir/rp-pppoe-libre.patch"
 
   cd "$srcdir/$_pkgname-$pkgver/src"
@@ -35,7 +35,7 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver/src"
+  cd "$srcdir/$_pkgname-$pkgver/src"
   ./configure --prefix=/usr --enable-plugin
   make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
 }
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
index 8b3c74d7c..b37ef217c 100644
--- a/libre/soundkonverter-libre/PKGBUILD
+++ b/libre/soundkonverter-libre/PKGBUILD
@@ -7,9 +7,9 @@
 
 _pkgname=soundkonverter
 pkgname=soundkonverter-libre
-pkgver=2.0.0
+pkgver=2.0.1
 pkgrel=1
-pkgdesc="Front-end to various audio converters (without nonfree faac and mac recommendation)"
+pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation"
 arch=('i686' 'x86_64')
 url="http://www.kde-apps.org/content/show.php?content=29024"
 license=('GPL')
@@ -36,7 +36,7 @@ conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=$_pkgname.install
 source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz")
-md5sums=('f1df729916b2418c474b859ed6b9eda6')
+md5sums=('d4f039003954c5279e56113237f608ca')
 
 build() {
   cd "$srcdir"/$_pkgname-$pkgver
diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD
index e3d5b265e..f87ce7e2a 100644
--- a/pcr/netatalk/PKGBUILD
+++ b/pcr/netatalk/PKGBUILD
@@ -5,13 +5,13 @@
 # Contributor: Farhan Yousaf <farhany at xaviya dot com>
 
 pkgname=netatalk
-pkgver=3.0.2
-pkgrel=1
+pkgver=3.0.3
+pkgrel=2
 pkgdesc='A kernel-level implementation of AFP services'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://netatalk.sourceforge.net'
 license=('GPL')
-depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent')
+depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent' 'python' 'dbus-glib')
 replaces=('netatalk-git' 'netatalk2')
 backup=('etc/afp.conf'
 	'etc/extmap.conf')
@@ -19,25 +19,28 @@ options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('b5f1c2c4b3a5e64f5bca219415aa1c75')
+md5sums=('0a6f3acefd27ad63d2cde6ae4702e1b4')
 
 build() {
 	cd $pkgname-$pkgver
-	msg2 'Fixing...'
-	sed -i -e 's:AC_CONFIG_SUBDIRS:#AC_CONFIG_SUBDIRS:' -e 's/x"linux/x"generic/' macros/netatalk.m4
-	sed -i 's:/lib:/usr/lib:' distrib/initscripts/Makefile.{am,in}
+
+	sed -i -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4
 	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {configure.ac,libevent/configure.in}
 	cp /usr/share/automake*/missing .
-	autoreconf -i >/dev/null
-	msg2 'Configuring...'
-	CFLAGS="-Wno-unused-result" ./configure --prefix=/usr --localstatedir=/var/state --sysconfdir=/etc --with-init-style=systemd \
-		--with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --with-libevent=no
-	sed -i -e s/-Ino// -e s/-Lno// etc/netatalk/Makefile
-	msg2 'Making...'
-	make >/dev/null
+	autoreconf -i
+
+  ./configure --prefix=/usr \
+              --localstatedir=/var/state \
+              --sysconfdir=/etc \
+              --with-init-style=systemd \
+              --with-cracklib \
+              --with-cnid-cdb-backend \
+              --enable-pgp-uam \
+              --with-libevent=no
+
+	make
 }
 package() {
 	cd $pkgname-$pkgver
-	msg2 'Building...'
-	make DESTDIR="$pkgdir" install >/dev/null
+	make DESTDIR="$pkgdir" install
 }
diff --git a/pcr/netatalk/netatalk.changelog b/pcr/netatalk/netatalk.changelog
index b1ada018b..712a8e5c1 100644
--- a/pcr/netatalk/netatalk.changelog
+++ b/pcr/netatalk/netatalk.changelog
@@ -1,3 +1,28 @@
+2013-03-27 SJ_UnderWater
+
+	* 3.0.3-1:
+	package update
+	minor fixes
+	python dependency
+
+2013-01-27 SJ_UnderWater
+
+	* 3.0.2-1:
+	package update
+	libevent fix
+	copy newer ./missing
+
+2013-01-05 SJ_UnderWater
+
+	* 3.0.1-5:
+	fixed AM deprecations
+	minor install fix
+
+2012-11-28 SJ_UnderWater
+
+	* 3.0.1-4 :
+	fixed mimic model
+
 2012-10-08 SJ_UnderWater
 
 	* 3.0.1-3 :
diff --git a/pcr/netatalk/netatalk.install b/pcr/netatalk/netatalk.install
index 629586531..b27dcd44b 100644
--- a/pcr/netatalk/netatalk.install
+++ b/pcr/netatalk/netatalk.install
@@ -2,12 +2,13 @@ post_install() {
 	post_upgrade
 }
 post_upgrade() {
-	if [ -f /etc/rc.conf ] && [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
+	if [ -f /etc/rc.conf ];then
+	if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
 	echo '>>> Detected old netatalk daemon entries in';
 	echo '>>> /etc/rc.conf, please replace these with';
 	echo '>>> "netatalk" before restarting!';
 	else echo '>>> Add "netatalk" to your DAEMONS list';fi
-	echo '>>>';
+	fi
 	if [ -f /etc/avahi/services/adisk.service ] ||
 	[ -f /etc/avahi/services/afpd.service ];then
 	echo '>>> Detected old netatalk service files in';
@@ -16,5 +17,5 @@ post_upgrade() {
 	if [ -f /opt/netatalk/afp_signature.conf ] ||
 	[ -f /opt/netatalk/afp_voluuid.conf ]; then
 	echo '>>> Found *.conf in /opt/netatalk, please';
-	echo '>>> migrate these to /etc/netatalk before restarting';fi
+	echo '>>> migrate these to /var/state/netatalk before restarting';fi
 }