Version bump wrt bug 322991. Fix building with --as-needed wrt bug 334861, fix parallel build, fix implicit function conversions that resulted in SIGSEGV on amd64. Fix docs wrt bug 322355. Remove old. Claim ownership with Tobias' blessing.

Package-Manager: portage-2.1.9/cvs/Linux x86_64

7 files changed, 141 insertions, 53 deletions

diff --git a/net-irc/irssi-xmpp/ChangeLog b/net-irc/irssi-xmpp/ChangeLog
index 4a27862a8af0..08b1ef9ba3b8 100644
--- a/net-irc/irssi-xmpp/ChangeLog
+++ b/net-irc/irssi-xmpp/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-irc/irssi-xmpp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-xmpp/ChangeLog,v 1.3 2009/12/15 14:43:02 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-xmpp/ChangeLog,v 1.4 2010/09/05 12:03:29 xarthisius Exp $
+
+*irssi-xmpp-0.51 (05 Sep 2010)
+
+  05 Sep 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -irssi-xmpp-0.50.ebuild, +irssi-xmpp-0.51.ebuild,
+  +files/irssi-xmpp-0.51-build_system.patch,
+  +files/irssi-xmpp-0.51-implicit_conversion.patch, metadata.xml:
+  Version bump wrt bug 322991. Fix building with --as-needed wrt bug 334861,
+  fix parallel build, fix implicit function conversions that resulted in
+  SIGSEGV on amd64. Fix docs wrt bug 322355. Remove old. Claim ownership
+  with Tobias' blessing.
 
   15 Dec 2009; Peter Volkov <pva@gentoo.org> metadata.xml:
   metadata.xml: added required herd tag.
diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest
index 3e8545cfe05d..fa3fde2aea25 100644
--- a/net-irc/irssi-xmpp/Manifest
+++ b/net-irc/irssi-xmpp/Manifest
@@ -1,4 +1,18 @@
-DIST irssi-xmpp-0.50.tar.gz 65700 RMD160 58c01d2735c3ec9031df61d346db65399b2534d4 SHA1 bd37dc4759b9cf24c556653583885f4f1be4d945 SHA256 9aa5c656dffb9a067485e90cb62e4ac5fd41c38acd7876c1dc95f52e4ffc9878
-EBUILD irssi-xmpp-0.50.ebuild 1250 RMD160 29b161d52f617902c7fe796fb57682ed9a12b84d SHA1 620206f359381969b655978e541c63dce02ecd7e SHA256 c58ce6970c9f67f4bf47fb1de932e90bc50aedbfba2a3cb159f6c46b04e801a1
-MISC ChangeLog 582 RMD160 a4edcaaecc5888614016cbe51ee9557dc8c53448 SHA1 c66c05e5bf2b2a9c7a3864fcc5a8d588a46b1ac7 SHA256 0e24b99e8cd585e9d8e5ca7c3c3b0836d3408f9833079cabbf8e7d4b9decf4d0
-MISC metadata.xml 412 RMD160 28c88c40ace43aefcf1f5f0b8efe51e419cfd3bf SHA1 d9eaf4b75d45dbc0379af1322f8ecf33496c85cc SHA256 dae1f50c4e04d0e13fcc25180b4ef36c17111e9f1dc07e7c1d47e9a2d74b041d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX irssi-xmpp-0.51-build_system.patch 1490 RMD160 2f8aca9cb2a25238be562403b8ec8832efce8690 SHA1 fb8e5544e9399c70a876d4a83d5f4b8e7ff869dc SHA256 34494a9c656a56b021165247c8859f71f948803829d6d3cc002046b841655cc4
+AUX irssi-xmpp-0.51-implicit_conversion.patch 243 RMD160 078dad956e94e6d3f983738110ab81172ec76619 SHA1 88eafedbccdef80775aebd705af47f8a9fda52f2 SHA256 86c4e7d8e3105af2e8f426ab0c7b4aa74006a56214da49cc94954d0f513105dd
+DIST irssi-xmpp-0.51.tar.gz 67801 RMD160 4c93dc1ab80c7d672a4de040916acdb1a6fa8b0d SHA1 4b54eab0d2dccee87ff2cfdead50a19b52ea671f SHA256 5f8c7f9d51856201b47647befd74eea8e7cecc1ed0ee52916dc15d9e623f686d
+EBUILD irssi-xmpp-0.51.ebuild 982 RMD160 59147fdb764b7d6ac15a6151210d833ec9f09884 SHA1 277780815d0ba3c923d58b668a2106bf22a2a86d SHA256 6df800be70bbeac24cb2fd4b72af6f0c3f1283cbaf5199eccf8d5899307e063d
+MISC ChangeLog 1087 RMD160 ca5d09490ff7b1cbd826a2ee174bb6ef7bdfb164 SHA1 3b79c9e330eef1d4e5102186e3669786b1c2362d SHA256 02c71c652a93e3b52698d91bda110ce8933880eed2502a6c668c5c3d687c1eff
+MISC metadata.xml 254 RMD160 12344e4c1f4e690069ddb38d7496284396ca1715 SHA1 8d35936a32785e654ad2dc11b3c328eccecd4671 SHA256 05f0af9cd4f7023c5510a29a20dbe7f2a2b1973a770c077a4bafa722fb4fd90b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iJwEAQECAAYFAkyDhxoACgkQIiMqcbOVdxSSvgP+IQI6ctA9SzW1CJqDURD+uH0k
+IfK7LFYyVrV2SZnuvP0UEJUxvylY2ONT28XWJc2LRqnJXbS4v9NEfnw21bmdE1QM
+Z/IOEBPCW0WaHToA+YMXgn3CjgKWJ8Hk4i8mmrtu6K0+6IKulzpYPVcj1hxtxsc0
+mFb9I7f8UQOkXeJreEU=
+=B+k8
+-----END PGP SIGNATURE-----
diff --git a/net-irc/irssi-xmpp/files/irssi-xmpp-0.51-build_system.patch b/net-irc/irssi-xmpp/files/irssi-xmpp-0.51-build_system.patch
new file mode 100644
index 000000000000..44ed819ab2fe
--- /dev/null
+++ b/net-irc/irssi-xmpp/files/irssi-xmpp-0.51-build_system.patch
@@ -0,0 +1,61 @@
+* fix as-needed issues
+* fix parallel build 
+
+http://bugs.gentoo.org/show_bug.cgi?id=334861
+
+--- config.mk
++++ config.mk
+@@ -22,11 +22,11 @@
+ LIBS =	${LIB_LIBS}
+ 
+ # flags
+-CFLAGS += -fPIC -std=c99 -DUOFF_T_LONG ${INCS}
+-LDFLAGS += -shared ${LIBS}
++CFLAGS += -fPIC -std=c99 -DUOFF_T_LONG
++LDFLAGS += -shared
+ 
+ # debug
+-CFLAGS += -W -ggdb -Wall -Wno-unused-parameter
++#CFLAGS += -W -ggdb -Wall -Wno-unused-parameter
+ 
+ # compiler and linker
+ CC = cc
+--- src/rules.mk
++++ src/rules.mk
+@@ -4,25 +4,27 @@
+ 
+ OBJS = ${SRCS:.c=.o}
+ 
+-all: ${LIB}
++LIBSO=lib${LIB}.so
++
++all: ${LIBSO}
+ 
+ .c.o:
+-	${CC} ${CFLAGS} -o $@ -c $<
++	${CC} ${CFLAGS} ${INCS} -o $@ -c $<
+ 
+-${LIB}: ${OBJS}
+-	${CC} ${LDFLAGS} -o lib$@.so ${OBJS}
++${LIBSO}: ${OBJS}
++	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+ 
+ clean:
+-	rm -f lib${LIB}.so ${OBJS}
++	rm -f ${LIBSO} ${OBJS}
+ 
+ install: all
+-	@echo installing the module lib${LIB}.so to ${DESTDIR}${IRSSI_LIB}/modules
++	@echo installing the module ${LIBSO} to ${DESTDIR}${IRSSI_LIB}/modules
+ 	install -d ${DESTDIR}${IRSSI_LIB}/modules
+-	install lib${LIB}.so ${DESTDIR}${IRSSI_LIB}/modules
++	install ${LIBSO} ${DESTDIR}${IRSSI_LIB}/modules
+ 
+ uninstall:
+-	@echo deinstalling the module lib${LIB}.so from ${DESTDIR}${IRSSI_LIB}/modules
+-	rm -f ${DESTDIR}${IRSSI_LIB}/modules/lib${LIB}.so
++	@echo deinstalling the module ${LIBSO} from ${DESTDIR}${IRSSI_LIB}/modules
++	rm -f ${DESTDIR}${IRSSI_LIB}/modules/${LIBSO}
+ 
+ user-install:
+ 	env DESTDIR= IRSSI_LIB=~/.irssi ${MAKE} install
diff --git a/net-irc/irssi-xmpp/files/irssi-xmpp-0.51-implicit_conversion.patch b/net-irc/irssi-xmpp/files/irssi-xmpp-0.51-implicit_conversion.patch
new file mode 100644
index 000000000000..603bdd2be199
--- /dev/null
+++ b/net-irc/irssi-xmpp/files/irssi-xmpp-0.51-implicit_conversion.patch
@@ -0,0 +1,11 @@
+Function `strdup' implicitly converted to pointer at xmpp-servers.c:295
+
+--- src/core/xmpp-servers.c
++++ src/core/xmpp-servers.c
+@@ -18,5 +18,6 @@
+ */
+
++#define _GNU_SOURCE
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <string.h>
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.50.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.50.ebuild
deleted file mode 100644
index af43861ac197..000000000000
--- a/net-irc/irssi-xmpp/irssi-xmpp-0.50.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-xmpp/irssi-xmpp-0.50.ebuild,v 1.2 2009/11/03 17:50:43 dertobi123 Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="An irssi plugin providing Jabber/XMPP support"
-HOMEPAGE="http://cybione.org/~irssi-xmpp/"
-SRC_URI="http://cybione.org/~${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=net-irc/irssi-0.8.13
-	>=net-libs/loudmouth-1.2.0[debug]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Patch config.mk to include local CFLAGS and LDFLAGS.
-	# Those can probably be removed after 0.50 since upstream fixed it.
-	# Also set PREFIX and CC to the values we prefer.
-	sed -i \
-		-e "s#^CFLAGS = #CFLAGS = ${CFLAGS} #" \
-		-e "s#^LDFLAGS = #LDFLAGS = ${LDFLAGS} #" \
-		-e "/^PREFIX ?\\?= /cPREFIX = /usr" \
-		-e "/^CC = /cCC = $(tc-getCC)" \
-		config.mk || die "patching config.mk failed"
-	# Patch Makefile to remove /irssi-xmpp suffix for docs.
-	sed -i -e 's#\${IRSSI_DOC}/irssi-xmpp$#${IRSSI_DOC}#' \
-		Makefile || die "patching Makefile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" IRSSI_DOC="/usr/share/doc/${PF}" \
-		install || die "install failed"
-}
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.51.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.51.ebuild
new file mode 100644
index 000000000000..a9566d026a37
--- /dev/null
+++ b/net-irc/irssi-xmpp/irssi-xmpp-0.51.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-xmpp/irssi-xmpp-0.51.ebuild,v 1.1 2010/09/05 12:03:29 xarthisius Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="An irssi plugin providing Jabber/XMPP support"
+HOMEPAGE="http://cybione.org/~irssi-xmpp/"
+SRC_URI="http://cybione.org/~${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=net-irc/irssi-0.8.13
+	>=net-libs/loudmouth-1.2.0[debug]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build_system.patch \
+		"${FILESDIR}"/${P}-implicit_conversion.patch
+	sed -e "s/{MAKE} doc-install/{MAKE}/" \
+		-i Makefile || die #322355
+}
+
+src_compile() {
+	emake PREFIX="/usr" CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" IRSSI_LIB="/usr/$(get_libdir)/irssi" install || die
+	dodoc README NEWS TODO docs/* || die #322355
+}
diff --git a/net-irc/irssi-xmpp/metadata.xml b/net-irc/irssi-xmpp/metadata.xml
index 3893e3e32f34..166c02ec2bc5 100644
--- a/net-irc/irssi-xmpp/metadata.xml
+++ b/net-irc/irssi-xmpp/metadata.xml
@@ -3,12 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-	<email>scy-bugs-gentoo@scytale.name</email>
-	<name>Tim Weber</name>
-	<description>Ebuild maintainer</description>
-</maintainer>
-<maintainer>
-	<email>dertobi123@gentoo.org</email>
-	<description>Proxy maintainer</description>
+	<email>xarthisius@gentoo.org</email>
+	<name>Kacper Kowalik</name>
 </maintainer>
 </pkgmetadata>