Bladeren bron

repoman fixes

Sergey Ilinykh 7 jaren geleden
bovenliggende
commit
78cec73ff8

+ 4 - 4
app-laptop/clevo-xsm-wmi-gui/clevo-xsm-wmi-gui-9999.ebuild

@@ -15,17 +15,17 @@ KEYWORDS=""
 IUSE="systemd"
 
 DEPEND="
-    app-laptop/clevo-xsm-wmi
-    dev-qt/qtwidgets
+	app-laptop/clevo-xsm-wmi
+	dev-qt/qtwidgets
 "
 RDEPEND=""
 
 S="${WORKDIR}/${P}/utility"
 
 src_configure() {
-    eqmake5 clevo-xsm-wmi.pro
+	eqmake5 clevo-xsm-wmi.pro
 }
 
 src_install() {
-    dobin clevo-xsm-wmi
+	dobin clevo-xsm-wmi
 }

+ 8 - 0
app-laptop/clevo-xsm-wmi-gui/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rion4ik@gmail.com</email>
+		<name>rion</name>
+	</maintainer>
+</pkgmetadata>

+ 9 - 9
app-laptop/clevo-xsm-wmi/clevo-xsm-wmi-9999.ebuild

@@ -15,8 +15,8 @@ KEYWORDS=""
 IUSE="systemd"
 
 DEPEND="
-    sys-kernel/linux-headers
-    virtual/linux-sources
+	sys-kernel/linux-headers
+	virtual/linux-sources
 "
 RDEPEND=""
 
@@ -36,14 +36,14 @@ src_prepare() {
 }
 
 src_compile() {
-    BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
-    linux-mod_src_compile
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+	linux-mod_src_compile
 }
 
 src_install() {
-    linux-mod_src_install
-    if use systemd; then
-        mkdir ${D}/etc/modules-load.d || die
-        echo "${PN}" > ${D}/etc/modules-load.d/${PN}.conf
-    fi
+	linux-mod_src_install
+	if use systemd; then
+		mkdir "${D}"/etc/modules-load.d || die
+		echo "${PN}" > "${D}"/etc/modules-load.d/${PN}.conf
+	fi
 }

+ 8 - 0
app-laptop/clevo-xsm-wmi/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rion4ik@gmail.com</email>
+		<name>rion</name>
+	</maintainer>
+</pkgmetadata>

+ 1 - 1
app-text/myrulib/myrulib-0.29.16.ebuild

@@ -19,7 +19,7 @@ RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	dev-libs/libxml2
 	dev-db/sqlite:3[fts3(+),icu?]
