gentoo auto-resync : 16:06:2024 - 00:09:44

5 files changed, 149 insertions, 5 deletions

diff --git a/media-gfx/monica/Manifest b/media-gfx/monica/Manifest
index 0eed7736e523..4d4c9eedad03 100644
--- a/media-gfx/monica/Manifest
+++ b/media-gfx/monica/Manifest
@@ -1,5 +1,8 @@
 AUX monica-3.6-makefile-cleanup.patch 907 BLAKE2B 13cf4d1a4950074f8909045fc0acd337482e343b51a800dbb87a585311ff776d4f87f8d0250b059e99b328a470e99bae23412646a5d8d89d09a4380e50bbd372 SHA512 cc151e238e89db9d3873133e1a637d5e2959c2460251fe7fe8feb62ef22c64963cec5b2533607996b2cf7d33abdfd1f42a59f5a769cad0bf2194e8d751da3bf6
+AUX monica-3.7-exit.patch 2534 BLAKE2B 99f544c0b9712d4a0cdf054fc6b39a34b143ecf93204c30e16bbfa9287ac8d89dcf25270f8c2a976f2045a0662cb673ba544c2e6ef31dcdf5253dfcac66d0b65 SHA512 a814424f3db144c5b1d8fc1dc4b507667cde97dcf13c6da3a8bd8e1aa5f95be8e119f9f8512b05096084cb3933719d85fa9548b8f2ec6af58b513abd9db612d2
+AUX monica-3.7-fprintf.patch 1835 BLAKE2B 06dedaded7424ced057b8b2298584e0d71c771124880255a012a10b351bddbbe336793da7d70104e9fa06a874a2171504424cdd55235d75b49feffa02c69bb55 SHA512 d80f79620c8df23765ae9e644e70428bf5a6443de53a3dc11ac7aa6fe091f2b911ee1f0efbc353c61851a3b571953a553898b8e1d6fb94b1ed6e7b942dbcb0fa
 AUX monica-3.7-gcc44.patch 341 BLAKE2B c534884cca357cbc37a0092bb42faa9a3f29165e0e5622d811d08f4238a2d716f91a8ce731438a33323dd350e3b9da79e743b7d3f46fc5ba9eb084b14f359bd4 SHA512 837f3fc2c77d415067460f1aae80807daa9882b814494f2305be711db920a750ae183ec7b456527956b60ca3cf022729524990cd0febafeaab41bd1dbb080bfb
+AUX monica-3.7-makefile-cleanup.patch 921 BLAKE2B af1492ec9cd83971c34fe571b17ebfdde6223c14ffdef51148cdac2dd58ef78f283ff5160d88fce0c6eb022bcd46c65af5e4069ff590ad8954f65d6e416fbe72 SHA512 9e8a1d12bc9c97b86e6f613d8ea3a06d8ab318e4bb93c7c335a8a8b80a2a6a7aa8a1edc3b8e3a451167a1d0d18736cce46859104faea810701783ff1bd0ccfff
 DIST monica-3.7.tar.bz2 18330 BLAKE2B 26c5539d00867fd6ee80255a41fa363ee8cd3a720637b1b83546bfe9bf877f5b521ea47da456d965b65f57d7a351bc7c5dfe310ab9608b67a8db7b2b4d9cd1af SHA512 87565f33f3c3492b196905e5b8e17bd45a7eb8eb0a0281f02e23337eec888af82571ac6f2d229256ee97012d402b7f1b217cd56a8b87ff9c9296931bf63cb153
-EBUILD monica-3.7.ebuild 718 BLAKE2B 50a1d50df2df9ff18ff9735b542b85cd5e5748f3e4dad8dcb66e03f4f76684d74e7899e130820eabd46cb31a29707ecc3822c930700370a704336d5868d6466f SHA512 56aaedd0adea9b91c69162ef8837caa4a1ddb472cf6b1e5aba251f30f11e8f9926b18902f8c1cd9ed7ce8393dea363162f6837cb10a906e0daef0d42fd891d96
+EBUILD monica-3.7-r1.ebuild 906 BLAKE2B 6a4a01632dbeb621e3e07feae8521f49f66724094b78651ccdf37057fc1d91dd2f6c641e3be2b5a446559e6d5bb2ffe7ac8ac50b4c004c7349be8dee834c71df SHA512 204de6470f2ff3da14aac40fbf11d865911a59c876d4915178fe93a6a0bbfe85066c9dcd01a785a9f2cd70088156b34a43a75827076b80bc0e184c2e174d4956
 MISC metadata.xml 557 BLAKE2B f6319ce0a15222c7ae4adf7bbf7c326db5ebd05ad36732c56c9540a30ea35bb7fbffb136433eed4ba10b899c6ddde893be83aa6920e4b8a4f5dbd51e940b6a1d SHA512 ecd6b679940f992d4bbb27ab3b63316ce089c8857a1288cf89f05fd7aa3da24e81206f660ac1d5fbe86e71c4796bffcf3bdca5e4c546678b22dd9ab584e8b6a2
