* [gentoo-commits] repo/gentoo:master commit in: app-cdr/nero/, app-cdr/nero/files/
@ 2016-10-29 11:30 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2016-10-29 11:30 UTC (permalink / raw
To: gentoo-commits
commit: 8030a7cc077e81477d0a28130c9f87989868865d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 11:26:40 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 11:30:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8030a7cc
app-cdr/nero: Fix QA violations
Gentoo-bug: 593382
* EAPI=6
* Take over maintainership of package
* Fix .desktop files
Package-Manager: portage-2.3.2
.../files/nero-4.0.0.0b-qa-desktop-files.patch | 23 ++++++++++
app-cdr/nero/metadata.xml | 5 ++-
...-4.0.0.0b-r1.ebuild => nero-4.0.0.0b-r2.ebuild} | 50 ++++++++++++----------
3 files changed, 55 insertions(+), 23 deletions(-)
diff --git a/app-cdr/nero/files/nero-4.0.0.0b-qa-desktop-files.patch b/app-cdr/nero/files/nero-4.0.0.0b-qa-desktop-files.patch
new file mode 100644
index 00000000..2145678
--- /dev/null
+++ b/app-cdr/nero/files/nero-4.0.0.0b-qa-desktop-files.patch
@@ -0,0 +1,23 @@
+Fix QA issues caused by outdated .desktop files:
+* QA Notice: This package installs one or more .desktop files that do not
+* pass validation.
+*
+* /usr/share/applications/nerolinux.desktop: warning:
+* key "Categories" in group "Desktop Entry" contains a deprecated value "Application"
+
+--- a/usr/share/applications/nerolinux.desktop
++++ b/usr/share/applications/nerolinux.desktop
+@@ -53,4 +53,4 @@
+ Icon=nerolinux
+ MimeType=application/x-cd-image;application/x-iso;application/x-cue;application/x-nero-disc-image;application/x-nero-linux-compilation
+ Terminal=false
+-Categories=Application;AudioVideo;DiscBurning;Recorder;
++Categories=AudioVideo;DiscBurning;Recorder;
+--- a/usr/share/applications/nerolinuxexpress.desktop
++++ b/usr/share/applications/nerolinuxexpress.desktop
+@@ -53,4 +53,4 @@
+ Icon=nerolinuxexpress
+ MimeType=application/x-cd-image;application/x-iso;application/x-cue;application/x-nero-disc-image;application/x-nero-linux-compilation
+ Terminal=false
+-Categories=Application;AudioVideo;DiscBurning;Recorder;
++Categories=AudioVideo;DiscBurning;Recorder;
diff --git a/app-cdr/nero/metadata.xml b/app-cdr/nero/metadata.xml
index 6f49eba..70f78a5 100644
--- a/app-cdr/nero/metadata.xml
+++ b/app-cdr/nero/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>soap@gentoo.org</email>
+ <name>David Seifert</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-cdr/nero/nero-4.0.0.0b-r1.ebuild b/app-cdr/nero/nero-4.0.0.0b-r2.ebuild
similarity index 62%
rename from app-cdr/nero/nero-4.0.0.0b-r1.ebuild
rename to app-cdr/nero/nero-4.0.0.0b-r2.ebuild
index a87e4c1..c8481b7 100644
--- a/app-cdr/nero/nero-4.0.0.0b-r1.ebuild
+++ b/app-cdr/nero/nero-4.0.0.0b-r2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-inherit eutils fdo-mime rpm multilib gnome2-utils linux-info
+EAPI=6
+
+inherit eutils fdo-mime gnome2-utils linux-info rpm
DESCRIPTION="Nero Burning ROM for Linux"
HOMEPAGE="http://nerolinux.nero.com"
SRC_URI="
x86? ( ${PN}linux-${PV}-x86.rpm )
- amd64? ( ${PN}/${PN}linux-${PV}-x86_64.rpm )
-"
+ amd64? ( ${PN}/${PN}linux-${PV}-x86_64.rpm )"
LICENSE="Nero-EULA-US"
SLOT="0"
@@ -23,33 +23,34 @@ RDEPEND="
x11-libs/gtk+:2
x11-libs/libX11
x11-libs/libXinerama
- x11-libs/pango[X]
-"
+ x11-libs/pango[X]"
DEPEND=""
-QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/*
- opt/${PN}/$(get_libdir)/libNeroAPI.so"
-QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*"
-QA_PREBUILT="opt/${PN}/${PN}.*
- opt/${PN}/${PN}
- opt/${PN}/$(get_libdir)/.*so
- opt/${PN}/$(get_libdir)/${PN}/*
- opt/${PN}/$(get_libdir)/${PN}/plug-ins/*
- usr/share/${PN}/helpers/splash/nerosplash"
-
S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-qa-desktop-files.patch )
+
pkg_nofetch() {
local nero_arch
use amd64 && nero_arch=64
use x86 && ner_arch=32
- einfo "Please visit http://www.nero.com/enu/downloads/previous-versions/download-linux4-update.php"
+ einfo "Please visit https://www.nero.com/enu/downloads/previous-versions/download-linux4-update.php"
einfo " and use the 'RPM package ${nero_arch} bit' download then place ${A}"
einfo " into ${DISTDIR}"
}
pkg_setup() {
+ QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/*
+ opt/${PN}/$(get_libdir)/libNeroAPI.so"
+ QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*"
+ QA_PREBUILT="opt/${PN}/${PN}.*
+ opt/${PN}/${PN}
+ opt/${PN}/$(get_libdir)/.*so
+ opt/${PN}/$(get_libdir)/${PN}/*
+ opt/${PN}/$(get_libdir)/${PN}/plug-ins/*
+ usr/share/${PN}/helpers/splash/nerosplash"
+
CONFIG_CHECK="~CHR_DEV_SG"
linux-info_pkg_setup
}
@@ -72,15 +73,19 @@ src_install() {
doicon usr/share/pixmaps/nerolinux.xpm
doman usr/share/man/man1/*
- use doc && dodoc usr/share/doc/nero/*.pdf
+
+ use doc && local DOCS+=( usr/share/doc/nero/*.pdf )
+ einstalldocs
make_wrapper nero ./nero /opt/nero /opt/${PN}/$(get_libdir)
make_wrapper nerocmd ./nerocmd /opt/nero /opt/nero/$(get_libdir)
make_wrapper neroexpress ./neroexpress /opt/nero /opt/nero/$(get_libdir)
- # This is a ugly hack to fix burning in x86_64.
+ # This is a ugly hack to fix burning in x86_64
# http://club.cdfreaks.com/showthread.php?t=218041
- use amd64 && cp usr/share/nero/Nero*.txt "${D}"/opt/nero/$(get_libdir)/nero
+ if use amd64; then
+ cp usr/share/nero/Nero*.txt "${ED%/}"/opt/nero/$(get_libdir)/nero || die
+ fi
}
pkg_preinst() {
@@ -91,7 +96,8 @@ pkg_postinst() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
gnome2_icon_cache_update
- nero --perform-post-installation
+
+ nero --perform-post-installation || die
}
pkg_postrm() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-cdr/nero/, app-cdr/nero/files/
@ 2018-12-29 12:24 Mikle Kolyada
0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada @ 2018-12-29 12:24 UTC (permalink / raw
To: gentoo-commits
commit: 082dd610afe13e0cf33dd48865d033036a0a3698
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 12:23:51 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 12:24:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=082dd610
app-cdr/nero: remove last rited package
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-cdr/nero/Manifest | 2 -
.../files/nero-4.0.0.0b-qa-desktop-files.patch | 23 -----
app-cdr/nero/metadata.xml | 8 --
app-cdr/nero/nero-4.0.0.0b-r2.ebuild | 106 ---------------------
4 files changed, 139 deletions(-)
diff --git a/app-cdr/nero/Manifest b/app-cdr/nero/Manifest
deleted file mode 100644
index 2e4bace03f2..00000000000
--- a/app-cdr/nero/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST nerolinux-4.0.0.0b-x86.rpm 17391650 BLAKE2B 4d78b4fa09ba45709af0ff87dea28cf24e1d04f8dee2fab1432215ee0707e398f9564c05f5f6999da912ff1e163d08687c8db99498a0c90e469a524684543759 SHA512 2168f87d329054803b6ac33f671aeaee59f5b9e22fb07c23347ae519d63fc4547db9d6e535f58468f2fba4ac274399f934a34d828892ae93e75cf2c2b46d44c7
-DIST nerolinux-4.0.0.0b-x86_64.rpm 17559298 BLAKE2B 5e7cc99c4710bcafbc9b6eebfa7b5670534a4f6b4011d3ff756fc936375b7ef6a466c474f3065516a09455b8bf35b8f3db145aedca497293e2915a53ef2dbae5 SHA512 0e5d6c1c9f99b6c149a72f544c6ec7608e9ded4c0d31a7754785a0d16fb3ad77d9d82cc210617104ac6dc2470b3df778cdf132be86a0591813e7a867d3c75a51
diff --git a/app-cdr/nero/files/nero-4.0.0.0b-qa-desktop-files.patch b/app-cdr/nero/files/nero-4.0.0.0b-qa-desktop-files.patch
deleted file mode 100644
index 2145678db0f..00000000000
--- a/app-cdr/nero/files/nero-4.0.0.0b-qa-desktop-files.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix QA issues caused by outdated .desktop files:
-* QA Notice: This package installs one or more .desktop files that do not
-* pass validation.
-*
-* /usr/share/applications/nerolinux.desktop: warning:
-* key "Categories" in group "Desktop Entry" contains a deprecated value "Application"
-
---- a/usr/share/applications/nerolinux.desktop
-+++ b/usr/share/applications/nerolinux.desktop
-@@ -53,4 +53,4 @@
- Icon=nerolinux
- MimeType=application/x-cd-image;application/x-iso;application/x-cue;application/x-nero-disc-image;application/x-nero-linux-compilation
- Terminal=false
--Categories=Application;AudioVideo;DiscBurning;Recorder;
-+Categories=AudioVideo;DiscBurning;Recorder;
---- a/usr/share/applications/nerolinuxexpress.desktop
-+++ b/usr/share/applications/nerolinuxexpress.desktop
-@@ -53,4 +53,4 @@
- Icon=nerolinuxexpress
- MimeType=application/x-cd-image;application/x-iso;application/x-cue;application/x-nero-disc-image;application/x-nero-linux-compilation
- Terminal=false
--Categories=Application;AudioVideo;DiscBurning;Recorder;
-+Categories=AudioVideo;DiscBurning;Recorder;
diff --git a/app-cdr/nero/metadata.xml b/app-cdr/nero/metadata.xml
deleted file mode 100644
index 70f78a5392d..00000000000
--- a/app-cdr/nero/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>soap@gentoo.org</email>
- <name>David Seifert</name>
- </maintainer>
-</pkgmetadata>
diff --git a/app-cdr/nero/nero-4.0.0.0b-r2.ebuild b/app-cdr/nero/nero-4.0.0.0b-r2.ebuild
deleted file mode 100644
index bed8d5a44fb..00000000000
--- a/app-cdr/nero/nero-4.0.0.0b-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils linux-info rpm xdg-utils
-
-DESCRIPTION="Nero Burning ROM for Linux"
-HOMEPAGE="http://nerolinux.nero.com"
-SRC_URI="
- x86? ( ${PN}linux-${PV}-x86.rpm )
- amd64? ( ${PN}/${PN}linux-${PV}-x86_64.rpm )"
-
-LICENSE="Nero-EULA-US"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RESTRICT="strip mirror test fetch"
-
-RDEPEND="
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXinerama
- x11-libs/pango[X]"
-DEPEND=""
-
-S="${WORKDIR}"
-
-PATCHES=( "${FILESDIR}"/${P}-qa-desktop-files.patch )
-
-pkg_nofetch() {
- local nero_arch
- use amd64 && nero_arch=64
- use x86 && ner_arch=32
-
- einfo "Please visit https://www.nero.com/enu/downloads/previous-versions/download-linux4-update.php"
- einfo " and use the 'RPM package ${nero_arch} bit' download then place ${A}"
- einfo " into ${DISTDIR}"
-}
-
-pkg_setup() {
- QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/*
- opt/${PN}/$(get_libdir)/libNeroAPI.so"
- QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*"
- QA_PREBUILT="opt/${PN}/${PN}.*
- opt/${PN}/${PN}
- opt/${PN}/$(get_libdir)/.*so
- opt/${PN}/$(get_libdir)/${PN}/*
- opt/${PN}/$(get_libdir)/${PN}/plug-ins/*
- usr/share/${PN}/helpers/splash/nerosplash"
-
- CONFIG_CHECK="~CHR_DEV_SG"
- linux-info_pkg_setup
-}
-
-src_install() {
- insinto /etc
- doins -r etc/nero
-
- insinto /opt/nero
- doins -r usr/$(get_libdir)
- dosym /opt/nero/$(get_libdir)/nero /usr/$(get_libdir)/nero
-
- exeinto /opt/nero
- doexe usr/bin/nero*
-
- insinto /usr/share
- doins -r usr/share/nero usr/share/locale usr/share/icons
-
- domenu usr/share/applications/*.desktop
- doicon usr/share/pixmaps/nerolinux.xpm
-
- doman usr/share/man/man1/*
-
- use doc && local DOCS+=( usr/share/doc/nero/*.pdf )
- einstalldocs
-
- make_wrapper nero ./nero /opt/nero /opt/${PN}/$(get_libdir)
- make_wrapper nerocmd ./nerocmd /opt/nero /opt/nero/$(get_libdir)
- make_wrapper neroexpress ./neroexpress /opt/nero /opt/nero/$(get_libdir)
-
- # This is a ugly hack to fix burning in x86_64
- # http://club.cdfreaks.com/showthread.php?t=218041
- if use amd64; then
- cp usr/share/nero/Nero*.txt "${ED%/}"/opt/nero/$(get_libdir)/nero || die
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-
- nero --perform-post-installation || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-29 12:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-29 11:30 [gentoo-commits] repo/gentoo:master commit in: app-cdr/nero/, app-cdr/nero/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2018-12-29 12:24 Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox