Use PN.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 7 insertions, 83 deletions

diff --git a/www-client/opera-developer/ChangeLog b/www-client/opera-developer/ChangeLog
index 533f7aa3b717..9af14f30ad77 100644
--- a/www-client/opera-developer/ChangeLog
+++ b/www-client/opera-developer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/opera-developer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-developer/ChangeLog,v 1.7 2014/09/10 21:21:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-developer/ChangeLog,v 1.8 2014/09/15 14:32:49 jer Exp $
+
+  15 Sep 2014; Jeroen Roovers <jer@gentoo.org>
+  -opera-developer-25.0.1613.1.ebuild, opera-developer-25.0.1614.5.ebuild:
+  Use PN.
 
 *opera-developer-25.0.1614.5 (10 Sep 2014)
 
diff --git a/www-client/opera-developer/opera-developer-25.0.1613.1.ebuild b/www-client/opera-developer/opera-developer-25.0.1613.1.ebuild
deleted file mode 100644
index ef3fdcd2bae4..000000000000
--- a/www-client/opera-developer/opera-developer-25.0.1613.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-developer/opera-developer-25.0.1613.1.ebuild,v 1.1 2014/09/05 15:26:35 jer Exp $
-
-EAPI=5
-CHROMIUM_LANGS="af ar az be bg bn ca cs da de el en_GB en_US es_LA es fi fr_CA
-	fr fy gd hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR
-	pt_PT ro ru sk sr sv sw ta te th tl tr uk uz vi zh_CN zh_TW zu"
-inherit chromium multilib unpacker
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="http://get.geo.opera.com/pub/"
-SRC_URI="
-	amd64? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
-"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/openssl-1.0.1:0
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/freetype
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/libcap
-	virtual/libudev
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-	rm -r usr/lib || die
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/opera-developer.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	dodir /usr/$(get_libdir)/${PN}/lib
-	dosym /usr/$(get_libdir)/libudev.so /usr/$(get_libdir)/${PN}/lib/libudev.so.0
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
diff --git a/www-client/opera-developer/opera-developer-25.0.1614.5.ebuild b/www-client/opera-developer/opera-developer-25.0.1614.5.ebuild
index 6d7fac465ef4..6a669e4e9895 100644
--- a/www-client/opera-developer/opera-developer-25.0.1614.5.ebuild
+++ b/www-client/opera-developer/opera-developer-25.0.1614.5.ebuild
@@ -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/www-client/opera-developer/opera-developer-25.0.1614.5.ebuild,v 1.1 2014/09/10 21:21:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-developer/opera-developer-25.0.1614.5.ebuild,v 1.2 2014/09/15 14:32:49 jer Exp $
 
 EAPI=5
 CHROMIUM_LANGS="af ar az be bg bn ca cs da de el en_GB en_US es_LA es fi fr_CA
@@ -68,7 +68,7 @@ src_prepare() {
 
 	sed -i \
 		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/opera-developer.desktop || die
+		usr/share/applications/${PN}.desktop || die
 }
 
 src_install() {