From: Joerg Bornkessel Date: Fri, 6 Feb 2015 19:00:13 +0000 (+0000) Subject: patched for new makefile handling X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2766e258c35d983a1cc906f6ca10a352949f5731;p=gentoo.git patched for new makefile handling Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x34C2808A --- diff --git a/media-plugins/vdr-duplicates/ChangeLog b/media-plugins/vdr-duplicates/ChangeLog index e1264a49bf00..54bdb9f66a69 100644 --- a/media-plugins/vdr-duplicates/ChangeLog +++ b/media-plugins/vdr-duplicates/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-plugins/vdr-duplicates # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-duplicates/ChangeLog,v 1.6 2015/02/03 09:38:24 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-duplicates/ChangeLog,v 1.7 2015/02/06 18:59:53 hd_brummy Exp $ + +*vdr-duplicates-0.0.5-r1 (06 Feb 2015) + + 06 Feb 2015; Joerg Bornkessel + +vdr-duplicates-0.0.5-r1.ebuild, +files/duplicates-0.0.5_Makefile-new.diff: + patched for new makefile handling 03 Feb 2015; Joerg Bornkessel -vdr-duplicates-0.0.4.ebuild: diff --git a/media-plugins/vdr-duplicates/Manifest b/media-plugins/vdr-duplicates/Manifest index bb8e7dc683bd..0188ea561cf3 100644 --- a/media-plugins/vdr-duplicates/Manifest +++ b/media-plugins/vdr-duplicates/Manifest @@ -1,15 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX duplicates-0.0.5_Makefile-new.diff 7408 SHA256 d1e6bc830726a1f92d38923981a5403bfa4e2b3e653572d908dcbd2cacccbd61 SHA512 114e25f66cd0eeaa7438ae5af0b7579324b001d9b2b1a25ba39a69454a233976be311f30e7d2a8b53362d324499ee69f174acce8bcf5ec96e8ed9d5e24ef0e88 WHIRLPOOL 2dfeee810370f0971b744b2cf64307469cbac9e2261e7c3d8dff464679e2aefbfbc6096e7c7587461c5505de3cb30f8e33637b3e269df846cde7b32d806f178d DIST vdr-duplicates-0.0.5.tgz 14745 SHA256 9ebe5efcf41a504f9bd3dbeb0cd709e101a31f2cac89f266e5cc1a6426c2cbb4 SHA512 9e8ec30cbf9b1447aa00152be48237a8688dcfd746b06774b3f5d87d7100037ee8f890507c06d203a81bc05b4b476e326a3c1f0fe84e222a876a7de534b2495d WHIRLPOOL a80b7d9247485bfe0de6cc07061b3906b629e332a4aea09ab5e3526cc35146522ff244f96be73e416deca70eaeb9e6ba1240c28437d7c7296911a870f7ad044f +EBUILD vdr-duplicates-0.0.5-r1.ebuild 589 SHA256 4f96eb9632877eb41570318a12037eb2ac100b2eed17ad4cebb687954b5cf1a9 SHA512 1a61ee9bf2669190f0bc34725421d4e23d6a205e9b17877a67e3559dbf17873d88cd895fc7d503470b117d17e42db8eae5537e1a5b308a54101fcb5e4d7c3abd WHIRLPOOL 7755526ac86e6b3da44983f5865632fc47279a936fb7d5fe2f5b9e21e8876459f9f7edb80ad93c28e8f6fb909b7c030c3e5c62696265a7818d453d5a1d54ef28 EBUILD vdr-duplicates-0.0.5.ebuild 524 SHA256 2fd20f2a2c31effc031faa84da64518dffa4fcf06a5b08c0ec29a0e24c82276b SHA512 1682397422f1d2414903be9050e1f9bc0c2a54018c21bbd9e5bc9afa11521b1e8acd9ee07c9929d5a6f8699f5505721f60b76df48653f355152903c61e9ce398 WHIRLPOOL dbd5f18c2b798a80c08a27ee5732bdb93bf3d929710340df3937893a989e326657ae5839ca79e37cb5ac9ef11cfcff5f7667b78427966b3910b4caea5d307904 -MISC ChangeLog 1012 SHA256 9c9458e0684aa14cd57df5830c9452ec838edd9cfd4ee95beb0a4f85368fe259 SHA512 26017299eaf05cffcef1c95d1d731fed16ee6a8621315f4c2a71d71f22401f66c5037a53d122893572cd042859e7a4d0f60d92cf016f2c08cb211c0e4169d9ba WHIRLPOOL 59df46ea43c3260ecda23392567e0e3f1e3a7b8d254445cce8962aa14c2b130992d6f51b1034689cdbfc32f39f354b08e1ce79dd3d2a8c79076f7573ba77c566 +MISC ChangeLog 1222 SHA256 14aaf60c4c3d392516c715c14009b1011829473482a02e66e35ad819b1a38aa8 SHA512 358b317207d1cef4c286508fc6bf91c0bb2650be8f860667a70a79bca9f358c9c7dc1ff53bdc716bb05ab1c27d8130b09ca629e4eb486eb4453defe4497e1abd WHIRLPOOL e3dd9cc93628e5fb381e795b976e4da32eeef666f08b670807da4152b763d5b0f4f090b854f9d3b4926121950b9b9be00333ba5073f554f95ca47e1113c9f13e MISC metadata.xml 251 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f SHA512 8f48311caba6e3069390a1871a0cb9b8731ff57b812b3b8d5a5b5147d4e2b8ad28232d059abb00f049ba78a10570d9326957a57349d2f080624b41b043112056 WHIRLPOOL 2b082e9ef2c0a111b189ec0a020a10fcf8ddb4ea6f2eb5d9627f98ab6edb72cac03a9a04f97ee4624f27852b85bb06f2d662a54b0ee421c777eba10e85e37cbe -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: added by hd_brummy@gentoo.org -iD8DBQFU0Jcddn07HTTCgIoRCBygAJsF5BYZZXH+4pfu1Y4cdEhlkCoe5ACdGVL2 -HwDHbJDhx7lFt0c9bqt59zA= -=lsvM +iD8DBQFU1Q8vdn07HTTCgIoRCPvBAJ9GEY37WX8L1tB8su4LtR1kiZUUvACeOKh1 +w7ySHJvW1Oou777F7POLrBU= +=s9uJ -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-duplicates/files/duplicates-0.0.5_Makefile-new.diff b/media-plugins/vdr-duplicates/files/duplicates-0.0.5_Makefile-new.diff new file mode 100644 index 000000000000..4a37b4d25ea1 --- /dev/null +++ b/media-plugins/vdr-duplicates/files/duplicates-0.0.5_Makefile-new.diff @@ -0,0 +1,217 @@ +New Makefile handling up from vdr-1.7.34 +completed german translation +minor fixes in .po files +Signed-of-by: Joerg Bornkessel 2015/Jan/03 +diff -Naur duplicates-0.0.5.orig/Makefile duplicates-0.0.5/Makefile +--- duplicates-0.0.5.orig/Makefile 2015-02-03 10:40:33.661259290 +0100 ++++ duplicates-0.0.5/Makefile 2015-02-03 10:53:20.542203193 +0100 +@@ -6,48 +6,50 @@ + # The official name of this plugin. + # This name will be used in the '-P...' option of VDR to load the plugin. + # By default the main source file also carries this name. +-# IMPORTANT: the presence of this macro is important for the Make.config +-# file. So it must be defined, even if it is not used here! +-# ++ + PLUGIN = duplicates + + ### The version number of this plugin (taken from the main source file): + + VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') + +-### The C++ compiler and options: +- +-CXX ?= g++ +-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses +- + ### The directory environment: + +-VDRDIR = ../../.. +-LIBDIR = ../../lib +-TMPDIR = /tmp ++# Use package data if installed...otherwise assume we're under the VDR source directory: ++PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) ++LIBDIR = $(call PKGCFG,libdir) ++LOCDIR = $(call PKGCFG,locdir) ++PLGCFG = $(call PKGCFG,plgcfg) ++# ++TMPDIR ?= /tmp + +-### Make sure that necessary options are included: ++### The compiler options: + +--include $(VDRDIR)/Make.global ++export CFLAGS = $(call PKGCFG,cflags) ++export CXXFLAGS = $(call PKGCFG,cxxflags) + +-### Allow user defined options to overwrite defaults: ++### The version number of VDR's plugin API: + +--include $(VDRDIR)/Make.config ++APIVERSION = $(call PKGCFG,apiversion) + +-### The version number of VDR's plugin API (taken from VDR's "config.h"): ++### Allow user defined options to overwrite defaults: + +-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) ++-include $(PLGCFG) + + ### The name of the distribution archive: + + ARCHIVE = $(PLUGIN)-$(VERSION) + PACKAGE = vdr-$(ARCHIVE) + ++### The name of the shared object file: ++ ++SOFILE = libvdr-$(PLUGIN).so ++ + ### Includes and Defines (add further entries here): + +-INCLUDES += -I$(VDRDIR)/include ++INCLUDES += + +-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' ++DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' + + ### The object files (add further files here): + +@@ -55,52 +57,57 @@ + + ### The main target: + +-all: libvdr-$(PLUGIN).so i18n ++all: $(SOFILE) i18n + + ### Implicit rules: + + %.o: %.c +- $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< ++ $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $< + + ### Dependencies: + + MAKEDEP = $(CXX) -MM -MG + DEPFILE = .dependencies + $(DEPFILE): Makefile +- @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ ++ @$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ + + -include $(DEPFILE) + + ### Internationalization (I18N): + + PODIR = po +-LOCALEDIR = $(VDRDIR)/locale + I18Npo = $(wildcard $(PODIR)/*.po) +-I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) ++I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) ++I18Nmsgs = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) + I18Npot = $(PODIR)/$(PLUGIN).pot + + %.mo: %.po + msgfmt -c -o $@ $< + + $(I18Npot): $(wildcard *.c) +- xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='' -o $@ $^ ++ xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='' -o $@ `ls $^` + + %.po: $(I18Npot) +- msgmerge -U --no-wrap --no-location --backup=none -q $@ $< ++ msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $< + @touch $@ + +-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo +- @mkdir -p $(dir $@) +- cp $< $@ ++$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo ++ install -D -m644 $< $@ + + .PHONY: i18n +-i18n: $(I18Nmsgs) $(I18Npot) ++i18n: $(I18Nmo) $(I18Npot) ++ ++install-i18n: $(I18Nmsgs) + + ### Targets: + +-libvdr-$(PLUGIN).so: $(OBJS) ++$(SOFILE): $(OBJS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ +- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) ++ ++install-lib: $(SOFILE) ++ install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) ++ ++install: install-lib install-i18n + + dist: $(I18Npo) clean + @-rm -rf $(TMPDIR)/$(ARCHIVE) +@@ -111,4 +118,5 @@ + @echo Distribution package created as $(PACKAGE).tgz + + clean: +- @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot ++ @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot ++ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ +diff -Naur duplicates-0.0.5.orig/Makefile-vdr-1.7.33 duplicates-0.0.5/Makefile-vdr-1.7.33 +diff -Naur duplicates-0.0.5.orig/po/de_DE.po duplicates-0.0.5/po/de_DE.po +--- duplicates-0.0.5.orig/po/de_DE.po 2012-12-13 09:32:52.000000000 +0100 ++++ duplicates-0.0.5/po/de_DE.po 2015-02-03 11:12:44.879118021 +0100 +@@ -5,20 +5,19 @@ + # + msgid "" + msgstr "" +-"Project-Id-Version: vdr-duplicates 0.0.1\n" ++"Project-Id-Version: vdr-duplicates 0.0.6\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2011-12-20 18:14+0200\n" +-"PO-Revision-Date: 2011-06-05 23:37+0100\n" +-"Last-Translator: Reiner Paulus \n" ++"PO-Revision-Date: 2015-02-03 11:12+0100\n" ++"Last-Translator: Joerg Bornkessel \n" + "Language-Team: \n" +-"Language: \n" ++"Language: de\n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=utf-8\n" ++"Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Poedit-Language: German\n" +-"X-Poedit-Country: GERMANY\n" +-"X-Poedit-SourceCharset: utf-8\n" ++"X-Poedit-SourceCharset: UTF-8\n" ++"X-Generator: Poedit 1.5.5\n" + + msgid "Shows duplicate recordings" + msgstr "Zeigt doppelte Aufnahmen an" +@@ -35,4 +34,4 @@ + msgstr "%d Aufnahmen ohne Beschreibung" + + msgid "Compare title" +-msgstr "" ++msgstr "Vergleiche Titel" +diff -Naur duplicates-0.0.5.orig/po/fi_FI.po duplicates-0.0.5/po/fi_FI.po +--- duplicates-0.0.5.orig/po/fi_FI.po 2015-02-03 10:40:33.661259290 +0100 ++++ duplicates-0.0.5/po/fi_FI.po 2015-02-03 11:13:00.607116870 +0100 +@@ -12,7 +12,7 @@ + "PO-Revision-Date: 2011-12-12 19:57+0300\n" + "Last-Translator: Timo Eskola \n" + "Language-Team: Finnish\n" +-"Language: \n" ++"Language: fi\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur duplicates-0.0.5.orig/po/it_IT.po duplicates-0.0.5/po/it_IT.po +--- duplicates-0.0.5.orig/po/it_IT.po 2015-02-03 10:40:33.661259290 +0100 ++++ duplicates-0.0.5/po/it_IT.po 2015-02-03 11:13:17.167115659 +0100 +@@ -12,7 +12,7 @@ + "PO-Revision-Date: 2011-06-05 23:37+0100\n" + "Last-Translator: Diego Pierotto \n" + "Language-Team: \n" +-"Language: \n" ++"Language: it\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" diff --git a/media-plugins/vdr-duplicates/vdr-duplicates-0.0.5-r1.ebuild b/media-plugins/vdr-duplicates/vdr-duplicates-0.0.5-r1.ebuild new file mode 100644 index 000000000000..b656224d97ff --- /dev/null +++ b/media-plugins/vdr-duplicates/vdr-duplicates-0.0.5-r1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-duplicates/vdr-duplicates-0.0.5-r1.ebuild,v 1.1 2015/02/06 18:59:53 hd_brummy Exp $ + +EAPI=5 + +inherit vdr-plugin-2 + +DESCRIPTION="VDR Plugin: show duplicated records" +HOMEPAGE="http://www.tolleri.net/vdr/" +SRC_URI="http://www.tolleri.net/vdr/plugins/${P}.tgz" + +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="GPL-2" +IUSE="" + +DEPEND=">=media-video/vdr-2" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${VDRPLUGIN}-${PV}_Makefile-new.diff" )