Use prune_libtool_files to remove unnecessary libtool archive (.la) of libosp.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 33 insertions, 42 deletions

diff --git a/app-text/opensp/ChangeLog b/app-text/opensp/ChangeLog
index 80dac469efd9..9135aeec58be 100644
--- a/app-text/opensp/ChangeLog
+++ b/app-text/opensp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/opensp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/opensp/ChangeLog,v 1.67 2012/11/16 09:34:52 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/opensp/ChangeLog,v 1.68 2013/03/21 04:19:52 ssuominen Exp $
+
+  21 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> opensp-1.5.2-r3.ebuild:
+  Use prune_libtool_files to remove unnecessary libtool archive (.la) of
+  libosp.
 
   16 Nov 2012; Ulrich Müller <ulm@gentoo.org> opensp-1.5.2-r2.ebuild,
   opensp-1.5.2-r3.ebuild:
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index 8d5c8ed4e606..4fcdbafd7e6e 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -5,23 +5,17 @@ AUX opensp-1.5-gcc34.patch 263 SHA256 679aa70752d48a6bd0d2ff32c8e4c7153f2ce6e50a
 AUX opensp-1.5.2-fix-segfault.patch 747 SHA256 d60915133b0d00ccd5453864af4e389e50825071f70bb2c7f88e53d9fd81246b SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf WHIRLPOOL e4028a8980d17dcc303166147cfcf24d21aaed79db70ebed45c259e94928f77042046da60e5e18f34c638d2635958e3e0ee04fd89317a495f1460ad728203c17
 DIST OpenSP-1.5.2.tar.gz 1521390 SHA256 57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e WHIRLPOOL 9565425b87d0f68025a2058e8941c5c64519cdb1ab3f22aeec6968473989f39b805dbfa8ca8c74f3968358fac2144756cf50aeab8e6c9ce8112610bd445d5ce2
 EBUILD opensp-1.5.2-r2.ebuild 2190 SHA256 c2cef9c84954e03e09e9c5b411dfc73fd2a321e8148439c2b044344c321a01e1 SHA512 1a939cab9252fd96387578a8465eb0924321e078722bc151727a470bcb7f4f43872b32eaeef8f66427f513b2867fc192adc1300c49799daa4ee4b1be5a5c2c79 WHIRLPOOL 327cdf1135d53571047dc8f112664cbefce794e8d76c55bf1c7c9b62012f4760bdd32e739b179a72d5b61ca65ac1b5fb00959a1c233b626918e3eaf83b1160e8
-EBUILD opensp-1.5.2-r3.ebuild 2371 SHA256 e2d67973752f024e115ac5be61e4105e749e7bd584219fbcb73e826d179ace3c SHA512 670e8cf06da69f8fc36741cad827795be7621bb00120c2735d7b42c66ec8a4525a4e66527c94f23556587647d4d342ac2ecc6c3b409f4feb0e17bff73ea160f3 WHIRLPOOL 8aa9865cca6b6bee53fc1fe9ed414f4e52e7eff0c7065379a3bd3d2817fea725212d654d089222eb2597649bb8eea02c5e44a6fce5343ff407e24a4fe8924b49
-MISC ChangeLog 8188 SHA256 18b64b8c6345287c1d9d6a36e5bfe0f303c514a8683ed156aa150a2864ec3584 SHA512 8add958a999d4a30ca9ab922be407af42742cd1de1146ffd100ca9f8e0cbbf507c802d58187539f171ea321e2145d7e2efe5ed7fdf2d5125c978642a6d14703a WHIRLPOOL 1777c83d95f349f9b96d270d3a45e668757ac45d36dab56ae4e607ce45350678756555ff610d14d396988ec44570f426d2fd4cc45783fb3a8b2bf2d3ddc02ee0
+EBUILD opensp-1.5.2-r3.ebuild 1996 SHA256 230b0cfa914533a9ee05c2fb3f01da93925e482702cb5bbb571cd0c967786eb6 SHA512 8bf80b0a3447683945272cf1172412c0a89707f46a054836d7b34308948794e422f996443df156fa08b52887d91d91b602e329915a2314f8292fbd002bb2285e WHIRLPOOL 5aad41da07da552e76e7026115d164e559b35fa527eb16b8157332c043c98fa6059b4aea061bddbc4128c546b5f129ec9d3ec9fa87fb11d1839266b5c4e1c39d
+MISC ChangeLog 8356 SHA256 d8caab95a375e14b7dab60461724755afd52df538a3f9ff0b0f083895ad68df5 SHA512 bf8d908b3319f15de2a16ab8cdcbf48e8dc23bf2b070c80a384fd20ea5d15998cb966f3c18f29c3a35b7310971c2b7835c7315a7585f90708ab150290c355bca WHIRLPOOL 58cba1a8a1e60c38212d57761aa78a970636f87d44867435bb8cae6b5f4ccf4bbac472565794405c02f747d9b8d85aa3a624b24d83c3a9a0fc7c6284e479aa8b
 MISC metadata.xml 159 SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3 SHA512 119d9e98ba4d956ad7811e557e8013b976337b14029b994bfa4eb08ba24cfe6ae7757a814a02c0526246b3c77ce1eb55b81681731863a10b72436dbe47e693d2 WHIRLPOOL a6d40a902f676b47e088ee88d7149fa3c2d6e8ac1117a265e083196abdb95483f506974afbdcfdcb3e6a14a85d4726ba2876d7cfb90efa8586a3d1581f30274b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQpgjzAAoJEDxpGckxwJCBX04P/jibcJKMyGQzmY7vva3gx6/P
