Bump corosync-2 series for testing

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

5 files changed, 41 insertions, 73 deletions

diff --git a/sys-cluster/corosync/ChangeLog b/sys-cluster/corosync/ChangeLog
index b76570a439eb..19535cce35f7 100644
--- a/sys-cluster/corosync/ChangeLog
+++ b/sys-cluster/corosync/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/corosync
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/ChangeLog,v 1.23 2012/07/11 08:30:55 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/ChangeLog,v 1.24 2012/10/29 13:41:52 ultrabug Exp $
+
+*corosync-2.1.0 (29 Oct 2012)
+
+  29 Oct 2012; Ultrabug <ultrabug@gentoo.org> -corosync-2.0.0.ebuild,
+  files/corosync-2.0.0-docs.patch, -files/corosync-2.0.0-rpath.patch,
+  +corosync-2.1.0.ebuild:
+  Bump corosync-2 series for testing, drop the old one
 
 *corosync-1.4.3-r1 (11 Jul 2012)
 
diff --git a/sys-cluster/corosync/Manifest b/sys-cluster/corosync/Manifest
index e9da2269a0ca..06f167d18051 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -1,8 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX corosync-2.0.0-docs.patch 1012 SHA256 21ccccd742b7d07182550e30cc402b45f3123d9bf7d27e8a5991cc0a1948406f SHA512 fe3b3718bac56a206e9eee82d6c2bc5502111fcc56e4aa4bc46c0560a14d7b986e4f8194a06c41fc935371283e99e0d13d521e41aa76356027160e27e68fe503 WHIRLPOOL de99b4dabcee0733c690cdcf355cb2fcc48479fea50ae256fad3b3d00012e1b196cd17edc43db360d05d51ed3dd73255fc7cb825ed99aee64d2f199b5521da65
-AUX corosync-2.0.0-rpath.patch 1152 SHA256 6c0d6968a4bb07e4e49df7c12018f5cb9941c094dd471fab5234770c1001aa36 SHA512 cb2aa3411d73d93e8d68157667a973633ef7b78a459767d23e00d8f015ccc188375026676a07bf6378a926cc47bd9b6d1228464e0477a2116fd285823e450bc1 WHIRLPOOL a2592c9d9dd932a46344e0b3e00949f01382b087e0831b4e5e3cc3581c6db5d632c3175c1e9547f14528125292b41cb97f262d45a2533218c988370dd0439d1a
+AUX corosync-2.0.0-docs.patch 1238 SHA256 505575c1025f46249fdedd8e46d0ae756da59f57f63bf42b2e3af78aa5f4e962 SHA512 d6c1a5e6c0ccef07b5748e5ec4fa6dd9f76c162b71d679ec809b3986e53ec30934ea4cf569d461c4f284f45588a5bf0ed63fe9618083f18f5be7d876d2139bd6 WHIRLPOOL 87422b99d0cf870cf93400e662813c1d9b5e6fb1249132752efb08b7d13f2ad10a03fcc7d37d4f616abdd9dba87a42b2957ad4e9975da0282794164a9fa4fa71
 AUX corosync-docs.patch 1022 SHA256 0c988b55ea471d9c413c0143d2a523a683a324c23de5dd82bcba62676eea6857 SHA512 49f8b19cbfd5f0b1f0f927a7aa8cd2f0ad24ff958cf2baf06e8a9d87858fa01cf3656ba05189a085e265a2d8b1b320ca7f18b3a4d405d73ff05f1876ebe14960 WHIRLPOOL a2a54277d91e378cf2eec7b2385de4773815a109e425c41f725255424ec1bcd03bbc6bc7dedb7db6293e46dc5b5a2c7cf093b818085b02beed2ddaa616a71d77
 AUX corosync.initd 601 SHA256 8e5a18febe55a08b8b5be80ca2e3b81cdf961784d7a2f246b9064825d3a847bc SHA512 be5ec458f8eb234eb01ba1023e59b35f967f0833fd8097eb8f9b5e9d172fe3beffc6ea3d15dd57f1b76ab7b90cdfccdb4868962488d4af573e70c55baf021a65 WHIRLPOOL e0ee597ca61c378fc93fcb4470220973643356de56668dffca46fefd307958efcca90be300dca440519af7d740c1e70b961b98a01f7f07cc7d1a499bd4240cb0
 AUX corosync.logrotate 93 SHA256 97ce0519c66e04936ff110ef530a73c7c6b48fa34a8cb8c178c2120daf67db6c SHA512 3c65eb01a33a6fa51befa8ce466cc8a35a06a19816b77610b83c18f9372dccdbd33354fc8568e63fe165f2c2aa598b6a5d15615939f12e3385b4c3e1b91a6ec3 WHIRLPOOL bf7ae7ac7e483ef89cce813dabbd7c89c14b3dfd531b285ea643cad32c698b1069ee923d9ce5938bfae51e3a7273ef2722e5a291ea29bd567fe8c9e16d00b885
@@ -10,18 +9,18 @@ DIST corosync-1.3.0.tar.gz 683458 SHA256 4f9e399befcb595a1671f7ddb54dbf53e1faad6
 DIST corosync-1.3.3.tar.gz 699140 SHA256 4f9680eada51f10df5b654d3fd7b1f9543d295506365a4f243a9ca2c7e38e76d SHA512 c9997236e385ffd37cce881f7d9e400f0c3cdbe3a8e569c56da96323fdd3b1ae9dae29b866b9a0b2cdc71e24cebf57c333bee442c8b0d2e655df090caa7650ee WHIRLPOOL 215e9019049a5543d7a2adfef07ea3d53ae740a4b6070fddf4ac78dc44f5df8a78b1573b286b419726761addf2657d3ffc7983625cdaa093b6d07112b0d1e174
 DIST corosync-1.3.5.tar.gz 698897 SHA256 7177914dff0ee16ace7a93f566c4fab06ea79400886d4d095e105a4b6bae1cd1 SHA512 74920fed67af72517076d5a85688f59f3ef81b4aa773147a96f58cbd57b3b150365b7eea4ef14c4e43c0961d9d9939d734526318b1af462e22329077a0cdbc3e WHIRLPOOL 1b66ec3caafb3623335f1eb6f8dedb04d54baffff5e26531319f4fcd9e69b7ec4d186118da2919eda6fa96edd5769a35e11cf258e4ad64fda504c465001753f3
 DIST corosync-1.4.3.tar.gz 729503 SHA256 c88fbfc14cd0ff8fba24833fa43b54cf8380fbd8106b9d7e70458e72d36ad169 SHA512 a90fa0956dd84b3a9456f1e40084c95ae23698d7bacbcb6a35c100711c494b955830ffe9903e8b8651cc00d47cf0a96797b82451674205fc84479aeee55365d1 WHIRLPOOL edc6ab9e042d16b63cd306e0141f27426491cb5c8e52522d8f644560eacf4cc9498679b070487405c3dcd96f35bc9a6269eb00f98b010a6025c7c40b49f069dd
