3 files changed, 45 insertions, 28 deletions
diff --git a/abs/extra/icon-naming-utils/PKGBUILD b/abs/extra/icon-naming-utils/PKGBUILD
new file mode 100644
index 0000000..7a7aff2
--- /dev/null
+++ b/abs/extra/icon-naming-utils/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=icon-naming-utils
+pkgver=0.8.90
+pkgrel=3
+pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops."
+arch=(any)
+license=('GPL')
+url="http://tango.freedesktop.org/"
+depends=('perl-xml-simple')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz
+        remove-legacy-calc.patch)
+md5sums=('2c5c7a418e5eb3268f65e21993277fba'
+         'd3490e31df95ae11c96f0af2a9ef2ed0')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/remove-legacy-calc.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/icon-naming-utils \
+	      --localstatedir=/var
+  make
+}
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  mv "$pkgdir/usr/share/pkgconfig" "$pkgdir/usr/lib/pkgconfig"
+}
diff --git a/abs/extra/icon-naming-utils/remove-legacy-calc.patch b/abs/extra/icon-naming-utils/remove-legacy-calc.patch
new file mode 100644
index 0000000..140a051
--- /dev/null
+++ b/abs/extra/icon-naming-utils/remove-legacy-calc.patch
@@ -0,0 +1,15 @@
+diff -Nur icon-naming-utils-0.8.90.orig/legacy-icon-mapping.xml icon-naming-utils-0.8.90/legacy-icon-mapping.xml
+--- icon-naming-utils-0.8.90.orig/legacy-icon-mapping.xml	2011-06-06 12:18:27.059555925 +0000
++++ icon-naming-utils-0.8.90/legacy-icon-mapping.xml	2011-06-06 12:18:47.709737921 +0000
+@@ -427,11 +427,6 @@
+ 	</icon>
+     </context>
+     <context dir="apps">
+-	<icon name="accessories-calculator">
+-	    <link>gnome-calculator</link>
+-	    <link>kcalc</link>
+-	    <link>calc</link>
+-	</icon>
+ 	<icon name="accessories-character-map">
+ 	    <link>gnome-character-map</link>
+ 	    <link>gucharmap</link>
diff --git a/abs/not_built/extra/icon-naming-utils/PKGBUILD b/abs/not_built/extra/icon-naming-utils/PKGBUILD
deleted file mode 100644
index 5496c29..0000000
--- a/abs/not_built/extra/icon-naming-utils/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 33029 2009-04-03 21:35:27Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=icon-naming-utils
-pkgver=0.8.90
-pkgrel=2
-pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops."
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://tango.freedesktop.org/"
-depends=('perl-xml-simple')
-source=(http://tango.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('dd8108b56130b9eedc4042df634efa66')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --libexecdir=/usr/lib/icon-naming-utils \
-              --localstatedir=/var || return 1
-  make || return 1
-}
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
-  mv "${pkgdir}/usr/share/pkgconfig" "${pkgdir}/usr/lib/pkgconfig" || return 1
-}
-