[gentoo-commits] repo/gentoo:master commit in: x11-misc/idesk/, x11-misc/idesk/files/

2022-07-17 Thread Sam James
commit: 20f9b659b43f3536e9337878e448e1ad96a67ab0
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 17 17:00:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 17 17:02:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20f9b659

x11-misc/idesk: add 0.7.8

Signed-off-by: Sam James  gentoo.org>

 x11-misc/idesk/Manifest|  1 +
 .../files/idesk-1-use-pkg-config-imlib2.patch  |  1 +
 x11-misc/idesk/idesk-0.7.8.ebuild  | 51 ++
 3 files changed, 53 insertions(+)

diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index 4a677bc53c3c..eaea35d0026c 100644
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -1 +1,2 @@
+DIST idesk-0.7.8.tar.gz 202949 BLAKE2B 
93f902ab8b073d5b8e4a03d65ce99379e4adcf7ae6220be858ef7f1ce1f326cbbcc50c6d99424d8153ad498c9498939f39c51de1aa231c392a18636ee53788ee
 SHA512 
0456646788ab70d1fc05ee0fc5f9d811f9f67c2420039ec525f42b6634ec92c1e3f8f061af5c407a22ab81db873efde216ad5c4fccba6fb27f1777d2e66a5535
 DIST idesk-v1.tar.gz 195147 BLAKE2B 
2b2b0dacbfb1d8fb950c88d990e3674bf8b4cf82d9022ed2f7be1f32082c46ae32d8200957e2e19d0d21ea1e4d59ec092f4cba90e712f79700a04f05c3a3aa14
 SHA512 
3190fca7a5c9fb36b66159107d22b5f6e50b4573afa21a3a4d8b8e3e5953dabda077c924e45d2607b849ee5fea141eb80f5b89ce5288ebc2490679f319edf768

diff --git a/x11-misc/idesk/files/idesk-1-use-pkg-config-imlib2.patch 
b/x11-misc/idesk/files/idesk-1-use-pkg-config-imlib2.patch
index 4e9849dabb00..7f062c94280f 100644
--- a/x11-misc/idesk/files/idesk-1-use-pkg-config-imlib2.patch
+++ b/x11-misc/idesk/files/idesk-1-use-pkg-config-imlib2.patch
@@ -1,5 +1,6 @@
 https://github.com/antonialoytorrens/idesk/pull/1
 https://github.com/neagix/idesk/pull/9
+https://github.com/neagix/idesk/issues/7
 
 From b13626bbe2669b8a267ad53df93f1060379a462e Mon Sep 17 00:00:00 2001
 From: Sam James 

diff --git a/x11-misc/idesk/idesk-0.7.8.ebuild 
b/x11-misc/idesk/idesk-0.7.8.ebuild
new file mode 100644
index ..16d07105e02b
--- /dev/null
+++ b/x11-misc/idesk/idesk-0.7.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Utility to place icons on the root window"
+HOMEPAGE="https://github.com/neagix/idesk;
+SRC_URI="https://github.com/neagix/idesk/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="svg"
+
+RDEPEND="
+   dev-libs/glib
+   dev-libs/libxml2
+   media-libs/freetype
+   media-libs/imlib2[X]
+   media-libs/libart_lgpl
+   x11-libs/libXft
+   x11-libs/gtk+:3
+   x11-libs/pango
+   x11-libs/startup-notification
+   svg? (
+   gnome-base/librsvg
+   x11-libs/gdk-pixbuf
+   )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1-use-pkg-config-imlib2.patch
+)
+
+src_prepare() {
+   default
+
+   sed -i -e 's,/usr/local/,/usr/,' examples/default.lnk || die
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --enable-libsn \
+   $(use_enable svg)
+}



[gentoo-commits] repo/gentoo:master commit in: x11-misc/idesk/, x11-misc/idesk/files/

2022-07-17 Thread Sam James
commit: 226d58be269c1b35e27828efd4fb2f92985e5639
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 17 17:02:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 17 17:02:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=226d58be

x11-misc/idesk: drop obsolete fork

Note that 0.7.8 is newer than 1 as 1 was from an obsolete fork.

Signed-off-by: Sam James  gentoo.org>

 x11-misc/idesk/Manifest|  1 -
 ...tch => idesk-0.7.8-use-pkg-config-imlib2.patch} |  0
 x11-misc/idesk/idesk-0.7.8.ebuild  |  4 +-
 x11-misc/idesk/idesk-1-r1.ebuild   | 48 --
 x11-misc/idesk/idesk-1.ebuild  | 40 --
 5 files changed, 2 insertions(+), 91 deletions(-)

diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index eaea35d0026c..5648bdfbefba 100644
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -1,2 +1 @@
 DIST idesk-0.7.8.tar.gz 202949 BLAKE2B 
93f902ab8b073d5b8e4a03d65ce99379e4adcf7ae6220be858ef7f1ce1f326cbbcc50c6d99424d8153ad498c9498939f39c51de1aa231c392a18636ee53788ee
 SHA512 
0456646788ab70d1fc05ee0fc5f9d811f9f67c2420039ec525f42b6634ec92c1e3f8f061af5c407a22ab81db873efde216ad5c4fccba6fb27f1777d2e66a5535
-DIST idesk-v1.tar.gz 195147 BLAKE2B 
2b2b0dacbfb1d8fb950c88d990e3674bf8b4cf82d9022ed2f7be1f32082c46ae32d8200957e2e19d0d21ea1e4d59ec092f4cba90e712f79700a04f05c3a3aa14
 SHA512 
3190fca7a5c9fb36b66159107d22b5f6e50b4573afa21a3a4d8b8e3e5953dabda077c924e45d2607b849ee5fea141eb80f5b89ce5288ebc2490679f319edf768

diff --git a/x11-misc/idesk/files/idesk-1-use-pkg-config-imlib2.patch 
b/x11-misc/idesk/files/idesk-0.7.8-use-pkg-config-imlib2.patch
similarity index 100%
rename from x11-misc/idesk/files/idesk-1-use-pkg-config-imlib2.patch
rename to x11-misc/idesk/files/idesk-0.7.8-use-pkg-config-imlib2.patch

diff --git a/x11-misc/idesk/idesk-0.7.8.ebuild 
b/x11-misc/idesk/idesk-0.7.8.ebuild
index 16d07105e02b..b6e6b14254a7 100644
--- a/x11-misc/idesk/idesk-0.7.8.ebuild
+++ b/x11-misc/idesk/idesk-0.7.8.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/neagix/idesk/archive/refs/tags/v${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="svg"
 
 RDEPEND="
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-1-use-pkg-config-imlib2.patch
+   "${FILESDIR}"/${PN}-0.7.8-use-pkg-config-imlib2.patch
 )
 
 src_prepare() {

diff --git a/x11-misc/idesk/idesk-1-r1.ebuild b/x11-misc/idesk/idesk-1-r1.ebuild
deleted file mode 100644
index 6b94e84161c4..
--- a/x11-misc/idesk/idesk-1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${PN}-v${PV}"
-
-inherit autotools
-
-DESCRIPTION="Utility to place icons on the root window"
-HOMEPAGE="https://github.com/antonialoytorrens/idesk/;
-SRC_URI="https://github.com/antonialoytorrens/idesk/releases/download/v1/${MY_P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-   dev-libs/glib
-   dev-libs/libxml2
-   media-libs/freetype
-   media-libs/imlib2[X]
-   media-libs/libart_lgpl
-   x11-libs/libXft
-   x11-libs/gtk+:3
-   x11-libs/pango
-   x11-libs/startup-notification
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1-use-pkg-config-imlib2.patch
-)
-
-src_prepare() {
-   default
-
-   sed -i -e 's,/usr/local/,/usr/,' examples/default.lnk || die
-
-   eautoreconf
-}
-
-src_configure() {
-   econf --enable-libsn
-}

diff --git a/x11-misc/idesk/idesk-1.ebuild b/x11-misc/idesk/idesk-1.ebuild
deleted file mode 100644
index d32a60e327c4..
--- a/x11-misc/idesk/idesk-1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Utility to place icons on the root window"
-HOMEPAGE="https://github.com/antonialoytorrens/idesk/;
-SRC_URI="https://github.com/antonialoytorrens/idesk/releases/download/v1/${MY_P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-   dev-libs/glib
-   dev-libs/libxml2
-   media-libs/freetype
-   media-libs/imlib2[X]
-   media-libs/libart_lgpl
-   x11-libs/gtk+:3
-   x11-libs/pango
-   x11-libs/startup-notification
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   default
-   sed -i -e 's,/usr/local/,/usr/,' examples/default.lnk || die
-}
-
-src_configure() {
-   econf --enable-libsn
-}



