[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 950ee2f71daeee5fb2fb56d0acba9470ca15bb83 Author: Adrian Schollmeyer nexadn de> AuthorDate: Mon Sep 20 14:33:29 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Mon Sep 20 14:33:33 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=950ee2f7 net-im/abaddon: Add new package Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 47 + net-im/abaddon/metadata.xml | 8 +++ 3 files changed, 56 insertions(+) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest new file mode 100644 index 0..a9031ec07 --- /dev/null +++ b/net-im/abaddon/Manifest @@ -0,0 +1 @@ +DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild new file mode 100644 index 0..54be008c5 --- /dev/null +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop git-r3 + +DESCRIPTION="Alternative Discord client using GTK instead of Electron" +HOMEPAGE="https://github.com/uowuo/abaddon"; +SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; +EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-cpp/gtkmm:3.0= + dev-db/sqlite:3 + net-misc/curl + >=net-libs/ixwebsocket-11.2.8 + sys-libs/zlib:= +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" +BDEPEND="" + +EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" + +src_unpack() { + default + git-r3_src_unpack +} + +src_install() { + dodoc README.md + + dobin "${BUILD_DIR}"/abaddon + + insinto /usr/share/${PN} + doins -r css res + + make_desktop_entry /usr/bin/${PN} ${PN} +} diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml new file mode 100644 index 0..b8439200b --- /dev/null +++ b/net-im/abaddon/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + Adrian Schollmeyer + nex+b-...@nexadn.de + +
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: e9a1e263a237475646e6f38e1d250f65a42ba479 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Sep 20 19:00:24 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Sep 20 19:00:24 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9a1e263 net-im/abaddon: dont use git-r3 Not live packages (non *) shouldn't inherit git-r3. We can use GitHub's snapshots to receive a tarball of simpleini at the wanted commit, and then link it in the wanted position by abaddon. Note: here I'm using bundled software, which is discouraged in Gentoo. simpleini should become a new package, on which abaddon depends. Signed-off-by: Arthur Zamarin gentoo.org> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 16 +--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index a9031ec07..b9936a57a 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1,2 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 +DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index 54be008c5..f987740f9 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -3,13 +3,16 @@ EAPI=7 -inherit cmake desktop git-r3 +inherit cmake desktop + +SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; -SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; -EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" +SRC_URI=" + https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz +" LICENSE="GPL-3" SLOT="0" @@ -28,11 +31,10 @@ DEPEND=" " BDEPEND="" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" - src_unpack() { default - git-r3_src_unpack + rm -r "${S}/thirdparty/simpleini" || die + ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die } src_install() {
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 950ee2f71daeee5fb2fb56d0acba9470ca15bb83 Author: Adrian Schollmeyer nexadn de> AuthorDate: Mon Sep 20 14:33:29 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Mon Sep 20 14:33:33 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=950ee2f7 net-im/abaddon: Add new package Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 47 + net-im/abaddon/metadata.xml | 8 +++ 3 files changed, 56 insertions(+) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest new file mode 100644 index 0..a9031ec07 --- /dev/null +++ b/net-im/abaddon/Manifest @@ -0,0 +1 @@ +DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild new file mode 100644 index 0..54be008c5 --- /dev/null +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop git-r3 + +DESCRIPTION="Alternative Discord client using GTK instead of Electron" +HOMEPAGE="https://github.com/uowuo/abaddon"; +SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; +EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-cpp/gtkmm:3.0= + dev-db/sqlite:3 + net-misc/curl + >=net-libs/ixwebsocket-11.2.8 + sys-libs/zlib:= +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" +BDEPEND="" + +EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" + +src_unpack() { + default + git-r3_src_unpack +} + +src_install() { + dodoc README.md + + dobin "${BUILD_DIR}"/abaddon + + insinto /usr/share/${PN} + doins -r css res + + make_desktop_entry /usr/bin/${PN} ${PN} +} diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml new file mode 100644 index 0..b8439200b --- /dev/null +++ b/net-im/abaddon/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + Adrian Schollmeyer + nex+b-...@nexadn.de + +
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: e9a1e263a237475646e6f38e1d250f65a42ba479 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Sep 20 19:00:24 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Sep 20 19:00:24 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9a1e263 net-im/abaddon: dont use git-r3 Not live packages (non *) shouldn't inherit git-r3. We can use GitHub's snapshots to receive a tarball of simpleini at the wanted commit, and then link it in the wanted position by abaddon. Note: here I'm using bundled software, which is discouraged in Gentoo. simpleini should become a new package, on which abaddon depends. Signed-off-by: Arthur Zamarin gentoo.org> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 16 +--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index a9031ec07..b9936a57a 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1,2 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 +DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index 54be008c5..f987740f9 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -3,13 +3,16 @@ EAPI=7 -inherit cmake desktop git-r3 +inherit cmake desktop + +SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; -SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; -EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" +SRC_URI=" + https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz +" LICENSE="GPL-3" SLOT="0" @@ -28,11 +31,10 @@ DEPEND=" " BDEPEND="" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" - src_unpack() { default - git-r3_src_unpack + rm -r "${S}/thirdparty/simpleini" || die + ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die } src_install() {
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 950ee2f71daeee5fb2fb56d0acba9470ca15bb83 Author: Adrian Schollmeyer nexadn de> AuthorDate: Mon Sep 20 14:33:29 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Mon Sep 20 14:33:33 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=950ee2f7 net-im/abaddon: Add new package Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 47 + net-im/abaddon/metadata.xml | 8 +++ 3 files changed, 56 insertions(+) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest new file mode 100644 index 0..a9031ec07 --- /dev/null +++ b/net-im/abaddon/Manifest @@ -0,0 +1 @@ +DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild new file mode 100644 index 0..54be008c5 --- /dev/null +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop git-r3 + +DESCRIPTION="Alternative Discord client using GTK instead of Electron" +HOMEPAGE="https://github.com/uowuo/abaddon"; +SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; +EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-cpp/gtkmm:3.0= + dev-db/sqlite:3 + net-misc/curl + >=net-libs/ixwebsocket-11.2.8 + sys-libs/zlib:= +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" +BDEPEND="" + +EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" + +src_unpack() { + default + git-r3_src_unpack +} + +src_install() { + dodoc README.md + + dobin "${BUILD_DIR}"/abaddon + + insinto /usr/share/${PN} + doins -r css res + + make_desktop_entry /usr/bin/${PN} ${PN} +} diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml new file mode 100644 index 0..b8439200b --- /dev/null +++ b/net-im/abaddon/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + Adrian Schollmeyer + nex+b-...@nexadn.de + +
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: e9a1e263a237475646e6f38e1d250f65a42ba479 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Sep 20 19:00:24 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Sep 20 19:00:24 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9a1e263 net-im/abaddon: dont use git-r3 Not live packages (non *) shouldn't inherit git-r3. We can use GitHub's snapshots to receive a tarball of simpleini at the wanted commit, and then link it in the wanted position by abaddon. Note: here I'm using bundled software, which is discouraged in Gentoo. simpleini should become a new package, on which abaddon depends. Signed-off-by: Arthur Zamarin gentoo.org> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 16 +--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index a9031ec07..b9936a57a 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1,2 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 +DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index 54be008c5..f987740f9 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -3,13 +3,16 @@ EAPI=7 -inherit cmake desktop git-r3 +inherit cmake desktop + +SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; -SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; -EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" +SRC_URI=" + https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz +" LICENSE="GPL-3" SLOT="0" @@ -28,11 +31,10 @@ DEPEND=" " BDEPEND="" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" - src_unpack() { default - git-r3_src_unpack + rm -r "${S}/thirdparty/simpleini" || die + ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die } src_install() {
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 950ee2f71daeee5fb2fb56d0acba9470ca15bb83 Author: Adrian Schollmeyer nexadn de> AuthorDate: Mon Sep 20 14:33:29 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Mon Sep 20 14:33:33 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=950ee2f7 net-im/abaddon: Add new package Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 47 + net-im/abaddon/metadata.xml | 8 +++ 3 files changed, 56 insertions(+) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest new file mode 100644 index 0..a9031ec07 --- /dev/null +++ b/net-im/abaddon/Manifest @@ -0,0 +1 @@ +DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild new file mode 100644 index 0..54be008c5 --- /dev/null +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop git-r3 + +DESCRIPTION="Alternative Discord client using GTK instead of Electron" +HOMEPAGE="https://github.com/uowuo/abaddon"; +SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; +EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-cpp/gtkmm:3.0= + dev-db/sqlite:3 + net-misc/curl + >=net-libs/ixwebsocket-11.2.8 + sys-libs/zlib:= +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" +BDEPEND="" + +EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" + +src_unpack() { + default + git-r3_src_unpack +} + +src_install() { + dodoc README.md + + dobin "${BUILD_DIR}"/abaddon + + insinto /usr/share/${PN} + doins -r css res + + make_desktop_entry /usr/bin/${PN} ${PN} +} diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml new file mode 100644 index 0..b8439200b --- /dev/null +++ b/net-im/abaddon/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + Adrian Schollmeyer + nex+b-...@nexadn.de + +
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: e9a1e263a237475646e6f38e1d250f65a42ba479 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Sep 20 19:00:24 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Sep 20 19:00:24 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9a1e263 net-im/abaddon: dont use git-r3 Not live packages (non *) shouldn't inherit git-r3. We can use GitHub's snapshots to receive a tarball of simpleini at the wanted commit, and then link it in the wanted position by abaddon. Note: here I'm using bundled software, which is discouraged in Gentoo. simpleini should become a new package, on which abaddon depends. Signed-off-by: Arthur Zamarin gentoo.org> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 16 +--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index a9031ec07..b9936a57a 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1,2 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 +DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index 54be008c5..f987740f9 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -3,13 +3,16 @@ EAPI=7 -inherit cmake desktop git-r3 +inherit cmake desktop + +SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; -SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; -EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" +SRC_URI=" + https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz +" LICENSE="GPL-3" SLOT="0" @@ -28,11 +31,10 @@ DEPEND=" " BDEPEND="" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" - src_unpack() { default - git-r3_src_unpack + rm -r "${S}/thirdparty/simpleini" || die + ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die } src_install() {
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 950ee2f71daeee5fb2fb56d0acba9470ca15bb83 Author: Adrian Schollmeyer nexadn de> AuthorDate: Mon Sep 20 14:33:29 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Mon Sep 20 14:33:33 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=950ee2f7 net-im/abaddon: Add new package Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 47 + net-im/abaddon/metadata.xml | 8 +++ 3 files changed, 56 insertions(+) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest new file mode 100644 index 0..a9031ec07 --- /dev/null +++ b/net-im/abaddon/Manifest @@ -0,0 +1 @@ +DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild new file mode 100644 index 0..54be008c5 --- /dev/null +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop git-r3 + +DESCRIPTION="Alternative Discord client using GTK instead of Electron" +HOMEPAGE="https://github.com/uowuo/abaddon"; +SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; +EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-cpp/gtkmm:3.0= + dev-db/sqlite:3 + net-misc/curl + >=net-libs/ixwebsocket-11.2.8 + sys-libs/zlib:= +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" +BDEPEND="" + +EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" + +src_unpack() { + default + git-r3_src_unpack +} + +src_install() { + dodoc README.md + + dobin "${BUILD_DIR}"/abaddon + + insinto /usr/share/${PN} + doins -r css res + + make_desktop_entry /usr/bin/${PN} ${PN} +} diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml new file mode 100644 index 0..b8439200b --- /dev/null +++ b/net-im/abaddon/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + Adrian Schollmeyer + nex+b-...@nexadn.de + +
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: e9a1e263a237475646e6f38e1d250f65a42ba479 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Sep 20 19:00:24 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Sep 20 19:00:24 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9a1e263 net-im/abaddon: dont use git-r3 Not live packages (non *) shouldn't inherit git-r3. We can use GitHub's snapshots to receive a tarball of simpleini at the wanted commit, and then link it in the wanted position by abaddon. Note: here I'm using bundled software, which is discouraged in Gentoo. simpleini should become a new package, on which abaddon depends. Signed-off-by: Arthur Zamarin gentoo.org> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 16 +--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index a9031ec07..b9936a57a 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1,2 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 +DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index 54be008c5..f987740f9 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -3,13 +3,16 @@ EAPI=7 -inherit cmake desktop git-r3 +inherit cmake desktop + +SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; -SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; -EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" +SRC_URI=" + https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz +" LICENSE="GPL-3" SLOT="0" @@ -28,11 +31,10 @@ DEPEND=" " BDEPEND="" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" - src_unpack() { default - git-r3_src_unpack + rm -r "${S}/thirdparty/simpleini" || die + ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die } src_install() {
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 950ee2f71daeee5fb2fb56d0acba9470ca15bb83 Author: Adrian Schollmeyer nexadn de> AuthorDate: Mon Sep 20 14:33:29 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Mon Sep 20 14:33:33 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=950ee2f7 net-im/abaddon: Add new package Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 47 + net-im/abaddon/metadata.xml | 8 +++ 3 files changed, 56 insertions(+) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest new file mode 100644 index 0..a9031ec07 --- /dev/null +++ b/net-im/abaddon/Manifest @@ -0,0 +1 @@ +DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild new file mode 100644 index 0..54be008c5 --- /dev/null +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop git-r3 + +DESCRIPTION="Alternative Discord client using GTK instead of Electron" +HOMEPAGE="https://github.com/uowuo/abaddon"; +SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; +EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-cpp/gtkmm:3.0= + dev-db/sqlite:3 + net-misc/curl + >=net-libs/ixwebsocket-11.2.8 + sys-libs/zlib:= +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" +BDEPEND="" + +EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" + +src_unpack() { + default + git-r3_src_unpack +} + +src_install() { + dodoc README.md + + dobin "${BUILD_DIR}"/abaddon + + insinto /usr/share/${PN} + doins -r css res + + make_desktop_entry /usr/bin/${PN} ${PN} +} diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml new file mode 100644 index 0..b8439200b --- /dev/null +++ b/net-im/abaddon/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + Adrian Schollmeyer + nex+b-...@nexadn.de + +
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: e9a1e263a237475646e6f38e1d250f65a42ba479 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Sep 20 19:00:24 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Sep 20 19:00:24 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9a1e263 net-im/abaddon: dont use git-r3 Not live packages (non *) shouldn't inherit git-r3. We can use GitHub's snapshots to receive a tarball of simpleini at the wanted commit, and then link it in the wanted position by abaddon. Note: here I'm using bundled software, which is discouraged in Gentoo. simpleini should become a new package, on which abaddon depends. Signed-off-by: Arthur Zamarin gentoo.org> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 16 +--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index a9031ec07..b9936a57a 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1,2 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 +DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index 54be008c5..f987740f9 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -3,13 +3,16 @@ EAPI=7 -inherit cmake desktop git-r3 +inherit cmake desktop + +SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; -SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; -EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" +SRC_URI=" + https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz +" LICENSE="GPL-3" SLOT="0" @@ -28,11 +31,10 @@ DEPEND=" " BDEPEND="" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" - src_unpack() { default - git-r3_src_unpack + rm -r "${S}/thirdparty/simpleini" || die + ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die } src_install() {
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 950ee2f71daeee5fb2fb56d0acba9470ca15bb83 Author: Adrian Schollmeyer nexadn de> AuthorDate: Mon Sep 20 14:33:29 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Mon Sep 20 14:33:33 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=950ee2f7 net-im/abaddon: Add new package Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 47 + net-im/abaddon/metadata.xml | 8 +++ 3 files changed, 56 insertions(+) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest new file mode 100644 index 0..a9031ec07 --- /dev/null +++ b/net-im/abaddon/Manifest @@ -0,0 +1 @@ +DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild new file mode 100644 index 0..54be008c5 --- /dev/null +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop git-r3 + +DESCRIPTION="Alternative Discord client using GTK instead of Electron" +HOMEPAGE="https://github.com/uowuo/abaddon"; +SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; +EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-cpp/gtkmm:3.0= + dev-db/sqlite:3 + net-misc/curl + >=net-libs/ixwebsocket-11.2.8 + sys-libs/zlib:= +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" +BDEPEND="" + +EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" + +src_unpack() { + default + git-r3_src_unpack +} + +src_install() { + dodoc README.md + + dobin "${BUILD_DIR}"/abaddon + + insinto /usr/share/${PN} + doins -r css res + + make_desktop_entry /usr/bin/${PN} ${PN} +} diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml new file mode 100644 index 0..b8439200b --- /dev/null +++ b/net-im/abaddon/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + Adrian Schollmeyer + nex+b-...@nexadn.de + +
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: e9a1e263a237475646e6f38e1d250f65a42ba479 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Sep 20 19:00:24 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Sep 20 19:00:24 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9a1e263 net-im/abaddon: dont use git-r3 Not live packages (non *) shouldn't inherit git-r3. We can use GitHub's snapshots to receive a tarball of simpleini at the wanted commit, and then link it in the wanted position by abaddon. Note: here I'm using bundled software, which is discouraged in Gentoo. simpleini should become a new package, on which abaddon depends. Signed-off-by: Arthur Zamarin gentoo.org> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 16 +--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index a9031ec07..b9936a57a 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1,2 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 +DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index 54be008c5..f987740f9 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -3,13 +3,16 @@ EAPI=7 -inherit cmake desktop git-r3 +inherit cmake desktop + +SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; -SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; -EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" +SRC_URI=" + https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz +" LICENSE="GPL-3" SLOT="0" @@ -28,11 +31,10 @@ DEPEND=" " BDEPEND="" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" - src_unpack() { default - git-r3_src_unpack + rm -r "${S}/thirdparty/simpleini" || die + ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die } src_install() {
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 950ee2f71daeee5fb2fb56d0acba9470ca15bb83 Author: Adrian Schollmeyer nexadn de> AuthorDate: Mon Sep 20 14:33:29 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Mon Sep 20 14:33:33 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=950ee2f7 net-im/abaddon: Add new package Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 47 + net-im/abaddon/metadata.xml | 8 +++ 3 files changed, 56 insertions(+) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest new file mode 100644 index 0..a9031ec07 --- /dev/null +++ b/net-im/abaddon/Manifest @@ -0,0 +1 @@ +DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild new file mode 100644 index 0..54be008c5 --- /dev/null +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop git-r3 + +DESCRIPTION="Alternative Discord client using GTK instead of Electron" +HOMEPAGE="https://github.com/uowuo/abaddon"; +SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; +EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-cpp/gtkmm:3.0= + dev-db/sqlite:3 + net-misc/curl + >=net-libs/ixwebsocket-11.2.8 + sys-libs/zlib:= +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" +BDEPEND="" + +EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" + +src_unpack() { + default + git-r3_src_unpack +} + +src_install() { + dodoc README.md + + dobin "${BUILD_DIR}"/abaddon + + insinto /usr/share/${PN} + doins -r css res + + make_desktop_entry /usr/bin/${PN} ${PN} +} diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml new file mode 100644 index 0..b8439200b --- /dev/null +++ b/net-im/abaddon/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + Adrian Schollmeyer + nex+b-...@nexadn.de + +
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: e9a1e263a237475646e6f38e1d250f65a42ba479 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Sep 20 19:00:24 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Sep 20 19:00:24 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9a1e263 net-im/abaddon: dont use git-r3 Not live packages (non *) shouldn't inherit git-r3. We can use GitHub's snapshots to receive a tarball of simpleini at the wanted commit, and then link it in the wanted position by abaddon. Note: here I'm using bundled software, which is discouraged in Gentoo. simpleini should become a new package, on which abaddon depends. Signed-off-by: Arthur Zamarin gentoo.org> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 16 +--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index a9031ec07..b9936a57a 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1,2 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 +DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index 54be008c5..f987740f9 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -3,13 +3,16 @@ EAPI=7 -inherit cmake desktop git-r3 +inherit cmake desktop + +SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; -SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_REPO_URI="https://github.com/brofield/simpleini.git"; -EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" +SRC_URI=" + https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz +" LICENSE="GPL-3" SLOT="0" @@ -28,11 +31,10 @@ DEPEND=" " BDEPEND="" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" - src_unpack() { default - git-r3_src_unpack + rm -r "${S}/thirdparty/simpleini" || die + ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die } src_install() {
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 7ef17317acbad25b9632d955b83fc371d3fa5b38 Author: Adrian Schollmeyer nexadn de> AuthorDate: Wed Oct 19 14:24:03 2022 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Wed Oct 19 14:24:03 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7ef17317 net-im/abaddon: add 0.1.8 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.8.ebuild | 48 + 2 files changed, 49 insertions(+) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index a5498d91f..914f21cc1 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1,2 @@ DIST abaddon-0.1.7.gh.tar.gz 12829173 BLAKE2B e759a7c6a07ffaeb47da4602286d013de0ed217328d6af7f28ad2de4516729777617a55111be5f2d7023f0990ba611563ea38da31e4045db07f6bd211ce74fcc SHA512 9e472acc9313cb257ee71172c6f8acfb01eedd628f4d0579a634f739d1e58b93a1917dd3cfdb7309e1e40d837c5e0d2eb11f6eee9af738643b70ce4660328f2b +DIST abaddon-0.1.8.gh.tar.gz 12829641 BLAKE2B f69210694bdb4d2d7a2cc4c4babbccc8afc15ba4429c08f6b477372c6d77af23d9d2e55b1283ce87b1a1a8cd10609723bc2b49cce21b6a6cdc2352a164cdcc77 SHA512 f9a52b76c4f39d28d5f3b17df9760dd45d3ee25ea254b267537544408a85f33f62c1f82febc2c5426b3533ec148ae9d25eb6ff167b61c1fd5b51c6bd6c923275 diff --git a/net-im/abaddon/abaddon-0.1.8.ebuild b/net-im/abaddon/abaddon-0.1.8.ebuild new file mode 100644 index 0..06af37878 --- /dev/null +++ b/net-im/abaddon/abaddon-0.1.8.ebuild @@ -0,0 +1,48 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop + +DESCRIPTION="Alternative Discord client using GTK instead of Electron" +HOMEPAGE="https://github.com/uowuo/abaddon"; +SRC_URI=" + https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz +" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+libhandy" + +RDEPEND=" + dev-cpp/gtkmm:3.0= + dev-db/sqlite:3 + net-misc/curl + >=net-libs/ixwebsocket-11.0.8 + sys-libs/zlib:= + libhandy? ( gui-libs/libhandy:= ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" + +src_configure() { + local mycmakeargs=( + -DUSE_LIBHANDY="$(usex libhandy)" + ) + cmake_src_configure +} + +src_install() { + dodoc README.md + + dobin "${BUILD_DIR}"/abaddon + + insinto /usr/share/${PN} + doins -r res/* + + make_desktop_entry /usr/bin/${PN} +}
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 2631afc3c22fcd2cddef8fe95a27541f3b87f7b1 Author: Adrian Schollmeyer nexadn de> AuthorDate: Wed Oct 19 14:26:55 2022 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Wed Oct 19 14:26:55 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2631afc3 net-im/abaddon: drop 0.1.7 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest | 1 - net-im/abaddon/abaddon-0.1.7.ebuild | 48 - 2 files changed, 49 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index 914f21cc1..2b7b00580 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1 @@ -DIST abaddon-0.1.7.gh.tar.gz 12829173 BLAKE2B e759a7c6a07ffaeb47da4602286d013de0ed217328d6af7f28ad2de4516729777617a55111be5f2d7023f0990ba611563ea38da31e4045db07f6bd211ce74fcc SHA512 9e472acc9313cb257ee71172c6f8acfb01eedd628f4d0579a634f739d1e58b93a1917dd3cfdb7309e1e40d837c5e0d2eb11f6eee9af738643b70ce4660328f2b DIST abaddon-0.1.8.gh.tar.gz 12829641 BLAKE2B f69210694bdb4d2d7a2cc4c4babbccc8afc15ba4429c08f6b477372c6d77af23d9d2e55b1283ce87b1a1a8cd10609723bc2b49cce21b6a6cdc2352a164cdcc77 SHA512 f9a52b76c4f39d28d5f3b17df9760dd45d3ee25ea254b267537544408a85f33f62c1f82febc2c5426b3533ec148ae9d25eb6ff167b61c1fd5b51c6bd6c923275 diff --git a/net-im/abaddon/abaddon-0.1.7.ebuild b/net-im/abaddon/abaddon-0.1.7.ebuild deleted file mode 100644 index 06af37878..0 --- a/net-im/abaddon/abaddon-0.1.7.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop - -DESCRIPTION="Alternative Discord client using GTK instead of Electron" -HOMEPAGE="https://github.com/uowuo/abaddon"; -SRC_URI=" - https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz -" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+libhandy" - -RDEPEND=" - dev-cpp/gtkmm:3.0= - dev-db/sqlite:3 - net-misc/curl - >=net-libs/ixwebsocket-11.0.8 - sys-libs/zlib:= - libhandy? ( gui-libs/libhandy:= ) -" -DEPEND=" - ${RDEPEND} - dev-cpp/nlohmann_json -" - -src_configure() { - local mycmakeargs=( - -DUSE_LIBHANDY="$(usex libhandy)" - ) - cmake_src_configure -} - -src_install() { - dodoc README.md - - dobin "${BUILD_DIR}"/abaddon - - insinto /usr/share/${PN} - doins -r res/* - - make_desktop_entry /usr/bin/${PN} -}
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 893c3d25f132034977389b500a62ae91b3da95c2 Author: Mark Lansky <49815452+ZerdoX-x users noreply github com> AuthorDate: Thu Feb 22 16:16:14 2024 + Commit: Remigiusz Micielski gmail com> CommitDate: Fri Feb 23 13:01:32 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=893c3d25 net-im/abaddon: add missing spdlog dependency Closes: #139 Signed-off-by: Remigiusz Micielski purelymail.com> net-im/abaddon/abaddon-0.1.12-r1.ebuild | 1 + net-im/abaddon/abaddon-0.1.13.ebuild| 1 + net-im/abaddon/abaddon-.ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/net-im/abaddon/abaddon-0.1.12-r1.ebuild b/net-im/abaddon/abaddon-0.1.12-r1.ebuild index 47487350f4..42384b3fdd 100644 --- a/net-im/abaddon/abaddon-0.1.12-r1.ebuild +++ b/net-im/abaddon/abaddon-0.1.12-r1.ebuild @@ -26,6 +26,7 @@ RDEPEND=" dev-cpp/gtkmm:3.0= dev-db/sqlite:3 dev-libs/miniaudio + dev-libs/spdlog >=net-libs/ixwebsocket-11.0.8 net-misc/curl sys-libs/zlib:= diff --git a/net-im/abaddon/abaddon-0.1.13.ebuild b/net-im/abaddon/abaddon-0.1.13.ebuild index 47487350f4..42384b3fdd 100644 --- a/net-im/abaddon/abaddon-0.1.13.ebuild +++ b/net-im/abaddon/abaddon-0.1.13.ebuild @@ -26,6 +26,7 @@ RDEPEND=" dev-cpp/gtkmm:3.0= dev-db/sqlite:3 dev-libs/miniaudio + dev-libs/spdlog >=net-libs/ixwebsocket-11.0.8 net-misc/curl sys-libs/zlib:= diff --git a/net-im/abaddon/abaddon-.ebuild b/net-im/abaddon/abaddon-.ebuild index 47487350f4..42384b3fdd 100644 --- a/net-im/abaddon/abaddon-.ebuild +++ b/net-im/abaddon/abaddon-.ebuild @@ -26,6 +26,7 @@ RDEPEND=" dev-cpp/gtkmm:3.0= dev-db/sqlite:3 dev-libs/miniaudio + dev-libs/spdlog >=net-libs/ixwebsocket-11.0.8 net-misc/curl sys-libs/zlib:=
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 2a010e590b380aef7a8a9adbb51d394c12f67593 Author: Remigiusz Micielski purelymail com> AuthorDate: Sat Feb 24 10:36:57 2024 + Commit: Remigiusz Micielski gmail com> CommitDate: Sat Feb 24 10:37:58 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2a010e59 net-im/abaddon: add missing opus dependency Closes: https://bugs.gentoo.org/925355 Signed-off-by: Remigiusz Micielski purelymail.com> net-im/abaddon/abaddon-0.1.13.ebuild | 1 + net-im/abaddon/abaddon-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/net-im/abaddon/abaddon-0.1.13.ebuild b/net-im/abaddon/abaddon-0.1.13.ebuild index 42384b3fdd..04089b4801 100644 --- a/net-im/abaddon/abaddon-0.1.13.ebuild +++ b/net-im/abaddon/abaddon-0.1.13.ebuild @@ -27,6 +27,7 @@ RDEPEND=" dev-db/sqlite:3 dev-libs/miniaudio dev-libs/spdlog + media-libs/opus >=net-libs/ixwebsocket-11.0.8 net-misc/curl sys-libs/zlib:= diff --git a/net-im/abaddon/abaddon-.ebuild b/net-im/abaddon/abaddon-.ebuild index 42384b3fdd..9356a75fe5 100644 --- a/net-im/abaddon/abaddon-.ebuild +++ b/net-im/abaddon/abaddon-.ebuild @@ -26,6 +26,7 @@ RDEPEND=" dev-cpp/gtkmm:3.0= dev-db/sqlite:3 dev-libs/miniaudio + media-libs/opus dev-libs/spdlog >=net-libs/ixwebsocket-11.0.8 net-misc/curl
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: a61854cfe5f0d46b725a12aad3c2ab3999098d3d Author: Remigiusz Micielski purelymail com> AuthorDate: Sun Feb 25 15:42:48 2024 + Commit: Remigiusz Micielski gmail com> CommitDate: Sun Feb 25 15:44:41 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a61854cf net-im/abaddon: add missing deps Closes: https://bugs.gentoo.org/925464 Signed-off-by: Remigiusz Micielski purelymail.com> net-im/abaddon/abaddon-0.1.12-r1.ebuild | 2 ++ net-im/abaddon/abaddon-0.1.13.ebuild| 1 + net-im/abaddon/abaddon-.ebuild | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/net-im/abaddon/abaddon-0.1.12-r1.ebuild b/net-im/abaddon/abaddon-0.1.12-r1.ebuild index 42384b3fdd..f3cda4227f 100644 --- a/net-im/abaddon/abaddon-0.1.12-r1.ebuild +++ b/net-im/abaddon/abaddon-0.1.12-r1.ebuild @@ -25,8 +25,10 @@ IUSE="+libhandy +rnnoise qrcodegen" RDEPEND=" dev-cpp/gtkmm:3.0= dev-db/sqlite:3 + dev-libs/libsodium dev-libs/miniaudio dev-libs/spdlog + media-libs/opus >=net-libs/ixwebsocket-11.0.8 net-misc/curl sys-libs/zlib:= diff --git a/net-im/abaddon/abaddon-0.1.13.ebuild b/net-im/abaddon/abaddon-0.1.13.ebuild index 04089b4801..f3cda4227f 100644 --- a/net-im/abaddon/abaddon-0.1.13.ebuild +++ b/net-im/abaddon/abaddon-0.1.13.ebuild @@ -25,6 +25,7 @@ IUSE="+libhandy +rnnoise qrcodegen" RDEPEND=" dev-cpp/gtkmm:3.0= dev-db/sqlite:3 + dev-libs/libsodium dev-libs/miniaudio dev-libs/spdlog media-libs/opus diff --git a/net-im/abaddon/abaddon-.ebuild b/net-im/abaddon/abaddon-.ebuild index 9356a75fe5..f3cda4227f 100644 --- a/net-im/abaddon/abaddon-.ebuild +++ b/net-im/abaddon/abaddon-.ebuild @@ -25,9 +25,10 @@ IUSE="+libhandy +rnnoise qrcodegen" RDEPEND=" dev-cpp/gtkmm:3.0= dev-db/sqlite:3 + dev-libs/libsodium dev-libs/miniaudio - media-libs/opus dev-libs/spdlog + media-libs/opus >=net-libs/ixwebsocket-11.0.8 net-misc/curl sys-libs/zlib:=
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 835b9b495f593ca5e3bc6e5522f92cf52339c02a Author: Remigiusz Micielski purelymail com> AuthorDate: Sat Sep 30 14:56:03 2023 + Commit: Remigiusz Micielski gmail com> CommitDate: Sat Sep 30 14:56:15 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=835b9b49 net-im/abaddon: add 0.1.12 Signed-off-by: Remigiusz Micielski purelymail.com> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.12.ebuild | 54 net-im/abaddon/metadata.xml | 1 + 3 files changed, 56 insertions(+) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index 2b7b005805..712e7baca5 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1,2 @@ +DIST abaddon-0.1.12.gh.tar.gz 12889771 BLAKE2B baeb6fb88eeb30332c290976f104a7efcfd09d8ed5a73464387b20abb41c1b899a926fdacfb7ddd069a843112c0d4ae08787a097842051abecc333f5e1709bbe SHA512 50e7af172fa12f382976c9bc10c9c1cde371866faf422f578c7ca8517facdf9331577bc69c5c856a75c8dc4014c0ed6ad2cef662cde7d551c212f412303e816b DIST abaddon-0.1.8.gh.tar.gz 12829641 BLAKE2B f69210694bdb4d2d7a2cc4c4babbccc8afc15ba4429c08f6b477372c6d77af23d9d2e55b1283ce87b1a1a8cd10609723bc2b49cce21b6a6cdc2352a164cdcc77 SHA512 f9a52b76c4f39d28d5f3b17df9760dd45d3ee25ea254b267537544408a85f33f62c1f82febc2c5426b3533ec148ae9d25eb6ff167b61c1fd5b51c6bd6c923275 diff --git a/net-im/abaddon/abaddon-0.1.12.ebuild b/net-im/abaddon/abaddon-0.1.12.ebuild new file mode 100644 index 00..481d002478 --- /dev/null +++ b/net-im/abaddon/abaddon-0.1.12.ebuild @@ -0,0 +1,54 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop + +DESCRIPTION="Alternative Discord client using GTK instead of Electron" +HOMEPAGE="https://github.com/uowuo/abaddon"; +SRC_URI=" + https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz +" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+libhandy +rnnoise" + +RDEPEND=" + >=net-libs/ixwebsocket-11.0.8 + dev-cpp/gtkmm:3.0= + dev-db/sqlite:3 + dev-libs/miniaudio + net-misc/curl + sys-libs/zlib:= + libhandy? ( gui-libs/libhandy:= ) + rnnoise? ( media-libs/rnnoise ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" + +src_configure() { + # Disable keychain because there's currently + # no package for it in ::guru or ::gentoo + # also disable QRCODE, for the same reason + local mycmakeargs=( + -DUSE_LIBHANDY="$(usex libhandy)" + -DENABLE_RNNOISE="$(usex rnnoise)" + -DUSE_KEYCHAIN="no" + -DENABLE_QRCODE_LOGIN="no" + ) + cmake_src_configure +} + +src_install() { + dobin "${BUILD_DIR}"/abaddon + + insinto /usr/share/${PN} + doins -r res/* + + make_desktop_entry /usr/bin/${PN} +} diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml index 3944869a71..e5356bebb0 100644 --- a/net-im/abaddon/metadata.xml +++ b/net-im/abaddon/metadata.xml @@ -7,6 +7,7 @@ Support for features using gui-libs/libhandy + Support for noise reduction using media-libs/rnnoise uowuo/abaddon
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 6a4c8c116f84181576536b19fbe74bb99ffe Author: Remigiusz Micielski purelymail com> AuthorDate: Sun Oct 1 14:16:28 2023 + Commit: Remigiusz Micielski gmail com> CommitDate: Sun Oct 1 14:17:33 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6a4c8c11 net-im/abaddon: update Signed-off-by: Remigiusz Micielski purelymail.com> net-im/abaddon/Manifest | 2 +- net-im/abaddon/abaddon-0.1.12.ebuild | 14 ++ net-im/abaddon/abaddon-.ebuild | 35 ++- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index 712e7baca5..71ff3721d2 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1,2 @@ -DIST abaddon-0.1.12.gh.tar.gz 12889771 BLAKE2B baeb6fb88eeb30332c290976f104a7efcfd09d8ed5a73464387b20abb41c1b899a926fdacfb7ddd069a843112c0d4ae08787a097842051abecc333f5e1709bbe SHA512 50e7af172fa12f382976c9bc10c9c1cde371866faf422f578c7ca8517facdf9331577bc69c5c856a75c8dc4014c0ed6ad2cef662cde7d551c212f412303e816b +DIST abaddon-0.1.12.tar.gz 12889771 BLAKE2B baeb6fb88eeb30332c290976f104a7efcfd09d8ed5a73464387b20abb41c1b899a926fdacfb7ddd069a843112c0d4ae08787a097842051abecc333f5e1709bbe SHA512 50e7af172fa12f382976c9bc10c9c1cde371866faf422f578c7ca8517facdf9331577bc69c5c856a75c8dc4014c0ed6ad2cef662cde7d551c212f412303e816b DIST abaddon-0.1.8.gh.tar.gz 12829641 BLAKE2B f69210694bdb4d2d7a2cc4c4babbccc8afc15ba4429c08f6b477372c6d77af23d9d2e55b1283ce87b1a1a8cd10609723bc2b49cce21b6a6cdc2352a164cdcc77 SHA512 f9a52b76c4f39d28d5f3b17df9760dd45d3ee25ea254b267537544408a85f33f62c1f82febc2c5426b3533ec148ae9d25eb6ff167b61c1fd5b51c6bd6c923275 diff --git a/net-im/abaddon/abaddon-0.1.12.ebuild b/net-im/abaddon/abaddon-0.1.12.ebuild index 481d002478..3c1ff56c4f 100644 --- a/net-im/abaddon/abaddon-0.1.12.ebuild +++ b/net-im/abaddon/abaddon-0.1.12.ebuild @@ -7,13 +7,19 @@ inherit cmake desktop DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; -SRC_URI=" - https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz -" + +if [[ ${PV} == ]]; then + EGIT_REPO_URI="https://github.com/uowuo/abaddon.git"; + # All dependencies are provided by portage + EGIT_SUBMODULES=() + inherit git-r3 +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +fi LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="+libhandy +rnnoise" RDEPEND=" diff --git a/net-im/abaddon/abaddon-.ebuild b/net-im/abaddon/abaddon-.ebuild index 2811c3dc1e..3c1ff56c4f 100644 --- a/net-im/abaddon/abaddon-.ebuild +++ b/net-im/abaddon/abaddon-.ebuild @@ -1,47 +1,56 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake desktop git-r3 +inherit cmake desktop DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; -SRC_URI="" -EGIT_REPO_URI="https://github.com/uowuo/abaddon.git"; -# Submodules shouldn't be used since all dependencies are provided by -# portage -EGIT_SUBMODULES=() + +if [[ ${PV} == ]]; then + EGIT_REPO_URI="https://github.com/uowuo/abaddon.git"; + # All dependencies are provided by portage + EGIT_SUBMODULES=() + inherit git-r3 +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +fi LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="+libhandy" +IUSE="+libhandy +rnnoise" RDEPEND=" + >=net-libs/ixwebsocket-11.0.8 dev-cpp/gtkmm:3.0= dev-db/sqlite:3 + dev-libs/miniaudio net-misc/curl - >=net-libs/ixwebsocket-11.0.8 sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) + rnnoise? ( media-libs/rnnoise ) " DEPEND=" ${RDEPEND} dev-cpp/nlohmann_json " -BDEPEND="" src_configure() { + # Disable keychain because there's currently + # no package for it in ::guru or ::gentoo + # also disable QRCODE, for the same reason local mycmakeargs=( -DUSE_LIBHANDY="$(usex libhandy)" + -DENABLE_RNNOISE="$(usex rnnoise)" + -DUSE_KEYCHAIN="no" + -DENABLE_QRCODE_LOGIN="no" ) cmake_src_configure } src_install() { - dodoc README.md - dobin "${BUILD_DIR}"/abaddon insinto /usr/share/${PN}
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: bb36efb675768ea7d1b938120fdb3cb4f6175f5c Author: Adrian Schollmeyer nexadn de> AuthorDate: Mon Oct 2 08:47:47 2023 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Mon Oct 2 08:47:47 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bb36efb6 net-im/abaddon: drop myself as a maintainer Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml index e5356bebb0..905ea64bbd 100644 --- a/net-im/abaddon/metadata.xml +++ b/net-im/abaddon/metadata.xml @@ -1,10 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - Adrian Schollmeyer - nex+b-...@nexadn.de - + Support for features using gui-libs/libhandy Support for noise reduction using media-libs/rnnoise
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: d717484d823d6aeba0f4b2e7a36fa26435dcbb21 Author: Remigiusz Micielski purelymail com> AuthorDate: Mon Oct 2 12:07:20 2023 + Commit: Remigiusz Micielski gmail com> CommitDate: Mon Oct 2 12:07:20 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d717484d net-im/abaddon: add myself as a maintainer Signed-off-by: Remigiusz Micielski purelymail.com> net-im/abaddon/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml index 905ea64bbd..88b7273623 100644 --- a/net-im/abaddon/metadata.xml +++ b/net-im/abaddon/metadata.xml @@ -1,7 +1,10 @@ https://www.gentoo.org/dtd/metadata.dtd";> - + + rmiciel...@purelymail.com + Remigiusz Micielski + Support for features using gui-libs/libhandy Support for noise reduction using media-libs/rnnoise
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: f222f8001bdec52707d317c5299ba0e3e233bcbc Author: Remigiusz Micielski purelymail com> AuthorDate: Mon Oct 2 12:19:58 2023 + Commit: Remigiusz Micielski gmail com> CommitDate: Mon Oct 2 12:19:58 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f222f800 net-im/abaddon: drop 0.1.8 Signed-off-by: Remigiusz Micielski purelymail.com> net-im/abaddon/Manifest | 1 - net-im/abaddon/abaddon-0.1.8.ebuild | 48 - 2 files changed, 49 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index 71ff3721d2..459d08e1a4 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1 @@ DIST abaddon-0.1.12.tar.gz 12889771 BLAKE2B baeb6fb88eeb30332c290976f104a7efcfd09d8ed5a73464387b20abb41c1b899a926fdacfb7ddd069a843112c0d4ae08787a097842051abecc333f5e1709bbe SHA512 50e7af172fa12f382976c9bc10c9c1cde371866faf422f578c7ca8517facdf9331577bc69c5c856a75c8dc4014c0ed6ad2cef662cde7d551c212f412303e816b -DIST abaddon-0.1.8.gh.tar.gz 12829641 BLAKE2B f69210694bdb4d2d7a2cc4c4babbccc8afc15ba4429c08f6b477372c6d77af23d9d2e55b1283ce87b1a1a8cd10609723bc2b49cce21b6a6cdc2352a164cdcc77 SHA512 f9a52b76c4f39d28d5f3b17df9760dd45d3ee25ea254b267537544408a85f33f62c1f82febc2c5426b3533ec148ae9d25eb6ff167b61c1fd5b51c6bd6c923275 diff --git a/net-im/abaddon/abaddon-0.1.8.ebuild b/net-im/abaddon/abaddon-0.1.8.ebuild deleted file mode 100644 index 06af37878c..00 --- a/net-im/abaddon/abaddon-0.1.8.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop - -DESCRIPTION="Alternative Discord client using GTK instead of Electron" -HOMEPAGE="https://github.com/uowuo/abaddon"; -SRC_URI=" - https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz -" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+libhandy" - -RDEPEND=" - dev-cpp/gtkmm:3.0= - dev-db/sqlite:3 - net-misc/curl - >=net-libs/ixwebsocket-11.0.8 - sys-libs/zlib:= - libhandy? ( gui-libs/libhandy:= ) -" -DEPEND=" - ${RDEPEND} - dev-cpp/nlohmann_json -" - -src_configure() { - local mycmakeargs=( - -DUSE_LIBHANDY="$(usex libhandy)" - ) - cmake_src_configure -} - -src_install() { - dodoc README.md - - dobin "${BUILD_DIR}"/abaddon - - insinto /usr/share/${PN} - doins -r res/* - - make_desktop_entry /usr/bin/${PN} -}
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 5e25ad243cfe11adb330376deb646b85f8bd356c Author: Benoît Dufour mail com> AuthorDate: Tue Oct 31 20:28:29 2023 + Commit: Benoît Dufour mail com> CommitDate: Tue Oct 31 20:28:29 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5e25ad24 net-im/abaddon: Add USE flag to enable QR Code login and add dependencies on media-libs/qrcodegen::guru Signed-off-by: Benoît Dufour mail.com> .../abaddon/{abaddon-0.1.12.ebuild => abaddon-0.1.12-r1.ebuild} | 9 + net-im/abaddon/abaddon-.ebuild | 9 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/net-im/abaddon/abaddon-0.1.12.ebuild b/net-im/abaddon/abaddon-0.1.12-r1.ebuild similarity index 83% rename from net-im/abaddon/abaddon-0.1.12.ebuild rename to net-im/abaddon/abaddon-0.1.12-r1.ebuild index 3c1ff56c4f..6c184160eb 100644 --- a/net-im/abaddon/abaddon-0.1.12.ebuild +++ b/net-im/abaddon/abaddon-0.1.12-r1.ebuild @@ -20,7 +20,8 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="+libhandy +rnnoise" +# Disable qrcodegen by default. Only the ones who really want it should enable it. +IUSE="+libhandy +rnnoise -qrcodegen" RDEPEND=" >=net-libs/ixwebsocket-11.0.8 @@ -31,6 +32,7 @@ RDEPEND=" sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) rnnoise? ( media-libs/rnnoise ) +qrcodegen ( dev-libs/qrcodegen ) " DEPEND=" ${RDEPEND} @@ -40,12 +42,11 @@ DEPEND=" src_configure() { # Disable keychain because there's currently # no package for it in ::guru or ::gentoo - # also disable QRCODE, for the same reason local mycmakeargs=( -DUSE_LIBHANDY="$(usex libhandy)" -DENABLE_RNNOISE="$(usex rnnoise)" - -DUSE_KEYCHAIN="no" - -DENABLE_QRCODE_LOGIN="no" + -DUSE_KEYCHAIN="no" + -DENABLE_QRCODE_LOGIN="$(usex qrcodegen)" ) cmake_src_configure } diff --git a/net-im/abaddon/abaddon-.ebuild b/net-im/abaddon/abaddon-.ebuild index 3c1ff56c4f..6c184160eb 100644 --- a/net-im/abaddon/abaddon-.ebuild +++ b/net-im/abaddon/abaddon-.ebuild @@ -20,7 +20,8 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="+libhandy +rnnoise" +# Disable qrcodegen by default. Only the ones who really want it should enable it. +IUSE="+libhandy +rnnoise -qrcodegen" RDEPEND=" >=net-libs/ixwebsocket-11.0.8 @@ -31,6 +32,7 @@ RDEPEND=" sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) rnnoise? ( media-libs/rnnoise ) +qrcodegen ( dev-libs/qrcodegen ) " DEPEND=" ${RDEPEND} @@ -40,12 +42,11 @@ DEPEND=" src_configure() { # Disable keychain because there's currently # no package for it in ::guru or ::gentoo - # also disable QRCODE, for the same reason local mycmakeargs=( -DUSE_LIBHANDY="$(usex libhandy)" -DENABLE_RNNOISE="$(usex rnnoise)" - -DUSE_KEYCHAIN="no" - -DENABLE_QRCODE_LOGIN="no" + -DUSE_KEYCHAIN="no" + -DENABLE_QRCODE_LOGIN="$(usex qrcodegen)" ) cmake_src_configure }
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 11db70be9284be1851341028307e97442cb270cd Author: Benoît Dufour mail com> AuthorDate: Tue Oct 31 20:38:44 2023 + Commit: Benoît Dufour mail com> CommitDate: Tue Oct 31 20:38:44 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=11db70be net-im/abaddon: Fix the metadata.xml file according to the new USE flag. Signed-off-by: Benoît Dufour mail.com> net-im/abaddon/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml index 88b7273623..6e876a53b1 100644 --- a/net-im/abaddon/metadata.xml +++ b/net-im/abaddon/metadata.xml @@ -6,6 +6,7 @@ Remigiusz Micielski + Support for login through QR Code feature using dev-libs/qrcodegen Support for features using gui-libs/libhandy Support for noise reduction using media-libs/rnnoise
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 6865ce1a852a72a215635df1b020b2d093fc0f91 Author: Leonardo Hernández Hernández proton me> AuthorDate: Wed Nov 1 19:09:33 2023 + Commit: Leonardo Hernandez proton me> CommitDate: Wed Nov 1 19:09:33 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6865ce1a net-im/abaddon: fix conditional depend of qrcodegen Signed-off-by: Leonardo Hernández Hernández proton.me> net-im/abaddon/abaddon-0.1.12-r1.ebuild | 2 +- net-im/abaddon/abaddon-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-im/abaddon/abaddon-0.1.12-r1.ebuild b/net-im/abaddon/abaddon-0.1.12-r1.ebuild index 6c184160eb..94666e37c1 100644 --- a/net-im/abaddon/abaddon-0.1.12-r1.ebuild +++ b/net-im/abaddon/abaddon-0.1.12-r1.ebuild @@ -31,8 +31,8 @@ RDEPEND=" net-misc/curl sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) + qrcodegen? ( dev-libs/qrcodegen ) rnnoise? ( media-libs/rnnoise ) -qrcodegen ( dev-libs/qrcodegen ) " DEPEND=" ${RDEPEND} diff --git a/net-im/abaddon/abaddon-.ebuild b/net-im/abaddon/abaddon-.ebuild index 6c184160eb..94666e37c1 100644 --- a/net-im/abaddon/abaddon-.ebuild +++ b/net-im/abaddon/abaddon-.ebuild @@ -31,8 +31,8 @@ RDEPEND=" net-misc/curl sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) + qrcodegen? ( dev-libs/qrcodegen ) rnnoise? ( media-libs/rnnoise ) -qrcodegen ( dev-libs/qrcodegen ) " DEPEND=" ${RDEPEND}
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: e77680b04d813fd768e1db937821bc61a608f1a6 Author: Leonardo Hernández Hernández proton me> AuthorDate: Wed Nov 1 19:17:28 2023 + Commit: Leonardo Hernandez proton me> CommitDate: Wed Nov 1 19:17:28 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e77680b0 net-im/abaddon: misc style fixes Signed-off-by: Leonardo Hernández Hernández proton.me> net-im/abaddon/abaddon-0.1.12-r1.ebuild | 4 ++-- net-im/abaddon/abaddon-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-im/abaddon/abaddon-0.1.12-r1.ebuild b/net-im/abaddon/abaddon-0.1.12-r1.ebuild index 34dbe184e0..47487350f4 100644 --- a/net-im/abaddon/abaddon-0.1.12-r1.ebuild +++ b/net-im/abaddon/abaddon-0.1.12-r1.ebuild @@ -23,10 +23,10 @@ SLOT="0" IUSE="+libhandy +rnnoise qrcodegen" RDEPEND=" - >=net-libs/ixwebsocket-11.0.8 dev-cpp/gtkmm:3.0= dev-db/sqlite:3 dev-libs/miniaudio + >=net-libs/ixwebsocket-11.0.8 net-misc/curl sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) @@ -44,7 +44,7 @@ src_configure() { local mycmakeargs=( -DUSE_LIBHANDY="$(usex libhandy)" -DENABLE_RNNOISE="$(usex rnnoise)" - -DUSE_KEYCHAIN="no" + -DUSE_KEYCHAIN="no" -DENABLE_QRCODE_LOGIN="$(usex qrcodegen)" ) cmake_src_configure diff --git a/net-im/abaddon/abaddon-.ebuild b/net-im/abaddon/abaddon-.ebuild index 34dbe184e0..47487350f4 100644 --- a/net-im/abaddon/abaddon-.ebuild +++ b/net-im/abaddon/abaddon-.ebuild @@ -23,10 +23,10 @@ SLOT="0" IUSE="+libhandy +rnnoise qrcodegen" RDEPEND=" - >=net-libs/ixwebsocket-11.0.8 dev-cpp/gtkmm:3.0= dev-db/sqlite:3 dev-libs/miniaudio + >=net-libs/ixwebsocket-11.0.8 net-misc/curl sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) @@ -44,7 +44,7 @@ src_configure() { local mycmakeargs=( -DUSE_LIBHANDY="$(usex libhandy)" -DENABLE_RNNOISE="$(usex rnnoise)" - -DUSE_KEYCHAIN="no" + -DUSE_KEYCHAIN="no" -DENABLE_QRCODE_LOGIN="$(usex qrcodegen)" ) cmake_src_configure
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 2639549a9dc717d9b1715b1eddbf8d065c5e7ece Author: Leonardo Hernández Hernández proton me> AuthorDate: Wed Nov 1 19:14:34 2023 + Commit: Leonardo Hernandez proton me> CommitDate: Wed Nov 1 19:14:34 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2639549a net-im/abaddon: do not disable IUSE=qrcodegen by default the USE-flag was masked in the previous commit Signed-off-by: Leonardo Hernández Hernández proton.me> net-im/abaddon/abaddon-0.1.12-r1.ebuild | 3 +-- net-im/abaddon/abaddon-.ebuild | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/net-im/abaddon/abaddon-0.1.12-r1.ebuild b/net-im/abaddon/abaddon-0.1.12-r1.ebuild index 94666e37c1..34dbe184e0 100644 --- a/net-im/abaddon/abaddon-0.1.12-r1.ebuild +++ b/net-im/abaddon/abaddon-0.1.12-r1.ebuild @@ -20,8 +20,7 @@ fi LICENSE="GPL-3" SLOT="0" -# Disable qrcodegen by default. Only the ones who really want it should enable it. -IUSE="+libhandy +rnnoise -qrcodegen" +IUSE="+libhandy +rnnoise qrcodegen" RDEPEND=" >=net-libs/ixwebsocket-11.0.8 diff --git a/net-im/abaddon/abaddon-.ebuild b/net-im/abaddon/abaddon-.ebuild index 94666e37c1..34dbe184e0 100644 --- a/net-im/abaddon/abaddon-.ebuild +++ b/net-im/abaddon/abaddon-.ebuild @@ -20,8 +20,7 @@ fi LICENSE="GPL-3" SLOT="0" -# Disable qrcodegen by default. Only the ones who really want it should enable it. -IUSE="+libhandy +rnnoise -qrcodegen" +IUSE="+libhandy +rnnoise qrcodegen" RDEPEND=" >=net-libs/ixwebsocket-11.0.8
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 7c7fc95316ebd434dcbf083bdf171cae9dc547ec Author: Remigiusz Micielski purelymail com> AuthorDate: Sun Nov 26 08:38:29 2023 + Commit: Remigiusz Micielski gmail com> CommitDate: Sun Nov 26 08:38:43 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7c7fc953 net-im/abaddon: add 0.1.13 Signed-off-by: Remigiusz Micielski purelymail.com> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.13.ebuild | 60 2 files changed, 61 insertions(+) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index 459d08e1a4..b5102f44e5 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1,2 @@ DIST abaddon-0.1.12.tar.gz 12889771 BLAKE2B baeb6fb88eeb30332c290976f104a7efcfd09d8ed5a73464387b20abb41c1b899a926fdacfb7ddd069a843112c0d4ae08787a097842051abecc333f5e1709bbe SHA512 50e7af172fa12f382976c9bc10c9c1cde371866faf422f578c7ca8517facdf9331577bc69c5c856a75c8dc4014c0ed6ad2cef662cde7d551c212f412303e816b +DIST abaddon-0.1.13.tar.gz 13013920 BLAKE2B 4cf9600ff3d1d3ea1e8aa82c82a3364f93e2c0b018d2c6211ded1d727627e3e06b5b88d714f081467bfad37644870a3b041de4b9524ce168ed7a45fffc9bf8d8 SHA512 e96167779e5ee7383c330e8a90afd0c58cb6dcb9e66bda38f2dc8f8fcac940ae44b789fd5afddb12ba493065db61cb68e74c378cad5c2ab67cbbc13cf90aa834 diff --git a/net-im/abaddon/abaddon-0.1.13.ebuild b/net-im/abaddon/abaddon-0.1.13.ebuild new file mode 100644 index 00..47487350f4 --- /dev/null +++ b/net-im/abaddon/abaddon-0.1.13.ebuild @@ -0,0 +1,60 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop + +DESCRIPTION="Alternative Discord client using GTK instead of Electron" +HOMEPAGE="https://github.com/uowuo/abaddon"; + +if [[ ${PV} == ]]; then + EGIT_REPO_URI="https://github.com/uowuo/abaddon.git"; + # All dependencies are provided by portage + EGIT_SUBMODULES=() + inherit git-r3 +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="+libhandy +rnnoise qrcodegen" + +RDEPEND=" + dev-cpp/gtkmm:3.0= + dev-db/sqlite:3 + dev-libs/miniaudio + >=net-libs/ixwebsocket-11.0.8 + net-misc/curl + sys-libs/zlib:= + libhandy? ( gui-libs/libhandy:= ) + qrcodegen? ( dev-libs/qrcodegen ) + rnnoise? ( media-libs/rnnoise ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" + +src_configure() { + # Disable keychain because there's currently + # no package for it in ::guru or ::gentoo + local mycmakeargs=( + -DUSE_LIBHANDY="$(usex libhandy)" + -DENABLE_RNNOISE="$(usex rnnoise)" + -DUSE_KEYCHAIN="no" + -DENABLE_QRCODE_LOGIN="$(usex qrcodegen)" + ) + cmake_src_configure +} + +src_install() { + dobin "${BUILD_DIR}"/abaddon + + insinto /usr/share/${PN} + doins -r res/* + + make_desktop_entry /usr/bin/${PN} +}
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
commit: 230de882f12df4b2e30ed5bd4b0cb11cb93d5fbd Author: Benoît Dufour mail com> AuthorDate: Sat Jun 15 00:33:03 2024 + Commit: Benoît Dufour mail com> CommitDate: Sat Jun 15 00:33:03 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=230de882 net-im/abaddon: add 0.2.1 Signed-off-by: Benoît Dufour mail.com> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.2.1.ebuild | 63 + 2 files changed, 64 insertions(+) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index b5102f44e..01a5ac072 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1,3 @@ DIST abaddon-0.1.12.tar.gz 12889771 BLAKE2B baeb6fb88eeb30332c290976f104a7efcfd09d8ed5a73464387b20abb41c1b899a926fdacfb7ddd069a843112c0d4ae08787a097842051abecc333f5e1709bbe SHA512 50e7af172fa12f382976c9bc10c9c1cde371866faf422f578c7ca8517facdf9331577bc69c5c856a75c8dc4014c0ed6ad2cef662cde7d551c212f412303e816b DIST abaddon-0.1.13.tar.gz 13013920 BLAKE2B 4cf9600ff3d1d3ea1e8aa82c82a3364f93e2c0b018d2c6211ded1d727627e3e06b5b88d714f081467bfad37644870a3b041de4b9524ce168ed7a45fffc9bf8d8 SHA512 e96167779e5ee7383c330e8a90afd0c58cb6dcb9e66bda38f2dc8f8fcac940ae44b789fd5afddb12ba493065db61cb68e74c378cad5c2ab67cbbc13cf90aa834 +DIST abaddon-0.2.1.tar.gz 14187672 BLAKE2B 80adeeda5aa6244676cba1247eb5d4e43e1b6a31130ee902146af62a4b824fbaa0711a1014b626bdb3c70210cdca7b2a1fd598e443fcde3369bec47dfd1675cd SHA512 d3d94ffcf361fcbee787de85bca2901feddcd24c543d80969cacaa2e28ad5c6548beee335ff1c394994618a05f22e6ee7114e8ef26355c65fb0315a58c5b775a diff --git a/net-im/abaddon/abaddon-0.2.1.ebuild b/net-im/abaddon/abaddon-0.2.1.ebuild new file mode 100644 index 0..f3cda4227 --- /dev/null +++ b/net-im/abaddon/abaddon-0.2.1.ebuild @@ -0,0 +1,63 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop + +DESCRIPTION="Alternative Discord client using GTK instead of Electron" +HOMEPAGE="https://github.com/uowuo/abaddon"; + +if [[ ${PV} == ]]; then + EGIT_REPO_URI="https://github.com/uowuo/abaddon.git"; + # All dependencies are provided by portage + EGIT_SUBMODULES=() + inherit git-r3 +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="+libhandy +rnnoise qrcodegen" + +RDEPEND=" + dev-cpp/gtkmm:3.0= + dev-db/sqlite:3 + dev-libs/libsodium + dev-libs/miniaudio + dev-libs/spdlog + media-libs/opus + >=net-libs/ixwebsocket-11.0.8 + net-misc/curl + sys-libs/zlib:= + libhandy? ( gui-libs/libhandy:= ) + qrcodegen? ( dev-libs/qrcodegen ) + rnnoise? ( media-libs/rnnoise ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" + +src_configure() { + # Disable keychain because there's currently + # no package for it in ::guru or ::gentoo + local mycmakeargs=( + -DUSE_LIBHANDY="$(usex libhandy)" + -DENABLE_RNNOISE="$(usex rnnoise)" + -DUSE_KEYCHAIN="no" + -DENABLE_QRCODE_LOGIN="$(usex qrcodegen)" + ) + cmake_src_configure +} + +src_install() { + dobin "${BUILD_DIR}"/abaddon + + insinto /usr/share/${PN} + doins -r res/* + + make_desktop_entry /usr/bin/${PN} +}
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/files/, net-im/abaddon/
commit: 34706315a36de754450ca83eda6d40346f388766 Author: Adrian Schollmeyer nexadn de> AuthorDate: Tue Sep 28 13:43:10 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Tue Sep 28 13:43:10 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34706315 net-im/abaddon: Remove vendored dependencies Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest| 1 - net-im/abaddon/abaddon-0.1.0.ebuild| 12 +++-- ...baddon-0.1.0-remove-vendored-dependencies.patch | 29 ++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index b9936a57a..a9031ec07 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 -DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index f987740f9..5e1dfdca0 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -5,13 +5,10 @@ EAPI=7 inherit cmake desktop -SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" - DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; SRC_URI=" https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz " LICENSE="GPL-3" @@ -19,6 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" + >=dev-cpp/simpleini-4.17_p20210831 dev-cpp/gtkmm:3.0= dev-db/sqlite:3 net-misc/curl @@ -31,11 +29,9 @@ DEPEND=" " BDEPEND="" -src_unpack() { - default - rm -r "${S}/thirdparty/simpleini" || die - ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die -} +PATCHES=( + "${FILESDIR}/${P}-remove-vendored-dependencies.patch" +) src_install() { dodoc README.md diff --git a/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch new file mode 100644 index 0..b1993cd1d --- /dev/null +++ b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 82d405f..5a2f75b 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -15,13 +15,7 @@ find_package(CURL) + find_package(ZLIB REQUIRED) + find_package(SQLite3 REQUIRED) + find_package(gtkmm REQUIRED) +- +-find_path(IXWEBSOCKET_INCLUDE_DIRS ixwebsocket/IXWebSocket.h) +-find_library(IXWEBSOCKET_LIBRARY ixwebsocket) +-if (NOT IXWEBSOCKET_LIBRARY) +- add_subdirectory(thirdparty/IXWebSocket) +- include_directories(IXWEBSOCKET_INCLUDE_DIRS) +-endif() ++find_package(ixwebsocket REQUIRED) + + include_directories(thirdparty/simpleini) + +@@ -63,6 +57,9 @@ target_include_directories(abaddon PUBLIC ${GTKMM_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${SQLite3_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${NLOHMANN_JSON_INCLUDE_DIRS}) ++target_include_directories(abaddon PUBLIC /usr/include/simpleini) ++ ++target_link_libraries(abaddon simpleini) + + if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/files/, net-im/abaddon/
commit: 34706315a36de754450ca83eda6d40346f388766 Author: Adrian Schollmeyer nexadn de> AuthorDate: Tue Sep 28 13:43:10 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Tue Sep 28 13:43:10 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34706315 net-im/abaddon: Remove vendored dependencies Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest| 1 - net-im/abaddon/abaddon-0.1.0.ebuild| 12 +++-- ...baddon-0.1.0-remove-vendored-dependencies.patch | 29 ++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index b9936a57a..a9031ec07 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 -DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index f987740f9..5e1dfdca0 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -5,13 +5,10 @@ EAPI=7 inherit cmake desktop -SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" - DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; SRC_URI=" https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz " LICENSE="GPL-3" @@ -19,6 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" + >=dev-cpp/simpleini-4.17_p20210831 dev-cpp/gtkmm:3.0= dev-db/sqlite:3 net-misc/curl @@ -31,11 +29,9 @@ DEPEND=" " BDEPEND="" -src_unpack() { - default - rm -r "${S}/thirdparty/simpleini" || die - ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die -} +PATCHES=( + "${FILESDIR}/${P}-remove-vendored-dependencies.patch" +) src_install() { dodoc README.md diff --git a/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch new file mode 100644 index 0..b1993cd1d --- /dev/null +++ b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 82d405f..5a2f75b 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -15,13 +15,7 @@ find_package(CURL) + find_package(ZLIB REQUIRED) + find_package(SQLite3 REQUIRED) + find_package(gtkmm REQUIRED) +- +-find_path(IXWEBSOCKET_INCLUDE_DIRS ixwebsocket/IXWebSocket.h) +-find_library(IXWEBSOCKET_LIBRARY ixwebsocket) +-if (NOT IXWEBSOCKET_LIBRARY) +- add_subdirectory(thirdparty/IXWebSocket) +- include_directories(IXWEBSOCKET_INCLUDE_DIRS) +-endif() ++find_package(ixwebsocket REQUIRED) + + include_directories(thirdparty/simpleini) + +@@ -63,6 +57,9 @@ target_include_directories(abaddon PUBLIC ${GTKMM_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${SQLite3_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${NLOHMANN_JSON_INCLUDE_DIRS}) ++target_include_directories(abaddon PUBLIC /usr/include/simpleini) ++ ++target_link_libraries(abaddon simpleini) + + if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/files/, net-im/abaddon/
commit: 34706315a36de754450ca83eda6d40346f388766 Author: Adrian Schollmeyer nexadn de> AuthorDate: Tue Sep 28 13:43:10 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Tue Sep 28 13:43:10 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34706315 net-im/abaddon: Remove vendored dependencies Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest| 1 - net-im/abaddon/abaddon-0.1.0.ebuild| 12 +++-- ...baddon-0.1.0-remove-vendored-dependencies.patch | 29 ++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index b9936a57a..a9031ec07 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 -DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index f987740f9..5e1dfdca0 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -5,13 +5,10 @@ EAPI=7 inherit cmake desktop -SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" - DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; SRC_URI=" https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz " LICENSE="GPL-3" @@ -19,6 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" + >=dev-cpp/simpleini-4.17_p20210831 dev-cpp/gtkmm:3.0= dev-db/sqlite:3 net-misc/curl @@ -31,11 +29,9 @@ DEPEND=" " BDEPEND="" -src_unpack() { - default - rm -r "${S}/thirdparty/simpleini" || die - ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die -} +PATCHES=( + "${FILESDIR}/${P}-remove-vendored-dependencies.patch" +) src_install() { dodoc README.md diff --git a/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch new file mode 100644 index 0..b1993cd1d --- /dev/null +++ b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 82d405f..5a2f75b 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -15,13 +15,7 @@ find_package(CURL) + find_package(ZLIB REQUIRED) + find_package(SQLite3 REQUIRED) + find_package(gtkmm REQUIRED) +- +-find_path(IXWEBSOCKET_INCLUDE_DIRS ixwebsocket/IXWebSocket.h) +-find_library(IXWEBSOCKET_LIBRARY ixwebsocket) +-if (NOT IXWEBSOCKET_LIBRARY) +- add_subdirectory(thirdparty/IXWebSocket) +- include_directories(IXWEBSOCKET_INCLUDE_DIRS) +-endif() ++find_package(ixwebsocket REQUIRED) + + include_directories(thirdparty/simpleini) + +@@ -63,6 +57,9 @@ target_include_directories(abaddon PUBLIC ${GTKMM_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${SQLite3_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${NLOHMANN_JSON_INCLUDE_DIRS}) ++target_include_directories(abaddon PUBLIC /usr/include/simpleini) ++ ++target_link_libraries(abaddon simpleini) + + if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/files/, net-im/abaddon/
commit: 34706315a36de754450ca83eda6d40346f388766 Author: Adrian Schollmeyer nexadn de> AuthorDate: Tue Sep 28 13:43:10 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Tue Sep 28 13:43:10 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34706315 net-im/abaddon: Remove vendored dependencies Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest| 1 - net-im/abaddon/abaddon-0.1.0.ebuild| 12 +++-- ...baddon-0.1.0-remove-vendored-dependencies.patch | 29 ++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index b9936a57a..a9031ec07 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 -DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index f987740f9..5e1dfdca0 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -5,13 +5,10 @@ EAPI=7 inherit cmake desktop -SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" - DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; SRC_URI=" https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz " LICENSE="GPL-3" @@ -19,6 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" + >=dev-cpp/simpleini-4.17_p20210831 dev-cpp/gtkmm:3.0= dev-db/sqlite:3 net-misc/curl @@ -31,11 +29,9 @@ DEPEND=" " BDEPEND="" -src_unpack() { - default - rm -r "${S}/thirdparty/simpleini" || die - ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die -} +PATCHES=( + "${FILESDIR}/${P}-remove-vendored-dependencies.patch" +) src_install() { dodoc README.md diff --git a/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch new file mode 100644 index 0..b1993cd1d --- /dev/null +++ b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 82d405f..5a2f75b 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -15,13 +15,7 @@ find_package(CURL) + find_package(ZLIB REQUIRED) + find_package(SQLite3 REQUIRED) + find_package(gtkmm REQUIRED) +- +-find_path(IXWEBSOCKET_INCLUDE_DIRS ixwebsocket/IXWebSocket.h) +-find_library(IXWEBSOCKET_LIBRARY ixwebsocket) +-if (NOT IXWEBSOCKET_LIBRARY) +- add_subdirectory(thirdparty/IXWebSocket) +- include_directories(IXWEBSOCKET_INCLUDE_DIRS) +-endif() ++find_package(ixwebsocket REQUIRED) + + include_directories(thirdparty/simpleini) + +@@ -63,6 +57,9 @@ target_include_directories(abaddon PUBLIC ${GTKMM_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${SQLite3_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${NLOHMANN_JSON_INCLUDE_DIRS}) ++target_include_directories(abaddon PUBLIC /usr/include/simpleini) ++ ++target_link_libraries(abaddon simpleini) + + if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/files/, net-im/abaddon/
commit: 34706315a36de754450ca83eda6d40346f388766 Author: Adrian Schollmeyer nexadn de> AuthorDate: Tue Sep 28 13:43:10 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Tue Sep 28 13:43:10 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34706315 net-im/abaddon: Remove vendored dependencies Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest| 1 - net-im/abaddon/abaddon-0.1.0.ebuild| 12 +++-- ...baddon-0.1.0-remove-vendored-dependencies.patch | 29 ++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index b9936a57a..a9031ec07 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 -DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index f987740f9..5e1dfdca0 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -5,13 +5,10 @@ EAPI=7 inherit cmake desktop -SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" - DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; SRC_URI=" https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz " LICENSE="GPL-3" @@ -19,6 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" + >=dev-cpp/simpleini-4.17_p20210831 dev-cpp/gtkmm:3.0= dev-db/sqlite:3 net-misc/curl @@ -31,11 +29,9 @@ DEPEND=" " BDEPEND="" -src_unpack() { - default - rm -r "${S}/thirdparty/simpleini" || die - ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die -} +PATCHES=( + "${FILESDIR}/${P}-remove-vendored-dependencies.patch" +) src_install() { dodoc README.md diff --git a/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch new file mode 100644 index 0..b1993cd1d --- /dev/null +++ b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 82d405f..5a2f75b 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -15,13 +15,7 @@ find_package(CURL) + find_package(ZLIB REQUIRED) + find_package(SQLite3 REQUIRED) + find_package(gtkmm REQUIRED) +- +-find_path(IXWEBSOCKET_INCLUDE_DIRS ixwebsocket/IXWebSocket.h) +-find_library(IXWEBSOCKET_LIBRARY ixwebsocket) +-if (NOT IXWEBSOCKET_LIBRARY) +- add_subdirectory(thirdparty/IXWebSocket) +- include_directories(IXWEBSOCKET_INCLUDE_DIRS) +-endif() ++find_package(ixwebsocket REQUIRED) + + include_directories(thirdparty/simpleini) + +@@ -63,6 +57,9 @@ target_include_directories(abaddon PUBLIC ${GTKMM_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${SQLite3_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${NLOHMANN_JSON_INCLUDE_DIRS}) ++target_include_directories(abaddon PUBLIC /usr/include/simpleini) ++ ++target_link_libraries(abaddon simpleini) + + if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/files/, net-im/abaddon/
commit: 34706315a36de754450ca83eda6d40346f388766 Author: Adrian Schollmeyer nexadn de> AuthorDate: Tue Sep 28 13:43:10 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Tue Sep 28 13:43:10 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34706315 net-im/abaddon: Remove vendored dependencies Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest| 1 - net-im/abaddon/abaddon-0.1.0.ebuild| 12 +++-- ...baddon-0.1.0-remove-vendored-dependencies.patch | 29 ++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index b9936a57a..a9031ec07 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 -DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index f987740f9..5e1dfdca0 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -5,13 +5,10 @@ EAPI=7 inherit cmake desktop -SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" - DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; SRC_URI=" https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz " LICENSE="GPL-3" @@ -19,6 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" + >=dev-cpp/simpleini-4.17_p20210831 dev-cpp/gtkmm:3.0= dev-db/sqlite:3 net-misc/curl @@ -31,11 +29,9 @@ DEPEND=" " BDEPEND="" -src_unpack() { - default - rm -r "${S}/thirdparty/simpleini" || die - ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die -} +PATCHES=( + "${FILESDIR}/${P}-remove-vendored-dependencies.patch" +) src_install() { dodoc README.md diff --git a/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch new file mode 100644 index 0..b1993cd1d --- /dev/null +++ b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 82d405f..5a2f75b 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -15,13 +15,7 @@ find_package(CURL) + find_package(ZLIB REQUIRED) + find_package(SQLite3 REQUIRED) + find_package(gtkmm REQUIRED) +- +-find_path(IXWEBSOCKET_INCLUDE_DIRS ixwebsocket/IXWebSocket.h) +-find_library(IXWEBSOCKET_LIBRARY ixwebsocket) +-if (NOT IXWEBSOCKET_LIBRARY) +- add_subdirectory(thirdparty/IXWebSocket) +- include_directories(IXWEBSOCKET_INCLUDE_DIRS) +-endif() ++find_package(ixwebsocket REQUIRED) + + include_directories(thirdparty/simpleini) + +@@ -63,6 +57,9 @@ target_include_directories(abaddon PUBLIC ${GTKMM_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${SQLite3_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${NLOHMANN_JSON_INCLUDE_DIRS}) ++target_include_directories(abaddon PUBLIC /usr/include/simpleini) ++ ++target_link_libraries(abaddon simpleini) + + if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/files/, net-im/abaddon/
commit: 34706315a36de754450ca83eda6d40346f388766 Author: Adrian Schollmeyer nexadn de> AuthorDate: Tue Sep 28 13:43:10 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Tue Sep 28 13:43:10 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34706315 net-im/abaddon: Remove vendored dependencies Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest| 1 - net-im/abaddon/abaddon-0.1.0.ebuild| 12 +++-- ...baddon-0.1.0-remove-vendored-dependencies.patch | 29 ++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index b9936a57a..a9031ec07 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 -DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index f987740f9..5e1dfdca0 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -5,13 +5,10 @@ EAPI=7 inherit cmake desktop -SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" - DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; SRC_URI=" https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz " LICENSE="GPL-3" @@ -19,6 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" + >=dev-cpp/simpleini-4.17_p20210831 dev-cpp/gtkmm:3.0= dev-db/sqlite:3 net-misc/curl @@ -31,11 +29,9 @@ DEPEND=" " BDEPEND="" -src_unpack() { - default - rm -r "${S}/thirdparty/simpleini" || die - ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die -} +PATCHES=( + "${FILESDIR}/${P}-remove-vendored-dependencies.patch" +) src_install() { dodoc README.md diff --git a/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch new file mode 100644 index 0..b1993cd1d --- /dev/null +++ b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 82d405f..5a2f75b 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -15,13 +15,7 @@ find_package(CURL) + find_package(ZLIB REQUIRED) + find_package(SQLite3 REQUIRED) + find_package(gtkmm REQUIRED) +- +-find_path(IXWEBSOCKET_INCLUDE_DIRS ixwebsocket/IXWebSocket.h) +-find_library(IXWEBSOCKET_LIBRARY ixwebsocket) +-if (NOT IXWEBSOCKET_LIBRARY) +- add_subdirectory(thirdparty/IXWebSocket) +- include_directories(IXWEBSOCKET_INCLUDE_DIRS) +-endif() ++find_package(ixwebsocket REQUIRED) + + include_directories(thirdparty/simpleini) + +@@ -63,6 +57,9 @@ target_include_directories(abaddon PUBLIC ${GTKMM_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${SQLite3_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${NLOHMANN_JSON_INCLUDE_DIRS}) ++target_include_directories(abaddon PUBLIC /usr/include/simpleini) ++ ++target_link_libraries(abaddon simpleini) + + if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/files/, net-im/abaddon/
commit: 34706315a36de754450ca83eda6d40346f388766 Author: Adrian Schollmeyer nexadn de> AuthorDate: Tue Sep 28 13:43:10 2021 + Commit: Adrian Schollmeyer nexadn de> CommitDate: Tue Sep 28 13:43:10 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34706315 net-im/abaddon: Remove vendored dependencies Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer nexadn.de> net-im/abaddon/Manifest| 1 - net-im/abaddon/abaddon-0.1.0.ebuild| 12 +++-- ...baddon-0.1.0-remove-vendored-dependencies.patch | 29 ++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index b9936a57a..a9031ec07 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 -DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index f987740f9..5e1dfdca0 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -5,13 +5,10 @@ EAPI=7 inherit cmake desktop -SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" - DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; SRC_URI=" https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz " LICENSE="GPL-3" @@ -19,6 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" + >=dev-cpp/simpleini-4.17_p20210831 dev-cpp/gtkmm:3.0= dev-db/sqlite:3 net-misc/curl @@ -31,11 +29,9 @@ DEPEND=" " BDEPEND="" -src_unpack() { - default - rm -r "${S}/thirdparty/simpleini" || die - ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die -} +PATCHES=( + "${FILESDIR}/${P}-remove-vendored-dependencies.patch" +) src_install() { dodoc README.md diff --git a/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch new file mode 100644 index 0..b1993cd1d --- /dev/null +++ b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 82d405f..5a2f75b 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -15,13 +15,7 @@ find_package(CURL) + find_package(ZLIB REQUIRED) + find_package(SQLite3 REQUIRED) + find_package(gtkmm REQUIRED) +- +-find_path(IXWEBSOCKET_INCLUDE_DIRS ixwebsocket/IXWebSocket.h) +-find_library(IXWEBSOCKET_LIBRARY ixwebsocket) +-if (NOT IXWEBSOCKET_LIBRARY) +- add_subdirectory(thirdparty/IXWebSocket) +- include_directories(IXWEBSOCKET_INCLUDE_DIRS) +-endif() ++find_package(ixwebsocket REQUIRED) + + include_directories(thirdparty/simpleini) + +@@ -63,6 +57,9 @@ target_include_directories(abaddon PUBLIC ${GTKMM_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${SQLite3_INCLUDE_DIRS}) + target_include_directories(abaddon PUBLIC ${NLOHMANN_JSON_INCLUDE_DIRS}) ++target_include_directories(abaddon PUBLIC /usr/include/simpleini) ++ ++target_link_libraries(abaddon simpleini) + + if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/files/, net-im/abaddon/
commit: 7b256a87bba322a32d193d59ca84cd5d99c98783 Author: Takuya Wakazono gmail com> AuthorDate: Sat Jun 15 03:49:13 2024 + Commit: Takuya Wakazono gmail com> CommitDate: Sat Jun 15 03:52:15 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7b256a87 net-im/abaddon: add missing includes Signed-off-by: Takuya Wakazono gmail.com> net-im/abaddon/abaddon-0.2.1.ebuild| 7 ++- .../abaddon/files/abaddon-0.2.1-missing-include.patch | 18 ++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/net-im/abaddon/abaddon-0.2.1.ebuild b/net-im/abaddon/abaddon-0.2.1.ebuild index f3cda4227..a51c94aa9 100644 --- a/net-im/abaddon/abaddon-0.2.1.ebuild +++ b/net-im/abaddon/abaddon-0.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,6 +41,11 @@ DEPEND=" dev-cpp/nlohmann_json " +PATCHES=( + # Add missing includes + "${FILESDIR}/${P}-missing-include.patch" +) + src_configure() { # Disable keychain because there's currently # no package for it in ::guru or ::gentoo diff --git a/net-im/abaddon/files/abaddon-0.2.1-missing-include.patch b/net-im/abaddon/files/abaddon-0.2.1-missing-include.patch new file mode 100644 index 0..d99694e3c --- /dev/null +++ b/net-im/abaddon/files/abaddon-0.2.1-missing-include.patch @@ -0,0 +1,18 @@ +Add missing includes. +https://github.com/uowuo/abaddon/commit/7ed65a89ae71c3c5d2ba99797bd2b1d93ce172ca +https://github.com/uowuo/abaddon/pull/312 +--- a/src/platform.cpp b/src/platform.cpp +@@ -1,9 +1,12 @@ + #include "platform.hpp" ++#include "util.hpp" + #include + #include + #include + #include + ++#include ++ + using namespace std::literals::string_literals; + + #if defined(_WIN32)
[gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/, dev-libs/qrcodegen/files/, profiles/updates/, ...
commit: 51709fafa48b6467d845f5cad2dfee3aa442d204 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sun Aug 25 12:16:52 2024 + Commit: Anna Vyalkova sysrq in> CommitDate: Sun Aug 25 12:16:52 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=51709faf dev-libs/qrcodegen: treeclean duplicate Packaged in gentoo as dev-libs/qr-code-generator Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> dev-libs/qrcodegen/Manifest| 1 - .../files/c_makefile_generate_libraries.patch | 73 -- .../files/cpp_makefile_generate_libraries.patch| 70 - dev-libs/qrcodegen/metadata.xml| 8 --- dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild | 42 - net-im/abaddon/abaddon-0.1.12-r1.ebuild| 2 +- net-im/abaddon/abaddon-0.1.13.ebuild | 2 +- net-im/abaddon/abaddon-0.2.1.ebuild| 2 +- net-im/abaddon/abaddon-.ebuild | 2 +- net-im/abaddon/metadata.xml| 2 +- profiles/updates/3Q-2024 | 1 + 11 files changed, 6 insertions(+), 199 deletions(-) diff --git a/dev-libs/qrcodegen/Manifest b/dev-libs/qrcodegen/Manifest deleted file mode 100644 index 203ac5155..0 --- a/dev-libs/qrcodegen/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qrcodegen-1.8.0.tar.gz 193288 BLAKE2B 2e511baf35fbfdb71ad5e2dc91c1400a113eb9bce51afa022c34b7ad7d3c9be4a862e2caaef89f517fbbf29879223fb078c88fdec27d6a876126c798ac6772c6 SHA512 0cdf0873e71aed124fc7357da86fb26f23fd26432f94c9752fa5a044085b26e5aece2115134d0e50213ff24be7c55818e7dec31205a68751065bc82ab0c2c6ac diff --git a/dev-libs/qrcodegen/files/c_makefile_generate_libraries.patch b/dev-libs/qrcodegen/files/c_makefile_generate_libraries.patch deleted file mode 100644 index b21b820f8..0 --- a/dev-libs/qrcodegen/files/c_makefile_generate_libraries.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/c/Makefile b/c/Makefile -index 661b1f7..7a507b2 100644 a/c/Makefile -+++ b/c/Makefile -@@ -51,18 +51,47 @@ CFLAGS += -std=c99 -O - # Targets to build - - LIB = qrcodegen --LIBFILE = lib$(LIB).a -+LIBFILE = lib$(LIB).so -+LIBFILE = lib$(LIB).so -+ARFILE = lib$(LIB).a -+SO_NAME = $(LIBFILE).1 -+REAL_NAME = $(LIBFILE).$(VERSION) -+HEADERS = qrcodegen.h - LIBOBJ = qrcodegen.o - MAINS = qrcodegen-demo qrcodegen-test - -+MULTIARCH ?= $(shell $(CC) --print-multiarch) -+ -+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen -+LIBDIR ?= $(DESTDIR)/usr/lib/$(MULTIARCH) -+ - # Build all binaries --all: $(LIBFILE) $(MAINS) -+all: $(LIBFILE) $(ARFILE) $(MAINS) - - # Delete build output - clean: -- rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS) -+ rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS) - rm -rf .deps - -+# Install procedure -+install-shared: $(LIBFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) -+ rm -f $(LIBDIR)/$(SO_NAME) -+ ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME) -+ rm -f $(LIBDIR)/$(LIBFILE) -+ ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE) -+ -+install-static: $(ARFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE) -+ -+install-header: $(HEADERS) -+ install -d $(INCLUDEDIR) || true -+ install -m 0644 $(HEADERS) $(INCLUDEDIR)/ -+ -+install: install-shared install-static install-header -+ - # Executable files - %: %.o $(LIBFILE) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB) -@@ -72,12 +101,15 @@ qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c) - $(CC) $(CFLAGS) $(LDFLAGS) -DQRCODEGEN_TEST -o $@ $^ - - # The library --$(LIBFILE): $(LIBOBJ) -+$(ARFILE): $(LIBOBJ) - $(AR) -crs $@ -- $^ - -+$(LIBFILE): $(LIBOBJ) -+ $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ -+ - # Object files - %.o: %.c .deps/timestamp -- $(CC) $(CFLAGS) -c -o $@ -MMD -MF .deps/$*.d $< -+ $(CC) $(CFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< - - # Have a place to store header dependencies automatically generated by compiler - .deps/timestamp: diff --git a/dev-libs/qrcodegen/files/cpp_makefile_generate_libraries.patch b/dev-libs/qrcodegen/files/cpp_makefile_generate_libraries.patch deleted file mode 100644 index 56cb4b23c..0 --- a/dev-libs/qrcodegen/files/cpp_makefile_generate_libraries.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/cpp/Makefile b/cpp/Makefile -index 57dc0bf..219f0b8 100644 a/cpp/Makefile -+++ b/cpp/Makefile -@@ -51,29 +51,60 @@ CXXFLAGS += -std=c++11 -O - # Targets to build - - LIB = qrcodegencpp --LIBFILE = lib$(LIB).a -+LIBFILE = lib$(LIB).so -+ARFILE = lib$(LIB).a -+SO_NAME = $(LIBFILE).1 -+REAL_NAME = $(LIBFILE).$(VERSION) -+HEADERS = qrcodegen.hpp - LIBOBJ = qrcodegen.o - MAINS = QrCodeGeneratorDemo - -+MULTIARCH ?= $(shell $(CC) --print-multiarch) -+ -+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrc