Skip to content

Commit

Permalink
net-misc/stargazer: Revbump for several bugs
Browse files Browse the repository at this point in the history 
The new ebuild is from the maintainer via closed PR 6662.
It seemed to be correct but just neglected.

1. Updated header, moved to EAPI 6, removed multilib eclass.
2. Patches were recreated to work with EAPI 6.
3. Fixed bug 587104.
4. Removed USE flags doc, examples, static-libs.
5. metadata.xml cleanup and fix bug #594242
6. Ebuild cleanup and fix RDEPEND
7. Filter optimization flags in debug build (use flag-o-matic).

Additional changes by committer for mysql dependency and EAPI 7

Closes: https://bugs.gentoo.org/587104
Closes: https://bugs.gentoo.org/666010
Closes: https://bugs.gentoo.org/670438
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Brian Evans <[email protected]>
  • Loading branch information
@SpiderX
SpiderX authored and Brian Evans committed Feb 15, 2019
1 parent 6f34bf3 commit e39c72b
Show file tree
Hide file tree
Showing 15 changed files with 680 additions and 702 deletions.
28 changes: 14 additions & 14 deletions net-misc/stargazer/files/patches/stg-2.408-build-upstream.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- projects/rlm_stg/build.org 2013-01-15 15:25:59.000000000 +0200
+++ projects/rlm_stg/build 2013-01-15 19:48:13.000000000 +0200
--- a/projects/rlm_stg/build.org 2013-01-15 15:25:59.000000000 +0200
+++ b/projects/rlm_stg/build 2013-01-15 19:48:13.000000000 +0200
@@ -16,21 +16,15 @@
DIR_MODE=0755
OWNER=root
Expand Down Expand Up @@ -30,8 +30,8 @@
fi

CXXFLAGS="$CXXFLAGS -I/usr/local/include"
--- projects/rscriptd/build.org 2013-01-15 18:28:32.000000000 +0200
+++ projects/rscriptd/build 2013-01-15 18:38:13.000000000 +0200
--- a/projects/rscriptd/build.org 2013-01-15 18:28:32.000000000 +0200
+++ b/projects/rscriptd/build 2013-01-15 18:38:13.000000000 +0200
@@ -16,21 +16,15 @@
DIR_MODE=0755
OWNER=root
Expand Down Expand Up @@ -61,8 +61,8 @@
fi

CXXFLAGS="$CXXFLAGS -I/usr/local/include"
--- projects/sgauth/build.org 2013-01-15 18:29:20.000000000 +0200
+++ projects/sgauth/build 2013-01-15 18:36:33.000000000 +0200
--- a/projects/sgauth/build.org 2013-01-15 18:29:20.000000000 +0200
+++ b/projects/sgauth/build 2013-01-15 18:36:33.000000000 +0200
@@ -16,21 +16,15 @@
DIR_MODE=0755
OWNER=root
Expand Down Expand Up @@ -92,8 +92,8 @@
fi

CXXFLAGS="$CXXFLAGS -I/usr/local/include"
--- projects/sgconf/build.org 2013-01-15 18:29:59.000000000 +0200
+++ projects/sgconf/build 2013-01-15 18:35:41.000000000 +0200
--- a/projects/sgconf/build.org 2013-01-15 18:29:59.000000000 +0200
+++ b/projects/sgconf/build 2013-01-15 18:35:41.000000000 +0200
@@ -16,21 +16,15 @@
DIR_MODE=0755
OWNER=root
Expand Down Expand Up @@ -123,8 +123,8 @@
fi

CXXFLAGS="$CXXFLAGS -I/usr/local/include"
--- projects/sgconf_xml/build.org 2013-01-15 18:30:26.000000000 +0200
+++ projects/sgconf_xml/build 2013-01-15 18:34:53.000000000 +0200
--- a/projects/sgconf_xml/build.org 2013-01-15 18:30:26.000000000 +0200
+++ b/projects/sgconf_xml/build 2013-01-15 18:34:53.000000000 +0200
@@ -16,21 +16,15 @@
DIR_MODE=0755
OWNER=root
Expand Down Expand Up @@ -154,8 +154,8 @@
fi