-ArcZq5/hM1HAlXMCroErgMlqoWyKVgsLJzj8ARzggvWLv1kItebvlbDd51Lp0jHi
-Xbifx3YC2jqD885F1Jb1npPuLM9c7qAYcvLd9egDzpYOnLbn+jLE+NHP67Voi8+O
-PNBdU6OvkljnEBhEiOW0CDAWYHdZuL/TgP9lIhxvdxHOa7BTKO16bP8r2e/8Pgvy
-Ks4F6pM3T9/atyglJZASL5QFeoLMKBNujmjL6IQcv3uolAF2ClAWHROjcc6O0ONl
-YtS7OZZXY/t9DSQD926LVsqTNBODcB6Hho7zcWZMjGI7v4acUJgZkGEjltbdC2ZZ
-pxMTSmarU5v8sk85MYtQp+w9gd8KJyyNYYTDciuc3l7bUIiWkzzZcpB8E0PYwhZ0
-QEpLBa7H5DKsfibw5X9CBuhEkzq2kPUVggxIvO2fUhIR0OKEVYoa3lK7DTxLmS0y
-k/YDsENgNxQFiu1n0WINBgBr62WDciD56IXHUmZYvqWZp2yWNViatj1/VMEvmEgP
-yB7ajQ68aY2IfmQxRMzwgGL1Hn2V9R5Tt1nd2zvPuZ3kNZPfHuxngiqEB+bkBB7Q
-8N9UpXZ/JD2DBdDy1Rx3Ix7IRLympU40Q7rXmMQvV5DgfNj/FEJhzzzrR/d8hG7q
-B8JrMiOfnFCiZZXuuGb1
-=06zu
+iQEcBAEBCAAGBQJRSopAAAoJEEdUh39IaPFNT3sIAICMA8rnBpZN+vDjxyw7LXhx
+wZrRFp2WtDLcIFyA5SFa7SkUitv9bGiRkSbdAKw8cKU02U2JOQHiMufjBeaQAnmQ
+R/Vet6NekSi1RMCyPQL5aL27Nrv4bhGgDo24IPpFzVsKJ8w2Fgb6wuM761kmsEqY
+6bE1YHXlfdgtuWApxIhXEH9eTc7npyi8wichuvztIt0KelGCLjqhW13u56zRfh4F
+A9UwPEpcl7ISwjheIl9x2WXhscpZCoNbhSdAu/+v1Qg+sZfoeLHB/zEthTv3rMqF
+xzqvBZykXXKqTxTztfsWKUnmc6yJRzVu2g3liTdxXHDU6HYQaRc1VKREtWT5++A=
+=OqQB
 -----END PGP SIGNATURE-----
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
index c7eaf53a448c..05c6994bdcf1 100644
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/opensp/opensp-1.5.2-r3.ebuild,v 1.14 2012/11/16 09:34:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/opensp/opensp-1.5.2-r3.ebuild,v 1.15 2013/03/21 04:19:52 ssuominen Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils flag-o-matic
 
 MY_P=${P/opensp/OpenSP}
+
 DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
 HOMEPAGE="http://openjade.sourceforge.net/"
 SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
@@ -15,7 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs test"
 
-DEPEND="nls? ( >=sys-devel/gettext-0.14.5 )
+DEPEND="nls? ( sys-devel/gettext )
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
@@ -29,15 +30,13 @@ RDEPEND=""
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5-gcc34.patch
-	epatch "${FILESDIR}"/${P}-fix-segfault.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.5-gcc34.patch \
+		"${FILESDIR}"/${P}-fix-segfault.patch
 }
 
 src_configure() {
-	#
 	# The following filters are taken from openjade's ebuild. See bug #100828.
-	#
-
 	# Please note!  Opts are disabled.  If you know what you're doing
 	# feel free to remove this line.  It may cause problems with
 	# docbook-sgml-utils among other things.
@@ -45,11 +44,10 @@ src_configure() {
 	strip-flags
 
 	econf \
-		--disable-dependency-tracking \
 		--enable-http \
-		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog   \
+		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
 		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
-		--datadir="${EPREFIX}"/usr/share/sgml/${P}               \
+		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
 		$(use_enable nls) \
 		$(use_enable doc doc-build) \
 		$(use_enable static-libs static)
@@ -60,23 +58,18 @@ src_compile() {
 }
 
 src_test() {
-	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	einfo "Skipping tests known not to work"
-	make SHOWSTOPPERS= check || die "Make test failed"
+	# Skipping tests known not to work
+	emake SHOWSTOPPERS= check
 	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
-		pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} install
+	emake \
+		DESTDIR="${D}" \
+		pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
 
-	dodoc AUTHORS BUGS ChangeLog NEWS README
-}
+	prune_libtool_files
 
-pkg_postinst() {
-	ewarn "Please note that the soname of the library changed."
-	ewarn "If you are upgrading from a previous version you need"
-	ewarn "to fix dynamic linking inconsistencies by executing:"
-	ewarn
-	ewarn "    revdep-rebuild --library='libosp.so.*'"
+	dodoc AUTHORS BUGS ChangeLog NEWS README
 }