7 files changed, 25 insertions, 112 deletions
diff --git a/abs/core-testing/atk/PKGBUILD b/abs/core-testing/atk/PKGBUILD
index 90ba910..bca7854 100644
--- a/abs/core-testing/atk/PKGBUILD
+++ b/abs/core-testing/atk/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 12890 2008-09-23 17:10:00Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=atk
-pkgver=1.22.0
+pkgver=1.24.0
 pkgrel=1
 pkgdesc="A library providing a set of interfaces for accessibility"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('glib2>=2.16.0')
+depends=('glib2>=2.18.1')
 makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.22/${pkgname}-${pkgver}.tar.bz2)
+options=('!libtool' '!docs')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.24/${pkgname}-${pkgver}.tar.bz2)
 url='http://www.gtk.org/'
-md5sums=('06a2b39a22d5ca35c47435da6b9643ac')
+md5sums=('fb0ee9c7f18b15b490a0168b13740a4d')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
diff --git a/abs/core-testing/gtk2/PKGBUILD b/abs/core-testing/gtk2/PKGBUILD
index 7cab655..d119d56 100644
--- a/abs/core-testing/gtk2/PKGBUILD
+++ b/abs/core-testing/gtk2/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 7635 2008-08-03 15:54:30Z jgc $
+# $Id: PKGBUILD 19648 2008-11-28 20:15:22Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gtk2
-pkgver=2.12.11
-pkgrel=3
+pkgver=2.14.5
+pkgrel=1
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 install=gtk2.install
-depends=('atk>=1.22.0' 'pango>=1.20.5' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.8-2' 'libxcomposite' 'libxdamage' 'heimdal>=1.2' 'gnutls>=2.4.1')
+depends=('atk>=1.24.0' 'pango>=1.22.3' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.9' 'libxcomposite' 'libxdamage' 'heimdal>=1.2' 'gnutls>=2.4.1')
 makedepends=('pkgconfig')
-replaces=('gtkprint-cups')
-conflicts=('gtkprint-cups')
-options=('!libtool')
+replaces=('gtkprint-cups' 'gail')
+conflicts=('gtkprint-cups' 'gail')
+provides=('gail=1.22.3')
+options=('!libtool' '!docs')
 backup=(etc/gtk-2.0/gtkrc)
 license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.12/gtk+-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.14/gtk+-${pkgver}.tar.bz2
 	gtkclipboard-check.patch)
-md5sums=('f7aab88e856a813386f797aade5867ad'
+md5sums=('1b1b5d7ab5a25e84682cb27ee4808a40'
          '4025d3c15d6c6f73a032f403ffd4ff1c')
 
 build() {
@@ -26,7 +27,8 @@ build() {
   patch -Np1 -i ${startdir}/src/gtkclipboard-check.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --with-xinput=xfree \
+              --localstatedir=/var --with-xinput=yes \
+	      --without-libjasper \
 	      --with-included-loaders=png || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
diff --git a/abs/core-testing/gtk2/gtk2.install b/abs/core-testing/gtk2/gtk2.install
index 3b4a881..6d415ad 100644
--- a/abs/core-testing/gtk2/gtk2.install
+++ b/abs/core-testing/gtk2/gtk2.install
@@ -1,27 +1,13 @@
-# arg 1:  the new package version
 post_install() {
-	# we need to ldconfig first, in case xfree86's libs aren't
-	# in ld.so.cache yet
-	sbin/ldconfig -r .
-	mkdir -p etc/gtk-2.0 &>/dev/null
-	usr/bin/gtk-query-immodules-2.0 >etc/gtk-2.0/gtk.immodules
-	usr/bin/gdk-pixbuf-query-loaders >etc/gtk-2.0/gdk-pixbuf.loaders
+  usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+  usr/bin/gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-	post_install $1
+  post_install
 }
 
-# arg 1:  the old package version
 pre_remove() {
-	rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
-	rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
-	rmdir etc/gtk-2.0 &>/dev/null
+  rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
+  rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
 }
-
-op=$1
-shift
-
-$op $*
diff --git a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
index adc1ce7..558d1ad 100644
--- a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=0.21
-pkgrel=15
+pkgrel=16
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
diff --git a/abs/core-testing/mythtv/stable/mythtv/menu-xml/knoppmyth.xml b/abs/core-testing/mythtv/stable/mythtv/menu-xml/knoppmyth.xml
deleted file mode 100644
index 8aa6134..0000000
--- a/abs/core-testing/mythtv/stable/mythtv/menu-xml/knoppmyth.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<mythmenu name="KnoppMyth">
-
-   <button>
-     <type>BACKUP</type>
-     <text>Backup KnoppMyth</text>
-     <action>MENU mythbackup.xml</action>
-   </button>
-
-   <button>
-     <type>RESTORE</type>
-     <text>Restore KnoppMyth</text>
-     <action>MENU mythrestore.xml</action>
-   </button>
-   
-   <button>
-     <type>Motion</type>
-     <text>Motion</text>
-     <action>MENU motion.xml</action>
-   </button>
-<!--
-   <button>
-     <type>POWER</type>
-     <text>Power Off </text>
-     <action>EXEC /usr/bin/sudo halt</action>
-   </button>
-   
-   <button>
-     <type>POWER</type>
-     <text>Reboot</text>
-     <action>EXEC /usr/bin/sudo reboot</action>
-   </button>
-
-   <button>
-     <type>VERSION</type>
-     <text>Version</text>
-     <action>EXEC /usr/local/bin/ver.sh</action>
-   </button>
--->
-
-   <button>
-       <type>MV_SETUP_MENU</type>
-       <text>MythVantage Settings</text>
-       <action>MENU HOST_SETTINGS.xml</action>
-
-   </button>
-<!--
-   <button>
-       <type>MV_TEMPLATE</type>
-       <text>Settings profile manager</text>
-        <action>EXEC  mythinstall -t </action>
-
-   </button>
--->
-</mythmenu>
-
diff --git a/abs/core-testing/mythtv/stable/mythtv/menu-xml/mainmenu.xml.patch b/abs/core-testing/mythtv/stable/mythtv/menu-xml/mainmenu.xml.patch
index 4df9682..269845d 100644
--- a/abs/core-testing/mythtv/stable/mythtv/menu-xml/mainmenu.xml.patch
+++ b/abs/core-testing/mythtv/stable/mythtv/menu-xml/mainmenu.xml.patch
@@ -7,7 +7,7 @@
 +   <button>
 +     <type>MENU_UTILITIES_SETUP</type>
 +     <text>Service Menu</text>
-+     <action>MENU knoppmyth.xml</action>
++     <action>MENU linhes.xml</action>
 +   </button>
 +
     <!-- <button>
diff --git a/abs/core-testing/mythtv/stable/mythtv/menu-xml/motion.xml b/abs/core-testing/mythtv/stable/mythtv/menu-xml/motion.xml
deleted file mode 100644
index 23ebfe2..0000000
--- a/abs/core-testing/mythtv/stable/mythtv/menu-xml/motion.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<mythmenu name="Motion">
-
-   <button>
-     <type>MOTION</type>
-     <text>Start Motion</text>
-     <action>EXEC sudo /etc/init.d/motion start</action>
-   </button>
-
-   <button>
-     <type>MOTION</type>
-     <text>Stop Motion</text>
-     <action>EXEC sudo /etc/init.d/motion stop</action>
-   </button>
-   
-   <button>
-     <type>MOTION</type>
-     <text>Clear Motion</text>
-     <action>EXEC /usr/local/bin/cm.sh</action>
-   </button>
-</mythmenu>