[gentoo-commits] repo/gentoo:master commit in: x11-misc/idesk/, x11-misc/idesk/files/

2021-08-03 Thread Andreas Sturmlechner
commit: 4865c809591923f09f32a713dc4ba1f831e0920b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug  3 12:24:28 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug  3 13:18:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4865c809

x11-misc/idesk: Drop 0.7.5-r3, EAPI6--

Closes: https://bugs.gentoo.org/799671
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/idesk/Manifest   |  1 -
 x11-misc/idesk/files/idesk-0.7.5-glibc-2.12.patch | 17 --
 x11-misc/idesk/idesk-0.7.5-r3.ebuild  | 41 ---
 3 files changed, 59 deletions(-)

diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index 1045f1037db..4a677bc53c3 100644
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -1,2 +1 @@
-DIST idesk-0.7.5.tar.bz2 185858 BLAKE2B 
b1cc2e423ff7f9f9db12fcfd46c0d9b03e29ad6b4b44f79ab6fca76b356b7df798532261364e30991dfacef9d377b69bf3dc9b5f44baf817b44629eb3805f3e6
 SHA512 
42c15cecc6e2cf6546420542fc4480902fd33c26c19ffc32e65eb04d09116d3b80f5539cde4ca86d4bec30ce96417752bfe7416ec83c531235d9064d06ec0475
 DIST idesk-v1.tar.gz 195147 BLAKE2B 
2b2b0dacbfb1d8fb950c88d990e3674bf8b4cf82d9022ed2f7be1f32082c46ae32d8200957e2e19d0d21ea1e4d59ec092f4cba90e712f79700a04f05c3a3aa14
 SHA512 
3190fca7a5c9fb36b66159107d22b5f6e50b4573afa21a3a4d8b8e3e5953dabda077c924e45d2607b849ee5fea141eb80f5b89ce5288ebc2490679f319edf768

diff --git a/x11-misc/idesk/files/idesk-0.7.5-glibc-2.12.patch 
b/x11-misc/idesk/files/idesk-0.7.5-glibc-2.12.patch
deleted file mode 100644
index c4ac03e206e..000
--- a/x11-misc/idesk/files/idesk-0.7.5-glibc-2.12.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixes build with glibc-2.12
-
-http://bugs.gentoo.org/333515
-https://bugs.launchpad.net/ubuntu/+source/idesk/+bug/592602
-
-Patch written by Bhavani Shankar 
 idesk-0.7.5/src/DesktopConfig.cpp
-+++ idesk-0.7.5/src/DesktopConfig.cpp
-@@ -24,6 +24,8 @@
- 
- #include "DesktopConfig.h"
- #include "Util.h"
-+#include // For stat()
-+#include  // For stat()
- 
- //the initilizer list just sets the program defaults for non-necessary options
- DesktopConfig::DesktopConfig(Database db, string ideskrcFile) :

diff --git a/x11-misc/idesk/idesk-0.7.5-r3.ebuild 
b/x11-misc/idesk/idesk-0.7.5-r3.ebuild
deleted file mode 100644
index 3a6373426c2..000
--- a/x11-misc/idesk/idesk-0.7.5-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Utility to place icons on the root window"
-HOMEPAGE="http://idesk.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="
-   dev-libs/glib:2
-   dev-libs/libxml2
-   media-libs/freetype
-   >=media-libs/imlib2-1.4[X]
-   media-libs/libart_lgpl
-   x11-libs/gtk+:2
-   x11-libs/pango
-   x11-libs/startup-notification"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-PATCHES=(
-   # bug 333515
-   "${FILESDIR}"/${P}-glibc-2.12.patch
-)
-
-src_prepare() {
-   default
-   sed -i \
-   -e 's,/usr/local/,/usr/,' \
-   examples/default.lnk || die
-}
-
-src_configure() {
-   econf --enable-libsn
-}