media-radio/xlog: Version bump

svn path=/sunrise/; revision=7626

7 files changed, 81 insertions, 12 deletions

diff --git a/media-radio/xlog/ChangeLog b/media-radio/xlog/ChangeLog
index ace645a19..60c82ff16 100644
--- a/media-radio/xlog/ChangeLog
+++ b/media-radio/xlog/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for media-radio/xlog
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jan 2009; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
+  -xlog-1.8.1.ebuild, -files/xlog-1.8.1-desktop-update.patch,
+  +xlog-1.9.ebuild, +files/xlog-1.9-desktop-update.patch,
+  +files/xlog-1.9-destdir.patch, +files/xlog-1.9-docdir.patch,
+  +files/xlog-1.9-key.patch:
+  Version bump
+
   04 Oct 2008; Thomas Beierlein (TomJBE) <tb@forth-ev.de> xlog-1.8.1.ebuild:
   econf dies on its own
 
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 556601975..058a737dd 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,5 +1,8 @@
-AUX xlog-1.8.1-desktop-update.patch 1393 RMD160 045463b085cb4587b571c9ecbf70aafadaf5b716 SHA1 d4143c9f581ab1859f7ea38584248f61358e0b05 SHA256 c9f9afee6309420b875363a3a52a996e48e98c6d6d236c91c2c81c78ce21c13a
-DIST xlog-1.8.1.tar.gz 1787030 RMD160 5eb20c49752a62d14146b69a741a35a89bbb63cd SHA1 28f4966b405588ca432d152659e1bd4b1fc68e93 SHA256 11858e7b13ebfcfc3751a2c88dafdc8832da406fe859cd9db60e12eff83830e1
-EBUILD xlog-1.8.1.ebuild 1276 RMD160 e611c14affa62c1840edf81ba2405a88f5abef04 SHA1 4faaafe9ee86972c9de60771d2eab01fd680c702 SHA256 15425a9b805a9fbb85f8fe5dd74312e223a7613540c88b3ca98650df783938db
-MISC ChangeLog 1492 RMD160 bb8c0be99474bfa0f4317838bcba2c7983f68ee1 SHA1 a32a549ed0f9d641ccc87db8790df0c014fa553a SHA256 6ca71945c2f58eeb3b1928b2850a0bdfd1c7d8d4a62a69131d6659920fd5ebcc
+AUX xlog-1.9-desktop-update.patch 1393 RMD160 045463b085cb4587b571c9ecbf70aafadaf5b716 SHA1 d4143c9f581ab1859f7ea38584248f61358e0b05 SHA256 c9f9afee6309420b875363a3a52a996e48e98c6d6d236c91c2c81c78ce21c13a
+AUX xlog-1.9-destdir.patch 440 RMD160 ed55ea3b45d55ac34845a2abe699cd4f24bdac56 SHA1 8e9842a1e879699846ebd236ade3bed4b2c60f39 SHA256 6a19fd2261a6f6e558c9a18bfde880d3d38b5fcf8f8e5fc6e303baa1a9b6d14c
+AUX xlog-1.9-docdir.patch 776 RMD160 2269c980193ed5faefe72106cbd5f4de1771ff1a SHA1 00a51b7dab4622b2d326da0d9f30a4349a6427e5 SHA256 8388793db0757fa565e736ffd12dafd820756c458e01389a8a11edb748e23774
+AUX xlog-1.9-key.patch 436 RMD160 5da5c3ba2b709aa02828aae053c04a8d542550e1 SHA1 fd9663bf71714320c7e570a03a00837e2c4fde3f SHA256 29a157c2a78cc7b41daddd34b1763cf15d767365cc1b2a12de50e24aa04ff2a8
+DIST xlog-1.9.tar.gz 11074235 RMD160 1779743ff234eb86f76f921bfc439e38d001515e SHA1 aa458886b2d89dc0c29ab3548d5664e235bf63b3 SHA256 b1e0a5289f4d716a1b9f2c33291b5e26eac724234193f0570c6f3ed11d809d76
+EBUILD xlog-1.9.ebuild 1572 RMD160 3e03b04d262352435814e6b993798a458bc2f975 SHA1 fedc23eeef0615838911bcf5030842d1c5413b4c SHA256 492c8d26f8ebff2a97d320917d23d9c8716d851d1a3ae4e7963851182a034e38
+MISC ChangeLog 1778 RMD160 33a07d3222025384c893021c295138c65df39a89 SHA1 ac98684ff32db38a2fac6a95bcc86a6277075027 SHA256 ba00ad5cda0fa108bddc826040141475cd8d234ae023084a887877bd6729581f
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/media-radio/xlog/files/xlog-1.8.1-desktop-update.patch b/media-radio/xlog/files/xlog-1.9-desktop-update.patch
index ccdb2ddac..ccdb2ddac 100644
--- a/media-radio/xlog/files/xlog-1.8.1-desktop-update.patch
+++ b/media-radio/xlog/files/xlog-1.9-desktop-update.patch
diff --git a/media-radio/xlog/files/xlog-1.9-destdir.patch b/media-radio/xlog/files/xlog-1.9-destdir.patch
new file mode 100644
index 000000000..639860b81
--- /dev/null
+++ b/media-radio/xlog/files/xlog-1.9-destdir.patch
@@ -0,0 +1,14 @@
+--- Makefile.am.orig	2009-01-11 18:06:38.000000000 +0100
++++ Makefile.am	2009-01-11 18:08:23.000000000 +0100
+@@ -8,8 +8,8 @@
+ 
+ install-data-local:
+ 	@$(NORMAL_INSTALL)
+-	$(INSTALL_DATA) AUTHORS $(docdir)
+-	$(INSTALL_DATA) ChangeLog $(docdir)
+-	$(INSTALL_DATA) BUGS $(docdir)
++	$(INSTALL_DATA) AUTHORS $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) ChangeLog $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) BUGS $(DESTDIR)$(docdir)
+ 
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/media-radio/xlog/files/xlog-1.9-docdir.patch b/media-radio/xlog/files/xlog-1.9-docdir.patch
new file mode 100644
index 000000000..1b8c5d6ac
--- /dev/null
+++ b/media-radio/xlog/files/xlog-1.9-docdir.patch
@@ -0,0 +1,25 @@
+--- data/doc/Makefile.am.orig	2009-01-11 18:27:28.000000000 +0100
++++ data/doc/Makefile.am	2009-01-11 18:28:21.000000000 +0100
+@@ -67,10 +67,9 @@
+ manual/xlog-pagesetupdialog.png \
+ manual/xlog-workedwindow.png
+ 
+-docdir = $(datadir)/doc/xlog
+ doc_DATA = $(DOC_FILES)
+ 
+-manualdir = $(datadir)/doc/xlog/manual
++manualdir = $(docdir)/manual
+ manual_DATA = $(MANUAL_FILES)
+ 
+ EXTRA_DIST = $(DOC_FILES) $(MANUAL_FILES) $(TEX_FILES)
+--- src/Makefile.am.orig	2009-01-11 19:56:43.000000000 +0100
++++ src/Makefile.am	2009-01-11 19:57:03.000000000 +0100
+@@ -12,7 +12,7 @@
+ 	-DDATADIR=\""$(datadir)"\" \
+ 	-DXLOG_LOCALEDIR=\""$(datadir)/locale"\" \
+ 	-DXLOG_DATADIR=\""$(datadir)/xlog"\" \
+-	-DXLOG_DOCDIR=\""$(datadir)/doc/xlog"\"
++	-DXLOG_DOCDIR=\""$(docdir)"\"
+ 
+ CLEANFILES = *~
+ 
diff --git a/media-radio/xlog/files/xlog-1.9-key.patch b/media-radio/xlog/files/xlog-1.9-key.patch
new file mode 100644
index 000000000..10d17c7f0
--- /dev/null
+++ b/media-radio/xlog/files/xlog-1.9-key.patch
@@ -0,0 +1,12 @@
+# fixes directory for KEYS file
+--- src/gui_keys.c.orig	2009-01-12 07:19:32.000000000 +0100
++++ src/gui_keys.c	2009-01-12 07:19:47.000000000 +0100
+@@ -88,7 +88,7 @@
+ #ifdef G_OS_WIN32
+ 	helpfile = g_strdup_printf ("%s", filename);
+ #else
+-	helpfile = g_strdup_printf ("%s%s%s", XLOG_DATADIR, G_DIR_SEPARATOR_S, 
++	helpfile = g_strdup_printf ("%s%s%s", XLOG_DOCDIR, G_DIR_SEPARATOR_S, 
+ 		filename);
+ #endif
+ 	buf = g_new0 (gchar, 100);
diff --git a/media-radio/xlog/xlog-1.8.1.ebuild b/media-radio/xlog/xlog-1.9.ebuild
index a97ad6735..deaf21795 100644
--- a/media-radio/xlog/xlog-1.8.1.ebuild
+++ b/media-radio/xlog/xlog-1.9.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 inherit autotools eutils fdo-mime
 
 DESCRIPTION="An amateur radio logging program"
-HOMEPAGE="http://pg4i.chronos.org.uk/"
-SRC_URI="http://pg4i.chronos.org.uk/download/${P}.tar.gz"
+HOMEPAGE="http://www.qsl.net/pg4i/linux/xlog.html"
+SRC_URI="http://www.qsl.net/pg4i/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -17,26 +17,34 @@ RDEPEND="media-libs/hamlib
 	=dev-libs/glib-2*
 	>=x11-libs/gtk+-2.12"
 DEPEND="${RDEPEND}
+	sys-devel/gettext
 	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# Let portage handle updating mimie/desktop databases
-	epatch "${FILESDIR}/${P}-desktop-update.patch"
+	# Let portage handle updating mime/desktop databases,
+	# fix for wrong placed file,
+	# fix for respecting DESTDIR and
+	# and finally fix to respect docdir=...
+	epatch "${FILESDIR}/${P}-desktop-update.patch" \
+		"${FILESDIR}/${P}-key.patch" \
+		"${FILESDIR}/${P}-destdir.patch" \
+		"${FILESDIR}/${P}-docdir.patch"
 	mkdir -p "${S}"/m4	# make autoconf happy...
 	eautoreconf
 }
 
 src_compile() {
 	# mime-update causes file collisions if enabled
-	econf --disable-mime-update --disable-desktop-update
+	econf --disable-mime-update --disable-desktop-update \
+		--docdir=/usr/share/doc/${PF}
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS README
+	dodoc AUTHORS data/doc/THANKS NEWS README || die "dodoc failed"
 }
 
 pkg_postinst() {