-DIST corosync-2.0.0.tar.gz 719492 SHA256 44eecc8bd190dfcb3eb340f87f91c085f87a242588059a270b0e25c23c06f1aa SHA512 244fbbc7945df19a8dbc18c723b37c0eb3f5267b6c021e1f2d06a48252773f631f219fdb3720bf0c26133455f226056e362a78a90a9355663eccce0664bc5ab7 WHIRLPOOL 23a868e2ba6d36b2f2584d9a53ac3ab944111a0ce09f31c02733c3ded33c382bdc1899e11b4a27191c3a6311e4aa8c1979c7e644a6166aa0b769817e314848bb
+DIST corosync-2.1.0.tar.gz 395855 SHA256 c3beaac2d792ab7d4802b0421c9377aa4e58665ecb20d4b047a4742978070db4 SHA512 6c545522dc6f984e77a90ac7a7be2338efb6ec9d6347cc92bf5f67d73a23a5ea11dcfbc1e1e967368b0139d067ffae2ce3f5753d623cab33fa57d943655e5f6b WHIRLPOOL f4a7b9732d7cca137052e5218b8403352857bc1facd67c50c43c65440889e8810a8e7933ec6ab4c383b0a5285336af90a14aa826c2c0a306b9438c3174241982
 EBUILD corosync-1.3.0.ebuild 1338 SHA256 bf11adc6b068aa96e98c3d101f72f0e8f3eae32fe815387dbfbca87422648b7f SHA512 4774079348070c284ce8e5d7ce554522dfc52929c562cc78f9911db1b110a6c45e7fec16339821958a4b511d8fa42f8e9e7181ac853042e4705d10f57e5d1e77 WHIRLPOOL 1f2e490e70cb6b7a4317f9ff131972c998b4614151b134420dcf1b411a50e415a547aaddca827a07d79f3056c526dc993c0c807d2da32aeba8ca67e1374e8477
 EBUILD corosync-1.3.3-r1.ebuild 1416 SHA256 a57de5834103a358677080d126f0b9db339f563bd07e2c4e82618dc0ea66e990 SHA512 94a7378f61dc443d9ab0181542ef9f04d73698d81d447adbd2048cdbe26b08155c02e1417f328b141fde8fedfa259a9291e91559844776d34c2129c0023d54cc WHIRLPOOL 3c27af61447b0e33b1420950026bcd1d6d24c204b8540e46417f5f1236dd56f8d2819f83db07989c5111e4f2f06e95375d2b15e111d2154c0dc595f93d376909
 EBUILD corosync-1.3.5.ebuild 1415 SHA256 25c6f8f04565027c60dc013157b4c63912c2f5f4fd34395db13dbbcee01974f4 SHA512 3ca0dfd2b1539f0b4da20835a53ee7caf890e7c189628e80af5f7a5fad0e3e9a8ac740411c0a28dc0d47c2e86fc5df98a3021bbbd2b31a8770d9a19b34e66998 WHIRLPOOL cb01b56596dc34ce9c9b9f6e47dd3a9e1e5cba756a19591537c3cd67ad3560a26b21acc3259d56b75707b9f6472d0922708538938dbc164192d184f9573d0853
 EBUILD corosync-1.4.3-r1.ebuild 1464 SHA256 b38b71ca5b710a0c2f82541f60cbaee58e95366f577e247f05591ef7b96a14e4 SHA512 ef8e9f5b61abc3618d4ff0ac835766880a630131cb79f441cee2381df6c0dddbbaf99caf3c978d40e1639b4533a7d3a5bbbc87a04d9f3747a85c1756b48c1378 WHIRLPOOL a5e0d51727ce8c76079508780a18d0877e2aacf74ee99e1e7beeeb33b5556ea135f86597fadbc22bc5835f365d32cf1faaf872dd633b3f88aeeb6b32f4f23529
-EBUILD corosync-2.0.0.ebuild 1792 SHA256 ff11fbf9fa363412b0d0efcc0fde111298db8849f00ab7c6eebc4e7788a2d8fa SHA512 fa9d33a1618154c4d073b50589546834f2b02563994f0c2b39c1cdf58de44fe9872578021091fbc62bdac45e26655f88572c1cc76bc7187aaff27f35a2a8e2d7 WHIRLPOOL 933740f1090d7646853593d6b7694481b2cafa896ee3e5103aebeed0adf3a1a6b7164d47ebd07ff89e5907c7ebb69ae7febd9bc3d68deee9f8ce948273103663
-MISC ChangeLog 3937 SHA256 718d0367b97a2f161e62beb87349d6d239fa93dcc1639ddcca4fc68edea7d7dc SHA512 2c6dafaa07eadde930fe1cb1706c1f3fbbd8c0ba0106f46e81ecfcfe549cbd1736b303f01dec7ebe64237c79f6f3ffd26b0c21e30926d60618dd2fdb124a4ea2 WHIRLPOOL bf986ba353bbb5e0f4f314b16fdd533d056a8982f7748f16c526111759c7ecc3f03e8b3ff36989384c9b9aaf54e67c5ae9fa924e1be1ab2995554bb7e7fe4c07
+EBUILD corosync-2.1.0.ebuild 1765 SHA256 86cdbeaec7d41e232e563d512aae6e642b397eb42af54cb7e89f0eb880c2b501 SHA512 e47a49e99453e15a04eb1df097d7d511acfc382264ef2c820c4d1a466673193b76bc848c983e50dc6f5275171d0720e27edcb3823d911f586442de5a93a7eff3 WHIRLPOOL 81457af4befc98908559d46bd7dd1be704651e8728a6f6dc5dd631525c1e7333ed26683be05778230b7a6a5ad0624da8e04c8953f84ba6f2ff563f8896bce726
+MISC ChangeLog 4190 SHA256 2c4ae63a3cef6407b38eceb0511d7ae4055047525d2a1d1a8f7b4a02582fc4f8 SHA512 685cd6547b1ecaa130fd5aa366b6b430aa92a7fcf488c991a73886cc80861d033a5a3e8ce1a75fcfec2596dbec5b37ac1f7bf857b9325c192f418d9bcd5170c9 WHIRLPOOL 48c32b568a23246e727eacfc117fc07a3eb96235c99e8be609c1d16874e031454c5073959172eb01c18256a31dd1af81a7bc660c128779cad0b1b96ea99ae2f3
 MISC metadata.xml 439 SHA256 c42c0a4842cfe519184bc5f0ed1a67e0d08957add7f680a3112c17d6f7aabb14 SHA512 9840d4948e84c3a98a7dafe2909648a529d735f3a9297912e4c044439035ff8ed4be3848787f41d5a868e94a9c6137ab6efaf38a84c7373084ba76ec1272b5a5 WHIRLPOOL 2940d8c05e9b0ade0ea3d00e17fd632998f0d46274864c140de8dd49ff25a5fa0bafb3fb54427be9ff366546a82a69e2905e5587655e97d05b9aaac76ad9af04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/9OckACgkQKiQSS7ZY+hMoPAEAk73UnBq5/G2dr6eAEZXRDPFO
