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

(Portage version: 2.1.7.16/cvs/Linux i686)

3 files changed, 49 insertions, 7 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/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() {