modified: j/Java/Java-1.8.0_121.eb

new file:   l/LIBSVM/LIBSVM-3.22-intel-2017a.eb
	modified:   l/libpciaccess/libpciaccess-0.13.1.eb

j/Java/Java-1.8.0_121.eb

@@ -5,7 +5,7 @@ homepage = 'http://java.com/'
 description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
  Java applications on desktops and servers."""
 
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = {'name': 'dummy', 'version': ''}
 
 # download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
 (vp, vs) = version.split('_')

l/LIBSVM/LIBSVM-3.22-intel-2017a.eb

@@ -0,0 +1,31 @@
+easyblock = 'MakeCp'
+
+name = 'LIBSVM'
+version = '3.22'
+
+homepage = 'http://www.csie.ntu.edu.tw/~cjlin/libsvm/'
+description = """LIBSVM is an integrated software for support vector classification, (C-SVC, nu-SVC), regression
+ (epsilon-SVR, nu-SVR) and distribution estimation (one-class SVM). It supports multi-class classification."""
+
+toolchain = {'name': 'intel', 'version': '2017a'}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('Qt', '4.8.6', '', True)]
+
+buildopts = ' && cd svm-toy/qt && make MOC=$EBROOTQT/bin/moc '
+buildopts += 'CFLAGS="$CFLAGS -I$EBROOTQT/include -I$EBROOTQT/include/QtGui -lQtGui -lQtCore" && cd -'
+
+files_to_copy = [(['svm-*'], 'bin'), 'tools']
+
+sanity_check_paths = {
+    'files': ['bin/svm-%s' % x for x in ['predict', 'scale', 'train']] + ['bin/svm-toy/qt/svm-toy'],
+    'dirs': ['bin/svm-toy', 'tools'],
+}
+
+modextrapaths = {
+    'PATH': ['bin', 'bin/svm-toy/qt'],
+}
+
+moduleclass = 'lib'

l/libpciaccess/libpciaccess-0.13.1.eb

@@ -25,31 +25,4 @@ sanity_check_paths = {
 }
 
 moduleclass = 'system'
-<<<<<<< HEAD
-=======
 
-# Build statistics
-buildstats = [{
-    "easybuild-framework_version": "2.5.0",
-    "easybuild-easyblocks_version": "2.5.0",
-    "timestamp": 1453108029,
-    "build_time": 33.75,
-    "install_size": 210409,
-    "command_line": ['--buildpath=/easybuild/build', '--installpath=/apps', '--installpath-modules=/apps/modules', '--installpath-software=/apps', '--module-naming-scheme=IT4IModuleNamingScheme', '--modules-footer=/easybuild/templates/modules/jas02_footer.txt', '--repositorypath=/easybuild/file-repository', '--robot=/easybuild/easyconfigs-salomon/easybuild/easyconfigs:/easybuild/file-repository', '--robot-paths=/easybuild/easyconfigs-salomon/easybuild/easyconfigs:/easybuild/file-repository', '--sourcepath=/easybuild/sources', '--try-toolchain="[\'foss\', \'2015g\']"', 'libdrm-2.4.27-ictce-5.5.0.eb'],
-    "modules_tool": ('EnvironmentModulesC', '/usr/bin/modulecmd', '3.2.10'),
-    "core_count": 28,
-    "cpu_model": "Intel(R) Xeon(R) CPU E5-2695 v3 @ 2.30GHz",
-    "cpu_speed": 2299.973,
-    "cpu_vendor": "Intel",
-    "gcc_version": "Using built-in specs.; COLLECT_GCC=gcc; COLLECT_LTO_WRAPPER=/apps/all/GCC/4.9.3-binutils-2.25/libexec/gcc/x86_64-unknown-linux-gnu/4.9.3/lto-wrapper; Target: x86_64-unknown-linux-gnu; Configured with: ../configure --enable-languages=c,c++,fortran --enable-lto --enable-checking=release --disable-multilib --enable-shared=yes --enable-static=yes --enable-threads=posix --enable-gold=default --enable-plugins --enable-ld --with-plugin-ld=ld.gold --enable-bootstrap --prefix=/apps/all/GCC/4.9.3-binutils-2.25 --with-local-prefix=/apps/all/GCC/4.9.3-binutils-2.25; Thread model: posix; gcc version 4.9.3 (GCC) ; ",
-    "glibc_version": "2.12",
-    "hostname": "login3",
-    "os_name": "centos",
-    "os_type": "Linux",
-    "os_version": "6.6",
-    "platform_name": "x86_64-unknown-linux",
-    "python_version": "2.6.6 (r266:84292, Jan 22 2014, 09:42:36) ; [GCC 4.4.7 20120313 (Red Hat 4.4.7-4)]",
-    "system_gcc_path": "/apps/all/GCC/4.9.3-binutils-2.25/bin/gcc",
-    "system_python_path": "/usr/bin/python",
-}]
->>>>>>> 722d100eeb14742609db5d4494b9f5a98c70e176