Remove unneeded pic flag (#81238). Cleanup.

Package-Manager: portage-2.0.51-r15

3 files changed, 26 insertions, 27 deletions

diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog
index 1c888d83ad48..7b9a9274ea4e 100644
--- a/net-dns/libidn/ChangeLog
+++ b/net-dns/libidn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/libidn
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.17 2005/01/29 17:00:10 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.18 2005/02/17 14:28:31 greg_g Exp $
+
+  17 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> libidn-0.5.13.ebuild:
+  Remove unneeded pic flag (#81238). Cleanup.
 
 *libidn-0.5.13 (29 Jan 2005)
 
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 99a881f6549d..c61f2a69aced 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,16 +1,16 @@
-MD5 458f0fceaad4ca817df0fb91d26894a4 libidn-0.5.4.ebuild 542
-MD5 5dbe6572032f2a6324f22b6c1bf69849 libidn-0.3.7.ebuild 636
-MD5 c1cf81ba24208fff0cc881461a7a99f2 libidn-0.5.11.ebuild 621
-MD5 239994761f24de616f862fd474378cb4 libidn-0.5.0.ebuild 634
+MD5 e9f97c86a019a719030caa8d9884a6b4 libidn-0.5.13.ebuild 1287
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 d342a79577ed37419020d2333d80879e libidn-0.5.11-r1.ebuild 1400
-MD5 853a87be38943ac5b928290728d8a326 libidn-0.5.13.ebuild 1388
+MD5 239994761f24de616f862fd474378cb4 libidn-0.5.0.ebuild 634
+MD5 c1cf81ba24208fff0cc881461a7a99f2 libidn-0.5.11.ebuild 621
+MD5 c678e93156256ae102192d5cefdc720c ChangeLog 2292
 MD5 46e9e202f4ddf7d92ab0bfc52bbbc2d5 libidn-0.5.7.ebuild 620
-MD5 0f2cef25ac5b9ee3234edb13dd7f36ed ChangeLog 2172
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 458f0fceaad4ca817df0fb91d26894a4 libidn-0.5.4.ebuild 542
+MD5 5dbe6572032f2a6324f22b6c1bf69849 libidn-0.3.7.ebuild 636
 MD5 71c9d73948b2aae62f1f91b02a24904c files/digest-libidn-0.3.7 65
 MD5 fc807c568d7d15366e98afb3b5d04911 files/digest-libidn-0.5.0 65
+MD5 823859b97ca0b5b2b7a9768723f050b6 files/digest-libidn-0.5.11 66
 MD5 34af7cf0c0c059728bc3b2870298d456 files/digest-libidn-0.5.4 65
+MD5 823859b97ca0b5b2b7a9768723f050b6 files/digest-libidn-0.5.11-r1 66
 MD5 9735250b9caf3517e94e86f3f18ef8cd files/digest-libidn-0.5.7 65
-MD5 823859b97ca0b5b2b7a9768723f050b6 files/digest-libidn-0.5.11 66
 MD5 04ac8297c56ed0aa42ee97df501dda7e files/digest-libidn-0.5.13 66
-MD5 823859b97ca0b5b2b7a9768723f050b6 files/digest-libidn-0.5.11-r1 66
diff --git a/net-dns/libidn/libidn-0.5.13.ebuild b/net-dns/libidn/libidn-0.5.13.ebuild
index e1c83579759e..6f2d5fc63497 100644
--- a/net-dns/libidn/libidn-0.5.13.ebuild
+++ b/net-dns/libidn/libidn-0.5.13.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/net-dns/libidn/libidn-0.5.13.ebuild,v 1.1 2005/01/29 17:00:10 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-0.5.13.ebuild,v 1.2 2005/02/17 14:28:31 greg_g Exp $
 
 inherit java-pkg
 
@@ -11,10 +11,9 @@ SRC_URI="ftp://alpha.gnu.org/pub/gnu/libidn/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="java doc pic nls"
+IUSE="java doc nls"
 
-DEPEND="java? ( virtual/jdk )
-	doc? ( dev-util/gtk-doc )"
+DEPEND="java? ( virtual/jdk )"
 RDEPEND="java? ( virtual/jre )"
 
 check_java_config() {
@@ -31,29 +30,26 @@ src_compile() {
 		check_java_config
 	fi
 
-	if use amd64; then
-		myconf="--with-pic"
-	else
-		myconf="`use_with pic`"
-	fi
-	econf \
-		`use_enable nls` \
-		`use_enable java` \
-		${myconf} || die "Configure failed"
+	econf $(use_enable nls) \
+	      $(use_enable java) || die
 
-	emake || die "Make failed"
+	emake || die
 }
 
 src_install() {
 	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO
+
+	if use doc; then
+		dohtml -r doc/reference/html/*
+	fi
 
 	if use java; then
 		java-pkg_dojar ${D}/usr/share/java/${P}.jar || die
 		rm -rf ${D}/usr/share/java
+
 		if use doc; then
-			dohtml -r ${S}/doc/java
+			dohtml -r doc/java
 		fi
 	fi
-
-	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO
 }