Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 12 insertions, 115 deletions

diff --git a/app-text/zathura/ChangeLog b/app-text/zathura/ChangeLog
index 27becf1529e3..1c3b6b0d26ab 100644
--- a/app-text/zathura/ChangeLog
+++ b/app-text/zathura/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/zathura
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/ChangeLog,v 1.2 2010/04/17 13:47:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/ChangeLog,v 1.3 2010/06/09 12:24:43 ssuominen Exp $
+
+*zathura-0.0.6 (09 Jun 2010)
+
+  09 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> +zathura-0.0.6.ebuild:
+  Version bump wrt #323261 by Nick White.
 
 *zathura-0.0.3 (17 Apr 2010)
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index a39a5afdcfea..3b36c3fcd167 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,7 +1,4 @@
-AUX zathura-0.0.2-build.patch 2144 RMD160 1053bffcaee28c342656f03dde3db39e5ece6755 SHA1 ee3e2782f67a64c22aa3b7caba81be764a575d7e SHA256 8da954f9acc2eed144c796b65f4b4361403532d8ddaf94118380dfcf3ab42694
-DIST zathura-0.0.2.tar.gz 20523 RMD160 24b3f442163f13c8fe1a5c83c0988daf72fc5e20 SHA1 3a9f3ec99d0354647fdd6558a3135f831cb18162 SHA256 75f10ee341e34412a14f9318eabae41c183565bd5363f8dd15dfcb5a376a2b86
-DIST zathura-0.0.3.tar.gz 22726 RMD160 317583d7a237f46346f00837a31d480f26765416 SHA1 4789c92e8c176b56b7e362ae784ff1d421f7d196 SHA256 fe1a5411d22c246f1af8996d17b48b550f0c5b988c1bb0b627427a058bb84b16
-EBUILD zathura-0.0.2.ebuild 809 RMD160 84d401ee0063c469ceab317a2b3304118fce5f50 SHA1 c17d1ead5bd384f20ef1cdefb4a18d0d1052e393 SHA256 02ce62b723367da98ac7b661fde1bb0825b91beb37610e941e6d0d64ec7d7847
-EBUILD zathura-0.0.3.ebuild 830 RMD160 2ce3303967547d2ee8572113c251b430eb27a0a4 SHA1 3f7f02a2a1223944de610a120006577da322d164 SHA256 50764815e356a544b2d36a72716fa7c4e4aa436a08a131491be540c3a83cbb2e
-MISC ChangeLog 494 RMD160 dc45411039fdafd83e03eca2bfe54a49b6fa5dff SHA1 a10ea9ac058dbbb28a1c4c96343b3b0f35beec87 SHA256 d0d98c3bad8a1b16e9abdcd6028d9f48544067d8f97fd3aeb854c6a2c8da7114
+DIST zathura-0.0.6.tar.gz 26516 RMD160 737883fa87c0af9f96360b41d3275f31d9746ee2 SHA1 fcc5ad94459c468ca942cfb2208453977b6f8369 SHA256 93981ecdee7811a2e4e58db5f5112374abe32b623ab66b90913d05e1f84fd08b
+EBUILD zathura-0.0.6.ebuild 882 RMD160 1a6ba66e019da713aa4d39b47d569e4d1d830250 SHA1 18e1ee58185b0021a1a52282d854e5b2f224ddbf SHA256 16e49d005ef82d78b537864bbf02a372d108d21382888c985facff34e9ae136b
+MISC ChangeLog 644 RMD160 1b55075d833ac28ff9e74456bea3c2ba756f5486 SHA1 52a06b83cc1ac2bbe06f93dca6d0d320d91777d5 SHA256 012802af663bc090155e2f8bdae8601f7477fae2a896795d183fb1512c3867a8
 MISC metadata.xml 241 RMD160 dbd39e15096a9c09432225b4dee87bcadcb33907 SHA1 1beb1a93e4526085c26b282271027ad508b29059 SHA256 950a704ea9fcebef2e688e8bd6e0f0d292c967e246d58e4778b9955b1d615ab4