CXXFLAGS="$CXXFLAGS -I/usr/local/include"
--- projects/sgconv/build.org 2013-01-15 18:31:01.000000000 +0200
+++ projects/sgconv/build 2013-01-15 18:32:46.000000000 +0200
--- a/projects/sgconv/build.org 2013-01-15 18:31:01.000000000 +0200
+++ b/projects/sgconv/build 2013-01-15 18:32:46.000000000 +0200
@@ -16,11 +16,20 @@
DIR_MODE=0755
OWNER=root
Expand All @@ -180,8 +180,8 @@

if [ "$sys" = "Linux" ]
then
--- projects/stargazer/build.org 2013-01-15 19:48:54.000000000 +0200
+++ projects/stargazer/build 2013-01-15 19:51:13.000000000 +0200
--- a/projects/stargazer/build.org 2013-01-15 19:48:54.000000000 +0200
+++ b/projects/stargazer/build 2013-01-15 19:51:13.000000000 +0200
@@ -35,23 +35,15 @@
XMLRPC_FEATURES="c++2 abyss-server"

Expand Down
28 changes: 14 additions & 14 deletions net-misc/stargazer/files/patches/stg-2.408-build.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- projects/rlm_stg/configure.org 2013-01-18 18:06:17.000000000 +0200
+++ projects/rlm_stg/configure 2013-01-18 18:07:18.000000000 +0200
--- a/projects/rlm_stg/configure.org 2013-01-18 18:06:17.000000000 +0200
+++ b/projects/rlm_stg/configure 2013-01-18 18:07:18.000000000 +0200
@@ -34,6 +34,7 @@
then
OS=linux
Expand All @@ -24,8 +24,8 @@
-
+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
\ No newline at end of file
--- projects/rscriptd/configure.org 2013-01-18 18:07:28.000000000 +0200
+++ projects/rscriptd/configure 2013-01-18 18:08:02.000000000 +0200
--- a/projects/rscriptd/configure.org 2013-01-18 18:07:28.000000000 +0200
+++ b/projects/rscriptd/configure 2013-01-18 18:08:02.000000000 +0200
@@ -34,6 +34,7 @@
then
OS=linux
Expand All @@ -51,8 +51,8 @@
-
+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
\ No newline at end of file
--- projects/sgauth/configure.org 2013-01-18 18:08:10.000000000 +0200
+++ projects/sgauth/configure 2013-01-18 18:08:38.000000000 +0200
--- a/projects/sgauth/configure.org 2013-01-18 18:08:10.000000000 +0200
+++ b/projects/sgauth/configure 2013-01-18 18:08:38.000000000 +0200
@@ -34,6 +34,7 @@
then
OS=linux
Expand All @@ -77,8 +77,8 @@
-
+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
\ No newline at end of file
--- projects/sgconf/configure.org 2013-01-18 18:08:46.000000000 +0200
+++ projects/sgconf/configure 2013-01-18 18:09:44.000000000 +0200
--- a/projects/sgconf/configure.org 2013-01-18 18:08:46.000000000 +0200
+++ b/projects/sgconf/configure 2013-01-18 18:09:44.000000000 +0200
@@ -34,6 +34,7 @@
then
OS=linux
Expand All @@ -104,8 +104,8 @@
-
+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
\ No newline at end of file
--- projects/sgconf_xml/configure.org 2013-01-18 18:09:54.000000000 +0200
+++ projects/sgconf_xml/configure 2013-01-18 18:10:23.000000000 +0200
--- a/projects/sgconf_xml/configure.org 2013-01-18 18:09:54.000000000 +0200
+++ b/projects/sgconf_xml/configure 2013-01-18 18:10:23.000000000 +0200
@@ -34,6 +34,7 @@
then
OS=linux
Expand All @@ -131,8 +131,8 @@
-
+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
\ No newline at end of file
--- projects/sgconv/configure.org 2013-01-18 18:10:30.000000000 +0200
+++ projects/sgconv/configure 2013-01-18 18:11:09.000000000 +0200
--- a/projects/sgconv/configure.org 2013-01-18 18:10:30.000000000 +0200
+++ b/projects/sgconv/configure 2013-01-18 18:11:09.000000000 +0200
@@ -35,6 +35,7 @@
then
OS=linux
Expand Down Expand Up @@ -161,8 +161,8 @@
-
+mkdir -p ../stargazer/modules
\ No newline at end of file
--- projects/stargazer/configure.org 2013-01-18 18:11:15.000000000 +0200
+++ projects/stargazer/configure 2013-01-18 18:11:40.000000000 +0200
--- a/projects/stargazer/configure.org 2013-01-18 18:11:15.000000000 +0200
+++ b/projects/stargazer/configure 2013-01-18 18:11:40.000000000 +0200
@@ -404,11 +404,4 @@
echo "VAR_DIR=$VAR_DIR" >> $CONFFILE
echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
Expand Down
32 changes: 16 additions & 16 deletions net-misc/stargazer/files/patches/stg-2.408-correct-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- projects/rscriptd/rscriptd.conf.org 2013-01-08 18:19:34.000000000 +0200
+++ projects/rscriptd/rscriptd.conf 2013-01-08 18:20:52.000000000 +0200
--- a/projects/rscriptd/rscriptd.conf.org 2013-01-08 18:19:34.000000000 +0200
+++ b/projects/rscriptd/rscriptd.conf 2013-01-08 18:20:52.000000000 +0200
@@ -6,7 +6,7 @@
# Parameter: optional
# Value: file path
Expand Down Expand Up @@ -34,8 +34,8 @@

