From 9faf5fa570009f1fbe831be09d7c418dfbdaeeca Mon Sep 17 00:00:00 2001 From: Michele Noberasco Date: Thu, 11 Mar 2010 14:52:06 +0000 Subject: [PATCH] Added patch to fix installation of documentation outside /usr/share/doc/${PF}. Fixes bug #294592. Package-Manager: portage-2.1.6.13/cvs/Linux i686 --- dev-libs/libwbxml/ChangeLog | 8 +++++-- dev-libs/libwbxml/Manifest | 5 ++-- .../files/wbxml2-0.9.2_p48.make_install.patch | 24 +++++++++++++++++++ dev-libs/libwbxml/libwbxml-0.9.2_p48.ebuild | 24 +++++++++++++++++-- 4 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 dev-libs/libwbxml/files/wbxml2-0.9.2_p48.make_install.patch diff --git a/dev-libs/libwbxml/ChangeLog b/dev-libs/libwbxml/ChangeLog index 30ff861a26f3..a7d31214cf40 100644 --- a/dev-libs/libwbxml/ChangeLog +++ b/dev-libs/libwbxml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libwbxml -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/ChangeLog,v 1.16 2009/05/16 16:16:03 nixnut Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/ChangeLog,v 1.17 2010/03/11 14:52:05 s4t4n Exp $ + + 11 Mar 2010; Michele Noberasco libwbxml-0.9.2_p48.ebuild: + Added patch to fix installation of documentation outside /usr/share/doc/${PF}. + Fixes bug #294592. 16 May 2009; nixnut libwbxml-0.10.1.ebuild: ppc stable #261166 diff --git a/dev-libs/libwbxml/Manifest b/dev-libs/libwbxml/Manifest index 9ec54d4f1579..3e1131b20820 100644 --- a/dev-libs/libwbxml/Manifest +++ b/dev-libs/libwbxml/Manifest @@ -1,4 +1,5 @@ AUX wbxml2-0.9.2.make_install.patch 684 RMD160 ed946c31131d19254735120e617d198784530dbd SHA1 15189a9fbcf640d84224ac9efd338a109c5c0c7d SHA256 63215a12b3ba9e3820431fef670e9b547d24baa3af7e151d0a24cd240e40b98f +AUX wbxml2-0.9.2_p48.make_install.patch 552 RMD160 976cea9903fb4dc85793f7ddb248703bbcfd36e7 SHA1 8b5584738bc78dc32260a5e33d35978f729ef0f4 SHA256 437eae7fbe4f1ed732772614530f2ebe09b1d3ac3b645eb24aa622f8e7afea7a DIST libwbxml-0.10.1.tar.bz2 328284 RMD160 459fa925dc808f6a73294163b0f1e3a105684866 SHA1 c5d053d24578821ec2943ec3d2f5d8bb99b16095 SHA256 804429d216c7a945ecd93e88a6d4ca8e3d41d3df2b6fe26f00857cb8701f66cc DIST libwbxml-0.10.6.tar.bz2 349749 RMD160 54cda02827e2e6b4258a9e964ace5e4053cafb82 SHA1 7c26623e3e5da58eba02c34964df2a72caab341e SHA256 5cb7b5d63c88e6baf4a57e5e6157591de815d9582ee110f85a744c705571aab1 DIST wbxml2-0.9.2+svn49synce.tar.gz 539046 RMD160 8c5376ea5d9f754f334ae8032d39e03f167eb93c SHA1 d6978b8a62309bb85280ed7d3cfc8b83203a9c9b SHA256 b5845a56163886eb58135e29720f897235fd74cbc4b61f262d7fb91507d9e19f @@ -6,6 +7,6 @@ DIST wbxml2-0.9.2.tar.gz 304115 RMD160 00e4f88d74be96a1a42dddc80c6edab94a6a8870 EBUILD libwbxml-0.10.1.ebuild 531 RMD160 e43f0422d298b9e1ab9c4a883c499ae0f9d792b9 SHA1 b129e0e83714be883bb9f75c5a981f181e487364 SHA256 c6881970e052c1c7185a65b5ad7b8ae616af4fdbbd8fe2f0cffd88eea642b831 EBUILD libwbxml-0.10.6.ebuild 533 RMD160 7031859880f99e7e7a0145c315636df56b172ede SHA1 3183ec3a8fada025a81182366d4b6c2c57b3d7b8 SHA256 58778eb3876f6663a5706c4add84d03f50ffcbe5f533e216fd592f4e331c8345 EBUILD libwbxml-0.9.2.ebuild 1086 RMD160 83b6423258e086c65ac26b29f4c1d046065ec8cf SHA1 49283edae9b1801d7b372490423809e1262ba96d SHA256 4ed7d3fcf7e7e184be5f60ff17f76947935013d20c9dd2cfdc351862e97cea6b -EBUILD libwbxml-0.9.2_p48.ebuild 696 RMD160 d008b52987c2a65ae98f2fb883bed9b5072048a7 SHA1 9f75f8dc9971d302034dd96a9dc4e42e2bd58d59 SHA256 412fa91116bfd64609ed600bfc9390fd427e807a459c36a1772d89472b7f8df1 -MISC ChangeLog 2582 RMD160 c1d0817d20d9f10f6ea64d70a46aeea9f1d85531 SHA1 8501af80173cb248a32cc79c573c4a480178fde5 SHA256 9c01b28514d4210837e8b7cd44a2a52c05235029ea6a9612eb0c92b571de141c +EBUILD libwbxml-0.9.2_p48.ebuild 1083 RMD160 fbcc7cc8b18f750dc0a21c7a6bccda71dde1287c SHA1 0bc1ac40fedbd608370a4f99c683915b115735ab SHA256 45762e675e8dd825249d20cbfaf15203fc8c81ef03f366f02b8875c02b71e915 +MISC ChangeLog 2763 RMD160 6a562428e80f32e108d3d35d16d68908ca5eb2d4 SHA1 cfefbaab9de4daf86a21e11ef3bb28a070335148 SHA256 b57e6d63c41cc895c1217d86f4ad6395f2e7b7a776cadaa823add0a4719ab630 MISC metadata.xml 254 RMD160 5c1b976d4bf83b9cb6770e8b6065df0c2fbad264 SHA1 f9659da73dc287f4249415f8609dd4256100bbb8 SHA256 51a4815eae0d318310ac2894236be562b906c9e662cbd13013c9733f9cc8503c diff --git a/dev-libs/libwbxml/files/wbxml2-0.9.2_p48.make_install.patch b/dev-libs/libwbxml/files/wbxml2-0.9.2_p48.make_install.patch new file mode 100644 index 000000000000..8dca505e6352 --- /dev/null +++ b/dev-libs/libwbxml/files/wbxml2-0.9.2_p48.make_install.patch @@ -0,0 +1,24 @@ +--- /Makefile.am 2010-03-11 15:44:49.000000000 +0100 ++++ /Makefile.am.new 2010-03-11 15:45:00.000000000 +0100 +@@ -8,21 +8,6 @@ + pkgconfigdir=$(libdir)/pkgconfig + pkgconfig_DATA = libwbxml2.pc + +-wbxmldocdir = ${prefix}/share/doc/wbxml2-${VERSION} +-wbxmldoc_DATA = \ +- AUTHORS\ +- bootstrap\ +- BUGS\ +- ChangeLog\ +- COPYING\ +- GNU-LGPL\ +- INSTALL\ +- NEWS\ +- README\ +- References\ +- THANKS\ +- TODO +- + dist-bz2: distdir + sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux + mv $(distdir)/wbxml2.spec.aux $(distdir)/wbxml2.spec diff --git a/dev-libs/libwbxml/libwbxml-0.9.2_p48.ebuild b/dev-libs/libwbxml/libwbxml-0.9.2_p48.ebuild index e40e7deec33b..74c9b5e5748b 100644 --- a/dev-libs/libwbxml/libwbxml-0.9.2_p48.ebuild +++ b/dev-libs/libwbxml/libwbxml-0.9.2_p48.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/libwbxml-0.9.2_p48.ebuild,v 1.6 2009/04/28 13:17:59 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/libwbxml-0.9.2_p48.ebuild,v 1.7 2010/03/11 14:52:05 s4t4n Exp $ + +inherit eutils autotools IUSE="" @@ -19,6 +21,24 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" +src_unpack() +{ + unpack ${A} + cd "${S}" + + # Remove doc stuff from Makefile.am, otherwise make install complains + epatch "${FILESDIR}/wbxml2-${PV}.make_install.patch" + + # Don't rewrite use CFLAGS, pass everything as AM_CFLAGS instead. + sed -i \ + -e '/-\(O3\|g\)/d' \ + -e '/-Wall/s:\\::' \ + -e 's:CFLAGS:AM_CFLAGS:' \ + {src,tools}/Makefile.am + + eautoreconf +} + src_install() { einstall || die "Installation failed" -- 2.26.2