Version bump, fix for bug #299478 and add ~amd64

Package-Manager: portage-2.1.7.16/cvs/Linux i686

4 files changed, 53 insertions, 10 deletions

diff --git a/net-im/minbif/ChangeLog b/net-im/minbif/ChangeLog
index 25a6d7827b2e..e7f224b259ab 100644
--- a/net-im/minbif/ChangeLog
+++ b/net-im/minbif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/minbif
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/minbif/ChangeLog,v 1.1 2009/11/24 19:22:35 cedk Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/minbif/ChangeLog,v 1.2 2010/02/28 14:05:34 cedk Exp $
+
+*minbif-1.0.1 (28 Feb 2010)
+
+  28 Feb 2010; Cédric Krier <cedk@gentoo.org> -minbif-1.0.ebuild,
+  +minbif-1.0.1.ebuild, +files/minbif-1.0.1-as-needed.patch:
+  Version bump, fix for bug #299478 and add ~amd64
 
 *minbif-1.0 (24 Nov 2009)
 
diff --git a/net-im/minbif/Manifest b/net-im/minbif/Manifest
index 732e95436d2e..1fddc3398c9a 100644
--- a/net-im/minbif/Manifest
+++ b/net-im/minbif/Manifest
@@ -1,5 +1,6 @@
+AUX minbif-1.0.1-as-needed.patch 2031 RMD160 2b6e9091becfdfe4e8d8b7923b1b527b74430f69 SHA1 d533740ea1ef914d1b74584911f8cf64841045aa SHA256 f7e22e3de97e9eebfb8079729ea450634633a5323025cca32cdc94ca8c913347
 AUX minbif.initd 561 RMD160 14741a1d5e4e71c8ac71688a42c46985f74fc557 SHA1 e8e5749c43eb9f539487a8a03b2fe17db0651bc7 SHA256 0a66ca96897ae7fb948150e1d7e01b328de2c2d32521de4c6fe24fdd2f630c7a
-DIST minbif-1.0.tar.gz 142209 RMD160 357e3ad72dc4fa1af67229a092f572c1bf4d2d01 SHA1 cac839f272a3b82e3644898173003f04b71f47e7 SHA256 a558e89d9da5e473e465cf9de900c4af9e90ffda47ae1ef1c681026a0e0d8728
-EBUILD minbif-1.0.ebuild 1663 RMD160 fd0e80be0b678b186a9b98734ddbe8645f60402f SHA1 4856a890d73e1bd2c5d6e7c15cac2fd6dd89386f SHA256 ea5d1ba376a080ecbb795e1a10ea4e14c4e2f76bcc345cc824aa3d6328e30feb
-MISC ChangeLog 343 RMD160 33c26ce2d18299e4c8f774d050e01110dde11e55 SHA1 fc09ffd8dbc84d7e6041de47d6ddf83aba7d1ee6 SHA256 14900ce8959cd48e877ef1862bda3b97bfeb97ce7d80a4090ff1f44c694a2258
+DIST minbif-1.0.1.tar.gz 152815 RMD160 6c22b309c148268533e17767adae8c24159edbb5 SHA1 5e9a6a4877493d6d7bcd70cd4ac324956f1197b3 SHA256 52e632974b65dc82396013979f3c76b8546366728f9f0e4b3685434a670e7771
+EBUILD minbif-1.0.1.ebuild 1723 RMD160 34fea081819576aaa1fa5a8bc1f45c754301ddb2 SHA1 5b975f2f0fb069dd9ee85ba2040ada266f215b7b SHA256 58af4c59b8c84c190fc77a716817a766ae11dd06070425024fe3b99067e6f78e
+MISC ChangeLog 552 RMD160 5be93b8e33e0e88903903704da62006fb45f71a2 SHA1 f6e4cbe1d0bdff55ebfff48a375316c8e728e861 SHA256 285e7a897baa9308dff14fc81e59de9e9f454636a9314f90fbe5c70d9be93ecd
 MISC metadata.xml 327 RMD160 b6a012d8c6f5a181259c75a0623d91b074e1a33e SHA1 7e61b3571a66c89f7904376c480816cc88582357 SHA256 44043fa7fa2bed7edaf4d65a4dfdf39c12de12ddb88582b479a07b1f1d49f07b