-	dev-db/wxsqlite3:${WX_GTK_VER}
+	dev-db/wxsqlite3
 	app-arch/bzip2
 	icu? ( dev-libs/icu:= )
 	reader? (

+ 2 - 2
app-text/myrulib/myrulib-9999.ebuild

@@ -8,7 +8,7 @@ inherit eutils wxwidgets git-r3
 
 DESCRIPTION="E-book collection manager"
 HOMEPAGE="http://www.lintest.ru/wiki/MyRuLib"
-EGIT_REPO_URI="https://github.com/lintest/myrulib"
+EGIT_REPO_URI="https://github.com/vitlav/myrulib"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -19,7 +19,7 @@ RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	dev-libs/libxml2
 	dev-db/sqlite:3[fts3(+),icu?]
-	dev-db/wxsqlite3:${WX_GTK_VER}
+	dev-db/wxsqlite3
 	app-arch/bzip2
 	icu? ( dev-libs/icu:= )
 	reader? (

+ 1 - 1
dev-erlang/cache_tab/cache_tab-1.0.12.ebuild

@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ppc ~sparc x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 
 DEPEND=">=dev-erlang/p1_utils-1.0.10
 	>=dev-lang/erlang-17.1"

+ 0 - 1
dev-erlang/eimp/eimp-1.0.2.ebuild

@@ -20,4 +20,3 @@ RDEPEND="media-libs/gd[png,jpeg,webp]
 DEPEND="${RDEPEND}"
 
 DOCS=( README.md LICENSE.txt )
-

+ 0 - 1
dev-util/valgrind/valgrind-3.13.0-r1.ebuild

@@ -36,7 +36,6 @@ src_prepare() {
 
 	# backported from upstream
 	eapply "${FILESDIR}"/${P}-xml-socket.patch
-	
 
 	# Allow users to test their own patches
 	eapply_user

+ 1 - 1
net-dialup/pptpclient/pptpclient-1.10.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"

+ 2 - 2
net-im/ejabberd/ejabberd-17.12.ebuild

@@ -5,7 +5,7 @@ EAPI=6
 
 SSL_CERT_MANDATORY=1
 
-inherit eutils autotools pam rebar ssl-cert systemd
+inherit eutils pam rebar ssl-cert systemd
 
 DESCRIPTION="Robust, scalable and extensible XMPP server"
 HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
@@ -14,7 +14,7 @@ SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="mssql? ( odbc )"
 # TODO: Add 'tools' flag.
 IUSE="captcha debug full-xml graphics hipe ldap mssql mysql nls odbc pam postgres redis

+ 4 - 8
net-im/swift/swift-9999.ebuild

@@ -3,11 +3,12 @@
 
 EAPI=6
 SCONS_MIN_VERSION="1.2"
-LANGS=" ca cs de es fr gl he hu nl pl ru se sk sv"
+PLOCALES="ca cs de en es fr gl he hu nl pl ru sk sv"
+PLOCALE_BACKUP="en"
 
 [[ ${PV} = *9999* ]] && VCS_ECLASS="git-r3" || VCS_ECLASS=""
 
-inherit scons-utils toolchain-funcs gnome2-utils ${VCS_ECLASS}
+inherit l10n scons-utils toolchain-funcs gnome2-utils ${VCS_ECLASS}
 
 DESCRIPTION="Qt5 jabber (xmpp) client"
 HOMEPAGE="http://swift.im/"
@@ -27,7 +28,6 @@ else
 	KEYWORDS=""
 fi
 IUSE="avahi debug hunspell icu test"
-IUSE+="${LANGS// / linguas_}"
 
 RDEPEND="
 	avahi? ( net-dns/avahi )
@@ -52,11 +52,7 @@ src_prepare() {
 	rm -rf Boost CAres DocBook Expat LCov Ldns LibMiniUPnPc LibIDN LibNATPMP OpenSSL SCons SQLite Unbound ZLib || die
 	popd || die
 
-	for x in ${LANGS}; do
-		if use !linguas_${x}; then
-			rm -f Swift/Translations/swift_${x}.ts || die
-		fi
-	done
+	l10n_for_each_disabled_locale_do rm -f
 
 	eapply_user
 }

+ 3 - 4
net-im/swiften/swiften-9999.ebuild

@@ -1,13 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
+
 SCONS_MIN_VERSION="1.2"
-LANGS=" ca cs de es fr gl he hu nl pl ru se sk sv"
 
 [[ ${PV} = *9999* ]] && VCS_ECLASS="git-r3" || VCS_ECLASS=""
 
-inherit eutils scons-utils toolchain-funcs ${VCS_ECLASS}
+inherit scons-utils toolchain-funcs ${VCS_ECLASS}
 
 DESCRIPTION="Just a perfect C++ XMPP library"
 HOMEPAGE="http://swift.im/"
@@ -31,7 +31,6 @@ else
 	KEYWORDS=""
 fi
 IUSE="avahi debug doc examples test"
-IUSE+="${LANGS// / linguas_}"
 PATCHES=( ${FILESDIR}/swiften-libdir-9999.patch )
 
 RDEPEND="

+ 1 - 1
net-misc/aseman-qt-tools/aseman-qt-tools-9999.ebuild

@@ -26,7 +26,7 @@ DEPEND="
 	dev-qt/qtquickcontrols:5
 	dev-qt/qtpositioning:5
 	dev-qt/qtsensors:5
-	dev-libs/qtkeychain[qt5]
+	dev-libs/qtkeychain
 "
 RDEPEND="${DEPEND}"
 

+ 0 - 1
net-voip/linphone/Manifest

@@ -1,2 +1 @@
-DIST linphone-3.11.1.tar.gz 18504096 SHA256 dc88ef3d311495b9db6041f2ed7b99f6b00a91339c1612e63b4071a4f0a0404e SHA512 c5ca879b7328425e637dca2479461f64c00ee2dec7e6345cacbf144d5ce8a0a0266f2f42a6b7a9c24ebcd186337dd695e09ec3bf0a2cd5ecc854c0bfb5b99468 WHIRLPOOL 937c5ea57a022fee477621915a292f8bb92b023b7354fdb78b3a2a517eaeb6cc2c42e3bda57e4bec37d404bc0a0bc90c20982b6d1f3a4369245c8f7717c8a94d
 DIST linphone-3.12.0.tar.gz 18667484 SHA256 3da4fa55c01aa4a04923a8f028eb7fadeaed094614594e1a12cfb75e4a9f105e SHA512 d4b8c9976c19c468e7c9c9be519840d67861b0d79f8d0d84404ed70cde43434a6be38128f80341862b9f5ec57809bce79060db58550cd8661b31cefe4c6633f0 WHIRLPOOL 0399b0fad6e8dd57f13171ba6154cb0f065ef8b585f8bb9b1742f592075338b22c196513a946fe725dae8666a95186971d44f2e4ed83ae765da5ed7f52b6569b

+ 0 - 126
net-voip/linphone/linphone-3.11.1.ebuild

@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib pax-utils versionator
-
-DESCRIPTION="Video softphone based on the SIP protocol"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="http://www.linphone.org/releases/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# TODO: run-time test for ipv6: does it need mediastreamer[ipv6]?
-IUSE="assistant doc gsm-nonstandard gtk ipv6 ldap libnotify ncurses nls sqlite tools upnp vcard video zlib"
-REQUIRED_USE="assistant? ( gtk )
-	libnotify? ( gtk )"
-
-RDEPEND="
-	>=media-libs/mediastreamer-2.15.0[upnp?,video?]
-	>=net-libs/ortp-0.24.0
-	net-libs/bctoolbox
-	>=net-voip/belle-sip-1.6
-	virtual/udev
-	gtk? (
-		dev-libs/glib:2
-		>=gnome-base/libglade-2.4.0:2.0
-		>=x11-libs/gtk+-2.4.0:2
-		assistant? ( >=net-libs/libsoup-2.26 )
-		libnotify? ( x11-libs/libnotify )
-	)
-	gsm-nonstandard? ( >=media-libs/mediastreamer-2.15.0[gsm] )
-	ldap? (
-		dev-libs/cyrus-sasl
-		net-nds/openldap
-	)
-	ncurses? (
-		sys-libs/readline:0
-		sys-libs/ncurses:0
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	tools? ( dev-libs/libxml2 )
-	upnp? ( net-libs/libupnp:0 )
-	vcard? ( net-voip/belcard )
-	video? ( >=media-libs/mediastreamer-2.15.0[v4l] )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/sgmltools-lite )
-	nls? ( dev-util/intltool )
-"
-
-IUSE_LINGUAS=" fr it de he ja es pl cs nl sr sv pt_BR hu ru zh_CN"
-IUSE="${IUSE}${IUSE_LINGUAS// / linguas_}"
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses ; then
-		ewarn "gtk and ncurses are disabled."
-		ewarn "At least one of these use flags are needed to get a front-end."
-		ewarn "Only liblinphone is going to be installed."
-	fi
-
-	strip-linguas ${IUSE_LINGUAS}
-}
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}"/${PN}-nls.patch \
-		"${FILESDIR}"/${PN}-no-cam-crash-fix.patch
-
-	# variable causes "command not found" warning and is not
-	# needed anyway
-	sed -i \
-		-e 's/$(ACLOCAL_MACOS_FLAGS)//' Makefile.am || die
-
-	# fix path to use lib64
-	# and lime actually does not depend on polarssl (upstream bug)
-	sed -i \
-		-e "s:lib\(/liblinphone\):$(get_libdir)\1:" \
-		-e "s:found_polarssl=no:found_polarssl=yes:" \
-		configure.ac || die "patching configure.ac failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc manual)
-		$(use_enable doc doxygen)
-		$(use_enable nls)
-		--disable-static
-		$(use_enable ldap)
-		$(use_enable ncurses console_ui)
-		$(use_enable tools)
-		$(use_enable upnp)
-		$(use_enable gtk gtk_ui)
-		$(use_enable libnotify notify)
-		--enable-lime
-		$(use_enable ipv6)
-		--disable-truespeech
-		$(use_enable gsm-nonstandard nonstandard-gsm)
-		--disable-speex
-		# seems not used, TODO: ask in ml
-		$(use_enable video)
-		--disable-zrtp
-		$(use_enable assistant)
-		# we don't want -Werror
-		--disable-strict
-		# don't bundle libs
-		--enable-external-mediastreamer
-		$(use_enable sqlite sqlite-storage)
-		--enable-external-ortp
-		$(use_enable vcard)
-		$(use_enable zlib)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdocdir="/usr/share/doc/${PF}" install # 415161
-	dodoc AUTHORS BUGS ChangeLog NEWS README.md README.arm TODO
-	pax-mark m "${ED%/}/usr/bin/linphone"
-}

