Fix pkgconfig file again

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64
RepoMan-Options: --force

diff --git a/x11-libs/libview/ChangeLog b/x11-libs/libview/ChangeLog
index 6681fb07f83070727318d2dcc648749342ac5a49..9c4369dcb68a170b98652c1adcbe292e7d7547a3 100644 (file)
--- a/x11-libs/libview/ChangeLog
+++ b/x11-libs/libview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libview
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libview/ChangeLog,v 1.17 2011/09/14 18:11:42 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libview/ChangeLog,v 1.18 2011/10/16 20:24:16 ssuominen Exp $
+
+*libview-0.6.6-r2 (16 Oct 2011)
+
+  16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  files/libview-0.5.6-pcfix.patch, +libview-0.6.6-r2.ebuild:
+  Move @VIEW_LIBS@ to Libs.private from Libs to avoid problems with libpng
+  upgrade.
 
   14 Sep 2011; Vadim Kuznetsov <vadimk@gentoo.org> -libview-0.6.2.ebuild,
   -libview-0.6.6.ebuild:

diff --git a/x11-libs/libview/Manifest b/x11-libs/libview/Manifest
index d9d0c3e7c3c196d828dd2bf55ab5e516e954e4be..000668bf7cd89961132257e2deb29a41b70f10fe 100644 (file)
--- a/x11-libs/libview/Manifest
+++ b/x11-libs/libview/Manifest
@@ -1,15 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libview-0.5.6-pcfix.patch 600 RMD160 58869acfda194c671bc6c858d0f8cfd7bc62851b SHA1 393d7d2e440173cd0cb2edc7de10629dab1f1c6e SHA256 4d93c8067fb1d371780a665fff731dd27ce3daac983ea63efbb7ba2bad492d39
+AUX libview-0.5.6-pcfix.patch 440 RMD160 785869c60c8f46b2b5d4e865738252f2cad5fe11 SHA1 784ad62003c6225cdb874168d3d3807c9733163e SHA256 8c3fd20b4b83220a2ed62afe16d60e8891e9aad493798d47d9e98f0a596ab388
 DIST libview-0.6.6.tar.bz2 304958 RMD160 1b118bd133dd97f19210389c3b1dbe80bad68cc9 SHA1 6ec44d55ceaf1a80196f1ee300deca75a4c9c793 SHA256 2b991bf150c5488b43f807e89bdbd64b2eb3bd433abbdfb68c3eec52cbaa59ab
 EBUILD libview-0.6.6-r1.ebuild 947 RMD160 dc012b113b48371f51dba64d879db05cb320991a SHA1 4b231870a458d2c2733abe3b6895f5059e58445a SHA256 b03316f3f48cb636f2e088d888399c2a3b5044e44a1e1b8d84e27b797196322d
