Fix ${S}. Do not build bzip2/ or link to it (still bug #249140).

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.25-gentoo-r7-JeR i686

5 files changed, 44 insertions, 15 deletions

diff --git a/app-admin/analog/ChangeLog b/app-admin/analog/ChangeLog
index 264fc1f8f552..d2b4074a18fa 100644
--- a/app-admin/analog/ChangeLog
+++ b/app-admin/analog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/analog
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.42 2008/12/15 06:50:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.43 2008/12/15 22:09:28 jer Exp $
+
+  15 Dec 2008; Jeroen Roovers <jer@gentoo.org> files/analog-6.0-bzip2.patch,
+  analog-6.0-r2.ebuild, analog-6.0-r3.ebuild:
+  Fix ${S}. Do not build bzip2/ or link to it (still bug #249140).
 
 *analog-6.0-r3 (15 Dec 2008)
 *analog-6.0-r2 (15 Dec 2008)
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index cc4a09b46f71..dd60ef37afa6 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -1,12 +1,12 @@
 AUX analog-5.1-gentoo.diff 888 RMD160 1d6e5f71bad897088d6d89e08415a17f8f3d3b5b SHA1 00918f41066f1da8487e9bf667f1f1604f5ebcab SHA256 8c60a0be231f5c16ea7131fa7c43a8d417eeec2da657c494441b22a5b75e59fc
-AUX analog-6.0-bzip2.patch 1907 RMD160 216a7c20b9192f849fb372529d04827a43dd9589 SHA1 5207b261ffeae6c512ac59f4bea5bf2a03694a7e SHA256 07ead6fb5cf41d527a6abb567f140e4cbdc8ae5e0d869ea731eff3208bc8f600
+AUX analog-6.0-bzip2.patch 3283 RMD160 7141642338edd4c0bc04f7f1eee7ad48d34246fc SHA1 ddca44d9801b11d4826f663658db1cb0de412c66 SHA256 5f9fc63e4bbb1ed0dcdf30cc2a2ab856c824084ba79f3bbb7df36132214ed42f
 AUX analog.cfg 3992 RMD160 60c87408dd4300011108e7efa1a7267a6104ad98 SHA1 1151ea868ceafdf37e2225deb88b8e88b7784e1d SHA256 83742dc17e28297fe4a4844bc53ef397ad1bb0514ed98b79ad5a9857f3a61fa8
 DIST analog-5.32.tar.gz 1428349 RMD160 64d5d04829e6088e13bedd0f3de49d2dcbe347c4 SHA1 81cd8c018663f905ce8c11175ca826f019765b4d SHA256 a16c90ad0e9f18372c055bdccebc67f275733672dc5283246c80b191ed3ff93d
 DIST analog-6.0.tar.gz 1553316 RMD160 75c6157d2ac1459ee28a90001787382f5b671dca SHA1 17ad601f84e73c940883fb9b9e805879aac37493 SHA256 31c0e2bedd0968f9d4657db233b20427d8c497be98194daf19d6f859d7f6fcca
 EBUILD analog-5.32.ebuild 1816 RMD160 12ebe8dc373aa5fc28f1e3e7654b0f2269840291 SHA1 7dd64685ab7602816540841a57e4ff3ed3e8ca26 SHA256 fb63a905e3b48fd938e09555450123805142c1bc1625fa10f91181ed15135dd1
 EBUILD analog-6.0-r1.ebuild 1407 RMD160 e9f63a176b81c3413c21c5827b4458a01ffadc27 SHA1 ca0042ce41a7ed2b2aa4d675e56058ff7cf78f09 SHA256 4429f52b6b01b2e19a3a551cf4d2605280549ec988f3a7ab06797d6f86a6a09e
-EBUILD analog-6.0-r2.ebuild 1693 RMD160 8c7065476ccd542e6a7e2093b2e89571be2970fa SHA1 d6ea0fac6c243e4fd7fa651e8cf926e65ea89da0 SHA256 df12c758b6985902474a443c5c8be15c83b63f612ec41af64138fd6cb3e094f1
-EBUILD analog-6.0-r3.ebuild 1276 RMD160 c0241fa4e5e3c91971d52dbe4ae5a31506a93b87 SHA1 d70b6e53804507c417c6e9620d4ecd6999d53666 SHA256 191b7aa4706e20f45fe89dae2019f6d17eb24824c053fb0d7c5f7c3a7516dc60
+EBUILD analog-6.0-r2.ebuild 1657 RMD160 2771c731c0f74cebf1220e9633e0ec4db5530b4d SHA1 13d0aa1545de29a26b38949b080c2e21d3376a03 SHA256 43e1d741d6301e641f382020fd8fd2edcddcdd6dc1300f82a0b7202f74361db4
+EBUILD analog-6.0-r3.ebuild 1255 RMD160 80bbef7fd7f0fe7d6cfda995fd4bc7f424fbd60c SHA1 6dd30d4be4eba5b8071a4fff954851b9646faa20 SHA256 a1666e0075bacd0b2ee1d4b1821dc194af8b6023a15f039e7d73bc2a5d0a9f9a
 EBUILD analog-6.0.ebuild 1794 RMD160 cf99354b2761bc609d2ec3207f6e0351220836ec SHA1 d00f86d45170d255510a15df2c380fe45b9a1e84 SHA256 a39023a069f0cba76f5a796b3d193e9894f8bba4ff22c9f3b6fc6299a6707f55
-MISC ChangeLog 4910 RMD160 44f48e9f4079c5579a47cf8c2abc5e09507ef7fd SHA1 7fc92206a5afaf0b6ccb2e3ec34673d33f8824b6 SHA256 85a603eefb0adf3158e7c3a44c696fc9dd0bbf50119738a8de75bd19e7aea236
+MISC ChangeLog 5101 RMD160 5c6a846d8eeaa6755312cf444b67dda1ea444633 SHA1 ae84d2adc22e34672d5fde46cde1746e39324f18 SHA256 6df65f0993067ad3cfd880ac0aa4a55443bc9e2c8eb73c871d5e3690bf64b204
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
diff --git a/app-admin/analog/analog-6.0-r2.ebuild b/app-admin/analog/analog-6.0-r2.ebuild
index d9eacc4cdc4c..b28cb80da14f 100644
--- a/app-admin/analog/analog-6.0-r2.ebuild
+++ b/app-admin/analog/analog-6.0-r2.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/app-admin/analog/analog-6.0-r2.ebuild,v 1.1 2008/12/15 06:50:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r2.ebuild,v 1.2 2008/12/15 22:09:28 jer Exp $
 
 inherit eutils toolchain-funcs
 
@@ -32,17 +32,15 @@ pkg_setup() {
 	fi
 }
 
-S="${WORKDIR}"/${P}/src
-
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+	cd "${S}"/src
 	epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
 	epatch "${FILESDIR}/${P}-bzip2.patch"
 }
 
 src_compile() {
-	tc-export CC || die "ohnoz"
+	tc-export CC
 	emake || die "make failed"
 }
 
diff --git a/app-admin/analog/analog-6.0-r3.ebuild b/app-admin/analog/analog-6.0-r3.ebuild
index 4bfe597eac83..bb517580b621 100644
--- a/app-admin/analog/analog-6.0-r3.ebuild
+++ b/app-admin/analog/analog-6.0-r3.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/app-admin/analog/analog-6.0-r3.ebuild,v 1.1 2008/12/15 06:50:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r3.ebuild,v 1.2 2008/12/15 22:09:28 jer Exp $
 
 EAPI=2
 
@@ -21,11 +21,9 @@ DEPEND=">=dev-libs/libpcre-3.4
 	media-libs/jpeg
 	media-libs/libpng"
 
-S="${WORKDIR}"/${P}/src
-
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+	cd "${S}"/src
 	epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
 	epatch "${FILESDIR}/${P}-bzip2.patch"
 }
