version bump fix #548672

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

4 files changed, 125 insertions, 14 deletions

diff --git a/sys-cluster/csync2/ChangeLog b/sys-cluster/csync2/ChangeLog
index b625aa7fda28..d35e32f03443 100644
--- a/sys-cluster/csync2/ChangeLog
+++ b/sys-cluster/csync2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/csync2
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/ChangeLog,v 1.38 2014/08/10 20:20:29 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/ChangeLog,v 1.39 2015/05/12 16:41:49 ultrabug Exp $
+
+*csync2-2.0 (12 May 2015)
+
+  12 May 2015; Ultrabug <ultrabug@gentoo.org> csync2-1.34-r2.ebuild,
+  +csync2-2.0.ebuild:
+  EAPI bump, version bump fix #548672
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> csync2-1.34-r2.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/sys-cluster/csync2/Manifest b/sys-cluster/csync2/Manifest
index 844f7b476077..4734f5ae8f6a 100644
--- a/sys-cluster/csync2/Manifest
+++ b/sys-cluster/csync2/Manifest
@@ -5,13 +5,15 @@ AUX csync2-1.34-gnutls.patch 8226 SHA256 aecfc03ca63ee4842b762ca856782dd0193aa39
 AUX csync2.initd 607 SHA256 eed3f72bdff8e15af8cf76fc3f0179dbfa6a8c9c49213089633a9daf01a5ab7c SHA512 ce29430fd74ca49d91494dc757fbec06e6b745acfd7e8e449fa514c63e2cc02e400f0ac652c932560ab212f0054cae4d8b8aecfa7082b1ccd96df3082f295e08 WHIRLPOOL 988d2725320b0a9983a44997c3c0de467f24500b9ce9dbbd85cf9d01f1d00c9d132543fcbfb8471b1eade3fc5ed412907fd48cbcba0644f85151a820236b6f82
 AUX csync2.xinetd 388 SHA256 c281d7e494088abd84ef09b5487482cfa886f12aa0ab717f4cb579b729cc7ee9 SHA512 538bb8fc5b6b667a8afd708fbb35c9b1e98967cf0c1e5b139cdd15a19305000fd7fb7eab564131eb7cf3f562ba9189b08a06061aa31ef64e8e85ca13d6f3d583 WHIRLPOOL 35896b35309fd8f99e938d592db2a4f9c3d348bd065e0e9428d9d0f1c3073b5992e77cc04c7655cefbde80cc079b049230dd483ef862b411239a71e5b18c99e8
 DIST csync2-1.34.tar.gz 222765 SHA256 32b250dd4a0353f71015c5c3961174b975dd5e799e4a084e8f6d00792bd8c833
-EBUILD csync2-1.34-r2.ebuild 2750 SHA256 53dd9d9be0546db8a04dc73c6d2461f4bdf4455db3f30fa64d35a48fae546d80 SHA512 3be6ee1241f27d3da5b935c7476c4e6bfcf1e44b7e57e43ffc71f54f1b5320014da34c2bc927145b73e75d4f9ab105efdf5ea70a779b9da2a5babea372cbbdd0 WHIRLPOOL 7093a9e2e177c16ea574c85b22f20bc4d35a97446f89529f017eb722501ceea869b2cd62bd959caaac626b1ac88fb9147083442c843da3b9c505168deb62a8e4
-MISC ChangeLog 5573 SHA256 c9621cb7050f68cef6d86bca42cf38521d9edfb8a3801892b9fe5da7914cf7f2 SHA512 ed8f163e33ddeccbed687fd91914fa0f9189fa61f20465082445201b49cbced8b77d49f897f499089b2c0c0d6457319695fb8abc9a847147181c3a5938f0f58a WHIRLPOOL f487c70943c6919100c1247e538a86c3557776364bb206c10689044ac6a401554ef42a022a6066ba5cf0e6e5839ccb058ba092f2971d52fb3aabe734947bc587
+DIST csync2-2.0.tar.gz 411013 SHA256 11cb37380fb185bce0c22b804fec9b01c385d9d83cc528cfd48d748453834fa2 SHA512 f91fd222f67affe9634471d341b43ff67854a6ed25b620301a454e98a79a9fb80b2a66eb8713546758fd08300d52751e5ca7472c696daa20ee11779b87a830f8 WHIRLPOOL 6cbe49b5dd36d455d2c2b15089cc8e766aa3f9ebc2d5ebbd0528379123ae280850972b07279075a38dc328391633bd63f1a5dc8a2403b1d4faac295e27d1d920
+EBUILD csync2-1.34-r2.ebuild 2724 SHA256 03bbc1495e2472decffff74b3969f3d3b5c0f22c176b250a26635433cd513ab1 SHA512 ff6bd4e589673d722a904123d812ff392fbea821bfaadae8fe39d11565ffda95de9847e717302485b3b31a27249790ba51fe84cfa6b2ef608c7a55d703a68a7c WHIRLPOOL b6d1f93189415293d60775495f0b6468a88096921b5e4992a51a12d70e73f264ceb28879df081c63ff08c52cdf9767df422884d6d79ff58438c6345a2f63df3f
+EBUILD csync2-2.0.ebuild 2656 SHA256 a00f9badaf4475eb99d8e647874957757731d32adc7c722b1a9532aba6d505ac SHA512 60cd6edd49d873099b923289523500c54d2fc25fbd5e22cf34bfda11f620a2402cdd5ac16d3f79a23bdf8c5e16e3c57f0b84ac9432e8c6bdd092d9c0807a91ea WHIRLPOOL a8edf311d64970f591f464c592d16b86f7ccd1a758f26b7db390b989f992107b23feecdbb57a8b661d573344aadea6c3408799a90eea688ca8e2a9699a0514d2
+MISC ChangeLog 5732 SHA256 9102443bce33cda80af9a3e7f7ca9be41943ce14b4c640fc01707ee834ad2d70 SHA512 71a714b6c0bda2132da7a446db20217077949309d2f663715e214eded9f09b774b76c4eefdf83f3c29cc5f84dbfe2b2af7887a3fed58a1ba85db573366ef65f1 WHIRLPOOL 4d5bf700ccb7216923fae7bdf92736aac4d2e804d0f6d8c7ed166c84be1d45a13de2e4fd2aeaaf6ace1a45ed38e69eb618cba2a502d984418db8c8765b56c370
 MISC metadata.xml 161 SHA256 fb0c2b5d458c0b9e6cae1b1cf1c80137c4b23c54e657343370b7d293fb29ecce SHA512 f3e07a100754c87015a67a1dd5e71686adbaf25281054a74ec21cb342a2440c010b30eb7d3d813a2504ea2b6d0330ac32511f11b583df1c519d579ad2b6f0c6a WHIRLPOOL c13246d1d1357f83c01bfb11b06c0bfe565c741b971d846363d44579f974fc1cb7b29470627460f6fc4d62eff22056b98cae11bfd497e5a20dfb566abd46c6d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn1A4ACgkQcaHudmEf86rE1QCfc+UUWYVfHzY5EQiYKXoljtsj
