diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-08-09 08:27:31 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-08-09 08:27:31 +0000 |
| commit | f8dd0a0d5617a48e2d0cf2a1783143e64c93b266 (patch) | |
| tree | 4ee17362adbba318ea501b9ef1c9cd38b1c43aa3 | |
| parent | Fix mysql as-needed wrt bug#423437. (diff) | |
| download | gentoo-2-f8dd0a0d5617a48e2d0cf2a1783143e64c93b266.tar.gz gentoo-2-f8dd0a0d5617a48e2d0cf2a1783143e64c93b266.tar.bz2 gentoo-2-f8dd0a0d5617a48e2d0cf2a1783143e64c93b266.zip | |
Do not override phases. Fixes bug#430480.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
| -rw-r--r-- | dev-cpp/libcmis/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-cpp/libcmis/files/libcmis-0.2.3-do-not-override-phases.patch | 17 | ||||
| -rw-r--r-- | dev-cpp/libcmis/libcmis-0.2.3.ebuild | 5 |
3 files changed, 25 insertions, 3 deletions
diff --git a/dev-cpp/libcmis/ChangeLog b/dev-cpp/libcmis/ChangeLog index 557358b40ebd..92ae331caaee 100644 --- a/dev-cpp/libcmis/ChangeLog +++ b/dev-cpp/libcmis/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-cpp/libcmis # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/ChangeLog,v 1.12 2012/08/02 18:22:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/ChangeLog,v 1.13 2012/08/09 08:27:31 scarabeus Exp $ + + 09 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> + +files/libcmis-0.2.3-do-not-override-phases.patch, libcmis-0.2.3.ebuild: + Do not override phases. Fixes bug#430480. 02 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> libcmis-0.1.0.ebuild: Hard require old curl to please ricers. Fixes bug#428790 diff --git a/dev-cpp/libcmis/files/libcmis-0.2.3-do-not-override-phases.patch b/dev-cpp/libcmis/files/libcmis-0.2.3-do-not-override-phases.patch new file mode 100644 index 000000000000..0a4741400f6c --- /dev/null +++ b/dev-cpp/libcmis/files/libcmis-0.2.3-do-not-override-phases.patch @@ -0,0 +1,17 @@ +diff -urN libcmis-0.2.3.old//Makefile.am libcmis-0.2.3/Makefile.am +--- libcmis-0.2.3.old//Makefile.am 2012-08-09 10:18:22.559384031 +0200 ++++ libcmis-0.2.3/Makefile.am 2012-08-09 10:18:44.797384029 +0200 +@@ -12,11 +12,11 @@ + cmis-client.1: doc/cmis-client.xml + $(DOCBOOK2X) $< + +-install-data-am: cmis-client.1 ++install-data-local: cmis-client.1 + mkdir -p $(DESTDIR)$(mandir)/man1/ + $(INSTALL_DATA) cmis-client.1 $(DESTDIR)$(mandir)/man1/ + +-uninstall-am: ++uninstall-local: + -rm -rf $(DESTDIR)$(mandir)/man1/ + endif + diff --git a/dev-cpp/libcmis/libcmis-0.2.3.ebuild b/dev-cpp/libcmis/libcmis-0.2.3.ebuild index f26f96ce5bb0..a5d7ff51a27e 100644 --- a/dev-cpp/libcmis/libcmis-0.2.3.ebuild +++ b/dev-cpp/libcmis/libcmis-0.2.3.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.2.3.ebuild,v 1.2 2012/06/21 15:31:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.2.3.ebuild,v 1.3 2012/08/09 08:27:31 scarabeus Exp $ EAPI=4 EGIT_REPO_URI="git://gitorious.org/libcmis/libcmis.git" [[ ${PV} == 9999 ]] && SCM_ECLASS="git-2" -inherit autotools ${SCM_ECLASS} +inherit eutils autotools ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="C++ client library for the CMIS interface" @@ -33,6 +33,7 @@ DEPEND="${RDEPEND} RESTRICT="test" src_prepare() { + epatch "${FILESDIR}/libcmis-0.2.3-do-not-override-phases.patch" eautoreconf } |