Fix pkgconfig files install dir, thanks to Octavio Ruiz (Ta^3) <tacvbo at tacvbo dot net>

Package-Manager: portage-2.1.3_rc9

5 files changed, 78 insertions, 92 deletions

diff --git a/net-im/silc-client/ChangeLog b/net-im/silc-client/ChangeLog
index b6c66500ca67..478cef7e3be5 100644
--- a/net-im/silc-client/ChangeLog
+++ b/net-im/silc-client/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/silc-client
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.38 2007/07/08 21:31:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.39 2007/07/23 11:46:49 armin76 Exp $
+
+*silc-client-1.1.2-r1 (23 Jul 2007)
+
+  23 Jul 2007; Raúl Porcel <armin76@gentoo.org> -silc-client-1.1.2.ebuild,
+  +silc-client-1.1.2-r1.ebuild:
+  Fix pkgconfig files install dir, thanks to Octavio Ruiz (Ta^3) <tacvbo at
+  tacvbo dot net>
 
 *silc-client-1.1.2 (08 Jul 2007)
 
diff --git a/net-im/silc-client/Manifest b/net-im/silc-client/Manifest
index b76d0c18ffec..720375df6b91 100644
--- a/net-im/silc-client/Manifest
+++ b/net-im/silc-client/Manifest
@@ -22,14 +22,14 @@ EBUILD silc-client-1.0.4.1.ebuild 1899 RMD160 271ea68b0b6afedf7f171e96a931a1bd01
 MD5 a425e17c45e0abb88cbbf395c8990b74 silc-client-1.0.4.1.ebuild 1899
 RMD160 271ea68b0b6afedf7f171e96a931a1bd01428396 silc-client-1.0.4.1.ebuild 1899
 SHA256 0d540f33963755b8af6aacdb14cd57299a7626f84a06ea3fa108affe55190c21 silc-client-1.0.4.1.ebuild 1899
-EBUILD silc-client-1.1.2.ebuild 2030 RMD160 666002ecd182177bbbe0cfc5a0a3d5547d241eb0 SHA1 216ed1340799fc18f029bf337f841ac6c7eb912a SHA256 6e390f94d3bb6c250b5c1cbd90f3f39b32eba7a1400ed23ba0ace4cee7f03115
-MD5 e1bc1c38bd75442e69a5906332ab7df4 silc-client-1.1.2.ebuild 2030
-RMD160 666002ecd182177bbbe0cfc5a0a3d5547d241eb0 silc-client-1.1.2.ebuild 2030
-SHA256 6e390f94d3bb6c250b5c1cbd90f3f39b32eba7a1400ed23ba0ace4cee7f03115 silc-client-1.1.2.ebuild 2030
-MISC ChangeLog 5570 RMD160 5536f310bcef5e8ab30fff6a12b39607003e9464 SHA1 7f468502a043a8e08c0ce04a64d03d4cad80d1d5 SHA256 0928d88645446f59c694958a0dac9598bec3fab3f5b932c1662666dc93974487
-MD5 dcced236d999c52128751457a3a7e43c ChangeLog 5570
-RMD160 5536f310bcef5e8ab30fff6a12b39607003e9464 ChangeLog 5570
-SHA256 0928d88645446f59c694958a0dac9598bec3fab3f5b932c1662666dc93974487 ChangeLog 5570
+EBUILD silc-client-1.1.2-r1.ebuild 1504 RMD160 24773abf0dfd09003e06df2a31eb732b5b72ca81 SHA1 fc7e842e2e06111ca23846b5208f37e92755cbe6 SHA256 3ee9f57da50bdee2a12f928d5dda58fddf219db70870c25036a39d9b907ff744
+MD5 9ee200b1ded1a798a7042f4afe57952e silc-client-1.1.2-r1.ebuild 1504
+RMD160 24773abf0dfd09003e06df2a31eb732b5b72ca81 silc-client-1.1.2-r1.ebuild 1504
+SHA256 3ee9f57da50bdee2a12f928d5dda58fddf219db70870c25036a39d9b907ff744 silc-client-1.1.2-r1.ebuild 1504
+MISC ChangeLog 5810 RMD160 b5c1a03e06e55870d1a038a40c363f0b59a7e34d SHA1 c85c74767eedb17fead8313e99267ca1fb6ab167 SHA256 895c1ecc9d98c23f7c658ad5991e08d4114e18f13aa6e2793372e6da9596bb41
+MD5 d206c6183b9dd261ebd9fa32f827bb09 ChangeLog 5810
+RMD160 b5c1a03e06e55870d1a038a40c363f0b59a7e34d ChangeLog 5810
+SHA256 895c1ecc9d98c23f7c658ad5991e08d4114e18f13aa6e2793372e6da9596bb41 ChangeLog 5810
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -43,6 +43,6 @@ SHA256 1dfa8fa7462ecbc18cbf9502f7bad26445070d9c5721999ea258514d883cc7b1 files/di
 MD5 39a39a8405c38de9a8d6ade4740f25a2 files/digest-silc-client-1.0.4.1 265
 RMD160 ab98d2b93114c265a5f8bfce25c2f58f4cb9e377 files/digest-silc-client-1.0.4.1 265
 SHA256 65af57336bad7a61d6e4ca488507fb41fd2b9e1de758ca707a43db3d2917d8a3 files/digest-silc-client-1.0.4.1 265