-+1RlDWJEMNy7ZCtH6wABALpJPh+5UMPMD1beZKB2WxrJKPUVpyWZ1rDWo67b++ka
-=uIID
+iF4EAREIAAYFAlCOh6YACgkQKiQSS7ZY+hMdlwD+Mi2RZ7/z2eNTP+oTgzNSO98N
+fkvSSzQgP0CtmrF9+HUA/2PBI+IquZgIsvoom0/oNZ4SO4lzIegXkawbtAL7Oi+e
+=kQoW
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/corosync/corosync-2.0.0.ebuild b/sys-cluster/corosync/corosync-2.1.0.ebuild
index 2cc94852e3e7..e9811d3a7e66 100644
--- a/sys-cluster/corosync/corosync-2.0.0.ebuild
+++ b/sys-cluster/corosync/corosync-2.1.0.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-2.0.0.ebuild,v 1.1 2012/05/16 12:39:47 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-2.1.0.ebuild,v 1.1 2012/10/29 13:41:52 ultrabug Exp $
 
 EAPI=4
 
 inherit autotools base
 
+MY_TREE="1706129"
+
 DESCRIPTION="OSI Certified implementation of a complete cluster engine"
 HOMEPAGE="http://www.corosync.org/"
-SRC_URI="ftp://ftp:${PN}.org@${PN}.org/downloads/${P}/${P}.tar.gz"
+SRC_URI="https://github.com/corosync/corosync/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD-2 public-domain"
 SLOT="0"
@@ -32,13 +34,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( sys-apps/groff )"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-docs.patch"
-	"${FILESDIR}/${PN}-2.0.0-rpath.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-2.0.0-docs.patch" )
 
 DOCS=( README.recovery SECURITY TODO AUTHORS )
 
