Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git

7 files changed, 75 insertions, 7 deletions

diff --git a/abs/core-testing/tweaker/PKGBUILD b/abs/core-testing/tweaker/PKGBUILD
index e77d9a6..b0115b7 100644
--- a/abs/core-testing/tweaker/PKGBUILD
+++ b/abs/core-testing/tweaker/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=tweaker
 pkgver=1
-pkgrel=18
+pkgrel=20
 pkgdesc=""
 arch=('i686' 'x86_64')
 
diff --git a/abs/core-testing/tweaker/bin/twk_audio.pl b/abs/core-testing/tweaker/bin/twk_audio.pl
index 37b2201..eec7992 100755
--- a/abs/core-testing/tweaker/bin/twk_audio.pl
+++ b/abs/core-testing/tweaker/bin/twk_audio.pl
@@ -301,10 +301,10 @@ sub implement_option {
 
     generate_asound_conf($option);
     edit_mplayer_conf($option);
-    edit_xine_conf($option);
-    reload_modules($option);
-    set_mixer_values($option);
+    #edit_xine_conf($option);
+    #reload_modules($option);
     edit_mythtv_configuration($option);
+    set_mixer_values($option);
 }
 
 # Try to get a Recommendation Level for $option.
diff --git a/abs/core-testing/tweaker/bin/twk_general.pl b/abs/core-testing/tweaker/bin/twk_general.pl
index d62536f..0255852 100755
--- a/abs/core-testing/tweaker/bin/twk_general.pl
+++ b/abs/core-testing/tweaker/bin/twk_general.pl
@@ -450,7 +450,7 @@ sub implement_option {
 	    #
 	    # customexample table
 	    #
-	    change_or_make_entry("customexample", [["fromclause", ""], ["whereclause", "program.category_type = \'movie\' AND program.airdate >= YEAR(DATE_SUB(NOW(), INTERVAL 1 YEAR)) AND program.stars > 0.5 "], ["search", "1"]], [["rulename", "New Flix"]]);
+	    change_or_make_entry("customexample", [["fromclause", ""], ["whereclause", "program.category_type = \"movie\" AND program.airdate >= YEAR(DATE_SUB(NOW(), INTERVAL 1 YEAR)) AND program.stars > 0.5 "], ["search", "1"]], [["rulename", "New Flix"]]);
 
 #	    # As much of MythWeather as we can automate for now
 	    my $units = 0;
@@ -529,8 +529,8 @@ sub implement_option {
 	    #
 	    # Websites for mythbrowser
 	    #
-	    change_or_make_entry("websites", [["grp", "LinHeS"], ["dsc", ""], ["updated", ""]], [["url", "http://knoppmyth.net"]]);
-	    change_or_make_entry("websites", [["grp", "LinHeS"], ["dsc", ""], ["updated", ""]], [["url", "http://knoppmythwiki.org"]]);
+	    #change_or_make_entry("websites", [["grp", "LinHeS"], ["dsc", ""], ["updated", ""]], [["url", "http://knoppmyth.net"]]);
+	    #change_or_make_entry("websites", [["grp", "LinHeS"], ["dsc", ""], ["updated", ""]], [["url", "http://knoppmythwiki.org"]]);
 	    
 	    disconnect_from_db();
 
diff --git a/abs/extra-testing/xscreensaver/ChangeLog b/abs/extra-testing/xscreensaver/ChangeLog
new file mode 100644
index 0000000..f972cf0
--- /dev/null
+++ b/abs/extra-testing/xscreensaver/ChangeLog
@@ -0,0 +1,20 @@
+2009-01-02  Eric Belanger  <eric@archlinux.org>
+
+	* xscreensaver 5.08-1
+	* Upstream update
+
+2008-08-11  Eric Belanger  <eric@archlinux.org>
+
+	* xscreensaver 5.07-1
+	* Upstream update
+
+2008-07-18  Eric Belanger  <eric@archlinux.org>
+
+	* xscreensaver 5.06-1
+	* Upstream update
+
+2008-03-02  Eric Belanger  <eric@archlinux.org>
+
+	* xscreensaver 5.05-1
+	* Upstream update
+	* FHS man pages
diff --git a/abs/extra-testing/xscreensaver/LICENSE b/abs/extra-testing/xscreensaver/LICENSE
new file mode 100644
index 0000000..4f587b5
--- /dev/null
+++ b/abs/extra-testing/xscreensaver/LICENSE
@@ -0,0 +1,9 @@
+/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski <jwz@jwz.org>
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation.  No representations are made about the suitability of this
+ * software for any purpose.  It is provided "as is" without express or 
+ * implied warranty.
+ */
diff --git a/abs/extra-testing/xscreensaver/PKGBUILD b/abs/extra-testing/xscreensaver/PKGBUILD
new file mode 100644
index 0000000..975d1cf
--- /dev/null
+++ b/abs/extra-testing/xscreensaver/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 23065 2009-01-02 07:24:36Z eric $
+# Maintainer: Eric Belanger <eric@archlinux.org>
+# Contributor: Sean Middleditch <elanthis@awesomeplay.com>
+
+pkgname=xscreensaver
+pkgver=5.08
+pkgrel=1
+pkgdesc="Screen saver and locker for the X Window System"
+arch=('i686' 'x86_64')
+url="http://www.jwz.org/xscreensaver/"
+license=('BSD')
+depends=('libxxf86misc' 'libglade' 'mesa' 'pam' 'xorg-res-utils')
+makedepends=('bc')
+backup=('etc/pam.d/xscreensaver')
+source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \
+	xscreensaver.pam LICENSE)
+md5sums=('79dea708c915341f205e00318a699be9' '367a3538f54db71f108b34cfa31088ac'\
+         '5e7f3f2a63d20a484742f5b4cb5d572c')
+sha1sums=('4e6889d7171eaf18b856c484a87d5701787e5dc6'
+          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+          '4209ea586b204fd1d81c382a0522c654f9fd9134')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+       --libexecdir=/usr/lib \
+       --with-x-app-defaults=/usr/share/X11/app-defaults \
+       --with-pam --without-motif \
+       --with-gtk --without-gnome --with-xml --with-gl \
+       --without-gle --with-xpm --with-pixbuf --with-jpeg \
+       --with-fortune="/bin/cat /etc/arch-release" || return 1
+  make || return 1
+  make install_prefix=${pkgdir} install || return 1
+  install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+  install -D -m644 ${srcdir}/xscreensaver.pam ${pkgdir}/etc/pam.d/xscreensaver || return 1
+  chmod 755 ${pkgdir}/usr/bin/xscreensaver || return 1
+  echo "NotShowIn=KDE;GNOME;" >> ${pkgdir}/usr/share/applications/xscreensaver-properties.desktop || return 1
+}
diff --git a/abs/extra-testing/xscreensaver/xscreensaver.pam b/abs/extra-testing/xscreensaver/xscreensaver.pam
new file mode 100644
index 0000000..b4d80c2
--- /dev/null
+++ b/abs/extra-testing/xscreensaver/xscreensaver.pam
@@ -0,0 +1 @@
+auth		required	pam_unix_auth.so