Version bump. Remove old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

4 files changed, 27 insertions, 71 deletions

diff --git a/app-emacs/nxml-libvirt-schemas/ChangeLog b/app-emacs/nxml-libvirt-schemas/ChangeLog
index 5846e2c9d23c..bfadaa333528 100644
--- a/app-emacs/nxml-libvirt-schemas/ChangeLog
+++ b/app-emacs/nxml-libvirt-schemas/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/nxml-libvirt-schemas
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/ChangeLog,v 1.8 2012/03/19 18:27:43 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/ChangeLog,v 1.9 2014/02/13 19:50:33 ulm Exp $
+
+*nxml-libvirt-schemas-1.2.1 (13 Feb 2014)
+
+  13 Feb 2014; Ulrich Müller <ulm@gentoo.org>
+  -nxml-libvirt-schemas-0.8.8.ebuild, -nxml-libvirt-schemas-0.9.0_rc1.ebuild,
+  +nxml-libvirt-schemas-1.2.1.ebuild:
+  Version bump. Remove old.
 
 *nxml-libvirt-schemas-0.9.7 (19 Mar 2012)
 
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.0_rc1.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.0_rc1.ebuild
deleted file mode 100644
index 301f77240498..000000000000
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.0_rc1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.0_rc1.ebuild,v 1.1 2011/03/28 07:58:56 flameeyes Exp $
-
-EAPI=2
-
-#BACKPORTS=
-NEED_EMACS=23
-
-inherit elisp eutils
-
-MY_P="libvirt-${PV/_rc/-rc}"
-
-DESCRIPTION="Extension for nxml-mode with libvirt schemas"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
-	${BACKPORTS:+mirror://gentoo/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
-
-# This is the license of the package, but the schema files are
-# provided without license, maybe it's bad.
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Yes this requires Java, but I'd rather not repackage this, if you
-# know something better in C, I'll be glad to use that.
-DEPEND="app-text/trang"
-RDEPEND=""
-
-SITEFILE=60${PN}-gentoo.el
-S="${WORKDIR}/${MY_P%-rc*}"
-
-src_prepare() {
-	[[ -d "${WORKDIR}/patches" ]] && \
-		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" EPATCH_SOURCE="${WORKDIR}/patches" epatch
-}
-
-src_compile() {
-	emake -C docs/schemas -f "${FILESDIR}/Makefile-trang" || die "trang failed"
-}
-
-src_test() {
-	# No we don't need tests here… trang will take care of checking
-	# the well-formedness of the schema files for us
-	:
-}
-
-src_install() {
-	insinto ${SITEETC}/${PN}
-	doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc || die "install failed"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-}
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild
index bf4a9490fd0f..4401b2c150be 100644
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild,v 1.1 2012/03/19 18:27:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild,v 1.2 2014/02/13 19:50:33 ulm Exp $
 
 EAPI=4
 
@@ -18,10 +18,9 @@ SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
 
 # This is the license of the package, but the schema files are
 # provided without license, maybe it's bad.
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # Yes this requires Java, but I'd rather not repackage this, if you
 # know something better in C, I'll be glad to use that.
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.8.8.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild
index 291bdc160060..aafba02dfe4f 100644
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.8.8.ebuild
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.8.8.ebuild,v 1.3 2011/03/28 07:58:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild,v 1.1 2014/02/13 19:50:33 ulm Exp $
 
-EAPI=2
+EAPI=5
 
 #BACKPORTS=
 NEED_EMACS=23
@@ -18,36 +18,39 @@ SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
 
 # This is the license of the package, but the schema files are
 # provided without license, maybe it's bad.
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # Yes this requires Java, but I'd rather not repackage this, if you
 # know something better in C, I'll be glad to use that.
 DEPEND="app-text/trang"
 RDEPEND=""
 
-SITEFILE=60${PN}-gentoo.el
+SITEFILE="60${PN}-gentoo.el"
 S="${WORKDIR}/${MY_P%-rc*}"
 
 src_prepare() {
-	[[ -d "${WORKDIR}/patches" ]] && \
-		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" EPATCH_SOURCE="${WORKDIR}/patches" epatch
+	if [[ -d "${WORKDIR}/patches" ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/patches" \
+		epatch
+	fi
 }
 
 src_compile() {
-	emake -C docs/schemas -f "${FILESDIR}/Makefile-trang" || die "trang failed"
+	emake -C docs/schemas -f "${FILESDIR}/Makefile-trang"
 }
 
 src_test() {
-	# No we don't need tests here… trang will take care of checking
+	# No we don't need tests here... trang will take care of checking
 	# the well-formedness of the schema files for us
 	:
 }
 
 src_install() {
 	insinto ${SITEETC}/${PN}
-	doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc || die "install failed"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 }