gentoo resync : 22.12.2021

3 files changed, 3 insertions, 112 deletions

diff --git a/sys-cluster/csync2/Manifest b/sys-cluster/csync2/Manifest
index 6595a41aa837..df018e6ea18d 100644
--- a/sys-cluster/csync2/Manifest
+++ b/sys-cluster/csync2/Manifest
@@ -1,7 +1,5 @@
 AUX csync2.initd 492 BLAKE2B 99058d692e34d5a9b59cb33726a06b8257ba8644f44ee299fbcb71364331ec213bc229fc89f8c2d3ecd92dc4c58c2ff8a57d28f5fe04daa42ea495abeb218438 SHA512 a189bdc921efb51734e66f8df808289850c6ce5c60c797c85abb7b3063a45630261a32edced1efd23fe367e8e91e4fe69c3d5e44a10d5b95112ae990e26fa916
 AUX csync2.xinetd 388 BLAKE2B ef926697fc0ebbfa15bc764372f88f279e02e6d6f05873d43c541fd057cd659b368486147f45c8d657eec0457d41c7b2af40e580b8ccbfd94f896379031cc08c SHA512 538bb8fc5b6b667a8afd708fbb35c9b1e98967cf0c1e5b139cdd15a19305000fd7fb7eab564131eb7cf3f562ba9189b08a06061aa31ef64e8e85ca13d6f3d583
 DIST csync2-2.0-github.tar.gz 108299 BLAKE2B ec06cf1284adfe63abd6c329deb4e53474d8f97998e4e6f7f6404321a6970f783d38e9feb46c02925c947834227516d40c928a457d2b43bd2b353ab3385fd150 SHA512 7555e2d958d6213e29cfa8b3b7415eea9a9868036865c519d724ae404006d913fba4aeeb61a916d3fc95669a6ca12160d4f52dc7d15bd59403e8a7de50ee8094
-DIST csync2-2.0.tar.gz 411013 BLAKE2B b5c3da3a46168f8b9835e349a8d56070cd0e5aef3b951ba1cfe7e958f6c830336141a2d1eca6a2485d23f745b9ae907d46282aa8cc3078a60582dac8c3f286b8 SHA512 f91fd222f67affe9634471d341b43ff67854a6ed25b620301a454e98a79a9fb80b2a66eb8713546758fd08300d52751e5ca7472c696daa20ee11779b87a830f8
-EBUILD csync2-2.0-r2.ebuild 2816 BLAKE2B bd18884898d747d2017b2c311a8fac8e79c62f4df8d54c71d2a73f1b7540892be42410e777d76fbaa948c9f5a903c07d956b059b4ed124252f4bba097908d853 SHA512 5cadc8acc48136401c6027deda5bb0c7152ee60274a0ef7803a4aa1d836372665c53e9683f7306cab34bcd0596c4e7709232256cc4005d5d2a03be4b2c18b43b
-EBUILD csync2-2.0.ebuild 2728 BLAKE2B 5af758742eef10ff811b5bc7d6fb407dbb5eba3317b685b348052b06381e5529c431aabe88374092d74a1b5334e373ecfeef470c9764cfb081c42411275a9eab SHA512 1539633ead9768601d2609c4a735c063222ba7c96da7694c023adf92828dbb0af6894c23d42df12c1f9f45311136c82a615b9722129de41cb8781d9f1b756a59
+EBUILD csync2-2.0-r2.ebuild 2814 BLAKE2B 8d7ec3b7ec6d2d760b0c3d65ab11f156a9f88b4238a5bbe26a60ef2b53b29865752ac1e6c97c8da1f3346ad136ce5c9acbba5ece61c230cbadb9d9a2c547c2e5 SHA512 2785f85d2eb19f06755e07360eef2a06ebda0acd7afec0e21211b689bff6a1bd24162b1959876576188f85f2eeacccf3ac509bc991ecef2fba2ab75786d4c093
 MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
diff --git a/sys-cluster/csync2/csync2-2.0-r2.ebuild b/sys-cluster/csync2/csync2-2.0-r2.ebuild
index f66a66ac0db5..6f71f731e737 100644
--- a/sys-cluster/csync2/csync2-2.0-r2.ebuild
+++ b/sys-cluster/csync2/csync2-2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/LINBIT/csync2"
 SRC_URI="https://github.com/LINBIT/${PN}/archive/${P}.tar.gz -> ${P}-github.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 IUSE="mysql postgres sqlite ssl xinetd"
 
diff --git a/sys-cluster/csync2/csync2-2.0.ebuild b/sys-cluster/csync2/csync2-2.0.ebuild
deleted file mode 100644
index 727751fad472..000000000000
--- a/sys-cluster/csync2/csync2-2.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~arm x86"
-
-IUSE="mysql postgres sqlite ssl xinetd"
-
-RDEPEND=">=net-libs/librsync-0.9.5
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	ssl? ( >=net-libs/gnutls-2.7.3 )
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-SLOT="0"
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${P} \
-		--localstatedir=/var \
-		--sysconfdir=/etc/csync2 \
-		$(use_enable mysql) \
-		$(use_enable postgres) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable ssl gnutls)
-}
-
-src_install() {
-	# Parallel install fails, bug #561382
-	emake -j1 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
-}