old

(Portage version: 2.1.6.2/cvs/Linux 2.6.27.7 i686)

6 files changed, 4 insertions, 238 deletions

diff --git a/dev-libs/liboil/files/liboil-0.3.10-sse2revert.diff b/dev-libs/liboil/files/liboil-0.3.10-sse2revert.diff
deleted file mode 100644
index 8f4cfa748f17..000000000000
--- a/dev-libs/liboil/files/liboil-0.3.10-sse2revert.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/as-intrinsics.m4-3.10	2006-12-11 16:04:34.000000000 +0300
-+++ m4/as-intrinsics.m4	2006-12-11 16:06:00.000000000 +0300
-@@ -69,7 +69,7 @@
- 
-   save_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS -msse2"
--  AC_TRY_COMPILE([#include <emmintrin.h>], [__m128i a; a = _mm_setzero_si128(); a = _mm_srli_epi16(a,8)], [flag_ok=yes], [flag_ok=no])
-+  AC_TRY_COMPILE([#include <emmintrin.h>], [__m128d a; a = _mm_setzero_pd(); a = _mm_srli_epi16(a,8)], [flag_ok=yes], [flag_ok=no])
-   CFLAGS="$save_CFLAGS"
- 
-   $1="-msse2"
diff --git a/dev-libs/liboil/files/liboil-0.3.12-dontbuild-examples.patch b/dev-libs/liboil/files/liboil-0.3.12-dontbuild-examples.patch
deleted file mode 100644
index 7b2394e7235c..000000000000
--- a/dev-libs/liboil/files/liboil-0.3.12-dontbuild-examples.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Index: liboil-0.3.12/examples/audioresample/Makefile.am
-===================================================================
---- liboil-0.3.12.orig/examples/audioresample/Makefile.am
-+++ liboil-0.3.12/examples/audioresample/Makefile.am
-@@ -1,8 +1,8 @@
- 
--noinst_PROGRAMS = test_functable1
-+EXTRA_PROGRAMS = test_functable1
- 
--noinst_LTLIBRARIES = libaudioresample.la
--#noinst_PROGRAMS = audioresample_test
-+EXTRA_LTLIBRARIES = libaudioresample.la
-+#EXTRA_PROGRAMS = audioresample_test
- 
- libaudioresample_la_SOURCES = functable.c resample.c
- libaudioresample_la_CFLAGS = $(LIBOIL_CFLAGS) $(GLIB_CFLAGS)
-Index: liboil-0.3.12/examples/huffman/Makefile.am
-===================================================================
---- liboil-0.3.12.orig/examples/huffman/Makefile.am
-+++ liboil-0.3.12/examples/huffman/Makefile.am
-@@ -1,5 +1,5 @@
- 
--noinst_PROGRAMS = huffman_test
-+EXTRA_PROGRAMS = huffman_test
- 
- huffman_test_SOURCES = \
- 	huffman.c \
-Index: liboil-0.3.12/examples/jpeg/Makefile.am
-===================================================================
---- liboil-0.3.12.orig/examples/jpeg/Makefile.am
-+++ liboil-0.3.12/examples/jpeg/Makefile.am
-@@ -1,7 +1,7 @@
- 
- 
--noinst_LTLIBRARIES = libjpeg.la
--noinst_PROGRAMS = jpeg_test jpeg_rgb_test
-+EXTRA_LTLIBRARIES = libjpeg.la
-+EXTRA_PROGRAMS = jpeg_test jpeg_rgb_test
- 
- libjpeg_la_SOURCES = \
- 	jpeg.c \
-Index: liboil-0.3.12/examples/Makefile.am
-===================================================================
---- liboil-0.3.12.orig/examples/Makefile.am
-+++ liboil-0.3.12/examples/Makefile.am
-@@ -3,7 +3,7 @@ SUBDIRS = jpeg md5 uberopt work huffman 
- 
- bin_PROGRAMS = oil-bugreport
- 
--noinst_PROGRAMS = example1 oil-graph oil-inspect oil-test memcpy-speed \
-+EXTRA_PROGRAMS = example1 oil-graph oil-inspect oil-test memcpy-speed \
- 	oil-suggest printcpu oil-mt19937 report oil-random
- 
- 
-Index: liboil-0.3.12/examples/md5/Makefile.am
-===================================================================
---- liboil-0.3.12.orig/examples/md5/Makefile.am
-+++ liboil-0.3.12/examples/md5/Makefile.am
-@@ -1,6 +1,6 @@
- 
- 
--noinst_PROGRAMS = md5sum
-+EXTRA_PROGRAMS = md5sum
- 
- md5sum_SOURCES = md5sum.c
- md5sum_CFLAGS = $(LIBOIL_CFLAGS)
-Index: liboil-0.3.12/examples/taylor/Makefile.am
-===================================================================
---- liboil-0.3.12.orig/examples/taylor/Makefile.am
-+++ liboil-0.3.12/examples/taylor/Makefile.am
-@@ -1,5 +1,5 @@
- 
--noinst_PROGRAMS = example1
-+EXTRA_PROGRAMS = example1
- 
- 
- example1_SOURCES = example1.c
-Index: liboil-0.3.12/examples/uberopt/Makefile.am
-===================================================================
---- liboil-0.3.12.orig/examples/uberopt/Makefile.am
-+++ liboil-0.3.12/examples/uberopt/Makefile.am
-@@ -3,9 +3,9 @@ EXTRA_DIST = example.c
- 
- 
- if HAVE_GLIB
--noinst_PROGRAMS = uberopt
-+EXTRA_PROGRAMS = uberopt
- else
--noinst_PROGRAMS = 
-+EXTRA_PROGRAMS = 
- endif
- 
- uberopt_SOURCES = uberopt.c
-Index: liboil-0.3.12/examples/videoscale/Makefile.am
-===================================================================
---- liboil-0.3.12.orig/examples/videoscale/Makefile.am
-+++ liboil-0.3.12/examples/videoscale/Makefile.am
-@@ -1,7 +1,7 @@
- 
- 
--noinst_LTLIBRARIES = libvideoscale.la
--#noinst_PROGRAMS = videoscale_test
-+EXTRA_LTLIBRARIES = libvideoscale.la
-+#EXTRA_PROGRAMS = videoscale_test
- 
- libvideoscale_la_SOURCES = vs_4tap.c vs_image.c vs_scanline.c
- libvideoscale_la_CFLAGS = $(LIBOIL_CFLAGS)
-Index: liboil-0.3.12/examples/work/Makefile.am
-===================================================================
---- liboil-0.3.12.orig/examples/work/Makefile.am
-+++ liboil-0.3.12/examples/work/Makefile.am
-@@ -1,8 +1,8 @@
- 
- if HAVE_GLIB
--noinst_PROGRAMS = work
-+EXTRA_PROGRAMS = work
- else
--noinst_PROGRAMS = 
-+EXTRA_PROGRAMS = 
- endif
- 
- work_SOURCES = work.c
diff --git a/dev-libs/liboil/liboil-0.3.10-r1.ebuild b/dev-libs/liboil/liboil-0.3.10-r1.ebuild
deleted file mode 100644
index 718f6386e93a..000000000000
--- a/dev-libs/liboil/liboil-0.3.10-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/liboil-0.3.10-r1.ebuild,v 1.11 2007/04/06 13:18:13 dertobi123 Exp $
-
-inherit flag-o-matic autotools
-
-DESCRIPTION="library of simple functions that are optimized for various CPUs"
-HOMEPAGE="http://www.schleef.org/liboil/"
-SRC_URI="http://www.schleef.org/${PN}/download/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0.3"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="=dev-libs/glib-2*"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/liboil-0.3.10-sse2revert.diff
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	strip-flags
-	filter-flags -O?
-	append-flags -O2
-	econf $(use_enable doc gtk-doc) || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-libs/liboil/liboil-0.3.12.ebuild b/dev-libs/liboil/liboil-0.3.12.ebuild
deleted file mode 100644
index 5e7cf0cbf0f6..000000000000
--- a/dev-libs/liboil/liboil-0.3.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/liboil-0.3.12.ebuild,v 1.8 2008/02/12 13:02:55 flameeyes Exp $
-
-inherit flag-o-matic autotools
-
-DESCRIPTION="library of simple functions that are optimized for various CPUs"
-HOMEPAGE="http://liboil.freedesktop.org/"
-SRC_URI="http://liboil.freedesktop.org/download/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0.3"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-DEPEND="=dev-libs/glib-2*"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/liboil-0.3.10-sse2revert.diff
-	epatch "${FILESDIR}"/${P}-dontbuild-examples.patch
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	strip-flags
-	filter-flags -O?
-	append-flags -O2
-	econf $(use_enable doc gtk-doc) || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-libs/liboil/liboil-0.3.14.ebuild b/dev-libs/liboil/liboil-0.3.14.ebuild
deleted file mode 100644
index 82c132b11847..000000000000
--- a/dev-libs/liboil/liboil-0.3.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/liboil-0.3.14.ebuild,v 1.3 2008/07/02 12:35:09 drac Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="library of simple functions that are optimized for various CPUs"
-HOMEPAGE="http://liboil.freedesktop.org/"
-SRC_URI="http://liboil.freedesktop.org/download/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0.3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-DEPEND="=dev-libs/glib-2*"
-
-src_compile() {
-	strip-flags
-	filter-flags -O?
-	append-flags -O2
-	econf $(use_enable doc gtk-doc) || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-libs/liboil/liboil-0.3.15.ebuild b/dev-libs/liboil/liboil-0.3.15.ebuild
index a00c1b0dd4d9..e9d009b2f597 100644
--- a/dev-libs/liboil/liboil-0.3.15.ebuild
+++ b/dev-libs/liboil/liboil-0.3.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/liboil-0.3.15.ebuild,v 1.8 2008/12/07 12:04:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/liboil-0.3.15.ebuild,v 1.9 2008/12/25 07:14:03 ssuominen Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,9 @@ SLOT="0.3"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="doc"
 
-DEPEND="=dev-libs/glib-2*"
+RDEPEND="=dev-libs/glib-2*"
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )"
 
 src_compile() {
 	strip-flags