summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/ucommon/ChangeLog6
-rw-r--r--dev-libs/ucommon/Manifest30
-rw-r--r--dev-libs/ucommon/ucommon-5.5.0.ebuild68
-rw-r--r--dev-libs/ucommon/ucommon-6.0.0.ebuild68
-rw-r--r--dev-libs/ucommon/ucommon-6.0.3.ebuild13
5 files changed, 25 insertions, 160 deletions
diff --git a/dev-libs/ucommon/ChangeLog b/dev-libs/ucommon/ChangeLog
index d0120d4aae5e..dc831e1242df 100644
--- a/dev-libs/ucommon/ChangeLog
+++ b/dev-libs/ucommon/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/ucommon
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ChangeLog,v 1.17 2013/02/26 10:59:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ChangeLog,v 1.18 2013/04/28 07:14:41 maksbotan Exp $
+
+ 28 Apr 2013; Maxim Koltsov <maksbotan@gentoo.org> -ucommon-5.5.0.ebuild,
+ -ucommon-6.0.0.ebuild, ucommon-6.0.3.ebuild:
+ Fix compilation with new automake-1.13, bug #467674. Thanks to slepnoga
26 Feb 2013; Agostino Sarubbo <ago@gentoo.org> ucommon-6.0.3.ebuild:
Stable for x86, wrt bug #457292
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index 325c664453ea..e782f67324fa 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1,34 +1,24 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
AUX disable_rtf_gen_doxy.patch 446 SHA256 19742ff3a149ca50d7397f9ffafc5c70fb332837e2eae81b914e47cf9e8b1f20 SHA512 fe4168b313b5eca78fe8787b758c789c4b91df8355e380acd71c32735ad5c6984a3d6c06747e0215326870eba05d38ca015c88e5ca4166f42b3213ecfb1ad793 WHIRLPOOL 3bb313489028b0e0098e6338fa563327ecfd0cdd3f3e0e410d0c07d532ffe0572e742e4e81b4a9e8e94730211a0b3c4bd473302700f6cb78cd93a5998076796f
AUX gcrypt_autotools.patch 1843 SHA256 9c449f270645e4809ea629533529e60297fd408606a126e4063d0685d6ed1a7d SHA512 019cbd580b7da5097a8de595fce2585cb9c84636260452ad8f03d03f8ce5b157a655f21724799689a94cc8eef70c1e0445aca5f458a659c301eaeb490f86aa83 WHIRLPOOL 1817daa10642c183dc30872368e20494dac5ef7c794584940b9074a788e1576c69abb2805c3eda80a3af7603ef64cc1ce615e7a675057d598839d21e3852cb41
AUX install_gcrypt.m4_file.patch 4970 SHA256 9a161813addb5be01b411539a65fc0c2848fa109624986b81be861f8b044df6c SHA512 03039a04a8fafe4b23e74efc89ee1391caf0c4172ff3f2176cb47fea3777061382e756b81c01d1413cdbf5d7715c85194842ff7e17d1b679e2db4ac5de14d683 WHIRLPOOL 4db79a5ac8086cca33c88b902a1bc91cbd9bbaed66138761779d72455b4233751469ce268d6f9b4fd7855723af9a13ed4b3152c641cdb8ea6d3e822f079a53d1
AUX ucommon-5.2.2-address.patch 1289 SHA256 1185931d42376bf3b980eff21a255b4a1bad5f61a97bf9129711afbbecbbd8ad SHA512 22950b7c5adc3af05e21e8324dd46665ac197f1de4c988fd2b28096d3bd18f00c5e4ab275e02571251607bdd3661caae950a2397e253293b62097e9cfce8847c WHIRLPOOL 73c616b7dc99074c95241a50bd2a0aa63d0322412588674431988004a27372c0df25df7a69a96d0fcc08bcc29c96b550097c08c717f143425d912bc750e357c8
DIST ucommon-5.2.2.tar.gz 792081 SHA256 9d5f3f4d1ef897482fe470b0dd65b0df516aaeb874eac3a33a455abca13f39e9 SHA512 5d5e526675cb39dffea48c38a14dff4eb1316a59c60e2352cfdbb0727ff4db00417e9704026f106da5d34f92ec2be3385b0763d66196f345f0b775bf62eb0125 WHIRLPOOL f857c4b06aff4bbb1ff84edc810d674c7d77a92bb4bcdb62fed64e77e9979c7d736b93596166de6c5fb848745aa7efc1b666231bdb6a33c3b959953b4b114ac2
-DIST ucommon-5.5.0.tar.gz 803892 SHA256 fd4b885ee5abdb3cc44a501d92428af71e1c50ff9166a0e5c5fdbdf16a853d8d SHA512 c860d0134a5c888bbbd008b1716eff985f152a8bf3e3ee54b85adcf89f3d073ea1d080a071def3314584579841a270f5323a7c092bf516af9efb2b3180b12440 WHIRLPOOL c7baf57390c415011a48fa7472932d73778b1f2a0b435de55a8d6564061ca28c29ef0660f03727853f7d96b6ea8f0d1e8afc99fff9556de4694ea9694f8363c3
-DIST ucommon-6.0.0.tar.gz 806713 SHA256 b28fe9c9f596c58bb796ec4aab54db7c525c8ad42bf5b7c57fe08d7d260c5099 SHA512 1482be954582317535e7b3668b433e4ee2bfe53ad05a7391f1152e19895221411b1900f66b0971c642bf1c5ff76241fc2d7ebd3ad020d20fce1e46d32d228bf7 WHIRLPOOL 546623fe5f5d4807c0f04145627b0e69f67022f15daf3ad6a49a69ef7c6a9be61cbbd9a255a674e2ea1f6cec54a65a5efe266b97243bc8f8946ae131b375a23e
DIST ucommon-6.0.3.tar.gz 806841 SHA256 228f3a0fa78173e9fa43e154250a7ed4f1e5be720a81fd2768506c088190c432 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762 WHIRLPOOL 93135ae4ec3c0e6d5203ebed6c6736b9b768d623d99a20674ee0a0ce48622d783efea6b8ca4eb22d5c2653b5059ff9626a35bf0ccfbad7d422a5cdf6c190c7c8
EBUILD ucommon-5.2.2-r3.ebuild 1382 SHA256 4c335d815c0c6306497d489fe8426d79ec090561457d4c2d9ea2f3a65cdf71aa SHA512 78361e73d8f17b4981bfd2431720d974e1ff186d16d387cb01557301d06dfb036a20388aebd10bf03711212e1686a2abdd0c76cb0dd3fa6843c7f30eccd4f8b0 WHIRLPOOL 433211d6cb3b7ad1441c2a92ee722c897bfc28c01881a15c480b106381087000d6e4e51f2c654fef7fde88ffd62a5bd333c2de421948a3ebc94a7e42dcb73f1f
-EBUILD ucommon-5.5.0.ebuild 1491 SHA256 d6d24324b81cebf2fa5bc881067278b80677c013e8a441a967974578a52bad6a SHA512 1eeb5b3c946bc7c17107be70a3ee31845625f244ac2af914eea11e877e991e3229d14c24505afcd85ab66e39993fb0acd02a39bb2068497c27411ec4ede0a65c WHIRLPOOL b5341c708badf228ca32a788fcfe346aa069b44a73557e60f2db3a1316471006853c542447c71d3904dd5c1c054df4af3d89342293be0a07b13d3feae43f64c4
-EBUILD ucommon-6.0.0.ebuild 1491 SHA256 b7871fa1fd38e46ecf24b439532b7a1b8d6e7e0f86119d46bf3cd16c875beb6a SHA512 b0fd10aa67e0a4c5f3229f40d0125d9a993e9996bbc3f542e8c6b3869abcb9b981467cddd4cdeac517848400ccbb0549329660d80bbfd848baa076ada087e947 WHIRLPOOL cf8d38174b3f7d1fbd021b44dae6bc15ddac607c9da25fe9d312b4b205e1133f2f95990e75027d0caf297d323e0e442a100afd1f38a08084177f44677cff36a0
-EBUILD ucommon-6.0.3.ebuild 1483 SHA256 71cc415e87604af5c999405496816d94511685fa0b8598d39618f0c262ead5d5 SHA512 df6564474285ec1ff6035c702c2368592241d21ac0ee7c30b90c7ac16f3a1be71aa76d1de47160a376a3a58fe2f82546c783e8c914f4064227d1081459e79208 WHIRLPOOL e7f420c75c45085f8761e37fd54147796557c380991950d1375244369ca06ef5559fcf9f97001bbe54f423c4f3e99f89efef00aba6fad6e36e22280a217c1032
-MISC ChangeLog 2946 SHA256 71450c0f35781457b603af32054a1002338f4559aea8a92c925c10f206ac6460 SHA512 f8d3db215b3d3ca36e936794ee2b366d38a552c247556920d6cd5d5a7bea671b0229740110d4114a72926a0ec0ec20b538eb133a0bda4041c7ee2e7527fce397 WHIRLPOOL bd26a8cbc342dacf2f45203d516fd49240a2c4f483a1df08ac21ab39a34939dd5c9a4dab6130708f084753605a7ab80c1f6a4272c38fd8fc0e5f75bb92d10f4e
+EBUILD ucommon-6.0.3.ebuild 1619 SHA256 ffa2d55a0f1e241a7a1927b31511a256d2391c1843439007646a2bdff5ec2041 SHA512 1b729a606f880139c730266b64597c5dcd1c40cdb16b87bb8817f21ab16eba387c1d3333285a4ec9c48b73df1a81d95d71283d3828e957c70ccda915333230e2 WHIRLPOOL 2f6a49dae570879289390a1e2d714081a2131fd49ddc8f78b7ba9cfdf7d988a02b21000c9e317715eb25d8d035e101f12d3ee48987f11978726a3f633e2c69fd
+MISC ChangeLog 3149 SHA256 bf4357290d91f4da179e1c254ebe4de37111e4e9431a05930f5b733c4ab68cd1 SHA512 40d3f30b17565d26b34c6969545745b2c605d7f6697a26aeac34a132102f643d31b5faf7f02bc8cf05bd93187c7b626f515859c8abdfa33ffaa7a3d23d52bebe WHIRLPOOL c421e5cee9048f4afd63eb19eeedaa469a15d2600ea4444589db85c1a5ddace182eecee50730afd9dc8fcbfe6f65302703d6117b132151e18393f43eb6d6ef6b
MISC metadata.xml 438 SHA256 a8ececfa37303e2e3822d69cacd23567fb9813b6fb0f319b08b6676808a26484 SHA512 c39973823d63c3506f0f572f4187aa000fa57dca64d96d3d5f5baf9b0e00bed2f1cc6fd116fff8e802b71bdfefbf527d6bf99051ad23136d9b6f91be6db55451 WHIRLPOOL 24719f9882adcf8bed378d899117a817b678f6b79623db49b9a833bc85cadb240f31ff61c0fc798772e7395ec9b3df9dfeeb27a7c47cde7a91a34a883e95a050
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCgAGBQJRLJWFAAoJELp701BxlEWfB60P/jqdCfiEzqlcK3F8j4uKJvUN
-0yDdDP8hS/JuY0nd+ZllNScmXPF3IRWS/9DOVDe29IWBQB4tj4U2NrbFoPM/UFE+
-B2zq7qzgkE/aGhjxCBwxl72FvEkwduArYo+xPC3MIT03paISLWkI1XVbCb+ElU5Y
-gWWAcfSWmuCpmu+d7N7q4O+xtStYaiJTAi5puCIRDR42VOKiRnZVxC1cE2t32/+S
-ChNkLgZtzMuKJvN3Jkg60KKwp6eNqg8s5L6VWT4g4QCCveIbzIBK9ECN5GsKV4YV
-DYjvW9fq7LXsqg6cSlwjR29DDmDK8B9mmT9f47osoJBHFqnxqEvhdkFsanwWJxQb
-CYGX+H6mdFN4vrBvCnHnrYXW8PyPJzk6CU+z2SmGw6Ap5sezHclgCNbGRstNK6Qa
-jsfbtGVHWgdPD5oS6t6CYVz3IXbqbhMPVY4xeJZrJVAb8L7pZl0uPBmrxmHAs2tD
-/NrgdB59fo+57eovuSQPE1eoe/4XrSWdASfjiQcrCdvdDKTiDF5TqmZTLWOloJnz
-IV9T1C7yyU2SbCeEMsws3P8hFQGkIiNq8UKGInns4QoVG1l4rhyXGUynHt9LuXPV
-f0faeNuI6Mp0iKc80O8K4vCCdZ2L5XqJcPi+4/ka1xLLSIx4Eu+HNgghfhi4GWfl
-k1X9nCrhHt4EnEHXd0Pr
-=eWCs
+iQEcBAEBCAAGBQJRfMydAAoJEAmJmMX429reTzEIAIvY2QELEotcDEAY7Jai2NZY
+DaDM7llTSVDnHPzq1BkpSFr/lKgjyzDaz2Vp62DQ1pmizWFCeyfWh9rKrDrq19n+
+fXRoerxYd/UsspPXy6vuqgJEdDuO3xUgyv5t+ppvMJsVLOag1R3JdUQXyO3ksQ0V
+CneUdL+WT1SX/UDYG7WaRPl3QShTk8yC47dM1/CfEwhSSkzI9Lbn3O6of9RkZ7on
+DJBaoiZJcdo9un5gUGmmBCznRJu0OVWF1m82ZbNPnyRU6k1UjkevBDgovhqP+LKK
+N9fRuPhl1aP7RS3KyW2uSU+fI2lkhwmHeRk65ZRh+SR+GXFIXcU4fUb44VNlJEU=
+=WyY7
-----END PGP SIGNATURE-----
diff --git a/dev-libs/ucommon/ucommon-5.5.0.ebuild b/dev-libs/ucommon/ucommon-5.5.0.ebuild
deleted file mode 100644
index a306568f23a4..000000000000
--- a/dev-libs/ucommon/ucommon-5.5.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-5.5.0.ebuild,v 1.1 2012/11/26 18:05:54 maksbotan Exp $
-
-EAPI="4"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="http://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug ssl gnutls"
-
-RDEPEND="ssl? (
- !gnutls? ( dev-libs/openssl )
- gnutls? (
- net-libs/gnutls
- dev-libs/libgcrypt
- )
- )"
-
-DEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )
- ${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch
- "${FILESDIR}"/install_gcrypt.m4_file.patch
- "${FILESDIR}"/gcrypt_autotools.patch )
-
-#"${FILESDIR}/${P}-address.patch"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
- local myconf=""
- if use ssl; then
- myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
- else
- myconf+=" --with-sslstack=nossl ";
- fi
-
- local myeconfargs=(
- $(use_enable socks)
- $(use_enable cxx stdcpp)
- ${myconf}
- --enable-atomics
- --with-pkg-config
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
- use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
- autotools-utils_src_install
- if use doc; then
- dohtml doc/html/*
- fi
-}
diff --git a/dev-libs/ucommon/ucommon-6.0.0.ebuild b/dev-libs/ucommon/ucommon-6.0.0.ebuild
deleted file mode 100644
index c5a923b20745..000000000000
--- a/dev-libs/ucommon/ucommon-6.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-6.0.0.ebuild,v 1.1 2012/11/26 18:05:54 maksbotan Exp $
-
-EAPI="4"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="http://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug ssl gnutls"
-
-RDEPEND="ssl? (
- !gnutls? ( dev-libs/openssl )
- gnutls? (
- net-libs/gnutls
- dev-libs/libgcrypt
- )
- )"
-
-DEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )
- ${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch
- "${FILESDIR}"/install_gcrypt.m4_file.patch
- "${FILESDIR}"/gcrypt_autotools.patch )
-
-#"${FILESDIR}/${P}-address.patch"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
- local myconf=""
- if use ssl; then
- myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
- else
- myconf+=" --with-sslstack=nossl ";
- fi
-
- local myeconfargs=(
- $(use_enable socks)
- $(use_enable cxx stdcpp)
- ${myconf}
- --enable-atomics
- --with-pkg-config
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
- use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
- autotools-utils_src_install
- if use doc; then
- dohtml doc/html/*
- fi
-}
diff --git a/dev-libs/ucommon/ucommon-6.0.3.ebuild b/dev-libs/ucommon/ucommon-6.0.3.ebuild
index 3c49c8564c00..1ed6422c1fea 100644
--- a/dev-libs/ucommon/ucommon-6.0.3.ebuild
+++ b/dev-libs/ucommon/ucommon-6.0.3.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-6.0.3.ebuild,v 1.3 2013/02/26 10:59:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-6.0.3.ebuild,v 1.4 2013/04/28 07:14:41 maksbotan Exp $
-EAPI="4"
+EAPI="5"
AUTOTOOLS_AUTORECONF=1
@@ -34,9 +34,16 @@ PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch
"${FILESDIR}"/install_gcrypt.m4_file.patch
"${FILESDIR}"/gcrypt_autotools.patch )
-#"${FILESDIR}/${P}-address.patch"
AUTOTOOLS_IN_SOURCE_BUILD=1
+src_prepare() {
+
+ # Aclocal 1.13 deprecated error #467674
+ sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
+
+ autotools-utils_src_prepare
+}
+
src_configure() {
local myconf=""
if use ssl; then