summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2014-01-25 15:23:54 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2014-01-25 15:23:54 +0000
commitf4b44f4a63a4ce24202664e8a660634465eadaf3 (patch)
tree4db77aed5648faf29f9cfd3bb15fcf208686c7ea /eclass
parentInitial addition based on version in enlightenment overlay, USE flag descript... (diff)
downloadgentoo-2-f4b44f4a63a4ce24202664e8a660634465eadaf3.tar.gz
gentoo-2-f4b44f4a63a4ce24202664e8a660634465eadaf3.tar.bz2
gentoo-2-f4b44f4a63a4ce24202664e8a660634465eadaf3.zip
major changes depend on wrt bug 497056, vdr-plugin-2.eclass
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/vdr-plugin-2.eclass23
2 files changed, 22 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 12b019aef0fb..47eb1d9f6efb 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1130 2014/01/25 04:07:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1131 2014/01/25 15:23:54 hd_brummy Exp $
+
+ 25 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+ major changes depend on wrt bug 497056, vdr-plugin-2.eclass
25 Jan 2014; Mike Gilbert <floppym@gentoo.org> cmake-utils.eclass:
Improve support for ninja, bug 490280.
diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index f935beb12d50..9862f1ec7dcd 100644
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.26 2014/01/24 13:51:18 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.27 2014/01/25 15:23:54 hd_brummy Exp $
# @ECLASS: vdr-plugin-2.eclass
# @MAINTAINER:
@@ -43,7 +43,7 @@
#
# For more details about it please take a look at the eutils.class.
-inherit base eutils flag-o-matic multilib toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs unpacker # base
case ${EAPI:-0} in
4|5) ;;
@@ -202,6 +202,7 @@ vdr_patchmakefile() {
dev_check() {
# A lot useful debug infos
# set VDR_MAINTAINER_MODE="1" in make.conf
+ VDR_MAINTAINER_MODE="1" # cleanup later
if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
eerror "\t Gentoo Developer Debug: $@"
fi
@@ -410,7 +411,9 @@ vdr-plugin-2_src_util() {
vdr-plugin-2_src_util add_local_patch patchmakefile linguas_patch i18n
;;
unpack)
- base_src_unpack
+# base_src_unpack # cleanup later
+ dev_check "function src_unpack, changed from base.eclass to unpacker.eclass"
+ unpacker_src_unpack
;;
add_local_patch)
cd "${S}" || die "Could not change to plugin-source-directory!"
@@ -441,6 +444,12 @@ vdr-plugin-2_src_unpack() {
die "vdr-plugin-2_src_unpack not called!"
fi
+ # cleanup later...
+ dev_check "https://bugs.gentoo.org/show_bug.cgi?id=497056"
+ dev_check "Major changes in vdr-plugin-2.eclass"
+ dev_check "Please report problems in scr_unpack, src_prepare"
+ dev_check "to this bug or direct to vdr(at)gentoo.org"
+
if [ -z "$1" ]; then
vdr-plugin-2_src_util unpack
else
@@ -457,7 +466,11 @@ vdr-plugin-2_src_prepare() {
die "vdr-plugin-2_src_prepare not called!"
fi
- base_src_prepare
+# base_src_prepare # cleanup later
+ dev_check "function src_prepare, changed from base.eclass to eutils.eclass"
+ [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+ debug-print "$FUNCNAME: applying user patches"
+
vdr-plugin-2_src_util prepare
}
@@ -532,7 +545,7 @@ vdr-plugin-2_src_install() {
DESTDIR="${D}" \
|| die "einstall (makefile target) failed"
else
- dev_check "Plugin still use the old Makefile handling"
+ dev_check "Plugin use still the old Makefile handling"
insinto "${VDR_PLUGIN_DIR}"
doins libvdr-*.so.*
fi