commit: 329eda868a0e3d3a47784abbc9ed143a6d99bdd4
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 30 07:11:33 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 07:14:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=329eda86
media-gfx/smile: Remove last-rited pkg, #620704
media-gfx/smile/Manifest | 1 -
media-gfx/smile/files/fix_docs-0.9.10.patch | 18 ----
media-gfx/smile/files/fix_installation.patch | 122 ---------------------------
media-gfx/smile/metadata.xml | 5 --
media-gfx/smile/smile-1.0-r1.ebuild | 60 -------------
profiles/package.mask | 5 --
6 files changed, 211 deletions(-)
diff --git a/media-gfx/smile/Manifest b/media-gfx/smile/Manifest
deleted file mode 100644
index 76c9aa87388..00000000000
--- a/media-gfx/smile/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST smile-1.0.tar.gz 15103785 SHA256
d6a6f5a2c7bce2dff174c4cb7f09a6326a926416c1ea47c6bdfc592b9cece9bf SHA512
bfec90888c59726a2c95f4429886e60dbbc7e3c846ad32089b5b656751fe9b6d869fa962a47d6748d26eefca4db284263c410e6baa63b441bb50ae6053a0474f
WHIRLPOOL
3e1c068626f868860b6ced372527319c7aead4a6a10879e2a3548605eed702561b95db6578c687b822a5d5a0f9f8ac7549275badcacaa52d7b91c596297eaebc
diff --git a/media-gfx/smile/files/fix_docs-0.9.10.patch
b/media-gfx/smile/files/fix_docs-0.9.10.patch
deleted file mode 100644
index 92eed515055..00000000000
--- a/media-gfx/smile/files/fix_docs-0.9.10.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: smile/helpfrm.cpp
-===================================================================
---- smile.orig/helpfrm.cpp
-+++ smile/helpfrm.cpp
-@@ -26,11 +26,11 @@ helpfrm::helpfrm(QWidget *parent) : QDia
- qDebug() << "LOADING HELP LANGUAGE ... " +
wlpack.left(2);
- if ( wlpack.left(2) == "fr" )
- {
-- webhelp->load(QUrl(wg_tmp_002 +
"/BIB_ManSlide/Help/doc_fr.html"));
-+
webhelp->load(QUrl("/usr/share/doc/smile-0.9.10/doc_fr.html"));
- }
- else
- {
-- webhelp->load(QUrl(wg_tmp_002 +
"/BIB_ManSlide/Help/doc_en.html"));
-+
webhelp->load(QUrl("/usr/share/doc/smile-0.9.10/doc_en.html"));
- }
- }
- configfile.close();
diff --git a/media-gfx/smile/files/fix_installation.patch
b/media-gfx/smile/files/fix_installation.patch
deleted file mode 100644
index 54311c92eb2..00000000000
--- a/media-gfx/smile/files/fix_installation.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -ru smile.ori/mainfrm.cpp smilei/mainfrm.cpp
---- smile.orig/mainfrm.cpp
-+++ smile/mainfrm.cpp
-@@ -187,14 +187,15 @@
- QString wlpack = QLocale::system().name();
- qDebug() << "LOADING LANGUAGE ... smile_" + wlpack.left(2);
- QTranslator *qtTranslator = new QTranslator(this);
-- if (qtTranslator->load("smile_" + wlpack.left(2),
qApp->applicationDirPath()) == true )
-+ if (qtTranslator->load("/usr/share/smile/translations/smile_" +
wlpack.left(2), qApp->applicationDirPath()) == true )
- {
- qApp->installTranslator(qtTranslator);
- }
- else
- {
-- if (qtTranslator->load("smile_en",
qApp->applicationDirPath()) == true )
-+ if
(qtTranslator->load("/usr/share/smile/translations/smile_en",
qApp->applicationDirPath()) == true )
- {
-+ qDebug() << "LOADING FALLBACK (EN) LANGUAGE...";
- qApp->installTranslator(qtTranslator);
- }
- }
-@@ -1639,7 +1640,7 @@
- void mainfrm::f_splash_load()
- {
- QDir tmpdir;
-- tmpdir.setPath(wg_library + "/BIB_ManSlide/Eff_sup/");
-+ tmpdir.setPath("/usr/share/smile/BIB_ManSlide/Eff_sup/");
- QStringList filters;
- filters << "*.mng" << "*.MNG" << "*.gif" << "*.GIF" << "*.png" <<
"*.PNG";
- tmpdir.setNameFilters(filters);
-@@ -1649,11 +1650,11 @@
- foreach (wlfile, tmpdir.entryList(QDir::Files))
- {
- comboeffets->insertItem(positem, wlfile);
-- comboeffets->setItemIcon(positem, QIcon(wg_library +
"/BIB_ManSlide/Eff_sup/" + wlfile));
-+ comboeffets->setItemIcon(positem,
QIcon("/usr/share/smile/BIB_ManSlide/Eff_sup/" + wlfile));
- positem++;
- }
- //
-- tmpdir.setPath(wg_library + "/BIB_ManSlide/Luma/");
-+ tmpdir.setPath("/usr/share/smile/BIB_ManSlide/Luma/");
- //filters << "MINI*.png";
- //tmpdir.setNameFilters(filters);
- positem = 2;
-@@ -1672,14 +1673,14 @@
- if ( wlfile != "crossfade.png" )
- {
- nametra = wlfile.mid(0,wlfile.length() - 4);
-- transpix.load(wg_library +
"/BIB_ManSlide/Luma/" + wlfile);
-+
transpix.load("/usr/share/smile/BIB_ManSlide/Luma/" + wlfile);
- transpix = transpix.scaledToWidth( 128,
Qt::FastTransformation );
- lst_transitions->insertItem(positem,nametra);
- lst_transitions->setItemIcon(positem,
QIcon(transpix));
-
lst_transitions_2->insertItem(positem+1,nametra);
- lst_transitions_2->setItemIcon(positem+1,
QIcon(transpix));
-- table_transitions[positem] = wg_library +
"/BIB_ManSlide/Luma/" + nametra + ".png";
-- loadtra.load(wg_library + "/BIB_ManSlide/Luma/"
+ nametra + ".png");
-+ table_transitions[positem] =
"/usr/share/smile/BIB_ManSlide/Luma/" + nametra + ".png";
-+
loadtra.load("/usr/share/smile/BIB_ManSlide/Luma/" + nametra + ".png");
- table_image_transition[positem-2] = loadtra;
- ++positem;
- }
-@@ -1895,9 +1896,9 @@
- int result = QMessageBox::information(this, "SMILE", tr("Voulez
vous vraiment supprimer cet effet : ") + comboeffets->currentText() ,
tr("Oui"), tr("Non"), 0, 1 );
- if (result == 0)
- {
-- if ( QFile::remove(wg_library + "BIB_ManSlide/Eff_sup/"
+ comboeffets->currentText()) == false )
-+ if (
QFile::remove("/usr/share/smile/BIB_ManSlide/Eff_sup/" +
comboeffets->currentText()) == false )
- {
-- qDebug() << "ERROR REMOVING EFFECT FILE : " <<
wg_library + "BIB_ManSlide/Eff_sup/" + comboeffets->currentText();
-+ qDebug() << "ERROR REMOVING EFFECT FILE : " <<
"/usr/share/smile/BIB_ManSlide/Eff_sup/" + comboeffets->currentText();
- }
- f_reload();
- comboeffets->setCurrentIndex(0);
-@@ -1961,7 +1962,7 @@
- {
- int i = wmyfic.lastIndexOf( '/' );
- outfilename = wmyfic.mid(i + 1, wmyfic.length() - (i + 1));
-- QFile::copy ( wmyfic, wg_library + "BIB_ManSlide/Eff_sup/" +
outfilename );
-+ QFile::copy ( wmyfic, "/usr/share/smile/BIB_ManSlide/Eff_sup/"
+ outfilename );
- f_reload();
- }
- }
-@@ -1969,7 +1970,7 @@
- void mainfrm::f_reload()
- {
- QDir tmpdir;
-- tmpdir.setPath(wg_library + "BIB_ManSlide/Eff_sup/");
-+ tmpdir.setPath("/usr/share/smile/BIB_ManSlide/Eff_sup/");
- QStringList filters;
- filters << "*.mng" << "*.MNG" << "*.gif" << "*.GIF" << "*.png" <<
"*.PNG";
- tmpdir.setNameFilters(filters);
-@@ -1980,7 +1981,7 @@
- foreach (wlfile, tmpdir.entryList(QDir::Files))
- {
- comboeffets->insertItem(positem, wlfile);
-- comboeffets->setItemIcon(positem, QIcon(wg_library +
"/BIB_ManSlide/Eff_sup/" + wlfile));
-+ comboeffets->setItemIcon(positem,
QIcon("/usr/share/smile/BIB_ManSlide/Eff_sup/" + wlfile));
- positem++;
- }
- }
-diff -ru smile.ori/tetrahedron.cpp smile/tetrahedron.cpp
---- smile.orig/tetrahedron.cpp
-+++ smile/tetrahedron.cpp
-@@ -344,7 +344,7 @@
- {
- iseffect = 1;
- delete movie;
-- movie = new QMovie(wg_tet_library + "/BIB_ManSlide/Eff_sup/" +
nomeffet);
-+ movie = new QMovie("/usr/share/smile/BIB_ManSlide/Eff_sup/" +
nomeffet);
- if ( movie->isValid() == true )
- {
- movie->setCacheMode( QMovie::CacheAll );
-@@ -382,7 +382,7 @@
- }
- else
- {
-- qDebug() << "ERROR LOADING EFFECT TEXTURE - INIT
POSITION - " << wg_tet_library + "/BIB_ManSlide/Eff_sup/" + nomeffet;
-+ qDebug() << "ERROR LOADING EFFECT TEXTURE - INIT
POSITION - " << "/usr/share/smile/BIB_ManSlide/Eff_sup/" + nomeffet;
- }
- }
- }
diff --git a/media-gfx/smile/metadata.xml b/media-gfx/smile/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/media-gfx/smile/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/media-gfx/smile/smile-1.0-r1.ebuild
b/media-gfx/smile/smile-1.0-r1.ebuild
deleted file mode 100644
index 9d71b27fe06..00000000000
--- a/media-gfx/smile/smile-1.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-LANGS="de en it pl pt ru"
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Slideshow Maker In Linux Environement"
-HOMEPAGE="http://smile.tuxfamily.org/";
-SRC_URI="http://download.tuxfamily.org/smiletool/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="media-sound/sox
- media-video/mplayer
- dev-qt/qtgui:4[debug?]
- dev-qt/qtopengl:4[debug?]
- dev-qt/qtwebkit:4[debug?]
- virtual/imagemagick-tools"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/fix_installation.patch"
- "${FILESDIR}/fix_docs-0.9.10.patch"
-)
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- qt4-r2_src_prepare
- # fix version string on applied patch
- sed -i "s/${PN}-0.9.10/${P}/" "${S}"/helpfrm.cpp \
- || die "failed to fix docs path"
-}
-
-src_install() {
- dobin smile || die "dobin failed"
- doicon Interface/Theme/${PN}.png || die "doicon failed"
- make_desktop_entry smile Smile smile "Qt;AudioVideo;Video"
-
- dodoc BIB_ManSlide/Help/doc_en.html
- dodoc BIB_ManSlide/Help/doc_fr.html
- insinto /usr/share/doc/${PF}/
- doins -r BIB_ManSlide/Help/images
- doins -r BIB_ManSlide/Help/images_en
- doins -r BIB_ManSlide/Help/images_fr
- #translations
- insinto /usr/share/${PN}/translations/
- for lang in ${LINGUAS};do
- for x in ${LANGS};do
- if [[ ${lang} == ${x} ]];then
- doins ${PN}_${x}.qm || die "failed to install
${x} translation"
- fi
- done
- done
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index c8100c7e958..837f9bfefe3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -488,11 +488,6 @@ kde-misc/krecipes
# Masked for removal in 30 days. Bug #620836.
media-gfx/picturewall
-# Michael Palimaka <[email protected]> (01 Jul 2017)
-# Depends on vulnerable qtwebkit:4. Dead upstream.
-# Masked for removal in 30 days. Bug #620704.
-media-gfx/smile
-
# Thomas Deutschmann <[email protected]> (28 Jun 2017)
# New strip feature which is enabled by default causes genkernel
# to create unbootable kernel/initramfs images. Bug #622716
