From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QEg2Z-0007oH-2F for garchives@archives.gentoo.org; Tue, 26 Apr 2011 11:02:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62D961C04D; Tue, 26 Apr 2011 11:02:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 338C01C04D for ; Tue, 26 Apr 2011 11:02:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6FA61BC007 for ; Tue, 26 Apr 2011 11:02:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 901B980509 for ; Tue, 26 Apr 2011 11:02:28 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: <8a521c26265103005783a625ed097968f84ebc98.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: scripts/, utils/ X-VCS-Repository: proj/libbash X-VCS-Files: scripts/sunpinyin-2.0.3-r1.ebuild.result utils/metadata_generator.cpp X-VCS-Directories: scripts/ utils/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 8a521c26265103005783a625ed097968f84ebc98 Date: Tue, 26 Apr 2011 11:02:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a36d09580d1203b9979bed926ce595e4 commit: 8a521c26265103005783a625ed097968f84ebc98 Author: Mu Qiao gentoo org> AuthorDate: Thu Apr 21 14:52:31 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Tue Apr 26 10:50:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D8a521c26 Utility: improve the output format of metadata_generator The metadata_generator now generates the same format as what Portage does. --- scripts/sunpinyin-2.0.3-r1.ebuild.result | 7 ++----- utils/metadata_generator.cpp | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/scripts/sunpinyin-2.0.3-r1.ebuild.result b/scripts/sunpinyin= -2.0.3-r1.ebuild.result index d29858d..41f016e 100644 --- a/scripts/sunpinyin-2.0.3-r1.ebuild.result +++ b/scripts/sunpinyin-2.0.3-r1.ebuild.result @@ -1,10 +1,7 @@ -dev-db/sqlite:3 - dev-util/pkgconfig +dev-db/sqlite:3 dev-util/pkgconfig dev-db/sqlite:3 0 -http://sunpinyin.googlecode.com/files/.tar.gz - http://open-gram.googlecode.com/files/dict.utf8.tar.bz2 - http://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2 +http://sunpinyin.googlecode.com/files/.tar.gz http://open-gram.googlecod= e.com/files/dict.utf8.tar.bz2 http://open-gram.googlecode.com/files/lm_sc= .t3g.arpa.tar.bz2 =20 http://sunpinyin.googlecode.com LGPL-2.1 CDDL diff --git a/utils/metadata_generator.cpp b/utils/metadata_generator.cpp index 57facb1..859839c 100644 --- a/utils/metadata_generator.cpp +++ b/utils/metadata_generator.cpp @@ -27,6 +27,9 @@ #include =20 #include +#include +#include +#include =20 #include "libbash.h" =20 @@ -55,6 +58,8 @@ static const std::unordered_map phases =3D { =20 int main(int argc, char** argv) { + using namespace boost::spirit::karma; + if(argc !=3D 2) { std::cerr<<"Please provide your script as an argument"<second[0] << std::endl; + { + std::vector formatted; + boost::trim_if(iter_value->second[0], boost::is_any_of(" \t\n")); + boost::split(formatted, + iter_value->second[0], + boost::is_any_of(" \t\n"), + boost::token_compress_on); + std::cout << format(string % ' ', formatted) << std::endl; + } else + { std::cout << std::endl; + } } =20 // Print defined phases