Removed old ebuilds. Created a snapshot and added -j1.

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

9 files changed, 56 insertions, 136 deletions

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 738739b1188f..fb79070871ee 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,3 +1,4 @@
-EBUILD llpp-9999.ebuild 968 RMD160 d7970585688fd61fb4203908a7c05dc3b7048b94 SHA1 1291e32791df20da0510bf19b4d3d1c90ab72ab3 SHA256 fb9259a2b8dc91b3810d215269843c2b57f6ae28f25b7d2ef70fbebe984b3f7d
-MISC ChangeLog 552 RMD160 2205f55b22ce3b6964f21548f308e6593f6b1a14 SHA1 71f1e2c2c4ba6513712a8c643f6d18f7f4799ad1 SHA256 491ca66a267fca9d83d6d119f39838aede9f8187dc3c5b504328a95779ab4460
+EBUILD llpp-0_p20110202.ebuild 949 RMD160 9f0127f19933a0fa1ee17a1ee69ff35fbba8cd09 SHA1 19214aa8dbd652ef516feb617b39e23b543185c7 SHA256 a0f0eb205d21281d4424572f88ffa52eb55bded4a2bea7cee319707f572e6059
+EBUILD llpp-9999.ebuild 978 RMD160 5dbbafcb8b449e34dc95f2db9d93b6f3cd8ac577 SHA1 43e57d8f13e18d4c6607dc88760d5086806d2e70 SHA256 83c70055024b3898023480e06f042ce6487836739259ff03eaa9a1e206e53824
+MISC ChangeLog 722 RMD160 3b6ba64db164403a577d6c05005b7429731912cc SHA1 4559bf09eadf7a90c84f56c7adb692989a396f5c SHA256 bf117f326b8e0519f74d0b96b823f2384f94faf0c92c5acf2117d6a9260d7f71
 MISC metadata.xml 250 RMD160 645ad5d42480ce40b7a4489492c766bbf141ca2c SHA1 ee670f38920df6f9fd58e4d396cf18473e948b73 SHA256 3de95efc65f52204c931a656e6a38b39a0bd977126383f919076465e2b407543
diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 50cba6c7a561..ae9da660afdf 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.8 2011/01/31 14:45:35 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.9 2011/02/17 02:15:26 xmw Exp $
+
+*mupdf-0.7_p20110212 (17 Feb 2011)
+
+  17 Feb 2011; Michael Weber <xmw@gentoo.org> -mupdf-0.6.ebuild,
+  -files/mupdf-0.6-buildsystem.patch, -mupdf-0.7.ebuild,
+  +mupdf-0.7_p20110212.ebuild, +files/mupdf-0.7_p20110212-buildsystem.patch,
+  +files/mupdf-0.7_p20110212-zoom.patch, mupdf-9999.ebuild,
+  -files/mupdf-9999-zoom.patch:
+  Removed old ebuilds. Created a snapshot and added -j1.
 
 *mupdf-9999 (31 Jan 2011)
 
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index e7c8dcf5bec0..c6f708f9631e 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,12 +1,11 @@
-AUX mupdf-0.6-buildsystem.patch 1446 RMD160 dbc139d01e47658a2339b6b8b65fe9fa8bfd9870 SHA1 0f4d9b7b47a24590623ef606ffbd6b878b2327a0 SHA256 bf6c539e530fe30f0bfb4c1c3f0e916d07ac18f035764e5afaf6b280c900b06f
 AUX mupdf-0.7-buildsystem.patch 1111 RMD160 9246a80c1cedf49dc39b694e9913f98f295d6a93 SHA1 17b2691984e799d423d7b90544df15fff054c70a SHA256 bd4dae8cd56579cd873654bf804a26cbad92a4b827673f04ab7a3d16e01d21b9
 AUX mupdf-0.7-zoom.patch 1632 RMD160 e55baa3b3dcf4e712a4844b4d4e3d11642279cac SHA1 e0685ec90ee7c1c68b58bc519b2844df521c14ba SHA256 261b9eb9125ef3bb96643c9a94146d48da6d0d7a14d67447f503bf4648db4c3e
