From c6d21826b5ce350425ec2cbdc2bff723c472188d Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Sun, 23 Oct 2011 11:19:26 +0000
Subject: [PATCH] Update the ebuild not to ship .la and .a archives, punt the
 overshadowed version.

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64
---
 app-text/rarian/ChangeLog              |  9 +++++--
 app-text/rarian/Manifest               | 25 +++++++++++------
 app-text/rarian/rarian-0.8.1-r1.ebuild | 35 +++++++++++++-----------
 app-text/rarian/rarian-0.8.1.ebuild    | 37 --------------------------
 4 files changed, 43 insertions(+), 63 deletions(-)
 delete mode 100644 app-text/rarian/rarian-0.8.1.ebuild

diff --git a/app-text/rarian/ChangeLog b/app-text/rarian/ChangeLog
index 563df0f15f21..ea32c24b50a4 100644
--- a/app-text/rarian/ChangeLog
+++ b/app-text/rarian/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/rarian
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/ChangeLog,v 1.50 2010/09/11 18:26:29 josejx Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/ChangeLog,v 1.51 2011/10/23 11:19:26 scarabeus Exp $
+
+  23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> -rarian-0.8.1.ebuild,
+  rarian-0.8.1-r1.ebuild:
+  Update the ebuild not to ship .la and .a archives, punt the overshadowed
+  version.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> rarian-0.8.1-r1.ebuild:
   Marked ppc for bug #324077.
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index 3d49edbe01d4..9eeb1d90efc8 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -2,15 +2,24 @@
 Hash: SHA1
 
 AUX rarian-0.8.1-fix-old-doc.patch 629 RMD160 5a93e3dc68131f951eac5294b34ebb47c28995d1 SHA1 4c0cebd42771d7c80f0851c75032c98d22796140 SHA256 2ac6f3d6df8f221fa36fbe4a86ee9a9c6d4d8a829d58d1d85afff1c9b959ad65
-DIST rarian-0.8.1.tar.bz2 324441 RMD160 2e4c0a4d22a4e0c41d4d3dc8e4a5ad080ee3b6ce SHA1 9b3f1bad1cdbb0de51d6f74431b20eb3647edc5a SHA256 aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577
-EBUILD rarian-0.8.1-r1.ebuild 1035 RMD160 fa20b64487b17ddf18b89a9e2348190ba25f9f21 SHA1 5a109f4ab5c77cb9f159337a9bac98b979e6fe9a SHA256 d1eef78d0c700a7f233c9ab0b69caf95abc9750bcd88ceee54ec22d67d31c7d4
-EBUILD rarian-0.8.1.ebuild 910 RMD160 a82d54a21d45f23fd3cd6bcf96cc4dfce4951fa7 SHA1 d2c0dfc52d135de2cef3399867b58eb9d345ff23 SHA256 a9870f85b1347d91645e584eb00616bf020318e755b9c254f44e25c1c9a0359d
-MISC ChangeLog 6363 RMD160 3f4a9a4bd84f6cd894f9c7c42f199849215b0b48 SHA1 f2c8c6c924bcff3a235b3c5fc3a5647ab1058b9f SHA256 22fad0862402071cc2045ddbcd4c4e8b0d7bf365c67e454b9b67ca547b7c70cb
+DIST rarian-0.8.1.tar.gz 459461 RMD160 60cab0eaae2eec3e2106c5dd4dcc708cd3e24713 SHA1 2b01d20ac0aa5cae8067760d9478d278a6954ba4 SHA256 b410d9581dddfabe93e29f9e235a9f9d04d33d8eb12afd0f5ad3bd238c55adef
+EBUILD rarian-0.8.1-r1.ebuild 1088 RMD160 46820be6f6ac4af85f84e7e4948fc40ddb9d2e90 SHA1 37d83d8520d2d8e37687a5e0f9550d43053051be SHA256 0c48796f34a300619e512f84845bdc5e5c78ede2b12390f69f98b5bfb2161be2
+MISC ChangeLog 6556 RMD160 fc81818b912fc8ba452a3e3035dbb652e8ca44a3 SHA1 b8c61e333d74e1f4b3f5e835910a9c33e01a0ace SHA256 b73e20a8c4f177d415024a905eda76a1312e65c073dbec1aa6b0b5139368db86
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkyLyOkACgkQcsIHjyDViGRtIwCg135iIiE81myhZ9jMU6SrfAOL
-oboAniNXlxLpj0+XN57vbNyFANfmmvtE
-=xrd/
+iQIcBAEBAgAGBQJOo/fvAAoJEOSiRoyO7jvoeAkQAKhAEQtsPRRCTM30EtjkrFPN
+jmfFuteKiwuNvPumC7OVYZ0q11cDeYlf6Akub/pBhbHtllke7nE3z+TJQ8X7GZF9
+X/A7Xr3ISAUmc0W1IkGkOFD/Ope5/by4bKnsrgMoHWT4RAeXhWp5zVDA1PEWmBLf
+vkhkiCRWncJzOEwaL0WigYlmVaPQYkQ9S6aEDK4Xit0bwCEaimQq5tsvgl/VwxD7
+CnTtm+epSYed18F574JGwEN2Jv5Pnk1RXW60T2ReKnUntsp7szUB3azfkGqft6+C
+cs3Mm2SOrR6peHnWtUhOztOolG05m2aDvZFdlPUmWaN2Ql6WnoHE4WcADtlxr1TT
+/aFXyz5sYEqcVhpTQMhLoalo7ZTlPo/9sglInyeowRtXyY63c0u65ZApBlidboPg
+T864TN/vL9KHBXmhyi6fhP0lFSl6r0KFqnnScp0zUs/TYB6mTxdHD3UU5t9SPWDp
+iIhfuwVK3kviBoEVqgd83tIqvzHNYTyRD3QRe107mPzMQSG/bJFHikK03zlihy49
+ZUZL+RNLM4vuiACL1ry+buekeDLWl/J8ckx5WB1Cdy6Aqqnv6Aflc5f8YfdFuo+Z
+xw7YtF/1Qx2urdMtYQ2mhrSz1v34wWAKP6a96MYETmp3xLHnQo+U9uS8BuU/x06d
+dDQ+sFJCbvUXtX3K9qAP
+=LYYy
 -----END PGP SIGNATURE-----
