[gentoo-commits] repo/gentoo:master commit in: app-cdr/dvdshrink/, profiles/, app-cdr/dvdshrink/files/

2023-12-15 Thread Arthur Zamarin
commit: 56b348555b5c3ac5731d98919d2147c52f607390
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 16 07:39:14 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 16 07:51:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b34855

app-cdr/dvdshrink: treeclean

Closes: https://bugs.gentoo.org/861311
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-cdr/dvdshrink/Manifest |  1 -
 app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild| 42 --
 .../files/dvdshrink-2.6.1_p10-fix-paths.patch  | 22 
 app-cdr/dvdshrink/metadata.xml | 11 --
 profiles/package.mask  |  1 -
 5 files changed, 77 deletions(-)

diff --git a/app-cdr/dvdshrink/Manifest b/app-cdr/dvdshrink/Manifest
deleted file mode 100644
index bec3a265f2b8..
--- a/app-cdr/dvdshrink/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dvdshrink-2.6.1-10mdk.tar.gz 1087571 BLAKE2B 
a45427483b5519ee7abbc787e7afea2f9edcb49f8f6a15843184e7c62e51f7ebb18ad1db35ea695004eda9763dfc9b2a5522b7b4c279a2b63a71b96d091ffe37
 SHA512 
6766f95bd2bb29ef0877d9b22bc45eb2c508ad2d1a7bb99f84b3f858987fc098a696f15f953efe006bf9556a73f6aa0e6247afcdf8e4c5dad826ddba97f02c06

diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild 
b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild
deleted file mode 100644
index 9e0f209477f0..
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop
-
-DESCRIPTION="Scriptable DVD copy software"
-HOMEPAGE="https://dvdshrink.sourceforge.net";
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}mdk.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk"
-
-RDEPEND="
-   app-cdr/cdrtools
-   >=app-cdr/dvd+rw-tools-6.1
-   >=app-text/gocr-0.40
-   >=media-video/dvdauthor-0.6.11
-   >=media-video/mjpegtools-1.8.0-r1
-   >=media-video/subtitleripper-0.3.4-r1
-   >=media-video/transcode-1.0.2-r2[dvd]
-   gtk? ( >=dev-perl/Gtk2-1.104 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.6.1_p10-fix-paths.patch )
-
-src_install() {
-   dobin usr/bin/{batchrip.sh,dvds{functions,hrink}}
-
-   use gtk && dobin usr/bin/xdvdshrink.pl
-
-   insinto /usr/share
-   doins -r usr/share/applications/dvdshrink
-
-   dodoc usr/share/doc/dvdshrink/{batchrip.txt,example.xml,README.txt}
-
-   doicon usr/share/icons/{batchrip.xpm,dvdshrink.xpm}
-   use gtk && make_desktop_entry xdvdshrink.pl xDVDShrink ${PN} AudioVideo
-}

diff --git a/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch 
b/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch
deleted file mode 100644
index 8acbb70073e0..
--- a/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 a/usr/bin/dvdsfunctions
-+++ b/usr/bin/dvdsfunctions
-@@ -1933,7 +1933,7 @@
-if ! ((`ps -C xdvdshrink.pl > /dev/null 2>&1`)); then GUI=1; fi
-SAVEISO=0# Save an ISO along with the burn(s)
- 
--   APPDIR=/usr/share/applications/dvdshrink
-+   APPDIR=/usr/share/dvdshrink
- }
- 
- # Build a minimal but usable XML file for 'dvdauthor'
 a/usr/bin/xdvdshrink.pl
-+++ b/usr/bin/xdvdshrink.pl
-@@ -22,7 +22,7 @@
- 
- my $login   =  getlogin || getpwuid($<); # Userid of current user
- my $homedir = "/home/" . $login; # Home dir of current user
--my $app_dir = "/usr/share/applications/dvdshrink";
-+my $app_dir = "/usr/share/dvdshrink";
- my $false   = 0;# A 'false'
- my $true= 1;# A 'true'
- my $srunning= 0;# Is the bash script running

diff --git a/app-cdr/dvdshrink/metadata.xml b/app-cdr/dvdshrink/metadata.xml
deleted file mode 100644
index 70683941b6ed..
--- a/app-cdr/dvdshrink/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   
-   XDVDShrink is a project in BASH and Perl-Gtk2 that allows you 
to create fair-use archival copies of DVD content on single-layer writable DVDs.
-   
-   
-   dvdshrink
-   
-

diff --git a/profiles/package.mask b/profiles/package.mask
index d8c6ad98ae69..98586a37ef8c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -264,7 +264,6 @@ dev-perl/PathTools
 # a lot of downstream patches just to keep it working, and it's broken
 # again (ffmpeg-5 this time).  The mask includes revdeps.
 # Removal on 2023-11-13.  Bug #861311.
-app-cdr/dvdshrink
 media-plugins/vdr-burn
 media-plugins/vdr-burn-templates
 media-video/dvd9to5



[gentoo-commits] repo/gentoo:master commit in: app-cdr/dvdshrink/

2023-06-11 Thread Joonas Niilola
commit: 466338842c1a9f8324b8c019db8654f6edcfcca0
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Jun  5 15:04:51 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jun 11 08:22:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46633884

app-cdr/dvdshrink: use HTTPS

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild 
b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild
index e55e9cbe6fdc..9e0f209477f0 100644
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit desktop
 
 DESCRIPTION="Scriptable DVD copy software"
-HOMEPAGE="http://dvdshrink.sourceforge.net";
+HOMEPAGE="https://dvdshrink.sourceforge.net";
 SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}mdk.tar.gz"
 S="${WORKDIR}/${PN}"
 



[gentoo-commits] repo/gentoo:master commit in: app-cdr/dvdshrink/

2022-07-26 Thread David Seifert
commit: f9553c91da090bbed00379bb766258f9bfbba7cd
Author: David Seifert  gentoo  org>
AuthorDate: Tue Jul 26 19:27:06 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jul 26 19:27:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9553c91

app-cdr/dvdshrink: update EAPI 6 -> 8

Signed-off-by: David Seifert  gentoo.org>

 ...vdshrink-2.6.1_p10.ebuild => dvdshrink-2.6.1_p10-r1.ebuild} | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild 
b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild
similarity index 89%
rename from app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
rename to app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild
index e052a53b1fb1..e55e9cbe6fdc 100644
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit desktop
 
 DESCRIPTION="Scriptable DVD copy software"
 HOMEPAGE="http://dvdshrink.sourceforge.net";
 SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}mdk.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,11 +23,8 @@ RDEPEND="
>=media-video/mjpegtools-1.8.0-r1
>=media-video/subtitleripper-0.3.4-r1
>=media-video/transcode-1.0.2-r2[dvd]
-   gtk? ( >=dev-perl/Gtk2-1.104 )
-"
-DEPEND=""
+   gtk? ( >=dev-perl/Gtk2-1.104 )"
 
-S=${WORKDIR}/${PN}
 PATCHES=( "${FILESDIR}"/${PN}-2.6.1_p10-fix-paths.patch )
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: app-cdr/dvdshrink/

2022-07-26 Thread David Seifert
commit: 27472c7f1302a2a913ad096221a9614196dbb1cc
Author: David Seifert  gentoo  org>
AuthorDate: Tue Jul 26 19:27:07 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jul 26 19:27:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27472c7f

app-cdr/dvdshrink: reindent metadata.xml

Signed-off-by: David Seifert  gentoo.org>

 app-cdr/dvdshrink/metadata.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-cdr/dvdshrink/metadata.xml b/app-cdr/dvdshrink/metadata.xml
index a161229051ce..70683941b6ed 100644
--- a/app-cdr/dvdshrink/metadata.xml
+++ b/app-cdr/dvdshrink/metadata.xml
@@ -3,9 +3,8 @@
 


-XDVDShrink is a project in BASH and Perl-Gtk2 that allows you to create 
fair-use
-archival copies of DVD content on single-layer writable DVDs.
-
+   XDVDShrink is a project in BASH and Perl-Gtk2 that allows you 
to create fair-use archival copies of DVD content on single-layer writable DVDs.
+   

dvdshrink




[gentoo-commits] repo/gentoo:master commit in: app-cdr/dvdshrink/

2020-12-18 Thread Michał Górny
commit: baddb3ae68c5f9e00bd62a9c28cebdf15829a6f0
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Dec 18 08:57:18 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Dec 18 09:00:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baddb3ae

