Psi and networkmanager-l2tp ebuilds updated for better compatibility with portage

net-im/psi/psi-9999.ebuild

@@ -82,12 +82,12 @@ DEPEND="${RDEPEND}
 	qt5? ( dev-qt/linguist-tools )
 "
 PDEPEND="
-	crypt? ( >=app-crypt/qca-2.1.0[gpg] )
+	crypt? ( app-crypt/qca[gpg] )
 	jingle? (
 		net-im/psimedia[extras?]
-		>=app-crypt/qca-2.1.0.3[openssl]
+		app-crypt/qca[ssl]
 	)
-	ssl? ( >=app-crypt/qca-2.1.0.3[openssl] )
+	ssl? ( app-crypt/qca[ssl] )
 "
 RESTRICT="test"
 
@@ -98,7 +98,7 @@ pkg_setup() {
 		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 "Take a look at homepage for more info: http://code.google.com/p/psi-dev"
+		ewarn "Take a look at homepage for more info: http://psi-plus.com/"
 		echo
 
 		if use iconsets; then

net-misc/networkmanager-l2tp/networkmanager-l2tp-9999.ebuild

@@ -19,7 +19,7 @@ EGIT_REPO_URI="https://github.com/nm-l2tp/network-manager-l2tp"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
+IUSE="gnome static-libs"
 
 RDEPEND="
 	>=net-misc/networkmanager-1.0[ppp]
@@ -42,19 +42,19 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
 	mkdir -p m4
-	intltoolize --copy --force --automake
+	intltoolize --copy --force --automake 
 	eautoreconf
 }
 
 src_configure() {
-	ECONF="--with-pppd-plugin-dir=/usr/lib/pppd/2.4.7
-		$(use_with gnome)"
+	ECONF="--with-pppd-plugin-dir=${EPREFIX}/usr/$(get_libdir)/pppd/2.4.7
+		$(use_with gnome)
+		$(use_enable static-libs static)"
 
 	econf ${ECONF}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README.md || die "dodoc failed"
+	emake DESTDIR="${ED}" install
+	dodoc AUTHORS ChangeLog NEWS README.md
 }