diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-02-20 09:54:55 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-02-20 09:54:55 +0000 |
| commit | 9a3aa6b055328111913bf92485a993d7f59d5271 (patch) | |
| tree | 986bf00d55d8071921cb9e760a80883b6f7667bf | |
| parent | old (diff) | |
| download | gentoo-2-9a3aa6b055328111913bf92485a993d7f59d5271.tar.gz gentoo-2-9a3aa6b055328111913bf92485a993d7f59d5271.tar.bz2 gentoo-2-9a3aa6b055328111913bf92485a993d7f59d5271.zip | |
Use PATCHES array and convert mycmakeargs to an array
(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)
| -rw-r--r-- | media-libs/lasi/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/lasi/lasi-1.1.1.ebuild | 29 | ||||
| -rw-r--r-- | media-libs/lasi/metadata.xml | 6 |
3 files changed, 26 insertions, 16 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/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 |