################################################################################
\ No newline at end of file
--- projects/sgconv/sgconv.conf.org 2012-12-18 21:56:33.578221904 +0200
+++ projects/sgconv/sgconv.conf 2012-12-18 21:58:22.355217059 +0200
--- a/projects/sgconv/sgconv.conf.org 2012-12-18 21:56:33.578221904 +0200
+++ b/projects/sgconv/sgconv.conf 2012-12-18 21:58:22.355217059 +0200
@@ -18,27 +18,27 @@
# Working server directory, provides data on tariffs, users, administrators.
# Parameter: required
Expand Down Expand Up @@ -80,8 +80,8 @@

# Database username
# Parameter: required
--- projects/stargazer/inst/linux/etc/stargazer/stargazer.conf.org 2012-12-30 14:35:22.000000000 +0200
+++ projects/stargazer/inst/linux/etc/stargazer/stargazer.conf 2012-12-30 14:36:37.000000000 +0200
--- a/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf.org 2012-12-30 14:35:22.000000000 +0200
+++ b/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf 2012-12-30 14:36:37.000000000 +0200
@@ -6,7 +6,7 @@
# Parameter: required
# Value: file path
Expand All @@ -100,8 +100,8 @@

# Defines message maximum lifetime
# Note: 0 - unlimited
--- projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf.org 2012-12-25 14:03:49.000000000 +0200
+++ projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf 2012-12-25 14:04:00.000000000 +0200
--- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf.org 2012-12-25 14:03:49.000000000 +0200
+++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf 2012-12-25 14:04:00.000000000 +0200
@@ -16,7 +16,7 @@
# Parametr: required
# Values: filename
Expand All @@ -111,8 +111,8 @@

# The password to encrypt packets between the stg-server and remote server
# Parameter: required
--- projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf.org 2012-12-25 13:31:01.000000000 +0200
+++ projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf 2012-12-25 13:31:43.000000000 +0200
--- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf.org 2012-12-25 13:31:01.000000000 +0200
+++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf 2012-12-25 13:31:43.000000000 +0200
@@ -5,27 +5,27 @@
# Working server directory, provides data on tariffs, users, administrators.
# Parameter: required
Expand Down Expand Up @@ -148,8 +148,8 @@
UserLogMode = 640

</StoreModule>
--- projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf.org 2012-12-25 13:39:00.000000000 +0200
+++ projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf 2012-12-25 13:39:28.000000000 +0200
--- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf.org 2012-12-25 13:39:00.000000000 +0200
+++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf 2012-12-25 13:39:28.000000000 +0200
@@ -9,7 +9,7 @@
# Parameter: required
# Value: file path
Expand All @@ -159,8 +159,8 @@

# Database username
# Parameter: required
--- projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp.org 2012-12-31 11:08:26.000000000 +0200
+++ projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp 2012-12-31 11:08:41.000000000 +0200
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp.org 2012-12-31 11:08:26.000000000 +0200
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp 2012-12-31 11:08:41.000000000 +0200
@@ -169,7 +169,7 @@
rpcServer = new xmlrpc_c::serverAbyss(
xmlrpc_c::serverAbyss::constrOpt()
Expand All @@ -170,8 +170,8 @@
.socketFd(fd)
);

