Tue Apr 23 01:16:16 PDT 2013

6 files changed, 97 insertions, 56 deletions

diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index cc3749800..9d771b952 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -7,8 +7,7 @@
 
 pkgname=cgminer-libre
 _pkgflag=libre
-pkgver=2.11.4
-_build=
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, without nonfree OpenCL recommendation"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
@@ -19,7 +18,7 @@ makedepends=('opencl-headers')
 provides=(${pkgname%-$_pkgflag}=$pkgver)
 conflicts=${pkgname%-$_pkgflag}
 replaces=${pkgname%-$_pkgflag}
-source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-$pkgver.tar.bz2"
+source=(http://github.com/ckolivas/${pkgname%-$_pkgflag}/archive/v3.0.0.tar.gz
         "${pkgname%-$_pkgflag}.conf.d"
         "${pkgname%-$_pkgflag}.service")
 backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf")
@@ -27,22 +26,22 @@ backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf")
 [ "$CARCH" == "x86_64" ] && makedepends+=('yasm')
 
 build() {
-  cd "$srcdir"
-  cd ${pkgname%-$_pkgflag}-$pkgver${_build}
+  cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver"
 
   # Use in-tree jansson since it is not compatible with jansson 2.0
   #sed -e 's/^AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)$/request_jansson=true/' -i configure.ac
 
   # Here you may want to use custom CFLAGS
   #export CFLAGS="-O2 -march=native -mtune=native -msse2"
-
-  ./configure --prefix=/usr --enable-cpumining --enable-scrypt --disable-adl
+  
+  ./autogen.sh
+  ./configure --prefix=/usr --enable-scrypt --disable-adl
   
   make
 }
 
 package() {
-  cd "$srcdir"/${pkgname%-$_pkgflag}-$pkgver${_build}
+  cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
@@ -52,6 +51,6 @@ package() {
   install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
 }
 
-md5sums=('535ca85b504bd408d1eeddf4962ed685'
+md5sums=('63551fdb16086d57bfa4d39cd40d74cd'
          'fe4a243fabe24608f5c05e40f0f118f6'
          'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/libre/django-countries/PKGBUILD b/libre/django-countries/PKGBUILD
deleted file mode 100644
index 24b667a67..000000000
--- a/libre/django-countries/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=django-countries
-pkgver=1.5
-pkgdesc="Provides a country field for Django models"
-license=('custom:MIT')
-url="http://bitbucket.org/smileychris/django-countries/"
-
-pkgrel=1
-arch=(any)
-depends=('django')
-makedepends=('python2-distribute')
-source=(http://pypi.python.org/packages/source/${pkgname:0:1}/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=(6c65fcc3aa7de065a54cdb619397626d)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py
-  # fix python->python2, and a typo!
-  sed -i 's|python regen[a-z]*\.py|python2 regenerage.py|' */bin/regenerate.py
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./setup.py install --root="$pkgdir/" --optimize=1
-}
diff --git a/libre/python2-cssmin-fredj/PKGBUILD b/libre/python2-cssmin-fredj/PKGBUILD
new file mode 100644
index 000000000..0f155de89
--- /dev/null
+++ b/libre/python2-cssmin-fredj/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=python2-cssmin
+pkgname=python2-cssmin-fredj
+pkgver=0.1.4.git4 # 0.1.4.git<number of commits after 0.1.4>
+_gitver='commit=3422b9962c5a6c2adb9597f418131d73e991c9b6'
+pkgdesc="Provides a country field for Django models"
+license=('custom:MIT')
+url="http://bitbucket.org/smileychris/django-countries/"
+
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+
+pkgrel=1
+arch=(any)
+
+makedepends=('python2-distribute')
+source=("libre://$pkgname-$pkgver.tar.gz")
+md5sums=('09649b374d148014a5644e9df8fcf18e')
+
+mkmakedepends=('git')
+mksource=("$pkgname-$pkgver::git://github.com/fredj/cssmin.git#${_gitver}")
+mkmd5sums=('SKIP')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py src/cssmin.py
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./setup.py install --root="$pkgdir/" --optimize=1
+}
+
diff --git a/libre/python2-django-countries/PKGBUILD b/libre/python2-django-countries/PKGBUILD
new file mode 100644
index 000000000..36bc6a580
--- /dev/null
+++ b/libre/python2-django-countries/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=django-countries
+pkgname=python2-$_pkgname
+pkgver=1.5
+pkgdesc="Provides a country field for Django models"
+url="http://bitbucket.org/smileychris/$_pkgname/"
+license=('custom:MIT')
+
+replaces=($_pkgname)
+conflicts=($_pkgname)
+
+pkgrel=3
+arch=(any)
+depends=('python2-django')
+makedepends=('python2-distribute')
+source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
+md5sums=(6c65fcc3aa7de065a54cdb619397626d)
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py
+  # fix help message: (python2, typo)
+  # "python regenenerate.py" -> "python2 regenerate.py"
+  sed -i 's|python regen[a-z]*\.py|python2 regenerate.py|' */bin/regenerate.py
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  ./setup.py install --root="$pkgdir/" --optimize=1
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index 2158c2892..e8a981a3d 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178747 2013-02-26 16:32:57Z tpowa $
+# $Id: PKGBUILD 182649 2013-04-12 07:08:42Z tpowa $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: orelien <aurelien.foret@wanadoo.fr>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
 _pkgname=rp-pppoe
 pkgname=rp-pppoe-libre
 pkgver=3.11
-pkgrel=2
-pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client (without nonfree ServPoET recommendation)"
+pkgrel=3
+pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation"
 arch=('i686' 'x86_64')
 url="http://www.roaringpenguin.com/pppoe/"
 license=('GPL')
@@ -19,26 +19,23 @@ provides=("rp-pppoe=$pkgver")
 replaces=('rp-pppoe')
 conflicts=('rp-pppoe')
 install=rp-pppoe.install
-source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig}
-        adsl adsl.service kmode.patch $pkgname.patch)
-md5sums=('13b5900c56bd602df6cc526e5e520722'
-         '8fc724aa146dba52ef7b3fbe5b8784c6'
-         'adace1ad441aa88dcb3db52fb7f9c97f'
-         'af234125f956f3a356ab0d0fcaa9e8a2'
-         'd38a903a247d689ff0323d7b6caa1c6b'
-         '3c53d550ac408608abb0b6cd6b76b6c2')
+source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} 
+       adsl.service 
+       kmode.patch
+       $pkgname.patch)
 
-build() {
+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 ./src
-
-  ## Adding support kernel mode
+  cd "$srcdir/$_pkgname-$pkgver/src"
   patch -Np2 -i ../../kmode.patch
+}
 
+build() {
+  cd "$srcdir/$_pkgname-$pkgver/src"
   ./configure --prefix=/usr --enable-plugin
   make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
 }
@@ -47,6 +44,11 @@ package() {
   cd "$srcdir/$_pkgname-$pkgver/src"
   make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install
 
-  install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
-  install -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
+  #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
+  install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
 }
+md5sums=('13b5900c56bd602df6cc526e5e520722'
+         'SKIP'
+         'af234125f956f3a356ab0d0fcaa9e8a2'
+         'd38a903a247d689ff0323d7b6caa1c6b'
+         '3c53d550ac408608abb0b6cd6b76b6c2')
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