-MD5 6ff5409c4e16d3ed9e15a2718461263c files/digest-silc-client-1.1.2 259
-RMD160 e62f957dd74816c9c3d9f0209cf16c6c7f96cbd5 files/digest-silc-client-1.1.2 259
-SHA256 0de24f6e72bbe9a23b1ebc79fe09274c9c6262cbf57d3e34cf9779b84ee8f966 files/digest-silc-client-1.1.2 259
+MD5 6ff5409c4e16d3ed9e15a2718461263c files/digest-silc-client-1.1.2-r1 259
+RMD160 e62f957dd74816c9c3d9f0209cf16c6c7f96cbd5 files/digest-silc-client-1.1.2-r1 259
+SHA256 0de24f6e72bbe9a23b1ebc79fe09274c9c6262cbf57d3e34cf9779b84ee8f966 files/digest-silc-client-1.1.2-r1 259
diff --git a/net-im/silc-client/files/digest-silc-client-1.1.2 b/net-im/silc-client/files/digest-silc-client-1.1.2-r1
index 2dc6fff038d5..2dc6fff038d5 100644
--- a/net-im/silc-client/files/digest-silc-client-1.1.2
+++ b/net-im/silc-client/files/digest-silc-client-1.1.2-r1
diff --git a/net-im/silc-client/silc-client-1.1.2-r1.ebuild b/net-im/silc-client/silc-client-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..ff9357ff75ad
--- /dev/null
+++ b/net-im/silc-client/silc-client-1.1.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.1.2-r1.ebuild,v 1.1 2007/07/23 11:46:49 armin76 Exp $
+
+inherit eutils
+
+DESCRIPTION="SDK for the SILC protocol"
+HOMEPAGE="http://silcnet.org/"
+SRC_URI="http://silcnet.org/download/toolkit/sources/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug ipv6"
+
+RDEPEND=""
+DEPEND="dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+
+	# They have incorrect DESTDIR usage
+	sed -i '/\$(srcdir)\/tutorial/s/\$(prefix)/\$(docdir)/' "${S}"/Makefile.{am,in}
+	sed -i \
+		"s/^\(pkgconfigdir =\) \$(libdir)\/pkgconfig/\1	\/usr\/$(get_libdir)\/pkgconfig/"\
+		"${S}"/lib/Makefile.{am,in}
+}
+
+src_compile() {
+	local myconf=""
+	use ipv6 && myconf="${myconf} --enable-ipv6"
+
+	econf \
+		--datadir=/usr/share/${PN} \
+		--datarootdir=/usr/share/${PN} \
+		--mandir=/usr/share/man \
+		--includedir=/usr/include/${PN} \
+		--sysconfdir=/etc/silc \
+		--with-helpdir=/usr/share/${PN}/help \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-optimizations \
+		$(use_enable debug) \
+		${myconf}
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	rm -rf \
+		"${D}"/etc/${PN}/silcd.conf \
+		"${D}"/usr/share/man \
+		"${D}"/usr/share/doc/${PF}/examples \
+		"${D}"/usr/share/silc-toolkit \
+		"${D}"/var/log/silc-toolkit \
+		"${D}"/etc/silc
+}
diff --git a/net-im/silc-client/silc-client-1.1.2.ebuild b/net-im/silc-client/silc-client-1.1.2.ebuild
deleted file mode 100644
index a0137f0477ce..000000000000
--- a/net-im/silc-client/silc-client-1.1.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.1.2.ebuild,v 1.1 2007/07/08 21:31:10 armin76 Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
-SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
-HOMEPAGE="http://silcnet.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ipv6 perl debug"
-
-DEPEND="perl? (	dev-lang/perl )
-	sys-libs/ncurses
-	!<=net-im/silc-toolkit-0.9.12-r1"
-
-RDEPEND="${DEPEND}
-	perl? (
-		!net-irc/irssi
-		!net-irc/irssi-svn
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i -e "s:-g -O2:${CFLAGS}:g" configure
-	epatch "${FILESDIR}/${PN}-1.1-docdir.patch"
-}
-
-src_compile() {
-	local myconf=""
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
-	econf \
-		--datadir=/usr/share/${PN} \
-		--datarootdir=/usr/share/${PN} \
-		--mandir=/usr/share/man \
-		--includedir=/usr/include/${PN} \
-		--sysconfdir=/etc/silc \
-		--with-helpdir=/usr/share/${PN}/help \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-optimizations \
-		$(use_enable debug) \
-		${myconf}
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	local myflags=""
-
-	if use perl
-	then
-		R1="s/installsitearch='//"
-		R2="s/';//"
-		perl_sitearch="`perl -V:installsitearch | sed -e ${R1} -e ${R2}`"
-		myflags="${myflags} INSTALLPRIVLIB=/usr/$(get_libdir)"
-		myflags="${myflags} INSTALLARCHLIB=${perl_sitearch}"
-		myflags="${myflags} INSTALLSITELIB=${perl_sitearch}"
-		myflags="${myflags} INSTALLSITEARCH=${perl_sitearch}"
-	fi
-
-	make DESTDIR="${D}" ${myflags} install || die "make install failed"
-
-	rm -rf ${D}/etc ${D}/usr/libsilc* ${D}/usr/include
-
-	dodoc CHANGES CREDITS README TODO
-	cd "${S}/apps/irssi"
-	dodoc silc.conf docs/formats.txt docs/manual.txt docs/signals.txt docs/special_vars.txt
-	dohtml docs/startup-HOWTO.html
-
-	insinto /usr/share/silc-client/help
-	rm docs/help/Make*
-	doins docs/help/*
-}