sci-astronomy/ccd now installs helper scripts to /usr/libexec/ccd

3 files changed, 24 insertions, 12 deletions

diff --git a/sci-astronomy/ccd/Manifest b/sci-astronomy/ccd/Manifest
index 5e915d9..6f42729 100644
--- a/sci-astronomy/ccd/Manifest
+++ b/sci-astronomy/ccd/Manifest
@@ -1,3 +1,3 @@
-AUX ccd-1.2.9-fix_helper_scripts_paths.patch 3454 SHA256 21820ffbaebfbc05290dadfec340b6b31a6ea3ca6250764825b487fdd17e63db SHA512 56662976ab087f8cc599acb06ecbfc5b1e7e0fd390b53c99e7c025c95b037999a5f6f8f9b4e81157fa47f3b80c4e2c5253f2189d14853cd704616d7cc57dd187 WHIRLPOOL 9bab2d36dac2f8d9000779ca92bf49678fbaa100f1e98dce34c40d72522fcec037476a9cd226464ffedbed4a03fd4ce4050955d8a015e798ae8a2506cce0d178
+AUX ccd-1.2.9-fix_helper_scripts_paths.patch 4047 SHA256 7d5be9f7bc004d2784ec24a3637d763bbc6f9fd78d7a678d0aa22be4c448bc41 SHA512 b36fd5cb880401c0e6a98dd24f972c966d44636e0da7f377542997d2a6e83b1da72ba629bbd33edee656ab21dfb0f1ec09830806691e42171db4abff8152228b WHIRLPOOL f7a46c29310d388efa41a314e0e9af546d8544c6128d0da0af6f8afde028653022160ee8a89e13d6433b7288587b1f5c287c6a71ef032da2db67d9ebdb5a3eb7
 DIST ccd-1.2.9.tar.bz2 114821 SHA256 b09ab4c0c0d06ecddfbf3efc7c6e82b8a47711555f61daf37f56e9b078a72f9d SHA512 5f0098e4c5c927e7bf9938e4ce790ddacba63240955fcaecae7a8422ef7963b9f28fa61ed534beb2c8bbb9b68eb593c3c31705b02429511b576163e2513ee8b3 WHIRLPOOL 88373a05dfa1ff7992b33f5c1680ed7ea347b01ce6f94b18202fee43a7929349d596874754192f584913b27f44fb4180d6f7d8e4de6d36ff90912185f1e1202e
