Index: binutils-avr/trunk/PKGBUILD
===================================================================
--- binutils-avr/trunk/PKGBUILD	(revision 12467)
+++ binutils-avr/trunk/PKGBUILD	(working copy)
@@ -3,25 +3,20 @@
 # Contributor: danst0 <danst0@west.de>
 
 pkgname=binutils-avr
-pkgver=2.19.1
+pkgver=2.20.1
 pkgrel=1
-_date=20090419
 pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/binutils/"
 license=('GPL')
 depends=('glibc>=2.10.1' 'zlib')
 options=('!libtool' '!distcc' '!ccache')
-install=binutils-avr.install
-source=(ftp://ftp.archlinux.org/other/${pkgname/-avr}/${pkgname/-avr}-${pkgver}_${_date}.tar.bz2
-        binutils-2.19-as-needed.patch)
-md5sums=('18db08329c4a1a22ec57ea4c0d7440a6' 'f6fd22284040a0b05e74ed2ff504a6d9')
+source=(http://ftp.gnu.org/gnu/${pkgname/-avr}/${pkgname/-avr}-${pkgver}.tar.bz2)
+md5sums=('9cdfb9d6ec0578c166d3beae5e15c4e5')
 
 build() {
-  cd ${srcdir}
+  cd ${srcdir}/${pkgname/-avr}-${pkgver}
 
-  patch -Np1 -i ${srcdir}/binutils-2.19-as-needed.patch || return 1
-
   mkdir build
   cd build
 
@@ -54,17 +49,23 @@
   make configure-host || return 1
 
   make tooldir=/usr || return 1
+}
+
+package() {
+  cd ${srcdir}/${pkgname/-avr}-${pkgver}
+
+  cd build
   make DESTDIR=${pkgdir} tooldir=/usr install || return 1
 
   rm -f ${pkgdir}/usr/lib/libiberty.a
-  rm -f ${pkgdir}/usr/man/man1/{dlltool,nlmconv,windres}*
-  rm -f ${pkgdir}/usr/share/info/dir || return 1
-  rm -rf ${pkgdir}/usr/share/lib || return 1
-  rm -rf ${pkgdir}/usr/share/locale || return 1
 
   for bin in addr2line ar as c++filt gprof ld nm objcopy objdump ranlib readelf size strings strip ; do
     rm -f ${pkgdir}/usr/bin/${bin} || return 1
   done
+
+  for info in as bfd binutils configure gprof ld standards; do
+    mv ${pkgdir}/usr/share/info/${info}.info ${pkgdir}/usr/share/info/avr-${info}.info || return 1
+  done
 }
 
 # vim:set ts=2 sw=2 et:
Index: binutils-avr/trunk/binutils-2.19-as-needed.patch
===================================================================
--- binutils-avr/trunk/binutils-2.19-as-needed.patch	(revision 12467)
+++ binutils-avr/trunk/binutils-2.19-as-needed.patch	(working copy)
@@ -1,38 +0,0 @@
-===================================================================
-RCS file: /cvs/src/src/bfd/elflink.c,v
-retrieving revision 1.328
-retrieving revision 1.329
-diff -u -r1.328 -r1.329
---- src/bfd/elflink.c	2009/01/29 16:35:03	1.328
-+++ src/bfd/elflink.c	2009/01/31 11:44:37	1.329
-@@ -3199,6 +3199,16 @@
-   return 0;
- }
- 
-+static bfd_boolean
-+on_needed_list (const char *soname, struct bfd_link_needed_list *needed)
-+{
-+  for (; needed != NULL; needed = needed->next)
-+    if (strcmp (soname, needed->name) == 0)
-+      return TRUE;
-+
-+  return FALSE;
-+}
-+
- /* Sort symbol by value and section.  */
- static int
- elf_sort_symbol (const void *arg1, const void *arg2)
-@@ -4434,8 +4444,11 @@
- 
- 	  if (!add_needed
- 	      && definition
--	      && dynsym
--	      && h->ref_regular)
-+	      && ((dynsym
-+		   && h->ref_regular)
-+		  || (h->ref_dynamic
-+		      && (elf_dyn_lib_class (abfd) & DYN_AS_NEEDED) != 0
-+		      && !on_needed_list (elf_dt_name (abfd), htab->needed))))
- 	    {
- 	      int ret;
- 	      const char *soname = elf_dt_name (abfd);
Index: binutils-avr/trunk/binutils-avr.install
===================================================================
--- binutils-avr/trunk/binutils-avr.install	(revision 12467)
+++ binutils-avr/trunk/binutils-avr.install	(working copy)
@@ -1,6 +0,0 @@
-post_upgrade() {
-  sed -ie '/\/opt\/avr\/lib/d' /etc/ld.so.conf
-}
-
-
-# vim:set ts=2 sw=2 et: