Version bump.

(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)

4 files changed, 39 insertions, 55 deletions

diff --git a/dev-libs/lzo/ChangeLog b/dev-libs/lzo/ChangeLog
index dfedf946f8db..1b3baad480a4 100644
--- a/dev-libs/lzo/ChangeLog
+++ b/dev-libs/lzo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/lzo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/ChangeLog,v 1.49 2010/07/18 09:32:47 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/ChangeLog,v 1.50 2010/12/01 17:30:46 ssuominen Exp $
+
+*lzo-2.04 (01 Dec 2010)
+
+  01 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> +lzo-2.04.ebuild:
+  Version bump.
 
   18 Jul 2010; Daniel Black <dragonheart@gentoo.org> -lzo-1.08-r1.ebuild:
   clean out old stuff
diff --git a/dev-libs/lzo/files/1.08-gcc3.patch b/dev-libs/lzo/files/1.08-gcc3.patch
deleted file mode 100644
index 19b351b3d687..000000000000
--- a/dev-libs/lzo/files/1.08-gcc3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- configure.in	2002-07-13 01:31:52.000000000 +0000
-+++ configure.in.patched	2003-09-10 14:37:31.000000000 +0000
-@@ -319,13 +319,13 @@
- [AC_TRY_RUN([#include <stdio.h>
- int test() {
- #if defined(__GNUC__)
--  __asm__ __volatile__ ("
--  .align 4
--mfx_a1:
--  .byte 0
--  .align 4
--mfx_a2:
--  ");
-+  __asm__ __volatile__ (
-+  ".align 4\n"
-+"mfx_a1:\n"
-+  ".byte 0\n"
-+  ".align 4\n"
-+"mfx_a2:\n"
-+  );
- #endif
-   return 0;
- }
-@@ -363,11 +363,11 @@
- #endif
-   int mfx_asm_func();
-   static void test() {
--    __asm__ __volatile__("
--    .globl mfx_asm_func
--    mfx_asm_func:
--      .byte 0
--    ");
-+    __asm__ __volatile__(
-+    ".globl mfx_asm_func\n"
-+    "mfx_asm_func:\n"
-+      ".byte 0\n"
-+    );
-   }
- ], [
-   return mfx_asm_func();
diff --git a/dev-libs/lzo/files/lzo-1.08-exec-stack.patch b/dev-libs/lzo/files/lzo-1.08-exec-stack.patch
deleted file mode 100644
index cda165657f15..000000000000
--- a/dev-libs/lzo/files/lzo-1.08-exec-stack.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur lzo-1.08.old/src/i386/src/leave.sh lzo-1.08/src/i386/src/leave.sh
---- lzo-1.08.old/src/i386/src/leave.sh	2005-12-28 01:18:28.958047816 +0200
-+++ lzo-1.08/src/i386/src/leave.sh	2005-12-28 01:17:49.253083888 +0200
-@@ -93,6 +93,10 @@
- 
- .L_end:
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
-+
- /*
- vi:ts=4
- */
diff --git a/dev-libs/lzo/lzo-2.04.ebuild b/dev-libs/lzo/lzo-2.04.ebuild
new file mode 100644
index 000000000000..2a4bae8c8cc9
--- /dev/null
+++ b/dev-libs/lzo/lzo-2.04.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-2.04.ebuild,v 1.1 2010/12/01 17:30:46 ssuominen Exp $
+
+EAPI=2
+
+DESCRIPTION="An extremely fast compression and decompression library"
+HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
+SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="examples static-libs"
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS doc/*
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h}
+	fi
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}