commit: f488b698d3c4e4a34cbb7fa0b9ba275b9e2e7836
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 20:59:44 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 21:00:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f488b698
net-im/bitlbee: version bump to 3.5
net-im/bitlbee/Manifest | 1 +
.../{bitlbee-9999.ebuild => bitlbee-3.5.ebuild} | 22 ++-
net-im/bitlbee/bitlbee-9999.ebuild | 22 ++-
.../bitlbee/files/bitlbee-3.5-systemd-user.patch | 10 ++
.../bitlbee/files/bitlbee-3.5-verbose-build.patch | 200 +++++++++++++++++++++
5 files changed, 243 insertions(+), 12 deletions(-)
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 521ead2..aa75627 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,2 +1,3 @@
DIST bitlbee-3.4.1.tar.gz 688072 SHA256
500a0b19943040d67458eb3beb0a63d004abb2aa54a777addeb2a895d4f5c0e1 SHA512
fad297c7a792c932ba74daf7dc894883037842ae5d39a4c831c6615100580073001806c1af60555aa1c775399e8a484d99a4e601e96c6a075e12546e5d153532
WHIRLPOOL
431faa8f065233ee7345d4950d147fea9fc627ba4b78ca0f25bed9627804d3dd4d512a12c9f98bd29a01ebfb680c8cf7e756bb53b38a484b304a0e973c657993
DIST bitlbee-3.4.2.tar.gz 719456 SHA256
69c85554def74f314e3b6e390389a30b0e748f23ef37883e9d7545ee2c45ea57 SHA512
2b839c014cfad037d815aa0e0867dda1b4628ff076d8de6fec1e80ab1499bca565d9afbe104929d492ff68c86b745cc3f76acbeba102766d656f2d359b70302e
WHIRLPOOL
43803ba2bbe6297e05e465912d22b0547bb0f9c3cd184a6c0c924dc023b9d505e3666aa732de83c79249e59aa0e2d6f621ee15c508ccc17eed1898b755f0112e
+DIST bitlbee-3.5.tar.gz 657177 SHA256
549d02181ab303dfe8a219faafd7a1aea7ee642eb071b767f668782a57388319 SHA512
7f044474fff5b1213dddc29e19aae102d1bbe4361cddcf9e58f965c01a58b6f7ed41cbf6ecec050a96f91f55dca15f6df948dee105eff001086d9daa15ba0499
WHIRLPOOL
72434e9d7d43a0d1bf6d1f8c0eda10a099fca262d5431430d0001a7dc7b34e7594e5a6dc0942eebc04f7073bc73d4d8b3f7d00991b21b47d1cfb15ea542715c7
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild
b/net-im/bitlbee/bitlbee-3.5.ebuild
similarity index 90%
copy from net-im/bitlbee/bitlbee-9999.ebuild
copy to net-im/bitlbee/bitlbee-3.5.ebuild
index ae09048..d010143 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-3.5.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
-inherit user systemd
+inherit user systemd toolchain-funcs
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git";
inherit git-r3
else
- SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz";
+ SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz";
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
DESCRIPTION="irc to IM gateway that support multiple IM protocols"
-HOMEPAGE="http://www.bitlbee.org/";
+HOMEPAGE="https://www.bitlbee.org/";
LICENSE="GPL-2"
SLOT="0"
@@ -41,7 +41,7 @@ COMMON_DEPEND="
!libressl? ( dev-libs/openssl:0= )
)
)
- "
+"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
selinux? ( sec-policy/selinux-bitlbee )
@@ -57,7 +57,12 @@ pkg_setup() {
}
src_prepare() {
- [[ ${PV} != "9999" ]] && eapply "${FILESDIR}"/${P}-systemd-user.patch
+ if [[ ${PV} != "9999" ]]; then
+ eapply \
+ "${FILESDIR}"/${P}-systemd-user.patch \
+ "${FILESDIR}"/${P}-verbose-build.patch
+ fi
+
eapply_user
}
@@ -112,6 +117,7 @@ src_configure() {
--systemdsystemunitdir=$(systemd_get_systemunitdir) \
--doc=1 \
--strip=0 \
+ --verbose=1 \
"${myconf[@]}" || die
sed -i \
@@ -119,6 +125,10 @@ src_configure() {
Makefile.settings || die
}
+src_compile() {
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
src_install() {
emake DESTDIR="${D}" install install-etc install-doc install-dev
install-systemd
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild
b/net-im/bitlbee/bitlbee-9999.ebuild
index ae09048..d010143 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
-inherit user systemd
+inherit user systemd toolchain-funcs
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git";
inherit git-r3
else
- SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz";
+ SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz";
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
DESCRIPTION="irc to IM gateway that support multiple IM protocols"
-HOMEPAGE="http://www.bitlbee.org/";
+HOMEPAGE="https://www.bitlbee.org/";
LICENSE="GPL-2"
SLOT="0"
@@ -41,7 +41,7 @@ COMMON_DEPEND="
!libressl? ( dev-libs/openssl:0= )
)
)
- "
+"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
selinux? ( sec-policy/selinux-bitlbee )
@@ -57,7 +57,12 @@ pkg_setup() {
}
src_prepare() {
- [[ ${PV} != "9999" ]] && eapply "${FILESDIR}"/${P}-systemd-user.patch
+ if [[ ${PV} != "9999" ]]; then
+ eapply \
+ "${FILESDIR}"/${P}-systemd-user.patch \
+ "${FILESDIR}"/${P}-verbose-build.patch
+ fi
+
eapply_user
}
@@ -112,6 +117,7 @@ src_configure() {
--systemdsystemunitdir=$(systemd_get_systemunitdir) \
--doc=1 \
--strip=0 \
+ --verbose=1 \
"${myconf[@]}" || die
sed -i \
@@ -119,6 +125,10 @@ src_configure() {
Makefile.settings || die
}
+src_compile() {
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
src_install() {
emake DESTDIR="${D}" install install-etc install-doc install-dev
install-systemd
diff --git a/net-im/bitlbee/files/bitlbee-3.5-systemd-user.patch
b/net-im/bitlbee/files/bitlbee-3.5-systemd-user.patch
new file mode 100644
index 00000000..63fcaea
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.5-systemd-user.patch
@@ -0,0 +1,10 @@
+--- bitlbee-3.5/init/bitlbee.service.in
++++ bitlbee-3.5/init/bitlbee.service.in
+@@ -3,6 +3,7 @@
+
+ [Service]
+ ExecStart=@sbindir@bitlbee -F -n
++User=bitlbee
+ KillMode=process
+
+ [Install]
diff --git a/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch
b/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch
new file mode 100644
index 00000000..7501963
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch
@@ -0,0 +1,200 @@
+Add a --verbose configure flag to enable verbose build output.
+
+--- bitlbee-3.5/configure
++++ bitlbee-3.5/configure
+@@ -38,6 +38,7 @@
+ twitter=1
+ purple=0
+
++verbose=0
+ doc=1
+ debug=0
+ strip=0
+@@ -125,6 +126,8 @@
+ --pidfile=... $pidfile
+ --config=... $config
+
++--verbose=0/1 Disable/enable verbose build $verbose
++
+ --msn=0/1 Disable/enable MSN part $msn
+ --jabber=0/1 Disable/enable Jabber part $jabber
+ --oscar=0/1 Disable/enable Oscar part (ICQ, AIM) $oscar
+@@ -282,6 +285,12 @@
+ debug=1
+ fi
+
++if [ "$verbose" = "0" ]; then
++ echo 'VERBOSE=@' >> Makefile.settings
++else
++ echo 'VERBOSE=' >> Makefile.settings
++fi
++
+ if [ "$debug" = "1" ]; then
+ echo 'DEBUG=1' >> Makefile.settings
+ CFLAGS="$CFLAGS -g3 -DDEBUG -O0"
+--- bitlbee-3.5/lib/Makefile
++++ bitlbee-3.5/lib/Makefile
+@@ -35,12 +35,12 @@
+
+ lib.o: $(objects) $(subdirs)
+ @echo '*' Linking lib.o
+- @$(LD) $(LFLAGS) $(objects) -o lib.o
++ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o lib.o
+
+ $(objects): ../Makefile.settings Makefile
+
+ $(objects): %.o: $(_SRCDIR_)%.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+
+ -include .depend/*.d
+--- bitlbee-3.5/Makefile
++++ bitlbee-3.5/Makefile
+@@ -162,28 +162,28 @@
+ tar czf $$x.tar.gz --exclude=debian --exclude=.git* --exclude=.depend
$$x
+
+ $(subdirs):
+- @$(MAKE) -C $@ $(MAKECMDGOALS)
++ $(MAKE) -C $@ $(MAKECMDGOALS)
+
+ $(OTR_PI): %.so: $(_SRCDIR_)%.c
+ @echo '*' Building plugin $@
+- @$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
++ $(VERBOSE) $(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
+
+ $(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c
+ @echo '*' Building plugin skype
+- @$(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
++ $(VERBOSE) $(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
+
+ $(objects): %.o: $(_SRCDIR_)%.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+
+ $(objects): Makefile Makefile.settings config.h
+
+ $(OUTFILE): $(objects) $(subdirs)
+ @echo '*' Linking $(OUTFILE)
+- @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE)
$(LDFLAGS) $(EFLAGS)
++ $(VERBOSE) $(CC) $(objects) $(subdirobjs) -o $(OUTFILE)
$(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
+ ifneq ($(firstword $(STRIP)), \#)
+ @echo '*' Stripping $(OUTFILE)
+- @-$(STRIP) $(OUTFILE)
++ $(VERBOSE) -$(STRIP) $(OUTFILE)
+ endif
+
+ ctags:
+--- bitlbee-3.5/protocols/jabber/Makefile
++++ bitlbee-3.5/protocols/jabber/Makefile
+@@ -37,10 +37,10 @@
+
+ $(objects): %.o: $(_SRCDIR_)%.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+
+ jabber_mod.o: $(objects)
+ @echo '*' Linking jabber_mod.o
+- @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
++ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o jabber_mod.o
+
+ -include .depend/*.d
+--- bitlbee-3.5/protocols/Makefile
++++ bitlbee-3.5/protocols/Makefile
+@@ -42,18 +42,18 @@
+ rm -rf .depend
+
+ $(subdirs):
+- @$(MAKE) -C $@ $(MAKECMDGOALS)
++ $(MAKE) -C $@ $(MAKECMDGOALS)
+
+ ### MAIN PROGRAM
+
+ protocols.o: $(objects) $(subdirs)
+ @echo '*' Linking protocols.o
+- @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
++ $(VERBOSE) $(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
+
+ $(objects): ../Makefile.settings Makefile
+
+ $(objects): %.o: $(_SRCDIR_)%.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+
+ -include .depend/*.d
+--- bitlbee-3.5/protocols/msn/Makefile
++++ bitlbee-3.5/protocols/msn/Makefile
+@@ -37,10 +37,10 @@
+
+ $(objects): %.o: $(_SRCDIR_)%.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+
+ msn_mod.o: $(objects)
+ @echo '*' Linking msn_mod.o
+- @$(LD) $(LFLAGS) $(objects) -o msn_mod.o
++ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o msn_mod.o
+
+ -include .depend/*.d
+--- bitlbee-3.5/protocols/oscar/Makefile
++++ bitlbee-3.5/protocols/oscar/Makefile
+@@ -38,10 +38,10 @@
+
+ $(objects): %.o: $(_SRCDIR_)%.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+
+ oscar_mod.o: $(objects)
+ @echo '*' Linking oscar_mod.o
+- @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
++ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o oscar_mod.o
+
+ -include .depend/*.d
+--- bitlbee-3.5/protocols/purple/Makefile
++++ bitlbee-3.5/protocols/purple/Makefile
+@@ -38,10 +38,10 @@
+
+ $(objects): %.o: $(_SRCDIR_)%.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+
+ purple_mod.o: $(objects)
+ @echo '*' Linking purple_mod.o
+- @$(LD) $(LFLAGS) $(objects) -o purple_mod.o
++ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o purple_mod.o
+
+ -include .depend/*.d
+--- bitlbee-3.5/protocols/twitter/Makefile
++++ bitlbee-3.5/protocols/twitter/Makefile
+@@ -37,10 +37,10 @@
+
+ $(objects): %.o: $(_SRCDIR_)%.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+
+ twitter_mod.o: $(objects)
+ @echo '*' Linking twitter_mod.o
+- @$(LD) $(LFLAGS) $(objects) -o twitter_mod.o
++ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o twitter_mod.o
+
+ -include .depend/*.d
+--- bitlbee-3.5/tests/Makefile
++++ bitlbee-3.5/tests/Makefile
+@@ -20,8 +20,8 @@
+
+ check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o
../lib/lib.o
+ @echo '*' Linking $@
+- @$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
++ $(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
+
+ %.o: $(_SRCDIR_)%.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $< -o $@
++ $(VERBOSE) $(CC) -c $(CFLAGS) $< -o $@
