From c2288f268af442665430e710b4ab24e87c24b319 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ch=C3=AD-Thanh=20Christopher=20Nguy=E1=BB=85n?= Date: Wed, 15 Apr 2015 14:26:01 +0000 Subject: [PATCH] Version bump. Unify live and non-live ebuilds. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x2324E7B566DF2611! --- net-libs/libosmocore/ChangeLog | 11 ++++- net-libs/libosmocore/Manifest | 44 +++++++++---------- net-libs/libosmocore/libosmocore-0.6.3.ebuild | 38 ---------------- ...-0.6.4.ebuild => libosmocore-0.8.0.ebuild} | 24 +++++++--- net-libs/libosmocore/libosmocore-9999.ebuild | 28 +++++++----- net-libs/libosmocore/metadata.xml | 1 + 6 files changed, 66 insertions(+), 80 deletions(-) delete mode 100644 net-libs/libosmocore/libosmocore-0.6.3.ebuild rename net-libs/libosmocore/{libosmocore-0.6.4.ebuild => libosmocore-0.8.0.ebuild} (59%) diff --git a/net-libs/libosmocore/ChangeLog b/net-libs/libosmocore/ChangeLog index 9601123da74f..83ef1daeb760 100644 --- a/net-libs/libosmocore/ChangeLog +++ b/net-libs/libosmocore/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-libs/libosmocore -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/ChangeLog,v 1.13 2014/11/03 15:37:14 zerochaos Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/ChangeLog,v 1.14 2015/04/15 14:25:49 chithanh Exp $ + +*libosmocore-0.8.0 (15 Apr 2015) + + 15 Apr 2015; Chí-Thanh Christopher Nguyễn + +libosmocore-0.8.0.ebuild, -libosmocore-0.6.3.ebuild, + -libosmocore-0.6.4.ebuild, libosmocore-9999.ebuild, metadata.xml: + Version bump. Unify live and non-live ebuilds. 03 Nov 2014; Rick Farina libosmocore-0.6.6.ebuild, libosmocore-9999.ebuild: diff --git a/net-libs/libosmocore/Manifest b/net-libs/libosmocore/Manifest index 5dbb154d1b94..715423095829 100644 --- a/net-libs/libosmocore/Manifest +++ b/net-libs/libosmocore/Manifest @@ -1,30 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX libosmocore-0.6.0-automake-1.13.patch 245 SHA256 a84fc6d01bb0ed7bcf7688d675f416050cd4066d8fdc2e6dde9527af8d9fee6f SHA512 be6ad33f91009e6a38d02deafcb69e4e6d88e7436531ddee822b461d95263609b9a6983d7f523cc6d7f97fb8794f32b1b15f9afe1f784bee907ad48535091e1f WHIRLPOOL 5a5941430ae83c423a4b451e7efdf110ee654df04c1cf8b9c7bcda562bd02c13ec49c63bebffb8426b47ac2a3174b16a2898b65c901b96e6ccc1530f99acb8db -DIST libosmocore-0.6.3.tar.bz2 305083 SHA256 c0d455cf396fa06676a697ae7ea86e43c8a2ecc607861bff359855528a775d6c SHA512 3bc5afbb5ac55a339ac8b0d4d12c66c4c53e1b57152d40883ea2eb1509ee915914131b708fbbfb9c4cc44212a21e91639c9f61204092535e4c1ca7ba9086bf24 WHIRLPOOL c0f547cdfbbee7c42a85e3eaafb2c0a29441c5ec83b3e08a9bceca6e2c7bbb77b3e961b20d1f21c8258aa56463b9b69b904e9df6bcdfc326804637957989383c -DIST libosmocore-0.6.4.tar.bz2 312951 SHA256 4b51f6bb55949b52e84a6e673fe61f4d672274e6a63cef832103785fde474a66 SHA512 5b05237c3eba7bcab7e9260a4bec03848fa10eb797b5a371adb9b8dd95ccf1f0767e8a799bf7979a837ce18b60de54258fa9151ca4fc3ffb645b464d2a4e16c1 WHIRLPOOL a1a2dacd5bdebc8c58cb61b94b8889eac02b2b7b88a975e9759cfa4f599eb7a5bc62f7ffbfa89e7f1c843e6efca966abb5f0c6689b15b0d0e6a2944fd0cb8dc3 DIST libosmocore-0.6.6.tar.bz2 396707 SHA256 c0ea2cdb1bdfe9cd815f7abf1abbf3f9ae4f7d5fc73d2820a02038da565ec83d SHA512 d0b2a4f0efb8c364a3c3da8cd888a30eb19f193ae13e9ecbb7126b33dd18c2c23a19672866efc365cdc49b0a971ce87d828ec3fbf7e0df4f4d6ff5f3e32a9c17 WHIRLPOOL 7d01aee748b8866bb2f0117ba00d152de56994d7e9cabe27d07ac760b7e07c9c09cd0b983cf5044757190e3cd84632ffc2000fa84b46506574618c9babd56b2e -EBUILD libosmocore-0.6.3.ebuild 968 SHA256 b1f9bab5bc1f36099f1529d962d1f152f4d40defba98f64a7473e718e1ea98bf SHA512 218a2cf8ce5f19d4038cc8ce88d2d1960bc72dc5c62253df9ba3553cd07594b1629844ce387c629a48b49b064da6cccad7647e2a961dcb843b56a40ed95daddd WHIRLPOOL a94a75d8ce947dda6a33fb25182eeeb4f42a8be6f802c58d1c8e7a2dbcbfcfdcfce927a4a5520997065db2a157c5057381ea04fb976e02b8b678ac31150339ce -EBUILD libosmocore-0.6.4.ebuild 965 SHA256 e7e085e4c1dee3cad34dec62f023f57d2d0fbe39c8b98024a9631f81ad0964f5 SHA512 a0123c3e6fccad669e932b1a869666e1d69b42feca3d8b3791e200ff0c0389bcb82df018d9e677fa289e4b9254bd0034de7da543d5607ee81474add77251f0b0 WHIRLPOOL 2d69a2879274a84026cf96ce655b0a7a510a1ae5e7a2f45baacab6844443a49b5d36139d0dc55a15758111c2cdee11c2ed822a621b998d384e222f3c2bf7692d +DIST libosmocore-0.8.0.tar.bz2 439320 SHA256 7a757b20855a030bc402d6b03411bc6a2d717b2f2cc97ee891cb13661825aefb SHA512 4ffd5943807440f80f70e381e477631a592fef41a3485819d94e7ce9523785e20057759aec6cac7abe57ba21b7d48e38164b7272c5bcd89882a3a8e213d89361 WHIRLPOOL e9e3c82d0d64a85d6915dedc9070f224e49b86a85239a1649751b85ddf2eda537ca9f90a578c42da6df13e77203aaa4dcf069d434f140313439a91686647aee6 EBUILD libosmocore-0.6.6.ebuild 995 SHA256 c653afb18311d7a9f7ae3bd8f76729dda6f00a6a9cfcfd1aaf45fc8473230711 SHA512 06e083adf452e767302629f18ec2c53bc7800e0a8583f57233a8efeca1a2f35c19e56f2afe51279ee722fc9fd6f6b5e16a186fa60f736228d729b3ff6e245ed3 WHIRLPOOL bcb00f0fee6d79f7142417ca664f7d8ec95ee696bcf4d9f80fe2a5c7749c82cf8d8d22a500ec882f4d11218da138acf2337b8b367f4135c72a71c035a9ed7054 -EBUILD libosmocore-9999.ebuild 1027 SHA256 76b03bae1a3016af9e23be71d1f78d49375d6cc2b2fc0a4a03a37347771fd08a SHA512 0a2cbff66e9c98cb213e25659f1e8017dc6fcf96d341fac6b246e7a68e0562e6bf3604e2cfd0c0cf1f93d76c0c1ea8149030d6e00d6a7dd1b4302cafdb1b053e WHIRLPOOL 512a37b16d221ebca9b5d697b2bbefdb9e104221f22d3f8c2eb6096b22be209bee96461125de175f44107e59e351d74e2de26a04d64b877703f287368d4aadcf -MISC ChangeLog 2743 SHA256 868fbf5ff7b377deb9c21fb6f7a0f0b8404d9b264a03db53e1a6b83f169f37a1 SHA512 db56c0bacf3cb3f1a7a6ce296234e8470ac560ce97f667c209545a485ba22b84dac44b6267827c5695e02be5bdd2249017d2392f5a39f9dfd77624cefd8b9b44 WHIRLPOOL 52d6999d3b835432957d82396b34d7081fe06e2d10c97dc0a37198f3a6a6563386ccf2637b4cfa91436c3aa1a88e7e2e04137967c9c1fe9131e5b9121081c771 -MISC metadata.xml 262 SHA256 4fb22ce1a8144565f063476a3371a87c9533d50fcdc3ea223932398f9c3900d4 SHA512 59a43a6d12f7be35e904d887522660463df1a8cc216d6a0a6f569e63f03217737dad7a8c78e1a31d2816bd7c3f89519cae455feb7c43570d94aac266b2342cca WHIRLPOOL 2cc5f91fc3c54baac4961e2df77b47b05cb6bf7b7fe89f9848605bc014e03b05bcb787f277bce6936f1cc57347e13f0113ad4124f4d4e740890e02dfd6284984 +EBUILD libosmocore-0.8.0.ebuild 1194 SHA256 2aeae8a1e5ccf509554803953e95a40881b83931235ba1ce1068dfa769344243 SHA512 d9aaa78eb14cff5e7bccb41dba7a6c5d54bb18560b0aae3668528533ff3cbcf1633d70bfe71231c1b0e06b8e5792135c1c14ee1b15b675de46ed02086b6e0a7e WHIRLPOOL d793f3708c54e8e102e3d526fc2659470de45915b642cb0ae80ac925612b24915433dc1b65f4a5db6d346b63460fdc8a22e092246b6315558ebbd243e1affbd3 +EBUILD libosmocore-9999.ebuild 1193 SHA256 4f27f166a5f8f426624ddb232fe609c7853a711f6fe2ce3aed0e2322183a1b91 SHA512 32e745a71a47aecb8920e1b4ffea52dec7c6462f251f62396ab43c1ac2c1c0246a32188e6ebbcbf08c7091dea6e24dbd99eb3fa5416e4e93fa0a71be413c6015 WHIRLPOOL 874f0466d47ef0f42e7522e4f5a896ab4b6c487803f7987211d32604b21d11f8299d43ac515eda3c7c2c353db75ae9ad7e937da33a4a385428248006968757f3 +MISC ChangeLog 3019 SHA256 2616fbb4476e14f1c049b28d8124183702ed8b529cb87a917e0fafcc7ffae514 SHA512 8d58f88aeef7180131ab4e4319434a5436d416df0e3be05828e878248b35769df856ecb81fd07150f69680c606400a9ab1e43a079cb4f08acfd83136eb431e6e WHIRLPOOL b79fafe952c03158e4f00b102d76bb40918065c3c10ca408e579b38f11b4b2b13be8c01ecd207a1b2bdb9430c7d22de7ccfa266509d524795241b876d0c101b9 +MISC metadata.xml 354 SHA256 2f06179ff7190957cd4f32635b11f3b0134f86b4d32dac48ecb2a85bc09d504c SHA512 14f0676fee00a2255bac185af6e1fd98e0855ed09fa7e2f3ae05b3aa3811132b572de7c3039eef588ef358a44a62d19a4f61309a42b71400031a14bcdee912da WHIRLPOOL 9fc7d693ccae808afd433ad6d94c3ceb6106613703be7c15fa70dd115025131709c891bd82a494b076216565045e05b1ca20ae22a3ec043f9c11d5a48cc9bb99 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQIcBAEBCgAGBQJUV6HTAAoJEKXdFCfdEflKdKwP/2dJz2ivxC+O0vzHL26JgaQj -j0/Uz5Ef0TztBmCnmxOZpLLc0m9Z3LdfdRWBwq9rmski85iVcgV1MKrWtKuUyuXR -at00fiHphJ+rsVRWbMTVpV4J+0wu0k1WJSSIE/l2hJLhqBfvXwMPaBpwmB2VKZe5 -qi/KEszBWz3CczYCvT6X9SBtYne9WGDf8/d+stZCK8RvYxgNgcvCkUhhbm99rJif -X0Rd2QauaL1XmpJ0IR8fV/KN8N0n7iNOeIe7wfLF9EX5T32v3zn90NGjsggEyPYd -j+H6jFGnw3F1kWfzW3V4fE91+T1kMjA5hbYDLuW9pxUeVLZvKcv6haEQs2jMT9Hh -TdQI8MpTAVM9zHX9TLAM9djJgmjzUNZRBtqu2I9n5UeM0GEl2/nb/qiUIyULzwXc -vSOx/Vw1rLYhygzzJrnRN41gdLf/+cqqeoZ9E04uww7TW92l/6N2+oXitpDHc9os -BzSPTTaUkS8Ccn2TNDsYSjQmGIL0DECbhyeReJYZsl/Ot5mE+xJnH5Cq1iDWjjdP -1AmpFuE61t7yg93EynSOan0GLYn+JV80w4lXGnNAeRTK/ndlB0K+2UjjmoynrI56 -g1d6r3K3Xu19O8+3RrmRFbomOBCyrh02Ipx5untwLaxmI88mDpLcMPRRQ2+yfqJd -4vm2XXxUvLiRPcnGVN/6 -=mMKo +iQJ8BAEBCABmBQJVLnUgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy +MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRAGcP/iajNIdmraNrMXO6YIIUcyps +N55k1NfXIdAYKZzJ71ygPYfZRx+X4V37uWeCAHSJESj0/40D5uxtqYMeXo1EUUhF +m/YyXminso0ZoP93cjN4NVIretZrY5adbnK6YYButxk4iN24NSa4mpmiulW3RXCT +mIWr+FX6h6Ir3I7ynGNeJLHAMQMBaXLMDq52iPQR8TQqQc2idhjKdF5e8iF6ERhb +qxi3GyHaiyStpsDNfhtrBeee/o346C4J/KfZA5nUYyopZG5zhTKBiWkDjAst3fyD +7NKRxZdPeHzr72z45sbx8JkO0E+eIzoO9hV9bT/+meHCpD2OjKlK+op3Z5kGpBYm +XjRu1CUaag+0JiL8mLC7Wf6Ek+sPcBAUCzFU/gXZJ/TF8QDZw2lwQ3D3UpH61IIL +wzfI/q1VBxfvJYFtbbmBXTnQzeK8hHOuZJKgoHjJgG0ybvQ4b2Ts9YyGYEJ70+b7 +AncELVnJdD22j/MB7lrK16V3NdMA8PAuofn5sgPxjddTrOjoeJp3YyXFPan+zAAU +1SPiNHspq9fgMSqpK4JIIDR4M1/8WVih/2W1+RqBdLNYCBxMIIGKbjqor99KqCYr +rUXPPVaMgx8t96j18Qo8JoyDnpsBunXQaUK8JFifAU/NS4Y8s2qzUi/Gs2h1jFvu +kOn3aLJ7swd9g30WlH4O +=xtph -----END PGP SIGNATURE----- diff --git a/net-libs/libosmocore/libosmocore-0.6.3.ebuild b/net-libs/libosmocore/libosmocore-0.6.3.ebuild deleted file mode 100644 index 1025a8b69d6f..000000000000 --- a/net-libs/libosmocore/libosmocore-0.6.3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/libosmocore-0.6.3.ebuild,v 1.1 2013/08/26 19:50:06 zerochaos Exp $ - -EAPI="4" - -inherit autotools eutils - -DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects" -HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore" -SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="embedded" - -RDEPEND="" -DEPEND="${RDEPEND} - app-doc/doxygen" - -src_prepare() { - # set correct version in pkgconfig files - sed -i "s/UNKNOWN/${PV}/" git-version-gen || die - - epatch "${FILESDIR}"/${PN}-0.6.0-automake-1.13.patch - eautoreconf -} - -src_configure() { - econf $(use_enable embedded) -} - -src_install() { - default - # install to correct documentation directory - mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die -} diff --git a/net-libs/libosmocore/libosmocore-0.6.4.ebuild b/net-libs/libosmocore/libosmocore-0.8.0.ebuild similarity index 59% rename from net-libs/libosmocore/libosmocore-0.6.4.ebuild rename to net-libs/libosmocore/libosmocore-0.8.0.ebuild index 5e43e1c3ea63..27a9987264ca 100644 --- a/net-libs/libosmocore/libosmocore-0.6.4.ebuild +++ b/net-libs/libosmocore/libosmocore-0.8.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/libosmocore-0.6.4.ebuild,v 1.1 2013/11/05 13:31:39 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/libosmocore-0.8.0.ebuild,v 1.1 2015/04/15 14:25:49 chithanh Exp $ EAPI=5 @@ -8,14 +8,22 @@ inherit autotools eutils DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects" HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore" -SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2" + +if [[ ${PV} == 9999* ]]; then + inherit git-2 + EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" + KEYWORDS="" +else + SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2" + KEYWORDS="~amd64 ~arm ~x86" +fi LICENSE="GPL-2 LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="embedded" +IUSE="embedded pcsc-lite" -RDEPEND="" +RDEPEND="embedded? ( sys-libs/talloc ) + pcsc-lite? ( sys-apps/pcsc-lite )" DEPEND="${RDEPEND} app-doc/doxygen" @@ -28,7 +36,9 @@ src_prepare() { } src_configure() { - econf $(use_enable embedded) + econf \ + $(use_enable embedded) \ + $(use_enable pcsc-lite pcsc) } src_install() { diff --git a/net-libs/libosmocore/libosmocore-9999.ebuild b/net-libs/libosmocore/libosmocore-9999.ebuild index 6c8027c9967b..7de067347c64 100644 --- a/net-libs/libosmocore/libosmocore-9999.ebuild +++ b/net-libs/libosmocore/libosmocore-9999.ebuild @@ -1,23 +1,29 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/libosmocore-9999.ebuild,v 1.6 2014/11/03 15:37:14 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/libosmocore-9999.ebuild,v 1.7 2015/04/15 14:25:49 chithanh Exp $ EAPI=5 -inherit autotools eutils git-2 +inherit autotools eutils DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects" HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore" -EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" + +if [[ ${PV} == 9999* ]]; then + inherit git-2 + EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" + KEYWORDS="" +else + SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2" + KEYWORDS="~amd64 ~arm ~x86" +fi LICENSE="GPL-2 LGPL-3" SLOT="0" -KEYWORDS="" -#IUSE="embedded pcsc" -IUSE="embedded" +IUSE="embedded pcsc-lite" -RDEPEND="sys-apps/pcsc-lite - embedded? ( sys-libs/talloc )" +RDEPEND="embedded? ( sys-libs/talloc ) + pcsc-lite? ( sys-apps/pcsc-lite )" DEPEND="${RDEPEND} app-doc/doxygen" @@ -31,8 +37,8 @@ src_prepare() { src_configure() { econf \ - $(use_enable embedded) - #$(use_enable pcsc) + $(use_enable embedded) \ + $(use_enable pcsc-lite pcsc) } src_install() { diff --git a/net-libs/libosmocore/metadata.xml b/net-libs/libosmocore/metadata.xml index 36cc6fa63e94..a3b7887f7df3 100644 --- a/net-libs/libosmocore/metadata.xml +++ b/net-libs/libosmocore/metadata.xml @@ -4,6 +4,7 @@ radio Build for embedded use and disable unsupported features + Enable smartcard support with sys-apps/pcsc-lite -- 2.26.2