-nYsAnjCgvgCvMaDwEVGgqneDW3QGm8JT
-=7knh
+iF4EAREIAAYFAlVSLU4ACgkQKiQSS7ZY+hMmPgEAo11p3TBTYi6vj4aNnO466QRo
+cbXVxpGAU3Ku0P+1RQ4BAJL2iIH2B3a9GhULsIStxWh+N/Tpn0QPcbvSKV5dPZ1S
+=xbPJ
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/csync2/csync2-1.34-r2.ebuild b/sys-cluster/csync2/csync2-1.34-r2.ebuild
index 247045d8c8bd..eda9a231a4d0 100644
--- a/sys-cluster/csync2/csync2-1.34-r2.ebuild
+++ b/sys-cluster/csync2/csync2-1.34-r2.ebuild
@@ -1,8 +1,8 @@
-# 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/sys-cluster/csync2/csync2-1.34-r2.ebuild,v 1.5 2014/08/10 20:20:29 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.34-r2.ebuild,v 1.6 2015/05/12 16:41:49 ultrabug Exp $
 
-EAPI=2
+EAPI=5
 
 inherit autotools eutils
 
@@ -39,18 +39,18 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	if use xinetd ; then
 		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/${PN}.xinetd ${PN} || die
+		newins "${FILESDIR}"/${PN}.xinetd ${PN}
 	fi
 
 	keepdir /var/lib/csync2
 
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO csync2_locheck.sh || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO csync2_locheck.sh
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/csync2/csync2-2.0.ebuild b/sys-cluster/csync2/csync2-2.0.ebuild
new file mode 100644
index 000000000000..bd4c54f2b73d
--- /dev/null
+++ b/sys-cluster/csync2/csync2-2.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-2.0.ebuild,v 1.1 2015/05/12 16:41:49 ultrabug Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Cluster synchronization tool"
+HOMEPAGE="http://oss.linbit.com/csync2/"
+SRC_URI="http://oss.linbit.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="mysql sqlite ssl xinetd"
+
+RDEPEND=">=net-libs/librsync-0.9.5
+	mysql? ( virtual/mysql )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	ssl? ( >=net-libs/gnutls-2.7.3 )
+	xinetd? ( sys-apps/xinetd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+SLOT="0"
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${P} \
+		--localstatedir=/var \
+		--sysconfdir=/etc/csync2 \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable ssl gnutls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/${PN}.xinetd ${PN}
+	fi
+
+	keepdir /var/lib/csync2
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+	if use xinetd; then
+		echo
+		einfo "After you setup your conf file, edit the xinetd"
+		einfo "entry in /etc/xinetd.d/${PN} to enable, then"
+		einfo "start xinetd: /etc/init.d/xinetd start"
+	fi
+	echo
+	einfo "To add ${PN} to your services file"
+	if use ssl; then
+		einfo "and to generate the SSL certificates,"
+	fi
+	einfo "just run this command after you install:"
+	echo
+	einfo "emerge  --config =${PF}"
+	echo
+	einfo "Now you can find csync2.cfg under /etc/${PN}"
+	einfo "Please move you old config to the right location"
+	echo
+	einfo "To start csync2 as a standalone daemon, simply run:"
+	einfo "/etc/init.d/csync2 start"
+	echo
+}
+
+pkg_config() {
+	einfo "Updating ${ROOT}/etc/services"
+	{ grep -v ^${PN} "${ROOT}"/etc/services;
+	echo "csync2  30865/tcp"
+	} > "${ROOT}"/etc/services.new
+	mv -f "${ROOT}"/etc/services.new "${ROOT}"/etc/services
+
+	if use ssl; then
+		if [ ! -f "${ROOT}"/etc/${PN}/csync2_ssl_key.pem ]; then
+			einfo "Creating default certificate in ${ROOT}/etc/${PN}"
+
+			openssl genrsa -out "${ROOT}"/etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null
+
+			yes '' | \
+			openssl req -new \
+				-key "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
+				-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
+				&> "${ROOT}"/dev/null
+
+			openssl x509 -req -days 600 \
+				-in "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
+				-signkey "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
+				-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem \
+				&> "${ROOT}"/dev/null
+
+			rm "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr
+			chmod 400 "${ROOT}"/etc/${PN}/csync2_ssl_key.pem "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem
+		fi
+	fi
+}