Remove .la file, unslot, drop old

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 31 insertions, 51 deletions

diff --git a/media-libs/libharu/ChangeLog b/media-libs/libharu/ChangeLog
index 14f9a840d629..39ddfe4fed6b 100644
--- a/media-libs/libharu/ChangeLog
+++ b/media-libs/libharu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libharu
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libharu/ChangeLog,v 1.4 2011/07/10 15:49:38 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libharu/ChangeLog,v 1.5 2012/04/11 09:47:09 xarthisius Exp $
+
+*libharu-2.2.1-r1 (11 Apr 2012)
+
+  11 Apr 2012; Kacper Kowalik <xarthisius@gentoo.org> +libharu-2.2.1-r1.ebuild,
+  -libharu-2.1.0.ebuild, -libharu-2.2.1.ebuild:
+  Remove .la file, unslot, drop old
 
   10 Jul 2011; Justin Lecher <jlec@gentoo.org> libharu-2.1.0.ebuild,
   libharu-2.2.1.ebuild, +files/libharu-2.2.1-libpng-1.5.patch, metadata.xml:
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index 4a9d2f925ebe..5336fb997b32 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -1,17 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libharu-2.2.1-libpng-1.5.patch 13383 RMD160 1de7814f24369b598acbb09cee66b3571326713a SHA1 463641d4570d59d632c1878597253db962129599 SHA256 da610b9ca069c23f7afe8b91e8e81ea50a490dadf67fea95aa0fc6b551613159
-DIST libharu-2.1.0.tar.bz2 1614433 RMD160 923684a2f127ef0a738d840bc50112f8eb829249 SHA1 1656f5ffeeb566240be2b24ade3849d22e2a0594 SHA256 399020bc016cbb38fbac8140354de763957c654123422e11bb2a731908dfab1e
 DIST libharu-2.2.1.tar.bz2 792180 RMD160 2f5b66b5e63d15039940fa9a38630b06e74a1360 SHA1 bfea7d9df3fb6a112340d0d54731f62f53b26d2f SHA256 9240f2f0860d7827d15d6dd5e1ff068b3c7891f276cb392e010e7db2641e8910
-EBUILD libharu-2.1.0.ebuild 831 RMD160 1ab0b7a853d427c670f8472228f5ba1f070d830e SHA1 36e28345bf874b2c1dc565c6cb3109e315f056c8 SHA256 9f644fdca762b9a8b88f69ecdd0dbc9ed7a1cc550f9fec253bbd75c3a36404be
-EBUILD libharu-2.2.1.ebuild 801 RMD160 eaec33db3fd4cf78cb8c13a486b8b9c81578a88f SHA1 7b0e2005512e70407a555aacc3a932783f31e84e SHA256 a88694df5ad35b6ef6db6c734446d6d0b43cb94da6a5f14f6830d03951161cd3
-MISC ChangeLog 852 RMD160 572f72c78b96c681927e22fc01eddcde102c543d SHA1 c9e0b29f8dd6f36cbf4178d2b174676f431fcf12 SHA256 083cbdc06cda562cda401d3fac39a29a6cb35a26dd368c8c64f566ac3f3f8bab
+EBUILD libharu-2.2.1-r1.ebuild 881 RMD160 892f2735cebdf0459145300eb7b20ee38be4d699 SHA1 5e37e01a2e1ddd35274f07e2a5168fe24574367e SHA256 55a5234d6f61a0519f906489b4343af60449e416794f9830737a4de46867521c
+MISC ChangeLog 1056 RMD160 0ab121acd0216936df7c6144a7ea4c0715102083 SHA1 4ca2ac80c5c07bb6d459216412e01e1a395a4f57 SHA256 0f2ae3938e9b58373689d4ac53889b88725dedfc489e0310840d1eaefc2e686d
 MISC metadata.xml 712 RMD160 c8c1e7078ecaf71b37ed930c92f5ad3976873e60 SHA1 f6e0417f9a14783588b904d30f0b294d7dd343c6 SHA256 48ce876903fc0b63a1dc4e9989910a716bfb5e3e9768a528308b72de801e1adf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk4ZyiEACgkQgAnW8HDreRaKXQCgwUtdH5T+GlbV25fTVcoTjPQV
