Remove old.

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

10 files changed, 9 insertions, 242 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 12f2d63d547c..601d7e6bd0a0 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/openjpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.54 2011/10/23 15:15:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.55 2011/10/23 19:28:42 radhermit Exp $
+
+  23 Oct 2011; Tim Harder <radhermit@gentoo.org>
+  -files/openjpeg-1.1.1-Makefile.patch, -files/openjpeg-1.2-Makefile.patch,
+  -openjpeg-1.3-r3.ebuild, -files/openjpeg-1.3-Makefile.patch,
+  -files/openjpeg-1.3-codec-Makefile, -files/openjpeg-1.3-darwin.patch,
+  -files/openjpeg-1.3-freebsd.patch, -files/openjpeg-1.3-r3-codec-Makefile,
+  metadata.xml:
+  Remove old.
 
   23 Oct 2011; Raúl Porcel <armin76@gentoo.org> openjpeg-1.4-r1.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #373499
diff --git a/media-libs/openjpeg/files/openjpeg-1.1.1-Makefile.patch b/media-libs/openjpeg/files/openjpeg-1.1.1-Makefile.patch
deleted file mode 100644
index d783e28a0566..000000000000
--- a/media-libs/openjpeg/files/openjpeg-1.1.1-Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- OpenJPEG/Makefile.orig	2007-02-13 09:49:00.000000000 +0100
-+++ OpenJPEG/Makefile	2007-02-28 08:28:58.000000000 +0100
-@@ -36,7 +36,7 @@
- dist: OpenJPEG
- 	mkdir -p dist
- 	cp *.a dist
--	mv *.so dist
-+	cp *.so dist
- 	cp libopenjpeg/openjpeg.h dist
- 
- dos2unix:
-@@ -51,7 +51,7 @@
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CC) $(LDFLAGS) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
- 
- install:
- 	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
diff --git a/media-libs/openjpeg/files/openjpeg-1.2-Makefile.patch b/media-libs/openjpeg/files/openjpeg-1.2-Makefile.patch
deleted file mode 100644
index 3ed124d9ab69..000000000000
--- a/media-libs/openjpeg/files/openjpeg-1.2-Makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur a/Makefile b/Makefile
---- a/Makefile	2007-06-04 14:27:25 +0100
-+++ b/Makefile	2007-08-23 11:38:25 +0100
-@@ -54,15 +54,15 @@
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
- 
- install: OpenJPEG
- 	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
--	install -m 644 -o root -g root $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
-+	install -m 644 $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
- 	ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)'
--	install -m 755 -o root -g root $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
-+	install -m 755 $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
- 	ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)'
--	install -m 644 -o root -g root libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'
-+	install -m 644 libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'
- 	-ldconfig
- 
- clean:
diff --git a/media-libs/openjpeg/files/openjpeg-1.3-Makefile.patch b/media-libs/openjpeg/files/openjpeg-1.3-Makefile.patch
deleted file mode 100644
index 5dfd6a91e72f..000000000000
--- a/media-libs/openjpeg/files/openjpeg-1.3-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -NrU5 OpenJPEG_v1_3.orig/Makefile OpenJPEG_v1_3/Makefile
---- OpenJPEG_v1_3.orig/Makefile	2009-02-09 21:25:42.000000000 +0100
-+++ OpenJPEG_v1_3/Makefile	2009-02-09 21:34:35.000000000 +0100
-@@ -24,11 +24,11 @@
- MODULES = $(SRCS:.c=.o)
- CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
- 
- TARGET  = openjpeg
- STATICLIB = lib$(TARGET).a
--SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
-+SHAREDLIB = lib$(TARGET).so.$(VER_MAJOR).$(VER_MINOR)
- LIBNAME = lib$(TARGET).so.$(VER_MAJOR)
- 
- 
- 
- default: all
-@@ -52,20 +52,20 @@
- 
- $(STATICLIB): $(MODULES)
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
- 
- install: OpenJPEG
- 	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
--	install -m 644 -o root -g root $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
-+	install -m 644 $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
- 	ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)'
--	install -m 755 -o root -g root $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
-+	install -m 755 $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
- 	ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)'
--	install -m 644 -o root -g root libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'
--	-ldconfig
-+	ln -sf $(LIBNAME) '$(DESTDIR)$(INSTALL_LIBDIR)/lib$(TARGET).so'
-+	install -m 644 libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'
- 
- clean:
- 	rm -rf core dist/ u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
- 
- osx:
diff --git a/media-libs/openjpeg/files/openjpeg-1.3-codec-Makefile b/media-libs/openjpeg/files/openjpeg-1.3-codec-Makefile
deleted file mode 100644
index 8a07423fd9a3..000000000000
--- a/media-libs/openjpeg/files/openjpeg-1.3-codec-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k
-
-CFLAGS += -lstdc++ # -g -p -pg
-
-PREFIX = /usr
-INSTALL_BINDIR = $(PREFIX)/bin
-
-all: j2k_to_image image_to_j2k
-
-j2k_to_image: j2k_to_image.c ../libopenjpeg.a
-	$(CC) $(CFLAGS) $(LDFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-
-image_to_j2k: image_to_j2k.c ../libopenjpeg.a
-	$(CC) $(CFLAGS) $(LDFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-
-clean:
-	rm -f j2k_to_image image_to_j2k
-
-install: all
-	install -d '$(DESTDIR)$(INSTALL_BINDIR)'
-	install -m 755 j2k_to_image image_to_j2k '$(DESTDIR)$(INSTALL_BINDIR)'
diff --git a/media-libs/openjpeg/files/openjpeg-1.3-darwin.patch b/media-libs/openjpeg/files/openjpeg-1.3-darwin.patch
deleted file mode 100644
index 7115ebadc38a..000000000000
--- a/media-libs/openjpeg/files/openjpeg-1.3-darwin.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-* <grobian@gentoo.org>: small compilation fix for Darwin, and produce
-                        correct(ly named) dylibs
-
---- libopenjpeg/opj_malloc.h
-+++ libopenjpeg/opj_malloc.h
-@@ -75,7 +75,7 @@
- #else /* Not WIN32 */

- 	#if defined(__sun)

- 			#define HAVE_MEMALIGN

--		#elif defined(__GNUC__)

-+		#elif defined(__GNUC__) && !defined(__APPLE__)

- 			#if defined(__FreeBSD__)

- 			#include <stdlib.h>

- 			#include <osreldate.h>

---- Makefile
-+++ Makefile
-@@ -26,8 +26,15 @@
- 
- TARGET  = openjpeg
- STATICLIB = lib$(TARGET).a
-+ifeq ($(TARGOS),Darwin)
-+SHAREDLIB = lib$(TARGET).$(VER_MAJOR).$(VER_MINOR).dylib
-+LIBNAME = lib$(TARGET).$(VER_MAJOR).dylib
-+LIBCMD = -dynamiclib -install_name $(INSTALL_LIBDIR)/$(LIBNAME)
-+else
- SHAREDLIB = lib$(TARGET).so.$(VER_MAJOR).$(VER_MINOR)
- LIBNAME = lib$(TARGET).so.$(VER_MAJOR)
-+LIBCMD = -shared -Wl,-soname,$(LIBNAME)
-+endif
- 
- 
- 
-@@ -54,7 +61,7 @@
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CC) $(LDFLAGS) $(LIBCMD) -o $@ $(MODULES) $(LIBRARIES)
- 
- install: OpenJPEG
- 	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
diff --git a/media-libs/openjpeg/files/openjpeg-1.3-freebsd.patch b/media-libs/openjpeg/files/openjpeg-1.3-freebsd.patch
deleted file mode 100644
index 5dbe02ca8641..000000000000
--- a/media-libs/openjpeg/files/openjpeg-1.3-freebsd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/ports/graphics/openjpeg/files/patch-opj_malloc.h?rev=1.1;content-type=text%2Fplain
-
-patch modified not to contain a bogus empty #if block
-
---- libopenjpeg/opj_malloc.h
-+++ libopenjpeg/opj_malloc.h
-@@ -76,8 +76,13 @@
- 	#if defined(__sun)

- 			#define HAVE_MEMALIGN

- 		#elif defined(__GNUC__)

-+			#if defined(__FreeBSD__)

-+			#include <stdlib.h>

-+			#include <osreldate.h>

-+			#else

- 			#define HAVE_MEMALIGN

- 			#include <malloc.h>		

-+			#endif

- 		/* Linux x86_64 and OSX always align allocations to 16 bytes */

- 		#elif !defined(__amd64__) && !defined(__APPLE__)	

- 			/* FIXME: Yes, this is a big assumption */

diff --git a/media-libs/openjpeg/files/openjpeg-1.3-r3-codec-Makefile b/media-libs/openjpeg/files/openjpeg-1.3-r3-codec-Makefile
deleted file mode 100644
index 131614ccb100..000000000000
--- a/media-libs/openjpeg/files/openjpeg-1.3-r3-codec-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k
-
-CPPFLAGS += -I../libopenjpeg
-LDLIBS += -lopenjpeg -ltiff
-LDFLAGS += -L..
-
-PREFIX = /usr
-INSTALL_BINDIR = $(PREFIX)/bin
-
-all: j2k_to_image image_to_j2k
-
-common = index.o convert.o #compat/getopt.o
-
-j2k_to_image: j2k_to_image.o ${common}
-image_to_j2k: image_to_j2k.o ${common}
-
-clean:
-	rm -f *.o j2k_to_image image_to_j2k
-
-install: all
-	install -d '$(DESTDIR)$(INSTALL_BINDIR)'
-	install -m 755 j2k_to_image image_to_j2k '$(DESTDIR)$(INSTALL_BINDIR)'
diff --git a/media-libs/openjpeg/metadata.xml b/media-libs/openjpeg/metadata.xml
index 8aa345c0f2ff..9be90a258970 100644
--- a/media-libs/openjpeg/metadata.xml
+++ b/media-libs/openjpeg/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>graphics</herd>
-  <use>
-    <flag name="tools">Installs tools (j2k_to_image and image_to_j2k)</flag>
-  </use>
 </pkgmetadata>
diff --git a/media-libs/openjpeg/openjpeg-1.3-r3.ebuild b/media-libs/openjpeg/openjpeg-1.3-r3.ebuild
deleted file mode 100644
index 6427300a4cf6..000000000000
--- a/media-libs/openjpeg/openjpeg-1.3-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.3-r3.ebuild,v 1.9 2011/03/25 09:48:06 xarthisius Exp $
-
-inherit eutils toolchain-funcs multilib
-
-MY_PV=${PV//./_}
-DESCRIPTION="An open-source JPEG 2000 codec written in C"
-HOMEPAGE="http://www.openjpeg.org/"
-SRC_URI="http://www.openjpeg.org/openjpeg_v${MY_PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="tools"
-
-DEPEND="tools? ( >=media-libs/tiff-3.8.2 )"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/OpenJPEG_v${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-Makefile.patch #258373
-	cp "${FILESDIR}"/${PF}-codec-Makefile "${S}"/codec/Makefile
-	epatch "${FILESDIR}"/${P}-freebsd.patch #253012
-	epatch "${FILESDIR}"/${P}-darwin.patch # needs to go after freebsd patch
-	sed -i 's:defined(HAVE_STDBOOL_H):1:' libopenjpeg/openjpeg.h || die #305333
-}
-
-src_compile() {
-	tc-export CC AR
-	# XXX: the -fPIC is wrong because it builds the libopenjpeg.a
-	# as a PIC library too.  Should build up two sets of objects.
-	emake CC="$CC" AR="$AR" LIBRARIES="-lm" COMPILERFLAGS="${CFLAGS} ${CPPFLAGS} -fPIC" || die "emake failed"
-	if use tools ; then
-		ln -s libopenjpeg.so.* libopenjpeg.so || die
-		emake -C codec || die "emake failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_LIBDIR="/usr/$(get_libdir)" install || die "install failed"
-	if use tools ; then
-		emake -C codec DESTDIR="${D}" install || die "install failed"
-	fi
-	dodoc ChangeLog
-}