diff --git a/app-admin/analog/files/analog-6.0-bzip2.patch b/app-admin/analog/files/analog-6.0-bzip2.patch
index 5a0c23d7da48..30ec4ae8461e 100644
--- a/app-admin/analog/files/analog-6.0-bzip2.patch
+++ b/app-admin/analog/files/analog-6.0-bzip2.patch
@@ -3,7 +3,7 @@ Use system bzip2 library. Get CC and CFLAGS from environment.
 
 
 --- analog-6.0/src/Makefile.orig	2004-12-19 14:51:30.000000000 +0100
-+++ analog-6.0/src/Makefile	2008-12-15 07:34:09.000000000 +0100
++++ analog-6.0/src/Makefile	2008-12-15 22:50:04.000000000 +0100
 @@ -2,16 +2,16 @@
  # Please read docs/Readme.html, or http://www.analog.cx/
  # This is a general Unix-like Makefile: Makefiles for other OS's can be found
@@ -33,3 +33,32 @@ Use system bzip2 library. Get CC and CFLAGS from environment.
  #               need -lm LAST
  #             if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz
  #             if you defined HAVE_ZLIB above you also need -lz
+@@ -54,7 +54,7 @@
+ 	input.o macinput.o macstuff.o output.o output2.o outcro.o outhtml.o \
+ 	outlatex.o outplain.o outxhtml.o outxml.o process.o settings.o sort.o \
+ 	tree.o utils.o win32.o
+-SUBDIRS = bzip2 libgd libpng pcre unzip zlib
++SUBDIRS = libgd libpng pcre unzip zlib
+ SUBDIROBJS = libgd/gd.o  libgd/gd_io.o libgd/gd_io_file.o libgd/gd_png.o \
+ 	libgd/gdfontf.o libgd/gdfonts.o libgd/gdtables.o \
+ 	libpng/png.o libpng/pngerror.o libpng/pngmem.o libpng/pngset.o \
+@@ -63,9 +63,7 @@
+ 	zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o \
+ 	zlib/gzio.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
+ 	zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
+-	zlib/uncompr.o zlib/zutil.o unzip/ioapi.o unzip/unzip.o \
+-	bzip2/bzlib.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o \
+-	bzip2/decompress.o bzip2/huffman.o bzip2/randtable.o
++	zlib/uncompr.o zlib/zutil.o unzip/ioapi.o unzip/unzip.o
+ HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h \
+ 	pcre/pcre.h libgd/gd.h libgd/gdfontf.h libgd/gdfonts.h unzip/unzip.h \
+ 	zlib/zlib.h bzip2/bzlib.h
+@@ -77,8 +75,6 @@
+ 
+ # There doesn't seem to be a good way to write all these rules in a generic
+ # form that works for all "make" programs
+-bzip2: ALWAYS
+-	cd bzip2 && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
+ 
+ libgd: ALWAYS
+ 	cd libgd && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'