-EBUILD ccd-1.2.9.ebuild 1146 SHA256 f3368ae5b131e1af957d0c6606ff089b842eb838ccff26b61c786ae57e591de6 SHA512 d34c454809eb2d540a0eb70b6071eff3155d90555bb1ec9eba56a60abb830a4c9126a5ab70871e93d59ca71a375bf1a3aff5a7da789b431d097165df849a8963 WHIRLPOOL ecea0eecaa4f5d63d40d248a8b6bd78507f9ec4a53b2dd31923742a4d4a1632961043700e3abcca92f7699dfb56e2ad0430ac4077b721900f2c8a4fa5aab9b27
+EBUILD ccd-1.2.9.ebuild 1154 SHA256 3b17269d55ae24234dfe69f4c78f2e270e12003d665cfb6393541744eecbf294 SHA512 7adf1e7d2f36eb0f72a333f1871f1146e6c88ee46a4d68c1721f44eaa789d3ab24952a2948563730e663a0c09ffd7873660b169cfa1d78a05e0224eade5adae7 WHIRLPOOL 90806429f12f18b157fea745d9f4c10effc80040b27ff6490ea0cddac37c71787a9c7a3b4f8abcf2762d1a9f53d360ec6d683d7aebf4a3b905ea016da27f7db5
diff --git a/sci-astronomy/ccd/ccd-1.2.9.ebuild b/sci-astronomy/ccd/ccd-1.2.9.ebuild
index 685c137..515d930 100644
--- a/sci-astronomy/ccd/ccd-1.2.9.ebuild
+++ b/sci-astronomy/ccd/ccd-1.2.9.ebuild
@@ -40,8 +40,8 @@ src_compile() {
 
 src_install() {
   dobin ccd
-  dobin shutter_procs/shutter
-  exeinto /usr/bin
+  exeinto /usr/libexec/ccd
+  doexe shutter_procs/shutter
   doexe utils/qhy6reset.sh
   doexe utils/qhy8reset.sh
   doexe utils/qhy8lreset.sh
diff --git a/sci-astronomy/ccd/files/ccd-1.2.9-fix_helper_scripts_paths.patch b/sci-astronomy/ccd/files/ccd-1.2.9-fix_helper_scripts_paths.patch
index 7f962b1..cd01cda 100644
--- a/sci-astronomy/ccd/files/ccd-1.2.9-fix_helper_scripts_paths.patch
+++ b/sci-astronomy/ccd/files/ccd-1.2.9-fix_helper_scripts_paths.patch
@@ -1,48 +1,60 @@
+diff -ruN ccd/src/devices/cam_gphoto.cpp ccd.new/src/devices/cam_gphoto.cpp

+--- ccd/src/devices/cam_gphoto.cpp	2015-01-29 00:01:59.743670552 +0100

++++ ccd.new/src/devices/cam_gphoto.cpp	2015-01-29 00:03:52.200487268 +0100

+@@ -678,7 +678,7 @@

+ 	else

+ 	if( pid == 0 )

+ 	{

+-		execl( "./shutter", "shutter", cmd == open_shutter ? "1" : "0", m_high_params.use_mirror_lock ? "1" : "0", NULL );

++		execl( "/usr/libexec/ccd/shutter", "shutter", cmd == open_shutter ? "1" : "0", m_high_params.use_mirror_lock ? "1" : "0", NULL );

+ 		_exit( 127 );

+ 	}

+ 	else

 diff -ruN ccd/src/devices/cam_qhy6.cpp ccd.new/src/devices/cam_qhy6.cpp

 --- ccd/src/devices/cam_qhy6.cpp	2013-07-31 14:24:53.000000000 +0200

-+++ ccd.new/src/devices/cam_qhy6.cpp	2015-01-28 23:23:41.000000000 +0100

++++ ccd.new/src/devices/cam_qhy6.cpp	2015-01-29 00:03:26.818528628 +0100

 @@ -321,7 +321,7 @@

  				//hardware BREAK

  				for( int i = 0;i < ccamera_base::try_reset_cnt;i++ )

  				{

 -					int res = system( "utils/qhy6reset.sh" );

-+					int res = system( "/usr/bin/qhy6reset.sh" );

++					int res = system( "/usr/libexec/ccd/qhy6reset.sh" );

  					if( res < 0 )

  					{

  						log_e( "Failed to reset camera by script... '%s'", strerror(errno) );

 diff -ruN ccd/src/devices/cam_qhy8.cpp ccd.new/src/devices/cam_qhy8.cpp

 --- ccd/src/devices/cam_qhy8.cpp	2013-07-31 14:40:11.000000000 +0200

-+++ ccd.new/src/devices/cam_qhy8.cpp	2015-01-28 23:23:31.000000000 +0100

++++ ccd.new/src/devices/cam_qhy8.cpp	2015-01-29 00:03:13.501550331 +0100

 @@ -380,7 +380,7 @@

  				//hardware BREAK

  				for( int i = 0;i < ccamera_base::try_reset_cnt;i++ )

  				{

 -					int res = system( "utils/qhy8reset.sh" );

-+					int res = system( "/usr/bin/qhy8reset.sh" );

++					int res = system( "/usr/libexec/ccd/qhy8reset.sh" );

  					if( res < 0 )

  					{

  						log_e( "Failed to reset camera by script... '%s'", strerror(errno) );

 diff -ruN ccd/src/devices/cam_qhy8l.cpp ccd.new/src/devices/cam_qhy8l.cpp

 --- ccd/src/devices/cam_qhy8l.cpp	2013-08-01 18:54:12.000000000 +0200

-+++ ccd.new/src/devices/cam_qhy8l.cpp	2015-01-28 23:23:13.000000000 +0100

++++ ccd.new/src/devices/cam_qhy8l.cpp	2015-01-29 00:03:16.166545988 +0100

 @@ -424,7 +424,7 @@

  				//hardware BREAK

  				for( int i = 0;i < ccamera_base::try_reset_cnt;i++ )

  				{

 -					int res = system( "utils/qhy8lreset.sh" );

-+					int res = system( "/usr/bin/qhy8lreset.sh" );

++					int res = system( "/usr/libexec/ccd/qhy8lreset.sh" );

  					if( res < 0 )

  					{

  						log_e( "Failed to reset camera by script... '%s'", strerror(errno) );

 diff -ruN ccd/src/devices/cam_qhy9.cpp ccd.new/src/devices/cam_qhy9.cpp

 --- ccd/src/devices/cam_qhy9.cpp	2013-07-31 10:28:44.000000000 +0200

-+++ ccd.new/src/devices/cam_qhy9.cpp	2015-01-28 23:23:15.000000000 +0100

++++ ccd.new/src/devices/cam_qhy9.cpp	2015-01-29 00:03:17.622543615 +0100

 @@ -424,7 +424,7 @@

  				//hardware BREAK

  				for( int i = 0;i < ccamera_base::try_reset_cnt;i++ )

  				{

 -					int res = system( "utils/qhy9reset.sh" );

-+					int res = system( "/usr/bin/qhy9reset.sh" );

++					int res = system( "/usr/libexec/ccd/qhy9reset.sh" );

  					if( res < 0 )

  					{

  						log_e( "Failed to reset camera by script... '%s'", strerror(errno) );