Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/angband/PKGBUILD
	community/bashburn/PKGBUILD
	community/qgis/PKGBUILD
	core/libldap/PKGBUILD
	core/tcp_wrappers/PKGBUILD
	extra/openldap/PKGBUILD
	extra/speedtouch/PKGBUILD
	libre/kernel26-libre/PKGBUILD

8 files changed, 0 insertions, 366 deletions

diff --git a/extra/gnome-disk-utility/add-support-for-DeviceAutomountHint.patch b/extra/gnome-disk-utility/add-support-for-DeviceAutomountHint.patch
deleted file mode 100644
index 5a36cc540..000000000
--- a/extra/gnome-disk-utility/add-support-for-DeviceAutomountHint.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 7dde5bc75a1d96be9510ce1e98d28f9d33520919 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Fri, 08 Jul 2011 15:03:52 +0000
-Subject: Add support for DeviceAutomountHint
-
-Based on the patch in https://bugzilla.gnome.org/show_bug.cgi?id=653184
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/src/gdu/gdu-device.c b/src/gdu/gdu-device.c
-index 6a5afad..4be39cf 100644
---- a/src/gdu/gdu-device.c
-+++ b/src/gdu/gdu-device.c
-@@ -82,6 +82,7 @@ typedef struct
-   gboolean device_presentation_nopolicy;
-   char *device_presentation_name;
-   char *device_presentation_icon_name;
-+  char *device_automount_hint;
-   guint64 device_size;
-   guint64 device_block_size;
- 
-@@ -279,6 +280,8 @@ collect_props (const char *key,
-     props->device_presentation_name = g_strdup (g_value_get_string (value));
-   else if (strcmp (key, "DevicePresentationIconName") == 0)
-     props->device_presentation_icon_name = g_strdup (g_value_get_string (value));
-+  else if (strcmp (key, "DeviceAutomountHint") == 0)
-+    props->device_automount_hint = g_strdup (g_value_get_string (value));
-   else if (strcmp (key, "DeviceSize") == 0)
-     props->device_size = g_value_get_uint64 (value);
-   else if (strcmp (key, "DeviceBlockSize") == 0)
-@@ -549,6 +552,7 @@ device_properties_free (DeviceProperties *props)
-   g_strfreev (props->device_mount_paths);
-   g_free (props->device_presentation_name);
-   g_free (props->device_presentation_icon_name);
-+  g_free (props->device_automount_hint);
-   g_free (props->job_id);
-   g_free (props->id_usage);
-   g_free (props->id_type);
-@@ -1294,6 +1298,12 @@ gdu_device_drive_get_media_compatibility (GduDevice *device)
- }
- 
- const char *
-+gdu_device_get_automount_hint (GduDevice *device)
-+{
-+        return device->priv->props->device_automount_hint;
-+}
-+
-+const char *
- gdu_device_drive_get_media (GduDevice *device)
- {
-         return device->priv->props->drive_media;
-diff --git a/src/gdu/gdu-device.h b/src/gdu/gdu-device.h
-index 4c1302b..8cfd7a9 100644
---- a/src/gdu/gdu-device.h
-+++ b/src/gdu/gdu-device.h
-@@ -143,6 +143,7 @@ const char *gdu_device_drive_get_wwn (GduDevice *device);
- const char *gdu_device_drive_get_connection_interface (GduDevice *device);
- guint64 gdu_device_drive_get_connection_speed (GduDevice *device);
- char **gdu_device_drive_get_media_compatibility (GduDevice *device);
-+const gchar *gdu_device_get_automount_hint(GduDevice *device);
- const char *gdu_device_drive_get_media (GduDevice *device);
- gboolean gdu_device_drive_get_is_media_ejectable (GduDevice *device);
- gboolean gdu_device_drive_get_requires_eject (GduDevice *device);
---
-cgit v0.9
diff --git a/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff b/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff
deleted file mode 100644
index eb3c591b9..000000000
--- a/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: lm-sensors/trunk/prog/detect/sensors-detect

-===================================================================

---- lm-sensors/trunk/prog/detect/sensors-detect	(revision 5963)

-+++ lm-sensors/trunk/prog/detect/sensors-detect	(revision 5964)

-@@ -2416,5 +2416,5 @@

- 		# Try some known default udev db locations, just in case

- 		if (-e '/dev/.udev.tdb' || -e '/dev/.udev'

--		 || -e '/dev/.udevdb') {

-+		 || -e '/dev/.udevdb' || -e '/run/udev') {

- 			$use_udev = 1;

- 			$dev_i2c = '/dev/i2c-';

-@@ -6460,4 +6460,20 @@

- 		close(SYSCONFIG);

- 

-+		if (-x "/bin/systemctl" && -d "/lib/systemd/system" &&

-+		    ! -f "/lib/systemd/system/lm_sensors.service") {

-+			print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n".

-+			      "and run 'systemctl enable lm_sensors.service'\n".

-+			      "for initialization at boot time.\n";

-+			return;

-+		}

-+

-+		if (-x "/bin/systemctl" &&

-+		    -f "/lib/systemd/system/lm_sensors.service") {

-+			system("/bin/systemctl", "enable", "lm_sensors.service");

-+			system("/bin/systemctl", "start", "lm_sensors.service");

-+			# All done, don't check for /etc/init.d/lm_sensors

-+			return;

-+		}

-+

- 		print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".

- 		      "for initialization at boot time.\n"

-@@ -6513,7 +6497,9 @@

- 		exit -1;

- 	}

- 

--	if (-x "/sbin/service" && -f "/etc/rc.d/sensors" &&

--	    -f "/var/lock/subsys/lm_sensors") {

-+       if (-x "/bin/systemctl" && -f "/lib/systemd/system/lm_sensors.service") {

-+               system("/bin/systemctl", "stop", "lm_sensors.service");

-+       } elsif (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&

-+                -f "/var/lock/subsys/lm_sensors") {

- 		system("/sbin/service", "lm_sensors", "stop");

- 	}

diff --git a/extra/lm_sensors/sensors-detect.patch b/extra/lm_sensors/sensors-detect.patch
deleted file mode 100644
index 1d12a2ce9..000000000
--- a/extra/lm_sensors/sensors-detect.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naur lm_sensors-3.1.0/prog/detect/sensors-detect lm_sensors-3.1.0-new/prog/detect/sensors-detect
---- lm_sensors-3.1.0/prog/detect/sensors-detect	2009-03-03 20:36:33.000000000 -0500
-+++ lm_sensors-3.1.0-new/prog/detect/sensors-detect	2009-03-03 20:52:06.000000000 -0500
-@@ -5282,21 +5282,21 @@
- 		}
- 	}
- 
--	my $have_sysconfig = -d '/etc/sysconfig';
--	printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
--	       (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
-+	my $have_sysconfig = -d '/etc/conf.d';
-+	printf "Do you want to \%s /etc/conf.d/lm_sensors? (\%s): ",
-+	       (-e '/etc/conf.d/lm_sensors' ? 'overwrite' : 'generate'),
- 	       ($have_sysconfig ? 'YES/no' : 'yes/NO');
- 	$_ = <STDIN>;
- 	if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
- 		unless ($have_sysconfig) {
--			mkdir('/etc/sysconfig', 0777)
--				or die "Sorry, can't create /etc/sysconfig ($!)";
-+			mkdir('/etc/conf.d', 0777)
-+				or die "Sorry, can't create /etc/conf.d ($!)";
- 		}
--		open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
--			or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
-+		open(local *SYSCONFIG, ">/etc/conf.d/lm_sensors")
-+			or die "Sorry, can't create /etc/conf.d/lm_sensors ($!)";
- 		print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
- 		print SYSCONFIG <<'EOT';
--# This file is sourced by /etc/init.d/lm_sensors and defines the modules to
-+# This file is sourced by /etc/rc.d/lm_sensors and defines the modules to
- # be loaded/unloaded.
- #
- # The format of this file is a shell script that simply defines variables:
-@@ -5322,13 +5322,13 @@
- 		}
- 		close(SYSCONFIG);
- 
--		print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
-+		print "Copy prog/init/lm_sensors.init to /etc/rc.d/lm_sensors\n".
- 		      "for initialization at boot time.\n"
--			unless -f "/etc/init.d/lm_sensors";
-+			unless -f "/etc/rc.d/lm_sensors";
- 
--		if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
--			system("/sbin/insserv", "/etc/init.d/lm_sensors");
--		} elsif (-x "/sbin/chkconfig" && -f "/etc/init.d/lm_sensors") {
-+		if (-x "/sbin/insserv" && -f "/etc/rc.d/lm_sensors") {
-+			system("/sbin/insserv", "/etc/rc.d/lm_sensors");
-+		} elsif (-x "/sbin/chkconfig" && -f "/etc/rc.d/lm_sensors") {
- 			system("/sbin/chkconfig", "lm_sensors", "on");
- 			if (-x "/sbin/service") {
- 				system("/sbin/service", "lm_sensors", "start");
-@@ -5377,7 +5377,7 @@
- 		exit -1;
- 	}
- 
--	if (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
-+	if (-x "/sbin/service" && -f "/etc/rc.d/sensors" &&
- 	    -f "/var/lock/subsys/lm_sensors") {
- 		system("/sbin/service", "lm_sensors", "stop");
- 	}
diff --git a/extra/openldap/PKGBUILD b/extra/openldap/PKGBUILD
deleted file mode 100644
index 9d63627af..000000000
--- a/extra/openldap/PKGBUILD
+++ /dev/null
@@ -1,107 +0,0 @@
-# $Id: PKGBUILD 127879 2011-06-19 07:32:04Z andrea $
-# Maintainer:
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=openldap
-pkgver=2.4.24
-pkgrel=2
-pkgdesc="LDAP Server"
-arch=('i686' 'x86_64' 'mips64el')
-license=('custom')
-url="http://www.openldap.org/"
-backup=('etc/openldap/slapd.conf' 'etc/default/slapd' 'etc/conf.d/slapd')
-depends=("libldap>=${pkgver}" 'tcp_wrappers' 'libfetch' 'util-linux-ng')
-provides=('openldap-clients')
-replaces=('openldap-clients')
-source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgname}-${pkgver}.tgz"
-        'slapd'
-        'slapd.default')
-md5sums=('116fe1e23a7b67686d5e62274367e6c0'
-         '832354417c495f29affd2c772808959d'
-         '6be69f6b7e522cb64cce8703da81ed32')
-options=('emptydirs')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-   
-  export LIBS=-ldb
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --libexecdir=/usr/sbin \
-              --sysconfdir=/etc \
-              --localstatedir=/var/lib/openldap \
-              --enable-bdb \
-              --enable-crypt \
-              --enable-dynamic \
-              --with-threads \
-              --enable-wrappers \
-              --enable-spasswd \
-              --with-cyrus-sasl
-  
-  find . -name 'Makefile' -exec \
-  	sed -e 's|$(LDAP_LIBDIR)/liblber/liblber.la|/usr/lib/liblber-2.4.so.2|g' \
-	    -e 's|$(LDAP_LIBDIR)/libldap/libldap.la|/usr/lib/libldap-2.4.so.2|g' \
-	    -e 's|$(LDAP_LIBDIR)/libldap_r/libldap_r.la|/usr/lib/libldap_r-2.4.so.2|g' \
-	    -i {} \;
-
-  cd include
-  make
-
-  cd ../libraries
-  for dir in liblutil librewrite liblunicode; do
-    pushd ${dir}
-    make depend
-    make
-    popd
-  done
-
-  cd ../servers
-  make depend
-  make
-
-  cd ../clients
-  make depend
-  make
-
-  cd ../doc/man
-  for dir in man{1,5,8}; do
-    pushd ${dir}
-    make
-    popd
-  done
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  
-  cd servers
-  make DESTDIR="${pkgdir}" install
-
-  cd ../clients
-  make DESTDIR="${pkgdir}" install
-
-  cd ../doc/man
-  for dir in man{1,5,8}; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
-
-  cd ../..
-
-  install -dm700 "${pkgdir}"/etc/openldap/slapd.d
-  install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd
-  install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd
-  install -dm700 "${pkgdir}"/var/lib/openldap
-  
-  # get rid of duplicate default conf files
-  rm "${pkgdir}"/etc/openldap/*.default
-
-  # hack to fix screwed up dirs
-  sed -e 's|^pidfile[[:space:]].*$|pidfile   /var/run/slapd.pid|g' \
-      -e 's|^argsfile[[:space:]].*$|argsfile  /var/run/slapd.args|g' \
-      -i "${pkgdir}"/etc/openldap/slapd.conf
-      
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/extra/openldap/slapd b/extra/openldap/slapd
deleted file mode 100755
index 392075027..000000000
--- a/extra/openldap/slapd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd
-
-PID=`pidof -o %PPID /usr/sbin/slapd`
-case "$1" in
-  start)
-    stat_busy "Starting OpenLDAP"
-    if [ -z "$PID" ]; then
-      if [ -z "$SLAPD_SERVICES" ]; then
-        /usr/sbin/slapd $SLAPD_OPTIONS
-      else
-        /usr/sbin/slapd -h "$SLAPD_SERVICES" $SLAPD_OPTIONS
-      fi
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-      add_daemon slapd
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OpenLDAP"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/slapd.pid
-      rm -f /var/run/slapd.args
-      rm_daemon slapd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/openldap/slapd.default b/extra/openldap/slapd.default
deleted file mode 100644
index 72ae2a6a7..000000000
--- a/extra/openldap/slapd.default
+++ /dev/null
@@ -1,6 +0,0 @@
-# slapd normally serves ldap only on all TCP-ports 389. slapd can also
-# service requests on TCP-port 636 (ldaps) and requests via unix
-# sockets.
-# Example usage:
-#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///"
-SLAPD_OPTIONS=""
diff --git a/extra/speedtouch/PKGBUILD b/extra/speedtouch/PKGBUILD
deleted file mode 100644
index 1c31c20bf..000000000
--- a/extra/speedtouch/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 77988 2010-04-19 08:04:32Z dgriffiths $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-
-pkgname=speedtouch
-pkgver=1.3.1
-pkgrel=3
-pkgdesc="Driver for the ADSL Speed Touch USB modem"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://speedtouch.sourceforge.net/"
-license=('GPL')
-depends=('bash')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 
-	speedtouch-1.3.1-gcc4.patch)
-md5sums=('0848a120ae0eeab6c8ab378e11dc4fa2' 
-	 '4191035925db745944c75e26937c42a3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 < ../speedtouch-1.3.1-gcc4.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man || return 1
-  make || return 1
-  make prefix=${pkgdir}/usr sysconfdir=${pkgdir}/etc mandir=${pkgdir}/usr/share/man install || return 1
-}
diff --git a/extra/speedtouch/speedtouch-1.3.1-gcc4.patch b/extra/speedtouch/speedtouch-1.3.1-gcc4.patch
deleted file mode 100644
index bdd323c50..000000000
--- a/extra/speedtouch/speedtouch-1.3.1-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- speedtouch-1.3.1/src/modem.h        2004-09-29 21:56:31.000000000 +0100
-+++ speedtouch-1.3.1-gcc4/src/modem.h   2005-07-21 07:15:03.000000000 +0100
-@@ -38,7 +38,4 @@
- #define EP_CODE_IN  0x85
- #define EP_CODE_OUT 0x05
-
--/* Global Variables */
--extern int verbose;
--
- #endif
- 
\ No newline at end of file