Do not override phases. Fixes bug#430480.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 41 insertions, 18 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/Manifest b/dev-cpp/libcmis/Manifest
index c5b3f2ec0726..57130ebd2551 100644
--- a/dev-cpp/libcmis/Manifest
+++ b/dev-cpp/libcmis/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libcmis-0.2.3-do-not-override-phases.patch 522 SHA256 6d8e1b88ecbdc7a49da91165d28a91eb8cf8fb3f59b3b4dd8601a930ee665303 SHA512 d902525548f164d89e175ffe0a5e545933ecd447bf6c9f34c4dd80ee39e358a2d884e75576305cd954fc50c77f1c1255d5a6dd00eaa0bce7078770828745a02e WHIRLPOOL 08b2ee7a9f2836095c9bf84683c91fd339a73f3ec0440de4730ee2ac1c3881600cc6d3fdf87f36f2f7e4554cc86347905c77240c98ce7dcd683412734979b8fd
 DIST libcmis-0.1.0.tar.gz 373429 SHA256 2452f9a746d85a126a9a61d71330f6ecca5449f1ab08f43924d660a143bd7e95 SHA512 8eac22ad70d01fdb756ade8c0914931ba1b6b49b10f6f7120f0276f3f13fcb64e33177b87b133b257d95394bfd54cbe4c4076fccfe65ccfdc2c69d20b7f01f5a WHIRLPOOL 95505b443850c1aed55ee671d0a940a3ad231a9acdb5fb0fdf765a94182127b3ac0d4317cf409f77218a173ab4e9ea324d8458db48ab1d804c38e795f6617d75
 DIST libcmis-0.2.3.tar.gz 432064 SHA256 a4ace7c0280e5ee8d4941b33449ee10edf1515437483d55ae387cc4de2c2bea0 SHA512 f69ff4cb6a76d3622e235b0e07c55a762c96634255cedb105565ac40daf5bb2f0fb679bae90708719824a08a921dd34b7cf4fc90d0fb8019e36b5dea3230abb0 WHIRLPOOL 86fe8e16da3148f5a73f5c8be4d5fe3bb71ef2f74e888f0727d6836df24f6013289d5c1b0433ca3d06686419b1c0fad5e0fd0bcda78d714f68d2d2f78c01e83f
 EBUILD libcmis-0.1.0.ebuild 1175 SHA256 5051a51a1e8061e76655c4821470e457d2aef9dec6469a8510ac473356079ba1 SHA512 bdcca89a794a9284c85dd766e3c57adeb41bdc9a42c11cfd9064df2259f2f82a4bcaf13b50e34746dde3d3180795df76882859a208fff87e4150f6b81f0ae91c WHIRLPOOL 5f31f9f214d574bc4ab10defbe6757b431395656b5c7464a6cdac9cd0f2e25bedc21846d513b437b6dc4224b324bd3e52b346bf25fb78bc85bdcff8fe0cac9a3
-EBUILD libcmis-0.2.3.ebuild 1223 SHA256 c7adbc21bc05640c8fca32bcfb40ecb1d8679f3812919daabe1a41f7adbd881a SHA512 0c3ae9279933cce4a7b7e1fe95c526613e5a4d28be885e0966d6325ae5eb64eca0bdd5bb62cdfc902ddbd619c28a0ad072f12f66dc2bf41205ac7302d506c5d4 WHIRLPOOL cba7d7b49f1ed9de79bf65d723344c58345df1c9cdc2379e4bc144dfbd5226b0acf9192b4da63ed57b11775e09dc4c36d91b5db1cb2625fc12fb034f2c0f2981
+EBUILD libcmis-0.2.3.ebuild 1295 SHA256 b6287321c35f016e3a95eecf3f731fb102ef9ff51e9ff244725f4cfb2887cea4 SHA512 3bfdb48d7f6a65b800b76a3ddd123ca47f949338f941ced36d7a9510b4d7f7d35c7c98303edcfebe879df29f3d7c1f9da8d7fecf597f0f9bffbdc34a1f3f8775 WHIRLPOOL 251cd44188dd9e6bec1d70f590491e5a526fa56ae111e30b53a6a6efef52f03937d54272b2af0391a096809d3c016ef0d02a36b66f1f6549cc20d1459621bad0
 EBUILD libcmis-9999.ebuild 1222 SHA256 afa149147de798319a57361bb9e0f2ee0fc44a698b2a08af52567497bf88c9b4 SHA512 e7184c0918a11f2d577dd5ad07277cd77e9806f7f60099488cdb994356efa0c6b3fa73285e4ca8bf15adac26592554e50208f2910ea585d315e26be049b8b9be WHIRLPOOL 2f4382e27097a65340f8e998a0f1b168eca13d6be158722bd0648f898a4037b64c0780c6cf087577b5951b56dd64f41f272094c046c846fbcb676fc511026e65
