diff --git a/app-editors/gobby/Manifest b/app-editors/gobby/Manifest
index eff66c0d911b262594f43ca7b5cf619a148c277b..ad1234625f69dc9b6228c1fe38d437f85e236081 100644
--- a/app-editors/gobby/Manifest
+++ b/app-editors/gobby/Manifest
@@ -1,7 +1,8 @@
-AUX gobby-0.4.94-gtkmm3.patch 6815 SHA256 52cd2897eb8835879653d4d5430e50aaa05360d3c59b4649d2ea77ae7dd9f133 SHA512 991afce432a5ff273ff99dbf4d002895f7948e9b4c25b30406ec33aa5f2e05c51eca0082bfd0ca117c280499af1d02f1b8d030e2399a334417b545c9c07345a0 WHIRLPOOL 8db03d50d3707d297877c537604d52b55c3f9ffe65caf879986baa78997f60aa3bf96cffc774b784dc61dc368b4ac2d1e3d6ed39c689b0309d03f430c7d7ae9e
-AUX gobby-0.4.94-gtksourceview38.patch 795 SHA256 5df85c22afa047ed1137c588d73061ebf646367cd80109d28cd2dad1cd25f88a SHA512 928c6e655e6d81fd6e94a45d652324f99ffc8d3b3072cbea90d216db71b097c20824809e2907e9a905dfea5a221409c68ccd6911313f177ea7482c8f9222e709 WHIRLPOOL c35871d587e8bfae2467641ead5c5f67a447f1fd50244bf283ba131cde6429c4a0d8cc45d55c45b9bd9799578ea390af389eb4300bcbd520eb67c94b09177dad
-AUX gobby-0.4.94-includes-preferences.patch 766 SHA256 516180a13715b72dbb0ce0f457e5b13a8c1c9105f292f263aa14661335e92cc6 SHA512 38e53393401e3b74ead18d228473fe2e67cd820190a78fd5483168ae9124cc54a0d09f187cebb3c74a03ada9d2841b6215d8b4fd4be84d0e2530bd51f02c8013 WHIRLPOOL 447a8a01dcaab6259841e8933a535359ac9513bf37a19cf5983a2daf150afc5a401af7baf69c861266f5790f4775bb6e551a3876506dc3d6ff23a876c0431736
-AUX gobby-0.4.94-includes.patch 1654 SHA256 1f8aef22b10420c8157c6d1174f951c2c92be1ee671cccbb8b8bc336838a8fa7 SHA512 6af1245344b6e526569e67716f0091a97b8a9312b99fb321a84e5d3f95ff986e6ca0a2b34001992cd81656b03fbd74df9578524a6c45b8ea35ef0640e2db684c WHIRLPOOL 9120e52cef57a42717446c0a9df59c6c778309ef7a1facaa56d8cf0a7c13d3035ed102d6679d9cfc7f0035980714a61573acb67b36235ee0d0b25cb13598c314
-AUX gobby-0.4.94-missing-icon.patch 1446 SHA256 310cd1909e218468b78157b87314a75f031c6d1f3e2bca209a59f8b7463ac824 SHA512 899157ed212dc10318e01a3f9d7c7a860ad15884a1012d51957fa7ef174feb208e77d81f9f3cda9f4e90c29f2843fae355603fa009836d7a16ec97027859d1c7 WHIRLPOOL 14c001e9c81b9c71a162e5d709a3633de99b547e0e0d5a041b6750e764ad279b5535dc08cf233f0ad93b1f3418e402702e005bc48cd90a36b92a3f286cb9fcf9
-DIST gobby-0.4.94.tar.gz 645815 SHA256 b9798808447cd94178430f0fb273d0e45d0ca30ab04560e3790bac469e03bb00 SHA512 62089e4f21c3eb6d822b7e240f694473b3f5b1585ddc3e42593503d68f8058645b04be137eb70a59c841b766f69791cbdfcfd82be1c9d126fca0ffd49ee7fe07 WHIRLPOOL 519d8b3ff8dacb3749a157c2fd641b33122751fe28ad0bc35ea5bb0cb6096dbbb89072799d14a1c2ee53a029a8f3f12b496052f27ffccc87cfa9ae6fc011dd02
-EBUILD gobby-0.4.94-r2.ebuild 1342 SHA256 d116df1b62288f86608d6c08f1e4404d87905eb6952dd1a4267d07ea93ac0ec0 SHA512 2294748d04befd2d7c1f823c76e19ae171d2981e010d41ad7d9d37d6d9862aad84fe3bff2f5bba79116934c160824814a7cc89bfb519254bc9df97425571ac26 WHIRLPOOL a3de3b7d256a8860f1e00c333aff989287c2db195b8d8dc8bf12d15bda1c4cf6697e6131de35911f4e23f83f83db3dee4d672b993a111a50d4e7b80b430144be
+AUX gobby-0.4.94-gtkmm3.patch 6815 BLAKE2B 615be9c1baa55d0f8e101feffea600acf2a70cf7f709030b3bed3074fd63bf2704f6bc3a3b0d3835fda9378bf4fb5ff111add09ad6acba205bcc1bd0c3715a4f SHA512 991afce432a5ff273ff99dbf4d002895f7948e9b4c25b30406ec33aa5f2e05c51eca0082bfd0ca117c280499af1d02f1b8d030e2399a334417b545c9c07345a0
+AUX gobby-0.4.94-gtksourceview38.patch 795 BLAKE2B 2d7b96bfb69fc507f215a20f0572acbef49961372898e438fee208ac50d70d085a0ccc0a83f771cd262aca1e89aa2493050cf5acc70ad04dc62bf2f36da22f4e SHA512 928c6e655e6d81fd6e94a45d652324f99ffc8d3b3072cbea90d216db71b097c20824809e2907e9a905dfea5a221409c68ccd6911313f177ea7482c8f9222e709
+AUX gobby-0.4.94-includes-preferences.patch 766 BLAKE2B 076f45f1f716704253b3d8c0544fbea4e9699d32fd13d2f8e60c14cfc359a82d1800124565a29f52ed264bf31fd53ad6b142893c36712b4f77d0f2da8fe0cdf2 SHA512 38e53393401e3b74ead18d228473fe2e67cd820190a78fd5483168ae9124cc54a0d09f187cebb3c74a03ada9d2841b6215d8b4fd4be84d0e2530bd51f02c8013
+AUX gobby-0.4.94-includes.patch 1654 BLAKE2B 4f6d40efc95972c25c407b12ca2838a7d149defb895299d82eb28fcc87af36cf19e120be9551bcf097a64b57a2ff14ed79cc3301170cefa0152ec1291026604d SHA512 6af1245344b6e526569e67716f0091a97b8a9312b99fb321a84e5d3f95ff986e6ca0a2b34001992cd81656b03fbd74df9578524a6c45b8ea35ef0640e2db684c
+AUX gobby-0.4.94-missing-icon.patch 1446 BLAKE2B aaaf0ec52c38e2ce5afa8f49f45c73ed70764397c0be273157aa8aea3ddbf0c18dd7fe1369585568d9403e119f50a5aae0ad6a6b14c302197b9cd7eba6545519 SHA512 899157ed212dc10318e01a3f9d7c7a860ad15884a1012d51957fa7ef174feb208e77d81f9f3cda9f4e90c29f2843fae355603fa009836d7a16ec97027859d1c7
+DIST gobby-0.5.0.tar.gz 765305 BLAKE2B 6ec623c2cee927d59ef0875ad9d97a981ad99e4ebd43dc4261a75f0cae3b9c88e4a2e1b2a3c26cdd4ad6f3b73bb81efedcb71d3a223cd46544156a5966a5637d SHA512 0410fc80696568a59355cbdbd5aee01a73e6087179ad608e87cd98fd250ec6c780b5efe44fe2f74081c71ea3267cd425e73ab22abbc182cd69ac28e827efe2dc
+EBUILD gobby-0.5.0.ebuild 1078 BLAKE2B ff75ca76ef6a6528c1a8fa9316449b0d94fa6e4f83974174650f59132757f195f499d1bb45506115a3d473ba9c63e9e75d2d6bb06f0fc2a95546af0fb8f0f624 SHA512 c77261b1cdc947bf5de6eea95e6dc48ae83f8e9ccece5754ddeb2253aba4fad54fff591259ff5f9e9d3bd81d40675c24085ad65cf334493141aee7c906615fbe
+MISC metadata.xml 325 BLAKE2B 184a704d08c8259944f1028e564169b839ee29e53254d9f431f8682d648090014e86b29dc01cc650e920163d82089fca10e8db42f860346fbcf94bcdd9f014a8 SHA512 d22d3d2f1ef70f21dab65d6455f0f2e4a21d9229fe9556d656684c3c3dc11af280376c5a6e41552215f04928f44c3675a1e8072fbfbc8f45f0adcb0a00fd1f83
diff --git a/app-editors/gobby/gobby-0.4.94-r2.ebuild b/app-editors/gobby/gobby-0.5.0.ebuild
similarity index 53%
rename from app-editors/gobby/gobby-0.4.94-r2.ebuild
rename to app-editors/gobby/gobby-0.5.0.ebuild
index 7fb06259971a5b87b0521096ee1128d5755e9460..d43cf22ff612363b45757fd6bac4542b68c89cdd 100644
--- a/app-editors/gobby/gobby-0.4.94-r2.ebuild
+++ b/app-editors/gobby/gobby-0.5.0.ebuild
@@ -1,45 +1,41 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gobby/gobby-0.4.94.ebuild,v 1.3 2012/11/21 08:50:09 xarthisius Exp $
EAPI=5
inherit eutils gnome2-utils toolchain-funcs
DESCRIPTION="GTK-based collaborative editor"
-HOMEPAGE="http://gobby.0x539.de/"
+HOMEPAGE="https://gobby.github.io/"
SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0.5"
KEYWORDS="~amd64 ~x86"
-IUSE="avahi doc nls"
+IUSE="avahi doc +gtk3 nls"
RDEPEND="dev-cpp/glibmm:2
- dev-cpp/gtkmm:3.0
+ gtk3? ( dev-cpp/gtkmm:3.0 )
+ !gtk3? ( dev-cpp/gtkmm:2.4 )
dev-libs/libsigc++:2
- >=net-libs/libinfinity-0.4[gtk,avahi?]
- x11-libs/gtk+:3
+ gtk3? ( net-libs/libinfinity:0/0.6[gtk3,avahi?] )
+ !gtk3? ( net-libs/libinfinity:0/0.6[gtk,avahi?] )
+ gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( x11-libs/gtk+:2 )
dev-cpp/libxmlpp:2.6
- x11-libs/gtksourceview:3.0"
+ gtk3? ( x11-libs/gtksourceview:3.0 )
+ !gtk3? ( x11-libs/gtksourceview:2.0 )"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? (
- app-text/gnome-doc-utils
+ >=app-text/gnome-doc-utils-0.9.0
app-text/scrollkeeper
)
nls? ( >=sys-devel/gettext-0.12.1 )"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-missing-icon.patch \
- "${FILESDIR}"/${P}-gtkmm3.patch \
- "${FILESDIR}"/${P}-includes.patch \
- "${FILESDIR}"/${P}-includes-preferences.patch \
- "${FILESDIR}"/${P}-gtksourceview38.patch
-}
-
src_configure() {
- econf $(use_enable nls) \
- --with-gtk3
+ econf $(use_enable doc scrollkeeper ) \
+ $(use_enable nls ) \
+ $(use_with gtk3 )
}
src_install() {
diff --git a/app-editors/gobby/metadata.xml b/app-editors/gobby/metadata.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cb08bee511d98090338d7a68e54951c4dc3c8cf1
--- /dev/null
+++ b/app-editors/gobby/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ megagreener@gmail.com
+ megabaks
+
+
+
diff --git a/net-libs/libinfinity/Manifest b/net-libs/libinfinity/Manifest
new file mode 100644
index 0000000000000000000000000000000000000000..42674fd62bc0ba2bc841c1c74962f7d232c09844
--- /dev/null
+++ b/net-libs/libinfinity/Manifest
@@ -0,0 +1,7 @@
+AUX infinoted.confd 395 BLAKE2B 74c3e1867db538ada0b721621cc03691deb2e15fb987771110a689d136c9c8c9dc199ae319204e962d46b6af3055f19d1d1c19beaedf0e240e3ae6c9a0a8f03a SHA512 c2c68e2af841699c33d71acfad6efd3034f4944b25a56bc912fd117590d8e8862684ed061065ebeb0de0c18cb75a9abdeeb997cd785abca4c5278f53a51cae95
+AUX infinoted.initd 533 BLAKE2B 24c3a750bf86ac716281dcebdb3f190d44ba5fcf6fdf066c481a61eb91e1d26beedeef2ac856800b90d7e7b5aacd6e6535f211464a0b3c8b615d3160217e4ec7 SHA512 d66fd8c754b5cbb0983d72c3dd13323176905cc475b3afaac21c75d2b9e5c2121faf0fc99daebec69644594bc9bd93a1ccd826cc1def96c0cd973c35de3c4ec1
+DIST libinfinity-0.6.8.tar.gz 1965208 BLAKE2B bc9f8b0a7604fccfa6819ce4d18db65ea1150a94c60cf55b080b785a03294200718a8fd84a6912f423faed68dad2146fd568bdf20439b7fde985d5b7beba1cda SHA512 33c3a01e51484309216e8dde9b5a704df479113c5b28c335a51913163b0a21da498bd5d5794d757e38ff846b11e4412c4e88b3697bf3005373815cd62a503b7b
+DIST libinfinity-0.7.1.tar.gz 2054876 BLAKE2B 5fb8823988daf30aa8f25dba4011a70f9719e4b5b82f8f74b17a84287f5139c7588dfc83e84586999161420827b3a32a7eecd743e655c14f6fc5cf24483e29fa SHA512 9391b50bd303aaa6fc58f64720eaec6e7fd61e033d1b3321646872ee30651a35b7e9f1475b6d31316041c4805574b720db03a40783b1b27983f7f46f8b7aa20d
+EBUILD libinfinity-0.6.8.ebuild 1835 BLAKE2B 564ab388dac4ac2f35665b54c77eb2f22ba7733219ac7d01e5bac7cb59cfbb78a566942de9b381c47cdf03a41b97bdd087e66d3d757e53fd7b96bbc877ddb846 SHA512 4a02ad614fc7f9640b4641932f2a1b8fa87b9c7a8df3a548995562d41f3f81ab5d78e76e1b3213558d5a0cf23d8ee0395d6c41e0ab8e62dfbc7a94d24dd7e186
+EBUILD libinfinity-0.7.1.ebuild 1833 BLAKE2B c175ddfef97d40bee330b12c687124f9d3d7a59d41daf0665ec2fd96f2cec3fe607488b6475495ab0eb03e35ddef42f6da517cde78dda9b5cb71ea7131b9d281 SHA512 2c3f9366faed478755244a50278bc1807bead3d1b9fc50547f2b219718cb11291c59ab3a399031b5d20b400b70d98cbf55d76e1ac336f9f58812c7ab1cd21692
+MISC metadata.xml 356 BLAKE2B f27beb1f39803e5107d5b983379a8ff76b40078836328a8d702b833e544d18792c701333b85b70aadc17c1c7ce7e092380f6f0308953d4f5fa7d002988f1da2a SHA512 e2ba0e12f575e322e141652d8648b225cec574a70534a6c92e7b4c4cde836912433aaf5699f7a297713db508affe58e05c016cf4a5f9bc85ce25a84063bc2d84
diff --git a/net-libs/libinfinity/files/infinoted.confd b/net-libs/libinfinity/files/infinoted.confd
new file mode 100644
index 0000000000000000000000000000000000000000..81e62a4d951505d46336893e25a0f41709700c6e
--- /dev/null
+++ b/net-libs/libinfinity/files/infinoted.confd
@@ -0,0 +1,12 @@
+# Config file for /etc/init.d/infinoted for Gentoo Linux
+
+USER="infinote"
+GROUP="infinote"
+UMASK="007"
+
+PIDFILE="/var/run/infinoted.pid"
+
+# Please read `infinoted --help` for other options.
+# This is a fast setup for local networks only (maybe not even those),
+# make sure you use appropriate security on untrusted networks.
+OPTIONS="--root-directory=/var/lib/infinote --security-policy=no-tls"
diff --git a/net-libs/libinfinity/files/infinoted.initd b/net-libs/libinfinity/files/infinoted.initd
new file mode 100644
index 0000000000000000000000000000000000000000..dd346d382ca82f871edcf9f12fd051d98849a644
--- /dev/null
+++ b/net-libs/libinfinity/files/infinoted.initd
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting infinoted"
+ start-stop-daemon \
+ --start --quiet --background --make-pidfile \
+ --pidfile /var/run/infinoted.pid \
+ --exec /usr/bin/infinoted \
+ --user ${USER} --group ${GROUP} --umask 007 \
+ -- ${OPTIONS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping infinoted"
+ start-stop-daemon \
+ --stop --quiet \
+ --pidfile /var/run/infinoted.pid
+ eend $?
+}
diff --git a/net-libs/libinfinity/libinfinity-0.6.8.ebuild b/net-libs/libinfinity/libinfinity-0.6.8.ebuild
new file mode 100644
index 0000000000000000000000000000000000000000..efd6e0a136f78516306ebdd5e921939151c66a05
--- /dev/null
+++ b/net-libs/libinfinity/libinfinity-0.6.8.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils eapi7-ver user
+
+MY_PV=$(ver_cut 1-2)
+
+DESCRIPTION="An implementation of the Infinote protocol written in GObject-based C"
+HOMEPAGE="https://gobby.github.io/"
+SRC_URI="https://github.com/gobby/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ http://releases.0x539.de/${PN}/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0/0.6"
+KEYWORDS="~amd64 ~x86"
+IUSE="avahi doc gtk +gtk3 server static-libs"
+
+RDEPEND="dev-libs/glib:2
+ dev-libs/libxml2
+ net-libs/gnutls
+ virtual/pam
+ virtual/gsasl
+ avahi? ( net-dns/avahi )
+ gtk3? ( x11-libs/gtk+:3 )
+ gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+ doc? ( dev-util/gtk-doc )"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md TODO )
+
+pkg_setup() {
+ if use server ; then
+ enewgroup infinote 100
+ enewuser infinote 100 /bin/bash /var/lib/infinote infinote
+ fi
+ #
+ if use gtk && use gtk3; then
+ eerror "You can select either gtk or gtk3, but not both at the same time" && die
+ fi
+}
+
+src_configure() {
+ econf \
+ $(use_enable doc gtk-doc)
+ $(use_with gtk inftextgtk)
+ $(use_with gtk infgtk)
+ $(use_with gtk)
+ $(use_with gtk3)
+ $(use_with server infinoted)
+ $(use_with avahi)
+ $(use_with avahi libdaemon)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ if use server ; then
+ newinitd "${FILESDIR}/infinoted.initd" infinoted
+ newconfd "${FILESDIR}/infinoted.confd" infinoted
+
+ keepdir /var/lib/infinote
+ fowners infinote:infinote /var/lib/infinote
+ fperms 770 /var/lib/infinote
+
+ dosym "${D}/usr/bin/infinoted-${MY_PV}" "${D}/usr/bin/infinoted"
+
+ elog "Add local users who should have local access to the documents"
+ elog "created by infinoted to the infinote group."
+ elog "The documents are saved in /var/lib/infinote per default."
+ fi
+}
diff --git a/net-libs/libinfinity/libinfinity-0.7.1.ebuild b/net-libs/libinfinity/libinfinity-0.7.1.ebuild
new file mode 100644
index 0000000000000000000000000000000000000000..65a051b9b1e48929e84432be058b7ae0997afc65
--- /dev/null
+++ b/net-libs/libinfinity/libinfinity-0.7.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils eapi7-ver user
+
+MY_PV=$(ver_cut 1-2)
+
+DESCRIPTION="An implementation of the Infinote protocol written in GObject-based C"
+HOMEPAGE="https://gobby.github.io/"
+SRC_URI="https://github.com/gobby/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ http://releases.0x539.de/${PN}/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0.7"
+KEYWORDS="~amd64 ~x86"
+IUSE="avahi doc gtk +gtk3 server static-libs"
+
+RDEPEND="dev-libs/glib:2
+ dev-libs/libxml2
+ net-libs/gnutls
+ virtual/pam
+ virtual/gsasl
+ avahi? ( net-dns/avahi )
+ gtk3? ( x11-libs/gtk+:3 )
+ gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+ doc? ( dev-util/gtk-doc )"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md TODO )
+
+pkg_setup() {
+ if use server ; then
+ enewgroup infinote 100
+ enewuser infinote 100 /bin/bash /var/lib/infinote infinote
+ fi
+ #
+ if use gtk && use gtk3; then
+ eerror "You can select either gtk or gtk3, but not both at the same time" && die
+ fi
+}
+
+src_configure() {
+ econf \
+ $(use_enable doc gtk-doc)
+ $(use_with gtk inftextgtk)
+ $(use_with gtk infgtk)
+ $(use_with gtk)
+ $(use_with gtk3)
+ $(use_with server infinoted)
+ $(use_with avahi)
+ $(use_with avahi libdaemon)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ if use server ; then
+ newinitd "${FILESDIR}/infinoted.initd" infinoted
+ newconfd "${FILESDIR}/infinoted.confd" infinoted
+
+ keepdir /var/lib/infinote
+ fowners infinote:infinote /var/lib/infinote
+ fperms 770 /var/lib/infinote
+
+ dosym "${D}/usr/bin/infinoted-${MY_PV}" "${D}/usr/bin/infinoted"
+
+ elog "Add local users who should have local access to the documents"
+ elog "created by infinoted to the infinote group."
+ elog "The documents are saved in /var/lib/infinote per default."
+ fi
+}
diff --git a/net-libs/libinfinity/metadata.xml b/net-libs/libinfinity/metadata.xml
new file mode 100644
index 0000000000000000000000000000000000000000..423a1b1276c61d5827292f7faaa29ff3d1fec077
--- /dev/null
+++ b/net-libs/libinfinity/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ megagreener@gmail.com
+
+
+