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

(Portage version: 2.1.9.22/cvs/Linux x86_64)

3 files changed, 66 insertions, 4 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/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