From 292660440fdd849ed14ef2e5359392db4f43da75 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 1 Mar 2012 23:16:33 +0100
Subject: [PATCH] Remove gcc-multilib. Functionality will be merged to the gcc
 pkg.

---
 srcpkgs/gcc-c++-multilib                      |   1 -
 srcpkgs/gcc-multilib/depends                  |   2 -
 .../gcc-multilib/gcc-c++-multilib.template    |  20 ----
 .../gcc-multilib/gcc-objc-multilib.template   |  21 ----
 srcpkgs/gcc-multilib/libgcc32.template        |  13 ---
 srcpkgs/gcc-multilib/libgomp32.template       |  16 ---
 .../gcc-multilib/libmudflap32-devel.template  |  17 ---
 srcpkgs/gcc-multilib/libmudflap32.template    |  14 ---
 srcpkgs/gcc-multilib/libobjc32.template       |  15 ---
 srcpkgs/gcc-multilib/libssp32.template        |  14 ---
 .../gcc-multilib/libstdc++32-devel.template   |  15 ---
 srcpkgs/gcc-multilib/libstdc++32.template     |  15 ---
 srcpkgs/gcc-multilib/template                 | 108 ------------------
 srcpkgs/gcc-objc-multilib                     |   1 -
 srcpkgs/libgcc32                              |   1 -
 srcpkgs/libgomp32                             |   1 -
 srcpkgs/libmudflap32                          |   1 -
 srcpkgs/libmudflap32-devel                    |   1 -
 srcpkgs/libobjc32                             |   1 -
 srcpkgs/libssp32                              |   1 -
 srcpkgs/libstdc++32                           |   1 -
 srcpkgs/libstdc++32-devel                     |   1 -
 22 files changed, 280 deletions(-)
 delete mode 120000 srcpkgs/gcc-c++-multilib
 delete mode 100644 srcpkgs/gcc-multilib/depends
 delete mode 100644 srcpkgs/gcc-multilib/gcc-c++-multilib.template
 delete mode 100644 srcpkgs/gcc-multilib/gcc-objc-multilib.template
 delete mode 100644 srcpkgs/gcc-multilib/libgcc32.template
 delete mode 100644 srcpkgs/gcc-multilib/libgomp32.template
 delete mode 100644 srcpkgs/gcc-multilib/libmudflap32-devel.template
 delete mode 100644 srcpkgs/gcc-multilib/libmudflap32.template
 delete mode 100644 srcpkgs/gcc-multilib/libobjc32.template
 delete mode 100644 srcpkgs/gcc-multilib/libssp32.template
 delete mode 100644 srcpkgs/gcc-multilib/libstdc++32-devel.template
 delete mode 100644 srcpkgs/gcc-multilib/libstdc++32.template
 delete mode 100644 srcpkgs/gcc-multilib/template
 delete mode 120000 srcpkgs/gcc-objc-multilib
 delete mode 120000 srcpkgs/libgcc32
 delete mode 120000 srcpkgs/libgomp32
 delete mode 120000 srcpkgs/libmudflap32
 delete mode 120000 srcpkgs/libmudflap32-devel
 delete mode 120000 srcpkgs/libobjc32
 delete mode 120000 srcpkgs/libssp32
 delete mode 120000 srcpkgs/libstdc++32
 delete mode 120000 srcpkgs/libstdc++32-devel

