Use `default` in src_install, and add patch for building with gcc-4.7.

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

4 files changed, 58 insertions, 20 deletions

diff --git a/dev-cpp/ctemplate/ChangeLog b/dev-cpp/ctemplate/ChangeLog
index f89a14bb94d6..77d0d7fd6a23 100644
--- a/dev-cpp/ctemplate/ChangeLog
+++ b/dev-cpp/ctemplate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/ctemplate
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ctemplate/ChangeLog,v 1.22 2012/04/20 17:55:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ctemplate/ChangeLog,v 1.23 2012/05/24 19:27:18 vapier Exp $
+
+  24 May 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/ctemplate-1.0-gcc-4.7.patch, ctemplate-1.0.ebuild:
+  Use `default` in src_install, and add patch for building with gcc-4.7.
 
 *ctemplate-2.2 (20 Apr 2012)
 
diff --git a/dev-cpp/ctemplate/Manifest b/dev-cpp/ctemplate/Manifest
index 152de6792816..ab6257aabd58 100644
--- a/dev-cpp/ctemplate/Manifest
+++ b/dev-cpp/ctemplate/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA1
 
 AUX 70ctemplate-gentoo.el 282 RMD160 3719bdae10ccdaaadf403b21031930f8f107d8fc SHA1 638e8e8d1614873fe6a85ab23d94875ac1b8019b SHA256 5b0f78a1bfc6171856ba0822612cff0a0451ee9c7969ab4ae935f15eed715de7
+AUX ctemplate-1.0-gcc-4.7.patch 1142 RMD160 8339a0b1d06cc37bd902052ad340adee8d388d41 SHA1 67004ad04b65fe7e0255e80b30afc36c10c3e7c4 SHA256 a5500696b0736354f3db90102091d81db299b52f36eeca2c4b2c9da8f20a413d
 DIST ctemplate-1.0.tar.gz 837995 RMD160 ca1fdc571a869280d0395f919191a0773505c9d0 SHA1 313e3ee7f9e28adb537c08212eb509bdb848de56 SHA256 731279f1717527cf85ff79ed19b8674f91c3768d8bc20b09440e8dd1ca1b5bf8
 DIST ctemplate-2.0.tar.gz 874846 RMD160 f2138b9996951d786c3cb97db81f46b087baade7 SHA1 c577432a9bdc7169ae420e50998d955f5cf85a0c SHA256 ca2dfe9474b1fb1a20f92d934a6b47cbaf170a08b201335594c93b7417c68d69
 DIST ctemplate-2.2.tar.gz 889458 RMD160 fb5cf475f47b9bd651d05418f5dc01c039b50070 SHA1 b00a35291bc5c5bb8493a68bbf76d6a9cfa5c117 SHA256 04f3cbc0f7ff36adedc904bce776a0817cc6b704b3c4a04b4df5de66fd7e686f
-EBUILD ctemplate-1.0.ebuild 1667 RMD160 7559d6e028e90c6844fd9d20c9f043128cc0de46 SHA1 17dbc25ba19cddba0fb19ed4e2faa8531ad60245 SHA256 8a1a7ff4d164a51a03e75f41e990a527bd8061d232d06baafed096002571b8cf
+EBUILD ctemplate-1.0.ebuild 1708 RMD160 8105df6570c32d749e512d47480e653fb1c82b74 SHA1 744081ec85d96b00239774ae25f97476744b4721 SHA256 333cb0737e4f43933122cf8807c846e491fac5bfd3c637ca6bf36ced72faf87b
 EBUILD ctemplate-2.0.ebuild 1655 RMD160 1b468871ca1bef78d838dc29c2fc1eecad873188 SHA1 ec21635cb29729d883085d1080a57fdeb9472984 SHA256 05545e3d97fd4357edf8fc2f575e7a0800c111f7c50eeabd2db27db0a98241d3
 EBUILD ctemplate-2.2.ebuild 1656 RMD160 24ef08a9eb9b10bdf71f7373763ac0b4c44ded25 SHA1 1f8e8941697f65aeff86b6861441a1a9972ae811 SHA256 4876e97c8f1e610d767a7576f25679beae1f55cd77941abe5df0c369079dd62f
