Browse Source

repoman fixes

Sergey Ilinykh 8 years ago
parent
commit
31e8c0e653

+ 1 - 1
dev-ml/ocaml-curses/ocaml-curses-1.0.3.ebuild

@@ -7,7 +7,7 @@ inherit eutils autotools findlib
 
 DESCRIPTION="Curses / ncurses  bindings for the Objective Caml  language."
 HOMEPAGE="http://www.nongnu.org/ocaml-tmk/"
-SRC_URI="http://download.savannah.nongnu.org/releases/ocaml-tmk/${P}.tar.gz"
+SRC_URI="mirror://nongnu/ocaml-tmk/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"

+ 0 - 3
net-im/psi-plugins-meta/metadata.xml

@@ -13,7 +13,6 @@
     <flag name="attention">Enable Psi plugin for making attention (XEP-0224)</flag>
     <flag name="autoreply">Enable Psi plugin to gnerate automatic replies.</flag>
     <flag name="birthdayreminder">Enable Psi plugin to remind contact's birthdays</flag>
-    <flag name="captchaforms">Enable Psi plugin to show MUC's captcha</flag>
     <flag name="chess">Enable Psi plugin to play chess with your friends</flag>
     <flag name="cleaner">Enable Psi plugin for profile cleaning for specified contacts.</flag>
     <flag name="clientswitcher">Enable Psi plugin for client version masking</flag>
@@ -22,8 +21,6 @@
     <flag name="enummessages">Enable Psi plugin to enumarate messages added to chat</flag>
     <flag name="extendedmenu">Enable Psi plugin which adds special submenu to contacts</flag>
     <flag name="extendedoptions">Enable Psi plugin for UI for some hidden options</flag>
-    <flag name="gmailservice">Enable Psi plugin for Gmail notification</flag>
-    <flag name="gnome3support">Enable Psi plugin for Gnome 3 support</flag>
     <flag name="gnupg">Enable Psi plugin for GnuPG message encryption</flag>
     <flag name="gomokugame">Enable Psi plugin for Gomoku game</flag>
     <flag name="historykeeper">Enable Psi plugin to keep certain contacts history clean</flag>

+ 1 - 1
net-im/psi-plugins-meta/psi-plugins-meta-9999.ebuild

@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="attention autoreply birthdayreminder captchaforms chess cleaner clientswitcher conferencelogger contentdownloader enummessages extendedmenu extendedoptions gmailservice gnome3support gnupg gomokugame historykeeper httpupload icqdie image imagepreview jabberdisk juick messagefilter otr pepchangenotify psto qipxstatuses screenshot skins stopspam storagenotes translate videostatus watcher"
+IUSE="attention autoreply birthdayreminder chess cleaner clientswitcher conferencelogger contentdownloader enummessages extendedmenu extendedoptions gnupg gomokugame historykeeper httpupload icqdie image imagepreview jabberdisk juick messagefilter otr pepchangenotify psto qipxstatuses screenshot skins stopspam storagenotes translate videostatus watcher"
 
 RDEPEND=""
 

+ 20 - 38
net-im/psi/psi-9999.ebuild

@@ -20,7 +20,7 @@ HOMEPAGE="http://psi-im.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="aspell crypt dbus debug doc enchant extras +hunspell jingle iconsets +qt4 qt5 spell sql ssl xscreensaver
+IUSE="aspell crypt dbus debug doc enchant extras +hunspell jingle iconsets spell sql ssl xscreensaver
 +plugins whiteboarding webengine webkit"
 
 REQUIRED_USE="
@@ -31,7 +31,6 @@ REQUIRED_USE="
 	iconsets? ( extras )
 	sql? ( extras )
 	webengine? ( webkit )
-	^^ ( qt4 qt5 )
 "
 
 RDEPEND="
@@ -43,35 +42,20 @@ RDEPEND="
 		aspell? ( app-text/aspell )
 	)
 	xscreensaver? ( x11-libs/libXScrnSaver )
