Use PATCHES array and convert mycmakeargs to an array

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

4 files changed, 33 insertions, 23 deletions

diff --git a/media-libs/lasi/ChangeLog b/media-libs/lasi/ChangeLog
index 716236564328..e439f2a136f0 100644
--- a/media-libs/lasi/ChangeLog
+++ b/media-libs/lasi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/lasi
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/ChangeLog,v 1.22 2011/11/27 04:05:57 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/ChangeLog,v 1.23 2012/02/20 09:54:55 jlec Exp $
+
+  20 Feb 2012; Justin Lecher <jlec@gentoo.org> lasi-1.1.1.ebuild, metadata.xml:
+  Use PATCHES array and convert mycmakeargs to an array
 
 *lasi-1.1.1 (27 Nov 2011)
 
diff --git a/media-libs/lasi/Manifest b/media-libs/lasi/Manifest
index 55876a3411dc..8006075b0888 100644
--- a/media-libs/lasi/Manifest
+++ b/media-libs/lasi/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX lasi-1.1.0-cmake.patch 417 RMD160 b8dcaac0d5f9700f66c6f44b68bd01ca88d26132 SHA1 a29da03b0ae418179fb73b0044883d6c0b9accce SHA256 9247c947eeeb02de666d9ae43f8d6681a192626a05e59100b58e0c2b9f9d281a
 AUX lasi-1.1.0-pkgconfig.patch 701 RMD160 80cc5f85aab9bba702364836bae0256ac8fa2054 SHA1 e628902622bf0e6acd9ba582fc7ef5af9461fed6 SHA256 de255e31df073127a2c75941a31bc41119a9b4271767b72a446f8533df43d0c5
 DIST libLASi-1.1.0.tar.gz 200126 RMD160 468ffda874ab78676408e8fbe7ab5fee3acc7de7 SHA1 6b2db9dc8719eb7f31c63b70e04b2337812379a1 SHA256 52b186060e531f851d4b9d288dc6dba4f0ab15a6b8862377213032da39bcb8f4
 DIST libLASi-1.1.1.tar.gz 223589 RMD160 dc9efdef39615b4c293c61e3506ee8f2e66bc751 SHA1 d17fdebf4bb4a29512e321c7af157a694dc855a0 SHA256 175964cb4fec347737899f9fa0b8d7441864ae20f439e013432d9b9072ab3723
 EBUILD lasi-1.1.0-r2.ebuild 1348 RMD160 3f501f07957951fc70559d662db337f117ed4b61 SHA1 8c912c2101ba196ac6601b61d22089cbafc140da SHA256 88d05c0ecfca4bc93f076b4ad5a31bdc742a18c022a3a18b7fc12a252f1be7a8
-EBUILD lasi-1.1.1.ebuild 1334 RMD160 050aeac9a11620e7d55e0072cc49a423d9dd4c76 SHA1 1f849c9774f4f8147e08b2692dd48db2a50bfb12 SHA256 e3ebe285f59f8f29fb9da5f7b53064376b0ebe031d8185a291d98156f68fe7ec
-MISC ChangeLog 3131 RMD160 9c7913e38ec827e41f48f819f378d69172ec5d57 SHA1 94007c68dcae4b6daa96b22e6dfad63736cc233b SHA256 0374521c82e51dc9c18b5e757cf804c03260b87659dab6a247228c7fcdc43a01
-MISC metadata.xml 1057 RMD160 67217462220df8046475f54b5730c32c7a671e07 SHA1 c7bbcdcb68e69633a7fba88670256f518af1ba53 SHA256 a6a6d68171bc80f9a9e38d5a17df48677609c82d82202cbce3328f9237945087
+EBUILD lasi-1.1.1.ebuild 1332 RMD160 3fb245b7636a51c0ea1cb7c7ddddbd66026d55b5 SHA1 6c6f07394c3c795f284041a653634c1f94ca39c1 SHA256 71cb8d412929d690701f5da089616a1608d4bae9569ac655e003055467177a38
+MISC ChangeLog 3264 RMD160 9ac53842d6780b5cab4ecdff6db270569a3bcb73 SHA1 6f4a866c7d0455c64cc48e09e135a8bfde799ec9 SHA256 ae2a02257c1e4f9b68157b66f3e048a6c1a9dcf523703b645b9eb33f8e960a91
+MISC metadata.xml 1060 RMD160 f7944c90e3ee8ea68cce56486bda1c979aaf184b SHA1 83aacedd23e7b73f214948bed38cb5cffc335266 SHA256 a0abc427d8237149be717d537b227b1df0ca0a72cf454bad84a903f551bef6d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7Rty8ACgkQ1ycZbhPLE2AK+ACeNeXx/s5URFgoVvY8zz610Dsa
-FRoAn230tRaeASpYoC9aLP7t57k42J8Q
-=GT/R
+iEYEAREKAAYFAk9CGKUACgkQgAnW8HDreRbEoQCfSOOqdm743oZIYmhqSfjPxtZd
+Ah8AnjXxPl1klQPzQvIONYqneaK1iRdK
+=/h2o
 -----END PGP SIGNATURE-----
diff --git a/media-libs/lasi/lasi-1.1.1.ebuild b/media-libs/lasi/lasi-1.1.1.ebuild
index 2777304fbcfd..a8ec56781ac8 100644
--- a/media-libs/lasi/lasi-1.1.1.ebuild
+++ b/media-libs/lasi/lasi-1.1.1.ebuild
@@ -1,9 +1,10 @@
-# 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/lasi/lasi-1.1.1.ebuild,v 1.1 2011/11/27 04:05:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/lasi-1.1.1.ebuild,v 1.2 2012/02/20 09:54:55 jlec Exp $
 
 EAPI=4
-inherit eutils cmake-utils
+
+inherit cmake-utils eutils
 
 MY_PN=libLASi
 MY_P=${MY_PN}-${PV}
@@ -17,17 +18,22 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc examples"
 
-RDEPEND="x11-libs/pango
-	media-libs/freetype:2"
+RDEPEND="
+	media-libs/freetype:2
+	x11-libs/pango"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-cmake.patch
+	"${FILESDIR}"/${PN}-1.1.0-pkgconfig.patch
+	)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.0-cmake.patch
-	epatch "${FILESDIR}"/${PN}-1.1.0-pkgconfig.patch
+	base_src_prepare
 	sed -i \
 		-e "s:\/lib$:\/$(get_libdir):" \
 		-e "s/libLASi-\${VERSION}/${PF}/" \
@@ -42,9 +48,10 @@ src_prepare() {
 
 src_configure() {
 	CMAKE_BUILD_TYPE=None
-	mycmakeargs="${mycmakeargs}
-		 -DCMAKE_SKIP_RPATH=OFF
-		 -DUSE_RPATH=OFF"
-		use doc || mycmakeargs="${mycmakeargs} -DDOXYGEN_EXECUTABLE="
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=OFF
+		-DUSE_RPATH=OFF
+		)
+		use doc || mycmakeargs+=( -DDOXYGEN_EXECUTABLE= )
 	cmake-utils_src_configure
 }
diff --git a/media-libs/lasi/metadata.xml b/media-libs/lasi/metadata.xml
index fe32deb782f9..561ab25509d0 100644
--- a/media-libs/lasi/metadata.xml
+++ b/media-libs/lasi/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<herd>graphics</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<herd>graphics</herd>
+	<longdescription lang="en">
   libLASi is a library written by Larry Siden that provides a C++
   stream output interface for creating Postscript documents that can
   contain characters from any of the scripts and symbol blocks