Fixed build problems on gentoo/fbsd, bug #157699

Package-Manager: portage-2.1.1-r2

diff --git a/net-im/ekg2/ChangeLog b/net-im/ekg2/ChangeLog
index 1b8e42fc23dedfc48ad2eb7ceca46bf6735a3f01..b08a3a7c77448e05878270d86347d4a4c357f87e 100644 (file)
--- a/net-im/ekg2/ChangeLog
+++ b/net-im/ekg2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/ekg2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.19 2006/12/10 21:38:36 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.20 2006/12/11 17:36:05 sekretarz Exp $
+
+  11 Dec 2006; <sekretarz@gentoo.org> +files/ekg2-20061202-intl.patch,
+  ekg2-20061202.ebuild:
+  Fixed build problems on gentoo/fbsd, bug #157699
 
 *ekg2-20061202 (10 Dec 2006)
 

diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
index f8be5d8013d5d4b17d6a3e4f042d449dd298ffac..f5203dbe1684feb8006bfde61a5b93609056396e 100644 (file)
--- a/net-im/ekg2/Manifest
+++ b/net-im/ekg2/Manifest
@@ -1,3 +1,7 @@
+AUX ekg2-20061202-intl.patch 264 RMD160 1f69a4cb5d03231fc983b43d238e9ce5ccb3e61c SHA1 7d032686486dff781d2560e8072f3650abab6549 SHA256 637787ebfd75e3b24371be2bc2166a339b2435261d360196d9959e5aed497ba1
+MD5 b1b97b83591349fc77cd398e3f892dac files/ekg2-20061202-intl.patch 264
+RMD160 1f69a4cb5d03231fc983b43d238e9ce5ccb3e61c files/ekg2-20061202-intl.patch 264
+SHA256 637787ebfd75e3b24371be2bc2166a339b2435261d360196d9959e5aed497ba1 files/ekg2-20061202-intl.patch 264
 AUX ekg2-20061202-no-default-debug.patch 353 RMD160 03301f7e70e753a5c57e45001c4d05730050c6ed SHA1 ed5e457d1a56b2417bc968251aa15f1115f752a1 SHA256 2cd227706c3dd8da1abb9ed88f0e0867ccdf7257e57da024733ff21f32d63dc6
 MD5 98a4f44753d9c629e1b0292df62dade5 files/ekg2-20061202-no-default-debug.patch 353
 RMD160 03301f7e70e753a5c57e45001c4d05730050c6ed files/ekg2-20061202-no-default-debug.patch 353
@@ -13,14 +17,14 @@ EBUILD ekg2-20061007.ebuild 1296 RMD160 910dade13220bbfb4598827c0a80e0d21b82d5f0
 MD5 8e620088df7114f2c213ce8d618b7a18 ekg2-20061007.ebuild 1296
 RMD160 910dade13220bbfb4598827c0a80e0d21b82d5f0 ekg2-20061007.ebuild 1296
 SHA256 58825670bec00292358b9f9aea142d6406aabce9a271eb5443192103aababd50 ekg2-20061007.ebuild 1296