+S="${WORKDIR}/${PN}-${PN}-${MY_TREE}"
+
 src_prepare() {
 	base_src_prepare
 	eautoreconf
@@ -54,14 +55,10 @@ src_configure() {
 		$(use_enable infiniband rdma)
 }
 
-src_compile() {
-	# Fix parallel compilation problem with libcmap
-	MAKEOPTS="-j1" base_src_compile
-}
-
 src_install() {
 	default
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	rm "${D}"/etc/init.d/corosync-notifyd || die
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/${PN}.logrotate ${PN}
diff --git a/sys-cluster/corosync/files/corosync-2.0.0-docs.patch b/sys-cluster/corosync/files/corosync-2.0.0-docs.patch
index 68de1f1b546d..66eacb821e5e 100644
--- a/sys-cluster/corosync/files/corosync-2.0.0-docs.patch
+++ b/sys-cluster/corosync/files/corosync-2.0.0-docs.patch
@@ -1,19 +1,17 @@
-Make docs optional
-
---- configure.ac
-+++ configure.ac
-@@ -432,7 +432,7 @@
- fi
+--- a/configure.ac	2012-10-29 14:34:48.200093085 +0100
++++ b/configure.ac	2012-10-29 14:37:05.997077034 +0100
+@@ -591,7 +591,7 @@
+ INCLUDE_DIRS="$INCLUDE_DIRS -I\$(top_builddir)/include/corosync -I\$(top_srcdir)/include/corosync"
  
  # final build of *FLAGS
--CFLAGS="$ENV_CFLAGS $OPT_CFLAGS $GDB_FLAGS $OS_CFLAGS \
-+CFLAGS="$ENV_CFLAGS $OS_CFLAGS \
- 	$COVERAGE_CFLAGS $EXTRA_WARNINGS $WERROR_CFLAGS $NSS_CFLAGS"
- CPPFLAGS="$ENV_CPPFLAGS $ANSI_CPPFLAGS $OS_CPPFLAGS"
- LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"
-@@ -458,7 +458,10 @@
- AC_SUBST([DARWIN_OPTS])
- AC_SUBST([SOLARIS_OPTS])
+-CFLAGS="$ENV_CFLAGS $lt_prog_compiler_pic $SEC_FLAGS $OPT_CFLAGS $GDB_FLAGS \
++CFLAGS="$ENV_CFLAGS $lt_prog_compiler_pic $OS_CFLAGS \
+ 	$COVERAGE_CFLAGS $EXTRA_WARNINGS \
+ 	$WERROR_CFLAGS $NSS_CFLAGS $LIBQB_CFLAGS \
+ 	$SNMP_INCLUDES"
+@@ -616,7 +616,10 @@
+ AM_CONDITIONAL(AUGTOOL, test -n "${AUGTOOL}")
+ AC_SUBST([NSS_LDFLAGS])
  
 -AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}")
 +AC_ARG_ENABLE([doc],
@@ -23,14 +21,14 @@ Make docs optional
  
  AC_SUBST([LINT_FLAGS])
  
---- Makefile.am
-+++ Makefile.am
-@@ -46,8 +46,6 @@
- 			  config.guess config.sub missing install-sh \
- 			  autoheader automake autoconf test_lense.sh
+--- a/Makefile.am	2012-10-29 14:34:48.200093085 +0100
++++ b/Makefile.am	2012-10-29 14:37:16.236853385 +0100
+@@ -48,8 +48,6 @@
+ 			  autoheader automake autoconf test_lense.sh \
+ 			  autoscan.log configure.scan ltmain.sh
  
 -dist_doc_DATA		= LICENSE INSTALL README.recovery SECURITY TODO AUTHORS
 -
  SUBDIRS			= include common_lib lib exec tools test cts pkgconfig \
- 			  man init conf
+ 			  man init conf qdevices
  
diff --git a/sys-cluster/corosync/files/corosync-2.0.0-rpath.patch b/sys-cluster/corosync/files/corosync-2.0.0-rpath.patch
deleted file mode 100644
index 4cca805066d8..000000000000
--- a/sys-cluster/corosync/files/corosync-2.0.0-rpath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -49,7 +49,7 @@
- 
- EXTRA_DIST		= $(bin_SCRIPTS) corosync-xmlproc.sh corosync-notifyd.sysconfig.example
- 
--COMMON_OPTS		= -L../lib -L../common_lib -Wl,-rpath,../common_lib
-+COMMON_OPTS		= -L../lib -L../common_lib
- 
- corosync_cmapctl_LDFLAGS= $(COMMON_OPTS)
- corosync_cmapctl_LDADD	= -lcorosync_common -lcmap $(LIBQB_LIBS)
-@@ -57,10 +57,10 @@
- corosync_fplay_LDADD	= $(LIBQB_LIBS)
- 
- corosync_cfgtool_LDFLAGS= $(COMMON_OPTS)
--corosync_cfgtool_LDADD	= -lcfg $(LIBQB_LIBS)
-+corosync_cfgtool_LDADD	= -lcfg -lcorosync_common $(LIBQB_LIBS)
- 
- corosync_cpgtool_LDFLAGS= $(COMMON_OPTS)
--corosync_cpgtool_LDADD	= -lcfg -lcpg $(LIBQB_LIBS)
-+corosync_cpgtool_LDADD	= -lcfg -lcpg -lcorosync_common $(LIBQB_LIBS)
- 
- corosync_quorumtool_LDFLAGS = $(COMMON_OPTS)
- corosync_quorumtool_LDADD   = -lcmap -lcfg -lquorum -lcorosync_common \
-@@ -68,7 +68,7 @@
- 
- corosync_notifyd_CPPFLAGS = $(DBUS_CFLAGS)
- corosync_notifyd_LDFLAGS  = $(COMMON_OPTS)
--corosync_notifyd_LDADD    = -lcfg -lcmap \
-+corosync_notifyd_LDADD    = -lcfg -lcmap -lcorosync_common \
- 			    $(LIBQB_LIBS) $(DBUS_LIBS) $(SNMPLIBS) \
- 			    -lquorum
-