[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/04/29 13:05:34

  Modified:             ChangeLog
  Added:                vdr-plugin-2.eclass
  Log:
  vdr-plugin-2.eclass added; include major fixes for obselet i18n handling, Linguas support

Revision  Changes    Path
1.226                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.226&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.226&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.225&r2=1.226

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- ChangeLog	27 Apr 2012 19:51:52 -0000	1.225
+++ ChangeLog	29 Apr 2012 13:05:34 -0000	1.226
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.225 2012/04/27 19:51:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.226 2012/04/29 13:05:34 hd_brummy Exp $
+
+  29 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-plugin-2.eclass:
+  vdr-plugin-2.eclass added; include major fixes for obselet i18n handling,
+  Linguas support
 
   27 Apr 2012; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
   Sync from Emacs overlay: Require GNU Emacs in elisp-need-emacs().



1.1                  eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.1&content-type=text/plain

Index: vdr-plugin-2.eclass
===================================================================
# Copyright 1999-2012 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.1 2012/04/29 13:05:34 hd_brummy Exp $

# @ECLASS: vdr-plugin-2.eclass
# @MAINTAINER:
# vdr@gentoo.org
# @BLURB: common vdr plugin ebuild functions
# @DESCRIPTION:
# Eclass for easing maitenance of vdr plugin ebuilds

# Authors:
# Matthias Schwarzott <zzam@gentoo.org>
# Joerg Bornkessel <hd_brummy@gentoo.org>
# Christian Ruppert <idl0r@gentoo.org>

# Plugin config file installation:
#
# A plugin config file can be specified through the $VDR_CONFD_FILE variable, it
# defaults to ${FILESDIR}/confd. Each config file will be installed as e.g.
# ${D}/etc/conf.d/vdr.${VDRPLUGIN}

# Installation of rc-addon files:
# NOTE: rc-addon files must be valid shell scripts!
#
# Installing rc-addon files is basically the same as for plugin config files
# (see above), it's just using the $VDR_RCADDON_FILE variable instead.
# The default value when $VDR_RCADDON_FILE is undefined is:
# ${FILESDIR}/rc-addon.sh and will be installed as
# ${VDR_RC_DIR}/plugin-${VDRPLUGIN}.sh
#
# The rc-addon files will be sourced by the startscript when the specific plugin
# has been enabled.
# rc-addon files may be used to prepare everything that is necessary for the
# plugin start/stop, like passing extra command line options and so on.

# Applying your own local/user patches:
# This is done by using the epatch_user() function of the eutils.eclass.
# Simply put your patches into one of these directories:
# /etc/portage/patches/<CATEGORY>/<PF|P|PN>/
# Quote: where the first of these three directories to exist will be the one to
# use, ignoring any more general directories which might exist as well.
#
# For more details about it please take a look at the eutils.class.

inherit base multilib eutils flag-o-matic

if ! has "${EAPI:-4}" 4; then
	die "API of vdr-plugin-2.eclass in EAPI=\"${EAPI}\" not established"
fi

EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config

IUSE=""

# Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and postfixes
VDRPLUGIN="${PN/#vdrplugin-/}"
VDRPLUGIN="${VDRPLUGIN/#vdr-/}"
VDRPLUGIN="${VDRPLUGIN/%-cvs/}"

DESCRIPTION="vdr Plugin: ${VDRPLUGIN} (based on vdr-plugin-2.eclass)"

# Works in most cases
S="${WORKDIR}/${VDRPLUGIN}-${PV}"

# depend on headers for DVB-driver
COMMON_DEPEND=">=media-tv/gentoo-vdr-scripts-0.4.2"

DEPEND="${COMMON_DEPEND}
	virtual/linuxtv-dvb-headers"
RDEPEND="${COMMON_DEPEND}
	>=app-admin/eselect-vdr-0.0.2"

# This is a hack for ebuilds like vdr-xineliboutput that want to
# conditionally install a vdr-plugin
if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]]; then
	IUSE="${IUSE} vdr"
	DEPEND="vdr? ( ${DEPEND} )"
	RDEPEND="vdr? ( ${RDEPEND} )"
fi

# New method of storing plugindb
#   Called from src_install
#   file maintained by normal portage-methods
create_plugindb_file() {
	local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
	local DB_FILE="${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}"
	insinto "${NEW_VDRPLUGINDB_DIR}"

#	BUG: portage-2.1.4_rc9 will delete the EBUILD= line, so we cannot use this code.
#	cat <<-EOT > "${D}/${DB_FILE}"
#		VDRPLUGIN_DB=1
#		CREATOR=ECLASS
#		EBUILD=${CATEGORY}/${PN}
#		EBUILD_V=${PVR}
#	EOT
	{
		echo "VDRPLUGIN_DB=1"
		echo "CREATOR=ECLASS"
		echo "EBUILD=${CATEGORY}/${PN}"
		echo "EBUILD_V=${PVR}"
		echo "PLUGINS=\"$@\""
	} > "${D}/${DB_FILE}"
}

# Delete files created outside of vdr-plugin-2.eclass
#   vdrplugin-rebuild.ebuild converted plugindb and files are
#   not deleted by portage itself - should only be needed as
#   long as not every system has switched over to
#   vdrplugin-rebuild-0.2 / gentoo-vdr-scripts-0.4.2
delete_orphan_plugindb_file() {
	#elog Testing for orphaned plugindb file
	local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
	local DB_FILE="${ROOT}/${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}"

	# file exists
	[[ -f ${DB_FILE} ]] || return

	# will portage handle the file itself
	if grep -q CREATOR=ECLASS "${DB_FILE}"; then
		#elog file owned by eclass - don't touch it
		return
	fi

	elog "Removing orphaned plugindb-file."
	elog "\t#rm ${DB_FILE}"
	rm "${DB_FILE}"
}


