diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-11-15 19:49:34 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-11-15 19:49:34 +0000 |
| commit | b0a3a174d4359778d261e0c662b883c0f719d78c (patch) | |
| tree | 32be14952098d3afd323206c1726b3258bd48728 /eclass | |
| parent | Define QA_PREBUILT, bug#443120. (diff) | |
| download | gentoo-2-b0a3a174d4359778d261e0c662b883c0f719d78c.tar.gz gentoo-2-b0a3a174d4359778d261e0c662b883c0f719d78c.tar.bz2 gentoo-2-b0a3a174d4359778d261e0c662b883c0f719d78c.zip | |
Use src_uri arrows to allow versioning sanely.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/obs-service.eclass | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d985c36d57c1..7e49595b4c64 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.504 2012/11/12 09:28:53 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.505 2012/11/15 19:49:34 scarabeus Exp $ + + 15 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> obs-service.eclass: + Use src_uri arrows to allow versioning sanely. 12 Nov 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: Update from qt overlay: respect AR (bug #440262); drop support for EAPI=2; diff --git a/eclass/obs-service.eclass b/eclass/obs-service.eclass index ff6544210e39..2756ab9b1f32 100644 --- a/eclass/obs-service.eclass +++ b/eclass/obs-service.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.5 2012/10/02 10:52:31 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.6 2012/11/15 19:49:34 scarabeus Exp $ # @ECLASS: obs-service.eclass # @MAINTAINER: @@ -53,8 +53,9 @@ DESCRIPTION="Open Build Service client module - ${OBS_SERVICE_NAME} service" inherit obs-download -SRC_URI="${OBS_URI}/${OBS_SERVICE_NAME}" -SRC_URI+=" ${OBS_URI}/${OBS_SERVICE_NAME}.service" +# As it aint versioned at all use arrows to deal with it +SRC_URI="${OBS_URI}/${OBS_SERVICE_NAME} -> ${OBS_SERVICE_NAME}-${PV}" +SRC_URI+=" ${OBS_URI}/${OBS_SERVICE_NAME}.service -> ${OBS_SERVICE_NAME}-${PV}.service" for i in ${ADDITIONAL_FILES}; do SRC_URI+=" ${OBS_URI}/${i}" @@ -88,9 +89,9 @@ obs-service_src_install() { debug-print-function ${FUNCNAME} "$@" debug-print "Installing service \"${OBS_SERVICE_NAME}\"" exeinto /usr/lib/obs/service - doexe "${S}"/${OBS_SERVICE_NAME} + newexe "${S}"/${OBS_SERVICE_NAME}-${PV} "${S}"/${OBS_SERVICE_NAME} insinto /usr/lib/obs/service - doins "${S}"/${OBS_SERVICE_NAME}.service + newins "${S}"/${OBS_SERVICE_NAME}-${PV}.service "${S}"/${OBS_SERVICE_NAME}.service if [[ -n ${ADDITIONAL_FILES} ]]; then debug-print "Installing following additional files:" debug-print " ${ADDITIONAL_FILES}" |