Add workaround patch to create a sane pkgconfig file, fixes bug 312799.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 106 insertions, 2 deletions

diff --git a/media-libs/lasi/ChangeLog b/media-libs/lasi/ChangeLog
index ee32da92dd11..05abbc1e8578 100644
--- a/media-libs/lasi/ChangeLog
+++ b/media-libs/lasi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/lasi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/ChangeLog,v 1.14 2010/01/14 06:54:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/ChangeLog,v 1.15 2010/09/18 13:20:45 dilfridge Exp $
+
+*lasi-1.1.0-r2 (18 Sep 2010)
+
+  18 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  +lasi-1.1.0-r2.ebuild, +files/lasi-1.1.0-pkgconfig.patch:
+  Added workaround patch to create a sane pkgconfig file. Fixes bug
+  312799.
 
   14 Jan 2010; Jeroen Roovers <jer@gentoo.org> lasi-1.1.0-r1.ebuild:
   Stable for HPPA (bug #284689).
diff --git a/media-libs/lasi/Manifest b/media-libs/lasi/Manifest
index 7cd5ffa798c1..0564efc8cb17 100644
--- a/media-libs/lasi/Manifest
+++ b/media-libs/lasi/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
 EBUILD lasi-1.1.0-r1.ebuild 1310 RMD160 9acdc3b2f612e631d98e9b6ca5814ca5f1778a97 SHA1 38465efb787587152f5525b0c19c97c08a27eadd SHA256 e02a9a2ff6c5521ce55670bc7dc1097ebe5830e371eda4eb53ab21e2048c75ad
-MISC ChangeLog 2137 RMD160 5b092f533ea6f4b797b20aa7ec4d6656203d425e SHA1 68534ac3a9f6e2ae7a70526bf87d24a570f592fd SHA256 45e068bbe806c9a34b0a7a7c2e575626c474c149ad6cec9942b7557744dc2b74
+EBUILD lasi-1.1.0-r2.ebuild 1365 RMD160 d99e6e34544dbef4f99e5f4907414e2e78fc58d6 SHA1 b49082488b29cbee69ec3a48a78e0cecbc5fbca4 SHA256 6c1cb9803a6ff4051e3888237c157063371c16ef99f161de145b3a7634681514
+MISC ChangeLog 2369 RMD160 dd841a0dbeb074f4cb7747c52f8924dcbdecb3d9 SHA1 148c882907e338b32ef931c8eb94fabbfc87a43e SHA256 0c88ff4205e98d576eacb0ef012be83e2fd76ea7b8fe048373a3b4712ceab338
 MISC metadata.xml 1057 RMD160 67217462220df8046475f54b5730c32c7a671e07 SHA1 c7bbcdcb68e69633a7fba88670256f518af1ba53 SHA256 a6a6d68171bc80f9a9e38d5a17df48677609c82d82202cbce3328f9237945087
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJMlLyNAAoJENwGBM22xffevosP/0aF/7f2CnUledXrG7+tvkFj
+NG38wQk9ybWDUYpsLZGrX0M1+RGVBODjimS/USoKX1jHSXf8IpT+lFmYTLc3RXvw
+K0AIZAeyWBJfgAD1aqZHxOWWVMkIpxxC7PZsXX9HWLZUYeHoNoT3SaOkgTh1MQ1e
+8wjG5ynriZRp+2guE2+6JQaKdTajyQdjTprV8llax573s+xJPH+yj4FMRNE23gjW
+tKL+P1TlpkLt9dBrWoutV8h/RgcIM8MtCksnSgH3sxff/FyZfD5ibcWLTrSAj9Hu
+4oPxEdd1LZYcL3ljs9dUVqiEml8i18lum4WgLm/2Ai7ivQizlvyiKpHDgKmlAip1
+auYTtQVsQwUIDW9TlA6VgWiziqnYW4Ob4Vz4H4mSf61+WvGRvaGKd6Q1GuG4vxli
+VrWsWMI3eH/TEGmPWKC+75pk4JNn7dhb+zr5oRElYqixLb6jzZl1XnvlWmcqVG94
+8SDeLR10sSwl5svujxE+Y5G8h3y7PvykRA3lNzPA753w81qL7jV/ljcF7UFwMyxc
+MAHjVZHmlQ6ehvgAr8Av30CyXyNwI6gYcCf85I+2/JBIEH0EWq0912aEHx9kA69U
+5boWjMfdainidM3O4fuxiXjDp0uMyBgdlSx20dYUlak1dHiX5fnCI5n8lGXRwlH7
+h8H5v9DnyXK31ua/7AAs
+=47XH
+-----END PGP SIGNATURE-----
diff --git a/media-libs/lasi/files/lasi-1.1.0-pkgconfig.patch b/media-libs/lasi/files/lasi-1.1.0-pkgconfig.patch
new file mode 100644
index 000000000000..8eab557c8fcb
--- /dev/null
+++ b/media-libs/lasi/files/lasi-1.1.0-pkgconfig.patch
@@ -0,0 +1,22 @@
+diff -ur libLASi-1.1.0.orig/CMakeLists.txt libLASi-1.1.0/CMakeLists.txt
+--- libLASi-1.1.0.orig/CMakeLists.txt	2010-04-29 14:24:58.000000000 +0300
++++ libLASi-1.1.0/CMakeLists.txt	2010-04-29 14:28:54.000000000 +0300
+@@ -35,6 +35,7 @@
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/lasi.pc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/lasi.pc
++@ONLY
+ )
+ 
+ install(FILES
+diff -ur libLASi-1.1.0.orig/lasi.pc.in libLASi-1.1.0/lasi.pc.in
+--- libLASi-1.1.0.orig/lasi.pc.in	2010-04-29 14:24:58.000000000 +0300
++++ libLASi-1.1.0/lasi.pc.in	2010-04-29 14:26:25.000000000 +0300
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=${exec_prefix}/@libdir@
+ includedir=@includedir@
+ 
+ Name: LASi
diff --git a/media-libs/lasi/lasi-1.1.0-r2.ebuild b/media-libs/lasi/lasi-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..b649b621d5e8
--- /dev/null
+++ b/media-libs/lasi/lasi-1.1.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/lasi-1.1.0-r2.ebuild,v 1.1 2010/09/18 13:20:45 dilfridge Exp $
+
+EAPI=2
+inherit eutils cmake-utils
+
+MY_PN="libLASi"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="C++ library for postscript stream output"
+HOMEPAGE="http://www.unifont.org/lasi/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples"
+
+RDEPEND="x11-libs/pango
+	media-libs/freetype:2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS NEWS NOTES README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cmake.patch
+	epatch "${FILESDIR}"/${P}-pkgconfig.patch
+	sed -i \
+		-e "s:\/lib$:\/$(get_libdir):" \
+		-e "s/libLASi-\${VERSION}/${PF}/" \
+		cmake/modules/instdirs.cmake \
+		|| die "Failed to fix cmake module"
+	sed -i \
+		-e "s:\${DATA_DIR}/examples:/usr/share/doc/${PF}/examples:" \
+		examples/CMakeLists.txt || die
+
+	use examples || sed -i -e '/add_subdirectory(examples)/d' CMakeLists.txt
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE=None
+	mycmakeargs="${mycmakeargs}
+		 -DCMAKE_SKIP_RPATH=OFF
+		 -DUSE_RPATH=OFF"
+		use doc || mycmakeargs="${mycmakeargs} -DDOXYGEN_EXECUTABLE="
+	cmake-utils_src_configure
+}