Version bump.

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

5 files changed, 42 insertions, 58 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/Manifest b/dev-libs/lzo/Manifest
index 532064d59172..f2ea759da5ed 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,9 +1,9 @@
-AUX 1.08-gcc3.patch 738 RMD160 808c9eb1517440b88033e845829972573651175e SHA1 4b30c1f694555ced35396476f7a2534f9511e47f SHA256 27f84a2262adbd1f3a43173241dee13d15c8b617fffbaaecfc9695e1ff422cd3
-AUX lzo-1.08-exec-stack.patch 367 RMD160 cf80e28bf304c88734d7e951807be41d31101241 SHA1 9de7493191b21266441906a3e538d051efc509e1 SHA256 68b50eb59a883c89dc52ace6b22d75c569edbf1c9a59bd7589e5ce4ba21ec0d5
 AUX lzo-2.02-exec-stack.patch 734 RMD160 7829cff33854c8a64a234fed877c48b8bb623484 SHA1 9415301733b46b174faffd4814b4f18972dfd7f1 SHA256 1343ae6699542019b33bfb4a7eba3f8721bd09f6cfe3111b14a75c9b54d8ccbb
 DIST lzo-2.02.tar.gz 599387 RMD160 382154ec7d076e66fdcb6114818193dca180e3ac SHA1 82e1ae75663623516156542f4975a64d3a264b91 SHA256 a2fbecb4dd7c1dab498e3d8b5a0e574e6b8be09c63329b0d29c6fa9adb4a2fc5
 DIST lzo-2.03.tar.gz 626042 RMD160 1c2eb11ba2babd81236128b7fef3676c9db7da51 SHA1 135a50699296e853362a3d11b9f872c74c8b8c5a SHA256 8b1b0da8f757b9ac318e1c15a0eac8bdb56ca902a2dd25beda06c0f265f22591
+DIST lzo-2.04.tar.gz 604424 RMD160 8fcfcd45144d63db397ef1e8b1bd5140e456fdaf SHA1 f5bf5c7ae4116e60513e5788d156ef78946677e7 SHA256 4ee3a040facf39561f13e4ef2ab99a886fd68251a35d612486ed0625cc6ab428
 EBUILD lzo-2.02-r1.ebuild 958 RMD160 619340156eb24ca150c18dc03d5f1caf1a476c1a SHA1 610b9597b1cce5b5a858d5a5b7ace9f5baf5f4b4 SHA256 4d0e0b1c1eca76a86842d212e8010e7f3113aec7add7f35427a2f88a69257e21
 EBUILD lzo-2.03.ebuild 845 RMD160 0277b39ed15f690ae582aafcae252819177d86ae SHA1 fa30b9d0dfb75df927fc8dec75566b494cf2b11a SHA256 75d46f2e8cef67fd2857ce4c606fb404dab39a0b2492af2cda85a6e9d4481d95
-MISC ChangeLog 5413 RMD160 b8f09b666540c9b4f0e38a098478396b0f419fb5 SHA1 8c7a1a9e3796c4ed3a3f0f514fefff14cfa935df SHA256 951afaa70da75a20c8eb68e93020ad002f0aadedebf5667bcd819b4c4d9c23b4
+EBUILD lzo-2.04.ebuild 927 RMD160 9a076e902054a187d7af63e1f618a538f6e721f7 SHA1 2c22a43c0522be1d89479176706fe1f72b7eaebb SHA256 49165f9633651163ed4ab144faf802cb2947d448b872c242e18d39db16acba2b
+MISC ChangeLog 5525 RMD160 e47e9e164746b58674acb3c0d0c692793bdf21c8 SHA1 4b3937916c488f3cac2e2c73f7aa5d96cb02247e SHA256 b8e43f07bd341c8af255fdc6ec11265317294b4a7c74b06292bb0ff72f0cf374
 MISC metadata.xml 295 RMD160 c3fe4bdd973f1354cc7956e35f6947e5e33da29e SHA1 072a94e2ee7e3e2473a2a7fea5f0e539a26d185f SHA256 22070f0c10318b4441106d6fb0e6236ba8f9d7ee87b2d95cade264150e66d9e5
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 '{}' +
+}