[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/
commit: c89a996083eb1c654d0c4aa661862ef06f26e544
Author: Michael Orlitzky gentoo org>
AuthorDate: Wed Nov 15 00:17:51 2023 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Wed Nov 15 00:24:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c89a9960
net-im/spectrum2: update http -> https in a comment
The bundled OpenRC service file contains a link to my website that can
now benefit from https://
Signed-off-by: Michael Orlitzky gentoo.org>
net-im/spectrum2/files/spectrum2.initd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-im/spectrum2/files/spectrum2.initd
b/net-im/spectrum2/files/spectrum2.initd
index 8a35dbe75bc9..0ab25819804d 100644
--- a/net-im/spectrum2/files/spectrum2.initd
+++ b/net-im/spectrum2/files/spectrum2.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
command="/usr/bin/spectrum2_manager"
@@ -41,7 +41,7 @@ stop() {
# Andrey Utkin (24 Nov 2018)
# Conrad Kostecki (24 Nov 2018)
# We are aware of many security issues caused by careless chowning, see
-#
http://michael.orlitzky.com/articles/end_root_chowning_now_(make_etc-init.d_great_again).xhtml
+#
https://michael.orlitzky.com/articles/end_root_chowning_now_(make_etc-init.d_great_again).xhtml
# We believe none of these issues apply.
# These pidfiles are not read by any privileged process.
# checkpath here chowns only the dir itself and doesn't act recursively.
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/
commit: eb988e1ee07d3d7862e514dc02fb719aac2e2bc1
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Aug 28 19:47:49 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Tue Aug 29 07:48:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb988e1e
net-im/spectrum2: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32494
Signed-off-by: Conrad Kostecki gentoo.org>
.../files/spectrum2-2.1.3-log4cxx-1.0.0.patch | 63 --
1 file changed, 63 deletions(-)
diff --git a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
b/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
deleted file mode 100644
index 852f4ad78027..
--- a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: (newer) Debian log4cxx needs C++17 and used smart pointers.
- This patch just enables C++17 for the build and using smart pointers
- where needed.
-Author: Tobias Frost
-Forwarded: not yet. log4cxx 0.14 will come with some preprocessor macros that
will enable properly gating the new code.
-Last-Update: 2022-11-21
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,7 +2,7 @@
-
- project(libtransport)
-
--set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD 17)
- if(WIN32)
- set(CMAKE_CXX_STANDARD 17)
- endif(WIN32)
a/plugin/cpp/Logging.cpp
-+++ b/plugin/cpp/Logging.cpp
-@@ -26,6 +26,7 @@
- #include
- #include
-
-+#include
-
- #include
- #include
-@@ -100,15 +101,17 @@
- #ifdef _MSC_VER
- root->addAppender(new ConsoleAppender(new PatternLayout(L"%d
%-5p %c: %m%n")));
- #else
-- root->addAppender(new ConsoleAppender(new PatternLayout("%d
%-5p %c: %m%n")));
-+ auto patternlayout = std::make_shared("%d %-5p
%c: %m%n");
-+ auto consoleappender =
std::make_shared(patternlayout);
-+ root->addAppender(consoleappender);
- #endif
- }
- else {
- log4cxx::helpers::Properties p;
-
-- log4cxx::helpers::FileInputStream *istream = NULL;
-+ log4cxx::helpers::InputStreamPtr istream;
- try {
-- istream = new
log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key));
-+ istream.reset(new
log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key)));
- }
- catch(log4cxx::helpers::IOException ) {
- std::cerr << "Can't create FileInputStream logger
instance: " << ex.what() << "\n";
a/tests/libtransport/main.cpp
-+++ b/tests/libtransport/main.cpp
-@@ -23,7 +23,9 @@
- #ifdef WITH_LOG4CXX
- LoggerPtr root = Logger::getRootLogger();
- #ifndef _MSC_VER
-- root->addAppender(new FileAppender(new PatternLayout("%d %-5p %c:
%m%n"), "libtransport_test.log", false));
-+ auto patternlayout = std::make_shared("%d %-5p %c:
%m%n");
-+ auto fileappender = std::make_shared(patternlayout,
"libtransport_test.log", false);
-+ root->addAppender(fileappender);
- #else
- root->addAppender(new FileAppender(new PatternLayout(L"%d %-5p %c:
%m%n"), L"libtransport_test.log", false));
- #endif
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 09e8bc15dde630c0945d3f09cc43c6d5ee9fce0b
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Aug 26 22:43:16 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Aug 26 23:41:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e8bc15
net-im/spectrum2: amd64 stable
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/spectrum2/spectrum2-2.2.1.ebuild
b/net-im/spectrum2/spectrum2-2.2.1.ebuild
index eb862d4dda7c..e9228d551d76 100644
--- a/net-im/spectrum2/spectrum2-2.2.1.ebuild
+++ b/net-im/spectrum2/spectrum2-2.2.1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
REQUIRED_USE="
|| ( mysql postgres sqlite )
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: aaff3dbf02abd44b3b19784d4fa45650850d4b84
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Aug 26 22:43:35 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Aug 26 23:41:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaff3dbf
net-im/spectrum2: drop 2.2.0-r1
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/Manifest | 1 -
net-im/spectrum2/spectrum2-2.2.0-r1.ebuild | 123 -
2 files changed, 124 deletions(-)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 210dd13da88b..ff04b5209c99 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,2 +1 @@
-DIST spectrum2-2.2.0.tar.gz 666281 BLAKE2B
aebf7d90a938ee62e5ae13955343a73c2f8a1484151519f59321b09d958cd49bd7b0914a3dc0a364d2469c691a653003bfc51324b69de38e3c59c9c248b3c672
SHA512
52125dd2b528b45cc814d4c62df6c0c431958dc5953af50731e765129e59a5dabdffd7f55d1709fe9854c81d6874d9549e8560f27b1b18a0af812299ef4c37ff
DIST spectrum2-2.2.1.tar.gz 666509 BLAKE2B
c946cea46d99bd8126ad8270a8a01140d75ff989cf0cc0e2ff19ac830c01df4ad02a296959077f5a56707d509bafe937515f78adf7361a2e261497f5299dfe7d
SHA512
c752f043f337157125da800ec5e5ed41b0f0f2bf8ee91c682a228779754557389469eb58610bef7793a0d68a303260f80a38a1519f61b62ba23e9ac6f399
diff --git a/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild
b/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild
deleted file mode 100644
index 1c68b2e65d48..
--- a/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd tmpfiles
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im;
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
-REQUIRED_USE="
- || ( mysql postgres sqlite )
- test? ( irc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/spectrum
- acct-user/spectrum
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- >=dev-libs/log4cxx-1.0.0:=
- dev-libs/jsoncpp:=
- dev-libs/openssl:=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:=
- >=net-im/swift-4.0.2-r2:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( dev-libs/libpqxx:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2.1.3-log4cxx-1.0.0.patch" )
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
- -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- $(usex irc '-DENABLE_QT4=OFF' '')
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}/tests/libtransport" || die
- ./libtransport_test || die
-}
-
-src_install() {
- cmake_src_install
-
- diropts -o spectrum -g spectrum
- keepdir /var/log/spectrum2 /var/lib/spectrum2
- diropts
-
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
- newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
-
- einstalldocs
-}
-
-pkg_postinst() {
- tmpfiles_process spectrum2.conf
-
- if [[ ${REPLACING_VERSIONS} ]]; then
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "${v}" -lt 2.2.0; then
- ewarn "Starting with Release 2.2.0, the path
for
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: f0041ddafe81399477a1db21b6d5795b1542a1d1
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Jul 23 19:31:24 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Jul 23 19:34:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0041dda
net-im/spectrum2: add 2.2.1
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/Manifest | 1 +
net-im/spectrum2/spectrum2-2.2.1.ebuild | 121
2 files changed, 122 insertions(+)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 04897fd0b2ba..210dd13da88b 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1 +1,2 @@
DIST spectrum2-2.2.0.tar.gz 666281 BLAKE2B
aebf7d90a938ee62e5ae13955343a73c2f8a1484151519f59321b09d958cd49bd7b0914a3dc0a364d2469c691a653003bfc51324b69de38e3c59c9c248b3c672
SHA512
52125dd2b528b45cc814d4c62df6c0c431958dc5953af50731e765129e59a5dabdffd7f55d1709fe9854c81d6874d9549e8560f27b1b18a0af812299ef4c37ff
+DIST spectrum2-2.2.1.tar.gz 666509 BLAKE2B
c946cea46d99bd8126ad8270a8a01140d75ff989cf0cc0e2ff19ac830c01df4ad02a296959077f5a56707d509bafe937515f78adf7361a2e261497f5299dfe7d
SHA512
c752f043f337157125da800ec5e5ed41b0f0f2bf8ee91c682a228779754557389469eb58610bef7793a0d68a303260f80a38a1519f61b62ba23e9ac6f399
diff --git a/net-im/spectrum2/spectrum2-2.2.1.ebuild
b/net-im/spectrum2/spectrum2-2.2.1.ebuild
new file mode 100644
index ..eb862d4dda7c
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.2.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd tmpfiles
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="
+ || ( mysql postgres sqlite )
+ test? ( irc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/spectrum
+ acct-user/spectrum
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ >=dev-libs/log4cxx-1.0.0:=
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:=
+ >=net-im/swift-4.0.2-r2:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( dev-libs/libpqxx:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
+ -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ $(usex irc '-DENABLE_QT4=OFF' '')
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}/tests/libtransport" || die
+ ./libtransport_test || die
+}
+
+src_install() {
+ cmake_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ tmpfiles_process spectrum2.conf
+
+ if [[ ${REPLACING_VERSIONS} ]]; then
+ for v in ${REPLACING_VERSIONS}; do
+ if ver_test "${v}" -lt 2.2.0; then
+ ewarn "Starting with Release 2.2.0, the path
for spectrum2"
+ ewarn "executable helper files has
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 9093d6f25320dc00341caf33c9205a2790c2039a
Author: Conrad Kostecki gentoo org>
AuthorDate: Wed May 24 21:50:26 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed May 24 22:12:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9093d6f2
net-im/spectrum2: amd64 stable
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.2.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild
b/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild
index 90630c5549c1..1c68b2e65d48 100644
--- a/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild
+++ b/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
REQUIRED_USE="
|| ( mysql postgres sqlite )
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: a60bc6d3537bac3c338b82d38cd08546e49700ef
Author: Conrad Kostecki gentoo org>
AuthorDate: Wed May 24 21:50:57 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed May 24 22:12:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a60bc6d3
net-im/spectrum2: drop 2.1.3-r2
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/Manifest | 1 -
net-im/spectrum2/spectrum2-2.1.3-r2.ebuild | 111 -
2 files changed, 112 deletions(-)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 90a758c89a24..04897fd0b2ba 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,2 +1 @@
-DIST spectrum2-2.1.3.tar.gz 666005 BLAKE2B
8356b71506b5489780052eaf404a79f0f760fa3a8d35e80e30730c86b5e4acf21a1ac59fed46e472a1085dc29c6751f2c4e788ad60569bf15b48d198762f2a77
SHA512
b6bf39738998b56c8a90984446740c38547ffdaadaf280d3f4f29cb8a2e168898a7b010eff115394f473fd02c66f30ef383c4a542812d5abd03a87b064b446a8
DIST spectrum2-2.2.0.tar.gz 666281 BLAKE2B
aebf7d90a938ee62e5ae13955343a73c2f8a1484151519f59321b09d958cd49bd7b0914a3dc0a364d2469c691a653003bfc51324b69de38e3c59c9c248b3c672
SHA512
52125dd2b528b45cc814d4c62df6c0c431958dc5953af50731e765129e59a5dabdffd7f55d1709fe9854c81d6874d9549e8560f27b1b18a0af812299ef4c37ff
diff --git a/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
b/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
deleted file mode 100644
index d3bff9c161d8..
--- a/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd tmpfiles
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im;
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
-REQUIRED_USE="
- || ( mysql postgres sqlite )
- test? ( irc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/spectrum
- acct-user/spectrum
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- >=dev-libs/log4cxx-1.0.0:=
- dev-libs/jsoncpp:=
- dev-libs/openssl:=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:=
- >=net-im/swift-4.0.2-r2:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( dev-libs/libpqxx:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2.1.3-log4cxx-1.0.0.patch" )
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- $(usex irc '-DENABLE_QT4=OFF' '')
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}/tests/libtransport" || die
- ./libtransport_test || die
-}
-
-src_install() {
- cmake_src_install
-
- diropts -o spectrum -g spectrum
- keepdir /var/log/spectrum2 /var/lib/spectrum2
- diropts
-
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
- newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
-
- einstalldocs
-}
-
-pkg_postinst() {
- tmpfiles_process spectrum2.conf
-}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: f348d2018cfb6f5da02f90bae94aba694b23cd23
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Apr 22 23:43:37 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Apr 22 23:53:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f348d201
net-im/spectrum2: fix paths
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/{spectrum2-2.2.0.ebuild => spectrum2-2.2.0-r1.ebuild} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net-im/spectrum2/spectrum2-2.2.0.ebuild
b/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild
similarity index 96%
rename from net-im/spectrum2/spectrum2-2.2.0.ebuild
rename to net-im/spectrum2/spectrum2-2.2.0-r1.ebuild
index a06b9471c79a..90630c5549c1 100644
--- a/net-im/spectrum2/spectrum2-2.2.0.ebuild
+++ b/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild
@@ -69,6 +69,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
+ -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-DENABLE_DOCS="$(usex doc)"
-DENABLE_FROTZ="$(usex frotz)"
-DENABLE_IRC="$(usex irc)"
@@ -81,7 +83,6 @@ src_configure() {
-DENABLE_TESTS="$(usex test)"
-DENABLE_TWITTER="$(usex twitter)"
-DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
)
cmake_src_configure
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: a0b85a6bf03edc1b6837179c3c828e40b1c38ed3
Author: Conrad Kostecki gentoo org>
AuthorDate: Mon Apr 10 18:34:28 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Mon Apr 10 18:37:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b85a6b
net-im/spectrum2: add 2.2.0
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/Manifest | 1 +
net-im/spectrum2/spectrum2-2.2.0.ebuild | 122
2 files changed, 123 insertions(+)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index f3c75bead36a..90a758c89a24 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1 +1,2 @@
DIST spectrum2-2.1.3.tar.gz 666005 BLAKE2B
8356b71506b5489780052eaf404a79f0f760fa3a8d35e80e30730c86b5e4acf21a1ac59fed46e472a1085dc29c6751f2c4e788ad60569bf15b48d198762f2a77
SHA512
b6bf39738998b56c8a90984446740c38547ffdaadaf280d3f4f29cb8a2e168898a7b010eff115394f473fd02c66f30ef383c4a542812d5abd03a87b064b446a8
+DIST spectrum2-2.2.0.tar.gz 666281 BLAKE2B
aebf7d90a938ee62e5ae13955343a73c2f8a1484151519f59321b09d958cd49bd7b0914a3dc0a364d2469c691a653003bfc51324b69de38e3c59c9c248b3c672
SHA512
52125dd2b528b45cc814d4c62df6c0c431958dc5953af50731e765129e59a5dabdffd7f55d1709fe9854c81d6874d9549e8560f27b1b18a0af812299ef4c37ff
diff --git a/net-im/spectrum2/spectrum2-2.2.0.ebuild
b/net-im/spectrum2/spectrum2-2.2.0.ebuild
new file mode 100644
index ..a06b9471c79a
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.2.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd tmpfiles
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="
+ || ( mysql postgres sqlite )
+ test? ( irc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/spectrum
+ acct-user/spectrum
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ >=dev-libs/log4cxx-1.0.0:=
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:=
+ >=net-im/swift-4.0.2-r2:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( dev-libs/libpqxx:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.1.3-log4cxx-1.0.0.patch" )
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ $(usex irc '-DENABLE_QT4=OFF' '')
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}/tests/libtransport" || die
+ ./libtransport_test || die
+}
+
+src_install() {
+ cmake_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ tmpfiles_process spectrum2.conf
+
+ if [[ ${REPLACING_VERSIONS} ]]; then
+ for v in ${REPLACING_VERSIONS}; do
+ if ver_test "${v}" -lt 2.2.0; then
+ ewarn "Starting with Release 2.2.0, the path
for spectrum2"
+ ewarn "executable helper files has been changed
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 810593b5b73b328a558695cb9691d39f385d349a
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Apr 1 19:23:20 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Apr 1 19:23:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=810593b5
net-im/spectrum2: drop 2.1.3-r1
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.1.3-r1.ebuild | 110 -
1 file changed, 110 deletions(-)
diff --git a/net-im/spectrum2/spectrum2-2.1.3-r1.ebuild
b/net-im/spectrum2/spectrum2-2.1.3-r1.ebuild
deleted file mode 100644
index fbb5805b03e1..
--- a/net-im/spectrum2/spectrum2-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd tmpfiles
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im;
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
-REQUIRED_USE="
- || ( mysql postgres sqlite )
- test? ( irc )
-"
-RESTRICT="!test? ( test )"
-
-# https://github.com/SpectrumIM/spectrum2/issues/464 for log4cxx version limit
-RDEPEND="
- acct-group/spectrum
- acct-user/spectrum
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- =net-im/swift-4.0.2-r2:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( dev-libs/libpqxx:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- $(usex irc '-DENABLE_QT4=OFF' '')
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}/tests/libtransport" || die
- ./libtransport_test || die
-}
-
-src_install() {
- cmake_src_install
-
- diropts -o spectrum -g spectrum
- keepdir /var/log/spectrum2 /var/lib/spectrum2
- diropts
-
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
- newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
-
- einstalldocs
-}
-
-pkg_postinst() {
- tmpfiles_process spectrum2.conf
-}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: d1261805caff00ce305aaab7d4c5aac10d91a62e
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Apr 1 19:22:40 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Apr 1 19:22:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1261805
net-im/spectrum2: amd64 stable
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.1.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
b/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
index 6913f31eba94..d3bff9c161d8 100644
--- a/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
REQUIRED_USE="
|| ( mysql postgres sqlite )
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
commit: f2af202efb0844fb1dd3b5a00d2865d51ffdeff3
Author: Conrad Kostecki gentoo org>
AuthorDate: Tue Feb 28 20:45:43 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Tue Feb 28 20:46:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2af202e
net-im/spectrum2: add log4cxx-1.0.0 support
Signed-off-by: Conrad Kostecki gentoo.org>
.../files/spectrum2-2.1.3-log4cxx-1.0.0.patch | 63
net-im/spectrum2/spectrum2-2.1.3-r2.ebuild | 111 +
2 files changed, 174 insertions(+)
diff --git a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
b/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
new file mode 100644
index ..852f4ad78027
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
@@ -0,0 +1,63 @@
+Description: (newer) Debian log4cxx needs C++17 and used smart pointers.
+ This patch just enables C++17 for the build and using smart pointers
+ where needed.
+Author: Tobias Frost
+Forwarded: not yet. log4cxx 0.14 will come with some preprocessor macros that
will enable properly gating the new code.
+Last-Update: 2022-11-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -2,7 +2,7 @@
+
+ project(libtransport)
+
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
+ if(WIN32)
+ set(CMAKE_CXX_STANDARD 17)
+ endif(WIN32)
+--- a/plugin/cpp/Logging.cpp
b/plugin/cpp/Logging.cpp
+@@ -26,6 +26,7 @@
+ #include
+ #include
+
++#include
+
+ #include
+ #include
+@@ -100,15 +101,17 @@
+ #ifdef _MSC_VER
+ root->addAppender(new ConsoleAppender(new PatternLayout(L"%d
%-5p %c: %m%n")));
+ #else
+- root->addAppender(new ConsoleAppender(new PatternLayout("%d
%-5p %c: %m%n")));
++ auto patternlayout = std::make_shared("%d %-5p
%c: %m%n");
++ auto consoleappender =
std::make_shared(patternlayout);
++ root->addAppender(consoleappender);
+ #endif
+ }
+ else {
+ log4cxx::helpers::Properties p;
+
+- log4cxx::helpers::FileInputStream *istream = NULL;
++ log4cxx::helpers::InputStreamPtr istream;
+ try {
+- istream = new
log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key));
++ istream.reset(new
log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key)));
+ }
+ catch(log4cxx::helpers::IOException ) {
+ std::cerr << "Can't create FileInputStream logger
instance: " << ex.what() << "\n";
+--- a/tests/libtransport/main.cpp
b/tests/libtransport/main.cpp
+@@ -23,7 +23,9 @@
+ #ifdef WITH_LOG4CXX
+ LoggerPtr root = Logger::getRootLogger();
+ #ifndef _MSC_VER
+- root->addAppender(new FileAppender(new PatternLayout("%d %-5p %c:
%m%n"), "libtransport_test.log", false));
++ auto patternlayout = std::make_shared("%d %-5p %c:
%m%n");
++ auto fileappender = std::make_shared(patternlayout,
"libtransport_test.log", false);
++ root->addAppender(fileappender);
+ #else
+ root->addAppender(new FileAppender(new PatternLayout(L"%d %-5p %c:
%m%n"), L"libtransport_test.log", false));
+ #endif
diff --git a/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
b/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
new file mode 100644
index ..6913f31eba94
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd tmpfiles
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="
+ || ( mysql postgres sqlite )
+ test? ( irc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/spectrum
+ acct-user/spectrum
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ >=dev-libs/log4cxx-1.0.0:=
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:=
+ >=net-im/swift-4.0.2-r2:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( dev-libs/libpqxx:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? (
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 27c3a56fd57df35b906cc4d7342c4157e611ab29 Author: Sam James gentoo org> AuthorDate: Sat Feb 4 21:20:11 2023 + Commit: Sam James gentoo org> CommitDate: Sat Feb 4 21:31:55 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c3a56f net-im/spectrum2: add github upstream metadata Signed-off-by: Sam James gentoo.org> net-im/spectrum2/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net-im/spectrum2/metadata.xml b/net-im/spectrum2/metadata.xml index 6de46eb88c98..14c0f5b599ee 100644 --- a/net-im/spectrum2/metadata.xml +++ b/net-im/spectrum2/metadata.xml @@ -19,4 +19,7 @@ Enables the WhatsApp backend, based on net-im/transwhat. Enables the Twitter backend. + + SpectrumIM/spectrum2 +
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 12b38d88ac7fbd8f098a19ceb59d48117a8e88f0
Author: Sam James gentoo org>
AuthorDate: Sat Feb 4 21:19:38 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Feb 4 21:31:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b38d88
net-im/spectrum2: add subslot dep on log4cxx and depend on old
Fails to build w/ 1.0.0.
Bug: https://github.com/SpectrumIM/spectrum2/issues/464
Signed-off-by: Sam James gentoo.org>
.../{spectrum2-2.1.3.ebuild => spectrum2-2.1.3-r1.ebuild}| 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net-im/spectrum2/spectrum2-2.1.3.ebuild
b/net-im/spectrum2/spectrum2-2.1.3-r1.ebuild
similarity index 92%
rename from net-im/spectrum2/spectrum2-2.1.3.ebuild
rename to net-im/spectrum2/spectrum2-2.1.3-r1.ebuild
index 9578b2864a39..fbb5805b03e1 100644
--- a/net-im/spectrum2/spectrum2-2.1.3.ebuild
+++ b/net-im/spectrum2/spectrum2-2.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,18 +19,19 @@ REQUIRED_USE="
"
RESTRICT="!test? ( test )"
+# https://github.com/SpectrumIM/spectrum2/issues/464 for log4cxx version limit
RDEPEND="
acct-group/spectrum
acct-user/spectrum
dev-libs/boost:=[nls]
dev-libs/expat
dev-libs/libev:=
- dev-libs/log4cxx
+ =net-im/swift-4.0.2-r2:=
net-misc/curl
sys-libs/zlib:=
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 9b7699cfb44e1144ffa34f3161df2ae2931e295b Author: Sam James gentoo org> AuthorDate: Wed Apr 13 14:45:57 2022 + Commit: Sam James gentoo org> CommitDate: Wed Apr 13 14:45:57 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b7699cf net-im/spectrum2: retire andrey_utkin Signed-off-by: Sam James gentoo.org> net-im/spectrum2/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/net-im/spectrum2/metadata.xml b/net-im/spectrum2/metadata.xml index 233e8e3037c3..6de46eb88c98 100644 --- a/net-im/spectrum2/metadata.xml +++ b/net-im/spectrum2/metadata.xml @@ -5,10 +5,6 @@ conik...@gentoo.org Conrad Kostecki - - andrey_ut...@gentoo.org - Andrey Utkin - Spectrum is an open source instant messaging transport. It allows users to chat together even when they are using
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: b9458edcb60ed5d521758abdfb8f06b1f873765a
Author: Conrad Kostecki gentoo org>
AuthorDate: Wed Apr 6 23:20:55 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed Apr 6 23:37:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9458edc
net-im/spectrum2: drop 2.1.2
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/Manifest | 1 -
net-im/spectrum2/spectrum2-2.1.2.ebuild | 109
2 files changed, 110 deletions(-)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 40236ed0fae7..f3c75bead36a 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,2 +1 @@
-DIST spectrum2-2.1.2.tar.gz 665486 BLAKE2B
edd98a296269141bdd104fca9f8e56d63b2f6a8ea9cda855bc17a65f8183be0b295a47453876df981ad5a3acf1df9483ab44c5a6d731ecc51e9ab6d61f005bb0
SHA512
e39caa9bb149c47b4a621f76613bf1f58cad84800851935dcf2722d91e84a5c21ccd50029ebc25c0d34d988dc390ece526ecfb1d3db6054ac8c07f4426be3a83
DIST spectrum2-2.1.3.tar.gz 666005 BLAKE2B
8356b71506b5489780052eaf404a79f0f760fa3a8d35e80e30730c86b5e4acf21a1ac59fed46e472a1085dc29c6751f2c4e788ad60569bf15b48d198762f2a77
SHA512
b6bf39738998b56c8a90984446740c38547ffdaadaf280d3f4f29cb8a2e168898a7b010eff115394f473fd02c66f30ef383c4a542812d5abd03a87b064b446a8
diff --git a/net-im/spectrum2/spectrum2-2.1.2.ebuild
b/net-im/spectrum2/spectrum2-2.1.2.ebuild
deleted file mode 100644
index 9578b2864a39..
--- a/net-im/spectrum2/spectrum2-2.1.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd tmpfiles
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im;
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
-REQUIRED_USE="
- || ( mysql postgres sqlite )
- test? ( irc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/spectrum
- acct-user/spectrum
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- dev-libs/log4cxx
- dev-libs/jsoncpp:=
- dev-libs/openssl:0=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:0=
- >=net-im/swift-4.0.2-r2:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( dev-libs/libpqxx:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- $(usex irc '-DENABLE_QT4=OFF' '')
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}/tests/libtransport" || die
- ./libtransport_test || die
-}
-
-src_install() {
- cmake_src_install
-
- diropts -o spectrum -g spectrum
- keepdir /var/log/spectrum2 /var/lib/spectrum2
- diropts
-
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
- newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
-
- einstalldocs
-}
-
-pkg_postinst() {
- tmpfiles_process spectrum2.conf
-}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 4640c6d0b05584e949bf4504249e0a64bc22c66a
Author: Conrad Kostecki gentoo org>
AuthorDate: Wed Apr 6 23:20:21 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed Apr 6 23:37:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4640c6d0
net-im/spectrum2: amd64 stable
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.1.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/spectrum2/spectrum2-2.1.3.ebuild
b/net-im/spectrum2/spectrum2-2.1.3.ebuild
index 546c78a06593..9578b2864a39 100644
--- a/net-im/spectrum2/spectrum2-2.1.3.ebuild
+++ b/net-im/spectrum2/spectrum2-2.1.3.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
REQUIRED_USE="
|| ( mysql postgres sqlite )
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 739f0bf6cf6c589b3ed9ae015645c9bb1f17978c
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Mar 12 11:49:14 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Mar 12 11:52:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739f0bf6
net-im/spectrum2: drop 2.1.0
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/Manifest | 1 -
net-im/spectrum2/spectrum2-2.1.0.ebuild | 109
2 files changed, 110 deletions(-)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index f833a2f919d3..40236ed0fae7 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,3 +1,2 @@
-DIST spectrum2-2.1.0.tar.gz 837296 BLAKE2B
3cff3cf700b08b3c061114e736b31f9ec1c44c6626173daacde3992d72c12e45c9ac60f57dc1fc426108aeb8b7d72a9d83a2aac3af64835f5f5155ecd0405f45
SHA512
53499b327edf280a87bdb334e3de2b54f8fc8ebc6a9a425e75676438561e47d144ae562d3c0c41d76330f0480a29cf08a0927de04158791f6d14671edc411321
DIST spectrum2-2.1.2.tar.gz 665486 BLAKE2B
edd98a296269141bdd104fca9f8e56d63b2f6a8ea9cda855bc17a65f8183be0b295a47453876df981ad5a3acf1df9483ab44c5a6d731ecc51e9ab6d61f005bb0
SHA512
e39caa9bb149c47b4a621f76613bf1f58cad84800851935dcf2722d91e84a5c21ccd50029ebc25c0d34d988dc390ece526ecfb1d3db6054ac8c07f4426be3a83
DIST spectrum2-2.1.3.tar.gz 666005 BLAKE2B
8356b71506b5489780052eaf404a79f0f760fa3a8d35e80e30730c86b5e4acf21a1ac59fed46e472a1085dc29c6751f2c4e788ad60569bf15b48d198762f2a77
SHA512
b6bf39738998b56c8a90984446740c38547ffdaadaf280d3f4f29cb8a2e168898a7b010eff115394f473fd02c66f30ef383c4a542812d5abd03a87b064b446a8
diff --git a/net-im/spectrum2/spectrum2-2.1.0.ebuild
b/net-im/spectrum2/spectrum2-2.1.0.ebuild
deleted file mode 100644
index 4678773061b0..
--- a/net-im/spectrum2/spectrum2-2.1.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd tmpfiles
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im;
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
-REQUIRED_USE="
- || ( mysql postgres sqlite )
- test? ( irc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/spectrum
- acct-user/spectrum
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- dev-libs/log4cxx
- dev-libs/jsoncpp:=
- dev-libs/openssl:0=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:0=
- >=net-im/swift-4.0.2-r2:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( dev-libs/libpqxx:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- $(usex irc '-DENABLE_QT4=OFF' '')
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}/tests/libtransport" || die
- ./libtransport_test || die
-}
-
-src_install() {
- cmake_src_install
-
- diropts -o spectrum -g spectrum
- keepdir /var/log/spectrum2 /var/lib/spectrum2
- diropts
-
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
- newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
-
- einstalldocs
-}
-
-pkg_postinst() {
- tmpfiles_process spectrum2.conf
-}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: c95524507b3f907921e05d11e6a3852509468733
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Mar 12 11:48:33 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Mar 12 11:52:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9552450
net-im/spectrum2: amd64 stable
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.1.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/spectrum2/spectrum2-2.1.2.ebuild
b/net-im/spectrum2/spectrum2-2.1.2.ebuild
index 546c78a06593..9578b2864a39 100644
--- a/net-im/spectrum2/spectrum2-2.1.2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.1.2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
REQUIRED_USE="
|| ( mysql postgres sqlite )
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: cc6586cc835132e1b9c013468952e1735f43522e
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Mar 6 20:21:45 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Mar 6 20:21:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc6586cc
net-im/spectrum2: add 2.1.3
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/Manifest | 1 +
net-im/spectrum2/spectrum2-2.1.3.ebuild | 109
2 files changed, 110 insertions(+)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index f5e3e5762a16..f833a2f919d3 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,2 +1,3 @@
DIST spectrum2-2.1.0.tar.gz 837296 BLAKE2B
3cff3cf700b08b3c061114e736b31f9ec1c44c6626173daacde3992d72c12e45c9ac60f57dc1fc426108aeb8b7d72a9d83a2aac3af64835f5f5155ecd0405f45
SHA512
53499b327edf280a87bdb334e3de2b54f8fc8ebc6a9a425e75676438561e47d144ae562d3c0c41d76330f0480a29cf08a0927de04158791f6d14671edc411321
DIST spectrum2-2.1.2.tar.gz 665486 BLAKE2B
edd98a296269141bdd104fca9f8e56d63b2f6a8ea9cda855bc17a65f8183be0b295a47453876df981ad5a3acf1df9483ab44c5a6d731ecc51e9ab6d61f005bb0
SHA512
e39caa9bb149c47b4a621f76613bf1f58cad84800851935dcf2722d91e84a5c21ccd50029ebc25c0d34d988dc390ece526ecfb1d3db6054ac8c07f4426be3a83
+DIST spectrum2-2.1.3.tar.gz 666005 BLAKE2B
8356b71506b5489780052eaf404a79f0f760fa3a8d35e80e30730c86b5e4acf21a1ac59fed46e472a1085dc29c6751f2c4e788ad60569bf15b48d198762f2a77
SHA512
b6bf39738998b56c8a90984446740c38547ffdaadaf280d3f4f29cb8a2e168898a7b010eff115394f473fd02c66f30ef383c4a542812d5abd03a87b064b446a8
diff --git a/net-im/spectrum2/spectrum2-2.1.3.ebuild
b/net-im/spectrum2/spectrum2-2.1.3.ebuild
new file mode 100644
index ..546c78a06593
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.1.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd tmpfiles
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="
+ || ( mysql postgres sqlite )
+ test? ( irc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/spectrum
+ acct-user/spectrum
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ dev-libs/log4cxx
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:0=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:0=
+ >=net-im/swift-4.0.2-r2:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( dev-libs/libpqxx:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ $(usex irc '-DENABLE_QT4=OFF' '')
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}/tests/libtransport" || die
+ ./libtransport_test || die
+}
+
+src_install() {
+ cmake_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ tmpfiles_process spectrum2.conf
+}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 7cb095aae1c3ea4a9fcd01046503bf07141707fe
Author: Conrad Kostecki gentoo org>
AuthorDate: Tue Nov 16 22:13:02 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Tue Nov 16 22:13:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb095aa
net-im/spectrum2: amd64 stable
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.1.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/spectrum2/spectrum2-2.1.0.ebuild
b/net-im/spectrum2/spectrum2-2.1.0.ebuild
index 2f4fdacf2aed..4678773061b0 100644
--- a/net-im/spectrum2/spectrum2-2.1.0.ebuild
+++ b/net-im/spectrum2/spectrum2-2.1.0.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
REQUIRED_USE="
|| ( mysql postgres sqlite )
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
commit: 01975b3fd47620a48b4d15eeb05fda7204e8c4ca
Author: Conrad Kostecki gentoo org>
AuthorDate: Tue Nov 16 22:14:04 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Tue Nov 16 22:14:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01975b3f
net-im/spectrum2: drop old version
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/Manifest | 1 -
.../spectrum2-2.0.13-libpqxx-7-compatibility.patch | 79 --
.../spectrum2-2.0.13-musl-compatibility.patch | 95 -
net-im/spectrum2/spectrum2-2.0.13-r2.ebuild| 114 -
4 files changed, 289 deletions(-)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 811f573d638f..de10b87706e8 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,2 +1 @@
-DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B
45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792
SHA512
8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7
DIST spectrum2-2.1.0.tar.gz 837296 BLAKE2B
3cff3cf700b08b3c061114e736b31f9ec1c44c6626173daacde3992d72c12e45c9ac60f57dc1fc426108aeb8b7d72a9d83a2aac3af64835f5f5155ecd0405f45
SHA512
53499b327edf280a87bdb334e3de2b54f8fc8ebc6a9a425e75676438561e47d144ae562d3c0c41d76330f0480a29cf08a0927de04158791f6d14671edc411321
diff --git
a/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch
b/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch
deleted file mode 100644
index 48a1f0a333a0..
--- a/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/cmake_modules/Findpqxx.cmake b/cmake_modules/Findpqxx.cmake
-index 9c53550..691ec0e 100644
a/cmake_modules/Findpqxx.cmake
-+++ b/cmake_modules/Findpqxx.cmake
-@@ -1,16 +1,33 @@
--FIND_PATH(PQXX_INCLUDE_DIR pqxx/pqxx PATHS)
--MARK_AS_ADVANCED(PQXX_INCLUDE_DIR)
-+if (NOT WIN32)
-+ find_package(PkgConfig)
-+ if (PKG_CONFIG_FOUND)
-+ pkg_check_modules(PQXX libpqxx)
-+ if (PQXX_FOUND)
-+ if (PQXX_VERSION STRGREATER "7")
-+ message(STATUS "libpqxx version
${PQXX_VERSION}, requesting c++17")
-+ set (CMAKE_CXX_STANDARD 17)
-+ endif()
-+ endif()
-+ endif()
-+else()
-
--FIND_LIBRARY(PQXX_LIBRARY pqxx )
--MARK_AS_ADVANCED(PQXX_LIBRARY)
-+ FIND_PATH(PQXX_INCLUDE_DIR pqxx/pqxx PATHS)
-+ MARK_AS_ADVANCED(PQXX_INCLUDE_DIR)
-
--FIND_LIBRARY(PQ_LIBRARY pq )
--MARK_AS_ADVANCED(PQ_LIBRARY)
-+ FIND_LIBRARY(PQXX_LIBRARIES pqxx )
-+ MARK_AS_ADVANCED(PQXX_LIBRARIES)
-
--if(PQXX_LIBRARY AND PQ_LIBRARY AND PQXX_INCLUDE_DIR)
-- set( PQXX_FOUND 1 )
-- message( STATUS "Found pqxx: ${PQXX_LIBRARY}, ${PQ_LIBRARY},
${PQXX_INCLUDE_DIR}")
--else()
-- message(STATUS "Could NOT find pqxx and pq library")
--endif()
-+ FIND_LIBRARY(PQ_LIBRARY pq )
-+ MARK_AS_ADVANCED(PQ_LIBRARY)
-
-+ if(PQXX_LIBRARY AND PQ_LIBRARY AND PQXX_INCLUDE_DIR)
-+ set( PQXX_FOUND 1 )
-+ message( STATUS "Found pqxx: ${PQXX_LIBRARIES}, ${PQ_LIBRARY},
${PQXX_INCLUDE_DIR}")
-+ if (PQXX_VERSION STRGREATER "7")
-+ message(STATUS "libpqxx version ${PQXX_VERSION},
requesting c++17")
-+ set (CMAKE_CXX_STANDARD 17)
-+ endif()
-+ else()
-+ message(STATUS "Could NOT find pqxx and pq library")
-+ endif()
-+endif()
-diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt
-index 8892241..2b5a0f9 100644
a/libtransport/CMakeLists.txt
-+++ b/libtransport/CMakeLists.txt
-@@ -48,9 +48,9 @@ find_package(CURL)
-
- if(WIN32)
- include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
-- target_link_libraries(transport transport-plugin ${PQXX_LIBRARY}
${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY}
${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib
bcrypt.lib)
-+ target_link_libraries(transport transport-plugin ${PQXX_LIBRARIES}
${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY}
${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib
bcrypt.lib)
- else()
-- target_link_libraries(transport transport-plugin ${PQXX_LIBRARY}
${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES}
${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY}
${JSONCPP_LIBRARY})
-+ target_link_libraries(transport transport-plugin ${PQXX_LIBRARIES}
${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES}
${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 846c6a6fd267d67c2dfdbe1d2f4168adcf8f66f8
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Oct 17 14:09:57 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Oct 17 14:37:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846c6a6f
net-im/spectrum2: bump to version 2.1.0
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/Manifest | 1 +
net-im/spectrum2/spectrum2-2.1.0.ebuild | 109
2 files changed, 110 insertions(+)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index bdab4cc72da..811f573d638 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1 +1,2 @@
DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B
45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792
SHA512
8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7
+DIST spectrum2-2.1.0.tar.gz 837296 BLAKE2B
3cff3cf700b08b3c061114e736b31f9ec1c44c6626173daacde3992d72c12e45c9ac60f57dc1fc426108aeb8b7d72a9d83a2aac3af64835f5f5155ecd0405f45
SHA512
53499b327edf280a87bdb334e3de2b54f8fc8ebc6a9a425e75676438561e47d144ae562d3c0c41d76330f0480a29cf08a0927de04158791f6d14671edc411321
diff --git a/net-im/spectrum2/spectrum2-2.1.0.ebuild
b/net-im/spectrum2/spectrum2-2.1.0.ebuild
new file mode 100644
index 000..2f4fdacf2ae
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.1.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd tmpfiles
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="
+ || ( mysql postgres sqlite )
+ test? ( irc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/spectrum
+ acct-user/spectrum
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ dev-libs/log4cxx
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:0=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:0=
+ >=net-im/swift-4.0.2-r2:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( dev-libs/libpqxx:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ $(usex irc '-DENABLE_QT4=OFF' '')
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}/tests/libtransport" || die
+ ./libtransport_test || die
+}
+
+src_install() {
+ cmake_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ tmpfiles_process spectrum2.conf
+}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: c6b85657d1b66832cdccf901d5ab8ecd19c02dcc
Author: Sam James gentoo org>
AuthorDate: Fri Jul 30 22:56:45 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 30 23:30:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6b85657
net-im/spectrum2: [QA] call tmpfiles_process in pkg_postinst
This is needed to actually apply the tmpfiles configuration
we've installed in the ebuild. See tmpfiles.eclass documentation.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sam James gentoo.org>
net-im/spectrum2/spectrum2-2.0.13-r2.ebuild | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
index ea3909e6add..e270aa2de67 100644
--- a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -108,3 +108,7 @@ src_install() {
einstalldocs
}
+
+pkg_postinst() {
+ tmpfiles_process spectrum2.conf
+}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 5aba390d268b54205abd6d898e23d1f9ebf78ee4
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Dec 13 19:38:08 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Dec 13 19:38:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aba390d
net-im/spectrum2: migrate to tmpfiles eclass
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.0.13-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
index 3c61f5951cc..ea3909e6add 100644
--- a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake systemd
+inherit cmake systemd tmpfiles
DESCRIPTION="An open source instant messaging transport"
HOMEPAGE="https://www.spectrum.im;
@@ -104,7 +104,7 @@ src_install() {
newinitd "${FILESDIR}"/spectrum2.initd spectrum2
systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
- systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+ newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
einstalldocs
}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
commit: 4b0cc208da074b6d03babb1a8aaeef873bfbd72d Author: Conrad Kostecki gentoo org> AuthorDate: Wed Sep 2 11:39:47 2020 + Commit: Conrad Kostecki gentoo org> CommitDate: Wed Sep 2 12:31:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0cc208 net-im/spectrum2: drop old version Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Conrad Kostecki gentoo.org> net-im/spectrum2/Manifest | 1 - .../spectrum2-2.0.12-boost-173-compatibility.patch | 21 .../spectrum2-2.0.12-gcc-10-compatibility.patch| 54 -- net-im/spectrum2/spectrum2-2.0.12-r4.ebuild| 112 - 4 files changed, 188 deletions(-) diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest index 5122ae14a1d..bdab4cc72da 100644 --- a/net-im/spectrum2/Manifest +++ b/net-im/spectrum2/Manifest @@ -1,2 +1 @@ -DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36 DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7 diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch deleted file mode 100644 index b9a8adeee5a..000 --- a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 1a6ede2dbf0f621e3e6864675befcbc32e02c8b6 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki -Date: Thu, 14 May 2020 10:34:43 +0200 -Subject: [PATCH] Fix compilation with boost-1.73 - -Signed-off-by: Conrad Kostecki - include/transport/ThreadPool.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/transport/ThreadPool.h b/include/transport/ThreadPool.h -index 5902f965..ffd07c8e 100644 a/include/transport/ThreadPool.h -+++ b/include/transport/ThreadPool.h -@@ -1,5 +1,6 @@ - #pragma once - -+#include - #include - #include - #include diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch deleted file mode 100644 index ad13208b3e1..000 --- a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 95e6968c0f8c95f6bd817e5081e0b10dea9d4269 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki -Date: Wed, 13 May 2020 14:22:27 +0200 -Subject: [PATCH] Fix dfrotz compilation with GCC >= 10 - -Since GCC enables by default -fno-common, -the compilation of dfrotz due multiple definitions will fail. - -Signed-off-by: Conrad Kostecki - backends/frotz/dfrotz/dumb/dumb_init.c | 2 +- - backends/frotz/dfrotz/dumb/dumb_input.c | 2 +- - backends/frotz/dfrotz/dumb/dumb_output.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/backends/frotz/dfrotz/dumb/dumb_init.c b/backends/frotz/dfrotz/dumb/dumb_init.c -index 4b9c6704..35295b74 100644 a/backends/frotz/dfrotz/dumb/dumb_init.c -+++ b/backends/frotz/dfrotz/dumb/dumb_init.c -@@ -7,7 +7,7 @@ - - #include "dumb_frotz.h" - --f_setup_t f_setup; -+extern f_setup_t f_setup; - - #define INFORMATION "\ - An interpreter for all Infocom and other Z-Machine games.\n\ -diff --git a/backends/frotz/dfrotz/dumb/dumb_input.c b/backends/frotz/dfrotz/dumb/dumb_input.c -index 4149b2b0..88fc8ae5 100644 a/backends/frotz/dfrotz/dumb/dumb_input.c -+++ b/backends/frotz/dfrotz/dumb/dumb_input.c -@@ -5,7 +5,7 @@ - */ - - #include "dumb_frotz.h" --f_setup_t f_setup; -+extern f_setup_t f_setup; - - static char runtime_usage[] = - "DUMB-FROTZ runtime help:\n" -diff --git a/backends/frotz/dfrotz/dumb/dumb_output.c b/backends/frotz/dfrotz/dumb/dumb_output.c -index 9e505167..6dc7db82 100644 a/backends/frotz/dfrotz/dumb/dumb_output.c -+++ b/backends/frotz/dfrotz/dumb/dumb_output.c -@@ -7,7 +7,7 @@ - - #include "dumb_frotz.h" - --f_setup_t f_setup; -+extern f_setup_t f_setup; - - static bool show_line_numbers = FALSE; - static bool show_line_types = -1; diff --git a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild deleted file mode 100644 index 3bbf840a522..000 --- a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake systemd - -DESCRIPTION="An open source instant messaging transport" -HOMEPAGE="https://www.spectrum.im;
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 81a2e43dfd7126a623a87c3375b3b3071695ca2d
Author: Sam James gentoo org>
AuthorDate: Tue Sep 1 22:44:41 2020 +
Commit: Sam James gentoo org>
CommitDate: Tue Sep 1 22:44:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81a2e43d
net-im/spectrum2: Stabilize 2.0.13-r2 amd64, #739308
Signed-off-by: Sam James gentoo.org>
net-im/spectrum2/spectrum2-2.0.13-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
index d94c327ca2c..3c61f5951cc 100644
--- a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
REQUIRED_USE="
|| ( mysql postgres sqlite )
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
commit: 73b5c4466f2c421fb3bdbe13b3f7b27be76fc968
Author: Conrad Kostecki gentoo org>
AuthorDate: Thu Aug 27 17:27:46 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Thu Aug 27 17:28:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73b5c446
net-im/spectrum2: fix compilation with musl
Closes: https://bugs.gentoo.org/717410
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Conrad Kostecki gentoo.org>
.../spectrum2-2.0.13-musl-compatibility.patch | 95 ++
net-im/spectrum2/spectrum2-2.0.12-r4.ebuild| 1 +
net-im/spectrum2/spectrum2-2.0.13-r2.ebuild| 5 +-
3 files changed, 100 insertions(+), 1 deletion(-)
diff --git a/net-im/spectrum2/files/spectrum2-2.0.13-musl-compatibility.patch
b/net-im/spectrum2/files/spectrum2-2.0.13-musl-compatibility.patch
new file mode 100644
index 000..07bde50b832
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.13-musl-compatibility.patch
@@ -0,0 +1,95 @@
+From 19b10896fa3426b2bd9e4e75a63ca52322373d33 Mon Sep 17 00:00:00 2001
+From: Vitaly Takmazov
+Date: Fri, 24 Jul 2020 15:09:28 +0300
+Subject: [PATCH] musl compatibility
+
+---
+ backends/libpurple/main.cpp | 6 +++---
+ backends/swiften/main.cpp| 2 ++
+ libtransport/UserManager.cpp | 2 ++
+ spectrum/src/main.cpp| 2 ++
+ 4 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp
+index 54c618e0..4555edbc 100644
+--- a/backends/libpurple/main.cpp
b/backends/libpurple/main.cpp
+@@ -528,7 +528,7 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
+
+ purple_accounts_delete_wrapped(account);
+ #ifndef WIN32
+-#if !defined(__FreeBSD__) && !defined(__APPLE__)
++#if !defined(__FreeBSD__) && !defined(__APPLE__) && defined (__GLIBC__)
+ malloc_trim(0);
+ #endif
+ #endif
+@@ -2287,7 +2287,7 @@ static void signed_on(PurpleConnection *gc, gpointer
unused) {
+ PurpleAccount *account = purple_connection_get_account_wrapped(gc);
+ np->handleConnected(np->m_accounts[account]);
+ #ifndef WIN32
+-#if !defined(__FreeBSD__) && !defined(__APPLE__)
++#if !defined(__FreeBSD__) && !defined(__APPLE__) && defined (__GLIBC__)
+ // force returning of memory chunks allocated by libxml2 to kernel
+ malloc_trim(0);
+ #endif
+@@ -2516,7 +2516,7 @@ int main(int argc, char **argv) {
+ boost::locale::generator gen;
+ std::locale::global(gen(""));
+ #ifndef WIN32
+-#if !defined(__FreeBSD__) && !defined(__APPLE__)
++#if !defined(__FreeBSD__) && !defined(__APPLE__) && defined (__GLIBC__)
+ mallopt(M_CHECK_ACTION, 2);
+ mallopt(M_PERTURB, 0xb);
+ #endif
+diff --git a/backends/swiften/main.cpp b/backends/swiften/main.cpp
+index f0acdb6d..6c111464 100644
+--- a/backends/swiften/main.cpp
b/backends/swiften/main.cpp
+@@ -227,10 +227,12 @@ class SwiftenPlugin : public NetworkPlugin,
Swift::XMPPParserClient {
+ #ifndef WIN32
+ #ifndef __FreeBSD__
+ #ifndef __MACH__
++#if defined (__GLIBC__)
+ // force returning of memory chunks allocated by
libxml2 to kernel
+ malloc_trim(0);
+ #endif
+ #endif
++#endif
+ #endif
+ }
+
+diff --git a/libtransport/UserManager.cpp b/libtransport/UserManager.cpp
+index 73fcdae9..a622754f 100644
+--- a/libtransport/UserManager.cpp
b/libtransport/UserManager.cpp
+@@ -125,10 +125,12 @@ void UserManager::removeUser(User *user, bool
onUserBehalf) {
+ #ifndef WIN32
+ #ifndef __FreeBSD__
+ #ifndef __MACH__
++#if defined (__GLIBC__)
+ malloc_trim(0);
+ #endif
+ #endif
+ #endif
++#endif
+ //VALGRIND_DO_LEAK_CHECK;
+ }
+
+diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp
+index 0f5985a2..89e5b9a1 100644
+--- a/spectrum/src/main.cpp
b/spectrum/src/main.cpp
+@@ -320,11 +320,13 @@ int main(int argc, char **argv)
+ #ifndef WIN32
+ #ifndef __FreeBSD__
+ #ifndef __MACH__
++#if defined (__GLIBC__)
+ mallopt(M_CHECK_ACTION, 2);
+ mallopt(M_PERTURB, 0xb);
+ #endif
+ #endif
+ #endif
++#endif
+
+ #ifndef WIN32
+ if (signal(SIGINT, spectrum_sigint_handler) == SIG_ERR) {
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
index 4f12c3c285e..3bbf840a522 100644
--- a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}/${P}-boost-173-compatibility.patch"
"${FILESDIR}/${P}-gcc-10-compatibility.patch"
"${FILESDIR}/${PN}-2.0.13-libpqxx-7-compatibility.patch"
+ "${FILESDIR}/${PN}-2.0.13-musl-compatibility.patch"
)
src_prepare() {
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
index 1c7985cbc6c..d94c327ca2c 100644
--- a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
+++
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/, net-im/spectrum2/files/
commit: b415791afae7da1913f38efcfa400d4a4a3fe266
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Aug 9 19:59:26 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Aug 9 20:00:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b415791a
net-im/spectrum2: fix compilation with libpqxx-7
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Conrad Kostecki gentoo.org>
.../spectrum2-2.0.13-libpqxx-7-compatibility.patch | 79 ++
net-im/spectrum2/spectrum2-2.0.12-r4.ebuild| 7 +-
net-im/spectrum2/spectrum2-2.0.13-r2.ebuild| 4 +-
3 files changed, 86 insertions(+), 4 deletions(-)
diff --git
a/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch
b/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch
new file mode 100644
index 000..48a1f0a333a
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch
@@ -0,0 +1,79 @@
+diff --git a/cmake_modules/Findpqxx.cmake b/cmake_modules/Findpqxx.cmake
+index 9c53550..691ec0e 100644
+--- a/cmake_modules/Findpqxx.cmake
b/cmake_modules/Findpqxx.cmake
+@@ -1,16 +1,33 @@
+-FIND_PATH(PQXX_INCLUDE_DIR pqxx/pqxx PATHS)
+-MARK_AS_ADVANCED(PQXX_INCLUDE_DIR)
++if (NOT WIN32)
++ find_package(PkgConfig)
++ if (PKG_CONFIG_FOUND)
++ pkg_check_modules(PQXX libpqxx)
++ if (PQXX_FOUND)
++ if (PQXX_VERSION STRGREATER "7")
++ message(STATUS "libpqxx version
${PQXX_VERSION}, requesting c++17")
++ set (CMAKE_CXX_STANDARD 17)
++ endif()
++ endif()
++ endif()
++else()
+
+-FIND_LIBRARY(PQXX_LIBRARY pqxx )
+-MARK_AS_ADVANCED(PQXX_LIBRARY)
++ FIND_PATH(PQXX_INCLUDE_DIR pqxx/pqxx PATHS)
++ MARK_AS_ADVANCED(PQXX_INCLUDE_DIR)
+
+-FIND_LIBRARY(PQ_LIBRARY pq )
+-MARK_AS_ADVANCED(PQ_LIBRARY)
++ FIND_LIBRARY(PQXX_LIBRARIES pqxx )
++ MARK_AS_ADVANCED(PQXX_LIBRARIES)
+
+-if(PQXX_LIBRARY AND PQ_LIBRARY AND PQXX_INCLUDE_DIR)
+- set( PQXX_FOUND 1 )
+- message( STATUS "Found pqxx: ${PQXX_LIBRARY}, ${PQ_LIBRARY},
${PQXX_INCLUDE_DIR}")
+-else()
+- message(STATUS "Could NOT find pqxx and pq library")
+-endif()
++ FIND_LIBRARY(PQ_LIBRARY pq )
++ MARK_AS_ADVANCED(PQ_LIBRARY)
+
++ if(PQXX_LIBRARY AND PQ_LIBRARY AND PQXX_INCLUDE_DIR)
++ set( PQXX_FOUND 1 )
++ message( STATUS "Found pqxx: ${PQXX_LIBRARIES}, ${PQ_LIBRARY},
${PQXX_INCLUDE_DIR}")
++ if (PQXX_VERSION STRGREATER "7")
++ message(STATUS "libpqxx version ${PQXX_VERSION},
requesting c++17")
++ set (CMAKE_CXX_STANDARD 17)
++ endif()
++ else()
++ message(STATUS "Could NOT find pqxx and pq library")
++ endif()
++endif()
+diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt
+index 8892241..2b5a0f9 100644
+--- a/libtransport/CMakeLists.txt
b/libtransport/CMakeLists.txt
+@@ -48,9 +48,9 @@ find_package(CURL)
+
+ if(WIN32)
+ include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
+- target_link_libraries(transport transport-plugin ${PQXX_LIBRARY}
${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY}
${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib
bcrypt.lib)
++ target_link_libraries(transport transport-plugin ${PQXX_LIBRARIES}
${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY}
${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib
bcrypt.lib)
+ else()
+- target_link_libraries(transport transport-plugin ${PQXX_LIBRARY}
${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES}
${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY}
${JSONCPP_LIBRARY})
++ target_link_libraries(transport transport-plugin ${PQXX_LIBRARIES}
${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES}
${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY}
${JSONCPP_LIBRARY})
+ endif()
+
+ set_target_properties(transport PROPERTIES
+diff --git a/libtransport/NetworkPluginServer.cpp
b/libtransport/NetworkPluginServer.cpp
+index 31cce95..f5305aa 100644
+--- a/libtransport/NetworkPluginServer.cpp
b/libtransport/NetworkPluginServer.cpp
+@@ -1904,7 +1904,7 @@
NetworkPluginServer::wrapIncomingMedia(SWIFTEN_SHRPTR_NAMESPACE::shared_ptrs, quotes in quotes ("quote:
'text' end quote")
+ static boost::regex
image_expr("]*src\\s*=\\s*[\"']([^\"']+)[\"'][^>]*>");
+
+-bool matchCount = 0;
++int matchCount = 0;
+ std::string firstUrl;
+
+ std::string::const_iterator xhtml_pos = xhtml.begin();
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
index 334f15bf538..4f12c3c285e 100644
---
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: e8056018092c0e0127e201f1ddbf1b47b491ce5a
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Aug 1 19:35:53 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Aug 1 19:40:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8056018
net-im/spectrum2: drop old version
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.0.12-r3.ebuild | 107
net-im/spectrum2/spectrum2-2.0.13-r1.ebuild | 102 --
2 files changed, 209 deletions(-)
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r3.ebuild
b/net-im/spectrum2/spectrum2-2.0.12-r3.ebuild
deleted file mode 100644
index 85771c62be5..000
--- a/net-im/spectrum2/spectrum2-2.0.12-r3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im;
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/spectrum
- acct-user/spectrum
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- dev-libs/log4cxx
- dev-libs/jsoncpp:=
- dev-libs/openssl:0=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:0=
- net-im/swift:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( >=dev-libs/libpqxx-6.4.5:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-PATCHES="
- "${FILESDIR}/${P}-boost-173-compatibility.patch"
- "${FILESDIR}/${P}-gcc-10-compatibility.patch"
-"
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- $(usex irc '-DENABLE_QT4=OFF' '')
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}/tests/libtransport" || die
- ./libtransport_test || die
-}
-
-src_install() {
- cmake_src_install
-
- diropts -o spectrum -g spectrum
- keepdir /var/log/spectrum2 /var/lib/spectrum2
- diropts
-
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
- systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
-
- einstalldocs
-}
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r1.ebuild
b/net-im/spectrum2/spectrum2-2.0.13-r1.ebuild
deleted file mode 100644
index 34d6db43558..000
--- a/net-im/spectrum2/spectrum2-2.0.13-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im;
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/spectrum
- acct-user/spectrum
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- dev-libs/log4cxx
- dev-libs/jsoncpp:=
- dev-libs/openssl:0=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:0=
-
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 6d46469b5e8b248d3671299b48a57272b352fd65
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Aug 1 19:33:47 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Aug 1 19:40:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d46469b
net-im/spectrum2: force irc for tests, block dev-libs/libpqxx-7
In order to run all tests, irc must be enabled for those tests. It's not
required for normal usage.
Also restricted on <=dev-libs/libpqxx-7, since it does not compile with
newest version.
Closes: https://bugs.gentoo.org/731166
Closes: https://bugs.gentoo.org/735100
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.0.12-r4.ebuild | 110
net-im/spectrum2/spectrum2-2.0.13-r2.ebuild | 105 ++
2 files changed, 215 insertions(+)
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
new file mode 100644
index 000..334f15bf538
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="
+ || ( mysql postgres sqlite )
+ test? ( irc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/spectrum
+ acct-user/spectrum
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ dev-libs/log4cxx
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:0=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:0=
+ >=net-im/swift-4.0.2-r2:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( <=dev-libs/libpqxx-7.0.0:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+PATCHES="
+ "${FILESDIR}/${P}-boost-173-compatibility.patch"
+ "${FILESDIR}/${P}-gcc-10-compatibility.patch"
+"
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ $(usex irc '-DENABLE_QT4=OFF' '')
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}/tests/libtransport" || die
+ ./libtransport_test || die
+}
+
+src_install() {
+ cmake_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
new file mode 100644
index 000..edbad4cad3e
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="
+ || ( mysql postgres sqlite
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: b4157177176a430eb2831623c1652e973fddc4b5
Author: Conrad Kostecki gentoo org>
AuthorDate: Thu Jul 30 13:26:12 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Thu Jul 30 13:37:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4157177
net-im/spectrum2: drop old version
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.0.13.ebuild | 118 ---
1 file changed, 118 deletions(-)
diff --git a/net-im/spectrum2/spectrum2-2.0.13.ebuild
b/net-im/spectrum2/spectrum2-2.0.13.ebuild
deleted file mode 100644
index ce3c2651ed2..000
--- a/net-im/spectrum2/spectrum2-2.0.13.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake python-any-r1 systemd
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im;
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
- acct-group/spectrum
- acct-user/spectrum
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- dev-libs/log4cxx
- dev-libs/jsoncpp:=
- dev-libs/openssl:0=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:0=
- net-im/swift:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( >=dev-libs/libpqxx-6.4.5:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]')
- dev-util/cppunit
- net-irc/ngircd
- )
-"
-
-# Tests are currently restricted, as they do completly fail
-RESTRICT="test"
-
-python_check_deps() {
- has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- $(usex irc '-DENABLE_QT4=OFF' '')
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cd tests/libtransport && "${EPYTHON}" ../start.py || die
-}
-
-src_install() {
- cmake_src_install
-
- diropts -o spectrum -g spectrum
- keepdir /var/log/spectrum2 /var/lib/spectrum2
- diropts
-
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
- systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
-
- einstalldocs
-}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: c2cd73aee6a33d3099f56630866bff028303727c
Author: Conrad Kostecki gentoo org>
AuthorDate: Thu Jul 30 13:36:10 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Thu Jul 30 13:37:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2cd73ae
net-im/spectrum2: drop old version
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.0.12-r2.ebuild | 123
1 file changed, 123 deletions(-)
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
deleted file mode 100644
index 52118de297e..000
--- a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-any-r1 systemd
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im;
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
- acct-group/spectrum
- acct-user/spectrum
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- dev-libs/log4cxx
- dev-libs/jsoncpp:=
- dev-libs/openssl:0=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:0=
- net-im/swift:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( >=dev-libs/libpqxx-6.4.5:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]')
- dev-util/cppunit
- net-irc/ngircd
- )
-"
-
-# Tests are currently restricted, as they do completly fail
-RESTRICT="test"
-
-PATCHES="
- "${FILESDIR}/${P}-boost-173-compatibility.patch"
- "${FILESDIR}/${P}-gcc-10-compatibility.patch"
-"
-
-python_check_deps() {
- has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- $(usex irc '-DENABLE_QT4=OFF' '')
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd tests/libtransport && "${EPYTHON}" ../start.py || die
-}
-
-src_install() {
- cmake-utils_src_install
-
- diropts -o spectrum -g spectrum
- keepdir /var/log/spectrum2 /var/lib/spectrum2
- diropts
-
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
- systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
-
- einstalldocs
-}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 11330a49180b7db734cb8daca3c79c4d5b2dff47
Author: Conrad Kostecki gentoo org>
AuthorDate: Thu Jul 30 13:23:09 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Thu Jul 30 13:37:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11330a49
net-im/spectrum2: enable tests (testing)
Since python isn't needed at all for tests, it can be dropped.
Closes: https://bugs.gentoo.org/734558
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.0.13-r1.ebuild | 102
1 file changed, 102 insertions(+)
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r1.ebuild
b/net-im/spectrum2/spectrum2-2.0.13-r1.ebuild
new file mode 100644
index 000..34d6db43558
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.13-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/spectrum
+ acct-user/spectrum
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ dev-libs/log4cxx
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:0=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:0=
+ net-im/swift:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( >=dev-libs/libpqxx-6.4.5:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ $(usex irc '-DENABLE_QT4=OFF' '')
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}/tests/libtransport" || die
+ ./libtransport_test || die
+}
+
+src_install() {
+ cmake_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: b43e934ebfdd14c72dc35cce2fab950bf4af2ccb
Author: Conrad Kostecki gentoo org>
AuthorDate: Thu Jul 30 13:29:19 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Thu Jul 30 13:37:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b43e934e
net-im/spectrum2: enable tests (stable)
Since python isn't needed at all for tests, it can be dropped.
Bug: https://bugs.gentoo.org/734558
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.0.12-r3.ebuild | 107
1 file changed, 107 insertions(+)
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r3.ebuild
b/net-im/spectrum2/spectrum2-2.0.12-r3.ebuild
new file mode 100644
index 000..85771c62be5
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.12-r3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/spectrum
+ acct-user/spectrum
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ dev-libs/log4cxx
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:0=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:0=
+ net-im/swift:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( >=dev-libs/libpqxx-6.4.5:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+PATCHES="
+ "${FILESDIR}/${P}-boost-173-compatibility.patch"
+ "${FILESDIR}/${P}-gcc-10-compatibility.patch"
+"
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ $(usex irc '-DENABLE_QT4=OFF' '')
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}/tests/libtransport" || die
+ ./libtransport_test || die
+}
+
+src_install() {
+ cmake_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 0ba2640cb9b379dbe10c5c02d72a0ec5b9d5844a
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Jul 19 16:26:30 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Jul 19 17:01:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba2640c
net-im/spectrum2: bump to version 2.0.13
Closes: https://bugs.gentoo.org/732928
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/Manifest| 1 +
net-im/spectrum2/spectrum2-2.0.13.ebuild | 118 +++
2 files changed, 119 insertions(+)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 7c194ddbe6e..5122ae14a1d 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1 +1,2 @@
DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B
22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7
SHA512
bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
+DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B
45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792
SHA512
8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7
diff --git a/net-im/spectrum2/spectrum2-2.0.13.ebuild
b/net-im/spectrum2/spectrum2-2.0.13.ebuild
new file mode 100644
index 000..ce3c2651ed2
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.13.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake python-any-r1 systemd
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+ acct-group/spectrum
+ acct-user/spectrum
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ dev-libs/log4cxx
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:0=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:0=
+ net-im/swift:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( >=dev-libs/libpqxx-6.4.5:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]')
+ dev-util/cppunit
+ net-irc/ngircd
+ )
+"
+
+# Tests are currently restricted, as they do completly fail
+RESTRICT="test"
+
+python_check_deps() {
+ has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ $(usex irc '-DENABLE_QT4=OFF' '')
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd tests/libtransport && "${EPYTHON}" ../start.py || die
+}
+
+src_install() {
+ cmake_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
commit: 023e1a434092beb0b6083f299a9530998f3253f4
Author: Conrad Kostecki gentoo org>
AuthorDate: Thu May 14 08:55:23 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Thu May 14 08:57:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=023e1a43
net-im/spectrum2: add fix for boost-1.73 and gcc-10
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Conrad Kostecki gentoo.org>
.../spectrum2-2.0.12-boost-173-compatibility.patch | 21 +
.../spectrum2-2.0.12-gcc-10-compatibility.patch| 54 ++
net-im/spectrum2/spectrum2-2.0.12-r2.ebuild| 5 ++
3 files changed, 80 insertions(+)
diff --git
a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
new file mode 100644
index 000..b9a8adeee5a
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
@@ -0,0 +1,21 @@
+From 1a6ede2dbf0f621e3e6864675befcbc32e02c8b6 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki
+Date: Thu, 14 May 2020 10:34:43 +0200
+Subject: [PATCH] Fix compilation with boost-1.73
+
+Signed-off-by: Conrad Kostecki
+---
+ include/transport/ThreadPool.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/transport/ThreadPool.h b/include/transport/ThreadPool.h
+index 5902f965..ffd07c8e 100644
+--- a/include/transport/ThreadPool.h
b/include/transport/ThreadPool.h
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include
+ #include
+ #include
+ #include
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
new file mode 100644
index 000..ad13208b3e1
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
@@ -0,0 +1,54 @@
+From 95e6968c0f8c95f6bd817e5081e0b10dea9d4269 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki
+Date: Wed, 13 May 2020 14:22:27 +0200
+Subject: [PATCH] Fix dfrotz compilation with GCC >= 10
+
+Since GCC enables by default -fno-common,
+the compilation of dfrotz due multiple definitions will fail.
+
+Signed-off-by: Conrad Kostecki
+---
+ backends/frotz/dfrotz/dumb/dumb_init.c | 2 +-
+ backends/frotz/dfrotz/dumb/dumb_input.c | 2 +-
+ backends/frotz/dfrotz/dumb/dumb_output.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/backends/frotz/dfrotz/dumb/dumb_init.c
b/backends/frotz/dfrotz/dumb/dumb_init.c
+index 4b9c6704..35295b74 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_init.c
b/backends/frotz/dfrotz/dumb/dumb_init.c
+@@ -7,7 +7,7 @@
+
+ #include "dumb_frotz.h"
+
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+
+ #define INFORMATION "\
+ An interpreter for all Infocom and other Z-Machine games.\n\
+diff --git a/backends/frotz/dfrotz/dumb/dumb_input.c
b/backends/frotz/dfrotz/dumb/dumb_input.c
+index 4149b2b0..88fc8ae5 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_input.c
b/backends/frotz/dfrotz/dumb/dumb_input.c
+@@ -5,7 +5,7 @@
+ */
+
+ #include "dumb_frotz.h"
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+
+ static char runtime_usage[] =
+ "DUMB-FROTZ runtime help:\n"
+diff --git a/backends/frotz/dfrotz/dumb/dumb_output.c
b/backends/frotz/dfrotz/dumb/dumb_output.c
+index 9e505167..6dc7db82 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_output.c
b/backends/frotz/dfrotz/dumb/dumb_output.c
+@@ -7,7 +7,7 @@
+
+ #include "dumb_frotz.h"
+
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+
+ static bool show_line_numbers = FALSE;
+ static bool show_line_types = -1;
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
index 0bc829465f9..e2a557eb711 100644
--- a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
@@ -64,6 +64,11 @@ DEPEND="
# Tests are currently restricted, as they do completly fail
RESTRICT="test"
+PATCHES="
+ "${FILESDIR}/${P}-boost-173-compatibility.patch"
+ "${FILESDIR}/${P}-gcc-10-compatibility.patch"
+"
+
python_check_deps() {
has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 6402b6c801b94895a428b8a96b93705ab701d953
Author: Conrad Kostecki gentoo org>
AuthorDate: Mon Apr 6 18:15:37 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Mon Apr 6 18:31:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6402b6c8
net-im/spectrum2: drop old version
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.0.12-r1.ebuild | 117
1 file changed, 117 deletions(-)
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r1.ebuild
b/net-im/spectrum2/spectrum2-2.0.12-r1.ebuild
deleted file mode 100644
index 328982615fb..000
--- a/net-im/spectrum2/spectrum2-2.0.12-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-any-r1 systemd
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im;
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
- acct-group/spectrum
- acct-user/spectrum
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- dev-libs/log4cxx
- dev-libs/jsoncpp:=
- dev-libs/openssl:0=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:0=
- net-im/swift:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( >=dev-libs/libpqxx-6.4.5:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]')
- dev-util/cppunit
- net-irc/ngircd
- )
-"
-
-# Tests are currently restricted, as they do completly fail
-RESTRICT="test"
-
-python_check_deps() {
- has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd tests/libtransport && "${EPYTHON}" ../start.py || die
-}
-
-src_install() {
- cmake-utils_src_install
-
- diropts -o spectrum -g spectrum
- keepdir /var/log/spectrum2 /var/lib/spectrum2
- diropts
-
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
- systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
-
- einstalldocs
-}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 49f5b3ed05504011be3ea25f33bf7d797884ddf2
Author: Conrad Kostecki gentoo org>
AuthorDate: Mon Apr 6 18:14:33 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Mon Apr 6 18:31:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f5b3ed
net-im/spectrum2: fix irc compilation
Force Qt5 variant of libcommuni as otherwise it's not being found.
Closes: https://bugs.gentoo.org/716356
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/spectrum2/spectrum2-2.0.12-r2.ebuild | 118
1 file changed, 118 insertions(+)
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
new file mode 100644
index 000..0bc829465f9
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-any-r1 systemd
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+ acct-group/spectrum
+ acct-user/spectrum
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ dev-libs/log4cxx
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:0=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:0=
+ net-im/swift:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( >=dev-libs/libpqxx-6.4.5:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]')
+ dev-util/cppunit
+ net-irc/ngircd
+ )
+"
+
+# Tests are currently restricted, as they do completly fail
+RESTRICT="test"
+
+python_check_deps() {
+ has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ $(usex irc '-DENABLE_QT4=OFF' '')
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ cd tests/libtransport && "${EPYTHON}" ../start.py || die
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: e5e358153a69fc3981ee460b96d8e07f6eaf8448
Author: Conrad Kostecki kostecki com>
AuthorDate: Tue Sep 17 18:01:22 2019 +
Commit: Andrey Utkin gentoo org>
CommitDate: Fri Sep 20 08:46:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5e35815
net-im/spectrum2: drop user eclass
Dropped user eclass in favour of acct-* packages.
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Conrad Kostecki kostecki.com>
Signed-off-by: Andrey Utkin gentoo.org>
net-im/spectrum2/spectrum2-2.0.12-r1.ebuild | 117
1 file changed, 117 insertions(+)
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r1.ebuild
b/net-im/spectrum2/spectrum2-2.0.12-r1.ebuild
new file mode 100644
index 000..328982615fb
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.12-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-any-r1 systemd
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+ acct-group/spectrum
+ acct-user/spectrum
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ dev-libs/log4cxx
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:0=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:0=
+ net-im/swift:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( >=dev-libs/libpqxx-6.4.5:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]')
+ dev-util/cppunit
+ net-irc/ngircd
+ )
+"
+
+# Tests are currently restricted, as they do completly fail
+RESTRICT="test"
+
+python_check_deps() {
+ has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ cd tests/libtransport && "${EPYTHON}" ../start.py || die
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: a0ae8b276ee3a457b446a715f16196d2d5603053
Author: Conrad Kostecki kostecki com>
AuthorDate: Tue Sep 17 18:01:52 2019 +
Commit: Andrey Utkin gentoo org>
CommitDate: Fri Sep 20 08:46:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ae8b27
net-im/spectrum2: drop old version
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Conrad Kostecki kostecki.com>
Signed-off-by: Andrey Utkin gentoo.org>
net-im/spectrum2/Manifest | 1 -
net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild | 118 --
net-im/spectrum2/spectrum2-2.0.12.ebuild | 118 --
3 files changed, 237 deletions(-)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 195a8a6de02..7c194ddbe6e 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,2 +1 @@
-DIST spectrum2-2.0.10.1.tar.gz 844983 BLAKE2B
f10a057f35ecb865497e26b6d31d37c895b351d7c93e7c00bf9d58bf855b49ee1ce0acbeab841a442ab2ab702b022675ca4478521ecac2f6d0bdb9d7e00b9060
SHA512
dde84e67b2ade8649a38027c398defd4dc911ed402e913779aca0b29aa801f1c17ef89b1b3abf91c3189e75b32e9162d6e9d52f90ce537091b65fb791a826357
DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B
22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7
SHA512
bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
diff --git a/net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild
b/net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild
deleted file mode 100644
index be621d22a70..000
--- a/net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-any-r1 systemd user
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im;
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- dev-libs/log4cxx
- dev-libs/jsoncpp:=
- dev-libs/openssl:0=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:0=
- net-im/swift:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( dev-libs/libpqxx:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]')
- dev-util/cppunit
- net-irc/ngircd
- )
-"
-
-# Tests are currently restricted, as they do completly fail
-RESTRICT="test"
-
-python_check_deps() {
- has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- enewgroup spectrum
- enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
-
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd tests/libtransport && "${EPYTHON}" ../start.py || die
-}
-
-src_install() {
- cmake-utils_src_install
-
- diropts -o spectrum -g spectrum
- keepdir /var/log/spectrum2 /var/lib/spectrum2
- diropts
-
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
-
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 6a578767b87cd684653a9411c5c9737c6b2ebffa
Author: Conrad Kostecki kostecki com>
AuthorDate: Sun Jul 21 21:13:43 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jul 21 21:46:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a578767
net-im/spectrum2: bump to version 2.0.12
2.0.12 fixes compilation with postgres
and needs dev-libs/libpqxx from testing.
Closes: https://bugs.gentoo.org/690408
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Conrad Kostecki kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/12506
Signed-off-by: Andreas Sturmlechner gentoo.org>
net-im/spectrum2/Manifest| 1 +
net-im/spectrum2/spectrum2-2.0.12.ebuild | 118 +++
2 files changed, 119 insertions(+)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 8547a8c9789..195a8a6de02 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1 +1,2 @@
DIST spectrum2-2.0.10.1.tar.gz 844983 BLAKE2B
f10a057f35ecb865497e26b6d31d37c895b351d7c93e7c00bf9d58bf855b49ee1ce0acbeab841a442ab2ab702b022675ca4478521ecac2f6d0bdb9d7e00b9060
SHA512
dde84e67b2ade8649a38027c398defd4dc911ed402e913779aca0b29aa801f1c17ef89b1b3abf91c3189e75b32e9162d6e9d52f90ce537091b65fb791a826357
+DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B
22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7
SHA512
bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
diff --git a/net-im/spectrum2/spectrum2-2.0.12.ebuild
b/net-im/spectrum2/spectrum2-2.0.12.ebuild
new file mode 100644
index 000..91e9038632e
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.12.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-any-r1 systemd user
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ dev-libs/log4cxx
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:0=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:0=
+ net-im/swift:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( >=dev-libs/libpqxx-6.4.5:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]')
+ dev-util/cppunit
+ net-irc/ngircd
+ )
+"
+
+# Tests are currently restricted, as they do completly fail
+RESTRICT="test"
+
+python_check_deps() {
+ has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ enewgroup spectrum
+ enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
+
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ cd tests/libtransport && "${EPYTHON}" ../start.py || die
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: b1ff6a5fe31857bad5a74c6e412461d820d9eaa7
Author: Conrad Kostecki kostecki com>
AuthorDate: Sun Jul 21 08:48:53 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jul 21 21:46:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ff6a5f
net-im/spectrum2: use correct python eclass
Switching from python-single-r1 eclass to python-any-r1 eclass,
since python is only used for tests and not during runtime.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Conrad Kostecki kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/12485
Signed-off-by: Andreas Sturmlechner gentoo.org>
...trum2-2.0.10.1-r1.ebuild => spectrum2-2.0.10.1-r2.ebuild} | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild
b/net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild
similarity index 90%
rename from net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild
rename to net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild
index d528d246079..be621d22a70 100644
--- a/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-single-r1 systemd user
+inherit cmake-utils python-any-r1 systemd user
DESCRIPTION="An open source instant messaging transport"
HOMEPAGE="https://www.spectrum.im;
@@ -49,11 +49,11 @@ RDEPEND="
whatsapp? ( net-im/transwhat )"
DEPEND="
- ${PYTHON_DEPS}
${RDEPEND}
doc? ( app-doc/doxygen )
test? (
- dev-python/sleekxmpp[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]')
dev-util/cppunit
net-irc/ngircd
)
@@ -62,11 +62,15 @@ DEPEND="
# Tests are currently restricted, as they do completly fail
RESTRICT="test"
+python_check_deps() {
+ has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
+}
+
pkg_setup() {
enewgroup spectrum
enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
- use test && python-single-r1_pkg_setup
+ use test && python-any-r1_pkg_setup
}
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/, net-im/spectrum2/files/
commit: a2b68e754ef03512b56ed71480bd28d4943ee62c
Author: Conrad Kostecki kostecki com>
AuthorDate: Sun Mar 24 13:11:54 2019 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Mar 26 16:45:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b68e75
net-im/spectrum2: drop old version.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Conrad Kostecki kostecki.com>
Signed-off-by: Patrice Clement gentoo.org>
net-im/spectrum2/Manifest | 1 -
net-im/spectrum2/files/spectrum2.tmpfiles | 1 -
net-im/spectrum2/spectrum2-2.0.10.1.ebuild | 114 -
net-im/spectrum2/spectrum2-2.0.10.ebuild | 114 -
4 files changed, 230 deletions(-)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 8e32d4648ab..8547a8c9789 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,2 +1 @@
DIST spectrum2-2.0.10.1.tar.gz 844983 BLAKE2B
f10a057f35ecb865497e26b6d31d37c895b351d7c93e7c00bf9d58bf855b49ee1ce0acbeab841a442ab2ab702b022675ca4478521ecac2f6d0bdb9d7e00b9060
SHA512
dde84e67b2ade8649a38027c398defd4dc911ed402e913779aca0b29aa801f1c17ef89b1b3abf91c3189e75b32e9162d6e9d52f90ce537091b65fb791a826357
-DIST spectrum2-2.0.10.tar.gz 844427 BLAKE2B
cb57bede4bfe996219ca5d0e62167643eb51fe44fd607400de8c2640f3892af9d089b6d62d7c25485049ef2a37066b3f6de46bfb5a6b7107fef6eb31dcf736f3
SHA512
b74f6f543aaa923a589b8b0b1007dec260af6fb66e5475c0294216713568dd93f4f52f39e6cbe4c6263efb0a479ac4d8095709d758e4faac81fc7d4712fd0b2c
diff --git a/net-im/spectrum2/files/spectrum2.tmpfiles
b/net-im/spectrum2/files/spectrum2.tmpfiles
deleted file mode 100644
index 4ce6f1c3ca7..000
--- a/net-im/spectrum2/files/spectrum2.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/spectrum2 0700 specturm spectrum - -
diff --git a/net-im/spectrum2/spectrum2-2.0.10.1.ebuild
b/net-im/spectrum2/spectrum2-2.0.10.1.ebuild
deleted file mode 100644
index 317a25b2ab5..000
--- a/net-im/spectrum2/spectrum2-2.0.10.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1 systemd user
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im;
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/libev:=
- dev-libs/log4cxx
- dev-libs/jsoncpp:=
- dev-libs/openssl:0=
- dev-libs/popt
- dev-libs/protobuf:=
- net-dns/libidn:0=
- net-im/swift:=
- net-misc/curl
- sys-libs/zlib:=
- frotz? ( !games-engines/frotz )
- irc? ( net-im/libcommuni )
- mysql? (
- || (
- dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
- )
- )
- postgres? ( dev-libs/libpqxx:= )
- purple? (
- dev-libs/glib
- net-im/pidgin:=
- )
- sms? ( app-mobilephone/smstools )
- sqlite? ( dev-db/sqlite:3 )
- twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )"
-
-DEPEND="
- ${PYTHON_DEPS}
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? (
- dev-python/sleekxmpp[${PYTHON_USEDEP}]
- dev-util/cppunit
- net-irc/ngircd
- )
-"
-
-# Tests are currently restricted, as they do completly fail
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup spectrum
- enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
-
- use test && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Respect users LDFLAGS
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DOCS="$(usex doc)"
- -DENABLE_FROTZ="$(usex frotz)"
- -DENABLE_IRC="$(usex irc)"
- -DENABLE_MYSQL="$(usex mysql)"
- -DENABLE_PQXX="$(usex postgres)"
- -DENABLE_PURPLE="$(usex purple)"
- -DENABLE_SMSTOOLS3="$(usex sms)"
- -DENABLE_SQLITE3="$(usex sqlite)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_TWITTER="$(usex twitter)"
- -DENABLE_XMPP="$(usex xmpp)"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd tests/libtransport && "${EPYTHON}" ../start.py || die
-}
-
-src_install() {
- cmake-utils_src_install
-
- diropts -o spectrum -g
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
commit: 48242c09c959b315f30bcaacdcbcdffdd464005f
Author: Conrad Kostecki kostecki com>
AuthorDate: Sun Mar 24 13:11:09 2019 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Mar 26 16:45:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48242c09
net-im/spectrum2: fix wrong user in systemd tmpfiles.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Conrad Kostecki kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/11479
Signed-off-by: Patrice Clement gentoo.org>
net-im/spectrum2/files/spectrum2.tmpfiles-r1 | 1 +
net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild | 114 ++
2 files changed, 115 insertions(+)
diff --git a/net-im/spectrum2/files/spectrum2.tmpfiles-r1
b/net-im/spectrum2/files/spectrum2.tmpfiles-r1
new file mode 100644
index 000..90c020f13d9
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2.tmpfiles-r1
@@ -0,0 +1 @@
+d /run/spectrum2 0700 spectrum spectrum - -
diff --git a/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild
b/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild
new file mode 100644
index 000..d528d246079
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1 systemd user
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ dev-libs/log4cxx
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:0=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:0=
+ net-im/swift:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( dev-libs/libpqxx:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ dev-python/sleekxmpp[${PYTHON_USEDEP}]
+ dev-util/cppunit
+ net-irc/ngircd
+ )
+"
+
+# Tests are currently restricted, as they do completly fail
+RESTRICT="test"
+
+pkg_setup() {
+ enewgroup spectrum
+ enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
+
+ use test && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ cd tests/libtransport && "${EPYTHON}" ../start.py || die
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
commit: d1ffc1ff3349eabd0f7ee13a6fe77407cb284cc1
Author: Andrey Utkin gentoo org>
AuthorDate: Mon Mar 4 19:21:14 2019 +
Commit: Andrey Utkin gentoo org>
CommitDate: Sun Mar 10 02:18:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ffc1ff
net-im/spectrum2: drop broken 'debug' USE flag
Switching to Debug CMake configuration leads to an odd effect.
Users can just supply extra CFLAGS for better debugging info, which is
exactly what Debug CMake configuration does.
No revbump since this is a build failure issue.
Successful installations don't need a rebuild.
Bug: https://bugs.gentoo.org/674498
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andrey Utkin gentoo.org>
.../files/spectrum2-2.0.9-remove_debug_cflags.patch | 13 -
net-im/spectrum2/spectrum2-2.0.10.ebuild| 10 +-
2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch
b/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch
deleted file mode 100644
index 19e3b83d230..000
--- a/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
a/CMakeLists.txt 2018-09-17 09:46:40.0 +0200
-+++ b/CMakeLists.txt 2018-09-20 21:04:29.0 +0200
-@@ -384,10 +384,6 @@
- endif()
-
- if(CMAKE_BUILD_TYPE MATCHES Debug)
-- if (CMAKE_COMPILER_IS_GNUCXX)
-- ADD_DEFINITIONS(-O0)
-- ADD_DEFINITIONS(-ggdb)
-- endif()
- ADD_DEFINITIONS(-DDEBUG)
- message("Debug : yes")
- else(CMAKE_BUILD_TYPE MATCHES Debug)
diff --git a/net-im/spectrum2/spectrum2-2.0.10.ebuild
b/net-im/spectrum2/spectrum2-2.0.10.ebuild
index ddc335eca68..317a25b2ab5 100644
--- a/net-im/spectrum2/spectrum2-2.0.10.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.10.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter
whatsapp xmpp"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp
xmpp"
REQUIRED_USE="|| ( mysql postgres sqlite )"
RDEPEND="
@@ -59,8 +59,6 @@ DEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-2.0.9-remove_debug_cflags.patch" )
-
# Tests are currently restricted, as they do completly fail
RESTRICT="test"
@@ -75,16 +73,10 @@ src_prepare() {
# Respect users LDFLAGS
sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
- # Respect users CFLAGS, when compiling for debug mode
- # Since Spectrum2 searches for a qt4 compiled libcommuni,
- # it must be patched, to find the qt5 compiled libcommuni,
- # See: https://github.com/SpectrumIM/spectrum2/pull/253
cmake-utils_src_prepare
}
src_configure() {
- use debug && CMAKE_BUILD_TYPE="Debug"
-
local mycmakeargs=(
-DENABLE_DOCS="$(usex doc)"
-DENABLE_FROTZ="$(usex frotz)"
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/
commit: eaf4188b0ddaf58777e96293aa4c5cf3866f328e
Author: Conrad Kostecki kostecki com>
AuthorDate: Tue Feb 26 13:05:14 2019 +
Commit: Andrey Utkin gentoo org>
CommitDate: Tue Feb 26 20:28:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf4188b
net-im/spectrum2: drop old version
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Conrad Kostecki kostecki.com>
Signed-off-by: Andrey Utkin gentoo.org>
net-im/spectrum2/Manifest | 1 -
.../files/spectrum2-2.0.9-use_qt5_libcommuni.patch | 54 -
net-im/spectrum2/spectrum2-2.0.9.ebuild| 125 -
3 files changed, 180 deletions(-)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index d19142bc269..3503d086f65 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,2 +1 @@
DIST spectrum2-2.0.10.tar.gz 844427 BLAKE2B
cb57bede4bfe996219ca5d0e62167643eb51fe44fd607400de8c2640f3892af9d089b6d62d7c25485049ef2a37066b3f6de46bfb5a6b7107fef6eb31dcf736f3
SHA512
b74f6f543aaa923a589b8b0b1007dec260af6fb66e5475c0294216713568dd93f4f52f39e6cbe4c6263efb0a479ac4d8095709d758e4faac81fc7d4712fd0b2c
-DIST spectrum2-2.0.9.tar.gz 842688 BLAKE2B
32cdb95c161aa97338895fb144200ac94d200aefb58300a8f55b03457b3aae1a0ef4a60311f0e2be8e3f3e331625d04ecd61a9583d07794c4398762e1348b939
SHA512
f33d3d327619ebbeeaa8c329b09dbdbef9c66ec7bc06eb6eac8c54e144cbf2d81d2751699bf97ae1d1bf0a94581f3971394a7f06b9a4d69f6248f1497982
diff --git a/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch
b/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch
deleted file mode 100644
index 27e23db4484..000
--- a/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch
+++ /dev/null
@@ -1,54 +0,0 @@
a/CMakeLists.txt 2018-09-17 09:46:40.0 +0200
-+++ b/CMakeLists.txt 2018-09-20 20:57:35.0 +0200
-@@ -182,8 +182,7 @@
- if(ENABLE_IRC)
- find_package(Communi)
-
-- INCLUDE(FindQt4)
-- FIND_PACKAGE(Qt4 COMPONENTS QtCore QtNetwork)
-+ FIND_PACKAGE(Qt5 COMPONENTS Core Network)
- # ADD_DEFINITIONS(${SWIFTEN_CFLAGS})
- ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS)
- # ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)
-@@ -321,7 +320,6 @@
- message("IRC plugin: yes")
- include_directories(${QT_QTNETWORK_INCLUDE_DIR})
- include_directories(${IRC_INCLUDE_DIR})
-- include(${QT_USE_FILE})
- else()
- if(ENABLE_IRC)
- message("IRC plugin: no (install libCommuni and
libprotobuf-dev)")
a/backends/libcommuni/CMakeLists.txt 2018-09-17 09:46:40.0
+0200
-+++ b/backends/libcommuni/CMakeLists.txt 2018-09-20 20:59:31.0
+0200
-@@ -1,14 +1,14 @@
- cmake_minimum_required(VERSION 2.6)
- FILE(GLOB SRC *.cpp)
- FILE(GLOB HEADERS *.h)
--QT4_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
--add_definitions(-DQT_NO_KEYWORDS)
-+QT5_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- ADD_EXECUTABLE(spectrum2_libcommuni_backend ${SRC})
-+include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
-
- if (NOT WIN32)
-- target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY}
Qt4::QtNetwork Qt4::QtCore transport pthread)
-+ target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY}
Qt5::Network Qt5::Core transport pthread)
- else ()
-- target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY}
Qt4::QtNetwork Qt4::QtCore transport)
-+ target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY}
Qt5::Network Qt5::Core transport)
- endif()
- INSTALL(TARGETS spectrum2_libcommuni_backend RUNTIME DESTINATION bin)
-
a/cmake_modules/FindCommuni.cmake 2018-09-17 09:46:40.0 +0200
-+++ b/cmake_modules/FindCommuni.cmake 2018-09-20 21:00:04.0 +0200
-@@ -1,8 +1,7 @@
--find_package(Qt4)
--include( ${QT_USE_FILE} )
-+find_package(Qt5Network)
-
- FIND_LIBRARY(IRC_LIBRARY NAMES IrcCore PATHS ${QT_LIBRARY_DIR})
--FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${QT_INCLUDE_DIR}
PATH_SUFFIXES Communi)
-+FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS
${Qt5Core_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS}"/.." PATH_SUFFIXES Communi)
-
- # message( STATUS ${IRC_LIBRARY})
- if( IRC_LIBRARY AND IRC_INCLUDE_DIR )
diff --git a/net-im/spectrum2/spectrum2-2.0.9.ebuild
b/net-im/spectrum2/spectrum2-2.0.9.ebuild
deleted file mode 100644
index 5533572a03c..000
--- a/net-im/spectrum2/spectrum2-2.0.9.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1 systemd user
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im;
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: cf6c53889128ff85af770e8948e97493d872468e Author: Andrey Utkin gentoo org> AuthorDate: Tue Feb 26 20:24:51 2019 + Commit: Andrey Utkin gentoo org> CommitDate: Tue Feb 26 20:28:30 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6c5388 net-im/spectrum2: boost must be with nls No revbump since this is a build failure issue. Successful installations don't need a rebuild. Bug: https://bugs.gentoo.org/678828 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andrey Utkin gentoo.org> net-im/spectrum2/spectrum2-2.0.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/spectrum2/spectrum2-2.0.10.ebuild b/net-im/spectrum2/spectrum2-2.0.10.ebuild index 285dd6d4982..ddc335eca68 100644 --- a/net-im/spectrum2/spectrum2-2.0.10.ebuild +++ b/net-im/spectrum2/spectrum2-2.0.10.ebuild @@ -18,7 +18,7 @@ IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsap REQUIRED_USE="|| ( mysql postgres sqlite )" RDEPEND=" - dev-libs/boost:= + dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: dbf6d26091cc8c3ff2e5ef24b91810846e236518
Author: Conrad Kostecki kostecki com>
AuthorDate: Sun Jan 27 17:03:47 2019 +
Commit: Andrey Utkin gentoo org>
CommitDate: Mon Jan 28 01:50:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbf6d260
net-im/spectrum2: bump to version 2.0.10
Also bumped to EAPI=7.
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Conrad Kostecki kostecki.com>
Signed-off-by: Andrey Utkin gentoo.org>
net-im/spectrum2/Manifest| 1 +
net-im/spectrum2/spectrum2-2.0.10.ebuild | 122 +++
2 files changed, 123 insertions(+)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index f17b8486402..d19142bc269 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1 +1,2 @@
+DIST spectrum2-2.0.10.tar.gz 844427 BLAKE2B
cb57bede4bfe996219ca5d0e62167643eb51fe44fd607400de8c2640f3892af9d089b6d62d7c25485049ef2a37066b3f6de46bfb5a6b7107fef6eb31dcf736f3
SHA512
b74f6f543aaa923a589b8b0b1007dec260af6fb66e5475c0294216713568dd93f4f52f39e6cbe4c6263efb0a479ac4d8095709d758e4faac81fc7d4712fd0b2c
DIST spectrum2-2.0.9.tar.gz 842688 BLAKE2B
32cdb95c161aa97338895fb144200ac94d200aefb58300a8f55b03457b3aae1a0ef4a60311f0e2be8e3f3e331625d04ecd61a9583d07794c4398762e1348b939
SHA512
f33d3d327619ebbeeaa8c329b09dbdbef9c66ec7bc06eb6eac8c54e144cbf2d81d2751699bf97ae1d1bf0a94581f3971394a7f06b9a4d69f6248f1497982
diff --git a/net-im/spectrum2/spectrum2-2.0.10.ebuild
b/net-im/spectrum2/spectrum2-2.0.10.ebuild
new file mode 100644
index 000..285dd6d4982
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.10.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1 systemd user
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im;
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter
whatsapp xmpp"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/expat
+ dev-libs/libev:=
+ dev-libs/log4cxx
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:0=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:0=
+ net-im/swift:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( dev-libs/libpqxx:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ dev-python/sleekxmpp[${PYTHON_USEDEP}]
+ dev-util/cppunit
+ net-irc/ngircd
+ )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.9-remove_debug_cflags.patch" )
+
+# Tests are currently restricted, as they do completly fail
+RESTRICT="test"
+
+pkg_setup() {
+ enewgroup spectrum
+ enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
+
+ use test && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/"
spectrum/src/CMakeLists.txt || die
+
+ # Respect users CFLAGS, when compiling for debug mode
+ # Since Spectrum2 searches for a qt4 compiled libcommuni,
+ # it must be patched, to find the qt5 compiled libcommuni,
+ # See: https://github.com/SpectrumIM/spectrum2/pull/253
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ use debug && CMAKE_BUILD_TYPE="Debug"
+
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ cd tests/libtransport && "${EPYTHON}" ../start.py || die
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: f78b3b7f82c4de98c22ca940891804f4784f5cd4
Author: Conrad Kostecki kostecki com>
AuthorDate: Sat Nov 24 10:46:29 2018 +
Commit: Andrey Utkin gentoo org>
CommitDate: Sun Nov 25 02:58:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f78b3b7f
net-im/spectrum2: fix build depenencies
The current build of net-im/spectrum2 needs always
net-im/swift and dev-libs/ev to be installed, otherwise it fails.
Closes: https://bugs.gentoo.org/671798
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Conrad Kostecki kostecki.com>
Signed-off-by: Andrey Utkin gentoo.org>
net-im/spectrum2/spectrum2-2.0.9.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-im/spectrum2/spectrum2-2.0.9.ebuild
b/net-im/spectrum2/spectrum2-2.0.9.ebuild
index 42cec5837e6..5533572a03c 100644
--- a/net-im/spectrum2/spectrum2-2.0.9.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.9.ebuild
@@ -20,12 +20,14 @@ REQUIRED_USE="|| ( mysql postgres sqlite )"
RDEPEND="
dev-libs/boost:=
dev-libs/expat
+ dev-libs/libev:=
dev-libs/log4cxx
dev-libs/jsoncpp:=
dev-libs/openssl:0=
dev-libs/popt
dev-libs/protobuf:=
net-dns/libidn:0=
+ net-im/swift:=
net-misc/curl
sys-libs/zlib:=
frotz? ( !games-engines/frotz )
@@ -39,14 +41,12 @@ RDEPEND="
postgres? ( dev-libs/libpqxx:= )
purple? (
dev-libs/glib
- dev-libs/libev:=
net-im/pidgin:=
)
sms? ( app-mobilephone/smstools )
sqlite? ( dev-db/sqlite:3 )
twitter? ( net-misc/curl )
- whatsapp? ( net-im/transwhat )
- xmpp? ( net-im/swift:= )"
+ whatsapp? ( net-im/transwhat )"
DEPEND="
${PYTHON_DEPS}
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/, net-im/spectrum2/files/
commit: 051f912c4915ce603ccba7bc15c34ae708c2b851
Author: Conrad Kostecki kostecki com>
AuthorDate: Sat Nov 17 20:30:38 2018 +
Commit: Andrey Utkin gentoo org>
CommitDate: Sat Nov 24 02:45:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051f912c
net-im/spectrum2: New package
Spectrum2 is an open source instant messaging jabber transport daemon.
Closes: https://bugs.gentoo.org/291437
Package-Manager: Portage-2.3.51, Repoman-2.3.12
RepoMan-Options: --force
Signed-off-by: Conrad Kostecki kostecki.com>
Signed-off-by: Andrey Utkin gentoo.org>
net-im/spectrum2/Manifest | 1 +
.../spectrum2-2.0.9-remove_debug_cflags.patch | 13 +++
.../files/spectrum2-2.0.9-use_qt5_libcommuni.patch | 54 +
net-im/spectrum2/files/spectrum2.initd | 47
net-im/spectrum2/files/spectrum2.service | 12 ++
net-im/spectrum2/files/spectrum2.tmpfiles | 1 +
net-im/spectrum2/metadata.xml | 26 +
net-im/spectrum2/spectrum2-2.0.9.ebuild| 125 +
8 files changed, 279 insertions(+)
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
new file mode 100644
index 000..f17b8486402
--- /dev/null
+++ b/net-im/spectrum2/Manifest
@@ -0,0 +1 @@
+DIST spectrum2-2.0.9.tar.gz 842688 BLAKE2B
32cdb95c161aa97338895fb144200ac94d200aefb58300a8f55b03457b3aae1a0ef4a60311f0e2be8e3f3e331625d04ecd61a9583d07794c4398762e1348b939
SHA512
f33d3d327619ebbeeaa8c329b09dbdbef9c66ec7bc06eb6eac8c54e144cbf2d81d2751699bf97ae1d1bf0a94581f3971394a7f06b9a4d69f6248f1497982
diff --git a/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch
b/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch
new file mode 100644
index 000..19e3b83d230
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt 2018-09-17 09:46:40.0 +0200
b/CMakeLists.txt 2018-09-20 21:04:29.0 +0200
+@@ -384,10 +384,6 @@
+ endif()
+
+ if(CMAKE_BUILD_TYPE MATCHES Debug)
+- if (CMAKE_COMPILER_IS_GNUCXX)
+- ADD_DEFINITIONS(-O0)
+- ADD_DEFINITIONS(-ggdb)
+- endif()
+ ADD_DEFINITIONS(-DDEBUG)
+ message("Debug : yes")
+ else(CMAKE_BUILD_TYPE MATCHES Debug)
diff --git a/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch
b/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch
new file mode 100644
index 000..27e23db4484
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch
@@ -0,0 +1,54 @@
+--- a/CMakeLists.txt 2018-09-17 09:46:40.0 +0200
b/CMakeLists.txt 2018-09-20 20:57:35.0 +0200
+@@ -182,8 +182,7 @@
+ if(ENABLE_IRC)
+ find_package(Communi)
+
+- INCLUDE(FindQt4)
+- FIND_PACKAGE(Qt4 COMPONENTS QtCore QtNetwork)
++ FIND_PACKAGE(Qt5 COMPONENTS Core Network)
+ # ADD_DEFINITIONS(${SWIFTEN_CFLAGS})
+ ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS)
+ # ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)
+@@ -321,7 +320,6 @@
+ message("IRC plugin: yes")
+ include_directories(${QT_QTNETWORK_INCLUDE_DIR})
+ include_directories(${IRC_INCLUDE_DIR})
+- include(${QT_USE_FILE})
+ else()
+ if(ENABLE_IRC)
+ message("IRC plugin: no (install libCommuni and
libprotobuf-dev)")
+--- a/backends/libcommuni/CMakeLists.txt 2018-09-17 09:46:40.0
+0200
b/backends/libcommuni/CMakeLists.txt 2018-09-20 20:59:31.0
+0200
+@@ -1,14 +1,14 @@
+ cmake_minimum_required(VERSION 2.6)
+ FILE(GLOB SRC *.cpp)
+ FILE(GLOB HEADERS *.h)
+-QT4_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+-add_definitions(-DQT_NO_KEYWORDS)
++QT5_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+ ADD_EXECUTABLE(spectrum2_libcommuni_backend ${SRC})
++include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
+
+ if (NOT WIN32)
+- target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY}
Qt4::QtNetwork Qt4::QtCore transport pthread)
++ target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY}
Qt5::Network Qt5::Core transport pthread)
+ else ()
+- target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY}
Qt4::QtNetwork Qt4::QtCore transport)
++ target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY}
Qt5::Network Qt5::Core transport)
+ endif()
+ INSTALL(TARGETS spectrum2_libcommuni_backend RUNTIME DESTINATION bin)
+
+--- a/cmake_modules/FindCommuni.cmake 2018-09-17 09:46:40.0 +0200
b/cmake_modules/FindCommuni.cmake 2018-09-20 21:00:04.0 +0200
+@@ -1,8 +1,7 @@
+-find_package(Qt4)
+-include( ${QT_USE_FILE} )
++find_package(Qt5Network)
+
+ FIND_LIBRARY(IRC_LIBRARY NAMES IrcCore PATHS
[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/
commit: 15dad3aa11218fdda4931250d3cd90efa0330ce8 Author: Andrey Utkin gentoo org> AuthorDate: Sun Nov 18 18:42:59 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sat Nov 24 02:45:22 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15dad3aa net-im/spectrum2: add myself as comaintainer Package-Manager: Portage-2.3.49, Repoman-2.3.12 Signed-off-by: Andrey Utkin gentoo.org> net-im/spectrum2/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/net-im/spectrum2/metadata.xml b/net-im/spectrum2/metadata.xml index d6eaa6f54e2..d7eb552115d 100644 --- a/net-im/spectrum2/metadata.xml +++ b/net-im/spectrum2/metadata.xml @@ -9,6 +9,10 @@ proxy-ma...@gentoo.org Proxy Maintainers + + andrey_ut...@gentoo.org + Andrey Utkin + Spectrum is an open source instant messaging transport. It allows users to chat together even when they are using