diff --git a/app-text/zathura/files/zathura-0.0.2-build.patch b/app-text/zathura/files/zathura-0.0.2-build.patch
deleted file mode 100644
index 613af48e46a5..000000000000
--- a/app-text/zathura/files/zathura-0.0.2-build.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -ur zathura-0.0.2.orig/config.mk zathura-0.0.2/config.mk
---- zathura-0.0.2.orig/config.mk	2010-02-15 03:35:34.000000000 +0200
-+++ zathura-0.0.2/config.mk	2010-03-05 17:03:08.000000000 +0200
-@@ -12,14 +12,13 @@
- GTK_LIB = $(shell pkg-config --libs gtk+-2.0 poppler-glib)
- 
- INCS = -I. -I/usr/include ${GTK_INC}
--LIBS = -L/usr/lib -lc ${GTK_LIB} -lpthread
-+LIBS = -lc ${GTK_LIB} -lpthread
- 
- # flags
--CFLAGS = -std=c99 -pedantic -Wall $(INCS)
--LDFLAGS = ${LIBS}
-+CFLAGS += -std=c99 -pedantic -Wall $(INCS)
- 
- # debug
- DFLAGS = -g
- 
- # compiler
--CC = gcc
-+CC ?= gcc
-diff -ur zathura-0.0.2.orig/Makefile zathura-0.0.2/Makefile
---- zathura-0.0.2.orig/Makefile	2010-02-15 03:35:34.000000000 +0200
-+++ zathura-0.0.2/Makefile	2010-03-05 17:04:25.000000000 +0200
-@@ -13,7 +13,7 @@
- options:
- 	@echo ${PROJECT} build options:
- 	@echo "CFLAGS  = ${CFLAGS}"
--	@echo "LDFLAGS = ${LDFLAGS}"
-+	@echo "LIBS    = ${LIBS}"
- 	@echo "DFLAGS  = ${DFLAGS}"
- 	@echo "CC      = ${CC}"
- 
-@@ -33,7 +33,7 @@
- 
- ${PROJECT}: ${OBJECTS}
- 	@echo CC -o $@
--	@${CC} -o $@ ${OBJECTS} ${LDFLAGS}
-+	@${CC} ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
- 
- clean:
- 	@rm -rf ${PROJECT} ${OBJECTS} ${PROJECT}-${VERSION}.tar.gz \
-@@ -41,7 +41,7 @@
- 
- ${PROJECT}-debug: ${DOBJECTS}
- 	@echo CC -o ${PROJECT}-debug
--	@${CC} -o ${PROJECT}-debug ${DOBJECTS} ${LDFLAGS}
-+	@${CC} ${LDFLAGS} -o ${PROJECT}-debug ${DOBJECTS} ${LIBS}
- 
- debug: ${PROJECT}-debug
- 
-@@ -62,13 +62,13 @@
- 
- install: all
- 	@echo installing executeable file
--	@mkdir -p ${PREFIX}/bin
--	@cp -f ${PROJECT} ${PREFIX}/bin
--	@chmod 755 ${PROJECT} ${PREFIX}/bin/${PROJECT}
-+	@mkdir -p ${DESTDIR}${PREFIX}/bin
-+	@cp -f ${PROJECT} ${DESTDIR}${PREFIX}/bin
-+	@chmod 755 ${PROJECT} ${DESTDIR}${PREFIX}/bin/${PROJECT}
- 	@echo installing manual page
--	@mkdir -p ${MANPREFIX}/man1
--	@sed "s/VERSION/${VERSION}/g" < ${PROJECT}.1 > ${MANPREFIX}/man1/${PROJECT}.1
--	@chmod 644 ${MANPREFIX}/man1/${PROJECT}.1
-+	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-+	@sed "s/VERSION/${VERSION}/g" < ${PROJECT}.1 > ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
-+	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
- 
- uninstall:
- 	@echo removing executeable file
diff --git a/app-text/zathura/zathura-0.0.2.ebuild b/app-text/zathura/zathura-0.0.2.ebuild
deleted file mode 100644
index e52231d4ae27..000000000000
--- a/app-text/zathura/zathura-0.0.2.ebuild
+++ /dev/null
@@ -1,35 +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/zathura/zathura-0.0.2.ebuild,v 1.2 2010/03/05 15:08:49 ssuominen Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A highly customizable and functional PDF viewer based on poppler and GTK+"
-HOMEPAGE="http://zathura.pwmt.org/"
-SRC_URI="http://zathura.pwmt.org/download/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/cairo-1.8.8
-	>=x11-libs/gtk+-2.18.6:2
-	>=app-text/poppler-0.12.3-r3[cairo]"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/app-text/zathura/zathura-0.0.3.ebuild b/app-text/zathura/zathura-0.0.6.ebuild
index 3e58ad8bd198..b6a10e04aded 100644
--- a/app-text/zathura/zathura-0.0.3.ebuild
+++ b/app-text/zathura/zathura-0.0.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.0.3.ebuild,v 1.1 2010/04/17 13:47:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.0.6.ebuild,v 1.1 2010/06/09 12:24:43 ssuominen Exp $
 
 EAPI=2
 inherit savedconfig toolchain-funcs
 
 DESCRIPTION="A highly customizable and functional PDF viewer based on poppler and GTK+"
 HOMEPAGE="http://zathura.pwmt.org/"
-SRC_URI="http://zathura.pwmt.org/download/${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.gz" # upstream https problems
 
 LICENSE="ZLIB"
 SLOT="0"
@@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/cairo-1.8.8
+	>=dev-libs/glib-2.22.4:2
 	>=x11-libs/gtk+-2.18.6:2
 	>=app-text/poppler-0.12.3-r3[cairo]"
 DEPEND="${RDEPEND}