-EBUILD ekg2-20061202.ebuild 2508 RMD160 0759a244ac6f7b412aa8bbcbf5a28c1e761bc419 SHA1 ca069552a091b11daf5502f1486fd4f1f5ed82a2 SHA256 785c16b405a15bc592c3baecaa0f4795961bcbcc48c9346326ca690b10302aa3
-MD5 be9a87b4be4674d6c1569ed2d97f7bcd ekg2-20061202.ebuild 2508
-RMD160 0759a244ac6f7b412aa8bbcbf5a28c1e761bc419 ekg2-20061202.ebuild 2508
-SHA256 785c16b405a15bc592c3baecaa0f4795961bcbcc48c9346326ca690b10302aa3 ekg2-20061202.ebuild 2508
-MISC ChangeLog 2931 RMD160 eee9348f46aa80b02db6da6b74566c4d8979dd93 SHA1 76319dca978bebd4578fd4d5d1e88ffde70b257f SHA256 ba57d7f3d3fdee8d82f1c259eb72ef69f5cf47781fed5ec7ddd24e6662033ebd
-MD5 e0bc1f7259eb07fe966eaa44c44a3587 ChangeLog 2931
-RMD160 eee9348f46aa80b02db6da6b74566c4d8979dd93 ChangeLog 2931
-SHA256 ba57d7f3d3fdee8d82f1c259eb72ef69f5cf47781fed5ec7ddd24e6662033ebd ChangeLog 2931
+EBUILD ekg2-20061202.ebuild 2561 RMD160 c2020b7d35cc0420e21137e078577f21fc78bea2 SHA1 a9913a36638c36900928610ec9483deef08e38af SHA256 85fe4af67e823b040cd0b7f79ce268a43cdb0cb1845e48142465e0b65d0dd6b3
+MD5 532cb5bf6f8717f8a271bc8fef0b87a4 ekg2-20061202.ebuild 2561
+RMD160 c2020b7d35cc0420e21137e078577f21fc78bea2 ekg2-20061202.ebuild 2561
+SHA256 85fe4af67e823b040cd0b7f79ce268a43cdb0cb1845e48142465e0b65d0dd6b3 ekg2-20061202.ebuild 2561
+MISC ChangeLog 3078 RMD160 8ab6ddcd4f4d9abd26766a6d56f3f8271bee5a9a SHA1 4df4ba66102888348b927b0567c9d14193e84851 SHA256 1070cd513aded02b846c0468623cb77b6d4501cdef589c885f17c975d0101e7b
+MD5 5a4d692bf5c651b5a2a986d4ee1d8a91 ChangeLog 3078
+RMD160 8ab6ddcd4f4d9abd26766a6d56f3f8271bee5a9a ChangeLog 3078
+SHA256 1070cd513aded02b846c0468623cb77b6d4501cdef589c885f17c975d0101e7b ChangeLog 3078
 MISC metadata.xml 259 RMD160 d41dd93dd43c9df66ed7632bb1789a26f4fc2e79 SHA1 0fa86a660e28e2f88cb9108e9a0eed2203c1ae13 SHA256 b878096a29afd76661f01786058d7000eab7c8ae2da54211f87f679c6939aefc
 MD5 19121381ed6ad2931da6c71c9e6f6eb8 metadata.xml 259
 RMD160 d41dd93dd43c9df66ed7632bb1789a26f4fc2e79 metadata.xml 259

diff --git a/net-im/ekg2/ekg2-20061202.ebuild b/net-im/ekg2/ekg2-20061202.ebuild
index 45853bd7fbe026ea1fa7944ed161737c02def462..fdd8da1c77e558c7a24a920c5648047d26081ea5 100644 (file)
--- a/net-im/ekg2/ekg2-20061202.ebuild
+++ b/net-im/ekg2/ekg2-20061202.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-20061202.ebuild,v 1.1 2006/12/10 21:38:36 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-20061202.ebuild,v 1.2 2006/12/11 17:36:05 sekretarz Exp $
 
 DESCRIPTION="Text based Instant Messenger and IRC client that supports protocols like Jabber and Gadu-Gadu"
 HOMEPAGE="http://dev.null.pl/ekg2/"
@@ -8,7 +8,7 @@ SRC_URI="http://dev.null.pl/ekg2/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~x86"
 
 IUSE="gpm jabber ssl spell jpeg gsm python unicode sqlite sqlite3 gif nogg
 gtk perl xosd debug expat static"
@@ -20,8 +20,8 @@ use perl && inherit perl-module
 DEPEND="jabber? ( >=dev-libs/expat-1.95.6 )
        expat? ( >=dev-libs/expat-1.95.6 )
        gpm? ( >=sys-libs/gpm-1.20.1 )
-       ssl? ( >=dev-libs/openssl-0.9.6m
-                       jabber? ( >=net-libs/gnutls-1.0.17 ) )
+       ssl? ( >=dev-libs/openssl-0.9.6m \
+               jabber? ( >=net-libs/gnutls-1.0.17 ) )
        jpeg? ( >=media-libs/jpeg-6b-r2 )
        spell? ( >=app-text/aspell-0.50.5 )
        !nogg? ( >=net-libs/libgadu-1.7.0 )
@@ -42,6 +42,9 @@ pkg_setup() {
 }
 
 src_compile() {
+       libtoolize --copy --force
+       epatch ${FILESDIR}/${P}-intl.patch
+
        # Ekg2 has no debug configure option
        # Instead it features a runtime option which defaults to on
        ! use debug && epatch ${FILESDIR}/${P}-no-default-debug.patch

diff --git a/net-im/ekg2/files/ekg2-20061202-intl.patch b/net-im/ekg2/files/ekg2-20061202-intl.patch
new file mode 100644 (file)
index 0000000..5d5c58b
--- /dev/null
+++ b/net-im/ekg2/files/ekg2-20061202-intl.patch
@@ -0,0 +1,13 @@
+--- configure.ac.old   2006-12-10 14:17:30.000000000 +0100
++++ configure.ac       2006-12-10 14:18:25.000000000 +0100
+@@ -484,7 +484,9 @@
+       COMMON_PLUGINS_CFLAGS="-DPLUGIN_SHARED_LIBS"
+ dnl   LIBS="$LIBS -no-undefined"
+ fi
+- 
++
++LIBS="$LIBS $LIBINTL"
++
+ AC_OUTPUT
+ 
+ echo