-	qt4? (
-		dev-qt/qtgui:4
-		dbus? ( dev-qt/qtdbus:4 )
-		app-crypt/qca:2[qt4]
-		whiteboarding? ( dev-qt/qtsvg:4 )
-		webkit? ( dev-qt/qtwebkit:4 )
-		extras? (
-			sql? (
-				dev-qt/qtsql:4
-				dev-libs/qjson
-			)
-		)
+	dev-qt/qtgui:5
+	dev-qt/qtxml:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtx11extras:5
+	dbus? ( dev-qt/qtdbus:5 )
+	app-crypt/qca:2[qt5]
+	whiteboarding? ( dev-qt/qtsvg:5 )
+	webkit? (
+		webengine? ( >=dev-qt/qtwebengine-5.7:5 )
+		!webengine? ( dev-qt/qtwebkit:5 )
 	)
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtx11extras:5
-		dbus? ( dev-qt/qtdbus:5 )
-		app-crypt/qca:2[qt5]
-		whiteboarding? ( dev-qt/qtsvg:5 )
-		webkit? (
-			webengine? ( >=dev-qt/qtwebengine-5.7:5 )
-			!webengine? ( dev-qt/qtwebkit:5 )
-		)
-		extras? (
-			sql? ( dev-qt/qtsql:5 )
-		)
+	extras? (
+		sql? ( dev-qt/qtsql:5 )
 	)
 "
 DEPEND="${RDEPEND}
@@ -80,7 +64,7 @@ DEPEND="${RDEPEND}
 	)
 	doc? ( app-doc/doxygen )
 	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools )
+	dev-qt/linguist-tools
 "
 PDEPEND="
 	crypt? ( app-crypt/qca[gpg] )
@@ -97,8 +81,8 @@ pkg_setup() {
 	if use extras; then
 		MY_PN=psi-plus
 		echo
-		ewarn "You're about to build heavily patched version of Psi called Psi+."
-		ewarn "It has really nice features but still is under heavy development."
+		ewarn "You're about to build patched version of Psi called Psi+."
+		ewarn "It has new nice features not yet included to Psi."
 		ewarn "Take a look at homepage for more info: http://psi-plus.com/"
 		echo
 
@@ -172,8 +156,7 @@ src_configure() {
 		--disable-growl
 	)
 
-	use qt4 && CONF+=(--qtdir="$(qt4_get_bindir)/..")
-	use qt5 && CONF+=(--qtdir="$(qt5_get_bindir)/..")
+	CONF+=(--qtdir="$(qt5_get_bindir)/..")
 
 	use dbus || CONF+=("--disable-qdbus")
 	use debug && CONF+=("--debug")
@@ -194,8 +177,7 @@ src_configure() {
 	elog ./configure "${CONF[@]}"
 	./configure "${CONF[@]}"
 
-	use qt4 && eqmake4 psi.pro
-	use qt5 && eqmake5 psi.pro
+	eqmake5 psi.pro
 }
 
 src_compile() {
@@ -220,7 +202,7 @@ src_install() {
 	use doc && dohtml -r doc/api
 
 	# install translations
-	local mylrelease="$(qt$(usex qt5 5 4)_get_bindir)"/lrelease
+	local mylrelease="$(qt5_get_bindir)"/lrelease
 	cd "${WORKDIR}/psi-l10n"
 	insinto /usr/share/${MY_PN}
 	install_locale() {

+ 1 - 1
net-libs/libexosip/libexosip-5.0.0.ebuild

@@ -10,7 +10,7 @@ MY_PV=${PV}
 MY_P=${PN}2-${MY_PV}
 DESCRIPTION="Simple API for SIP protocol for multimedia session establishement"
 HOMEPAGE="https://savannah.nongnu.org/projects/exosip/"
-SRC_URI="http://download.savannah.nongnu.org/releases/exosip/${MY_P}.tar.gz"
+SRC_URI="mirror://nongnu/exosip/${MY_P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0/$(get_version_component_range 1-2)"