Multilib fixes.

(Portage version: 2.0.51.19)

5 files changed, 15 insertions, 53 deletions

diff --git a/net-libs/adns/ChangeLog b/net-libs/adns/ChangeLog
index 43f7554e5ce9..ace2c6e57127 100644
--- a/net-libs/adns/ChangeLog
+++ b/net-libs/adns/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/adns
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/adns/ChangeLog,v 1.15 2004/12/29 03:15:36 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/adns/ChangeLog,v 1.16 2005/04/22 10:58:42 eradicator Exp $
+
+  22 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> adns-1.1.ebuild:
+  Multilib fixes.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-libs/adns/Manifest b/net-libs/adns/Manifest
index 757d3f2b8629..5d7c7604086a 100644
--- a/net-libs/adns/Manifest
+++ b/net-libs/adns/Manifest
@@ -1,8 +1,6 @@
-MD5 56b927c45b687f67eb1fc6400644413e adns-1.1.ebuild 832
-MD5 52de41c66c7eb0f492933dc584bae422 adns-1.0.ebuild 886
-MD5 f5adea3619fc3db897f312916e3653b0 ChangeLog 1883
+MD5 252cb02000ab8527b79278637d65ce74 ChangeLog 1976
+MD5 029ccc13aca2174c7d65cc2bf3e54683 adns-1.1.ebuild 873
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 583cad2ed3b8db07cc660368048e3fdf files/1.1-gcc34.patch 472
 MD5 76b3ed702ddc4890c7035d83a27aa42b files/adns-gcc34.patch 433
 MD5 02d0728348754d60e1859fdb915fe6bf files/digest-adns-1.1 60
-MD5 583cad2ed3b8db07cc660368048e3fdf files/1.1-gcc34.patch 472
-MD5 11e178ba008aecd0b4f867a8b86d084d files/digest-adns-1.0 60
diff --git a/net-libs/adns/adns-1.0.ebuild b/net-libs/adns/adns-1.0.ebuild
deleted file mode 100644
index 8d854b80804f..000000000000
--- a/net-libs/adns/adns-1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/adns/adns-1.0.ebuild,v 1.13 2004/10/02 19:27:06 kloeri Exp $
-
-inherit eutils
-
-DESCRIPTION="Advanced, easy to use, asynchronous-capable DNS client library and utilities"
-SRC_URI="ftp://ftp.chiark.greenend.org.uk/users/ian/adns/${P}.tar.gz"
-HOMEPAGE="http://www.chiark.greenend.org.uk/~ian/adns/"
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc "
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/adns-gcc34.patch
-}
-
-src_compile() {
-	./configure --prefix=/usr --host=${CHOST} || die
-	make || die
-}
-
-src_install () {
-	dodir /usr/{include,bin,lib}
-	make prefix=${D}/usr install || die
-	dodoc README GPL-vs-LGPL COPYING TODO
-	dohtml *.html
-
-	cd ${D}/usr/lib
-	dosym libadns.so.1 /usr/lib/libadns.so
-}
-
diff --git a/net-libs/adns/adns-1.1.ebuild b/net-libs/adns/adns-1.1.ebuild
index 219253ca6bf9..077091012b57 100644
--- a/net-libs/adns/adns-1.1.ebuild
+++ b/net-libs/adns/adns-1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/adns/adns-1.1.ebuild,v 1.9 2004/07/21 02:35:03 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/adns/adns-1.1.ebuild,v 1.10 2005/04/22 10:58:42 eradicator Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="Advanced, easy to use, asynchronous-capable DNS client library and utilities"
 HOMEPAGE="http://www.chiark.greenend.org.uk/~ian/adns/"
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.chiark.greenend.org.uk/users/ian/adns/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc alpha hppa ~mips ia64 amd64 ppc64"
+KEYWORDS="x86 ~ppc sparc alpha hppa ~mips ia64 amd64 ppc64"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -23,11 +23,10 @@ src_unpack() {
 }
 
 src_install () {
-	dodir /usr/{include,bin,lib}
-	make prefix=${D}/usr install || die
+	dodir /usr/{include,bin,$(get_libdir)}
+	make prefix=${D}/usr lib_dir=${D}/usr/$(get_libdir) install || die
 	dodoc README TODO
 	dohtml *.html
 
-	cd ${D}/usr/lib
-	dosym libadns.so.1 /usr/lib/libadns.so
+	dosym libadns.so.1 /usr/$(get_libdir)/libadns.so
 }
diff --git a/net-libs/adns/files/digest-adns-1.0 b/net-libs/adns/files/digest-adns-1.0
deleted file mode 100644
index 1314a6d6bcb0..000000000000
--- a/net-libs/adns/files/digest-adns-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af4411ee10875b96c0d61f903018f438 adns-1.0.tar.gz 208741