Bump and add socket patch

Package-Manager: portage-2.2.0_alpha188
RepoMan-Options: --force
This commit is contained in:
Mario Fetka 2013-11-22 17:01:27 +01:00
parent 98adf64843
commit 5e17ec7e58
6 changed files with 90 additions and 94 deletions

View File

@ -2,6 +2,13 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $Header: $
*log4c-1.2.4 (22 Nov 2013)
22 Nov 2013; Mario Fetka <mario.fetka@gmail.com> +log4c-1.2.4.ebuild,
-files/log4c-fix-m4-quoting.patch, -log4c-1.2.1.ebuild,
files/log4c-socket.patch:
Bump and add socket patch
22 Nov 2013; Mario Fetka <mario.fetka@gmail.com> +files/log4c-socket.patch, 22 Nov 2013; Mario Fetka <mario.fetka@gmail.com> +files/log4c-socket.patch,
log4c-1.2.1.ebuild: log4c-1.2.1.ebuild:
Add Socket support Add Socket support

View File

@ -1,6 +1,5 @@
AUX log4c-fix-m4-quoting.patch 440 SHA256 418e27de9eb35bc57cb7852cf2fec90213d36deeb2cf8be270a635e8d19b5b13 SHA512 34f4c66dfbc2f7b5f85289006b697a5e052768d9ad7d6ee380bf2f6b45cb7bae214b7d4366dc9313d3dbe2d76d5bc417e77cf43b771ec9173c2c5b0797837056 WHIRLPOOL 08d67b138c01f34c0b247549969081691be06ad09f3d1a1089229447c8926193abea48b9b0f5b91567bd660dbdffe2b27f5a3cbd0bb1d6da3810ceefa87f9614 AUX log4c-socket.patch 35592 SHA256 7b214c0b9ecc9d5d2e751c01913a590c70662e455b8f39982d60ce82008d35d4 SHA512 54c86d315c5ee49162a876b137c807d4c07c1af9e0ef11f26187bfece0dcb6f6281dcd09701cc4da9b03d357d6fbe85831fb56fd43b5adf9e71736a1a37ffa0f WHIRLPOOL bb033c55ed188d0f11fa7fa6250b27a4ead271f5f8c45a4a556f0af82230f1b11a3331b2bbd4d8d1dd52856f588c1928f259bca39a45e8fdcf374cac0c565d5f
AUX log4c-socket.patch 35781 SHA256 977ce6d892e05f2042a815bf6f857f023183f3137ec946f588b3219b0de37777 SHA512 365e483f370650fcaf874f30a07f35d4c283aca7b0b4eea8b0cf6f78f3510b7865b3ab088ffbf83a69e219cfeeca3df36628228679a8c66425c93399c71dfff8 WHIRLPOOL 8be3a1654204af867b741559a941e62eaefa3092bf4f4768d255da4e85bae12ba9aaf423c4db64f791aa921c7460e346d749582649433ace0d6ce171c9007646 DIST log4c-1.2.4.tar.gz 559789 SHA256 5991020192f52cc40fa852fbf6bbf5bd5db5d5d00aa9905c67f6f0eadeed48ea SHA512 bd66029183b545de6b46b803e128735c5b57af0ca7f8a0a1f1655565920778993362e3187ffbe9b4b5e85dbf4c700b7d1f1dd4d1a636bcb20bfdb71fc73d37ca WHIRLPOOL 30e90b35d1ccc9fd4687cd761fe99f9933cb17ad75c97c3c140c1e794b696aea0caf643dde434b7c90555c821eebb59b1874f8a61d4d26896bd71739816c5812
DIST log4c-1.2.1.tar.gz 508139 SHA256 6ed40a41307c26d052667e1661437394ab00e29cd24ff2640b502ba8ab1e442b SHA512 d8a5122df4d0afcff4880464ca58afa0661db3c60242c8ed1d034acf217f642bf9db0b0601ee07e832195408a8fa2ee8be61e9ee3f6ab59834bb13ec8598d0fd WHIRLPOOL 3a5f7e682f5f1a0f2cb073a8c242c01b94df55791e361a8781177acf631adce30a86732718a8a618f72c2a34f096d1522ea9c208547123684327a6ac0b1a0d49 EBUILD log4c-1.2.4.ebuild 1237 SHA256 9f29bfee3951f3979ac90ceb680b325f8bffe7313a8672ead9cc73e0fe882b53 SHA512 a73b809690e4348c904635713634a652ac4860ca2563e473f423c9943f83dc52a66625d7504f884490df35583836f45ad6790ced41acf524a1178b5ed8fc24c3 WHIRLPOOL 8bc9b46ad7289f51b240b9f63cafa48580007d6e74d2919a349a86b29d63ed398d45e14a5765c53d3c625493e1f1f1b028e8703283fdc7a2a92bf3db4425eaa4
EBUILD log4c-1.2.1.ebuild 1074 SHA256 ac684aa99616cdc8f2624d15c9edfd50cf6eaf65c21724a19d6e2b39b52414fe SHA512 6a57ea58d6edf8732cb78fd02d07d4de4f3e8a6986872a28b6cf7997eb9bdf86b25f7523eb85e6c4a90250ed9ab608472ee571bfff1d7c0b06ca8283586bb4a9 WHIRLPOOL bbabf2539034fc1458ba0af1ff9c4dbfafb6afdcf293d43de098fbb2e1b34d374f1ff43428f7f19685cf138d5d63af977228627df16d1b9ff686cdd7a60be974 MISC ChangeLog 608 SHA256 c330f246c44701bd263c1d165034a36e321d478f6fe790f0e17f15c495c58152 SHA512 5a4862f15fa59bab2304c350f4f4273ab14a464d8b9848dc1fdbb2a972dde9cdad97bbf6a7cd4f7467ecc5d9b682cd10bcf7ab12ef1ba5e105a6d71492e642ef WHIRLPOOL e316b03672f5ba32865af49bd1acafff6af284c841cceda55fa2a0f522323806389c8629f512b6a10eda49d6abdba9d217041e96e78188086010d6cbb7215737
MISC ChangeLog 393 SHA256 a421197900e10785217b0301fac1dd9bd105b360f68bf932a88f6d48fc72cb11 SHA512 c761277c0e58e2a7568ed463d7b38372be9631e3930266ef41c32f0f55affc2fbfa81a5565e7d058e1fb031d3f8a1af7b4b30e7188cedd3fee87aaadf3172f6a WHIRLPOOL 01238f871c96c60803f8810bfd6010cf83088f502f9a00ffd8a67d90f6a02ead8ab93e947a0800b2ec208a3f0d6f79de3f9efa265e8407737f5229422b917533
MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9 MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9