app-cdr/dvdshrink: Inline virtual/cdrtools

Signed-off-by: Michał Górny  gentoo.org>

 app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild 
b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
index c7e5f5c4269..e052a53b1fb 100644
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,14 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gtk"
 
-RDEPEND=">=media-video/transcode-1.0.2-r2[dvd]
+RDEPEND="
+   app-cdr/cdrtools
+   >=app-cdr/dvd+rw-tools-6.1
+   >=app-text/gocr-0.40
+   >=media-video/dvdauthor-0.6.11
>=media-video/mjpegtools-1.8.0-r1
>=media-video/subtitleripper-0.3.4-r1
-   >=media-video/dvdauthor-0.6.11
-   >=app-cdr/dvd+rw-tools-6.1
+   >=media-video/transcode-1.0.2-r2[dvd]
gtk? ( >=dev-perl/Gtk2-1.104 )
-   >=app-text/gocr-0.40
-   virtual/cdrtools"
+"
 DEPEND=""
 
 S=${WORKDIR}/${PN}



[gentoo-commits] repo/gentoo:master commit in: app-cdr/dvdshrink/, app-cdr/dvdshrink/files/

2017-12-28 Thread David Seifert
commit: c210c56f95a0ee9f892d8c76ea9bba35416b8e33
Author: David Seifert  gentoo  org>
AuthorDate: Thu Dec 28 11:35:16 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Dec 28 12:03:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c210c56f

app-cdr/dvdshrink: Port to EAPI 6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild   | 19 +++
 .../files/dvdshrink-2.6.1_p10-fix-paths.patch  | 22 ++
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild 
b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
index 0dd1d1b1926..c7e5f5c4269 100644
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
+
+inherit desktop
 
 DESCRIPTION="Scriptable DVD copy software"
 HOMEPAGE="http://dvdshrink.sourceforge.net";
@@ -24,21 +25,15 @@ RDEPEND=">=media-video/transcode-1.0.2-r2[dvd]
 DEPEND=""
 
 S=${WORKDIR}/${PN}
-
-src_prepare() {
-   sed -e 's:applications/::g' -i usr/bin/dvdsfunctions \
-   -i usr/bin/xdvdshrink.pl || die "sed failed."
-}
+PATCHES=( "${FILESDIR}"/${PN}-2.6.1_p10-fix-paths.patch )
 
 src_install() {
-   dobin usr/bin/{batchrip.sh,dvds{functions,hrink}} || die "dobin failed."
+   dobin usr/bin/{batchrip.sh,dvds{functions,hrink}}
 
-   if use gtk; then
-   dobin usr/bin/xdvdshrink.pl || die "dobin failed."
-   fi
+   use gtk && dobin usr/bin/xdvdshrink.pl
 
insinto /usr/share
-   doins -r usr/share/applications/dvdshrink || die "doins failed."
+   doins -r usr/share/applications/dvdshrink
 
dodoc usr/share/doc/dvdshrink/{batchrip.txt,example.xml,README.txt}
 

diff --git a/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch 
b/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch
new file mode 100644
index 000..8acbb70073e
--- /dev/null
+++ b/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch
@@ -0,0 +1,22 @@
+--- a/usr/bin/dvdsfunctions
 b/usr/bin/dvdsfunctions
+@@ -1933,7 +1933,7 @@
+if ! ((`ps -C xdvdshrink.pl > /dev/null 2>&1`)); then GUI=1; fi
+SAVEISO=0# Save an ISO along with the burn(s)
+ 
+-   APPDIR=/usr/share/applications/dvdshrink
++   APPDIR=/usr/share/dvdshrink
+ }
+ 
+ # Build a minimal but usable XML file for 'dvdauthor'
+--- a/usr/bin/xdvdshrink.pl
 b/usr/bin/xdvdshrink.pl
+@@ -22,7 +22,7 @@
+ 
+ my $login   =  getlogin || getpwuid($<); # Userid of current user
+ my $homedir = "/home/" . $login; # Home dir of current user
+-my $app_dir = "/usr/share/applications/dvdshrink";
++my $app_dir = "/usr/share/dvdshrink";
+ my $false   = 0;# A 'false'
+ my $true= 1;# A 'true'
+ my $srunning= 0;# Is the bash script running