-MISC ChangeLog 2004 SHA256 41bcbdc44792cdae714935fe81b08b2ced3101badab769588dab63db965adada SHA512 db3b7015a304704d1f5ac0949b3bb575733595f5fc9577eef4e993efa4913b8b5062f4c7e5aaf78f2eaa1efcb499c0dbff9fb7cf492cd1a99713c7261b320bd7 WHIRLPOOL 9c5e814d65f42cc2eb8d1bd2070b82ec41107bf6765a0fdc2470301dae786b52bcbff24afb3c06455186dc9e9f3234a443c59440467fec3799db3df52e5a1580
+MISC ChangeLog 2179 SHA256 02dc6a902d8e7076fd9b7595361b2a3a13c45d646a0fdf7ab359a5902a068b6b SHA512 0fabe46493af88e67ea03f47ccd255d2e81d4126ca5941bd74d332145a93e6c34ba64e539bbe95999e18986c2a55ebabf76bc65169928ba788e994efe01527a6 WHIRLPOOL 2efdc1afe628e25b45899cad2969e0815cda477f1ccacafb8373d5aa2e437471df21122001b069ba6e1e4e31edb2aabf4c6305be8dcf8c45fd687cfe562551f6
 MISC metadata.xml 230 SHA256 963e17c8788eb273db38fb5cc08e10c2eeaafae5e224d8ae50ecb5e0ddbc37d7 SHA512 ee2f609978027b9888b8440feb4583658bcc0b362a82246219fbb49166619a5d473411f4d204ed02e98aa8922eff648d663415f203cd269bec4a7775a5be8597 WHIRLPOOL 9fee66207dd50a07a5907776c96e7d012838175d4374ab3952c6215cc0833becd4c9bf5c73030b551f039a5932140df2400c2e66b8a9eb7fc89a647bdc55659c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQGsW+AAoJEOSiRoyO7jvo5rUP/jBqgGa5bQJCyHjRoxvDPG4n
-FqJSeIRu8RAQN9xpl7Dkhyy5O8P025h06s0qsJrxwV8DPBt0dP2nT9U5zaeZEgO1
-Gd8F9mKn25ysCYkD5ybWrVovfPcKJb1Hll9lFdgNHvtn1e+8md5QZGH37pMV4PEL
-19gxLOW/VXAkYVW355DU9m/GY8Ma0H6/+E4md55LZF9ic/LoROp1Y0yEYjGsBASv
-ZlH+YPEOO/rw2KPOywROBRc1WEfvtVEkA/tPvakUfZOWyNFPgbiotGpIZT5/qA27
-6IhIJ9+LUjPZh9zN5j/ald22hFVk/WWR5wBk+G762K2ETIX3Ak5ol5VDbX2vdzBy
-X79FBnxvDj3c3vCXGEBnzi9wS0A4jooM80uXIX9HNdeddOVFGf8pxQfHhE1t8g9u
-pfxCsmvxXp1iJebobopD5bw1WEYsR8WQLumovWKEQ++mTgGaRf3ZBLAeDLsgSF0J
-4iA34YSe3qoeRQUcfzZEDsRulDAg7NLr11NzyiWDWo/pu4dvGDqfyHSc3fgCOX+h
-fo7bxAyhFAKIM/DsJzi5vdI36KNxr9EWZ9A5TWnlVnNU70libSuWBPcYHyI65TBV
-CpEdU+sAcZ0tNRUf7a10aUPADTExwFMtO9LvMPyXSXoKEvqc4C57CBRxU4BHpp/w
-sCjKUu3vk7lVIOBRJWpE
-=kNqt
+iQIcBAEBCAAGBQJQI3S7AAoJEOSiRoyO7jvo8dUP/RT3P5mMbu+Qh7MfYJ6XEF9Y
+58djkze35UJSgMJM9C1pkoj/UeMmzC86EITyBZlgiuTbGKgwtl68Jud16Gmh+LwR
+d+94z18vxmGI+U6dTxl2WqOVvudcLv7EMor8SgfhJT3q7EphxLrBvRsQf4GOTd6s
+GAQYpiyWNEjDDxDCE2GLXFNlGjHmYq/lVBbrIM2foP0fHrz1DbYwFLNP8gJhxtZz
+rnd3IgRNvIBtzlhW9MdBVDnHkvEig3NcN7x7Z/omjO6tLzrwBxZATpYxjT2R9uXR
+nhAjYtJU/ftGgK+KAUdVIaPRb/tq8RIY9StUG6ag7ffYQ8TRuQ8nDtacm5ICKttP
+ChlBQ2XIcK52wMCBeuf7tU/aRd7+8WYL/+QuFV3BgEDUX3QdbLeE2ZfKIig7xmE3
+pkRumFuqgX8YcxZNERmOj6qy7X15OBA+Vl6SxdTRw9oHTfdT/hau2yP5BwksM3ZW
+vvNNpM5MuMy3/iZTSIee17zr14YMFNO68fIFCmBCDJpiw0lAfECe1SXk5gSG3RD6
+MDRVxxUtVgRD/4oPWPtCQW8Mo+VxibUTh3e9ThAi2CekbOrz8G6qPwDtdBiZHggG
+WwN5bqxZf+csrPL/5PdqPk4beiMQmb39TyvLCFAKFtTfcQDlzfl/HEcgfik3aBSY
+VWo+TuD072RBkH5oyXEZ
+=GK9e
 -----END PGP SIGNATURE-----
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
 }