revert changes for xlog-2.0.3.ebuild and revbump instead to make users aware of it

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

4 files changed, 69 insertions, 6 deletions

diff --git a/media-radio/xlog/ChangeLog b/media-radio/xlog/ChangeLog
index dfd8466428a5..43215e0a3fef 100644
--- a/media-radio/xlog/ChangeLog
+++ b/media-radio/xlog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-radio/xlog
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/ChangeLog,v 1.15 2010/10/24 10:03:18 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/ChangeLog,v 1.16 2010/10/24 10:51:30 tomjbe Exp $
+
+*xlog-2.0.3-r1 (24 Oct 2010)
+
+  24 Oct 2010; Thomas Beierlein <tomjbe@gentoo.org> xlog-2.0.3.ebuild,
+  +xlog-2.0.3-r1.ebuild:
+  revert changes for xlog-2.0.3.ebuild and revbump instead to make users
+  aware of it
 
   24 Oct 2010; Thomas Beierlein <tomjbe@gentoo.org> xlog-2.0.3.ebuild,
   +files/xlog-2.0.3-dxcc.patch:
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 2c5969e20923..c5911210970e 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -4,6 +4,7 @@ AUX xlog-2.0.2-qsl.patch 809 RMD160 e1e124b746c0f08febf4f7e1bc33c66735181d18 SHA
 AUX xlog-2.0.3-dxcc.patch 793 RMD160 b59a93280e07d064d110a460dc90f8b608900cef SHA1 6f82d9a98e1a3fa1d80fcd0f070fb7ed5f172090 SHA256 935a8313552b5291bb07a7d8a9179cb5670852d713aae6712c7c28c144fe732d
 AUX xlog-2.0.3-memmove.patch 1873 RMD160 23deb0ae3eec9e5f7cd8f799368bd44d3b90b35a SHA1 000b00cf73ac915e47d92a57554a5a9053706d17 SHA256 b13e49ed3b305463a4e9fc38afb1806f8b53348b55fd48dd21c39b29ca1f4f12
 DIST xlog-2.0.3.tar.gz 11141993 RMD160 b4882d0916ebb80306e497367dacf065b687009b SHA1 cc073fb3844b240ecaeed3119fc9b430e4116faf SHA256 ca12a468d2b10b11adbff365d0731853bfc54d915a342b2e3b712629d092f245
-EBUILD xlog-2.0.3.ebuild 1478 RMD160 34127dc21581366d2f87eb999f3ce83f3c7ad852 SHA1 1b8b1ca81eeadfda5218378e9a2dea0598dc5bac SHA256 2c557b3f16f78e82acaaff89c596b36b8289d61382bc6ad15e8e43ec3caee5fc
-MISC ChangeLog 963 RMD160 2c04467bda7d370cc5c02a87792c932e789d6d63 SHA1 dbb4602178605e3fe7b270525b63e961e59f736e SHA256 d5a04c292d790bd93f55a7d02b86e6f86e9891bacd2fa56fca4b9941c8f8cc9d
+EBUILD xlog-2.0.3-r1.ebuild 1483 RMD160 cbef32872de2093a08b5fc4473a981c8f64e6aac SHA1 a664e39298ff2370d0a26c865d1e02a1b11a0b0d SHA256 80a34eb459e135b598ac682e235469f3c2508b37e71f12767ad1ea6cac22d317
+EBUILD xlog-2.0.3.ebuild 1399 RMD160 1827c3d3325bcf4ad5d34311aadd8688e22ae99a SHA1 4f5864d07e4ad33a0dc8845c2181d100f5002829 SHA256 2bfb573570b6dae87cf373a478fc08d5979683004ae417efe5f362c62c8ccca3
+MISC ChangeLog 1177 RMD160 ab6f9fd4db921d03bfedbe81e340825768d1fc1c SHA1 005eec24f71002d710936d37e7bf40e86cea4ae3 SHA256 6480f9c22c5eb5752d14d3857fa6516ea38dac51e7b4f184cfd9d2ee164a66b2
 MISC metadata.xml 252 RMD160 97b7e7d78993c6123ed2d99298be3bade7e52197 SHA1 d747c2ba9a0158afb075712518f6442af74a6fbb SHA256 e9ecb799a64ff215ac2412db6e6c133d8d325c330d07b087b23d21ad0b56c7a6
diff --git a/media-radio/xlog/xlog-2.0.3-r1.ebuild b/media-radio/xlog/xlog-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..b94e1196931a
--- /dev/null
+++ b/media-radio/xlog/xlog-2.0.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/xlog-2.0.3-r1.ebuild,v 1.1 2010/10/24 10:51:30 tomjbe Exp $
+
+EAPI=2
+
+inherit autotools eutils fdo-mime
+
+DESCRIPTION="An amateur radio logging program"
+HOMEPAGE="http://www.nongnu.org/xlog"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/hamlib
+	=dev-libs/glib-2*
+	>=x11-libs/gtk+-2.12"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+src_prepare() {
+	# Let portage handle updating mime/desktop databases,
+	epatch "${FILESDIR}/${PN}-1.9-desktop-update.patch"
+	# and patch wrong ADIF export
+	epatch "${FILESDIR}/${PN}-2.0.1-adif.patch" \
+	    "${FILESDIR}/${PN}-2.0.2-qsl.patch"
+	# patch buffer overflow for new cty.dat
+	epatch "${FILESDIR}"/${P}-dxcc.patch
+	# fix buffer overflow (bug 339652)
+	epatch "${FILESDIR}/${P}-memmove.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# mime-update causes file collisions if enabled
+	econf --disable-mime-update --disable-desktop-update \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS data/doc/THANKS NEWS README || die "dodoc failed"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-radio/xlog/xlog-2.0.3.ebuild b/media-radio/xlog/xlog-2.0.3.ebuild
index 3e2e1d8e7cb5..c0cae21d9bb7 100644
--- a/media-radio/xlog/xlog-2.0.3.ebuild
+++ b/media-radio/xlog/xlog-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/xlog-2.0.3.ebuild,v 1.5 2010/10/24 10:03:18 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/xlog-2.0.3.ebuild,v 1.6 2010/10/24 10:51:30 tomjbe Exp $
 
 EAPI=2
 
@@ -28,8 +28,6 @@ src_prepare() {
 	# and patch wrong ADIF export
 	epatch "${FILESDIR}/${PN}-2.0.1-adif.patch" \
 	    "${FILESDIR}/${PN}-2.0.2-qsl.patch"
-	# patch buffer overflow for new cty.dat
-	epatch "${FILESDIR}"/${P}-dxcc.patch
 	# fix buffer overflow (bug 339652)
 	epatch "${FILESDIR}/${P}-memmove.patch"
 	eautoreconf