diff --git a/app-text/rarian/rarian-0.8.1-r1.ebuild b/app-text/rarian/rarian-0.8.1-r1.ebuild
index 4eccb8e36eea..5a5f9d5f66f0 100644
--- a/app-text/rarian/rarian-0.8.1-r1.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r1.ebuild
@@ -1,31 +1,27 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/rarian-0.8.1-r1.ebuild,v 1.9 2010/09/11 18:26:29 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/rarian-0.8.1-r1.ebuild,v 1.10 2011/10/23 11:19:26 scarabeus Exp $
 
-inherit eutils gnome2
+EAPI=4
+
+inherit eutils
 
 DESCRIPTION="A documentation metadata library"
-HOMEPAGE="http://www.freedesktop.org"
+HOMEPAGE="http://rarian.freedesktop.org/"
+SRC_URI="http://${PN}.freedesktop.org/Releases/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
+IUSE="static-libs"
 
 RDEPEND="dev-libs/libxslt"
 DEPEND="${RDEPEND}
 	!<app-text/scrollkeeper-9999"
 
-DOCS="ChangeLog NEWS README"
-
-GCONF=""
-
-src_unpack() {
-	# You cannot run src_unpack from gnome2; it will break the install by
-	# calling gnome2_omf_fix
-	unpack ${A}
-	cd "${S}"
+DOCS=( ChangeLog NEWS README )
 
+src_prepare() {
 	# Fix uri of omf files produced by rarian-sk-preinstall, see bug #302900
 	epatch "${FILESDIR}/${P}-fix-old-doc.patch"
 
@@ -35,6 +31,13 @@ src_unpack() {
 	elibtoolize ${ELTCONF}
 }
 
-src_compile() {
-	gnome2_src_compile --localstatedir=/var
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }
diff --git a/app-text/rarian/rarian-0.8.1.ebuild b/app-text/rarian/rarian-0.8.1.ebuild
deleted file mode 100644
index fa0d60fc84bb..000000000000
--- a/app-text/rarian/rarian-0.8.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/rarian-0.8.1.ebuild,v 1.12 2010/07/20 15:07:11 jer Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="A documentation metadata library"
-HOMEPAGE="http://www.freedesktop.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-libs/libxslt"
-DEPEND="${RDEPEND}
-	!<app-text/scrollkeeper-9999"
-
-DOCS="ChangeLog NEWS README"
-
-GCONF=""
-
-src_unpack() {
-	# You cannot run src_unpack from gnome2; it will break the install by
-	# calling gnome2_omf_fix
-	unpack ${A}
-	cd "${S}"
-
-	# remove unneeded line, bug #240564
-	sed "s/ (foreign dist-bzip2 dist-gzip)//" -i configure || die "sed failed"
-
-	elibtoolize ${ELTCONF}
-}
-
-src_compile() {
-	gnome2_src_compile --localstatedir=/var
-}
-- 
2.26.2