diff --git a/srcpkgs/gcc-c++-multilib b/srcpkgs/gcc-c++-multilib
deleted file mode 120000
index 9f2eca37b15..00000000000
--- a/srcpkgs/gcc-c++-multilib
+++ /dev/null
@@ -1 +0,0 @@
-gcc-multilib
\ No newline at end of file
diff --git a/srcpkgs/gcc-multilib/depends b/srcpkgs/gcc-multilib/depends
deleted file mode 100644
index fa93ce90fbf..00000000000
--- a/srcpkgs/gcc-multilib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.5.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gcc-multilib/gcc-c++-multilib.template b/srcpkgs/gcc-multilib/gcc-c++-multilib.template
deleted file mode 100644
index d6d0a4a1614..00000000000
--- a/srcpkgs/gcc-multilib/gcc-c++-multilib.template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'gcc-c++-multilib'.
-#
-short_desc="GCC C++ compiler (multilib files)"
-long_desc="
- This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
-
- On architectures with multilib support, the package contains files and
- dependencies for the non-default multilib architecture(s)."
-
-Add_dependency run gcc-c++		">=${version}"
-Add_dependency run gcc-multilib		">=${version}"
-Add_dependency run libstdc++32-devel	">=${version}"
-
-do_install()
-{
-	local libmddir="usr/lib/gcc/x86_64-unknown-linux-gnu/${_majorver}"
-
-	vmove ${libmddir}/32/libstdc++.a ${libmddir}/32
-	vmove ${libmddir}/32/libsupc++.a ${libmddir}/32
-}
diff --git a/srcpkgs/gcc-multilib/gcc-objc-multilib.template b/srcpkgs/gcc-multilib/gcc-objc-multilib.template
deleted file mode 100644
index 6aa5f084477..00000000000
--- a/srcpkgs/gcc-multilib/gcc-objc-multilib.template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'gcc-objc-multilib'.
-#
-short_desc="The GNU Objective-C compiler (multilib files)"
-long_desc="
- This is the GNU Objective-C compiler, which compiles Objective-C on
- platforms supported by the GCC compiler.
-
- On architectures with multilib support, the package contains files and
- dependencies for the non-default multilib architecture(s)."
-
-Add_dependency run gcc		">=${version}"
-Add_dependency run gcc-multilib	">=${version}"
-Add_dependency run gcc-objc	">=${version}"
-Add_dependency run libobjc32	">=${version}"
-
-do_install()
-{
-	local libmddir="/usr/lib/gcc/x86_64-unknown-linux-gnu/${_majorver}"
-
-	vmove "${libmddir}/32/libobjc*.a" ${libmddir}/32
-}
diff --git a/srcpkgs/gcc-multilib/libgcc32.template b/srcpkgs/gcc-multilib/libgcc32.template
deleted file mode 100644
index 74783619149..00000000000
--- a/srcpkgs/gcc-multilib/libgcc32.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'libgcc32'.
-#
-short_desc="GCC version ${version} shared library support (32bit)"
-long_desc="${long_desc}
-
- This package contains the 32bit GCC shared library for x86_64 systems."
-
-noverifyrdeps=yes
-
-do_install()
-{
-	vmove "usr/lib32/libgcc_s.so*" usr/lib32
-}
diff --git a/srcpkgs/gcc-multilib/libgomp32.template b/srcpkgs/gcc-multilib/libgomp32.template
deleted file mode 100644
index 7bf524dba3b..00000000000
--- a/srcpkgs/gcc-multilib/libgomp32.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'libgomp32'.
-#
-short_desc="GCC OpenMP v3.0 shared support library (32bit)"
-long_desc="${long_desc}
-
- This package contains the 32bit GCC shared support library which is needed
- for OpenMP v3.0 support."
-
-Add_dependency run libgcc32
-Add_dependency run glibc32
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib32
-	mv ${SRCPKGDESTDIR}/usr/lib32/libgomp.* ${DESTDIR}/usr/lib32
-}
diff --git a/srcpkgs/gcc-multilib/libmudflap32-devel.template b/srcpkgs/gcc-multilib/libmudflap32-devel.template
deleted file mode 100644
index 417801eea0c..00000000000
--- a/srcpkgs/gcc-multilib/libmudflap32-devel.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'libmudflap32-devel'.
-#
-short_desc="GCC 32bit mudflap support libraries (development files)"
-long_desc="
- The libmudflap libraries are used by GCC for instrumenting pointer
- and array dereferencing operations.
-
- This package contains the headers and the static libraries." 
-
-Add_dependency run gcc-multilib
-Add_dependency run glibc32-devel
-Add_dependency run libmudflap32
-
-do_install()
-{
-	vmove "usr/lib32/libmudflap*.a" usr/lib32
-}
diff --git a/srcpkgs/gcc-multilib/libmudflap32.template b/srcpkgs/gcc-multilib/libmudflap32.template
deleted file mode 100644
index 4f81e465381..00000000000
--- a/srcpkgs/gcc-multilib/libmudflap32.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'libmudflap32'.
-#
-short_desc="GCC mudflap shared support libraries (32bit)"
-long_desc="
- The libmudflap libraries are used by GCC for instrumenting pointer
- and array dereferencing operations."
-
-Add_dependency run gcc-multilib
-Add_dependency run glibc32
-
-do_install()
-{
-	vmove "usr/lib32/libmudflap*.so*" usr/lib32
-}
diff --git a/srcpkgs/gcc-multilib/libobjc32.template b/srcpkgs/gcc-multilib/libobjc32.template
deleted file mode 100644
index 6051de02171..00000000000
--- a/srcpkgs/gcc-multilib/libobjc32.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'libobjc32'.
-#
-short_desc="GCC Objective-C shared library support (32bit)"
-long_desc="${long_desc}
-
- This package contains the 32bit GCC Objective-C shared support library
- which is needed to run Objective-C dynamically linked programs."
-
-Add_dependency run libgcc32
-Add_dependency run glibc32
-
-do_install()
-{
-	vmove "usr/lib32/libobjc.so*" usr/lib32
-}
diff --git a/srcpkgs/gcc-multilib/libssp32.template b/srcpkgs/gcc-multilib/libssp32.template
deleted file mode 100644
index 0877407ab85..00000000000
--- a/srcpkgs/gcc-multilib/libssp32.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'libssp32'.
-#
-short_desc="GCC SSP shared library support (32bit)"
-long_desc="${long_desc}
-
- This package contains the 32bit Stack Smashing Protection shared library
- provided by GCC."
-
-Add_dependency run glibc32
-
-do_install()
-{
-	vmove "usr/lib32/libssp.so*" usr/lib32
-}
diff --git a/srcpkgs/gcc-multilib/libstdc++32-devel.template b/srcpkgs/gcc-multilib/libstdc++32-devel.template
deleted file mode 100644
index 60e4bbd3af0..00000000000
--- a/srcpkgs/gcc-multilib/libstdc++32-devel.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'libstdc++32-devel'.
-#
-short_desc="GCC Standard C++ Library (32bit) development files"
-long_desc="${long_desc}
-
- This package contains a rewritten 32bit standard compliant GCC Standard
- C++ development files and headers for x86_64 systems."
-
-Add_dependency run libstdc++-devel
-Add_dependency run libstdc++32
-
-do_install()
-{
-	vmove usr/include usr
-}
diff --git a/srcpkgs/gcc-multilib/libstdc++32.template b/srcpkgs/gcc-multilib/libstdc++32.template
deleted file mode 100644
index 51b822280e0..00000000000
--- a/srcpkgs/gcc-multilib/libstdc++32.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'libstdc++32'.
-#
-short_desc="GCC Standard C++ Library (32bit)"
-long_desc="${long_desc}
-
- This package contains a rewritten standard compliant GCC Standard
- C++ library 32bit for x86_64 systems."
-
-Add_dependency run libgcc32
-Add_dependency run glibc32
-
-do_install()
-{
-	vmove "usr/lib32/libstdc++.so*" usr/lib32
-}
diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template
deleted file mode 100644
index 274e4e288f0..00000000000
--- a/srcpkgs/gcc-multilib/template
+++ /dev/null
@@ -1,108 +0,0 @@
-# Template build file for 'gcc-multilib'
-pkgname=gcc-multilib
-_majorver=4.6
-_gmp_ver=5.0.3
-_mpfr_ver=3.1.0
-_mpc_ver=0.8.2
-version=${_majorver}.2
-wrksrc="gcc-${version}"
-distfiles="
-http://ftp.gnu.org/pub/gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2
-http://ftp.gnu.org/pub/gnu/gmp/gmp-${_gmp_ver}.tar.bz2
-http://www.mpfr.org/mpfr-current/mpfr-${_mpfr_ver}.tar.bz2
-http://www.multiprecision.org/mpc/download/mpc-${_mpc_ver}.tar.gz"
-short_desc="The GNU C Compiler suite (multilib libraries)"
-maintainer="Juan RP <xtraeme@gmail.com>"
-checksum="
-60b05463dfe18d40d68fb8a71b25b408a01f86cc6ceaf5e6b22238b6b0f450c2
-dcafe9989c7f332b373e1f766af8e9cd790fc802fdec422a1910a6ef783480e3
-74a7bbbad168dd1cc414f1c9210b8fc16ccfc8e422d34b3371a8978e31eab680
-ae79f8d41d8a86456b68607e9ca398d00f8b7342d1d83bcf4428178ac45380c7"
-long_desc="
- The GNU C Compiler suite, with support for C, C++, ObjC and ObjC++.
-
- This package installs the 32 bit libraries required to compile 32 bit
- code on x86_64 systems."
-
-subpackages="libgcc32 libssp32 libgomp32 libobjc32 libstdc++32 libmudflap32"
-subpackages="${subpackages} libstdc++32-devel libmudflap32-devel"
-subpackages="${subpackages} gcc-c++-multilib gcc-objc-multilib"
-
-disable_parallel_build=yes
-noverifyrdeps=yes
-only_for_archs=x86_64
-
-Add_dependency run gcc		">=${version}"
-Add_dependency run libgcc32	">=${version}"
-Add_dependency run libgomp32	">=${version}"
-Add_dependency run zlib32
-Add_dependency run glibc32-devel
-
-Add_dependency build glibc32-devel
-Add_dependency build zlib32-devel
-
-do_configure() {
-	# As specified in the LFS book, disable installing libiberty.
-	sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-	# Do not run fixincludes
-	sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-	mkdir -p ${build_wrksrc}/gmp
-	{ mv ${XBPS_BUILDDIR}/gmp-${_gmp_ver} gmp; \
-	mv ${XBPS_BUILDDIR}/mpfr-${_mpfr_ver} mpfr; \
-	mv ${XBPS_BUILDDIR}/mpc-${_mpc_ver} mpc; }
-
-	cp -a gmp/*.h ${build_wrksrc}/gmp
-
-	./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib \
-		--enable-clocale=gnu --enable-shared --disable-bootstrap \
-		--enable-threads=posix --enable-__cxa_atexit \
-		--disable-gold --disable-lto --with-system-zlib \
-		--enable-languages=c,c++,objc,obj-c++ --disable-nls \
-		--enable-multilib
-}
-
-do_build() {
-	make ${makejobs}
-}
-
-do_install() {
-	local triplet="x86_64-unknown-linux-gnu"
-	local libmddir="usr/lib/gcc/${triplet}/${_majorver}"
-	local dirn _dir_
-
-	vmkdir usr/lib
-	cd ${DESTDIR}/usr && ln -sf lib lib64 && cd ${wrksrc}/${build_wrksrc}
-
-	# Create major version to version symlink.
-	make DESTDIR=${DESTDIR} install
-	mv ${DESTDIR}/usr/lib/gcc/${triplet}/${version} \
-		${DESTDIR}/${libmddir}
-
-	# We are only interested in 32bit stuff, remove anything else.
-	rm -rf ${DESTDIR}/usr/{lib64,libexec,bin,share}
-	rm -f ${DESTDIR}/usr/lib/*.{spec,a,so*}
-	rm -f ${DESTDIR}/usr/lib32/{libiberty*,*.py}
-	rm -rf ${DESTDIR}/${libmddir}/{include,include-fixed,install-tools,plugin}
-	rm -f ${DESTDIR}/${libmddir}/*.{a,o}
-	rm -f ${DESTDIR}/${libmddir}/{c,lto}*
-	rm -f ${DESTDIR}/usr/lib32/libquadmath*
-
-	# Move around some stuff for multilib.
-	mv ${DESTDIR}/usr/lib32/lib{std,sup}c++.a ${DESTDIR}/${libmddir}/32
-	mv ${DESTDIR}/usr/lib32/lib{gomp,objc*}.a ${DESTDIR}/${libmddir}/32
-	mv ${DESTDIR}/usr/lib32/libssp*.a ${DESTDIR}/${libmddir}/32
-
-	# Keep libstdc++ 32bit headers, remove anything else.
-	rm -rf ${wrksrc}/xbps_32bits_libstdc++
-	mv ${DESTDIR}/usr/include/c++/${version}/${triplet}/32 \
-		${wrksrc}/xbps_32bits_libstdc++
-	rm -rf ${DESTDIR}/usr/include/c++/${version}/*
-
-	vmkdir usr/include/c++/${_majorver}/${triplet}
-	mv xbps_32bits_libstdc++ \
-		${DESTDIR}/usr/include/c++/${_majorver}/${triplet}/32
-
-	# Install specs file overriding native gcc with no multilib support.
-	vinstall host-${triplet}/gcc/specs 644 ${libmddir}
-}
diff --git a/srcpkgs/gcc-objc-multilib b/srcpkgs/gcc-objc-multilib
deleted file mode 120000
index 9f2eca37b15..00000000000
--- a/srcpkgs/gcc-objc-multilib
+++ /dev/null
@@ -1 +0,0 @@
-gcc-multilib
\ No newline at end of file
diff --git a/srcpkgs/libgcc32 b/srcpkgs/libgcc32
deleted file mode 120000
index 9f2eca37b15..00000000000
--- a/srcpkgs/libgcc32
+++ /dev/null
@@ -1 +0,0 @@
-gcc-multilib
\ No newline at end of file
diff --git a/srcpkgs/libgomp32 b/srcpkgs/libgomp32
deleted file mode 120000
index 9f2eca37b15..00000000000
--- a/srcpkgs/libgomp32
+++ /dev/null
@@ -1 +0,0 @@
-gcc-multilib
\ No newline at end of file
diff --git a/srcpkgs/libmudflap32 b/srcpkgs/libmudflap32
deleted file mode 120000
index 9f2eca37b15..00000000000
--- a/srcpkgs/libmudflap32
+++ /dev/null
@@ -1 +0,0 @@
-gcc-multilib
\ No newline at end of file
diff --git a/srcpkgs/libmudflap32-devel b/srcpkgs/libmudflap32-devel
deleted file mode 120000
index 9f2eca37b15..00000000000
--- a/srcpkgs/libmudflap32-devel
+++ /dev/null
@@ -1 +0,0 @@
-gcc-multilib
\ No newline at end of file
diff --git a/srcpkgs/libobjc32 b/srcpkgs/libobjc32
deleted file mode 120000
index 9f2eca37b15..00000000000
--- a/srcpkgs/libobjc32
+++ /dev/null
@@ -1 +0,0 @@
-gcc-multilib
\ No newline at end of file
diff --git a/srcpkgs/libssp32 b/srcpkgs/libssp32
deleted file mode 120000
index 9f2eca37b15..00000000000
--- a/srcpkgs/libssp32
+++ /dev/null
@@ -1 +0,0 @@
-gcc-multilib
\ No newline at end of file
diff --git a/srcpkgs/libstdc++32 b/srcpkgs/libstdc++32
deleted file mode 120000
index 9f2eca37b15..00000000000
--- a/srcpkgs/libstdc++32
+++ /dev/null
@@ -1 +0,0 @@
-gcc-multilib
\ No newline at end of file
diff --git a/srcpkgs/libstdc++32-devel b/srcpkgs/libstdc++32-devel
deleted file mode 120000
index 9f2eca37b15..00000000000
--- a/srcpkgs/libstdc++32-devel
+++ /dev/null
@@ -1 +0,0 @@
-gcc-multilib
\ No newline at end of file