--- projects/stargazer/inst/var/00-base-00.sql.org 2013-01-02 16:22:28.000000000 +0200
+++ projects/stargazer/inst/var/00-base-00.sql 2013-01-02 16:22:52.000000000 +0200
--- a/projects/stargazer/inst/var/00-base-00.sql.org 2013-01-02 16:22:28.000000000 +0200
+++ b/projects/stargazer/inst/var/00-base-00.sql 2013-01-02 16:22:52.000000000 +0200
@@ -50,9 +50,9 @@
/*
* CONNECT 'localhost:/var/stg/stargazer.fdb' USER 'stg' PASSWORD '123456';
Expand Down
4 changes: 2 additions & 2 deletions net-misc/stargazer/files/patches/stg-2.408-makefile-firebird-upstream.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- projects/stargazer/plugins/store/firebird/Makefile.org 2013-01-04 22:50:13.000000000 +0200
+++ projects/stargazer/plugins/store/firebird/Makefile 2013-01-04 22:50:56.000000000 +0200
--- a/projects/stargazer/plugins/store/firebird/Makefile.org 2013-01-04 22:50:13.000000000 +0200
+++ b/projects/stargazer/plugins/store/firebird/Makefile 2013-01-04 22:50:56.000000000 +0200
@@ -22,5 +22,11 @@
locker \
crypto
Expand Down
48 changes: 24 additions & 24 deletions net-misc/stargazer/files/patches/stg-2.408-makefile.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- projects/sgauth/Makefile.org 2013-01-05 23:47:38.000000000 +0200
+++ projects/sgauth/Makefile 2013-01-05 23:48:34.000000000 +0200
--- a/projects/sgauth/Makefile.org 2013-01-05 23:47:38.000000000 +0200
+++ b/projects/sgauth/Makefile 2013-01-05 23:48:34.000000000 +0200
@@ -67,8 +67,8 @@

install-data:
Expand All @@ -11,8 +11,8 @@

uninstall: uninstall-bin uninstall-data

--- projects/stargazer/Makefile.org 2013-01-05 22:53:26.000000000 +0200
+++ projects/stargazer/Makefile 2013-01-05 22:54:52.000000000 +0200
--- a/projects/stargazer/Makefile.org 2013-01-05 22:53:26.000000000 +0200
+++ b/projects/stargazer/Makefile 2013-01-05 22:54:52.000000000 +0200
@@ -92,30 +92,8 @@
mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer/conf-available.d
mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer/conf-enabled.d
Expand Down Expand Up @@ -44,8 +44,8 @@

uninstall: uninstall-bin uninstall-data

--- projects/rscriptd/Makefile.org 2013-01-19 17:03:42.000000000 +0200
+++ projects/rscriptd/Makefile 2013-01-19 17:04:25.000000000 +0200
--- a/projects/rscriptd/Makefile.org 2013-01-19 17:03:42.000000000 +0200
+++ b/projects/rscriptd/Makefile 2013-01-19 17:04:25.000000000 +0200
@@ -65,15 +65,13 @@
$(MAKE) -C $(DIR_LIBSRC) install

Expand All @@ -67,8 +67,8 @@
endif

uninstall: uninstall-bin uninstall-data
--- projects/rlm_stg/Makefile.org 2013-02-03 14:02:58.000000000 +0200
+++ projects/rlm_stg/Makefile 2013-02-03 14:05:43.000000000 +0200
--- a/projects/rlm_stg/Makefile.org 2013-02-03 14:02:58.000000000 +0200
+++ b/projects/rlm_stg/Makefile 2013-02-03 14:05:43.000000000 +0200
@@ -56,19 +56,11 @@
install: install-bin

Expand All @@ -89,8 +89,8 @@
$(MAKE) -C $(DIR_LIBSRC) install

uninstall: uninstall-bin
--- projects/rscriptd/Makefile.org 2013-02-03 14:17:01.000000000 +0200
+++ projects/rscriptd/Makefile 2013-02-03 14:17:32.000000000 +0200
--- a/projects/rscriptd/Makefile.org 2013-02-03 14:17:01.000000000 +0200
+++ b/projects/rscriptd/Makefile 2013-02-03 14:17:32.000000000 +0200
@@ -57,11 +57,7 @@
install: install-bin install-data

Expand All @@ -103,8 +103,8 @@
$(MAKE) -C $(DIR_LIBSRC) install

install-data:
--- projects/sgauth/Makefile.org 2013-02-03 14:18:37.000000000 +0200
+++ projects/sgauth/Makefile 2013-02-03 14:18:48.000000000 +0200
--- a/projects/sgauth/Makefile.org 2013-02-03 14:18:37.000000000 +0200
+++ b/projects/sgauth/Makefile 2013-02-03 14:18:48.000000000 +0200
@@ -58,11 +58,7 @@
install: install-bin install-data

Expand All @@ -117,8 +117,8 @@
$(MAKE) -C $(DIR_LIBSRC) install

install-data:
--- projects/sgconf/Makefile.org 2013-02-03 14:19:18.000000000 +0200
+++ projects/sgconf/Makefile 2013-02-03 14:19:28.000000000 +0200
--- a/projects/sgconf/Makefile.org 2013-02-03 14:19:18.000000000 +0200
+++ b/projects/sgconf/Makefile 2013-02-03 14:19:28.000000000 +0200
@@ -66,11 +66,7 @@
install: install-bin

Expand All @@ -131,8 +131,8 @@
$(MAKE) -C $(DIR_LIBSRC) install

uninstall: uninstall-bin
--- projects/sgconf_xml/Makefile.org 2013-02-03 14:19:53.000000000 +0200
+++ projects/sgconf_xml/Makefile 2013-02-03 14:19:59.000000000 +0200
--- a/projects/sgconf_xml/Makefile.org 2013-02-03 14:19:53.000000000 +0200
+++ b/projects/sgconf_xml/Makefile 2013-02-03 14:19:59.000000000 +0200
@@ -66,11 +66,7 @@
install: install-bin install-data

Expand All @@ -145,8 +145,8 @@
$(MAKE) -C $(DIR_LIBSRC) install

uninstall: uninstall-bin uninstall-data
--- projects/sgconv/Makefile.org 2013-02-03 14:20:24.000000000 +0200
+++ projects/sgconv/Makefile 2013-02-03 14:20:33.000000000 +0200
--- a/projects/sgconv/Makefile.org 2013-02-03 14:20:24.000000000 +0200
+++ b/projects/sgconv/Makefile 2013-02-03 14:20:33.000000000 +0200
@@ -61,11 +61,7 @@
install: install-bin

Expand All @@ -159,8 +159,8 @@
$(MAKE) -C $(DIR_PLUGINS) install

uninstall: uninstall-bin
--- projects/stargazer/Makefile.org 2013-02-03 14:20:56.000000000 +0200
+++ projects/stargazer/Makefile 2013-02-03 14:21:30.000000000 +0200
--- a/projects/stargazer/Makefile.org 2013-02-03 14:20:56.000000000 +0200
+++ b/projects/stargazer/Makefile 2013-02-03 14:21:30.000000000 +0200
@@ -77,11 +77,7 @@
install: install-bin install-data

Expand All @@ -173,8 +173,8 @@
$(MAKE) -C $(DIR_INCLUDE) install
$(MAKE) -C $(DIR_LIBSRC) install
$(MAKE) -C $(DIR_PLUGINS) install
--- stglibs/Makefile.in.org 2013-02-03 14:53:02.000000000 +0200
+++ stglibs/Makefile.in 2013-02-03 14:53:11.000000000 +0200
--- a/stglibs/Makefile.in.org 2013-02-03 14:53:02.000000000 +0200
+++ b/stglibs/Makefile.in 2013-02-03 14:53:11.000000000 +0200
@@ -35,11 +35,7 @@
rm -f deps $(PROG) *.o *.a *.so tags *.*~

Expand All @@ -187,8 +187,8 @@
mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/include/stg
install -m $(DATA_MODE) -o $(OWNER) $(addprefix include/stg/,$(INCS)) $(PREFIX)/usr/include/stg/

--- projects/stargazer/plugins/Makefile.in.org 2013-02-03 15:38:41.000000000 +0200
+++ projects/stargazer/plugins/Makefile.in 2013-02-03 15:38:51.000000000 +0200
--- a/projects/stargazer/plugins/Makefile.in.org 2013-02-03 15:38:41.000000000 +0200
+++ b/projects/stargazer/plugins/Makefile.in 2013-02-03 15:38:51.000000000 +0200
@@ -28,11 +28,7 @@

install: $(PROG)
Expand Down
Loading

0 comments on commit e39c72b

Please sign in to comment.