Merge branch 'master' of git+ssh://parabola-git/abslibre

6 files changed, 89 insertions, 11 deletions

diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD
new file mode 100644
index 000000000..4f7c7deed
--- /dev/null
+++ b/libre/bogofilter-libre/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 146459 2012-01-11 15:21:47Z stephane $
+# Maintainer: tobias <tobias@archlinux.org>
+# Contributor: Low Kian Seong <fastmail_low@speedymail.org>
+
+_pkgname=bogofilter
+pkgname=bogofilter-libre
+pkgver=1.2.2
+pkgrel=4
+pkgdesc="A fast Bayesian spam filtering tool"
+arch=('i686' 'x86_64')
+license=('GPL3')
+url="http://bogofilter.sourceforge.net"
+depends=('db' 'perl' 'gsl')
+backup=('etc/bogofilter/bogofilter.cf')
+source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz)
+md5sums=('af9c7857c66b1884c820f54f23082701')
+
+mksource() {
+    [ -f ${_pkgname}-${pkgver}.tar.bz2 ] || wget http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2
+    tar xf ${_pkgname}-${pkgver}.tar.bz2
+    # Remove noncommercial files.
+    rm ${_pkgname}-${pkgver}/doc/bogofilter-SA-{2005-0{1,2},2010-01}
+    tar cJf ${pkgname}-${pkgver}.tar.xz ${_pkgname}-${pkgver}
+}
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc/bogofilter  \
+              --localstatedir=/var \
+              --enable-transactions
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf"
+
+  install -dm755 "${pkgdir}/usr/share/${_pkgname}/contrib"
+  install -m644 contrib/* "${pkgdir}/usr/share/${_pkgname}/contrib/"
+}
diff --git a/libre/kdenetwork-libre/PKGBUILD b/libre/kdenetwork-libre/PKGBUILD
index 14c6448e5..d8fa960e5 100644
--- a/libre/kdenetwork-libre/PKGBUILD
+++ b/libre/kdenetwork-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144733 2011-12-08 09:21:25Z andrea $
+# $Id: PKGBUILD 147895 2012-01-28 10:36:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,18 +10,18 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-kppp'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp'
+makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
+	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
     'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
     'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
 source=("http://repo.parabolagnulinux.org/other/${pkgbase}-libre-${pkgver}.tar.xz")
-sha1sums=('2537c5286a1464008e05974a3fd55ae00740c843')
+sha1sums=('2472128aef671e3474505cf65397dfc7ef9f79bb')
 
 # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
 mksource() {
@@ -67,9 +67,8 @@ package_kdenetwork-kdnssd() {
 package_kdenetwork-kget() {
 	pkgdesc='Download Manager'
 	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
-	optdepends=('python2: YouTube plugin')
 	url="http://kde.org/applications/internet/kget/"
-	install='kdenetwork.install'
+	install='kdenetwork-kget.install'
 	cd $srcdir/build/kget
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kget
@@ -79,12 +78,12 @@ package_kdenetwork-kget() {
 package_kdenetwork-kopete-libre() {
 	pkgdesc='Instant Messenger'
 	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
-	         'libidn' 'qimageblitz' 'v4l-utils' 'libgadu' 'mediastreamer')
+	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
         conflicts=('kdenetwork-kopete')
         provides=("kdenetwork-kopete=${pkgver}")
         replaces=('kdenetwork-kopete')
 	url="http://kde.org/applications/internet/kopete/"
-	install='kdenetwork.install'
+	install='kdenetwork-kopete.install'
 	cd $srcdir/build/kopete
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kopete
@@ -95,7 +94,7 @@ package_kdenetwork-kppp() {
 	pkgdesc='Internet Dial-Up Tool'
 	depends=('kdebase-runtime' 'ppp')
 	url="http://kde.org/applications/internet/kppp/"
-	install='kdenetwork.install'
+	install='kdenetwork-kppp.install'
 	cd $srcdir/build/kppp
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kppp
diff --git a/libre/kdenetwork-libre/kdenetwork-kget.install b/libre/kdenetwork-libre/kdenetwork-kget.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/libre/kdenetwork-libre/kdenetwork-kget.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/libre/kdenetwork-libre/kdenetwork-kopete.install b/libre/kdenetwork-libre/kdenetwork-kopete.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/libre/kdenetwork-libre/kdenetwork-kopete.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/libre/kdenetwork-libre/kdenetwork-kppp.install b/libre/kdenetwork-libre/kdenetwork-kppp.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/libre/kdenetwork-libre/kdenetwork-kppp.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index fe0e79220..57ff8cae3 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -9,7 +9,7 @@ license=('GPL3')
 groups=('base')
 install=${pkgname}.install
 source=(https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt)
-md5sums=('3f67515fda1c9b4e4d1a988d3c03bb9a')
+md5sums=('707ba4c6ba76fb3fed35c70103f269cb')
 
 build() {
     cd ${srcdir}