diff options
| -rw-r--r-- | media-gfx/mirage/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/mirage/mirage-0.9.1.ebuild | 29 | ||||
| -rw-r--r-- | media-gfx/pngcrush/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/pngcrush/files/pngcrush-1.6.2-ascall.patch | 11 | ||||
| -rw-r--r-- | media-gfx/pngcrush/files/pngcrush-1.6.4-modified-debian-patchset-5.patch | 163 | ||||
| -rw-r--r-- | media-gfx/pngcrush/pngcrush-1.6.4-r1.ebuild | 34 |
6 files changed, 11 insertions, 239 deletions
diff --git a/media-gfx/mirage/ChangeLog b/media-gfx/mirage/ChangeLog index 474a1b6cfbb6..48c92bfcaf06 100644 --- a/media-gfx/mirage/ChangeLog +++ b/media-gfx/mirage/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/mirage # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/mirage/ChangeLog,v 1.28 2008/08/24 15:55:52 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/mirage/ChangeLog,v 1.29 2008/08/24 15:59:31 maekke Exp $ + + 24 Aug 2008; Markus Meier <maekke@gentoo.org> -mirage-0.9.1.ebuild: + old 24 Aug 2008; nixnut <nixnut@gentoo.org> mirage-0.9.3.ebuild: Stable on ppc wrt bug 235518 diff --git a/media-gfx/mirage/mirage-0.9.1.ebuild b/media-gfx/mirage/mirage-0.9.1.ebuild deleted file mode 100644 index 80ca1415aa12..000000000000 --- a/media-gfx/mirage/mirage-0.9.1.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/media-gfx/mirage/mirage-0.9.1.ebuild,v 1.5 2008/04/09 20:49:31 maekke Exp $ - -inherit distutils - -DESCRIPTION="Fast and simple GTK+ image viewer" -HOMEPAGE="http://mirageiv.berlios.de/" -SRC_URI="mirror://berlios/mirageiv/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=dev-python/pygtk-2.6" -DEPEND="${RDEPEND}" - -src_install() { - local DOCS="CHANGELOG README TODO TRANSLATORS" - distutils_src_install - - rm -f "${D}/usr/share/mirage/COPYING" - - # Do not install duplicate docs. - for DOC in ${DOCS}; do - rm -f "${D}/usr/share/mirage/${DOC}" - done -} diff --git a/media-gfx/pngcrush/ChangeLog b/media-gfx/pngcrush/ChangeLog index 257d1fd1fa1b..fe2eb694021e 100644 --- a/media-gfx/pngcrush/ChangeLog +++ b/media-gfx/pngcrush/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/pngcrush # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.35 2008/08/24 15:49:13 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.36 2008/08/24 16:03:03 maekke Exp $ + + 24 Aug 2008; Markus Meier <maekke@gentoo.org> + -files/pngcrush-1.6.2-ascall.patch, + -files/pngcrush-1.6.4-modified-debian-patchset-5.patch, + -pngcrush-1.6.4-r1.ebuild: + old 24 Aug 2008; nixnut <nixnut@gentoo.org> pngcrush-1.6.7.ebuild: Stable on ppc wrt bug 235524 diff --git a/media-gfx/pngcrush/files/pngcrush-1.6.2-ascall.patch b/media-gfx/pngcrush/files/pngcrush-1.6.2-ascall.patch deleted file mode 100644 index 06defb5b6ebc..000000000000 --- a/media-gfx/pngcrush/files/pngcrush-1.6.2-ascall.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pngcrush-1.6.2/Makefile -+++ pngcrush-1.6.2/Makefile -@@ -10,7 +10,7 @@ - - # macros -------------------------------------------------------------------- - --GAS_VERSION := $(shell as --version | grep "GNU assembler" | sed -e 's/GNU assembler //' -e 's/ .*//') -+GAS_VERSION := $(shell as --version < /dev/null 2&>1 | grep "GNU assembler" | sed -e 's/GNU assembler //' -e 's/ .*//') - - # uncomment these 2 lines only if you are using an external copy of zlib: - #ZINC = ../../zlib diff --git a/media-gfx/pngcrush/files/pngcrush-1.6.4-modified-debian-patchset-5.patch b/media-gfx/pngcrush/files/pngcrush-1.6.4-modified-debian-patchset-5.patch deleted file mode 100644 index 6762dcb9a25d..000000000000 --- a/media-gfx/pngcrush/files/pngcrush-1.6.4-modified-debian-patchset-5.patch +++ /dev/null @@ -1,163 +0,0 @@ -diff -ur pngcrush-1.6.4-nolib.orig/Makefile pngcrush-1.6.4-nolib/Makefile ---- pngcrush-1.6.4-nolib.orig/Makefile 2006-03-31 04:39:16.000000000 +0300 -+++ pngcrush-1.6.4-nolib/Makefile 2008-04-23 17:30:34.000000000 +0300 -@@ -10,34 +10,40 @@ - - # macros -------------------------------------------------------------------- - --GAS_VERSION := $(shell as --version | grep "GNU assembler" | sed -e 's/GNU assembler //' -e 's/ .*//') -+#GAS_VERSION := $(shell as --version | grep "GNU assembler" | sed -e 's/GNU assembler //' -e 's/ .*//') -+GAS_VERSION := $(shell as --version < /dev/null 2&>1 | grep "GNU assembler" | sed -e 's/GNU assembler //' -e 's/ .*//') - - # uncomment these 2 lines only if you are using an external copy of libpng: --PNGINC = /usr/local/include --PNGLIB = /usr/local/lib -+#PNGINC = /usr/local/include -+PNGINC = /usr/include -+#PNGLIB = /usr/local/lib - # uncomment these 2 lines only if you are using an external copy of zlib: --ZINC = /usr/local/include --ZLIB = /usr/local/lib -+#ZINC = /usr/local/include -+#ZLIB = /usr/local/lib - --CC = gcc --LD = gcc -+CC ?= gcc - RM = rm -f - #CFLAGS = -I. -O -Wall - #CFLAGS = -I. -O3 -fomit-frame-pointer -Wall -DPNG_USE_PNGGCCRD --# CFLAGS = -I. -O3 -fomit-frame-pointer -Wall -DPNG_USE_PNGGCCRD \ -- -DGAS_VERSION="\"${GAS_VERSION}\"" --CFLAGS = -I${ZINC} -I. -g -O3 -fomit-frame-pointer -Wall -DPNG_USE_PNGGCCRD \ -+ -+CFLAGS = -I. -Wall -+ -+#CFLAGS = -I${ZINC} -I. -g -O3 -fomit-frame-pointer -Wall -DPNG_USE_PNGGCCRD \ - # -DGAS_VERSION="\"${GAS_VERSION}\"" - # [note that -Wall is a gcc-specific compilation flag ("all warnings on")] --LDFLAGS = -+LDFLAGS += - O = .o - E = - -+# additional defines -+DEFINES = -DPNG_USE_PNGGCCRD -DPNG_iCCP_SUPPORTED -DPNGCRUSH_USE_LOCAL_ARRAYS \ -+ -DPNG_iTXt_SUPPORTED -DGAS_VERSION="\"${GAS_VERSION}\"" -+ - PNGCRUSH = pngcrush - - # LIBS = -lm --LIBS = -L$(PNGLIB) -lpng -lz -lm --# LIBS = -lpng -lz -lm -+# LIBS = -L$(PNGLIB) -lpng -lz -lm -+LIBS = -lpng -lz - #LIBS = ${ZLIB}/libz.a -lm - - # uncomment these 4 lines only if you are NOT using an external copy of zlib: -@@ -58,7 +64,7 @@ - # implicit make rules ------------------------------------------------------- - - .c$(O): png.h cexcept.h $(ZHDR) -- $(CC) -c $(CFLAGS) $< -+ $(CC) -c $(CFLAGS) $(DEFINES) $< - #.c$(O): png.h pngconf.h pngcrush.h cexcept.h $(ZHDR) - # $(CC) -c $(CFLAGS) $< - -@@ -71,12 +77,12 @@ - ln -s $(PNGINC)/png.h png.h - - pngcrush$(O): pngcrush.c cexcept.h -- $(CC) -c $(CFLAGS) $< -+ $(CC) -c $(CFLAGS) $(DEFINES) $< - # pngcrush$(O): pngcrush.c png.h pngconf.h pngcrush.h cexcept.h $(ZHDR) - # $(CC) -c $(CFLAGS) $< - - $(PNGCRUSH)$(E): $(OBJS) -- $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - # maintenance --------------------------------------------------------------- - -diff -ur pngcrush-1.6.4-nolib.orig/pngcrush.c pngcrush-1.6.4-nolib/pngcrush.c ---- pngcrush-1.6.4-nolib.orig/pngcrush.c 2006-06-08 19:14:31.000000000 +0300 -+++ pngcrush-1.6.4-nolib/pngcrush.c 2008-04-23 17:24:21.000000000 +0300 -@@ -128,12 +128,10 @@ - #define PNG_iCCP const png_byte png_iCCP[5] = {105, 67, 67, 80, '\0'} - #define PNG_IEND const png_byte png_IEND[5] = { 73, 69, 78, 68, '\0'} - --#if 0 - PNG_EXPORT_VAR (const png_byte FARDATA) png_IHDR[5]; - PNG_EXPORT_VAR (const png_byte FARDATA) png_IDAT[5]; - PNG_EXPORT_VAR (const png_byte FARDATA) png_IEND[5]; - PNG_EXPORT_VAR (const png_byte FARDATA) png_iCCP[5]; --#endif - - #define PNG_FLAG_CRC_CRITICAL_USE 0x0400 - #define PNG_FLAG_CRC_CRITICAL_IGNORE 0x0800 -@@ -1384,13 +1382,6 @@ - do_color_count = do_color_count; /* silence compiler warning */ - #endif - -- if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING)) { -- fprintf(STDERR, -- "Warning: versions are different between png.h and png.c\n"); -- fprintf(STDERR, " png.h version: %s\n", PNG_LIBPNG_VER_STRING); -- fprintf(STDERR, " png.c version: %s\n\n", png_libpng_ver); -- } -- - t_start = (TIME_T) clock(); - - strncpy(prog_string, argv[0], STR_BUF_SIZE); -@@ -1829,7 +1820,7 @@ - if (!strncmp(argv[i], "-zi", 3)) { - text_compression[text_inputs] = - PNG_ITXT_COMPRESSION_zTXt; -- names += 2; -+ /* names += 2; */ - } else - #endif - if (!strncmp(argv[i], "-z", 2)) -@@ -1842,7 +1833,7 @@ - else { - text_compression[text_inputs] = - PNG_ITXT_COMPRESSION_NONE; -- names += 2; -+ /* names += 2; */ - } - #endif - names += 3; -@@ -1856,6 +1847,10 @@ - text_lang[text_inputs * 80] = '\0'; - text_lang_key[text_inputs * 80] = '\0'; - } else { -+ i += 2; -+ BUMP_I; -+ i -= 3; -+ names += 2; - strcpy(&text_lang[text_inputs * 80], argv[++i]); - /* libpng-1.0.5j and later */ - strcpy(&text_lang_key[text_inputs * 80], argv[++i]); -@@ -4360,7 +4355,7 @@ - - for (;;) { - #ifndef PNG_UINT_IDAT --#ifdef PNG_USE_LOCAL_ARRAYS -+#if defined(PNG_USE_LOCAL_ARRAYS) || defined(PNGCRUSH_USE_LOCAL_ARRAYS) - PNG_IDAT; - PNG_IEND; - PNG_IHDR; -@@ -4979,6 +4974,12 @@ - PNGCRUSH_VERSION, progname, PNG_LIBPNG_VER_STRING, - png_get_header_version(NULL), ZLIB_VERSION); - -+ if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING)) { -+ fprintf(STDERR, "|| Warning: versions are different between png.h and png.c\n"); -+ fprintf(STDERR, "|| png.h version: %s\n", PNG_LIBPNG_VER_STRING); -+ fprintf(STDERR, "|| png.c version: %s\n\n", png_libpng_ver); -+ } -+ - #if defined(__GNUC__) - fprintf(STDERR, - " | It was compiled with gcc version %s", __VERSION__); -Vain hakemistossa pngcrush-1.6.4-nolib: pngcrush.c.orig diff --git a/media-gfx/pngcrush/pngcrush-1.6.4-r1.ebuild b/media-gfx/pngcrush/pngcrush-1.6.4-r1.ebuild deleted file mode 100644 index 905d9474807e..000000000000 --- a/media-gfx/pngcrush/pngcrush-1.6.4-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.6.4-r1.ebuild,v 1.6 2008/06/12 08:37:47 armin76 Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Portable Network Graphics (PNG) optimizing utility" -HOMEPAGE="http://pmt.sourceforge.net/pngcrush" -SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~alpha amd64 ppc x86" -IUSE="" - -DEPEND=">=media-libs/libpng-1.2.26-r1" - -S=${WORKDIR}/${P}-nolib - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-modified-debian-patchset-5.patch -} - -src_compile() { - tc-export CC - emake || die "emake failed." -} - -src_install() { - dobin ${PN} || die "dobin failed." - dodoc *.txt -} |