Fix proper -fPIC usage on amd64. Fixed dependencies.

(Portage version: 2.0.51.19)

2 files changed, 18 insertions, 28 deletions

diff --git a/net-im/silc-toolkit/ChangeLog b/net-im/silc-toolkit/ChangeLog
index f6ad4118990f..40f529b48f18 100644
--- a/net-im/silc-toolkit/ChangeLog
+++ b/net-im/silc-toolkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/silc-toolkit
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.39 2005/04/07 12:06:26 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.40 2005/04/10 18:35:10 eradicator Exp $
+
+  10 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  silc-toolkit-0.9.13.ebuild:
+  Fix proper -fPIC usage on amd64.  Fixed dependencies.  
 
 *silc-toolkit-0.9.13 (07 Apr 2005)
 
diff --git a/net-im/silc-toolkit/silc-toolkit-0.9.13.ebuild b/net-im/silc-toolkit/silc-toolkit-0.9.13.ebuild
index beee8cb0be4c..c22dd58b0400 100644
--- a/net-im/silc-toolkit/silc-toolkit-0.9.13.ebuild
+++ b/net-im/silc-toolkit/silc-toolkit-0.9.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-im/silc-toolkit/silc-toolkit-0.9.13.ebuild,v 1.1 2005/04/07 12:06:26 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-0.9.13.ebuild,v 1.2 2005/04/10 18:35:10 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,37 +13,23 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
 IUSE="debug ipv6"
 
-DEPEND="!<=net-im/silc-client-1.0.1
+RDEPEND="!<=net-im/silc-client-1.0.1"
+
+DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-
-	# also modify Makefile.am, since the build process seems to recreate
-	# Makefile.in and start over (see bug 63089)
-	sed -i \
-		-e "s:\$(srcdir)/tutorial \$(prefix):\$(srcdir)/tutorial \$(docdir):" \
-		Makefile.am
-
-	sed -i \
-		-e "s:\$(srcdir)/tutorial \$(prefix):\$(srcdir)/tutorial \$(docdir):" \
-		Makefile.in
 
-	sed -i \
-		-e "s:-g -O2:${CFLAGS}:g" \
-		configure
+	# They have incorrect DESTDIR usage
+	sed -i '/\$(srcdir)\/tutorial/s/\$(prefix)/\$(docdir)/' ${S}/Makefile.am
+	sed -i '/\$(srcdir)\/tutorial/s/\$(prefix)/\$(docdir)/' ${S}/Makefile.in
 
-	# Fix for amd64
-	use amd64 && epatch ${FILESDIR}/${P}-64bit_goodness.patch
-
-	libtoolize --copy --force
+	# Stop them from unsetting our CFLAGS
+	sed -i '/^CFLAGS=$/d' ${S}/configure || die
 }
 
 src_compile() {
-	# Fix for amd64
-	use amd64 && append-flags -fPIC
-
 	econf \
 		--datadir=/usr/share/${PN} \
 		--mandir=/usr/share/man \
@@ -57,15 +43,15 @@ src_compile() {
 		--enable-static \
 		--without-irssi \
 		--without-silcd \
-		`use_enable debug` \
-		`use_enable ipv6` \
-		|| die "econf failed"
+		$(use_enable debug) \
+		$(use_enable ipv6)
+
 	emake || die "emake failed"
 	emake -C lib || die "emake -C lib failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "make install failed"
+	make install DESTDIR="${D}" || die "make install failed"
 
 	rm -rf \
 		${D}/etc/${PN}/silcd.conf \