Cleanup and new version

(Portage version: 2.0.51.22-r1)

7 files changed, 24 insertions, 20 deletions

diff --git a/dev-util/xmingw-binutils/ChangeLog b/dev-util/xmingw-binutils/ChangeLog
index 498ece11aa14..3d462f1681ef 100644
--- a/dev-util/xmingw-binutils/ChangeLog
+++ b/dev-util/xmingw-binutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/xmingw-binutils
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-binutils/ChangeLog,v 1.6 2005/02/07 19:24:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-binutils/ChangeLog,v 1.7 2005/05/27 17:32:05 cretin Exp $
+
+*xmingw-binutils-2.15.94.20050118.1 (27 May 2005)
+
+  27 May 2005; Stefan Jones <cretin@gentoo.org>
+  New version
 
   07 Feb 2005; Simon Stelling <blubb@gentoo.org>
   xmingw-binutils-2.15.90.0.2.ebuild:
diff --git a/dev-util/xmingw-binutils/Manifest b/dev-util/xmingw-binutils/Manifest
index 717a5a041f61..0c2edc43da5a 100644
--- a/dev-util/xmingw-binutils/Manifest
+++ b/dev-util/xmingw-binutils/Manifest
@@ -1,5 +1,5 @@
+MD5 9008447e25f51c427c42f347670b6c8e xmingw-binutils-2.15.90.0.2.ebuild 944
+MD5 569161cf9e262416729181afe85a4ef6 xmingw-binutils-2.15.94.20050118.1.ebuild 770
 MD5 b5205ffd47ad317a660bc8eeacd4617f ChangeLog 736
-MD5 7719edc39da68c5077c0a7fa66aee46f xmingw-binutils-2.14.90.0.6.ebuild 938
-MD5 8e7632597e6c5ec56e5eb96507f7742d xmingw-binutils-2.15.90.0.2.ebuild 946
-MD5 f480ae045925666c288f7d7e5e1f2d7a files/digest-xmingw-binutils-2.14.90.0.6 157
 MD5 64fe03ab4e08a6313bc2b3f5c7423e83 files/digest-xmingw-binutils-2.15.90.0.2 157
+MD5 4ec7e1dce377315f3376b62ea328d8a7 files/digest-xmingw-binutils-2.15.94.20050118.1 85
diff --git a/dev-util/xmingw-binutils/files/digest-xmingw-binutils-2.14.90.0.6 b/dev-util/xmingw-binutils/files/digest-xmingw-binutils-2.14.90.0.6
deleted file mode 100644
index be4f5564ec2f..000000000000
--- a/dev-util/xmingw-binutils/files/digest-xmingw-binutils-2.14.90.0.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 71b99dba3045a359dc314dbebedcf502 binutils-2.14.90.0.6.tar.bz2 10399066
-MD5 1e7a7868b78e755bdc678bc12e62e461 binutils-2.14.90-20030807-1-src.diff.gz 3033
diff --git a/dev-util/xmingw-binutils/files/digest-xmingw-binutils-2.15.94.20050118.1 b/dev-util/xmingw-binutils/files/digest-xmingw-binutils-2.15.94.20050118.1
new file mode 100644
index 000000000000..b6caea8ac08b
--- /dev/null
+++ b/dev-util/xmingw-binutils/files/digest-xmingw-binutils-2.15.94.20050118.1
@@ -0,0 +1 @@
+MD5 89adb382ac9a99953636d2986c85dd2a binutils-2.15.94-20050118-1-src.tar.gz 15269504
diff --git a/dev-util/xmingw-binutils/metadata.xml b/dev-util/xmingw-binutils/metadata.xml
new file mode 100644
index 000000000000..45d7d45c4bed
--- /dev/null
+++ b/dev-util/xmingw-binutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>cretin@gentoo.org</email>
+<name>Stefan Jones</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/xmingw-binutils/xmingw-binutils-2.15.90.0.2.ebuild b/dev-util/xmingw-binutils/xmingw-binutils-2.15.90.0.2.ebuild
index 9d35dc7e92a5..3c4a619c7505 100644
--- a/dev-util/xmingw-binutils/xmingw-binutils-2.15.90.0.2.ebuild
+++ b/dev-util/xmingw-binutils/xmingw-binutils-2.15.90.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-binutils/xmingw-binutils-2.15.90.0.2.ebuild,v 1.4 2005/02/07 19:24:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-binutils/xmingw-binutils-2.15.90.0.2.ebuild,v 1.5 2005/05/27 17:32:05 cretin Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://kernel/linux/devel/binutils/${MY_P}.tar.bz2
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/xmingw-binutils/xmingw-binutils-2.14.90.0.6.ebuild b/dev-util/xmingw-binutils/xmingw-binutils-2.15.94.20050118.1.ebuild
index 59af300b1c40..253dda036422 100644
--- a/dev-util/xmingw-binutils/xmingw-binutils-2.14.90.0.6.ebuild
+++ b/dev-util/xmingw-binutils/xmingw-binutils-2.15.94.20050118.1.ebuild
@@ -1,31 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-binutils/xmingw-binutils-2.14.90.0.6.ebuild,v 1.5 2005/02/07 19:24:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-binutils/xmingw-binutils-2.15.94.20050118.1.ebuild,v 1.1 2005/05/27 17:32:05 cretin Exp $
 
 inherit eutils
 
-MY_P=${P/xmingw-/}
+MY_P=binutils-2.15.94-20050118-1
 S=${WORKDIR}/${MY_P}
-MINGW_PATCH=binutils-2.14.90-20030807-1-src.diff.gz
 
 DESCRIPTION="Tools necessary to build Win32 programs"
 HOMEPAGE="http://sources.redhat.com/binutils/"
-SRC_URI="mirror://kernel/linux/devel/binutils/${MY_P}.tar.bz2
-		mirror://sourceforge/mingw/${MINGW_PATCH}"
+SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz"
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND=""
 
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-	epatch "${DISTDIR}/${MINGW_PATCH}"
-}
-
 src_compile() {
 	./configure \
 		--target=i386-mingw32msvc \