gui-libs/libpanel: add 1.0.1, drop 1.0_alpha1

4 files changed, 35 insertions, 24 deletions

diff --git a/gui-libs/libpanel/Manifest b/gui-libs/libpanel/Manifest
index d45d0ff..2ce87bf 100644
--- a/gui-libs/libpanel/Manifest
+++ b/gui-libs/libpanel/Manifest
@@ -1 +1 @@
-DIST libpanel-1.0_alpha1.tar.gz 117061 BLAKE2B 576e5b43e9e3a310d3decb9f91611428cb638f947c76780ce807a748c0596a51dd91f9b151c3dcafd99d3e2e55913ddc40b18f39e3cdc535b15f83667d6033e1 SHA512 6e057b14672fe4e7115e9a729f5bde46375f803052e05818b026dac8c0077afcc10ed80336d827ae503f2dd337dad3c3ffa615e0c277a82ced5616ce3a8ba129
+DIST libpanel-1.0.1.tar.xz 100852 BLAKE2B a55ac6c7c441f5c487553052dca66dd4c1efe1cc010c7202c3400df1d3fc3cfc8f886afdd796981cf14800ad34e49b8efbd274f2f97bce19600b8935a2f1f595 SHA512 5592b01e3a8c532d40e2190d1b2c332d8a104946c0813156119be98d433cd946ad839308b166ebdc399b853809e2fde90be8ea3acced053c2f11b86807163627
diff --git a/gui-libs/libpanel/files/libpanel-1.0.1-gtk-doc-dir.patch b/gui-libs/libpanel/files/libpanel-1.0.1-gtk-doc-dir.patch
new file mode 100644
index 0000000..fd68864
--- /dev/null
+++ b/gui-libs/libpanel/files/libpanel-1.0.1-gtk-doc-dir.patch
@@ -0,0 +1,20 @@
+--- a/docs/meson.build
++++ b/docs/meson.build
+@@ -6,7 +6,7 @@ if get_option('docs').allowed() and get_option('introspection').allowed()
+ 
+   gidocgen = find_program('gi-docgen')
+ 
+-  docdir = datadir / 'doc'
++  docdir = datadir / 'gtk-doc/html'
+ 
+   toml_conf = configuration_data()
+   toml_conf.set('PANEL_VERSION', meson.project_version())
+@@ -19,7 +19,7 @@ if get_option('docs').allowed() and get_option('introspection').allowed()
+ 
+   custom_target('panel-doc',
+     input:  libpanel_gir[0],
+-    output: 'panel-1.0',
++    output: 'libpanel-1.0',
+     command: [
+       gidocgen,
+       'generate',
diff --git a/gui-libs/libpanel/files/libpanel-1.0_alpha1-gtk4.6.patch b/gui-libs/libpanel/files/libpanel-1.0_alpha1-gtk4.6.patch
deleted file mode 100644
index ba1be80..0000000
--- a/gui-libs/libpanel/files/libpanel-1.0_alpha1-gtk4.6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -27,7 +27,7 @@ vapidir = join_paths(datadir, 'vala', 'vapi')
- 
- # Check dependencies
- glib_req_version = '2.72'
--gtk_req_version = '4.7'
-+gtk_req_version = '4.6'
- adwaita_req_version = '1.0'
- 
- glib_req = '>= @0@'.format(glib_req_version)
diff --git a/gui-libs/libpanel/libpanel-1.0_alpha1.ebuild b/gui-libs/libpanel/libpanel-1.0.1.ebuild
index 0dda397..1489857 100644
--- a/gui-libs/libpanel/libpanel-1.0_alpha1.ebuild
+++ b/gui-libs/libpanel/libpanel-1.0.1.ebuild
@@ -3,46 +3,48 @@
 
 EAPI=8
 
-inherit meson
+inherit meson gnome.org
 
 DESCRIPTION="dock/panel library for GTK 4"
 
 HOMEPAGE="https://gitlab.gnome.org/GNOME/libpanel"
 
-MYPV="1.0.alpha1"
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${MYPV}/${PN}-${MYPV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-${MYPV}"
-
 LICENSE="LGPL-3"
 
 SLOT="0"
 
 KEYWORDS="~amd64"
 
-IUSE="vala introspection examples"
+IUSE="vala doc introspection examples"
+
+REQUIRED_USE="doc? ( introspection )"
 
-RDEPEND=">=dev-libs/glib-2.72
+RDEPEND="
+>=dev-libs/glib-2.72
 >=gui-libs/gtk-4.6
 >=gui-libs/libadwaita-1.0
 vala? ( dev-lang/vala )
-introspection? ( dev-libs/gobject-introspection )"
+introspection? ( dev-libs/gobject-introspection )
+doc? ( >=dev-util/gi-docgen-2021.1 )
+"
 
 DEPEND="${RDEPEND}"
 
 BDEPEND="virtual/pkgconfig
 dev-util/cmake
->=dev-util/meson-0.60"
+>=dev-util/meson-0.60
+dev-util/gtk-doc-am
+"
 
 PATCHES=(
-	# i know this is stupid but whatever
-	"${FILESDIR}/${P}-gtk4.6.patch"
+	"${FILESDIR}/${P}-gtk-doc-dir.patch"
 )
 
 src_configure() {
 	local emesonargs=(
 		$(meson_use vala vapi)
 		$(meson_feature introspection)
+		$(meson_feature doc docs)
 		$(meson_use examples install-examples)
 	)
 	meson_src_configure