-MISC ChangeLog 3256 RMD160 b2f071ee9b4dc315e6946dba25ad252cbd081319 SHA1 4838a6b6fc45dd145a44616090f7b80e05dd01db SHA256 fafb559b4d3ff59f42c2907bfbdb4ac9acb0997e897375c9b53d15522ec586c3
+MISC ChangeLog 3440 RMD160 20c0461b5e039e228e5ea539b4ee39509e284dc5 SHA1 918454d3c89b24f8aa26747f39716122cc9082af SHA256 c3f2468fcb4968f1cfb7c74a38f5104d74f2128911699992c22d0032c413d6a7
 MISC metadata.xml 243 RMD160 3d5501cca5df03c5328c93deea2dea1873195140 SHA1 79ea882e54a0492e5a83275b53b0d4bf8d21f689 SHA256 218da70c1c7d2b46dfab30396f9949239a4805b44d62df58fcc911e5d1f2e131
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPkaM7AAoJELEHsLL7fEFWVSQQALXdXlztIqzX6EvHzwhQU+4v
-aRfRiI51XNLTqmye8PLNxg+R7iQJhcdssIjcoXZVfajdvDpp1kpK9OGn8LB28s5e
-CdonnTmhXSyVWSsLv8Lp16NlciSal+yaxmixnFqMCp4XkPnOGPyHx1sbKgrS2X6r
-cxeJrZgnLPBxQXBwLq9M7v9NyCQFo+1636RKDNKhTS0TBT9TlDa5AuDFIumN1sqB
-cF7f+sIYIx2obuCX5dYlGFG9pXYHP53FsxOehdhYJQmGJi+IiLtjXQ/Lm1ZnSaPk
-AxJXo0LOqRqbHsLP/tPyLuAdAsEH9iRZU806nK1JP3qtE0vEQxQEQ8MB30CNaKVu
-Lsz+q8aVvH1lMX06LDtdi7hba+Tf8gOgTdPNdDOT8wUjCIw+Z9sgymVMQnQWdG7Q
-O98BIwuK7qS3klLS2UyJL/Dvp7ZLQ017FB52fk5O6yDJqQBlVmTWTY6kBMWPCVgb
-SYv89yclmvRCUHAlEqmNsx1V1Yc8kVRnrQHwTqdyjtK07dQjhoJN8fbKBYRcfJsV
-gwnhTtJx6i4wQi7igJ0ZH3xkBeewmMqjjOzsIrjqcbKoHuJ0oYWdxJE0z4pIB149
-RLhAEqWkDpkwsb3DwLCFl4dMRyDVydGc+dDIHmG/mgWaKrPQqyAFmpaffqUFxYA5
-rhBGEZN8TWpFfVUdZyRm
-=ITCf
+iQIcBAEBAgAGBQJPvovtAAoJELEHsLL7fEFWVEQP/0dkQluIT2019j2X/RLCbd1l
+kSktY3z8DQRBQdlHN630eMzi7rLvxGG31dy/SKvAChHodIqmnBCsZMES1RyCzDv0
+6zFmsicPTmfJochCSM/T/VWkqScr0F/DArn2SdxFzC4BsUYfea67e778jquAnbZY
+7HcLsR+smjBWPQCj7ZcfbAqaE3JdlONAXpbq6YiZTBrtuzkzhF5Sg6QZ0+pgtpz+
+ndpzJgbJ1Uq8jz+mMLkDDrSztsp/B2+UGaxLpkb/3a4/cSJ02UGox5WRvxLYzpWv
+OWZ1gWsavTUaDmy2l3Qe1ORXO+yW6nAny3lqek+1JWtjSbMwTggdk7Xjcv/lYVT9
+FtMuuJXrbAJR1RSekcdQK1suPGsxBeRvCsYZK4Q367GDDKeiVPq79/lpemA/j1tA
+hrgQ6fBrsQ1mLFG6XYLbpYsJyk3WgzlfwA6OPcaEgnZ+Qir06iA+er8QhwN2N1wJ
+FCYQZmJ6Vs9YuO4z2BMX9WQLke0piA17+TMZlEP3NS/f18bSMxmeVHbuKeivmAfM
+KXBs9PQJwp+XhKY3HnouKiKqc+yMB95hiTNEdyano6Oz5GbKTDv4SwU/9aOImu0Z
+xyfvK+HggirZ+sjPpfJgTFckb990kEFFV3OooskH5b5ilhoK+Fc9NaZGpR2FN+5Q
+IGdlKi5QGW2GnkYHM/u6
+=daS4
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/ctemplate/ctemplate-1.0.ebuild b/dev-cpp/ctemplate/ctemplate-1.0.ebuild
index 70540264a04d..f6c2b810e14c 100644
--- a/dev-cpp/ctemplate/ctemplate-1.0.ebuild
+++ b/dev-cpp/ctemplate/ctemplate-1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ctemplate/ctemplate-1.0.ebuild,v 1.6 2012/02/13 16:29:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ctemplate/ctemplate-1.0.ebuild,v 1.7 2012/05/24 19:27:18 vapier Exp $
 
 EAPI="4"
 
-inherit elisp-common python
+inherit elisp-common python eutils
 
 DESCRIPTION="A simple but powerful template language for C++"
 HOMEPAGE="http://code.google.com/p/google-ctemplate/"
@@ -28,6 +28,10 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+}
+
 src_configure() {
 	econf \
 		--enable-shared \
@@ -43,7 +47,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	# Installs just every piece
 	rm -rf "${ED}/usr/share/doc"
@@ -64,7 +68,7 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}"/usr -name '*.la' -delete
 }
 
 pkg_postinst() {
diff --git a/dev-cpp/ctemplate/files/ctemplate-1.0-gcc-4.7.patch b/dev-cpp/ctemplate/files/ctemplate-1.0-gcc-4.7.patch
new file mode 100644
index 000000000000..a8eaaa6fa13e
--- /dev/null
+++ b/dev-cpp/ctemplate/files/ctemplate-1.0-gcc-4.7.patch
@@ -0,0 +1,29 @@
+backported fix from ctemplate-2.2 for building with gcc-4.7+
+
+--- ctemplate-1.0/src/base/small_map.h
++++ ctemplate-1.0/src/base/small_map.h
+@@ -360,20 +360,20 @@ class small_map {
+     if (size_ >= 0) {
+       for (int i = 0; i < size_; i++) {
+         if (compare(array_[i]->first, x.first)) {
+-          return make_pair(iterator(array_ + i), false);
++          return std::make_pair(iterator(array_ + i), false);
+         }
+       }
+       if (size_ == kArraySize) {
+         ConvertToRealMap();  // Invalidates all iterators!
+         std::pair<typename NormalMap::iterator, bool> ret = map_->insert(x);
+-        return make_pair(iterator(ret.first), ret.second);
++        return std::make_pair(iterator(ret.first), ret.second);
+       } else {
+         array_[size_].Init(x);
+-        return make_pair(iterator(array_ + size_++), true);
++        return std::make_pair(iterator(array_ + size_++), true);
+       }
+     } else {
+       std::pair<typename NormalMap::iterator, bool> ret = map_->insert(x);
+-      return make_pair(iterator(ret.first), ret.second);
++      return std::make_pair(iterator(ret.first), ret.second);
+     }
+   }
+