Add 0.4.1 with fix for #409137 and 0.3.2-r2 with backported patch from 0.4.1 for the same bug. Thanks to slepnoga

(Portage version: 2.1.10.57/cvs/Linux x86_64)

5 files changed, 49 insertions, 10 deletions

diff --git a/dev-libs/libee/ChangeLog b/dev-libs/libee/ChangeLog
index 6e17d57d0f19..6e1205e4e353 100644
--- a/dev-libs/libee/ChangeLog
+++ b/dev-libs/libee/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/libee
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libee/ChangeLog,v 1.9 2012/04/22 15:54:38 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libee/ChangeLog,v 1.10 2012/04/23 14:05:00 maksbotan Exp $
+
+*libee-0.4.1 (23 Apr 2012)
+*libee-0.3.2-r2 (23 Apr 2012)
+
+  23 Apr 2012; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/0.3.2-add_math_lib_configure.patch,
+  +files/0.3.2-add_math_lib_pc_in.patch, +libee-0.3.2-r2.ebuild,
+  +libee-0.4.1.ebuild, -libee-0.3.1.ebuild, -libee-0.3.2.ebuild:
+  Add 0.4.1 with fix for #409137 and 0.3.2-r2 with backported patch from 0.4.1
+  for the same bug. Thanks to slepnoga
 
   22 Apr 2012; Maxim Koltsov <maksbotan@gentoo.org> -libee-0.4.0.ebuild:
   Remove 0.4.0 by maintainer's request
diff --git a/dev-libs/libee/files/0.3.2-add_math_lib_configure.patch b/dev-libs/libee/files/0.3.2-add_math_lib_configure.patch
new file mode 100644
index 000000000000..305440cda865
--- /dev/null
+++ b/dev-libs/libee/files/0.3.2-add_math_lib_configure.patch
@@ -0,0 +1,16 @@
+diff -r fb643518cffc configure.ac
+--- a/configure.ac	Sun Apr 22 18:45:47 2012 +0300
++++ b/configure.ac	Sun Apr 22 18:48:05 2012 +0300
+@@ -18,11 +18,8 @@
+ AC_PROG_LIBTOOL
+ 
+ # Checks for libraries.
+-save_LIBS=$LIBS
+-LIBS=
+-#AC_SEARCH_LIBS(clock_gettime, rt)
++AC_SEARCH_LIBS(pow, m)
+ #rt_libs=$LIBS
+-LIBS=$save_LIBS
+ 
+ # We CURRENTLY do NOT need libxml, but this will change at a later stage.
+ # If we need libxml, we need it for features which some may not find essential.
diff --git a/dev-libs/libee/files/0.3.2-add_math_lib_pc_in.patch b/dev-libs/libee/files/0.3.2-add_math_lib_pc_in.patch
new file mode 100644
index 000000000000..61cdedc94e87
--- /dev/null
+++ b/dev-libs/libee/files/0.3.2-add_math_lib_pc_in.patch
@@ -0,0 +1,10 @@
+diff -r fb643518cffc libee.pc.in
+--- a/libee.pc.in	Sun Apr 22 18:45:47 2012 +0300
++++ b/libee.pc.in	Sun Apr 22 18:53:55 2012 +0300
+@@ -6,5 +6,5 @@
+ Name: libee
+ Description: event expression library, based on CEE ideas
+ Version: @VERSION@
+-Libs: -L${libdir} @rt_libs@ -lee 
++Libs: -L${libdir} -lee @rt_libs@
+ Cflags: -I${includedir}
diff --git a/dev-libs/libee/libee-0.3.2.ebuild b/dev-libs/libee/libee-0.3.2-r2.ebuild
index c9861b2f75f0..93a44d39081c 100644
--- a/dev-libs/libee/libee-0.3.2.ebuild
+++ b/dev-libs/libee/libee-0.3.2-r2.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libee/libee-0.3.2.ebuild,v 1.1 2011/11/26 19:33:47 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libee/libee-0.3.2-r2.ebuild,v 1.1 2012/04/23 14:05:00 maksbotan Exp $
 
 EAPI=4
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
+
 inherit autotools-utils
 
 DESCRIPTION="An Event Expression Library inspired by CEE"
@@ -13,7 +15,7 @@ SRC_URI="http://www.libee.org/files/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug static-libs"
 
 DEPEND="dev-libs/libxml2
@@ -21,6 +23,8 @@ DEPEND="dev-libs/libxml2
 RDEPEND="${DEPEND}"
 
 DOCS=(INSTALL ChangeLog)
+PATCHES=("${FILESDIR}"/0.3.2-add_math_lib_configure.patch
+"${FILESDIR}"/0.3.2-add_math_lib_pc_in.patch)
 
 src_configure() {
 	local myeconfargs=(
@@ -31,5 +35,5 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1
+	autotools-utils_src_compile -j1
 }
diff --git a/dev-libs/libee/libee-0.3.1.ebuild b/dev-libs/libee/libee-0.4.1.ebuild
index ab91d6019239..b44bf6600df7 100644
--- a/dev-libs/libee/libee-0.3.1.ebuild
+++ b/dev-libs/libee/libee-0.4.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libee/libee-0.3.1.ebuild,v 1.2 2011/09/18 10:49:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libee/libee-0.4.1.ebuild,v 1.1 2012/04/23 14:05:00 maksbotan Exp $
 
 EAPI=4
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
 inherit autotools-utils
 
 DESCRIPTION="An Event Expression Library inspired by CEE"
@@ -13,7 +12,7 @@ SRC_URI="http://www.libee.org/files/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug static-libs"
 
 DEPEND="dev-libs/libxml2
@@ -31,5 +30,5 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1
+	autotools-utils_src_compile -j1
 }