diff --git a/net-im/minbif/files/minbif-1.0.1-as-needed.patch b/net-im/minbif/files/minbif-1.0.1-as-needed.patch
new file mode 100644
index 000000000000..7bba09319525
--- /dev/null
+++ b/net-im/minbif/files/minbif-1.0.1-as-needed.patch
@@ -0,0 +1,34 @@
+diff -ru minbif-1.0.1~/CMakeLists.txt minbif-1.0.1/CMakeLists.txt
+--- minbif-1.0.1~/CMakeLists.txt	2010-02-28 14:44:26.000000000 +0100
++++ minbif-1.0.1/CMakeLists.txt	2010-02-28 14:50:19.000000000 +0100
+@@ -19,6 +19,7 @@
+ INCLUDE(CheckLibraryExists)
+ 
+ PKG_CHECK_MODULES(PURPLE REQUIRED purple>=2.4)
++PKG_CHECK_MODULES(GTHREAD REQUIRED gthread-2.0)
+ 
+ OPTION(ENABLE_MINBIF "Enable minbif compilation" ON)
+ OPTION(ENABLE_PLUGIN "Enable plugin build" OFF)
+@@ -74,8 +75,8 @@
+ 	ENDIF (HAVE_LPAM)
+ ENDIF (ENABLE_PAM)
+ 
+-INCLUDE_DIRECTORIES(${PURPLE_INCLUDE_DIRS} ${CACA_INCLUDE_DIRS} ${IMLIB_INCLUDE_DIRS} ${GSTREAMER_INCLUDE_DIRS} ${FARSIGHT_INCLUDE_DIRS} ${LIBXML_INCLUDE_DIRS} "src/")
+-LINK_DIRECTORIES(${PURPLE_LINK_DIRS} ${CACA_LINK_DIRS} ${IMLIB_LINK_DIRS} ${GSTREAMER_LINK_DIRS} ${FARSIGHT_LINK_DIRS} ${LIBXML_LINK_DIRS})
++INCLUDE_DIRECTORIES(${PURPLE_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${CACA_INCLUDE_DIRS} ${IMLIB_INCLUDE_DIRS} ${GSTREAMER_INCLUDE_DIRS} ${FARSIGHT_INCLUDE_DIRS} ${LIBXML_INCLUDE_DIRS} "src/")
++LINK_DIRECTORIES(${PURPLE_LINK_DIRS} ${GTHREAD_LINK_DIRS} ${CACA_LINK_DIRS} ${IMLIB_LINK_DIRS} ${GSTREAMER_LINK_DIRS} ${FARSIGHT_LINK_DIRS} ${LIBXML_LINK_DIRS})
+ 
+ SET(CMAKE_BUILD_TYPE ${BUILD})
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_REENTRANT -D_FILE_OFFSET_BITS=64 -Werror -Wall -Wextra -Wno-unused-parameter")
+diff -ru minbif-1.0.1~/src/CMakeLists.txt minbif-1.0.1/src/CMakeLists.txt
+--- minbif-1.0.1~/src/CMakeLists.txt	2010-02-28 14:44:26.000000000 +0100
++++ minbif-1.0.1/src/CMakeLists.txt	2010-02-28 14:51:40.000000000 +0100
+@@ -44,7 +44,7 @@
+ 		irc/conversation_channel.cpp
+ 	      )
+ 
+-TARGET_LINK_LIBRARIES(${BIN_NAME} "-lpthread -lstdc++" ${PURPLE_LDFLAGS} ${CACA_LDFLAGS} ${IMLIB_LDFLAGS} ${GSTREAMER_LDFLAGS} ${FARSIGHT_LDFLAGS} ${PAM_LDFLAGS})
++TARGET_LINK_LIBRARIES(${BIN_NAME} "-lpthread -lstdc++" ${PURPLE_LIBRARIES} ${GTHREAD_LIBRARIES} ${CACA_LIBRARIES} ${IMLIB_LIBRARIES} ${GSTREAMER_LIBRARIES} ${FARSIGHT_LIBRARIES} ${PAM_LIBRARIES})
+ 
+ INSTALL(TARGETS ${BIN_NAME}
+         DESTINATION bin)
diff --git a/net-im/minbif/minbif-1.0.ebuild b/net-im/minbif/minbif-1.0.1.ebuild
index cb1ffaceaed6..03f56bd1d458 100644
--- a/net-im/minbif/minbif-1.0.ebuild
+++ b/net-im/minbif/minbif-1.0.1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/minbif/minbif-1.0.ebuild,v 1.1 2009/11/24 19:22:35 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/minbif/minbif-1.0.1.ebuild,v 1.1 2010/02/28 14:05:34 cedk Exp $
 
 EAPI=2
 
-inherit cmake-utils
+inherit cmake-utils eutils
 
 DESCRIPTION="an IRC gateway to IM networks"
 HOMEPAGE="http://minbif.im/"
-SRC_URI="http://symlink.me/attachments/download/30/${P}.tar.gz"
+SRC_URI="http://symlink.me/attachments/download/39/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="libcaca gstreamer xinetd"
 
 DEPEND=">=net-im/pidgin-2.6[gstreamer?]
@@ -31,6 +31,8 @@ src_prepare() {
 		sed -i "s/type\s=\s[0-9]/type = 0/" \
 			minbif.conf || die "sed failed"
 	fi
+
+	epatch "${FILESDIR}/${P}-as-needed.patch"
 }
 
 src_configure() {