-oecAoMn7XUYK71SkT+0rroyB3GHD036M
-=XfRH
+iQIcBAEBCAAGBQJPhVMvAAoJEF0huFKJUZL574wP/ikaioa0Mah22p3ddFPJeTIC
+FtVDJ267b9p7nBZkLDokSx+A0+EJUV4H34IV7ITlGEa0sc0qS+ny2Es1FlAyV+uE
+m8XzHb8ghE9XoV9F0rRvNffyCjnWas4H9et8PlxdzjhFO8XvWfs7W8YiHEOOQ4hT
+RmYkaO7Qwz33fucyzRwtcBNeWQ82kTB5lo6hqMTrBLciddar0MERp7VPMnMt69Rh
+M3BMZsZOtJnubgOmGnb+M+lxcAwqOxQhjLmErAUWL4XOs0wKca05zEbwX3/94P3N
+HWufEP7Mj3I1vK+oHn6WSp6eG7X6d3+j/2j51SLTCpDnXjrnhSq2NVy4Bmsezm40
+hOk+xYh4Qls7aI7q3iobIR3v/mjk3i3SSr1cHD1pRWlDBQuPjyKYgnWO9OfpH4On
+sIgUsN0mi3VnrSitsZm9DJRquR+26FKMXqKg+zJMhBZpKbTh68Vrda8sxzC5mZQs
+7lqfxSlaouAWijITXhhM4Ae2Q8AH+BD4P4CGxzU3EJsp/7HOqRjIQEVS+CxUv0Yc
+/FML3tOg7oENMi+oAGlWWYLTK8gWfVXKacOKlzIkjkbZppbtg6KaNIMJyaqWkmft
+DXTQCYdUJDpH/ky59lrSAUUKlRYfL99wsffzgKh/T9tiUaFYwojZyPBUd1wqJtI3
+sgt3J24yIwSyQEyw8mrq
+=Qdou
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libharu/libharu-2.1.0.ebuild b/media-libs/libharu/libharu-2.1.0.ebuild
deleted file mode 100644
index 492e2af8611b..000000000000
--- a/media-libs/libharu/libharu-2.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libharu/libharu-2.1.0.ebuild,v 1.3 2011/07/10 15:49:38 jlec Exp $
-
-DESCRIPTION="C/C++ library for PDF generation"
-HOMEPAGE="http://www.libharu.org/"
-SRC_URI="http://libharu.org/files/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="png zlib examples"
-
-DEPEND="
-	png? ( media-libs/libpng )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf \
-		$(use_with png) \
-		$(use_with zlib)
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake \
-		INSTALL_STRIP_FLAG="" \
-		DESTDIR="${D}" install || die "emake install failed"
-	dodoc README CHANGES
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r demo/* || die
-	fi
-}
diff --git a/media-libs/libharu/libharu-2.2.1.ebuild b/media-libs/libharu/libharu-2.2.1-r1.ebuild
index c24e81919e38..6b7faf55866f 100644
--- a/media-libs/libharu/libharu-2.2.1.ebuild
+++ b/media-libs/libharu/libharu-2.2.1-r1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libharu/libharu-2.2.1.ebuild,v 1.2 2011/07/10 15:49:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libharu/libharu-2.2.1-r1.ebuild,v 1.1 2012/04/11 09:47:09 xarthisius Exp $
 
 EAPI=4
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="C/C++ library for PDF generation"
 HOMEPAGE="http://www.libharu.org/"
 SRC_URI="http://libharu.org/files/${P}.tar.bz2"
 
 LICENSE="ZLIB"
-SLOT="2"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="png zlib static-libs"
+IUSE="png static-libs zlib"
 
 DEPEND="
 	png? ( media-libs/libpng )
@@ -36,4 +36,5 @@ src_install() {
 		INSTALL_STRIP_FLAG="" \
 		DESTDIR="${D}" install
 	dodoc README
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libhpdf.la
 }