diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-10-08 16:52:20 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-10-08 16:52:20 +0000 |
commit | 2ecae9c41965e5ada4b25ffa19647ac571b321c3 (patch) | |
tree | 3233c022c50b793efd13fd769bf87516ad892c5d | |
parent | Version bump; bad sector emulation is now off by default. Remove old. (diff) | |
download | gentoo-2-2ecae9c41965e5ada4b25ffa19647ac571b321c3.tar.gz gentoo-2-2ecae9c41965e5ada4b25ffa19647ac571b321c3.tar.bz2 gentoo-2-2ecae9c41965e5ada4b25ffa19647ac571b321c3.zip |
Version bump. Remove old.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
-rw-r--r-- | app-cdr/cdemu/ChangeLog | 13 | ||||
-rw-r--r-- | app-cdr/cdemu/cdemu-2.0.0.ebuild | 58 | ||||
-rw-r--r-- | app-cdr/cdemu/cdemu-2.1.1.ebuild (renamed from app-cdr/cdemu/cdemu-2.1.0.ebuild) | 13 | ||||
-rw-r--r-- | app-cdr/cdemu/files/cdemu-2.0.0-bash-completion-dir.patch | 13 |
4 files changed, 20 insertions, 77 deletions
diff --git a/app-cdr/cdemu/ChangeLog b/app-cdr/cdemu/ChangeLog index c672fe4cf133..79a65ba139c1 100644 --- a/app-cdr/cdemu/ChangeLog +++ b/app-cdr/cdemu/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for app-cdr/cdemu # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.45 2013/07/20 11:11:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.46 2013/10/08 16:52:20 tetromino Exp $ + +*cdemu-2.1.1 (08 Oct 2013) + + 08 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -cdemu-2.0.0.ebuild, + -cdemu-2.1.0.ebuild, +cdemu-2.1.1.ebuild, + -files/cdemu-2.0.0-bash-completion-dir.patch: + Version bump. Remove old. + + 08 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -cdemu-2.0.0.ebuild, + -cdemu-2.1.0.ebuild, -files/cdemu-2.0.0-bash-completion-dir.patch: + Remove old. 20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> cdemu-2.1.0-r2.ebuild: Stable for x86, wrt bug #477004 diff --git a/app-cdr/cdemu/cdemu-2.0.0.ebuild b/app-cdr/cdemu/cdemu-2.0.0.ebuild deleted file mode 100644 index c9632ec1cb89..000000000000 --- a/app-cdr/cdemu/cdemu-2.0.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.0.0.ebuild,v 1.3 2013/06/25 16:56:14 ago Exp $ - -EAPI="5" - -CMAKE_MIN_VERSION="2.8.5" -PYTHON_COMPAT=( python2_6 python2_7 ) -PLOCALES="de fr no pl sl sv" - -inherit cmake-utils eutils fdo-mime l10n python-single-r1 - -DESCRIPTION="Command-line tool for controlling cdemu-daemon" -HOMEPAGE="http://cdemu.org" -SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~hppa x86" -IUSE="+cdemu-daemon" - -RDEPEND="${PYTHON_DEPS} - dev-python/dbus-python[${PYTHON_USEDEP}] - cdemu-daemon? ( app-cdr/cdemu-daemon:0/4 )" -DEPEND="${RDEPEND} - dev-util/desktop-file-utils - >=dev-util/intltool-0.21 - >=sys-devel/gettext-0.18" - -S=${WORKDIR}/cdemu-client-${PV} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - python_fix_shebang src/cdemu - epatch "${FILESDIR}/${PN}-2.0.0-bash-completion-dir.patch" - # build system doesn't respect LINGUAS :/ - rm_po() { - rm po/$1.po || die - } - l10n_for_each_disabled_locale_do rm_po -} - -src_configure() { - DOCS="AUTHORS README" - local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF ) - cmake-utils_src_configure -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/app-cdr/cdemu/cdemu-2.1.0.ebuild b/app-cdr/cdemu/cdemu-2.1.1.ebuild index 438b827b2bef..51262d57a6d0 100644 --- a/app-cdr/cdemu/cdemu-2.1.0.ebuild +++ b/app-cdr/cdemu/cdemu-2.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.0.ebuild,v 1.1 2013/06/17 04:19:18 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.1.ebuild,v 1.1 2013/10/08 16:52:20 tetromino Exp $ EAPI="5" @@ -8,7 +8,7 @@ CMAKE_MIN_VERSION="2.8.5" PYTHON_COMPAT=( python2_6 python2_7 ) PLOCALES="de fr no pl sl sv" -inherit cmake-utils eutils fdo-mime l10n python-single-r1 +inherit bash-completion-r1 cmake-utils eutils fdo-mime l10n python-single-r1 DESCRIPTION="Command-line tool for controlling cdemu-daemon" HOMEPAGE="http://cdemu.org" @@ -21,7 +21,7 @@ IUSE="+cdemu-daemon" RDEPEND="${PYTHON_DEPS} dev-python/dbus-python[${PYTHON_USEDEP}] - cdemu-daemon? ( app-cdr/cdemu-daemon:0/5 )" + cdemu-daemon? ( app-cdr/cdemu-daemon:0/6 )" DEPEND="${RDEPEND} dev-util/desktop-file-utils >=dev-util/intltool-0.21 @@ -35,7 +35,7 @@ pkg_setup() { src_prepare() { python_fix_shebang src/cdemu - epatch "${FILESDIR}/${PN}-2.0.0-bash-completion-dir.patch" + epatch "${FILESDIR}/${PN}-2.1.0-bash-completion-dir.patch" # build system doesn't respect LINGUAS :/ l10n_find_plocales_changes po "" ".po" rm_po() { @@ -46,7 +46,10 @@ src_prepare() { src_configure() { DOCS="AUTHORS README" - local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF ) + local mycmakeargs=( + -DPOST_INSTALL_HOOKS=OFF + -DGENTOO_BASHCOMPDIR="$(get_bashcompdir)" + ) cmake-utils_src_configure } diff --git a/app-cdr/cdemu/files/cdemu-2.0.0-bash-completion-dir.patch b/app-cdr/cdemu/files/cdemu-2.0.0-bash-completion-dir.patch deleted file mode 100644 index 58ad6d9f24eb..000000000000 --- a/app-cdr/cdemu/files/cdemu-2.0.0-bash-completion-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt -index 6f33b7c..5261c18 100644 ---- a/cdemu-client/CMakeLists.txt -+++ b/cdemu-client/CMakeLists.txt -@@ -41,7 +41,7 @@ install ( - - install ( - FILES data/cdemu-bashcomp -- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion - RENAME cdemu-client - ) - |