diff --git a/media-gfx/monica/files/monica-3.7-exit.patch b/media-gfx/monica/files/monica-3.7-exit.patch
new file mode 100644
index 000000000000..afd347c28257
--- /dev/null
+++ b/media-gfx/monica/files/monica-3.7-exit.patch
@@ -0,0 +1,61 @@
+--- monica-3.7.orig/monica.cpp	2024-06-15 10:17:52.270992952 -0700
++++ monica-3.7/monica.cpp	2024-06-15 10:53:54.255394576 -0700
+@@ -1276,7 +1276,7 @@
+ 	int bcheck = system("echo $SHELL | grep bash");
+ 	if (bcheck) {
+ 		fl_alert("Monica senses that BASH is not\nyour login shell...\n\nSince Monica uses bash init scripts to \nimplement gamma corrections on system login, \nyou will have to paste the call to monicarc \ninto your startup scripts by hand.\n\nAlternatively, you can make a direct call \nto xgamma in your X config file.");
+-		__builtin_exit (0);
++		exit (0);
+ 	} 
+   
+     fn_r = get_shell_rc_path();
+@@ -1563,13 +1563,13 @@
+ }
+ //---------------------------------------------------------------------
+ void exit_cb(Fl_Widget *, void *) {
+-  __builtin_exit(0);
++  exit(0);
+ }
+ //---------------------------------------------------------------------
+ void exit_save_cb(Fl_Widget *, void *s) {
+   int res = write_monicarc((Sliders*)s); 
+   if (res) res = add_monicarc_to_startup();
+-  __builtin_exit(0);
++  exit(0);
+ }
+ //---------------------------------------------------------------------
+ 
+@@ -1704,7 +1704,7 @@
+ //	if (no_ati_gamma && no_x_gamma) {
+     if (no_x_gamma) {
+ 		fl_alert("Monica cannot detect the presence\n of xgamma on your machine...\n\nIt is distributed with all versions of XFree86 \nand Xorg to date, so if you have X installed, \nit should be around or something might be \nwrong with your installation.\n\nXgamma is needed for Monica to function.");
+-		__builtin_exit (0);
++		exit (0);
+ 	}
+ //-- set global value of "xgamma" command string, accomodating ATI's fglrx_xgamma ---
+ //	if ( ! no_ati_gamma ) {
+@@ -1739,13 +1739,13 @@
+ 	printf("Copyright (C) 2005 Paul Sherman\n\n");
+ 	printf("Copyright (C) 2002 Tilo Riemer\n\n");
+ 	printf("Monica is published under a BSD like licence.\nSee Monica -l\n\n");
+-	__builtin_exit(0);
++	exit(0);
+       }
+       if ( (strcmp(argv[i], "-l") == 0) 
+           || (strcmp(argv[i], "--licence") == 0) 
+           || (strcmp(argv[i], "--license") == 0) ) {
+         printf("\n%s\n\n", LICENCE);
+-	__builtin_exit(0);
++	exit(0);
+       }
+       if ( (strcmp(argv[i], "-h") == 0) || (strcmp(argv[i], "--help") == 0) ) {
+ 	printf("\nUsage: Monica [options]\nwhere options are:\n");
+@@ -1766,7 +1766,7 @@
+ 	printf("\t-s[cheme]         scheme\n");
+ 	printf("\t-t[itle]          windowtitle\n\n");
+ 
+-	__builtin_exit(0);
++	exit(0);
+       } 
+       if ( (strcmp(argv[i], "-o") == 0) || (strcmp(argv[i], "--onthefly") == 0) ) {
+ 	g_toggle_apply_on_the_fly_checkbox = 1;
diff --git a/media-gfx/monica/files/monica-3.7-fprintf.patch b/media-gfx/monica/files/monica-3.7-fprintf.patch
new file mode 100644
index 000000000000..55959e246f43
--- /dev/null
+++ b/media-gfx/monica/files/monica-3.7-fprintf.patch
@@ -0,0 +1,46 @@
+--- monica-3.7.orig/monica.cpp	2024-06-15 10:16:59.594465873 -0700
++++ monica-3.7/monica.cpp	2024-06-15 10:17:18.277749251 -0700
+@@ -1301,9 +1301,9 @@
+           while (fgets (buffer, BUF_SIZE, f_r)) {
+ 	        if (strstr(buffer, ". .monicarc")) {//skip old entries
+ 	           continue;  
+-	        } else fprintf(f_w, buffer);
++	        } else fprintf(f_w, "%s", buffer);
+           }
+-		  fprintf(f_w, ". .monicarc   #monitor calibration");
++		  fprintf(f_w, "%s", ". .monicarc   #monitor calibration");
+           fclose(f_w);
+           // script edited, so back up the original and put the ".tmp" in its place
+           rename(fn_r.c_str(), fn_old.c_str());
+@@ -1348,18 +1348,18 @@
+          while (fgets (buffer, BUF_SIZE, f_r)) {
+            if (buffer[0] != '#') {
+ 	         if (!wrote_monicarc) {//add line for calling .monicarc
+-	           fprintf(f_w, "$HOME/.monicarc   #monitor calibration\n");
++	           fprintf(f_w, "%s", "$HOME/.monicarc   #monitor calibration\n");
+ 	           wrote_monicarc = 1;
+ 	         }
+ 	         if (strstr(buffer, "xgamma")) {
+ 	           strcpy(mod_buffer, "#");
+ 	           strncat(mod_buffer, buffer, BUF_SIZE);
+ 	           mod_buffer[BUF_SIZE + 1] = '\0';
+-	           fprintf(f_w, mod_buffer);
++	           fprintf(f_w, "%s", mod_buffer);
+ 	         } else if (strstr(buffer, "$HOME/.monicarc")) {//skip old entries of .monicarc
+ 	            continue;  
+-	         } else fprintf(f_w, buffer);
+-           } else fprintf(f_w, buffer);
++	         } else fprintf(f_w, "%s", buffer);
++           } else fprintf(f_w, "%s", buffer);
+          }
+ 
+          fclose(f_w);
+@@ -1395,7 +1395,7 @@
+ 				if (strstr(buffer, str_to_remove.c_str())) {
+ 					continue;  
+ 			  } else {
+-			    fprintf(f_w, buffer);
++			    fprintf(f_w, "%s", buffer);
+ 					line_count += 1;
+ 			  }
+ 			}
diff --git a/media-gfx/monica/files/monica-3.7-makefile-cleanup.patch b/media-gfx/monica/files/monica-3.7-makefile-cleanup.patch
new file mode 100644
index 000000000000..4d7501254ada
--- /dev/null
+++ b/media-gfx/monica/files/monica-3.7-makefile-cleanup.patch
@@ -0,0 +1,33 @@
+diff -Nuar monica-3.6.orig/Makefile monica-3.6/Makefile
+--- monica-3.6.orig/Makefile	2005-03-14 22:00:18.000000000 -0800
++++ monica-3.6/Makefile	2007-11-15 00:48:39.000000000 -0800
+@@ -2,22 +2,24 @@
+ CXX      = g++
+ LINK     = g++
+ CFLAGS   = -Wall -O2
+-CXXFLAGS = `fltk-config --cxxflags` -Wall -O2
+-LDFLAGS  = `fltk-config --ldflags`
++CXXFLAGS = -Wall -O2
++FLTK_CXXFLAGS = $(shell fltk-config --cxxflags)
++LDFLAGS  = 
++FLTK_LDFLAGS  = $(shell fltk-config --ldflags)
+ TARGET   = monica
+-DESTINATION = /usr/bin
++DESTINATION = $(DESTDIR)/usr/bin
+ OBJECTS = monica.o
+ 
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJECTS)
+-	$(LINK) -o $(TARGET) $(OBJECTS) $(LDFLAGS)
++	$(LINK) -o $(TARGET) $(OBJECTS) $(FLTK_LDFLAGS) $(LDFLAGS)
+ 
+ 
+ monica.o: monica.cpp
+-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o monica.o monica.cpp
++	$(CXX) -c $(FLTK_CXXFLAGS) $(CXXFLAGS) $(INCPATH) -o monica.o monica.cpp
+ 
+ clean: 
+ 	rm -f $(OBJECTS)
+ 	rm -f monica
+ 	
diff --git a/media-gfx/monica/monica-3.7.ebuild b/media-gfx/monica/monica-3.7-r1.ebuild
index 08697029c232..b6be41461371 100644
--- a/media-gfx/monica/monica-3.7.ebuild
+++ b/media-gfx/monica/monica-3.7-r1.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Monica is a Monitor Calibration Tool"
-HOMEPAGE="http://freshmeat.sourceforge.net/projects/monica"
+HOMEPAGE="https://web.archive.org/web/20201111203551/http://freshmeat.sourceforge.net/projects/monica https://web.archive.org/web/20051016203856/http://www.pcbypaul.com:80/linux/monica.html"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 DEPEND=">=x11-libs/fltk-1.1:1"
 RDEPEND="${DEPEND}
@@ -20,8 +19,10 @@ RDEPEND="${DEPEND}
 
 DOCS=( authors ChangeLog news readme )
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.6-makefile-cleanup.patch
+	"${FILESDIR}"/${PN}-3.7-makefile-cleanup.patch
 	"${FILESDIR}"/${P}-gcc44.patch
+	"${FILESDIR}"/${P}-fprintf.patch
+	"${FILESDIR}"/${P}-exit.patch
 )
 
 src_compile() {