-AUX mupdf-9999-zoom.patch 1540 RMD160 71f21318124b4c3926d469b2387dce07cae1051f SHA1 034f401e4ca5fd816c7240e5cd6b83b63c775c1e SHA256 ddd3901fcf492f5092c8ea4bfa6846b927a58efbaa3fd0a566bffb0abbfa4ff6
-DIST mupdf-0.6.tar.gz 3607245 RMD160 50b1ed1c3c07613a1dbb19cfe63cb47d4f2ae2fe SHA1 dd501da6f50c686c6d519fe6ae7c951d2e2d7e1c SHA256 6f87c4f113ee9e0f4bdfd3a316ef44052edc4febc8f7b531c4a3f44ffe149605
+AUX mupdf-0.7_p20110212-buildsystem.patch 456 RMD160 1e7352cead17011e12e8e1cc8e9482434f07f56c SHA1 3bf7eff144e45fd7ba7871e86e97af19db9d1f32 SHA256 f4e5d00efdbb244cff75a19d851b01d0a1dd969e95b52086232961d97a59138e
+AUX mupdf-0.7_p20110212-zoom.patch 1540 RMD160 71f21318124b4c3926d469b2387dce07cae1051f SHA1 034f401e4ca5fd816c7240e5cd6b83b63c775c1e SHA256 ddd3901fcf492f5092c8ea4bfa6846b927a58efbaa3fd0a566bffb0abbfa4ff6
 DIST mupdf-0.7.tar.gz 3557621 RMD160 82723652fb967be7665cfc55f4b2bb7c3ff55b69 SHA1 3e97cefa9a65b770cc1be7584d6a5da9dc064d84 SHA256 e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae23105f917189e81960a6
-EBUILD mupdf-0.6.ebuild 1508 RMD160 b5a8d55ef08171bda0927f803a8b59244b5b5a82 SHA1 2feab92de9341ad96f5cd9ecfa1977680256eb02 SHA256 2e4f5e510b5964ea978742a2bf45e2ba3ca6cc51d7caa8591f08bcbc2a87d0b4
+DIST mupdf-0.7_p20110212.tar.bz2 3479486 RMD160 1c862e6534b473911ff0994d4634840923bfe12d SHA1 498f3e13f390c06287a716d1a3f779a1ec987a62 SHA256 8c95398c8f8a296e7b0c7d490222d65b08cb1d1ad941f32428aa03a031bcd2f1
 EBUILD mupdf-0.7-r1.ebuild 1521 RMD160 117f4292a1a35882cc87b77f2e720bf21f67364e SHA1 4da21277f2872749a05f0643810356e6aa6a042e SHA256 2d33215a1de0f16e700767d2e7ce97fb4c61fdb4a67cef8aa5f4bdfa71bc0e41
-EBUILD mupdf-0.7.ebuild 1427 RMD160 3b569bb195e5a7d3af22ecf0aed4a74a158bb361 SHA1 1fa0f72b1023cecd609b54b373264038e6eec9c2 SHA256 f451a4a316882f744adc96ec82a2c41c05a4f82aa0fe63ed961ac111fffa8ac4
-EBUILD mupdf-9999.ebuild 1527 RMD160 3e820c94e32d4c62c39a158a6f28788025d381ea SHA1 6d0a7911946869d934b09c1a9b99b9de1e2a6a7f SHA256 c8c1862f8a3f6288fabb3fa021550fbd7ba3d91552dd4aae5324889b71cb3526
-MISC ChangeLog 1463 RMD160 d1c4b8b7b0a58b9664f8d9ce6a0e088ba5c9e41a SHA1 2089be8874b8fbe87fc063888283ba6c1ba2ae70 SHA256 407a710e6cb1b438535cbfee9094721a2c9bfeba130ef27bae270b42deefbd4c
+EBUILD mupdf-0.7_p20110212.ebuild 1504 RMD160 8516a65e09a09ad44843a77f24fa0b43f93e8d7a SHA1 0ea75632be7cf11aaaae6d519ea49737ab48c5da SHA256 764582eb9a41cda91a2fa2ce127d008c2ea467bb1d7f825cc591c4e7ca36bae1
+EBUILD mupdf-9999.ebuild 1553 RMD160 0288a1dcb2c24f731f6ad0821f8324118f3737b5 SHA1 0a13786ca6677f308258fa26b693acf2844a23d0 SHA256 bf9f23b43129d6a6afb5824f6cbbcdddba552f2e5b9726a9c0a3776e167028db
+MISC ChangeLog 1848 RMD160 ab9b9bb7719f88ffc26b5152bf81b022cf8c9c1c SHA1 b794299b06e06d67ee6734db4e329b980b773cc7 SHA256 22dd547cd49ceba45814daf74e3ea8ffcc64b72600cb3fdce63f799a9a312fd0
 MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
