summaryrefslogtreecommitdiff
path: root/sci-libs/indilib-drivers
diff options
context:
space:
mode:
authorCtibor <ctibor.brancik@seznam.cz>2015-01-05 18:29:51 +0100
committerCtibor <ctibor.brancik@seznam.cz>2015-01-05 18:29:51 +0100
commit5b2f6dda15c0ec57c3bc5090e4a1468412c09db7 (patch)
treebd413bc92b100ead893236e0790424d94dbb47a0 /sci-libs/indilib-drivers
parent01a654682a81c985da27a869e6ffed9b83972f7a (diff)
downloadbrancik-overlay-5b2f6dda15c0ec57c3bc5090e4a1468412c09db7.tar.gz
brancik-overlay-5b2f6dda15c0ec57c3bc5090e4a1468412c09db7.tar.bz2
Fixing mess after commit revert.
Diffstat (limited to 'sci-libs/indilib-drivers')
-rw-r--r--sci-libs/indilib-drivers/indilib-drivers-0.9.9.ebuild38
1 files changed, 0 insertions, 38 deletions
diff --git a/sci-libs/indilib-drivers/indilib-drivers-0.9.9.ebuild b/sci-libs/indilib-drivers/indilib-drivers-0.9.9.ebuild
index 1241dcc..741a925 100644
--- a/sci-libs/indilib-drivers/indilib-drivers-0.9.9.ebuild
+++ b/sci-libs/indilib-drivers/indilib-drivers-0.9.9.ebuild
@@ -12,7 +12,6 @@ LICENSE="metapackage"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~arm"
IUSE_INDILIB_DRIVERS="
-<<<<<<< HEAD
aagcloudwatcher
apogee
asicam
@@ -29,30 +28,11 @@ IUSE_INDILIB_DRIVERS="
spectracyber
sx
tess
-=======
- +indilib_3rdparty_drivers_aagcloudwatcher
- +indilib_3rdparty_drivers_apogee
- +indilib_3rdparty_drivers_asicam
- +indilib_3rdparty_drivers_duino
- +indilib_3rdparty_drivers_eqmod
- +indilib_3rdparty_drivers_fishcamp
- +indilib_3rdparty_drivers_fli
- +indilib_3rdparty_drivers_gphoto
- +indilib_3rdparty_drivers_maxdomeii
- +indilib_3rdparty_drivers_meadedsi
- +indilib_3rdparty_drivers_qhy
- +indilib_3rdparty_drivers_qsi
- +indilib_3rdparty_drivers_sbig
- +indilib_3rdparty_drivers_spectracyber
- +indilib_3rdparty_drivers_sx
- +indilib_3rdparty_drivers_tess
->>>>>>> parent of dcec0bd... Adding make.defaults and indilib_drivers.desc thus introducing USE_EXPAND_INDILIB_DRIVERS
"
IUSE="${IUSE_INDILIB_DRIVERS}"
PDEPEND="
-<<<<<<< HEAD
aagcloudwatcher? ( sci-libs/indilib-driver-aagcloudwatcher )
apogee? ( sci-libs/indilib-driver-apogee )
asicam? ( sci-libs/indilib-driver-asicam )
@@ -69,22 +49,4 @@ PDEPEND="
spectracyber? ( sci-libs/indilib-driver-spectracyber )
sx? ( sci-libs/indilib-driver-sx )
tess? ( sci-libs/indilib-driver-tess )
-=======
- indilib_3rdparty_drivers_aagcloudwatcher? ( sci-libs/indilib-driver-aagcloudwatcher )
- indilib_3rdparty_drivers_apogee? ( sci-libs/indilib-driver-apogee )
- indilib_3rdparty_drivers_asicam? ( sci-libs/indilib-driver-asicam )
- indilib_3rdparty_drivers_duino? ( sci-libs/indilib-driver-duino )
- indilib_3rdparty_drivers_eqmod? ( sci-libs/indilib-driver-eqmod )
- indilib_3rdparty_drivers_fishcamp? ( sci-libs/indilib-driver-fishcamp )
- indilib_3rdparty_drivers_fli? ( sci-libs/indilib-driver-fli )
- indilib_3rdparty_drivers_gphoto? ( sci-libs/indilib-driver-gphoto )
- indilib_3rdparty_drivers_maxdomeii? ( sci-libs/indilib-driver-maxdomeii )
- indilib_3rdparty_drivers_meadedsi? ( sci-libs/indilib-driver-meadedsi )
- indilib_3rdparty_drivers_qhy? ( sci-libs/indilib-driver-qhy )
- indilib_3rdparty_drivers_qsi? ( sci-libs/indilib-driver-qsi )
- indilib_3rdparty_drivers_sbig? ( sci-libs/indilib-driver-sbig )
- indilib_3rdparty_drivers_spectracyber? ( sci-libs/indilib-driver-spectracyber )
- indilib_3rdparty_drivers_sx? ( sci-libs/indilib-driver-sx )
- indilib_3rdparty_drivers_tess? ( sci-libs/indilib-driver-tess )
->>>>>>> parent of dcec0bd... Adding make.defaults and indilib_drivers.desc thus introducing USE_EXPAND_INDILIB_DRIVERS
" \ No newline at end of file