-MISC ChangeLog 2540 RMD160 8b28957c66347c027e2aa7ac58f49e42182943bd SHA1 f6806ecf950444b5238a28bfb6b046516a00df5d SHA256 998c952b7b0d98cd4b2a92322e9e63bb22c77778a3bf8627ce12f651ad301311
+EBUILD libview-0.6.6-r2.ebuild 950 RMD160 ee9b8522920c3be146fd871cd8db43df1ddc85be SHA1 d0b1e92c44e1c36108d10396c0bc9f5b34b20d62 SHA256 f0ccb9fcd5c5f7c4c9dc5e6e298f8e4d2c6721fd94eb86f26a6a6ec7bdbda3f7
+MISC ChangeLog 2778 RMD160 32424e63ad40ce630e5dda747970fcee6d398420 SHA1 8a16a0e241c9e8c7d35958954346e9bc3a72319d SHA256 99b2df9765935056cf49da5b1a4346012899835f61e6b6ee41a8465d34df5a0a
 MISC metadata.xml 210 RMD160 c221abe824d7def33ad4b46921558f39f5c86c9c SHA1 c5d824f3b06a9b92a197c9dd811eafdf9f5e7487 SHA256 046ab532b99c45cb8b7c910ce6058555fb8d02a88aa9ffa4fa5a6bda923f1e11
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5w7m4ACgkQiLKviuHfItWYtACcC2giwC++v8da/ogA4hXLgtwJ
-1gkAoMTiAvWv35a+bMHQFBmsaAwDJUUc
-=dV0S
+iQEcBAEBAgAGBQJOmz1kAAoJEEdUh39IaPFNR+kH/2bFeG9E/FhLsJzFw8PI17Ve
+nFOdKhUG5/G0hMiCpImzAU+rFx3m26OdELTBxBtmYHaQBeAqtmXOFSRxAtqZmskY
+JzXsAOGL/45CGlllPve2YbJoEv9wWXWPcnAAfpd010J5C1FN+iEBWFST2doMuMGt
+9gmhj2H/lPnYHqHD/2Tep95nppdV9kxs4ashCqvKCuETgskAR4DqyBWUF39HXp4Z
+SWKvDSvthEzmMjGrd0kk5NEflox/t9KZKReottxI7GE+91AjiYlK4ZTCPbou1Nio
+5EpxL3l7n2Z13pdUyuYuwNzc5PuBMjGo66LOBhQpNgGn+t2hqx3nKB1QHwFXdHA=
+=4ie3
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/libview/files/libview-0.5.6-pcfix.patch b/x11-libs/libview/files/libview-0.5.6-pcfix.patch
index e43bac0b792e5e05f4ffa2de7414a29fc1d80245..8df5d414da94da6c18dc47d7366f8486a1a7c863 100644 (file)
--- a/x11-libs/libview/files/libview-0.5.6-pcfix.patch
+++ b/x11-libs/libview/files/libview-0.5.6-pcfix.patch
@@ -1,7 +1,6 @@
-diff -u -r libview-0.5.6.old/libview.pc.in libview-0.5.6/libview.pc.in
---- libview-0.5.6.old/libview.pc.in    2005-09-07 18:35:12.000000000 -0400
-+++ libview-0.5.6/libview.pc.in        2006-05-31 10:38:50.000000000 -0400
-@@ -1,9 +1,10 @@
+--- libview.pc.in
++++ libview.pc.in
+@@ -1,9 +1,11 @@
 -prefix=${prefix}
 +prefix=@prefix@
 +exec_prefix=${prefix}
@@ -13,5 +12,6 @@ diff -u -r libview-0.5.6.old/libview.pc.in libview-0.5.6/libview.pc.in
  Version: @VERSION@
 -Libs: -L${libdir} -lview @PACKAGE_LIBS@
 -Cflags: -I${includedir} @PACKAGE_CFLAGS@
-+Libs: -L${libdir} -lview @VIEW_LIBS@
++Libs: -L${libdir} -lview
++Libs.private: @VIEW_LIBS@
 +Cflags: -I${includedir} @VIEW_CFLAGS@

diff --git a/x11-libs/libview/libview-0.6.6-r2.ebuild b/x11-libs/libview/libview-0.6.6-r2.ebuild
new file mode 100644 (file)
index 0000000..26a32e8
--- /dev/null
+++ b/x11-libs/libview/libview-0.6.6-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libview/libview-0.6.6-r2.ebuild,v 1.1 2011/10/16 20:24:16 ssuominen Exp $
+
+EAPI=3
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="VMware's Incredibly Exciting Widgets"
+HOMEPAGE="http://view.sourceforge.net"
+SRC_URI="mirror://sourceforge/view/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static-libs"
+
+RDEPEND=">=x11-libs/gtk+-2.4.0:2
+                dev-cpp/gtkmm:2.4"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig"
+
+G2CONF="--enable-deprecated"
+
+src_unpack() {
+       gnome2_src_unpack
+}
+
+src_prepare() {
+       # Fix the pkgconfig file
+       epatch "${FILESDIR}"/${PN}-0.5.6-pcfix.patch
+       eautoreconf -i
+}
+src_configure() {
+       econf \
+               --enable-deprecated \
+               $(use_enable static-libs static)
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die
+       dodoc AUTHORS ChangeLog NEWS
+
+       find "${ED}" -name '*.la' -delete
+}