View File

@ -1,13 +0,0 @@
Index: log4c-1.2.1/log4c.m4
===================================================================
--- log4c-1.2.1.orig/log4c.m4
+++ log4c-1.2.1/log4c.m4
@@ -4,7 +4,7 @@
dnl AM_PATH_LOG4C([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for LOG4C, and define LOG4C_CFLAGS and LOG4C_LIBS
dnl
-AC_DEFUN(AM_PATH_LOG4C,
+AC_DEFUN([AM_PATH_LOG4C],
[dnl
dnl Get the cflags and libraries from the log4c-config script
dnl

View File

@ -25,34 +25,6 @@ index a4b49dd..0e2993a 100644
##################################### #####################################
# Enable test compilation if required # Enable test compilation if required
diff --git a/src/log4c/Makefile.am b/src/log4c/Makefile.am
index f9f5882..c14dac9 100644
--- a/src/log4c/Makefile.am
+++ b/src/log4c/Makefile.am
@@ -22,10 +22,14 @@ liblog4c_la_SOURCES = \
category.c
if WITH_ROLLINGFILE
- liblog4c_la_SOURCES += appender_type_rollingfile.c \
+liblog4c_la_SOURCES += appender_type_rollingfile.c \
rollingpolicy.c rollingpolicy_type_sizewin.c
endif
+if WITH_SOCKET
+liblog4c_la_SOURCES += appender_type_socket.c
+endif
+
if WITH_MMAP
liblog4c_la_SOURCES += appender_type_mmap.c
endif
@@ -48,6 +52,7 @@ pkginclude_HEADERS = \
layout_type_basic_r.h \
layout_type_dated_r.h \
layout.h \
+ appender_type_socket.h \
appender_type_stream.h \
appender_type_stream2.h \
appender_type_syslog.h \
diff --git a/src/log4c/appender_type_socket.c b/src/log4c/appender_type_socket.c diff --git a/src/log4c/appender_type_socket.c b/src/log4c/appender_type_socket.c
new file mode 100644 new file mode 100644
index 0000000..9ce215e index 0000000..9ce215e
@ -1167,3 +1139,26 @@ index 0000000..db9afe4
+ +
+ return(0); + return(0);
+} +}
diff --git a/src/log4c/Makefile.am b/src/log4c/Makefile.am
index f9f5882..c14dac9 100644
--- a/src/log4c/Makefile.am
+++ b/src/log4c/Makefile.am
@@ -33,6 +33,10 @@
rollingpolicy.c rollingpolicy_type_sizewin.c
endif
+if WITH_SOCKET
+liblog4c_la_SOURCES += appender_type_socket.c
+endif
+
if WITH_MMAP
liblog4c_la_SOURCES += appender_type_mmap.c
endif
@@ -58,6 +62,7 @@
layout_type_dated_r.h \
layout_type_dated_local_r.h \
layout.h \
+ appender_type_socket.h \
appender_type_stream.h \
appender_type_stream2.h \
appender_type_syslog.h \

View File

@ -1,48 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit eutils autotools
DESCRIPTION="Log4c is a library of C for flexible logging to files, syslog and other destinations."
SRC_URI="mirror://sourceforge/log4c/${P}.tar.gz"
HOMEPAGE="http://log4c.sourceforge.net/"
SLOT="0"
LICENSE="LGPL-2.1"
KEYWORDS="~x86 ~sparc ~ppc ~amd64"
IUSE="doc static pic expat debug"
DEPEND="doc? ( >=app-doc/doxygen-1.2.15
virtual/tex-base
virtual/ghostscript )"
RDEPEND=">=media-gfx/graphviz-1.7.15-r2"
src_prepare() {
epatch ${FILESDIR}/log4c-fix-m4-quoting.patch
epatch ${FILESDIR}/log4c-socket.patch
eautoreconf
}
src_configure() {
econf --enable-test \
$(use_with expat) \
$(use_with pic) \
$(use_with amd64 pic ) \
$(use_enable static) \
$(use_enable debug) \
$(use_enable doc) || die
}
src_test() {
# test case broken
#${S}/tests/log4c/test_rc || die "test_rc failed"
"${S}"/tests/log4c/test_category || die "test_rc failed"
}
src_install() {
emake DESTDIR="${D}" install || die
}

View File

@ -0,0 +1,56 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.2.1.ebuild,v 1.2 2010/11/04 17:35:26 fauli Exp $
EAPI=2
inherit eutils autotools
DESCRIPTION="Log4c is a library of C for flexible logging to files, syslog and other destinations"
HOMEPAGE="http://log4c.sourceforge.net/"
SRC_URI="mirror://sourceforge/log4c/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 x86"
IUSE="debug doc examples +expat +pic static"
RDEPEND="media-gfx/graphviz
expat? ( dev-libs/expat )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
src_prepare() {
epatch ${FILESDIR}/log4c-socket.patch
eautoreconf
}
src_configure() {
local myconf
myconf="${myconf} --disable-expattest"
econf \
$(use_enable doc doxygen) \
$(use_with pic) \
$(use_with amd64 pic ) \
$(use_enable static) \
$(use_enable debug) \
$(use_enable expat) \
${myconf} || die "configure failed"
}
src_compile() {
emake || die "make failed"
}
src_install() {
emake DESTDIR="${D}" install || die "install failed"
dodoc AUTHORS ChangeLog NEWS README TODO
if use examples; then
insinto "/usr/share/doc/${PF}/examples"
doins -r examples/*
fi
}