+ 7 - 7
net-voip/linphone/linphone-3.12.0.ebuild

@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+PLOCALES="ar cs de es fi fr he hu it ja lt nb-NO nl pl pt-BR ru sr sv tr zh-CN zh-TW"
 
-inherit eutils multilib pax-utils versionator cmake-utils
+inherit l10n multilib pax-utils versionator cmake-utils
 
 DESCRIPTION="Video softphone based on the SIP protocol"
 HOMEPAGE="http://www.linphone.org/"
@@ -54,28 +55,27 @@ DEPEND="${RDEPEND}
 	nls? ( dev-util/intltool )
 "
 
-IUSE_LINGUAS=" fr it de he ja es pl cs nl sr sv pt_BR hu ru zh_CN"
-IUSE="${IUSE}${IUSE_LINGUAS// / linguas_}"
-
 pkg_setup() {
 	if ! use gtk && ! use ncurses ; then
 		ewarn "gtk and ncurses are disabled."
 		ewarn "At least one of these use flags are needed to get a front-end."
 		ewarn "Only liblinphone is going to be installed."
 	fi
-
-	strip-linguas ${IUSE_LINGUAS}
+	l10n_find_plocales_changes po "" .po
 }
 
 src_prepare() {
 	default
-	epatch "${FILESDIR}"/${PN}-nls.patch \
+	eapply "${FILESDIR}"/${PN}-nls.patch \
 		"${FILESDIR}"/${PN}-no-cam-crash-fix.patch
 
 	# another workaround for upstream bug
 	printf "#define LIBLINPHONE_GIT_VERSION \"${PV}\"\n" > "${S}"/coreapi/gitversion.h
 	printf "#define LIBLINPHONE_GIT_VERSION \"${PV}\"\n" > "${S}"/coreapi/liblinphone_gitversion.h
 
+	rm_locale() { rm -f ${1/-/_}; }
+	l10n_for_each_disabled_locale_do rm_locale
+
 	cmake-utils_src_prepare
 }
 

+ 1 - 1
profiles/license_groups

@@ -1 +1 @@
-EULA  Cisco_EULA EULA JUNGLE_DISK SMLABS-EULA
+EULA  Cisco_EULA EULA JUNGLE_DISK SMLABS-EULA Samsung-EULA

+ 11 - 7
www-plugins/freshplayerplugin/metadata.xml

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>grknight@gentoo.org</email>
-    <name>Brian Evans</name>
-  </maintainer>
-  <use>
-    <flag name='gtk3'>Use gtk3 instead of gtk2</flag>
-  </use>
+	<maintainer type="person">
+		<email>grknight@gentoo.org</email>
+		<name>Brian Evans</name>
+	</maintainer>
+	<use>
+		<flag name="gles2">Use system GLESv2 libraries instead of ANGLE for shader translation</flag>
+		<flag name="v4l">Use libv4l2 for colorspace conversion</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">i-rinat/freshplayerplugin</remote-id>
+	</upstream>
 </pkgmetadata>