diff --git a/app-text/mupdf/files/mupdf-0.6-buildsystem.patch b/app-text/mupdf/files/mupdf-0.6-buildsystem.patch
deleted file mode 100644
index 56086726e6c3..000000000000
--- a/app-text/mupdf/files/mupdf-0.6-buildsystem.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Michael Weber Jun 5th 2010
-  Possibility to pass /usr/lib64 on multilib/64bit systems.
-  Dropped the hard compiler options for compartibility on older chips.
-
---- Makefile	2010-06-05 16:38:48.000000000 +0200
-+++ Makefile	2010-06-05 16:41:43.000000000 +0200
-@@ -7,6 +7,7 @@
- 
- build ?= debug
- prefix ?= /usr/local
-+libprefix ?= $(prefix)/lib
- 
- OBJDIR := build/$(build)
- GENDIR := build/generated
-@@ -314,8 +315,8 @@
- 	rm -rf build
- 
- install: $(DIRS) $(APPS) $(MUPDF_LIB)
--	install -d $(prefix)/bin $(prefix)/lib $(prefix)/include
-+	install -d $(prefix)/bin $(libprefix) $(prefix)/include
- 	install $(APPS) $(prefix)/bin
--	install $(MUPDF_LIB) $(prefix)/lib
-+	install $(MUPDF_LIB) $(libprefix)
- 	install $(MUPDF_HDR) $(prefix)/include
- 
---- Makerules	2010-06-05 16:38:48.000000000 +0200
-+++ Makerules	2010-06-05 16:49:44.000000000 +0200
-@@ -4,8 +4,8 @@
- OS := $(OS:MINGW%=MINGW)
- 
- LIBS := -ljbig2dec -lopenjpeg -ljpeg -lz -lm
--CFLAGS := -Wall --std=gnu99 -Ifitz -Imupdf $(THIRD_INCS)
--LDFLAGS =
-+CFLAGS += -Wall --std=gnu99 -Ifitz -Imupdf $(THIRD_INCS)
-+LDFLAGS +=
- CC = cc
- LD = $(CC)
- AR = ar
-@@ -23,10 +23,10 @@
- CFLAGS += `pkg-config --cflags freetype2`
- LDFLAGS += `pkg-config --libs freetype2`
- endif
--X11LIBS = -lX11 -lXext
-+X11LIBS = `pkg-config --libs x11 xext`
- PDFVIEW_EXE = $(X11VIEW_EXE)
- ifeq  "$(build)" "release"
--CFLAGS += -mmmx -ftree-vectorize -msse -msse2 -march=k8 -DARCH_X86
-+CFLAGS += 
- ARCH_SRC = archx86.c
- endif
- endif
diff --git a/app-text/mupdf/files/mupdf-0.7_p20110212-buildsystem.patch b/app-text/mupdf/files/mupdf-0.7_p20110212-buildsystem.patch
new file mode 100644
index 000000000000..299179706ea5
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-0.7_p20110212-buildsystem.patch
@@ -0,0 +1,22 @@
+--- mupdf-0.7_p20110212/Makerules.orig
++++ mupdf-0.7_p20110212/Makerules
+@@ -4,8 +4,8 @@
+ OS := $(OS:MINGW%=MINGW)
+ 
+ CC ?= cc
+-CFLAGS := -Ifitz -Imupdf -Wall
+-LDFLAGS :=
++CFLAGS += -Ifitz -Imupdf
++LDFLAGS +=
+ 
+ ifeq "$(build)" "debug"
+ CFLAGS += -pipe -g
+@@ -21,7 +21,7 @@
+ 
+ ifeq "$(OS)" "Linux"
+ SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
+-X11LIBS := -lX11 -lXext
++X11LIBS := `pkg-config --libs x11 xext`
+ PDFVIEW_EXE = $(X11VIEW_EXE)
+ endif
+ 
diff --git a/app-text/mupdf/files/mupdf-9999-zoom.patch b/app-text/mupdf/files/mupdf-0.7_p20110212-zoom.patch
index 4576ea4407e4..4576ea4407e4 100644
--- a/app-text/mupdf/files/mupdf-9999-zoom.patch
+++ b/app-text/mupdf/files/mupdf-0.7_p20110212-zoom.patch
diff --git a/app-text/mupdf/mupdf-0.6.ebuild b/app-text/mupdf/mupdf-0.6.ebuild
deleted file mode 100644
index 5b579a132c07..000000000000
--- a/app-text/mupdf/mupdf-0.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.6.ebuild,v 1.2 2010/11/11 17:34:49 ssuominen Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://${PN}.com/download/source/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-S=${WORKDIR}/${PN}
-
-RDEPEND="media-libs/freetype:2
-	media-libs/jbig2dec
-	virtual/jpeg
-	media-libs/openjpeg
-	X? ( x11-libs/libX11
-		x11-libs/libXext )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-buildsystem.patch
-}
-
-src_compile() {
-	use x86 && append-cflags -DARCH_X86
-	use amd64 && append-cflags -DARCH_X86_64
-
-	my_pdfexe=
-	use X || my_pdfexe="PDFVIEW_EXE="
-
-	emake build=release ${my_pdfexe} CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	emake build=release ${my_pdfexe} prefix="${D}usr" \
-		libprefix="${D}usr/$(get_libdir)" install || die
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins debian/mupdf.pc || die
-
-	if use X ; then
-		domenu debian/mupdf.desktop || die
-		doicon debian/mupdf.xpm || die
-		doman debian/mupdf.1 || die
-	fi
-	doman debian/pdf{clean,draw,show}.1 || die
-	dodoc README || die
-
-	# avoid collision with app-text/poppler-utils
-	mv "${D}"usr/bin/pdfinfo "${D}"usr/bin/mupdf_pdfinfo || die
-}
-
-pkg_postinst() {
-	elog "pdfinfo was renamed to mupdf_pdfinfo"
-}
diff --git a/app-text/mupdf/mupdf-0.7.ebuild b/app-text/mupdf/mupdf-0.7_p20110212.ebuild
index 525394e4692c..5a895c46dfbf 100644
--- a/app-text/mupdf/mupdf-0.7.ebuild
+++ b/app-text/mupdf/mupdf-0.7_p20110212.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.7.ebuild,v 1.2 2010/11/11 17:34:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.7_p20110212.ebuild,v 1.1 2011/02/17 02:15:26 xmw Exp $
 
 EAPI=2
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://${PN}.com/download/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -26,18 +26,22 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-buildsystem.patch
+
+	epatch "${FILESDIR}"/${P}-zoom.patch
+
+	sed -i -e '/CFLAGS/s: -DNDEBUG : :' Makerules || die
 }
 
 src_compile() {
 	my_pdfexe=
 	use X || my_pdfexe="PDFVIEW_EXE="
 
-	emake build=release ${my_pdfexe} CC="$(tc-getCC)" verbose=true || die
+	emake build=release ${my_pdfexe} CC="$(tc-getCC)" verbose=true -j1 || die
 }
 
 src_install() {
 	emake build=release ${my_pdfexe} prefix="${D}usr" \
-		libprefix="${D}usr/$(get_libdir)" verbose=true install || die
+		LIBDIR="${D}usr/$(get_libdir)" verbose=true install || die
 
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins debian/mupdf.pc || die
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 69b539b7ce85..074aae01e03d 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.1 2011/01/31 14:45:35 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.2 2011/02/17 02:15:26 xmw Exp $
 
 EAPI=2
 
@@ -27,9 +27,9 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7-buildsystem.patch
+	epatch "${FILESDIR}"/${PN}-0.7_p20110212-buildsystem.patch
 
-	epatch "${FILESDIR}"/${P}-zoom.patch
+	epatch "${FILESDIR}"/${PN}-0.7_p20110212-zoom.patch
 
 	sed -i -e '/CFLAGS/s: -DNDEBUG : :' Makerules || die
 }
@@ -38,12 +38,12 @@ src_compile() {
 	my_pdfexe=
 	use X || my_pdfexe="PDFVIEW_EXE="
 
-	emake build=release ${my_pdfexe} CC="$(tc-getCC)" verbose=true || die
+	emake build=release ${my_pdfexe} CC="$(tc-getCC)" verbose=true -j1 || die
 }
 
 src_install() {
 	emake build=release ${my_pdfexe} prefix="${D}usr" \
-		libprefix="${D}usr/$(get_libdir)" verbose=true install || die
+		LIBDIR="${D}usr/$(get_libdir)" verbose=true install || die
 
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins debian/mupdf.pc || die