create_header_checksum_file() {
	# Danger: Not using $ROOT here, as compile will also not use it !!!
	# If vdr in $ROOT and / differ, plugins will not run anyway

	local CHKSUM="header-md5-vdr"

	if [[ -f ${VDR_CHECKSUM_DIR}/header-md5-vdr ]]; then
		cp "${VDR_CHECKSUM_DIR}/header-md5-vdr" "${CHKSUM}"
	elif type -p md5sum >/dev/null 2>&1; then
		(
			cd "${VDR_INCLUDE_DIR}"
			md5sum *.h libsi/*.h|LC_ALL=C sort --key=2
		) > "${CHKSUM}"
	else
		die "Could not create md5 checksum of headers"
	fi

	insinto "${VDR_CHECKSUM_DIR}"
	local p_name
	for p_name; do
		newins "${CHKSUM}" "header-md5-${p_name}"
	done
}

fix_vdr_libsi_include() {
	dev_check "Fixing include of libsi-headers"
	local f
	for f; do
		sed -i "${f}" \
			-e '/#include/s:"\(.*libsi.*\)":<\1>:' \
			-e '/#include/s:<.*\(libsi/.*\)>:<vdr/\1>:'
	done
}

vdr_patchmakefile() {
	einfo "Patching Makefile"
	[[ -e Makefile ]] || die "Makefile of plugin can not be found!"
	cp Makefile "${WORKDIR}"/Makefile.before

	# plugin makefiles use VDRDIR in strange ways
	# assumptions:
	#   1. $(VDRDIR) contains Make.config
	#   2. $(VDRDIR) contains config.h
	#   3. $(VDRDIR)/include/vdr contains the headers
	#   4. $(VDRDIR) contains main vdr Makefile
	#   5. $(VDRDIR)/locale exists
	#   6. $(VDRDIR) allows to access vdr source files
	#
	# We only have one directory (for now /usr/include/vdr),
	# that contains vdr-headers and Make.config.
	# To satisfy 1-3 we do this:
	#   Set VDRDIR=/usr/include/vdr
	#   Set VDRINCDIR=/usr/include
	#   Change $(VDRDIR)/include to $(VDRINCDIR)

	sed -i Makefile \
		-e "s:^VDRDIR.*$:VDRDIR = ${VDR_INCLUDE_DIR}:" \
		-e "/^VDRDIR/a VDRINCDIR = ${VDR_INCLUDE_DIR%/vdr}" \
		-e '/VDRINCDIR.*=/!s:$(VDRDIR)/include:$(VDRINCDIR):' \
		\
		-e 's:-I$(DVBDIR)/include::' \
		-e 's:-I$(DVBDIR)::'

	# may be needed for multiproto:
	#sed -i Makefile \
	#	-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
	#	-e 's:-I$(DVBDIR)/include:-I$(DVBDIR):'

	if ! grep -q APIVERSION Makefile; then
		ebegin "  Converting to APIVERSION"
		sed -i Makefile \
			-e 's:^APIVERSION = :APIVERSION ?= :' \
			-e 's:$(LIBDIR)/$@.$(VDRVERSION):$(LIBDIR)/$@.$(APIVERSION):' \
			-e '/VDRVERSION =/a\APIVERSION = $(shell sed -ne '"'"'/define APIVERSION/s/^.*"\\(.*\\)".*$$/\\1/p'"'"' $(VDRDIR)/config.h)'
		eend $?
	fi

	# Correcting Compile-Flags
	# Do not overwrite CXXFLAGS, add LDFLAGS if missing
	sed -i Makefile \
		-e '/^CXXFLAGS[[:space:]]*=/s/=/?=/' \
		-e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:'

	# Disabling file stripping, the package manager takes care of it
	sed -i Makefile \
		-e '/@.*strip/d' \
		-e '/strip \$(LIBDIR)\/\$@/d' \
		-e 's/STRIP.*=.*$/STRIP = true/'

	# Use a file instead of a variable as single-stepping via ebuild
	# destroys environment.
	touch "${WORKDIR}"/.vdr-plugin_makefile_patched
}

# Begin new vdr-plugin-2.eclass content
dev_check() {
	# A lot useful debug infos
	# set VDR_MAINTAINER_MODE="1" in /etc/make.conf
	if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
		eerror "\t Maintainer Info: $@"
	fi
}

gettext_missing() {
	# plugins without converting to gettext

	local GETTEXT_MISSING=$( grep xgettext Makefile )
	if [ -z ${GETTEXT_MISSING} ]; then
		dev_check "Plugin isn't converted to gettext handling \n"
	fi
}

linguas_support() {
#	Patching Makefile for linguas support.
#	Only locales, enabled through the LINGUAS (make.conf) variable will be
#	"compiled" and installed.
#
#	Some plugins have po/ in a subdir
#	set PO_SUBDIR in .ebuild
#	i.e media-plugins/vdr-streamdev
#	PO_SUBDIR="client server"

	einfo "Patching for Linguas support"
	einfo "available Languages for ${P} are:"

	[[ -f po ]] && local po_dir="${S}"
	local po_subdir=( ${S}/${PO_SUBDIR} )
	local f

	makefile_dir=( ${po_dir} ${po_subdir[*]} )

	for f in ${makefile_dir[*]}; do

		PLUGIN_LINGUAS=$( ls ${f}/po | tr \\\012 ' ' | tr -d [:upper:] | tr -d [:punct:] |sed -e "s:po::g" )
		einfo "LINGUAS=\"${PLUGIN_LINGUAS}\""

		sed -i ${f}/Makefile \
			-e 's:\$(wildcard[[:space:]]*\$(PODIR)/\*.po):\$(foreach dir,\$(LINGUAS),\$(wildcard \$(PODIR)\/\$(dir)\*.po)):' \
			|| die "sed failed for Linguas"
	done

	# maintainer check
	if [[ ! -d po ]]; then
		dev_check "po dir not found? May be in subdir? \n"
	fi
}

vdr_i18n() {
# 	i18n handling was deprecated since >=media-video/vdr-1.5.9,
#	finally with >=media-video/vdr-1.7.27 it has been dropped entirely and some
#	plugins will fail to "compile" because they're still using the old variant.
#	Simply remove the i18n.o object from Makefile (OBJECT) and
#	remove "static const tI18nPhrase*" from i18n.h.
#
#	Plugins that are still using the old method will be pmasked until they're
#	fixed or in case of maintainer timeout they'll be masked for removal.

	gettext_missing

	local I18N_OBJECT=$( grep i18n.o Makefile )
	if [[ -n ${I18N_OBJECT} ]]; then
		sed -i "s:i18n.o::g" Makefile
		dev_check "OBJECT i18n.o found"
		dev_check "removed per sed \n"
	else
		dev_check "OBJECT i18n.o not found in Makefile"
		dev_check "all fine or manual review needed? \n"
	fi

	local I18N_STRING=$( [[ -e i18n.h ]] && grep tI18nPhrase i18n.h )
	if [[ -n ${I18N_STRING} ]]; then
		sed -i "s:^extern[[:space:]]*const[[:space:]]*tI18nPhrase://static const tI18nPhrase:" i18n.h
		dev_check "obsolete tI18nPhrase found"
		dev_check "disabled per sed, please recheck \n"
	else
		dev_check "obsolete tI18nPhrase not found, fine..."
		dev_check "please review, may be in subdir... \n"
	fi
}
# end new vdr-plugin-2.eclass content

vdr-plugin-2_copy_source_tree() {
	pushd . >/dev/null
	cp -r "${S}" "${T}"/source-tree
	cd "${T}"/source-tree
	cp "${WORKDIR}"/Makefile.before Makefile
	# TODO: Fix this, maybe no longer needed
	sed -i Makefile \
		-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
		-e 's:^CXXFLAGS:#CXXFLAGS:' \
		-e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \
		-e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):'
	popd >/dev/null
}

vdr-plugin-2_install_source_tree() {
	einfo "Installing sources"
	destdir="${VDRSOURCE_DIR}/vdr-${VDRVERSION}/PLUGINS/src/${VDRPLUGIN}"
	insinto "${destdir}-${PV}"
	doins -r "${T}"/source-tree/*

	dosym "${VDRPLUGIN}-${PV}" "${destdir}"
}

vdr-plugin-2_print_enable_command() {
	local p_name c=0 l=""
	for p_name in ${vdr_plugin_list}; do
		c=$(( c+1 ))
		l="$l ${p_name#vdr-}"
	done

	elog
	case $c in
	1)	elog "Installed plugin${l}" ;;
	*)	elog "Installed $c plugins:${l}" ;;
	esac
	elog "To activate a plugin execute this command:"
	elog "\teselect vdr-plugin enable <plugin_name> ..."
	elog
}

has_vdr() {
	[[ -f "${VDR_INCLUDE_DIR}"/config.h ]]
}

## exported functions

vdr-plugin-2_pkg_setup() {
	# -fPIC is needed for shared objects on some platforms (amd64 and others)
	append-flags -fPIC

	# Plugins need to be compiled with position independent code, otherwise linking
	# VDR against it will fail
	if has_version ">=media-video/vdr-1.7.13"; then
		append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
	fi

	# Where should the plugins live in the filesystem
	VDR_PLUGIN_DIR="/usr/$(get_libdir)/vdr/plugins"
	VDR_CHECKSUM_DIR="${VDR_PLUGIN_DIR%/plugins}/checksums"

	# was /usr/lib/... some time ago
	# since gentoo-vdr-scripts-0.3.6 it works with /usr/share/...
	VDR_RC_DIR="/usr/share/vdr/rcscript"

	# Pathes to includes
	VDR_INCLUDE_DIR="/usr/include/vdr"
	DVB_INCLUDE_DIR="/usr/include"

	TMP_LOCALE_DIR="${WORKDIR}/tmp-locale"
	LOCDIR="/usr/share/locale"

	if ! has_vdr; then
		# set to invalid values to detect abuses
		VDRVERSION="eclass_no_vdr_installed"
		APIVERSION="eclass_no_vdr_installed"

		if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]] && ! use vdr; then
			einfo "VDR not found!"
		else
			# if vdr is required
			die "VDR not found!"
		fi
		return
	fi

	VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
	APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
	[[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"

	einfo "Compiling against"
	einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]"

	if [[ -n "${VDR_LOCAL_PATCHES_DIR}" ]]; then
		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
		eerror "Please move all your patches into"
		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
		die
	fi
}

vdr-plugin-2_src_util() {
	while [ "$1" ]; do
		case "$1" in
		all)
			vdr-plugin-2_src_util unpack add_local_patch patchmakefile linguas_patch i18n
			;;
		prepare)
			vdr-plugin-2_src_util add_local_patch patchmakefile linguas_patch i18n
			;;
		unpack)
			base_src_unpack
			;;
		add_local_patch)
			cd "${S}" || die "Could not change to plugin-source-directory!"
			epatch_user
			;;
		patchmakefile)
			cd "${S}" || die "Could not change to plugin-source-directory!"
			vdr_patchmakefile
			;;
		i18n)
			vdr_i18n
			;;
		linguas_patch)
			linguas_support
			;;
		esac

		shift
	done
}

vdr-plugin-2_src_unpack() {
	if [[ -z ${VDR_INCLUDE_DIR} ]]; then
		eerror "Wrong use of vdr-plugin-2.eclass."
		eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_pkg_setup."
		echo
		eerror "Please report this at bugs.gentoo.org."
		die "vdr-plugin-2_pkg_setup not called!"
	fi

	if [ -z "$1" ]; then
		vdr-plugin-2_src_util unpack
	else
		vdr-plugin-2_src_util $@
	fi
}

vdr-plugin-2_src_prepare() {
	base_src_prepare
	vdr-plugin-2_src_util prepare
}

vdr-plugin-2_src_compile() {
	[ -z "$1" ] && vdr-plugin-2_src_compile copy_source compile

	while [ "$1" ]; do
		case "$1" in
		copy_source)
			[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_copy_source_tree
			;;
		compile)
			if [[ ! -f ${WORKDIR}/.vdr-plugin_makefile_patched ]]; then
				eerror "Wrong use of vdr-plugin-2.eclass."
				eerror "An ebuild for a vdr-plugin will not work without"
				eerror "calling vdr-plugin-2_src_unpack to patch the Makefile."
				echo
				eerror "Please report this at bugs.gentoo.org."
				die "vdr-plugin-2_src_unpack not called!"
			fi
			cd "${S}"

			BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-all}}

			emake ${BUILD_PARAMS} \
				${BUILD_TARGETS} \
				LOCALEDIR="${TMP_LOCALE_DIR}" \
				LIBDIR="${S}" \
				TMPDIR="${T}" \
			|| die "emake failed"
			;;
		esac

		shift
	done
}

vdr-plugin-2_src_install() {
	[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_install_source_tree
	cd "${WORKDIR}"

	if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
		local mname="${P}-Makefile"
		cp "${S}"/Makefile "${mname}.patched"
		cp Makefile.before "${mname}.before"

		diff -u "${mname}.before" "${mname}.patched" > "${mname}.diff"

		insinto "/usr/share/vdr/maintainer-data/makefile-changes"
		doins "${mname}.diff"

		insinto "/usr/share/vdr/maintainer-data/makefile-before"
		doins "${mname}.before"

		insinto "/usr/share/vdr/maintainer-data/makefile-patched"
		doins "${mname}.patched"

	fi

	cd "${S}"
	insinto "${VDR_PLUGIN_DIR}"
	doins libvdr-*.so.*

	# create list of all created plugin libs
	vdr_plugin_list=""
	local p_name
	for p in libvdr-*.so.*; do
		p_name="${p%.so*}"
		p_name="${p_name#lib}"
		vdr_plugin_list="${vdr_plugin_list} ${p_name}"
	done

	create_header_checksum_file ${vdr_plugin_list}
	create_plugindb_file ${vdr_plugin_list}

	if [[ -d ${TMP_LOCALE_DIR} ]]; then
		einfo "Installing locales"
		cd "${TMP_LOCALE_DIR}"
		insinto "${LOCDIR}"
		doins -r *
	fi

	cd "${S}"
	local docfile
	for docfile in README* HISTORY CHANGELOG; do
		[[ -f ${docfile} ]] && dodoc ${docfile}
	done

	# if VDR_CONFD_FILE is empty and ${FILESDIR}/confd exists take it
	[[ -z ${VDR_CONFD_FILE} ]] && [[ -e ${FILESDIR}/confd ]] && VDR_CONFD_FILE=${FILESDIR}/confd

	if [[ -n ${VDR_CONFD_FILE} ]]; then
		newconfd "${VDR_CONFD_FILE}" vdr.${VDRPLUGIN}
	fi

	# if VDR_RCADDON_FILE is empty and ${FILESDIR}/rc-addon.sh exists take it
	[[ -z ${VDR_RCADDON_FILE} ]] && [[ -e ${FILESDIR}/rc-addon.sh ]] && VDR_RCADDON_FILE=${FILESDIR}/rc-addon.sh

	if [[ -n ${VDR_RCADDON_FILE} ]]; then
		insinto "${VDR_RC_DIR}"
		newins "${VDR_RCADDON_FILE}" plugin-${VDRPLUGIN}.sh
	fi
}

vdr-plugin-2_pkg_postinst() {
	vdr-plugin-2_print_enable_command

	if [[ -n "${VDR_CONFD_FILE}" ]]; then
		elog "Please have a look at the config-file"
		elog "\t/etc/conf.d/vdr.${VDRPLUGIN}"
		elog
	fi
}

vdr-plugin-2_pkg_postrm() {
	delete_orphan_plugindb_file
}

vdr-plugin-2_pkg_config() {
:
}

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/04/29 15:03:09

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  typo, added missing [ ] for test

Revision  Changes    Path
1.227                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.227&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.227&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.226&r2=1.227

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- ChangeLog	29 Apr 2012 13:05:34 -0000	1.226
+++ ChangeLog	29 Apr 2012 15:03:09 -0000	1.227
@@ -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.226 2012/04/29 13:05:34 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.227 2012/04/29 15:03:09 hd_brummy Exp $
+
+  29 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  typo, added missing [ ] for test
 
   29 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-plugin-2.eclass:
   vdr-plugin-2.eclass added; include major fixes for obselet i18n handling,



1.2                  eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.1&r2=1.2

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-plugin-2.eclass	29 Apr 2012 13:05:34 -0000	1.1
+++ vdr-plugin-2.eclass	29 Apr 2012 15:03:09 -0000	1.2
@@ -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/vdr-plugin-2.eclass,v 1.1 2012/04/29 13:05:34 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.2 2012/04/29 15:03:09 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -235,7 +235,7 @@
 	# plugins without converting to gettext
 
 	local GETTEXT_MISSING=$( grep xgettext Makefile )
-	if [ -z ${GETTEXT_MISSING} ]; then
+	if [[ -z ${GETTEXT_MISSING} ]]; then
 		dev_check "Plugin isn't converted to gettext handling \n"
 	fi
 }

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/05/20 17:33:41

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  some debug infos for wrong use of vdr-plugin-2.eclass

Revision  Changes    Path
1.256                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.256&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.256&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.255&r2=1.256

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- ChangeLog	20 May 2012 17:12:34 -0000	1.255
+++ ChangeLog	20 May 2012 17:33:41 -0000	1.256
@@ -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.255 2012/05/20 17:12:34 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.256 2012/05/20 17:33:41 hd_brummy Exp $
+
+  20 May 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  some debug infos for wrong use of vdr-plugin-2.eclass
 
   20 May 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Try to avoid sandbox violation when running qhelpgenerator, bug 415517.



1.3                  eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.2&r2=1.3

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdr-plugin-2.eclass	29 Apr 2012 15:03:09 -0000	1.2
+++ vdr-plugin-2.eclass	20 May 2012 17:33:41 -0000	1.3
@@ -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/vdr-plugin-2.eclass,v 1.2 2012/04/29 15:03:09 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.3 2012/05/20 17:33:41 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -445,10 +445,10 @@
 vdr-plugin-2_src_unpack() {
 	if [[ -z ${VDR_INCLUDE_DIR} ]]; then
 		eerror "Wrong use of vdr-plugin-2.eclass."
-		eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_pkg_setup."
+		eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_src_unpack."
 		echo
 		eerror "Please report this at bugs.gentoo.org."
-		die "vdr-plugin-2_pkg_setup not called!"
+		die "vdr-plugin-2_src_unpack not called!"
 	fi
 
 	if [ -z "$1" ]; then
@@ -459,6 +459,14 @@
 }
 
 vdr-plugin-2_src_prepare() {
+	if [[ -z ${VDR_INCLUDE_DIR} ]]; then
+		eerror "Wrong use of vdr-plugin-2.eclass."
+		eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_src_prepare."
+		echo
+		eerror "Please report this at bugs.gentoo.org."
+		die "vdr-plugin-2_src_prepare not called!"
+	fi
+
 	base_src_prepare
 	vdr-plugin-2_src_util prepare
 }
@@ -475,10 +483,10 @@
 			if [[ ! -f ${WORKDIR}/.vdr-plugin_makefile_patched ]]; then
 				eerror "Wrong use of vdr-plugin-2.eclass."
 				eerror "An ebuild for a vdr-plugin will not work without"
-				eerror "calling vdr-plugin-2_src_unpack to patch the Makefile."
+				eerror "calling vdr-plugin-2_src_compile to patch the Makefile."
 				echo
 				eerror "Please report this at bugs.gentoo.org."
-				die "vdr-plugin-2_src_unpack not called!"
+				die "vdr-plugin-2_src_compile not called!"
 			fi
 			cd "${S}"
 
@@ -498,6 +506,14 @@
 }
 
 vdr-plugin-2_src_install() {
+	if [[ -z ${VDR_INCLUDE_DIR} ]]; then
+		eerror "Wrong use of vdr-plugin-2.eclass."
+		eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_src_install."
+		echo
+		eerror "Please report this at bugs.gentoo.org."
+		die "vdr-plugin-2_src_install not called!"
+	fi
+
 	[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_install_source_tree
 	cd "${WORKDIR}"
 

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/05/20 20:34:56

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  strip-linguas check added

Revision  Changes    Path
1.257                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.257&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.257&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.256&r2=1.257

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- ChangeLog	20 May 2012 17:33:41 -0000	1.256
+++ ChangeLog	20 May 2012 20:34:55 -0000	1.257
@@ -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.256 2012/05/20 17:33:41 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.257 2012/05/20 20:34:55 hd_brummy Exp $
+
+  20 May 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  strip-linguas check added
 
   20 May 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
   some debug infos for wrong use of vdr-plugin-2.eclass



1.4                  eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.3&r2=1.4

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vdr-plugin-2.eclass	20 May 2012 17:33:41 -0000	1.3
+++ vdr-plugin-2.eclass	20 May 2012 20:34:55 -0000	1.4
@@ -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/vdr-plugin-2.eclass,v 1.3 2012/05/20 17:33:41 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.4 2012/05/20 20:34:55 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -269,6 +269,8 @@
 			|| die "sed failed for Linguas"
 	done
 
+	strip-linguas ${PLUGIN_LINGUAS}
+
 	# maintainer check
 	if [[ ! -d po ]]; then
 		dev_check "po dir not found? May be in subdir? \n"

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/05/25 19:56:13

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  fixed install for locales if only LINGUAS=en

Revision  Changes    Path
1.268                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.268&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.268&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.267&r2=1.268

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- ChangeLog	25 May 2012 12:06:05 -0000	1.267
+++ ChangeLog	25 May 2012 19:56:13 -0000	1.268
@@ -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.267 2012/05/25 12:06:05 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.268 2012/05/25 19:56:13 hd_brummy Exp $
+
+  25 May 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  fixed install for locales if only LINGUAS=en
 
   25 May 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Re-enable rpath on prefix wrt bug 417169.



1.5                  eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.4&r2=1.5

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vdr-plugin-2.eclass	20 May 2012 20:34:55 -0000	1.4
+++ vdr-plugin-2.eclass	25 May 2012 19:56:13 -0000	1.5
@@ -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/vdr-plugin-2.eclass,v 1.4 2012/05/20 20:34:55 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.5 2012/05/25 19:56:13 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -556,8 +556,11 @@
 	if [[ -d ${TMP_LOCALE_DIR} ]]; then
 		einfo "Installing locales"
 		cd "${TMP_LOCALE_DIR}"
-		insinto "${LOCDIR}"
-		doins -r *
+		local linguas
+		for linguas in ${LINGUAS[*]}; do
+			insinto "${LOCDIR}"
+			cp -r --parents ${linguas}* ${D}/${LOCDIR}
+		done
 	fi
 
 	cd "${S}"

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/06/10 14:21:20

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  fixed missing chost tag; fixed append-cppflags warning; added Variable to keep the i18n.o object

Revision  Changes    Path
1.304                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.304&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.304&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.303&r2=1.304

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- ChangeLog	10 Jun 2012 11:31:12 -0000	1.303
+++ ChangeLog	10 Jun 2012 14:21:20 -0000	1.304
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.303 2012/06/10 11:31:12 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.304 2012/06/10 14:21:20 hd_brummy Exp $
+
+  10 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  fixed missing chost tag; fixed append-cppflags warning; added Variable to
+  keep the i18n.o object
 
   10 Jun 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
   reorder public functions



1.6                  eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.5&r2=1.6

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vdr-plugin-2.eclass	25 May 2012 19:56:13 -0000	1.5
+++ vdr-plugin-2.eclass	10 Jun 2012 14:21:20 -0000	1.6
@@ -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/vdr-plugin-2.eclass,v 1.5 2012/05/25 19:56:13 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.6 2012/06/10 14:21:20 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 multilib eutils flag-o-matic
+inherit base eutils flag-o-matic multilib toolchain-funcs
 
 if ! has "${EAPI:-4}" 4; then
 	die "API of vdr-plugin-2.eclass in EAPI=\"${EAPI}\" not established"
@@ -291,9 +291,15 @@
 
 	local I18N_OBJECT=$( grep i18n.o Makefile )
 	if [[ -n ${I18N_OBJECT} ]]; then
-		sed -i "s:i18n.o::g" Makefile
-		dev_check "OBJECT i18n.o found"
-		dev_check "removed per sed \n"
+
+		if [[ "${KEEP_I18NOBJECT:-no}" = "yes" ]]; then
+			dev_check "Forced to keep i18n.o"
+		else
+			sed -i "s:i18n.o::g" Makefile
+			dev_check "OBJECT i18n.o found"
+			dev_check "removed per sed \n"
+		fi
+
 	else
 		dev_check "OBJECT i18n.o not found in Makefile"
 		dev_check "all fine or manual review needed? \n"
@@ -364,9 +370,12 @@
 	# Plugins need to be compiled with position independent code, otherwise linking
 	# VDR against it will fail
 	if has_version ">=media-video/vdr-1.7.13"; then
-		append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+		append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 	fi
 
+	# missing ${chost}- tag
+	tc-export CC CXX
+
 	# Where should the plugins live in the filesystem
 	VDR_PLUGIN_DIR="/usr/$(get_libdir)/vdr/plugins"
 	VDR_CHECKSUM_DIR="${VDR_PLUGIN_DIR%/plugins}/checksums"

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/06/10 14:59:55

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  fix for strip-linguas en

Revision  Changes    Path
1.306                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.306&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.306&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.305&r2=1.306

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- ChangeLog	10 Jun 2012 14:23:43 -0000	1.305
+++ ChangeLog	10 Jun 2012 14:59:55 -0000	1.306
@@ -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.305 2012/06/10 14:23:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.306 2012/06/10 14:59:55 hd_brummy Exp $
+
+  10 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  fix for strip-linguas en
 
   10 Jun 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
   Remove pypy1_7 from default PYTHON_COMPAT due to removal from tree. Add



1.7                  eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.6&r2=1.7

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vdr-plugin-2.eclass	10 Jun 2012 14:21:20 -0000	1.6
+++ vdr-plugin-2.eclass	10 Jun 2012 14:59:55 -0000	1.7
@@ -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/vdr-plugin-2.eclass,v 1.6 2012/06/10 14:21:20 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.7 2012/06/10 14:59:55 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -269,7 +269,7 @@
 			|| die "sed failed for Linguas"
 	done
 
-	strip-linguas ${PLUGIN_LINGUAS}
+	strip-linguas ${PLUGIN_LINGUAS} en
 
 	# maintainer check
 	if [[ ! -d po ]]; then

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/06/27 18:54:58

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  fixed eapi block; bug 423657

Revision  Changes    Path
1.331                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.331&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.331&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.330&r2=1.331

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- ChangeLog	26 Jun 2012 00:06:14 -0000	1.330
+++ ChangeLog	27 Jun 2012 18:54:58 -0000	1.331
@@ -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.330 2012/06/26 00:06:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.331 2012/06/27 18:54:58 hd_brummy Exp $
+
+  27 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  fixed eapi block; bug 423657
 
   26 Jun 2012; Robin H. Johnson <robbat2@gentoo.org> linux-info.eclass:
   You must ensure at least one of the version setup functions gets called in



1.8                  eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.7&r2=1.8

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vdr-plugin-2.eclass	10 Jun 2012 14:59:55 -0000	1.7
+++ vdr-plugin-2.eclass	27 Jun 2012 18:54:58 -0000	1.8
@@ -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/vdr-plugin-2.eclass,v 1.7 2012/06/10 14:59:55 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.8 2012/06/27 18:54:58 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -45,9 +45,10 @@
 
 inherit base eutils flag-o-matic multilib toolchain-funcs
 
-if ! has "${EAPI:-4}" 4; then
-	die "API of vdr-plugin-2.eclass in EAPI=\"${EAPI}\" not established"
-fi
+case ${EAPI:-0} in
+    4) ;;
+    *) die "EAPI ${EAPI} unsupported."
+esac
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config
 

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/08/05 19:26:36

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  fix for wrong detected *.pot file in po dir

Revision  Changes    Path
1.365                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.365&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.365&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.364&r2=1.365

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- ChangeLog	3 Aug 2012 08:49:22 -0000	1.364
+++ ChangeLog	5 Aug 2012 19:26:36 -0000	1.365
@@ -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.364 2012/08/03 08:49:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.365 2012/08/05 19:26:36 hd_brummy Exp $
+
+  05 Aug 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  fix for wrong detected *.pot file in po dir
 
   03 Aug 2012; Tim Harder <radhermit@gentoo.org> vim-plugin.eclass:
   Add alternative location for vim plugin tarball archives.



1.9                  eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.8&r2=1.9

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vdr-plugin-2.eclass	27 Jun 2012 18:54:58 -0000	1.8
+++ vdr-plugin-2.eclass	5 Aug 2012 19:26:36 -0000	1.9
@@ -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/vdr-plugin-2.eclass,v 1.8 2012/06/27 18:54:58 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.9 2012/08/05 19:26:36 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -262,7 +262,7 @@
 
 	for f in ${makefile_dir[*]}; do
 
-		PLUGIN_LINGUAS=$( ls ${f}/po | tr \\\012 ' ' | tr -d [:upper:] | tr -d [:punct:] |sed -e "s:po::g" )
+		PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | tr \\\012 ' ' | tr -d [:upper:] | tr -d [:punct:] |sed -e "s:po::g" )
 		einfo "LINGUAS=\"${PLUGIN_LINGUAS}\""
 
 		sed -i ${f}/Makefile \

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/09/17 19:32:49

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  better LINGUAS detection, vdr-plugin-2.eclass

Revision  Changes    Path
1.403                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.403&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.403&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.402&r2=1.403

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- ChangeLog	16 Sep 2012 18:37:44 -0000	1.402
+++ ChangeLog	17 Sep 2012 19:32:49 -0000	1.403
@@ -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.402 2012/09/16 18:37:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.403 2012/09/17 19:32:49 hd_brummy Exp $
+
+  17 Sep 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  better LINGUAS detection, vdr-plugin-2.eclass
 
   16 Sep 2012; Ulrich Müller <ulm@gentoo.org> tla.eclass:
   Mark as DEAD for removal.



1.10                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.9&r2=1.10

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vdr-plugin-2.eclass	5 Aug 2012 19:26:36 -0000	1.9
+++ vdr-plugin-2.eclass	17 Sep 2012 19:32:49 -0000	1.10
@@ -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/vdr-plugin-2.eclass,v 1.9 2012/08/05 19:26:36 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.10 2012/09/17 19:32:49 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -262,7 +262,7 @@
 
 	for f in ${makefile_dir[*]}; do
 
-		PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | tr \\\012 ' ' | tr -d [:upper:] | tr -d [:punct:] |sed -e "s:po::g" )
+		PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
 		einfo "LINGUAS=\"${PLUGIN_LINGUAS}\""
 
 		sed -i ${f}/Makefile \

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/09/29 19:38:57

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  added helper function to remove i18n.h includes, if media-plugins/vdr-* are still use the obsoleted i18n handling and unsupported to gettext handling

Revision  Changes    Path
1.421                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.421&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.421&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.420&r2=1.421

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- ChangeLog	28 Sep 2012 15:18:04 -0000	1.420
+++ ChangeLog	29 Sep 2012 19:38:56 -0000	1.421
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.420 2012/09/28 15:18:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.421 2012/09/29 19:38:56 hd_brummy Exp $
+
+  29 Sep 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  added helper function to remove i18n.h includes, if media-plugins/vdr-* are
+  still use the obsoleted i18n handling and unsupported to gettext handling
 
   28 Sep 2012; Ulrich Müller <ulm@gentoo.org> eutils.eclass:
   Test for the EAPI explicitly, because it isn't guaranteed that package



1.13                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.12&r2=1.13

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vdr-plugin-2.eclass	27 Sep 2012 16:35:42 -0000	1.12
+++ vdr-plugin-2.eclass	29 Sep 2012 19:38:56 -0000	1.13
@@ -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/vdr-plugin-2.eclass,v 1.12 2012/09/27 16:35:42 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.13 2012/09/29 19:38:56 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -316,6 +316,19 @@
 		dev_check "please review, may be in subdir... \n"
 	fi
 }
+
+remove_i18n_include() {
+	# remove uneeded i18.n includes
+	# call 'remove_i18n_include bla foo'
+
+	local f
+	for f; do
+		sed -i "${f}" \
+		-e "s:^#include[[:space:]]*\"i18n.h\"://:"
+	done
+
+	dev_check "removed i18n.h for ${@}"
+}
 # end new vdr-plugin-2.eclass content
 
 vdr-plugin-2_copy_source_tree() {

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/12/29 17:47:53

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  some adaption for new makefile handling, >=vdr-1.7.34, vdr-plugin-2.eclass

Revision  Changes    Path
1.580                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.580&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.580&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.579&r2=1.580

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -r1.579 -r1.580
--- ChangeLog	27 Dec 2012 22:57:28 -0000	1.579
+++ ChangeLog	29 Dec 2012 17:47:53 -0000	1.580
@@ -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.579 2012/12/27 22:57:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.580 2012/12/29 17:47:53 hd_brummy Exp $
+
+  29 Dec 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  some adaption for new makefile handling, >=vdr-1.7.34
 
   27 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Pass --build-scripts path to setup.py (when out-of-source builds are used).



1.14                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.13&r2=1.14

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vdr-plugin-2.eclass	29 Sep 2012 19:38:56 -0000	1.13
+++ vdr-plugin-2.eclass	29 Dec 2012 17:47:53 -0000	1.14
@@ -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/vdr-plugin-2.eclass,v 1.13 2012/09/29 19:38:56 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.14 2012/12/29 17:47:53 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -241,26 +241,36 @@
 	fi
 }
 
-linguas_support() {
-#	Patching Makefile for linguas support.
-#	Only locales, enabled through the LINGUAS (make.conf) variable will be
-#	"compiled" and installed.
-#
+detect_po_dir() {
 #	Some plugins have po/ in a subdir
 #	set PO_SUBDIR in .ebuild
 #	i.e media-plugins/vdr-streamdev
 #	PO_SUBDIR="client server"
 
-	einfo "Patching for Linguas support"
-	einfo "available Languages for ${P} are:"
-
 	[[ -f po ]] && local po_dir="${S}"
 	local po_subdir=( ${S}/${PO_SUBDIR} )
 	local f
 
-	makefile_dir=( ${po_dir} ${po_subdir[*]} )
+	pofile_dir=( ${po_dir} ${po_subdir[*]} )
+
+	# maintainer check
+	if [[ ! -d ${pofile_dir[*]} ]]; then
+		dev_check "po dir not found? May be in subdir? \n"
+	fi
+}
+
+linguas_support() {
+#	Patching Makefile for linguas support.
+#	Only locales, enabled through the LINGUAS (make.conf) variable will be
+#	"compiled" and installed.
+#
+
+	einfo "Patching for Linguas support"
+	einfo "available Languages for ${P} are:"
 
-	for f in ${makefile_dir[*]}; do
+	detect_po_dir
+
+	for f in ${pofile_dir[*]}; do
 
 		PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
 		einfo "LINGUAS=\"${PLUGIN_LINGUAS}\""
@@ -271,11 +281,6 @@
 	done
 
 	strip-linguas ${PLUGIN_LINGUAS} en
-
-	# maintainer check
-	if [[ ! -d po ]]; then
-		dev_check "po dir not found? May be in subdir? \n"
-	fi
 }
 
 vdr_i18n() {
@@ -331,28 +336,30 @@
 }
 # end new vdr-plugin-2.eclass content
 
-vdr-plugin-2_copy_source_tree() {
-	pushd . >/dev/null
-	cp -r "${S}" "${T}"/source-tree
-	cd "${T}"/source-tree
-	cp "${WORKDIR}"/Makefile.before Makefile
-	# TODO: Fix this, maybe no longer needed
-	sed -i Makefile \
-		-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
-		-e 's:^CXXFLAGS:#CXXFLAGS:' \
-		-e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \
-		-e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):'
-	popd >/dev/null
-}
-
-vdr-plugin-2_install_source_tree() {
-	einfo "Installing sources"
-	destdir="${VDRSOURCE_DIR}/vdr-${VDRVERSION}/PLUGINS/src/${VDRPLUGIN}"
-	insinto "${destdir}-${PV}"
-	doins -r "${T}"/source-tree/*
-
-	dosym "${VDRPLUGIN}-${PV}" "${destdir}"
-}
+# we don't support included plugins from vdr source for install in this way !!!
+# obsolet, remove it, later...
+#vdr-plugin-2_copy_source_tree() {
+#	pushd . >/dev/null
+#	cp -r "${S}" "${T}"/source-tree
+#	cd "${T}"/source-tree
+#	cp "${WORKDIR}"/Makefile.before Makefile
+#	# TODO: Fix this, maybe no longer needed
+#	sed -i Makefile \
+#		-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
+#		-e 's:^CXXFLAGS:#CXXFLAGS:' \
+#		-e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \
+#		-e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):'
+#	popd >/dev/null
+#}
+
+#vdr-plugin-2_install_source_tree() {
+#	einfo "Installing sources"
+#	destdir="${VDRSOURCE_DIR}/vdr-${VDRVERSION}/PLUGINS/src/${VDRPLUGIN}"
+#	insinto "${destdir}-${PV}"
+#	doins -r "${T}"/source-tree/*
+#
+#	dosym "${VDRPLUGIN}-${PV}" "${destdir}"
+#}
 
 vdr-plugin-2_print_enable_command() {
 	local p_name c=0 l=""
@@ -391,7 +398,12 @@
 	tc-export CC CXX
 
 	# Where should the plugins live in the filesystem
-	VDR_PLUGIN_DIR="/usr/$(get_libdir)/vdr/plugins"
+	if has_version ">=media-video/vdr-1.7.34"; then
+		VDR_PLUGIN_DIR=$(pkg-config --variable=libdir vdr)
+	else
+		VDR_PLUGIN_DIR="/usr/$(get_libdir)/vdr/plugins"
+	fi
+
 	VDR_CHECKSUM_DIR="${VDR_PLUGIN_DIR%/plugins}/checksums"
 
 	# was /usr/lib/... some time ago
@@ -403,7 +415,12 @@
 	DVB_INCLUDE_DIR="/usr/include"
 
 	TMP_LOCALE_DIR="${WORKDIR}/tmp-locale"
-	LOCDIR="/usr/share/locale"
+
+	if has_version ">=media-video/vdr-1.7.34"; then
+		LOCDIR=$(pkg-config --variable=locdir vdr)
+	else
+		LOCDIR="/usr/share/locale"
+	fi
 
 	if ! has_vdr; then
 		# set to invalid values to detect abuses
@@ -419,9 +436,13 @@
 		return
 	fi
 
-	VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
-	APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
+	if has_version ">=media-video/vdr-1.7.34"; then
+		APIVERSION=$(pkg-config --variable=apiversion vdr)
+	else
+		VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
+		APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
 	[[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"
+	fi
 
 	einfo "Compiling against"
 	einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]"
@@ -502,7 +523,8 @@
 	while [ "$1" ]; do
 		case "$1" in
 		copy_source)
-			[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_copy_source_tree
+#			[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_copy_source_tree
+			eerror "obsoleted handling, vdr-plugin-2_copy_source_tree"
 			;;
 		compile)
 			if [[ ! -f ${WORKDIR}/.vdr-plugin_makefile_patched ]]; then
@@ -515,14 +537,24 @@
 			fi
 			cd "${S}"
 
-			BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-all}}
 
-			emake ${BUILD_PARAMS} \
-				${BUILD_TARGETS} \
-				LOCALEDIR="${TMP_LOCALE_DIR}" \
-				LIBDIR="${S}" \
-				TMPDIR="${T}" \
-			|| die "emake failed"
+			if has_version ">=media-video/vdr-1.7.34"; then
+			BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-install }}
+				emake ${BUILD_PARAMS} \
+					${BUILD_TARGETS} \
+					LOCDIR="${TMP_LOCALE_DIR}" \
+					LIBDIR="${S}" \
+					TMPDIR="${T}" \
+					|| die "emake failed"
+			else
+			BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-all }}
+				emake ${BUILD_PARAMS} \
+					${BUILD_TARGETS} \
+					LOCALEDIR="${TMP_LOCALE_DIR}" \
+					LIBDIR="${S}" \
+					TMPDIR="${T}" \
+					|| die "emake failed"
+			fi
 			;;
 		esac
 
@@ -539,7 +571,8 @@
 		die "vdr-plugin-2_src_install not called!"
 	fi
 
-	[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_install_source_tree
+#	obsolet, remove it, later...
+#	[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_install_source_tree
 	cd "${WORKDIR}"
 
 	if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
@@ -561,6 +594,7 @@
 	fi
 
 	cd "${S}"
+
 	insinto "${VDR_PLUGIN_DIR}"
 	doins libvdr-*.so.*
 

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/12/31 09:27:00

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  vdr-plugin-2.eclass; better detection of new Makefile handling, fixed some mistakes in inherited append-*flags

Revision  Changes    Path
1.583                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.583&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.583&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.582&r2=1.583

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.582
retrieving revision 1.583
diff -u -r1.582 -r1.583
--- ChangeLog	31 Dec 2012 06:29:42 -0000	1.582
+++ ChangeLog	31 Dec 2012 09:27:00 -0000	1.583
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.582 2012/12/31 06:29:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.583 2012/12/31 09:27:00 hd_brummy Exp $
+
+  31 Dec 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  vdr-plugin-2.eclass; better detection of new Makefile handling, fixed some
+  mistakes in inherited append-*flags
 
   31 Dec 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Remove dead code.



1.15                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.14&r2=1.15

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vdr-plugin-2.eclass	29 Dec 2012 17:47:53 -0000	1.14
+++ vdr-plugin-2.eclass	31 Dec 2012 09:27:00 -0000	1.15
@@ -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/vdr-plugin-2.eclass,v 1.14 2012/12/29 17:47:53 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.15 2012/12/31 09:27:00 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -226,7 +226,7 @@
 # Begin new vdr-plugin-2.eclass content
 dev_check() {
 	# A lot useful debug infos
-	# set VDR_MAINTAINER_MODE="1" in /etc/make.conf
+	# set VDR_MAINTAINER_MODE="1" in make.conf
 	if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
 		eerror "\t Maintainer Info: $@"
 	fi
@@ -336,7 +336,7 @@
 }
 # end new vdr-plugin-2.eclass content
 
-# we don't support included plugins from vdr source for install in this way !!!
+# ToDo: we don't support included plugins from vdr source for install in this way !!!
 # obsolet, remove it, later...
 #vdr-plugin-2_copy_source_tree() {
 #	pushd . >/dev/null
@@ -385,18 +385,18 @@
 ## exported functions
 
 vdr-plugin-2_pkg_setup() {
+	# missing ${chost}- tag
+	tc-export CC CXX
+
 	# -fPIC is needed for shared objects on some platforms (amd64 and others)
 	append-flags -fPIC
 
 	# Plugins need to be compiled with position independent code, otherwise linking
 	# VDR against it will fail
 	if has_version ">=media-video/vdr-1.7.13"; then
-		append-lfs-flags
+		append-cxxlags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 	fi
 
-	# missing ${chost}- tag
-	tc-export CC CXX
-
 	# Where should the plugins live in the filesystem
 	if has_version ">=media-video/vdr-1.7.34"; then
 		VDR_PLUGIN_DIR=$(pkg-config --variable=libdir vdr)
@@ -445,7 +445,7 @@
 	fi
 
 	einfo "Compiling against"
-	einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]"
+	einfo "\tvdr-${VDRVERSION}} [API version ${APIVERSION}]"
 
 	if [[ -n "${VDR_LOCAL_PATCHES_DIR}" ]]; then
 		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
@@ -523,8 +523,8 @@
 	while [ "$1" ]; do
 		case "$1" in
 		copy_source)
-#			[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_copy_source_tree
-			eerror "obsoleted handling, vdr-plugin-2_copy_source_tree"
+			[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_copy_source_tree
+			dev_check "ToDo: obsoleted handling, vdr-plugin-2_copy_source_tree"
 			;;
 		compile)
 			if [[ ! -f ${WORKDIR}/.vdr-plugin_makefile_patched ]]; then
@@ -537,8 +537,9 @@
 			fi
 			cd "${S}"
 
-
-			if has_version ">=media-video/vdr-1.7.34"; then
+			local SOFILE_STRING=$(grep SOFILE Makefile)
+			if [[ -n ${SOFILE_STRING} ]]; then
+			dev_check "compiling with new Makefile handling"
 			BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-install }}
 				emake ${BUILD_PARAMS} \
 					${BUILD_TARGETS} \
@@ -547,6 +548,7 @@
 					TMPDIR="${T}" \
 					|| die "emake failed"
 			else
+			dev_check "compiling with old Makefile handling"
 			BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-all }}
 				emake ${BUILD_PARAMS} \
 					${BUILD_TARGETS} \
@@ -571,7 +573,7 @@
 		die "vdr-plugin-2_src_install not called!"
 	fi
 
-#	obsolet, remove it, later...
+#	ToDo: obsolet, remove it, later...
 #	[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_install_source_tree
 	cd "${WORKDIR}"
 

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/12/31 18:53:48

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  vdr-plugin-2.eclass, typo

Revision  Changes    Path
1.587                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.587&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.587&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.586&r2=1.587

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -r1.586 -r1.587
--- ChangeLog	31 Dec 2012 13:10:42 -0000	1.586
+++ ChangeLog	31 Dec 2012 18:53:47 -0000	1.587
@@ -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.586 2012/12/31 13:10:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.587 2012/12/31 18:53:47 hd_brummy Exp $
+
+  31 Dec 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  vdr-plugin-2.eclass, typo
 
   31 Dec 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
   Add a function to generate dep-strings conditional to Python implementations.



1.16                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.15&r2=1.16

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vdr-plugin-2.eclass	31 Dec 2012 09:27:00 -0000	1.15
+++ vdr-plugin-2.eclass	31 Dec 2012 18:53:47 -0000	1.16
@@ -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/vdr-plugin-2.eclass,v 1.15 2012/12/31 09:27:00 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.16 2012/12/31 18:53:47 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -394,7 +394,7 @@
 	# Plugins need to be compiled with position independent code, otherwise linking
 	# VDR against it will fail
 	if has_version ">=media-video/vdr-1.7.13"; then
-		append-cxxlags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+		append-cxxflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 	fi
 
 	# Where should the plugins live in the filesystem

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    12/12/31 19:49:41

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  Do not use {C,CXX}FLAGS from pkg-config vdr.pc >=media-video/vdr-1.7.34;we do not have the chance to overwrite it with *.eclass

Revision  Changes    Path
1.588                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.588&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.588&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.587&r2=1.588

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.587
retrieving revision 1.588
diff -u -r1.587 -r1.588
--- ChangeLog	31 Dec 2012 18:53:47 -0000	1.587
+++ ChangeLog	31 Dec 2012 19:49:40 -0000	1.588
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.587 2012/12/31 18:53:47 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.588 2012/12/31 19:49:40 hd_brummy Exp $
+
+  31 Dec 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  Do not use {C,CXX}FLAGS from pkg-config vdr.pc >=media-video/vdr-1.7.34;we do
+  not have the chance to overwrite it with *.eclass
 
   31 Dec 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
   vdr-plugin-2.eclass, typo



1.17                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.16&r2=1.17

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vdr-plugin-2.eclass	31 Dec 2012 18:53:47 -0000	1.16
+++ vdr-plugin-2.eclass	31 Dec 2012 19:49:41 -0000	1.17
@@ -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/vdr-plugin-2.eclass,v 1.16 2012/12/31 18:53:47 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.17 2012/12/31 19:49:41 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -212,6 +212,12 @@
 		-e '/^CXXFLAGS[[:space:]]*=/s/=/?=/' \
 		-e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:'
 
+	# Do not use {C,CXX}FLAGS from pkg-config vdr.pc, >=media-video/vdr-1.7.34
+	# we do not have the chance to overwrite it with *.eclass
+	sed -e "/^export[[:space:]]*CFLAGS[[:space:]]*=/s/=/?=/" \
+		-e "/^export[[:space:]]*CXXFLAGS[[:space:]]*=/s/=/?=/" \
+		-i Makefile
+
 	# Disabling file stripping, the package manager takes care of it
 	sed -i Makefile \
 		-e '/@.*strip/d' \
@@ -445,7 +451,7 @@
 	fi
 
 	einfo "Compiling against"
-	einfo "\tvdr-${VDRVERSION}} [API version ${APIVERSION}]"
+	einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]"
 
 	if [[ -n "${VDR_LOCAL_PATCHES_DIR}" ]]; then
 		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    13/01/03 20:30:47

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  fixed mistake for emake:-all emake:-install between old and new plugin makefile structur, vdr-plugin-2.eclass

Revision  Changes    Path
1.593                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.593&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.593&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.592&r2=1.593

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -r1.592 -r1.593
--- ChangeLog	3 Jan 2013 19:22:05 -0000	1.592
+++ ChangeLog	3 Jan 2013 20:30:47 -0000	1.593
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.592 2013/01/03 19:22:05 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.593 2013/01/03 20:30:47 hd_brummy Exp $
+
+  03 Jan 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  fixed mistake for emake:-all emake:-install between old and new plugin
+  makefile structur, vdr-plugin-2.eclass
 
   03 Jan 2013; Alon Bar-Lev <alonbl@gentoo.org> ssl-cert.eclass:
   Support mandatory enrollment and custom USE flag, bug#319529.



1.18                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.17&r2=1.18

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vdr-plugin-2.eclass	31 Dec 2012 19:49:41 -0000	1.17
+++ vdr-plugin-2.eclass	3 Jan 2013 20:30:47 -0000	1.18
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.17 2012/12/31 19:49:41 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.18 2013/01/03 20:30:47 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -543,26 +543,14 @@
 			fi
 			cd "${S}"
 
-			local SOFILE_STRING=$(grep SOFILE Makefile)
-			if [[ -n ${SOFILE_STRING} ]]; then
-			dev_check "compiling with new Makefile handling"
-			BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-install }}
-				emake ${BUILD_PARAMS} \
-					${BUILD_TARGETS} \
-					LOCDIR="${TMP_LOCALE_DIR}" \
-					LIBDIR="${S}" \
-					TMPDIR="${T}" \
-					|| die "emake failed"
-			else
-			dev_check "compiling with old Makefile handling"
 			BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-all }}
 				emake ${BUILD_PARAMS} \
 					${BUILD_TARGETS} \
 					LOCALEDIR="${TMP_LOCALE_DIR}" \
+					LOCDIR="${TMP_LOCALE_DIR}" \
 					LIBDIR="${S}" \
 					TMPDIR="${T}" \
 					|| die "emake failed"
-			fi
 			;;
 		esac
 
@@ -603,9 +591,33 @@
 
 	cd "${S}"
 
+	local SOFILE_STRING=$(grep SOFILE Makefile)
+	if [[ -n ${SOFILE_STRING} ]]; then
+		dev_check "installing with new Makefile handling"
+		BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-install }}
+		einstall ${BUILD_PARAMS} \
+			${BUILD_TARGETS} \
+			LOCDIR="${TMP_LOCALE_DIR}" \
+			LIBDIR="${S}" \
+			TMPDIR="${T}" \
+			DESTDIR="${D}" \
+			|| die "einstall (makefile target) failed"
+	fi
+
 	insinto "${VDR_PLUGIN_DIR}"
 	doins libvdr-*.so.*
 
+	if [[ -d ${TMP_LOCALE_DIR} ]]; then
+		einfo "Installing locales"
+		cd "${TMP_LOCALE_DIR}"
+
+		local linguas
+		for linguas in ${LINGUAS[*]}; do
+		insinto "${LOCDIR}"
+		cp -r --parents ${linguas}* ${D}/${LOCDIR}
+		done
+	fi
+
 	# create list of all created plugin libs
 	vdr_plugin_list=""
 	local p_name
@@ -618,15 +630,6 @@
 	create_header_checksum_file ${vdr_plugin_list}
 	create_plugindb_file ${vdr_plugin_list}
 
-	if [[ -d ${TMP_LOCALE_DIR} ]]; then
-		einfo "Installing locales"
-		cd "${TMP_LOCALE_DIR}"
-		local linguas
-		for linguas in ${LINGUAS[*]}; do
-			insinto "${LOCDIR}"
-			cp -r --parents ${linguas}* ${D}/${LOCDIR}
-		done
-	fi
 
 	cd "${S}"
 	local docfile

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    13/01/04 13:23:43

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  fixed typo, thx to Martin Dummer on irc #vdr-gentoo

Revision  Changes    Path
1.596                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.596&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.596&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.595&r2=1.596

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.595
retrieving revision 1.596
diff -u -r1.595 -r1.596
--- ChangeLog	4 Jan 2013 03:12:44 -0000	1.595
+++ ChangeLog	4 Jan 2013 13:23:43 -0000	1.596
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.595 2013/01/04 03:12:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.596 2013/01/04 13:23:43 hd_brummy Exp $
+
+  04 Jan 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  fixed typo, thx to Martin Dummer on irc #vdr-gentoo
 
   04 Jan 2013; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass:
   addpredict /usr/lib/portage/pym in distutils-r1_src_install.



1.19                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.18&r2=1.19

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- vdr-plugin-2.eclass	3 Jan 2013 20:30:47 -0000	1.18
+++ vdr-plugin-2.eclass	4 Jan 2013 13:23:43 -0000	1.19
@@ -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/eclass/vdr-plugin-2.eclass,v 1.18 2013/01/03 20:30:47 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.19 2013/01/04 13:23:43 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -618,6 +618,8 @@
 		done
 	fi
 
+	cd "${S}"
+
 	# create list of all created plugin libs
 	vdr_plugin_list=""
 	local p_name
@@ -630,8 +632,6 @@
 	create_header_checksum_file ${vdr_plugin_list}
 	create_plugindb_file ${vdr_plugin_list}
 
-
-	cd "${S}"
 	local docfile
 	for docfile in README* HISTORY CHANGELOG; do
 		[[ -f ${docfile} ]] && dodoc ${docfile}

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    13/01/27 10:17:13

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  some fixes, install new makefilehandling; thx to zoolock@irc gentoo.vdr

Revision  Changes    Path
1.642                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.642&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.642&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.641&r2=1.642

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.641
retrieving revision 1.642
diff -u -r1.641 -r1.642
--- ChangeLog	26 Jan 2013 15:01:52 -0000	1.641
+++ ChangeLog	27 Jan 2013 10:17:13 -0000	1.642
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.641 2013/01/26 15:01:52 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.642 2013/01/27 10:17:13 hd_brummy Exp $
+
+  27 Jan 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  some fixes, install new makefilehandling; thx to zoolock@irc gentoo.vdr
 
   26 Jan 2013; Sven Vermeulen <swift@gentoo.org> selinux-policy-2.eclass:
   Supporting removal of SELinux modules



1.20                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.19&r2=1.20

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- vdr-plugin-2.eclass	4 Jan 2013 13:23:43 -0000	1.19
+++ vdr-plugin-2.eclass	27 Jan 2013 10:17:13 -0000	1.20
@@ -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/eclass/vdr-plugin-2.eclass,v 1.19 2013/01/04 13:23:43 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.20 2013/01/27 10:17:13 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -593,20 +593,18 @@
 
 	local SOFILE_STRING=$(grep SOFILE Makefile)
 	if [[ -n ${SOFILE_STRING} ]]; then
-		dev_check "installing with new Makefile handling"
+		dev_check "einstall with new Makefile handling"
 		BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-install }}
 		einstall ${BUILD_PARAMS} \
 			${BUILD_TARGETS} \
-			LOCDIR="${TMP_LOCALE_DIR}" \
-			LIBDIR="${S}" \
 			TMPDIR="${T}" \
 			DESTDIR="${D}" \
 			|| die "einstall (makefile target) failed"
+	else
+		insinto "${VDR_PLUGIN_DIR}"
+		doins libvdr-*.so.*
 	fi
 
-	insinto "${VDR_PLUGIN_DIR}"
-	doins libvdr-*.so.*
-
 	if [[ -d ${TMP_LOCALE_DIR} ]]; then
 		einfo "Installing locales"
 		cd "${TMP_LOCALE_DIR}"

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    13/01/27 13:32:45

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  reverted last changes

Revision  Changes    Path
1.646                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.646&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.646&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.645&r2=1.646

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.645
retrieving revision 1.646
diff -u -r1.645 -r1.646
--- ChangeLog	27 Jan 2013 11:48:48 -0000	1.645
+++ ChangeLog	27 Jan 2013 13:32:44 -0000	1.646
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.645 2013/01/27 11:48:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.646 2013/01/27 13:32:44 hd_brummy Exp $
+
+  27 Jan 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  reverted last changes
 
   27 Jan 2013; Tim Harder <radhermit@gentoo.org> vim-plugin.eclass:
   Remove files before installing docs.



1.21                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.20&r2=1.21

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vdr-plugin-2.eclass	27 Jan 2013 10:17:13 -0000	1.20
+++ vdr-plugin-2.eclass	27 Jan 2013 13:32:44 -0000	1.21
@@ -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/eclass/vdr-plugin-2.eclass,v 1.20 2013/01/27 10:17:13 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.21 2013/01/27 13:32:44 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -598,12 +598,14 @@
 		einstall ${BUILD_PARAMS} \
 			${BUILD_TARGETS} \
 			TMPDIR="${T}" \
+			LOCDIR="${TMP_LOCALE_DIR}" \
+			LIBDIR="${S}" \
 			DESTDIR="${D}" \
 			|| die "einstall (makefile target) failed"
-	else
-		insinto "${VDR_PLUGIN_DIR}"
-		doins libvdr-*.so.*
-	fi
+		fi
+
+	insinto "${VDR_PLUGIN_DIR}"
+	doins libvdr-*.so.*
 
 	if [[ -d ${TMP_LOCALE_DIR} ]]; then
 		einfo "Installing locales"

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    13/03/05 09:09:17

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  vdr-plugin-2.eclass, adapted to the new plugin makefile handling; cleanup for unusede function 'delete_orphan_plugindb_file'; more unneeded source cleanup

Revision  Changes    Path
1.714                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.714&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.714&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.713&r2=1.714

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.713
retrieving revision 1.714
diff -u -r1.713 -r1.714
--- ChangeLog	4 Mar 2013 19:31:01 -0000	1.713
+++ ChangeLog	5 Mar 2013 09:09:17 -0000	1.714
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.713 2013/03/04 19:31:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.714 2013/03/05 09:09:17 hd_brummy Exp $
+
+  05 Mar 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  vdr-plugin-2.eclass, adapted to the new plugin makefile handling; cleanup for
+  unusede function 'delete_orphan_plugindb_file'; more unneeded source cleanup
 
   04 Mar 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
   Introduce multilib_for_best_impl().



1.22                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.21&r2=1.22

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- vdr-plugin-2.eclass	27 Jan 2013 13:32:44 -0000	1.21
+++ vdr-plugin-2.eclass	5 Mar 2013 09:09:17 -0000	1.22
@@ -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/eclass/vdr-plugin-2.eclass,v 1.21 2013/01/27 13:32:44 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.22 2013/03/05 09:09:17 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -104,31 +104,6 @@
 	} > "${D}/${DB_FILE}"
 }
 
-# Delete files created outside of vdr-plugin-2.eclass
-#   vdrplugin-rebuild.ebuild converted plugindb and files are
-#   not deleted by portage itself - should only be needed as
-#   long as not every system has switched over to
-#   vdrplugin-rebuild-0.2 / gentoo-vdr-scripts-0.4.2
-delete_orphan_plugindb_file() {
-	#elog Testing for orphaned plugindb file
-	local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
-	local DB_FILE="${ROOT}/${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}"
-
-	# file exists
-	[[ -f ${DB_FILE} ]] || return
-
-	# will portage handle the file itself
-	if grep -q CREATOR=ECLASS "${DB_FILE}"; then
-		#elog file owned by eclass - don't touch it
-		return
-	fi
-
-	elog "Removing orphaned plugindb-file."
-	elog "\t#rm ${DB_FILE}"
-	rm "${DB_FILE}"
-}
-
-
 create_header_checksum_file() {
 	# Danger: Not using $ROOT here, as compile will also not use it !!!
 	# If vdr in $ROOT and / differ, plugins will not run anyway
@@ -212,12 +187,6 @@
 		-e '/^CXXFLAGS[[:space:]]*=/s/=/?=/' \
 		-e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:'
 
-	# Do not use {C,CXX}FLAGS from pkg-config vdr.pc, >=media-video/vdr-1.7.34
-	# we do not have the chance to overwrite it with *.eclass
-	sed -e "/^export[[:space:]]*CFLAGS[[:space:]]*=/s/=/?=/" \
-		-e "/^export[[:space:]]*CXXFLAGS[[:space:]]*=/s/=/?=/" \
-		-i Makefile
-
 	# Disabling file stripping, the package manager takes care of it
 	sed -i Makefile \
 		-e '/@.*strip/d' \
@@ -248,7 +217,7 @@
 }
 
 detect_po_dir() {
-#	Some plugins have po/ in a subdir
+#	Some plugins have /po in a subdir
 #	set PO_SUBDIR in .ebuild
 #	i.e media-plugins/vdr-streamdev
 #	PO_SUBDIR="client server"
@@ -258,18 +227,12 @@
 	local f
 
 	pofile_dir=( ${po_dir} ${po_subdir[*]} )
-
-	# maintainer check
-	if [[ ! -d ${pofile_dir[*]} ]]; then
-		dev_check "po dir not found? May be in subdir? \n"
-	fi
 }
 
 linguas_support() {
 #	Patching Makefile for linguas support.
 #	Only locales, enabled through the LINGUAS (make.conf) variable will be
 #	"compiled" and installed.
-#
 
 	einfo "Patching for Linguas support"
 	einfo "available Languages for ${P} are:"
@@ -277,7 +240,6 @@
 	detect_po_dir
 
 	for f in ${pofile_dir[*]}; do
-
 		PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
 		einfo "LINGUAS=\"${PLUGIN_LINGUAS}\""
 
@@ -342,31 +304,6 @@
 }
 # end new vdr-plugin-2.eclass content
 
-# ToDo: we don't support included plugins from vdr source for install in this way !!!
-# obsolet, remove it, later...
-#vdr-plugin-2_copy_source_tree() {
-#	pushd . >/dev/null
-#	cp -r "${S}" "${T}"/source-tree
-#	cd "${T}"/source-tree
-#	cp "${WORKDIR}"/Makefile.before Makefile
-#	# TODO: Fix this, maybe no longer needed
-#	sed -i Makefile \
-#		-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
-#		-e 's:^CXXFLAGS:#CXXFLAGS:' \
-#		-e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \
-#		-e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):'
-#	popd >/dev/null
-#}
-
-#vdr-plugin-2_install_source_tree() {
-#	einfo "Installing sources"
-#	destdir="${VDRSOURCE_DIR}/vdr-${VDRVERSION}/PLUGINS/src/${VDRPLUGIN}"
-#	insinto "${destdir}-${PV}"
-#	doins -r "${T}"/source-tree/*
-#
-#	dosym "${VDRPLUGIN}-${PV}" "${destdir}"
-#}
-
 vdr-plugin-2_print_enable_command() {
 	local p_name c=0 l=""
 	for p_name in ${vdr_plugin_list}; do
@@ -524,14 +461,10 @@
 }
 
 vdr-plugin-2_src_compile() {
-	[ -z "$1" ] && vdr-plugin-2_src_compile copy_source compile
+	[ -z "$1" ] && vdr-plugin-2_src_compile compile
 
 	while [ "$1" ]; do
 		case "$1" in
-		copy_source)
-			[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_copy_source_tree
-			dev_check "ToDo: obsoleted handling, vdr-plugin-2_copy_source_tree"
-			;;
 		compile)
 			if [[ ! -f ${WORKDIR}/.vdr-plugin_makefile_patched ]]; then
 				eerror "Wrong use of vdr-plugin-2.eclass."
@@ -567,8 +500,6 @@
 		die "vdr-plugin-2_src_install not called!"
 	fi
 
-#	ToDo: obsolet, remove it, later...
-#	[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_install_source_tree
 	cd "${WORKDIR}"
 
 	if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
@@ -598,14 +529,12 @@
 		einstall ${BUILD_PARAMS} \
 			${BUILD_TARGETS} \
 			TMPDIR="${T}" \
-			LOCDIR="${TMP_LOCALE_DIR}" \
-			LIBDIR="${S}" \
 			DESTDIR="${D}" \
 			|| die "einstall (makefile target) failed"
-		fi
-
-	insinto "${VDR_PLUGIN_DIR}"
-	doins libvdr-*.so.*
+	else
+		insinto "${VDR_PLUGIN_DIR}"
+		doins libvdr-*.so.*
+	fi
 
 	if [[ -d ${TMP_LOCALE_DIR} ]]; then
 		einfo "Installing locales"
@@ -618,7 +547,7 @@
 		done
 	fi
 
-	cd "${S}"
+	cd "${D}/usr/$(get_libdir)/vdr/plugins"
 
 	# create list of all created plugin libs
 	vdr_plugin_list=""
@@ -629,6 +558,8 @@
 		vdr_plugin_list="${vdr_plugin_list} ${p_name}"
 	done
 
+	cd "${S}"
+
 	create_header_checksum_file ${vdr_plugin_list}
 	create_plugindb_file ${vdr_plugin_list}
 
@@ -664,7 +595,7 @@
 }
 
 vdr-plugin-2_pkg_postrm() {
-	delete_orphan_plugindb_file
+:
 }
 
 vdr-plugin-2_pkg_config() {

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    13/03/30 20:14:41

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  fixed missing VDRVERSION up from >=vdr-1.7.34

Revision  Changes    Path
1.760                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.760&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.760&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.759&r2=1.760

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.759
retrieving revision 1.760
diff -u -r1.759 -r1.760
--- ChangeLog	30 Mar 2013 12:56:24 -0000	1.759
+++ ChangeLog	30 Mar 2013 20:14:41 -0000	1.760
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.759 2013/03/30 12:56:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.760 2013/03/30 20:14:41 hd_brummy Exp $
+
+  30 Mar 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  fixed missing VDRVERSION up from >=vdr-1.7.34
 
   30 Mar 2013; Mike Gilbert <floppym@gentoo.org> python-r1.eclass:
   Add note about quoting patterns for python_gen_usedep.



1.23                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.22&r2=1.23

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- vdr-plugin-2.eclass	5 Mar 2013 09:09:17 -0000	1.22
+++ vdr-plugin-2.eclass	30 Mar 2013 20:14:41 -0000	1.23
@@ -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/eclass/vdr-plugin-2.eclass,v 1.22 2013/03/05 09:09:17 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.23 2013/03/30 20:14:41 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -380,6 +380,7 @@
 	fi
 
 	if has_version ">=media-video/vdr-1.7.34"; then
+		VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
 		APIVERSION=$(pkg-config --variable=apiversion vdr)
 	else
 		VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    13/04/13 19:07:31

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  spell fixing

Revision  Changes    Path
1.785                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.785&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.785&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.784&r2=1.785

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.784
retrieving revision 1.785
diff -u -r1.784 -r1.785
--- ChangeLog	13 Apr 2013 14:01:10 -0000	1.784
+++ ChangeLog	13 Apr 2013 19:07:31 -0000	1.785
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.784 2013/04/13 14:01:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.785 2013/04/13 19:07:31 hd_brummy Exp $
+
+  13 Apr 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  spell fix
 
   13 Apr 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Unmask the egg_info block for further testing. Feel free to comment it out if



1.24                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.23&r2=1.24

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vdr-plugin-2.eclass	30 Mar 2013 20:14:41 -0000	1.23
+++ vdr-plugin-2.eclass	13 Apr 2013 19:07:31 -0000	1.24
@@ -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/eclass/vdr-plugin-2.eclass,v 1.23 2013/03/30 20:14:41 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.24 2013/04/13 19:07:31 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -300,7 +300,7 @@
 		-e "s:^#include[[:space:]]*\"i18n.h\"://:"
 	done
 
-	dev_check "removed i18n.h for ${@}"
+	dev_check "removed i18n.h include in ${@}"
 }
 # end new vdr-plugin-2.eclass content
 

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    13/10/07 12:21:14

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  small modification on output from function dev_check

Revision  Changes    Path
1.1012               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1012&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1012&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1011&r2=1.1012

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1011
retrieving revision 1.1012
diff -u -r1.1011 -r1.1012
--- ChangeLog	6 Oct 2013 14:37:31 -0000	1.1011
+++ ChangeLog	7 Oct 2013 12:21:14 -0000	1.1012
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1011 2013/10/06 14:37:31 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1012 2013/10/07 12:21:14 hd_brummy Exp $
+
+  07 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  small modification on output from function dev_check
 
   06 Oct 2013; Vlastimil Babka <caster@gentoo.org> java-utils-2.eclass:
   Convert comments for eclass manpages. Heavily based on work from ercpe, bug



1.25                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.24&r2=1.25

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vdr-plugin-2.eclass	13 Apr 2013 19:07:31 -0000	1.24
+++ vdr-plugin-2.eclass	7 Oct 2013 12:21:14 -0000	1.25
@@ -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/eclass/vdr-plugin-2.eclass,v 1.24 2013/04/13 19:07:31 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.25 2013/10/07 12:21:14 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -203,7 +203,7 @@
 	# A lot useful debug infos
 	# set VDR_MAINTAINER_MODE="1" in make.conf
 	if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-		eerror "\t Maintainer Info: $@"
+		eerror "\t Gentoo Developer Debug: $@"
 	fi
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    14/01/24 13:51:19

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  changed debug info in vdr-plugin-2_src_install for Makefile handling

Revision  Changes    Path
1.1129               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1129&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1129&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1128&r2=1.1129

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1128
retrieving revision 1.1129
diff -u -r1.1128 -r1.1129
--- ChangeLog	24 Jan 2014 04:13:58 -0000	1.1128
+++ ChangeLog	24 Jan 2014 13:51:18 -0000	1.1129
@@ -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.1128 2014/01/24 04:13:58 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1129 2014/01/24 13:51:18 hd_brummy Exp $
+
+  24 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  changed debug info in vdr-plugin-2_src_install for Makefile handling
 
   24 Jan 2014; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
   Work around bug #357287.



1.26                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.25&r2=1.26

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- vdr-plugin-2.eclass	7 Oct 2013 12:21:14 -0000	1.25
+++ vdr-plugin-2.eclass	24 Jan 2014 13:51:18 -0000	1.26
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.25 2013/10/07 12:21:14 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.26 2014/01/24 13:51:18 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -525,7 +525,6 @@
 
 	local SOFILE_STRING=$(grep SOFILE Makefile)
 	if [[ -n ${SOFILE_STRING} ]]; then
-		dev_check "einstall with new Makefile handling"
 		BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-install }}
 		einstall ${BUILD_PARAMS} \
 			${BUILD_TARGETS} \
@@ -533,6 +532,7 @@
 			DESTDIR="${D}" \
 			|| die "einstall (makefile target) failed"
 	else
+		dev_check "Plugin still use the old Makefile handling"
 		insinto "${VDR_PLUGIN_DIR}"
 		doins libvdr-*.so.*
 	fi

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    14/01/25 15:23:54

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  major changes depend on wrt bug 497056, vdr-plugin-2.eclass

Revision  Changes    Path
1.1131               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1131&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1131&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1130&r2=1.1131

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1130
retrieving revision 1.1131
diff -u -r1.1130 -r1.1131
--- ChangeLog	25 Jan 2014 04:07:04 -0000	1.1130
+++ ChangeLog	25 Jan 2014 15:23:54 -0000	1.1131
@@ -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.



1.27                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.26&r2=1.27

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vdr-plugin-2.eclass	24 Jan 2014 13:51:18 -0000	1.26
+++ vdr-plugin-2.eclass	25 Jan 2014 15:23:54 -0000	1.27
@@ -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 @@
 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 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 @@
 		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 @@
 		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 @@
 			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

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    14/02/08 00:56:30

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  removed base.eclass, wrt bug 497056

Revision  Changes    Path
1.1139               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1139&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1139&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1138&r2=1.1139

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1138
retrieving revision 1.1139
diff -u -r1.1138 -r1.1139
--- ChangeLog	6 Feb 2014 17:07:56 -0000	1.1138
+++ ChangeLog	8 Feb 2014 00:56:30 -0000	1.1139
@@ -1,6 +1,6 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1138 2014/02/06 17:07:56 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1139 2014/02/08 00:56:30 hd_brummy Exp $
 
   06 Feb 2014; Michael Palimaka <kensington@gentoo.org> kde4-meta.eclass:
   Disable more bogus dependency checks wrt bug #494680.
@@ -18,6 +18,9 @@
   02 Feb 2014; Julian Ospald <hasufell@gentoo.org> games.eclass:
   respect ECONF_SOURCE wrt #494210
 
+  02 Feb 2014; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  removed debuginfos depends on base.eclass removing, wrt bug #497056
+
   01 Feb 2014; Ryan Hill <dirtyepic@gentoo.org> flag-o-matic.eclass:
   Add -fdiagnostics* and ISA flags for 4.8 and 4.9.
 



1.28                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.27&r2=1.28

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vdr-plugin-2.eclass	25 Jan 2014 15:23:54 -0000	1.27
+++ vdr-plugin-2.eclass	8 Feb 2014 00:56:30 -0000	1.28
@@ -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.27 2014/01/25 15:23:54 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.28 2014/02/08 00:56:30 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 eutils flag-o-matic multilib toolchain-funcs unpacker # base
+inherit eutils flag-o-matic multilib toolchain-funcs unpacker
 
 case ${EAPI:-0} in
     4|5) ;;
@@ -202,7 +202,6 @@
 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
@@ -411,8 +410,6 @@
 			vdr-plugin-2_src_util add_local_patch patchmakefile linguas_patch i18n
 			;;
 		unpack)
-#			base_src_unpack # cleanup later
-			dev_check "function src_unpack, changed from base.eclass to unpacker.eclass"
 			unpacker_src_unpack
 			;;
 		add_local_patch)
@@ -444,12 +441,6 @@
 		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
@@ -466,8 +457,6 @@
 		die "vdr-plugin-2_src_prepare not called!"
 	fi
 
-#	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"
 

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    15/01/04 21:16:47

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  documentation syntax fixed

Revision  Changes    Path
1.1498               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1498&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1498&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1497&r2=1.1498

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1497
retrieving revision 1.1498
diff -u -r1.1497 -r1.1498
--- ChangeLog	4 Jan 2015 18:24:06 -0000	1.1497
+++ ChangeLog	4 Jan 2015 21:16:47 -0000	1.1498
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1497 2015/01/04 18:24:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1498 2015/01/04 21:16:47 hd_brummy Exp $
+
+  04 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  documentation syntax fixed
 
   04 Jan 2015; Tim Harder <radhermit@gentoo.org> -vim.eclass:
   Remove unused eclass.



1.29                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.28&r2=1.29

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- vdr-plugin-2.eclass	8 Feb 2014 00:56:30 -0000	1.28
+++ vdr-plugin-2.eclass	4 Jan 2015 21:16:47 -0000	1.29
@@ -1,28 +1,29 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.28 2014/02/08 00:56:30 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.29 2015/01/04 21:16:47 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
-# vdr@gentoo.org
-# @BLURB: common vdr plugin ebuild functions
-# @DESCRIPTION:
-# Eclass for easing maitenance of vdr plugin ebuilds
-
-# Authors:
+# Gentoo VDR Project <vdr@gentoo.org>
+# @AUTHOR:
 # Matthias Schwarzott <zzam@gentoo.org>
 # Joerg Bornkessel <hd_brummy@gentoo.org>
 # Christian Ruppert <idl0r@gentoo.org>
+# (undisclosed contributors)
+# @BLURB: common vdr plugin ebuild functions
+# @DESCRIPTION:
+# Eclass for easing maintenance of vdr plugin ebuilds
 
-# Plugin config file installation:
-#
+# @ECLASS-VARIABLE: VDR_CONFD_FILE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # A plugin config file can be specified through the $VDR_CONFD_FILE variable, it
 # defaults to ${FILESDIR}/confd. Each config file will be installed as e.g.
 # ${D}/etc/conf.d/vdr.${VDRPLUGIN}
 
-# Installation of rc-addon files:
-# NOTE: rc-addon files must be valid shell scripts!
-#
+# @ECLASS-VARIABLE: VDR_RCADDON_FILE
+# @DEFAULT_UNSET
+# @DESCRIPTION
 # Installing rc-addon files is basically the same as for plugin config files
 # (see above), it's just using the $VDR_RCADDON_FILE variable instead.
 # The default value when $VDR_RCADDON_FILE is undefined is:
@@ -33,10 +34,68 @@
 # has been enabled.
 # rc-addon files may be used to prepare everything that is necessary for the
 # plugin start/stop, like passing extra command line options and so on.
+#
+# NOTE: rc-addon files must be valid shell scripts!
+
+# @ECLASS-VARIABLE: GENTOO_VDR_CONDITIONAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# This is a hack for ebuilds like vdr-xineliboutput that want to
+# conditionally install a vdr-plugin
+
+# @ECLASS-VARIABLE: PO_SUBDIR
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# default DIR /po is in ${S}
+# use PO_SUBDIR if /po is in a subdir of ${S}
+#
+# Example:
+# for list of files: bla foo/bla
+#
+# @CODE
+# PO_SUBDIR="bla foo/bla"
+# @CODE
+
+# @ECLASS_VARIABLE: VDR_MAINTAINER_MODE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# output from function dev_check if it is defined in ebuild or eclass,
+# helpfull for gentoo ebuild developer
+#
+# This will also install any debug files in /usr/share/vdr/maintainer-data
+#
+# This is intended to be set by user in make.conf. Ebuilds must not set
+# it.
+#
+# VDR_MAINTAINER_MODE=1
+
+# @FUNCTION: fix_vdr_libsi_include
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# plugins failed on compile with wrong path of libsi includes,
+# fix this by 'function + space separated list of files'
+#
+# @Example:
+# @CODE
+# fix_vdr_libsi_include bla.c foo.c
+# @CODE
+
+# @FUNCTION: remove_i18n_include
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# compile will fail if plugin still use the old i18n language handling,
+# most parts are fixed by vdr-plugin-2.eclass internal functions itself
+# remove unneeded i18.n includes from files, if they are still wrong there
+# fix this by 'function + space separated list of files"
+#
+# @Example:
+# @CODE
+# remove_i18n_include bla.n foo.n
+# @CODE
 
 # Applying your own local/user patches:
 # This is done by using the epatch_user() function of the eutils.eclass.
-# Simply put your patches into one of these directories:
+# Simply add your patches into one of these directories:
 # /etc/portage/patches/<CATEGORY>/<PF|P|PN>/
 # Quote: where the first of these three directories to exist will be the one to
 # use, ignoring any more general directories which might exist as well.
@@ -72,8 +131,6 @@
 RDEPEND="${COMMON_DEPEND}
 	>=app-admin/eselect-vdr-0.0.2"
 
-# This is a hack for ebuilds like vdr-xineliboutput that want to
-# conditionally install a vdr-plugin
 if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]]; then
 	IUSE="${IUSE} vdr"
 	DEPEND="vdr? ( ${DEPEND} )"
@@ -198,7 +255,6 @@
 	touch "${WORKDIR}"/.vdr-plugin_makefile_patched
 }
 
-# Begin new vdr-plugin-2.eclass content
 dev_check() {
 	# A lot useful debug infos
 	# set VDR_MAINTAINER_MODE="1" in make.conf
@@ -217,10 +273,7 @@
 }
 
 detect_po_dir() {
-#	Some plugins have /po in a subdir
-#	set PO_SUBDIR in .ebuild
-#	i.e media-plugins/vdr-streamdev
-#	PO_SUBDIR="client server"
+	# helper function
 
 	[[ -f po ]] && local po_dir="${S}"
 	local po_subdir=( ${S}/${PO_SUBDIR} )
@@ -292,7 +345,6 @@
 
 remove_i18n_include() {
 	# remove uneeded i18.n includes
-	# call 'remove_i18n_include bla foo'
 
 	local f
 	for f; do
@@ -302,7 +354,6 @@
 
 	dev_check "removed i18n.h include in ${@}"
 }
-# end new vdr-plugin-2.eclass content
 
 vdr-plugin-2_print_enable_command() {
 	local p_name c=0 l=""
@@ -344,6 +395,7 @@
 	if has_version ">=media-video/vdr-1.7.34"; then
 		VDR_PLUGIN_DIR=$(pkg-config --variable=libdir vdr)
 	else
+		# obsolete, as we have only >=media-video/vdr-2
 		VDR_PLUGIN_DIR="/usr/$(get_libdir)/vdr/plugins"
 	fi
 
@@ -362,6 +414,7 @@
 	if has_version ">=media-video/vdr-1.7.34"; then
 		LOCDIR=$(pkg-config --variable=locdir vdr)
 	else
+		# obsolete, as we have only >=media-video/vdr-2
 		LOCDIR="/usr/share/locale"
 	fi
 
@@ -383,6 +436,7 @@
 		VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
 		APIVERSION=$(pkg-config --variable=apiversion vdr)
 	else
+		# obsolete, as we have only >=media-video/vdr-2
 		VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
 		APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
 	[[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    15/01/05 10:26:32

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  typo

Revision  Changes    Path
1.1500               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1500&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1500&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1499&r2=1.1500

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1499
retrieving revision 1.1500
diff -u -r1.1499 -r1.1500
--- ChangeLog	4 Jan 2015 22:18:12 -0000	1.1499
+++ ChangeLog	5 Jan 2015 10:26:31 -0000	1.1500
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1499 2015/01/04 22:18:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1500 2015/01/05 10:26:31 hd_brummy Exp $
+
+  05 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  typo
 
   04 Jan 2015; Michał Górny <mgorny@gentoo.org> python-single-r1.eclass:
   Run pkg_setup() only in non-binary installs, as intended and documented a



1.30                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.29&r2=1.30

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- vdr-plugin-2.eclass	4 Jan 2015 21:16:47 -0000	1.29
+++ vdr-plugin-2.eclass	5 Jan 2015 10:26:32 -0000	1.30
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.29 2015/01/04 21:16:47 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.30 2015/01/05 10:26:32 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -23,7 +23,7 @@
 
 # @ECLASS-VARIABLE: VDR_RCADDON_FILE
 # @DEFAULT_UNSET
-# @DESCRIPTION
+# @DESCRIPTION:
 # Installing rc-addon files is basically the same as for plugin config files
 # (see above), it's just using the $VDR_RCADDON_FILE variable instead.
 # The default value when $VDR_RCADDON_FILE is undefined is:
@@ -56,7 +56,7 @@
 # PO_SUBDIR="bla foo/bla"
 # @CODE
 
-# @ECLASS_VARIABLE: VDR_MAINTAINER_MODE
+# @ECLASS-VARIABLE: VDR_MAINTAINER_MODE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # output from function dev_check if it is defined in ebuild or eclass,
@@ -70,25 +70,23 @@
 # VDR_MAINTAINER_MODE=1
 
 # @FUNCTION: fix_vdr_libsi_include
-# @DEFAULT_UNSET
 # @DESCRIPTION:
-# plugins failed on compile with wrong path of libsi includes,
+# Plugins failed on compile with wrong path of libsi includes,
 # fix this by 'function + space separated list of files'
 #
-# @Example:
+# Example:
 # @CODE
 # fix_vdr_libsi_include bla.c foo.c
 # @CODE
 
 # @FUNCTION: remove_i18n_include
-# @DEFAULT_UNSET
 # @DESCRIPTION:
-# compile will fail if plugin still use the old i18n language handling,
-# most parts are fixed by vdr-plugin-2.eclass internal functions itself
-# remove unneeded i18.n includes from files, if they are still wrong there
+# Compile will fail if plugin still use the old i18n language handling,
+# most parts are fixed by vdr-plugin-2.eclass internal functions itself.
+# Remove unneeded i18.n includes from files, if they are still wrong there,
 # fix this by 'function + space separated list of files"
 #
-# @Example:
+# Example:
 # @CODE
 # remove_i18n_include bla.n foo.n
 # @CODE

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin-2.eclass

[Joerg Bornkessel (hd_brummy)]

hd_brummy    15/01/05 18:15:06

  Modified:             ChangeLog vdr-plugin-2.eclass
  Log:
  better readable description

Revision  Changes    Path
1.1501               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1501&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1501&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1500&r2=1.1501

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1500
retrieving revision 1.1501
diff -u -r1.1500 -r1.1501
--- ChangeLog	5 Jan 2015 10:26:31 -0000	1.1500
+++ ChangeLog	5 Jan 2015 18:15:06 -0000	1.1501
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1500 2015/01/05 10:26:31 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1501 2015/01/05 18:15:06 hd_brummy Exp $
+
+  05 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
+  better readable description
 
   05 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
   typo



1.31                 eclass/vdr-plugin-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.30&r2=1.31

Index: vdr-plugin-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- vdr-plugin-2.eclass	5 Jan 2015 10:26:32 -0000	1.30
+++ vdr-plugin-2.eclass	5 Jan 2015 18:15:06 -0000	1.31
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.30 2015/01/05 10:26:32 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.31 2015/01/05 18:15:06 hd_brummy Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -46,12 +46,10 @@
 # @ECLASS-VARIABLE: PO_SUBDIR
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# default DIR /po is in ${S}
-# use PO_SUBDIR if /po is in a subdir of ${S}
+# By default, translation are found in"${S}"/po but this
+# default can be overridden by defining PO_SUBDIR.
 #
 # Example:
-# for list of files: bla foo/bla
-#
 # @CODE
 # PO_SUBDIR="bla foo/bla"
 # @CODE
@@ -59,7 +57,7 @@
 # @ECLASS-VARIABLE: VDR_MAINTAINER_MODE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# output from function dev_check if it is defined in ebuild or eclass,
+# Output from function dev_check if it is defined in ebuild or eclass,
 # helpfull for gentoo ebuild developer
 #
 # This will also install any debug files in /usr/share/vdr/maintainer-data
@@ -72,7 +70,7 @@
 # @FUNCTION: fix_vdr_libsi_include
 # @DESCRIPTION:
 # Plugins failed on compile with wrong path of libsi includes,
-# fix this by 'function + space separated list of files'
+# this can be fixed by 'function + space separated list of files'
 #
 # Example:
 # @CODE
@@ -84,7 +82,7 @@
 # Compile will fail if plugin still use the old i18n language handling,
 # most parts are fixed by vdr-plugin-2.eclass internal functions itself.
 # Remove unneeded i18.n includes from files, if they are still wrong there,
-# fix this by 'function + space separated list of files"
+# this can be fixed by 'function + space separated list of files"
 #
 # Example:
 # @CODE